diff -rup binutils-2.26.orig/bfd/bfd.c binutils-2.26/bfd/bfd.c

--- binutils-2.26.orig/bfd/bfd.c	2016-02-19 09:35:36.231000625 +0000

+++ binutils-2.26/bfd/bfd.c	2016-02-19 09:35:54.901106498 +0000

@@ -57,6 +57,14 @@ CODE_FRAGMENT

 .    bfd_byte data[1];

 .  };

 .

+.enum bfd_lto_object_type

+.  {

+.    lto_non_object,

+.    lto_non_ir_object,

+.    lto_ir_object,

+.    lto_mixed_object

+.  };

+.

 .struct bfd

 .{

 .  {* The filename the application opened the BFD with.  *}

@@ -227,6 +235,9 @@ CODE_FRAGMENT

 .  {* Set if this is a plugin output file.  *}

 .  unsigned int lto_output : 1;

 .

+.  {* LTO object type.  *}

+.  ENUM_BITFIELD (bfd_lto_object_type) lto_type : 2;

+.

 .  {* Set to dummy BFD created when claimed by a compiler plug-in

 .     library.  *}

 .  bfd *plugin_dummy_bfd;

@@ -252,6 +263,9 @@ CODE_FRAGMENT

 .  {* The last section on the section list.  *}

 .  struct bfd_section *section_last;

 .

+.  {* The object-only section on the section list.  *}

+.  struct bfd_section *object_only_section;

+.

 .  {* The number of sections.  *}

 .  unsigned int section_count;

 .

@@ -2270,3 +2284,36 @@ bfd_convert_section_contents (bfd *ibfd,

   *ptr_size = size;

   return TRUE;

 }

+

+/*

+FUNCTION

+	bfd_group_signature

+

+SYNOPSIS

+	asymbol *bfd_group_signature (asection *group, asymbol **isympp);

+

+DESCRIPTION

+	Return a pointer to the symbol used as a signature for GROUP.

+*/

+

+asymbol *

+bfd_group_signature (asection *group, asymbol **isympp)

+{

+  bfd *abfd = group->owner;

+  Elf_Internal_Shdr *ghdr;

+

+  if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)

+    return NULL;

+

+  ghdr = &elf_section_data (group)->this_hdr;

+  if (ghdr->sh_link < elf_numsections (abfd))

+    {

+      const struct elf_backend_data *bed = get_elf_backend_data (abfd);

+      Elf_Internal_Shdr *symhdr = elf_elfsections (abfd) [ghdr->sh_link];

+

+      if (symhdr->sh_type == SHT_SYMTAB

+	  && ghdr->sh_info < symhdr->sh_size / bed->s->sizeof_sym)

+	return isympp[ghdr->sh_info - 1];

+    }

+  return NULL;

+}

diff -rup binutils-2.26.orig/bfd/bfd-in2.h binutils-2.26/bfd/bfd-in2.h

--- binutils-2.26.orig/bfd/bfd-in2.h	2016-02-19 09:35:36.280000903 +0000

+++ binutils-2.26/bfd/bfd-in2.h	2016-02-19 09:35:54.900106492 +0000

@@ -1654,6 +1657,9 @@ extern asection _bfd_std_section[4];

 #define BFD_COM_SECTION_NAME "*COM*"

 #define BFD_IND_SECTION_NAME "*IND*"

+/* GNU object-only section name.  */

+#define GNU_OBJECT_ONLY_SECTION_NAME ".gnu_object_only"

+

 /* Pointer to the common section.  */

 #define bfd_com_section_ptr (&_bfd_std_section[0])

 /* Pointer to the undefined section.  */

@@ -6511,6 +6517,14 @@ struct bfd_build_id

     bfd_byte data[1];

   };

+enum bfd_lto_object_type

+  {

+    lto_non_object,

+    lto_non_ir_object,

+    lto_ir_object,

+    lto_mixed_object

+  };

