baa571
--- binutils.orig/ld/emultempl/elf32.em	2017-09-14 15:35:45.971100712 +0100
baa571
+++ binutils-2.29/ld/emultempl/elf32.em	2017-09-14 15:40:30.315782167 +0100
baa571
@@ -2011,6 +2011,29 @@ output_rel_find (asection *sec, int isdy
baa571
 
baa571
 static int orphan_init_done = 0;
baa571
 
baa571
+/* Return whether IN is suitable to be part of OUT.  */
baa571
+
baa571
+static bfd_boolean
baa571
+elf_orphan_compatible (asection *in, asection *out)
baa571
+{
baa571
+  /* Non-zero sh_info implies a section with SHF_INFO_LINK with
baa571
+     unknown semantics for the generic linker, or a SHT_REL/SHT_RELA
baa571
+     section where sh_info specifies a symbol table.  (We won't see
baa571
+     SHT_GROUP, SHT_SYMTAB or SHT_DYNSYM sections here.)  We clearly
baa571
+     can't merge SHT_REL/SHT_RELA using differing symbol tables, and
baa571
+     shouldn't merge sections with differing unknown semantics.  */
baa571
+  if (elf_section_data (out)->this_hdr.sh_info
baa571
+      != elf_section_data (in)->this_hdr.sh_info)
baa571
+    return FALSE;
baa571
+  /* We can't merge two sections with differing SHF_EXCLUDE when doing
baa571
+     a relocatable link.  */
baa571
+  if (bfd_link_relocatable (&link_info)
baa571
+      && ((elf_section_flags (out) ^ elf_section_flags (in)) & SHF_EXCLUDE) != 0)
baa571
+    return FALSE;
baa571
+  return _bfd_elf_match_sections_by_type (link_info.output_bfd, out,
baa571
+					  in->owner, in);
baa571
+}
baa571
+
baa571
 /* Place an orphan section.  We use this to put random SHF_ALLOC
baa571
    sections in the right segment.  */
baa571
 
baa571
@@ -2067,8 +2090,9 @@ gld${EMULATION_NAME}_place_orphan (asect
baa571
   lang_output_section_statement_type *os;
baa571
   lang_output_section_statement_type *match_by_name = NULL;
baa571
   int isdyn = 0;
baa571
-  int iself = s->owner->xvec->flavour == bfd_target_elf_flavour;
baa571
-  unsigned int sh_type = iself ? elf_section_type (s) : SHT_NULL;
baa571
+  int elfinput = s->owner->xvec->flavour == bfd_target_elf_flavour;
baa571
+  int elfoutput = link_info.output_bfd->xvec->flavour == bfd_target_elf_flavour;
baa571
+  unsigned int sh_type = elfinput ? elf_section_type (s) : SHT_NULL;
baa571
   flagword flags;
baa571
   asection *nexts;
baa571
 
baa571
@@ -2076,7 +2100,7 @@ gld${EMULATION_NAME}_place_orphan (asect
baa571
       && link_info.combreloc
baa571
       && (s->flags & SEC_ALLOC))
baa571
     {
baa571
-      if (iself)
baa571
+      if (elfinput)
baa571
 	switch (sh_type)
baa571
 	  {
baa571
 	  case SHT_RELA:
baa571
@@ -2098,6 +2122,8 @@ gld${EMULATION_NAME}_place_orphan (asect
baa571
     }
baa571
 
baa571
   if (!bfd_link_relocatable (&link_info)
baa571
+      && elfinput
baa571
+      && elfoutput
baa571
       && (s->flags & SEC_ALLOC) != 0
baa571
       && (elf_section_flags (s) & SHF_GNU_MBIND) != 0)
baa571
     {
baa571
@@ -2148,23 +2174,18 @@ gld${EMULATION_NAME}_place_orphan (asect
baa571
 	   lang_insert_orphan to create a new output section.  */
baa571
 	constraint = SPECIAL;
baa571
 
baa571
-	/* SEC_EXCLUDE is cleared when doing a relocatable link.  But
baa571
-	   we can't merge 2 input sections with the same name when only
baa571
-	   one of them has SHF_EXCLUDE.  Don't merge 2 sections with
baa571
-	   different sh_info.  */
baa571
+	/* Check to see if we already have an output section statement
baa571
+	   with this name, and its bfd section has compatible flags.
baa571
+	   If the section already exists but does not have any flags
baa571
+	   set, then it has been created by the linker, possibly as a
baa571
+	   result of a --section-start command line switch.  */
baa571
 	if (os->bfd_section != NULL
baa571
-	    && (elf_section_data (os->bfd_section)->this_hdr.sh_info
baa571
-		== elf_section_data (s)->this_hdr.sh_info)
baa571
 	    && (os->bfd_section->flags == 0
baa571
-		|| ((!bfd_link_relocatable (&link_info)
baa571
-		     || (iself && (((elf_section_flags (s)
baa571
-				     ^ elf_section_flags (os->bfd_section))
baa571
-				    & SHF_EXCLUDE) == 0)))
baa571
-		    && ((s->flags ^ os->bfd_section->flags)
baa571
+		|| (((s->flags ^ os->bfd_section->flags)
baa571
 		     & (SEC_LOAD | SEC_ALLOC)) == 0
baa571
-		    && _bfd_elf_match_sections_by_type (link_info.output_bfd,
baa571
-							os->bfd_section,
baa571
-							s->owner, s))))
baa571
+		    && (!elfinput
baa571
+			|| !elfoutput
baa571
+			|| elf_orphan_compatible (s, os->bfd_section)))))
baa571
 	  {
baa571
 	    /* We already have an output section statement with this
baa571
 	       name, and its bfd section has compatible flags.
baa571
@@ -2253,8 +2274,8 @@ gld${EMULATION_NAME}_place_orphan (asect
baa571
   else if ((flags & SEC_ALLOC) == 0)
baa571
     ;
baa571
   else if ((flags & SEC_LOAD) != 0
baa571
-	   && ((iself && sh_type == SHT_NOTE)
baa571
-	       || (!iself && CONST_STRNEQ (secname, ".note"))))
baa571
+	   && ((elfinput && sh_type == SHT_NOTE)
baa571
+	       || (!elfinput && CONST_STRNEQ (secname, ".note"))))
baa571
     place = &hold[orphan_interp];
baa571
   else if ((flags & (SEC_LOAD | SEC_HAS_CONTENTS | SEC_THREAD_LOCAL)) == 0)
baa571
     place = &hold[orphan_bss];
baa571
@@ -2264,8 +2285,8 @@ gld${EMULATION_NAME}_place_orphan (asect
baa571
     place = &hold[orphan_tdata];
baa571
   else if ((flags & SEC_READONLY) == 0)
baa571
     place = &hold[orphan_data];
baa571
-  else if (((iself && (sh_type == SHT_RELA || sh_type == SHT_REL))
baa571
-	    || (!iself && CONST_STRNEQ (secname, ".rel")))
baa571
+  else if (((elfinput && (sh_type == SHT_RELA || sh_type == SHT_REL))
baa571
+	    || (!elfinput && CONST_STRNEQ (secname, ".rel")))
baa571
 	   && (flags & SEC_LOAD) != 0)
baa571
     place = &hold[orphan_rel];
baa571
   else if ((flags & SEC_CODE) == 0)
baa571
diff -rup binutils.orig/bfd/elf32-i386.c binutils-2.29/bfd/elf32-i386.c
baa571
--- binutils.orig/bfd/elf32-i386.c	2017-09-15 10:27:16.828950825 +0100
baa571
+++ binutils-2.29/bfd/elf32-i386.c	2017-09-15 10:27:38.962692771 +0100
baa571
@@ -6921,8 +6921,9 @@ elf_i386_link_setup_gnu_properties (stru
baa571
       for (abfd = info->input_bfds;
baa571
 	   abfd != NULL;
baa571
 	   abfd = abfd->link.next)
baa571
-	if ((abfd->flags
baa571
-	     & (DYNAMIC | BFD_LINKER_CREATED | BFD_PLUGIN)) == 0)
baa571
+	if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
baa571
+	    && (abfd->flags
baa571
+		 & (DYNAMIC | BFD_LINKER_CREATED | BFD_PLUGIN)) == 0)
baa571
 	  {
baa571
 	    htab->elf.dynobj = abfd;
baa571
 	    dynobj = abfd;
baa571
diff -rup binutils.orig/bfd/elf64-x86-64.c binutils-2.29/bfd/elf64-x86-64.c
baa571
--- binutils.orig/bfd/elf64-x86-64.c	2017-09-15 10:27:16.820950918 +0100
baa571
+++ binutils-2.29/bfd/elf64-x86-64.c	2017-09-15 10:28:02.621416935 +0100
baa571
@@ -7466,8 +7466,9 @@ error_alignment:
baa571
 	  for (abfd = info->input_bfds;
baa571
 	       abfd != NULL;
baa571
 	       abfd = abfd->link.next)
baa571
-	    if ((abfd->flags
baa571
-		 & (DYNAMIC | BFD_LINKER_CREATED | BFD_PLUGIN)) == 0)
baa571
+	    if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
baa571
+		&& (abfd->flags
baa571
+		    & (DYNAMIC | BFD_LINKER_CREATED | BFD_PLUGIN)) == 0)
baa571
 	      {
baa571
 		htab->elf.dynobj = abfd;
baa571
 		dynobj = abfd;