From 39ef6ffbbf3776464b4c925a0f6b168fa5e40757 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 1 Dec 2011 15:50:56 +0000
Subject: [PATCH] 	* elf32-m68k.c (elf_m68k_check_relocs) <R_68K_8,
 R68K_16, R_68K_32>: For 	non-SEC_ALLOC sections break before GOT and
 PLT accounting.

---
 bfd/ChangeLog    | 5 +++++
 bfd/elf32-m68k.c | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 78b1a958d..22270f589 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-01  Mikael Pettersson  <mikpe@it.uu.se>
+
+	* elf32-m68k.c (elf_m68k_check_relocs) <R_68K_8, R68K_16, R_68K_32>: For
+	non-SEC_ALLOC sections break before GOT and PLT accounting.
+
 2011-12-01  Hans-Peter Nilsson  <hp@axis.com>
 
 	* elf32-cris.c (cris_elf_check_relocs) <plt accounting for
diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index 8c935485f..bd660e984 100644
--- a/bfd/elf32-m68k.c
+++ b/bfd/elf32-m68k.c
@@ -2816,6 +2816,11 @@ elf_m68k_check_relocs (abfd, info, sec, relocs)
 	case R_68K_8:
 	case R_68K_16:
 	case R_68K_32:
+	  /* We don't need to handle relocs into sections not going into
+	     the "real" output.  */
+	  if ((sec->flags & SEC_ALLOC) == 0)
+	      break;
+
 	  if (h != NULL)
 	    {
 	      /* Make sure a plt entry is created for this symbol if it
@@ -2829,8 +2834,7 @@ elf_m68k_check_relocs (abfd, info, sec, relocs)
 
 	  /* If we are creating a shared library, we need to copy the
 	     reloc into the shared library.  */
-	  if (info->shared
-	      && (sec->flags & SEC_ALLOC) != 0)
+	  if (info->shared)
 	    {
 	      /* When creating a shared object, we must copy these
 		 reloc types into the output file.  We create a reloc
-- 
2.11.4.GIT