+

 struct bfd

 {

   /* The filename the application opened the BFD with.  */

@@ -6681,6 +6695,9 @@ struct bfd

   /* Set if this is a plugin output file.  */

   unsigned int lto_output : 1;

+  /* LTO object type.  */

+  ENUM_BITFIELD (bfd_lto_object_type) lto_type : 2;

+

   /* Set to dummy BFD created when claimed by a compiler plug-in

      library.  */

   bfd *plugin_dummy_bfd;

@@ -6706,6 +6723,9 @@ struct bfd

   /* The last section on the section list.  */

   struct bfd_section *section_last;

+  /* The object-only section on the section list.  */

+  struct bfd_section *object_only_section;

+

   /* The number of sections.  */

   unsigned int section_count;

@@ -7026,6 +7046,8 @@ bfd_boolean bfd_convert_section_contents

    (bfd *ibfd, asection *isec, bfd *obfd,

     bfd_byte **ptr, bfd_size_type *ptr_size);

+asymbol *bfd_group_signature (asection *group, asymbol **isympp);

+

 /* Extracted from archive.c.  */

 symindex bfd_get_next_mapent

    (bfd *abfd, symindex previous, carsym **sym);

diff -rup binutils-2.26.orig/bfd/elf.c binutils-2.26/bfd/elf.c

--- binutils-2.26.orig/bfd/elf.c	2016-02-19 09:35:36.280000903 +0000

+++ binutils-2.26/bfd/elf.c	2016-02-19 09:35:54.904106515 +0000

@@ -2387,6 +2387,7 @@ static const struct bfd_elf_special_sect

   { STRING_COMMA_LEN (".gnu.linkonce.b"), -2, SHT_NOBITS,      SHF_ALLOC + SHF_WRITE },

   { STRING_COMMA_LEN (".gnu.lto_"),	  -1, SHT_PROGBITS,    SHF_EXCLUDE },

   { STRING_COMMA_LEN (".got"),		   0, SHT_PROGBITS,    SHF_ALLOC + SHF_WRITE },

+  { STRING_COMMA_LEN (".gnu_object_only"), 0, SHT_GNU_OBJECT_ONLY, SHF_EXCLUDE },

   { STRING_COMMA_LEN (".gnu.version"),	   0, SHT_GNU_versym,  0 },

   { STRING_COMMA_LEN (".gnu.version_d"),   0, SHT_GNU_verdef,  0 },

   { STRING_COMMA_LEN (".gnu.version_r"),   0, SHT_GNU_verneed, 0 },

diff -rup binutils-2.26.orig/bfd/format.c binutils-2.26/bfd/format.c

--- binutils-2.26.orig/bfd/format.c	2016-02-19 09:35:36.265000818 +0000

+++ binutils-2.26/bfd/format.c	2016-02-19 09:36:21.420256880 +0000

@@ -46,6 +46,9 @@ SUBSECTION

 #include "sysdep.h"

 #include "bfd.h"

 #include "libbfd.h"

+#if BFD_SUPPORTS_PLUGINS

+#include "plugin.h"

+#endif

 /* IMPORT from targets.c.  */

 extern const size_t _bfd_target_vector_entries;

@@ -179,6 +182,33 @@ bfd_preserve_finish (bfd *abfd ATTRIBUTE

   preserve->marker = NULL;

 }

+/* Set lto_type in ABFD.  */

+

+static void

+bfd_set_lto_type (bfd *abfd)

+{

+  if (abfd->format == bfd_object

+      && abfd->lto_type == lto_non_object

+      && (abfd->flags & (DYNAMIC | EXEC_P)) == 0)

+    {

+      asection *sec;

+      enum bfd_lto_object_type type = lto_non_ir_object;

+      for (sec = abfd->sections; sec != NULL; sec = sec->next)

+	{

+	  if (strcmp (sec->name, GNU_OBJECT_ONLY_SECTION_NAME) == 0)

+	    {

+	      type = lto_mixed_object;

+	      abfd->object_only_section = sec;

+	      break;

+	    }

+	  else if (type != lto_ir_object

+		   && strncmp (sec->name, ".gnu.lto_", 9) == 0)

+	    type = lto_ir_object;

+	}

+      abfd->lto_type = type;

+    }

+}

+

 /*

 FUNCTION

 	bfd_check_format_matches

@@ -221,7 +251,10 @@ bfd_check_format_matches (bfd *abfd, bfd

     }

   if (abfd->format != bfd_unknown)

-    return abfd->format == format;

+    {

+      bfd_set_lto_type (abfd);

+      return abfd->format == format;

+    }

   if (matching != NULL || *bfd_associated_vector != NULL)

     {

@@ -285,6 +318,13 @@ bfd_check_format_matches (bfd *abfd, bfd

 	  || (*target)->match_priority > best_match)

 	continue;

+#if BFD_SUPPORTS_PLUGINS

+      /* If the plugin target is explicitly specified when a BFD file

+	 is opened, don't check it twice.  */

+      if (bfd_plugin_specified_p () && bfd_plugin_target_p (*target))

+	continue;

+#endif

+

       /* If we already tried a match, the bfd is modified and may

 	 have sections attached, which will confuse the next

 	 _bfd_check_format call.  */

@@ -449,6 +489,8 @@ bfd_check_format_matches (bfd *abfd, bfd

       if (matching_vector)

 	free (matching_vector);

+      bfd_set_lto_type (abfd);

+

       /* File position has moved, BTW.  */

       return TRUE;

     }

diff -rup binutils-2.26.orig/bfd/plugin.c binutils-2.26/bfd/plugin.c

--- binutils-2.26.orig/bfd/plugin.c	2016-02-19 09:35:36.271000852 +0000

+++ binutils-2.26/bfd/plugin.c	2016-02-19 09:35:54.905106520 +0000

@@ -130,6 +130,146 @@ register_claim_file (ld_plugin_claim_fil

   return LDPS_OK;

 }

+static asection bfd_plugin_fake_text_section

+  = BFD_FAKE_SECTION (bfd_plugin_fake_text_section, 0, 0, ".text", 0);

+static asection bfd_plugin_fake_common_section

+  = BFD_FAKE_SECTION (bfd_plugin_fake_common_section, SEC_IS_COMMON, 0,

+		      NULL, 0);

+

+/* Get symbols from object only section.  */

+

+static void

+bfd_plugin_get_symbols_in_object_only (bfd *abfd)

+{

+  struct plugin_data_struct *plugin_data = abfd->tdata.plugin_data;

+  const char *object_only_file;

+  bfd *nbfd;

+  long storage;

+  long object_only_nsyms, added_nsyms, i;

+  asymbol **object_only_syms, **added_syms;

+

+  plugin_data->object_only_syms = NULL;

+  plugin_data->object_only_nsyms = 0;

+

+  if (abfd->sections == NULL && abfd->my_archive == NULL)

+    {

+      nbfd = bfd_openr (abfd->filename, NULL);

+      if (nbfd == NULL)

+	{

+	  (*_bfd_error_handler)

+	    (_("%s: failed to open to extract object only section: %s"),

+	     abfd->filename, bfd_errmsg (bfd_get_error ()));

+	  goto error_return;

+	}

+      else if (!bfd_check_format (nbfd, bfd_object))

+	{

+	  /* There is no object only section if it isn't a bfd_object

+	     file.  */

+error_return:

+	  bfd_close (nbfd);

+	  return;

+	}

+    }

+  else

+    {

+      if (!bfd_check_format (abfd, bfd_object))

+	{

+	  (*_bfd_error_handler)

+	    (_("%B: invalid file to extract object only section: %s"),

+	     abfd, bfd_errmsg (bfd_get_error ()));

+	  return;

+	}

+      nbfd = abfd;

+    }

+

+  if (nbfd->lto_type == lto_mixed_object

+      && (nbfd->flags & HAS_SYMS) != 0)

+    {

+      object_only_file = bfd_extract_object_only_section (nbfd);

+      if (object_only_file == NULL)

+	(*_bfd_error_handler)

+	  (_("%B: failed to extract object only section: %s"),

+	   abfd, bfd_errmsg (bfd_get_error ()));

+    }

+  else

+    object_only_file = NULL;

+

+  /* Close the new bfd we just opened.  */

+  if (nbfd != abfd)

+    bfd_close (nbfd);

+

+  /* Return if there is no object only section or there is no

+     symbol in object only section.  */

+  if (!object_only_file)

+    return;

+

+  /* Open the file containing object only section.  */

+  nbfd = bfd_openr (object_only_file, NULL);

+  if (!bfd_check_format (nbfd, bfd_object))

+    {

+      (*_bfd_error_handler)

+	(_("%B: failed to open object only section: %s"),

+	 abfd, bfd_errmsg (bfd_get_error ()));

+      goto quit;

+    }

+

+  storage = bfd_get_symtab_upper_bound (nbfd);

+  if (storage <= 0)

+    {

+      if (storage < 0)

+	(*_bfd_error_handler)

+	  (_("%B: failed to get symbol table in object only section: %s"),

+	   abfd, bfd_errmsg (bfd_get_error ()));

+

+      goto quit;

+    }

+

+  object_only_syms = (asymbol **) bfd_malloc (storage);

+  object_only_nsyms = bfd_canonicalize_symtab (nbfd, object_only_syms);

+

+  /* FIXME: We waste some spaces if not all symbols are copied.  */

+  added_syms = (asymbol **) bfd_alloc (abfd, storage);

+  added_nsyms = 0;

+

+  /* Copy only global symbols from object only section.  */

+  for (i = 0; i < object_only_nsyms; i++)

+    {

+      asection *sec = object_only_syms[i]->section;

+      flagword flags = object_only_syms[i]->flags;

+      asymbol *s;

+

+      if (bfd_is_com_section (sec))

+	sec = &bfd_plugin_fake_common_section;

+      else if (bfd_is_und_section (sec))

+	;

+      else if ((flags & (BSF_GLOBAL | BSF_WEAK | BSF_GNU_UNIQUE)) != 0)

+	sec = &bfd_plugin_fake_text_section;

+      else

+	continue;

+

+      s = bfd_alloc (abfd, sizeof (asymbol));

+      BFD_ASSERT (s);

+      added_syms[added_nsyms++] = s;

+

+      s->section = sec;

+      s->the_bfd = abfd;

+      s->name = xstrdup (object_only_syms[i]->name);

+      s->value = 0;

+      s->flags = flags;

+      s->udata.p = NULL;

+    }

+

+  plugin_data->object_only_syms = added_syms;

+  plugin_data->object_only_nsyms = added_nsyms;

+

+  free (object_only_syms);

+

+quit:

+  /* Close and remove the object only section file.  */

+  bfd_close (nbfd);

+  unlink (object_only_file);

+}

+

 static enum ld_plugin_status

 add_symbols (void * handle,

 	     int nsyms,

@@ -142,10 +282,13 @@ add_symbols (void * handle,

   plugin_data->nsyms = nsyms;

   plugin_data->syms = syms;

-  if (nsyms != 0)

+  abfd->tdata.plugin_data = plugin_data;

+

+  bfd_plugin_get_symbols_in_object_only (abfd);

+

+  if ((nsyms + plugin_data->object_only_nsyms) != 0)

     abfd->flags |= HAS_SYMS;

-  abfd->tdata.plugin_data = plugin_data;

   return LDPS_OK;

 }

@@ -440,7 +583,8 @@ static long

 bfd_plugin_get_symtab_upper_bound (bfd *abfd)

 {

   struct plugin_data_struct *plugin_data = abfd->tdata.plugin_data;

-  long nsyms = plugin_data->nsyms;

+  /* Add symbols from object only section.  */

+  long nsyms = plugin_data->nsyms + plugin_data->object_only_nsyms;

   BFD_ASSERT (nsyms >= 0);

@@ -474,12 +618,7 @@ bfd_plugin_canonicalize_symtab (bfd *abf

   struct plugin_data_struct *plugin_data = abfd->tdata.plugin_data;

   long nsyms = plugin_data->nsyms;

   const struct ld_plugin_symbol *syms = plugin_data->syms;

-  static asection fake_section;

-  static asection fake_common_section;

-  int i;

-

-  fake_section.name = ".text";

-  fake_common_section.flags = SEC_IS_COMMON;

+  int i, j;

   for (i = 0; i < nsyms; i++)

     {

@@ -492,10 +631,11 @@ bfd_plugin_canonicalize_symtab (bfd *abf

       s->name = syms[i].name;

       s->value = 0;

       s->flags = convert_flags (&syms[i]);

+      s->udata.p = NULL;

       switch (syms[i].def)

 	{

 	case LDPK_COMMON:

-	  s->section = &fake_common_section;

+	  s->section = &bfd_plugin_fake_common_section;

 	  break;

 	case LDPK_UNDEF:

 	case LDPK_WEAKUNDEF:

@@ -503,15 +643,18 @@ bfd_plugin_canonicalize_symtab (bfd *abf

 	  break;

 	case LDPK_DEF:

 	case LDPK_WEAKDEF:

-	  s->section = &fake_section;

+	  s->section = &bfd_plugin_fake_text_section;

 	  break;

 	default:

 	  BFD_ASSERT (0);

 	}

-

-      s->udata.p = (void *) &syms[i];

     }

+  /* Copy symbols from object only section.  */

+  nsyms += plugin_data->object_only_nsyms;

+  for (j = 0; j < plugin_data->object_only_nsyms; j++, i++)

+    alocation[i] = plugin_data->object_only_syms[j];

+

   return nsyms;

 }

diff -rup binutils-2.26.orig/bfd/plugin.h binutils-2.26/bfd/plugin.h

--- binutils-2.26.orig/bfd/plugin.h	2016-02-19 09:35:36.271000852 +0000

+++ binutils-2.26/bfd/plugin.h	2016-02-19 09:35:54.906106526 +0000

@@ -33,6 +33,8 @@ typedef struct plugin_data_struct

 {

   int nsyms;

   const struct ld_plugin_symbol *syms;

+  int object_only_nsyms;

+  asymbol **object_only_syms;

 }

 plugin_data_struct;

diff -rup binutils-2.26.orig/bfd/section.c binutils-2.26/bfd/section.c

--- binutils-2.26.orig/bfd/section.c	2016-02-19 09:35:36.276000881 +0000

+++ binutils-2.26/bfd/section.c	2016-02-19 09:35:54.906106526 +0000

@@ -588,6 +588,9 @@ CODE_FRAGMENT

 .#define BFD_COM_SECTION_NAME "*COM*"

 .#define BFD_IND_SECTION_NAME "*IND*"

 .

+.{* GNU object-only section name.  *}

+.#define GNU_OBJECT_ONLY_SECTION_NAME ".gnu_object_only"

+.

 .{* Pointer to the common section.  *}

 .#define bfd_com_section_ptr (&_bfd_std_section[0])

 .{* Pointer to the undefined section.  *}

diff -rup binutils-2.26.orig/binutils/readelf.c binutils-2.26/binutils/readelf.c

--- binutils-2.26.orig/binutils/readelf.c	2016-02-19 09:35:36.295000988 +0000

+++ binutils-2.26/binutils/readelf.c	2016-02-19 09:35:54.911106554 +0000

@@ -3900,6 +3900,7 @@ get_section_type_name (unsigned int sh_t

     case 0x7ffffffd:		return "AUXILIARY";

     case 0x7fffffff:		return "FILTER";

     case SHT_GNU_LIBLIST:	return "GNU_LIBLIST";

+    case SHT_GNU_OBJECT_ONLY:	return "GNU_OBJECT_ONLY";

     default:

       if ((sh_type >= SHT_LOPROC) && (sh_type <= SHT_HIPROC))

diff -rup binutils-2.26.orig/gas/testsuite/gas/elf/section9.d binutils-2.26/gas/testsuite/gas/elf/section9.d

--- binutils-2.26.orig/gas/testsuite/gas/elf/section9.d	2016-02-19 09:35:36.397001567 +0000

+++ binutils-2.26/gas/testsuite/gas/elf/section9.d	2016-02-19 09:35:54.912106560 +0000

@@ -4,4 +4,5 @@

 #...

 [ 	]*\[.*\][ 	]+\.gnu\.lto_main[ 	]+PROGBITS.*[ 	]+E[   ]+.*

 [ 	]*\[.*\][ 	]+\.gnu\.lto_\.pureconst[ 	]+PROGBITS.*[ 	]+E[   ]+.*

+[ 	]*\[.*\][ 	]+\.gnu_object_only[ 	]+GNU_OBJECT_ONLY.*[ 	]+E[   ]+.*

 #pass

diff -rup binutils-2.26.orig/gas/testsuite/gas/elf/section9.s binutils-2.26/gas/testsuite/gas/elf/section9.s

--- binutils-2.26.orig/gas/testsuite/gas/elf/section9.s	2016-02-19 09:35:36.397001567 +0000

+++ binutils-2.26/gas/testsuite/gas/elf/section9.s	2016-02-19 09:35:54.912106560 +0000

@@ -2,3 +2,5 @@

 	.byte 0,0,0,0

 	.section .gnu.lto_.pureconst,"",%progbits

 	.byte 0,0,0,0

+	.section .gnu_object_only

+	.byte 0,0,0,0

diff -rup binutils-2.26.orig/include/bfdlink.h binutils-2.26/include/bfdlink.h

--- binutils-2.26.orig/include/bfdlink.h	2016-02-19 09:35:36.672003126 +0000

+++ binutils-2.26/include/bfdlink.h	2016-02-19 09:35:54.913106566 +0000

@@ -400,6 +400,12 @@ struct bfd_link_info

   /* TRUE if ok to have multiple definition.  */

   unsigned int allow_multiple_definition: 1;

+  /* TRUE if .gnu_object_only section should be created.  */

+  unsigned int emit_gnu_object_only: 1;

+

+  /* TRUE if .gnu_object_only section is being created.  */

+  unsigned int emitting_gnu_object_only: 1;

+

   /* TRUE if ok to have version with no definition.  */

   unsigned int allow_undefined_version: 1;

diff -rup binutils-2.26.orig/include/elf/common.h binutils-2.26/include/elf/common.h

--- binutils-2.26.orig/include/elf/common.h	2016-02-19 09:35:36.675003143 +0000

+++ binutils-2.26/include/elf/common.h	2016-02-19 09:35:54.913106566 +0000

@@ -478,6 +478,7 @@

 #define SHT_GNU_ATTRIBUTES 0x6ffffff5	/* Object attributes */

 #define SHT_GNU_HASH	0x6ffffff6	/* GNU style symbol hash table */

 #define SHT_GNU_LIBLIST	0x6ffffff7	/* List of prelink dependencies */

+#define SHT_GNU_OBJECT_ONLY 0x6ffffff8	/* Object only */

 /* The next three section types are defined by Solaris, and are named

    SHT_SUNW*.  We use them in GNU code, so we also define SHT_GNU*

diff -rup binutils-2.26.orig/ld/emultempl/aarch64elf.em binutils-2.26/ld/emultempl/aarch64elf.em

--- binutils-2.26.orig/ld/emultempl/aarch64elf.em	2016-02-19 09:35:36.698003274 +0000

+++ binutils-2.26/ld/emultempl/aarch64elf.em	2016-02-19 09:35:54.914106571 +0000

@@ -271,7 +271,7 @@ gld${EMULATION_NAME}_after_allocation (v

 }

 static void

-gld${EMULATION_NAME}_finish (void)

+aarch64_finish (void)

 {

   if (!bfd_link_relocatable (&link_info))

     {

@@ -283,7 +283,7 @@ gld${EMULATION_NAME}_finish (void)

 	}

     }

-  finish_default ();

+  gld${EMULATION_NAME}_finish ();

 }

 /* This is a convenient point to tell BFD about target specific flags.

@@ -435,4 +435,4 @@ LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=

 LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME}"_before_parse

 # Call the extra arm-elf function

-LDEMUL_FINISH=gld${EMULATION_NAME}_finish

+LDEMUL_FINISH=aarch64_finish

diff -rup binutils-2.26.orig/ld/emultempl/alphaelf.em binutils-2.26/ld/emultempl/alphaelf.em

--- binutils-2.26.orig/ld/emultempl/alphaelf.em	2016-02-19 09:35:36.698003274 +0000

+++ binutils-2.26/ld/emultempl/alphaelf.em	2016-02-19 09:35:54.914106571 +0000

@@ -104,7 +104,7 @@ alpha_finish (void)

   if (limit_32bit)

     elf_elfheader (link_info.output_bfd)->e_flags |= EF_ALPHA_32BIT;

-  finish_default ();

+  gld${EMULATION_NAME}_finish ();

 }

 EOF

diff -rup binutils-2.26.orig/ld/emultempl/avrelf.em binutils-2.26/ld/emultempl/avrelf.em

--- binutils-2.26.orig/ld/emultempl/avrelf.em	2016-02-19 09:35:36.698003274 +0000

+++ binutils-2.26/ld/emultempl/avrelf.em	2016-02-19 09:35:54.915106577 +0000

@@ -209,7 +209,7 @@ avr_finish (void)

 	elf_elfheader (abfd)->e_flags &= ~EF_AVR_LINKRELAX_PREPARED;

     }

-  finish_default ();

+  gld${EMULATION_NAME}_finish ();

 }

 EOF

diff -rup binutils-2.26.orig/ld/emultempl/elf32.em binutils-2.26/ld/emultempl/elf32.em

--- binutils-2.26.orig/ld/emultempl/elf32.em	2016-02-19 09:35:36.700003285 +0000

+++ binutils-2.26/ld/emultempl/elf32.em	2016-02-19 09:35:54.915106577 +0000

@@ -66,6 +66,7 @@ static void gld${EMULATION_NAME}_before_

 static void gld${EMULATION_NAME}_after_allocation (void);

 static lang_output_section_statement_type *gld${EMULATION_NAME}_place_orphan

   (asection *, const char *, int);

+static void gld${EMULATION_NAME}_finish (void);

 EOF

 if [ "x${USE_LIBPATH}" = xyes ] ; then

@@ -1795,6 +1796,8 @@ output_rel_find (asection *sec, int isdy

 					  in->owner, in);

 }

+static int orphan_init_done = 0;

+

 /* Place an orphan section.  We use this to put random SHF_ALLOC

    sections in the right segment.  */

@@ -1803,7 +1806,7 @@ gld${EMULATION_NAME}_place_orphan (asect

 				   const char *secname,

 				   int constraint)

 {

-  static struct orphan_save hold[] =

+  static struct orphan_save orig_hold[] =

     {

       { ".text",

 	SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE,

@@ -1833,6 +1836,7 @@ gld${EMULATION_NAME}_place_orphan (asect

 	SEC_HAS_CONTENTS,

 	0, 0, 0, 0 },

     };

+  static struct orphan_save hold[ARRAY_SIZE (orig_hold)];

   enum orphan_save_index

     {

       orphan_text = 0,

@@ -1845,7 +1849,6 @@ gld${EMULATION_NAME}_place_orphan (asect

       orphan_sdata,

       orphan_nonalloc

     };

-  static int orphan_init_done = 0;

   struct orphan_save *place;

   lang_output_section_statement_type *after;

   lang_output_section_statement_type *os;

@@ -1924,15 +1927,22 @@ gld${EMULATION_NAME}_place_orphan (asect

   if (!orphan_init_done)

     {

-      struct orphan_save *ho;

+      struct orphan_save *ho, *horig;

       for (ho = hold; ho < hold + sizeof (hold) / sizeof (hold[0]); ++ho)

+      for (ho = hold, horig = orig_hold;

+	   ho < hold + ARRAY_SIZE (hold);

+	   ++ho, ++horig)

+	{

+	  *ho = *horig;

+	  if (ho->name != NULL)

 	if (ho->name != NULL)

 	  {

 	    ho->os = lang_output_section_find (ho->name);

 	    if (ho->os != NULL && ho->os->flags == 0)

 	      ho->os->flags = ho->flags;

 	  }

+	}

       orphan_init_done = 1;

     }

@@ -2017,6 +2027,27 @@ gld${EMULATION_NAME}_place_orphan (asect

 EOF

 fi

+fragment <

+

+/* Final emulation specific call.  */

+

+static void

+gld${EMULATION_NAME}_finish (void)

+{

+EOF

+if test x"$LDEMUL_PLACE_ORPHAN" != xgld"$EMULATION_NAME"_place_orphan; then

+fragment <

+  /* Support the object-only output.  */

+  if (link_info.emit_gnu_object_only)

+    orphan_init_done = 0;

+

+EOF

+fi

+fragment <

+  finish_default ();

+}

+EOF

+

 if test x"$LDEMUL_AFTER_ALLOCATION" != xgld"$EMULATION_NAME"_after_allocation; then

 fragment <

@@ -2503,7 +2534,7 @@ struct ld_emulation_xfer_struct ld_${EMU

   ${LDEMUL_GET_SCRIPT-gld${EMULATION_NAME}_get_script},

   "${EMULATION_NAME}",

   "${OUTPUT_FORMAT}",

-  ${LDEMUL_FINISH-finish_default},

+  ${LDEMUL_FINISH-gld${EMULATION_NAME}_finish},

   ${LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS-NULL},

   ${LDEMUL_OPEN_DYNAMIC_ARCHIVE-gld${EMULATION_NAME}_open_dynamic_archive},

   ${LDEMUL_PLACE_ORPHAN-gld${EMULATION_NAME}_place_orphan},

diff -rup binutils-2.26.orig/ld/emultempl/ppc32elf.em binutils-2.26/ld/emultempl/ppc32elf.em

--- binutils-2.26.orig/ld/emultempl/ppc32elf.em	2016-02-19 09:35:36.699003279 +0000

+++ binutils-2.26/ld/emultempl/ppc32elf.em	2016-02-19 09:35:54.916106583 +0000

@@ -215,7 +215,7 @@ ppc_finish (void)

 {

   if (params.ppc476_workaround)

     lang_for_each_statement (no_zero_padding);

-  finish_default ();

+  gld${EMULATION_NAME}_finish ();

 }

 EOF

diff -rup binutils-2.26.orig/ld/emultempl/spuelf.em binutils-2.26/ld/emultempl/spuelf.em

--- binutils-2.26.orig/ld/emultempl/spuelf.em	2016-02-19 09:35:36.699003279 +0000

+++ binutils-2.26/ld/emultempl/spuelf.em	2016-02-19 09:35:54.916106583 +0000

@@ -416,7 +416,7 @@ spu_elf_relink (void)

 /* Final emulation specific call.  */

 static void

-gld${EMULATION_NAME}_finish (void)

+spu_finish (void)

 {

   if (is_spu_target ())

     {

@@ -432,7 +432,7 @@ gld${EMULATION_NAME}_finish (void)

 	einfo (_("%P: --auto-overlay ignored with zero local store range\n"));

     }

-  finish_default ();

+  gld${EMULATION_NAME}_finish ();

 }