From: Hans-Peter Nilsson <hp@axis.com>
Date: Fri, 2 Dec 2011 13:36:32 +0000 (+0000)
Subject: 2011-12-01  Mikael Pettersson  <mikpe@it.uu.se>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76477c863c421f7e6e45a266906862e3d5af99d3;p=thirdparty%2Fbinutils-gdb.git

2011-12-01  Mikael Pettersson  <mikpe@it.uu.se>

	Apply mainline patches
	* 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.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 8b0851fe5b6..86e0ee71c48 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-01  Mikael Pettersson  <mikpe@it.uu.se>
+
+	Apply mainline patches
+	* 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>
 
 	Apply mainline patches
diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index 612525c2ad6..3e9ada92865 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