Nick Clifton cb8d97
diff -rup binutils-2.25/bfd/bfd.c binutils-2.25.patched/bfd/bfd.c
Nick Clifton cb8d97
--- binutils-2.25/bfd/bfd.c	2014-11-04 09:54:41.000000000 +0000
Nick Clifton cb8d97
+++ binutils-2.25.patched/bfd/bfd.c	2015-02-02 16:10:13.853438622 +0000
Nick Clifton cb347a
@@ -221,6 +229,9 @@ CODE_FRAGMENT
Nick Clifton cb347a
 .  {* The last section on the section list.  *}
Nick Clifton cb347a
 .  struct bfd_section *section_last;
Nick Clifton cb347a
 .
Nick Clifton cb347a
+.  {* The object-only section on the section list.  *}
Nick Clifton cb347a
+.  struct bfd_section *object_only_section;
Nick Clifton cb347a
+.
Nick Clifton cb347a
 .  {* The number of sections.  *}
Nick Clifton cb347a
 .  unsigned int section_count;
Nick Clifton cb347a
 .
Nick Clifton cb8d97
diff -rup binutils-2.25/bfd/bfd-in2.h binutils-2.25.patched/bfd/bfd-in2.h
Nick Clifton cb8d97
--- binutils-2.25/bfd/bfd-in2.h	2015-02-02 16:11:06.706681097 +0000
Nick Clifton cb8d97
+++ binutils-2.25.patched/bfd/bfd-in2.h	2015-02-02 16:10:13.841438566 +0000
Nick Clifton cb347a
@@ -1078,6 +1078,9 @@ struct bfd_section *bfd_create_gnu_debug
Nick Clifton cb347a
 bfd_boolean bfd_fill_in_gnu_debuglink_section
Nick Clifton cb347a
    (bfd *abfd, struct bfd_section *sect, const char *filename);
Nick Clifton cb347a
 
Nick Clifton cb347a
+const char *bfd_extract_object_only_section
Nick Clifton cb347a
+   (bfd *abfd);
Nick Clifton cb347a
+
Nick Clifton cb347a
 /* Extracted from libbfd.c.  */
Nick Clifton cb347a
 
Nick Clifton cb347a
 /* Byte swapping macros for user section data.  */
Nick Clifton cb347a
@@ -1650,6 +1653,9 @@ extern asection _bfd_std_section[4];
Nick Clifton cb347a
   || ((SEC) == bfd_com_section_ptr)            \
Nick Clifton cb347a
   || ((SEC) == bfd_ind_section_ptr))
Nick Clifton cb347a
 
Nick Clifton cb347a
+/* GNU object-only section name.  */
Nick Clifton cb347a
+#define GNU_OBJECT_ONLY_SECTION_NAME ".gnu_object_only"
Nick Clifton cb347a
+
Nick Clifton cb347a
 /* Macros to handle insertion and deletion of a bfd's sections.  These
Nick Clifton cb347a
    only handle the list pointers, ie. do not adjust section_count,
Nick Clifton cb347a
    target_index etc.  */
Nick Clifton cb347a
@@ -6446,6 +6460,9 @@ struct bfd
Nick Clifton cb347a
   /* The last section on the section list.  */
Nick Clifton cb347a
   struct bfd_section *section_last;
Nick Clifton cb347a
 
Nick Clifton cb347a
+  /* The object-only section on the section list.  */
Nick Clifton cb347a
+  struct bfd_section *object_only_section;
Nick Clifton cb347a
+
Nick Clifton cb347a
   /* The number of sections.  */
Nick Clifton cb347a
   unsigned int section_count;
Nick Clifton cb347a
 
Nick Clifton cb8d97
diff -rup binutils-2.25/bfd/elf.c binutils-2.25.patched/bfd/elf.c
Nick Clifton cb8d97
--- binutils-2.25/bfd/elf.c	2015-02-02 16:11:06.700681069 +0000
Nick Clifton cb8d97
+++ binutils-2.25.patched/bfd/elf.c	2015-02-02 16:10:13.833438530 +0000
Nick Clifton cb347a
@@ -2208,6 +2208,7 @@ static const struct bfd_elf_special_sect
Nick Clifton cb347a
   { STRING_COMMA_LEN (".gnu.linkonce.b"), -2, SHT_NOBITS,      SHF_ALLOC + SHF_WRITE },
Nick Clifton cb347a
   { STRING_COMMA_LEN (".gnu.lto_"),       -1, SHT_PROGBITS,    SHF_EXCLUDE },
Nick Clifton cb347a
   { STRING_COMMA_LEN (".got"),             0, SHT_PROGBITS,    SHF_ALLOC + SHF_WRITE },
Nick Clifton cb347a
+  { STRING_COMMA_LEN (".gnu_object_only"), 0, SHT_GNU_OBJECT_ONLY, SHF_EXCLUDE },
Nick Clifton cb347a
   { STRING_COMMA_LEN (".gnu.version"),     0, SHT_GNU_versym,  0 },
Nick Clifton cb347a
   { STRING_COMMA_LEN (".gnu.version_d"),   0, SHT_GNU_verdef,  0 },
Nick Clifton cb347a
   { STRING_COMMA_LEN (".gnu.version_r"),   0, SHT_GNU_verneed, 0 },
Nick Clifton cb8d97
diff -rup binutils-2.25/bfd/format.c binutils-2.25.patched/bfd/format.c
Nick Clifton cb8d97
--- binutils-2.25/bfd/format.c	2014-10-14 08:32:02.000000000 +0100
Nick Clifton cb8d97
+++ binutils-2.25.patched/bfd/format.c	2015-02-02 16:10:13.857438640 +0000
Nick Clifton cb347a
@@ -94,6 +94,33 @@ bfd_check_format (bfd *abfd, bfd_format
Nick Clifton cb347a
   return bfd_check_format_matches (abfd, format, NULL);
Nick Clifton cb347a
 }
Nick Clifton cb347a
 
Nick Clifton cb347a
+/* Set lto_type in ABFD.  */
Nick Clifton cb347a
+
Nick Clifton cb347a
+static void
Nick Clifton cb347a
+bfd_set_lto_type (bfd *abfd)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+  if (abfd->format == bfd_object
Nick Clifton cb347a
+      && abfd->lto_type == lto_non_object
Nick Clifton cb347a
+      && (abfd->flags & (DYNAMIC | EXEC_P)) == 0)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      asection *sec;
Nick Clifton cb347a
+      enum bfd_lto_object_type type = lto_non_ir_object;
Nick Clifton cb347a
+      for (sec = abfd->sections; sec != NULL; sec = sec->next)
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	  if (strcmp (sec->name, GNU_OBJECT_ONLY_SECTION_NAME) == 0)
Nick Clifton cb347a
+	    {
Nick Clifton cb347a
+	      type = lto_mixed_object;
Nick Clifton cb347a
+	      abfd->object_only_section = sec;
Nick Clifton cb347a
+	      break;
Nick Clifton cb347a
+	    }
Nick Clifton cb347a
+	  else if (type != lto_ir_object
Nick Clifton cb347a
+		   && strncmp (sec->name, ".gnu.lto_", 9) == 0)
Nick Clifton cb347a
+	    type = lto_ir_object;
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+      abfd->lto_type = type;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+}
Nick Clifton cb347a
+
Nick Clifton cb347a
 struct bfd_preserve
Nick Clifton cb347a
 {
Nick Clifton cb347a
   void *marker;
Nick Clifton cb347a
@@ -221,7 +248,10 @@ bfd_check_format_matches (bfd *abfd, bfd
Nick Clifton cb347a
     }
Nick Clifton cb347a
 
Nick Clifton cb347a
   if (abfd->format != bfd_unknown)
Nick Clifton cb347a
-    return abfd->format == format;
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      bfd_set_lto_type (abfd);
Nick Clifton cb347a
+      return abfd->format == format;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
 
Nick Clifton cb347a
   if (matching != NULL || *bfd_associated_vector != NULL)
Nick Clifton cb347a
     {
Nick Clifton cb347a
@@ -449,6 +479,9 @@ bfd_check_format_matches (bfd *abfd, bfd
Nick Clifton cb347a
       if (matching_vector)
Nick Clifton cb347a
 	free (matching_vector);
Nick Clifton cb347a
 
Nick Clifton cb347a
+      bfd_set_lto_type (abfd);
Nick Clifton cb347a
+
Nick Clifton cb347a
+
Nick Clifton cb347a
       /* File position has moved, BTW.  */
Nick Clifton cb347a
       return TRUE;
Nick Clifton cb347a
     }
Nick Clifton cb8d97
diff -rup binutils-2.25/bfd/opncls.c binutils-2.25.patched/bfd/opncls.c
Nick Clifton cb8d97
--- binutils-2.25/bfd/opncls.c	2015-02-02 16:11:06.707681101 +0000
Nick Clifton cb8d97
+++ binutils-2.25.patched/bfd/opncls.c	2015-02-02 16:10:13.866438681 +0000
Nick Clifton cb347a
@@ -1711,3 +1711,69 @@ bfd_fill_in_gnu_debuglink_section (bfd *
Nick Clifton cb347a
 
Nick Clifton cb347a
   return TRUE;
Nick Clifton cb347a
 }
Nick Clifton cb347a
+
Nick Clifton cb347a
+/*
Nick Clifton cb347a
+FUNCTION
Nick Clifton cb347a
+	bfd_extract_object_only_section
Nick Clifton cb347a
+
Nick Clifton cb347a
+SYNOPSIS
Nick Clifton cb347a
+	const char *bfd_extract_object_only_section
Nick Clifton cb347a
+	  (bfd *abfd);
Nick Clifton cb347a
+
Nick Clifton cb347a
+DESCRIPTION
Nick Clifton cb347a
+
Nick Clifton cb347a
+	Takes a @var{ABFD} and extract the .gnu_object_only section into
Nick Clifton cb347a
+	a temporary file.
Nick Clifton cb347a
+
Nick Clifton cb347a
+RETURNS
Nick Clifton cb347a
+	The name of the temporary file is returned if all is ok.
Nick Clifton cb347a
+	Otherwise <<NULL>> is returned and bfd_error is set.
Nick Clifton cb347a
+*/
Nick Clifton cb347a
+
Nick Clifton cb347a
+const char *
Nick Clifton cb347a
+bfd_extract_object_only_section (bfd *abfd)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+  asection *sec = abfd->object_only_section;
Nick Clifton cb347a
+  const char *name;
Nick Clifton cb347a
+  FILE *file;
Nick Clifton cb347a
+  bfd_byte *memhunk = NULL;
Nick Clifton cb347a
+  size_t off, size;
Nick Clifton cb347a
+  bfd_error_type err;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Get a temporary object-only file.  */
Nick Clifton cb347a
+  name = make_temp_file (".obj-only.o");
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Open the object-only file.  */
Nick Clifton cb347a
+  file = real_fopen (name, FOPEN_WB);
Nick Clifton cb347a
+  if (!bfd_get_full_section_contents (abfd, sec, &memhunk))
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = bfd_get_error ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+loser:
Nick Clifton cb347a
+      free (memhunk);
Nick Clifton cb347a
+      fclose (file);
Nick Clifton cb347a
+      unlink (name);
Nick Clifton cb347a
+      bfd_set_error (err);
Nick Clifton cb347a
+      return NULL;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  off = 0;
Nick Clifton cb347a
+  size = sec->size;
Nick Clifton cb347a
+  while (off != size)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      size_t written, nwrite = size - off;
Nick Clifton cb347a
+
Nick Clifton cb347a
+      written = fwrite (memhunk + off, 1, nwrite, file);
Nick Clifton cb347a
+      if (written < nwrite && ferror (file))
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	  err = bfd_error_system_call;
Nick Clifton cb347a
+	  goto loser;
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+
Nick Clifton cb347a
+      off += written;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  free (memhunk);
Nick Clifton cb347a
+  fclose (file);
Nick Clifton cb347a
+  return name;
Nick Clifton cb347a
+}
Nick Clifton cb8d97
diff -rup binutils-2.25/bfd/plugin.c binutils-2.25.patched/bfd/plugin.c
Nick Clifton cb8d97
--- binutils-2.25/bfd/plugin.c	2014-11-04 09:54:41.000000000 +0000
Nick Clifton cb8d97
+++ binutils-2.25.patched/bfd/plugin.c	2015-02-02 16:10:49.164600619 +0000
Nick Clifton cb347a
@@ -129,6 +129,139 @@ register_claim_file (ld_plugin_claim_fil
Nick Clifton cb347a
   return LDPS_OK;
Nick Clifton cb347a
 }
Nick Clifton cb347a
 
Nick Clifton cb347a
+static asection bfd_plugin_fake_text_section
Nick Clifton cb347a
+  = BFD_FAKE_SECTION (bfd_plugin_fake_text_section, 0, 0, ".text", 0);
Nick Clifton cb347a
+static asection bfd_plugin_fake_common_section
Nick Clifton cb347a
+  = BFD_FAKE_SECTION (bfd_plugin_fake_common_section, SEC_IS_COMMON, 0,
Nick Clifton cb347a
+		      NULL, 0);
Nick Clifton cb347a
+
Nick Clifton cb347a
+/* Get symbols from object only section.  */
Nick Clifton cb347a
+
Nick Clifton cb347a
+static void
Nick Clifton cb347a
+bfd_plugin_get_symbols_in_object_only (bfd *abfd)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+  struct plugin_data_struct *plugin_data = abfd->tdata.plugin_data;
Nick Clifton cb347a
+  const char *object_only_file;
Nick Clifton cb347a
+  bfd *nbfd;
Nick Clifton cb347a
+  long storage;
Nick Clifton cb347a
+  long object_only_nsyms, added_nsyms, i;
Nick Clifton cb347a
+  asymbol **object_only_syms, **added_syms;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  plugin_data->object_only_syms = NULL;
Nick Clifton cb347a
+  plugin_data->object_only_nsyms = 0;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (abfd->sections == NULL && abfd->my_archive == NULL)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      nbfd = bfd_openr (abfd->filename, NULL);
Nick Clifton cb347a
+      if (nbfd == NULL || !bfd_check_format (nbfd, bfd_object))
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	  (*_bfd_error_handler)
Nick Clifton cb347a
+	    (_("%s: failed to open to extract object only section: %s"),
Nick Clifton cb347a
+	     abfd->filename, bfd_errmsg (bfd_get_error ()));
Nick Clifton cb347a
+	  bfd_close (nbfd);
Nick Clifton cb347a
+	  return;
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+  else
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      if (!bfd_check_format (abfd, bfd_object))
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	  (*_bfd_error_handler)
Nick Clifton cb347a
+	    (_("%B: invalid file to extract object only section: %s"),
Nick Clifton cb347a
+	     abfd, bfd_errmsg (bfd_get_error ()));
Nick Clifton cb347a
+	  return;
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+      nbfd = abfd;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (nbfd->lto_type == lto_mixed_object
Nick Clifton cb347a
+      && (nbfd->flags & HAS_SYMS) != 0)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      object_only_file = bfd_extract_object_only_section (nbfd);
Nick Clifton cb347a
+      if (object_only_file == NULL)
Nick Clifton cb347a
+	(*_bfd_error_handler)
Nick Clifton cb347a
+	  (_("%B: failed to extract object only section: %s"),
Nick Clifton cb347a
+	   abfd, bfd_errmsg (bfd_get_error ()));
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+  else
Nick Clifton cb347a
+    object_only_file = NULL;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Close the new bfd we just opened.  */
Nick Clifton cb347a
+  if (nbfd != abfd)
Nick Clifton cb347a
+    bfd_close (nbfd);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Return if there is no object only section or there is no
Nick Clifton cb347a
+     symbol in object only section.  */
Nick Clifton cb347a
+  if (!object_only_file)
Nick Clifton cb347a
+    return;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Open the file containing object only section.  */
Nick Clifton cb347a
+  nbfd = bfd_openr (object_only_file, NULL);
Nick Clifton cb347a
+  if (!bfd_check_format (nbfd, bfd_object))
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      (*_bfd_error_handler)
Nick Clifton cb347a
+	(_("%B: failed to open object only section: %s"),
Nick Clifton cb347a
+	 abfd, bfd_errmsg (bfd_get_error ()));
Nick Clifton cb347a
+      goto quit;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  storage = bfd_get_symtab_upper_bound (nbfd);
Nick Clifton cb347a
+  if (storage <= 0)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      if (storage < 0)
Nick Clifton cb347a
+	(*_bfd_error_handler)
Nick Clifton cb347a
+	  (_("%B: failed to get symbol table in object only section: %s"),
Nick Clifton cb347a
+	   abfd, bfd_errmsg (bfd_get_error ()));
Nick Clifton cb347a
+
Nick Clifton cb347a
+      goto quit;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  object_only_syms = (asymbol **) bfd_malloc (storage);
Nick Clifton cb347a
+  object_only_nsyms = bfd_canonicalize_symtab (nbfd, object_only_syms);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* FIXME: We waste some spaces if not all symbols are copied.  */
Nick Clifton cb347a
+  added_syms = (asymbol **) bfd_alloc (abfd, storage);
Nick Clifton cb347a
+  added_nsyms = 0;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Copy only global symbols from object only section.  */
Nick Clifton cb347a
+  for (i = 0; i < object_only_nsyms; i++)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      asection *sec = object_only_syms[i]->section;
Nick Clifton cb347a
+      flagword flags = object_only_syms[i]->flags;
Nick Clifton cb347a
+      asymbol *s;
Nick Clifton cb347a
+
Nick Clifton cb347a
+      if (bfd_is_com_section (sec))
Nick Clifton cb347a
+	sec = &bfd_plugin_fake_common_section;
Nick Clifton cb347a
+      else if (bfd_is_und_section (sec))
Nick Clifton cb347a
+	;
Nick Clifton cb347a
+      else if ((flags & (BSF_GLOBAL | BSF_WEAK | BSF_GNU_UNIQUE)) != 0)
Nick Clifton cb347a
+	sec = &bfd_plugin_fake_text_section;
Nick Clifton cb347a
+      else
Nick Clifton cb347a
+	continue;
Nick Clifton cb347a
+
Nick Clifton cb347a
+      s = bfd_alloc (abfd, sizeof (asymbol)); 
Nick Clifton cb347a
+      BFD_ASSERT (s);
Nick Clifton cb347a
+      added_syms[added_nsyms++] = s;
Nick Clifton cb347a
+
Nick Clifton cb347a
+      s->section = sec;
Nick Clifton cb347a
+      s->the_bfd = abfd;
Nick Clifton cb347a
+      s->name = xstrdup (object_only_syms[i]->name);
Nick Clifton cb347a
+      s->value = 0;
Nick Clifton cb347a
+      s->flags = flags;
Nick Clifton cb347a
+      s->udata.p = NULL;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  plugin_data->object_only_syms = added_syms;
Nick Clifton cb347a
+  plugin_data->object_only_nsyms = added_nsyms;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  free (object_only_syms);
Nick Clifton cb347a
+
Nick Clifton cb347a
+quit:
Nick Clifton cb347a
+  /* Close and remove the object only section file.  */
Nick Clifton cb347a
+  bfd_close (nbfd);
Nick Clifton cb347a
+  unlink (object_only_file);
Nick Clifton cb347a
+}
Nick Clifton cb347a
+
Nick Clifton cb347a
 static enum ld_plugin_status
Nick Clifton cb347a
 add_symbols (void * handle,
Nick Clifton cb347a
 	     int nsyms,
Nick Clifton cb8d97
@@ -140,11 +273,13 @@ add_symbols (void * handle,
Nick Clifton cb8d97
 
Nick Clifton cb347a
   plugin_data->nsyms = nsyms;
Nick Clifton cb347a
   plugin_data->syms = syms;
Nick Clifton cb8d97
+  abfd->tdata.plugin_data = plugin_data;
Nick Clifton cb8d97
+
Nick Clifton cb8d97
+  bfd_plugin_get_symbols_in_object_only (abfd);
Nick Clifton cb347a
 
Nick Clifton cb347a
-  if (nsyms != 0)
Nick Clifton cb347a
+  if ((nsyms + plugin_data->object_only_nsyms) != 0)
Nick Clifton cb347a
     abfd->flags |= HAS_SYMS;
Nick Clifton cb347a
 
Nick Clifton cb8d97
-  abfd->tdata.plugin_data = plugin_data;
Nick Clifton cb8d97
   return LDPS_OK;
Nick Clifton cb8d97
 }
Nick Clifton cb8d97
 
Nick Clifton cb347a
@@ -390,7 +525,8 @@ static long
Nick Clifton cb347a
 bfd_plugin_get_symtab_upper_bound (bfd *abfd)
Nick Clifton cb347a
 {
Nick Clifton cb347a
   struct plugin_data_struct *plugin_data = abfd->tdata.plugin_data;
Nick Clifton cb347a
-  long nsyms = plugin_data->nsyms;
Nick Clifton cb347a
+  /* Add symbols from object only section.  */
Nick Clifton cb347a
+  long nsyms = plugin_data->nsyms + plugin_data->object_only_nsyms;
Nick Clifton cb347a
 
Nick Clifton cb347a
   BFD_ASSERT (nsyms >= 0);
Nick Clifton cb347a
 
Nick Clifton cb347a
@@ -424,12 +560,7 @@ bfd_plugin_canonicalize_symtab (bfd *abf
Nick Clifton cb347a
   struct plugin_data_struct *plugin_data = abfd->tdata.plugin_data;
Nick Clifton cb347a
   long nsyms = plugin_data->nsyms;
Nick Clifton cb347a
   const struct ld_plugin_symbol *syms = plugin_data->syms;
Nick Clifton cb347a
-  static asection fake_section;
Nick Clifton cb347a
-  static asection fake_common_section;
Nick Clifton cb347a
-  int i;
Nick Clifton cb347a
-
Nick Clifton cb347a
-  fake_section.name = ".text";
Nick Clifton cb347a
-  fake_common_section.flags = SEC_IS_COMMON;
Nick Clifton cb347a
+  int i, j;
Nick Clifton cb347a
 
Nick Clifton cb347a
   for (i = 0; i < nsyms; i++)
Nick Clifton cb347a
     {
Nick Clifton cb347a
@@ -442,10 +573,11 @@ bfd_plugin_canonicalize_symtab (bfd *abf
Nick Clifton cb347a
       s->name = syms[i].name;
Nick Clifton cb347a
       s->value = 0;
Nick Clifton cb347a
       s->flags = convert_flags (&syms[i]);
Nick Clifton cb347a
+      s->udata.p = NULL;
Nick Clifton cb347a
       switch (syms[i].def)
Nick Clifton cb347a
 	{
Nick Clifton cb347a
 	case LDPK_COMMON:
Nick Clifton cb347a
-	  s->section = &fake_common_section;
Nick Clifton cb347a
+	  s->section = &bfd_plugin_fake_common_section;
Nick Clifton cb347a
 	  break;
Nick Clifton cb347a
 	case LDPK_UNDEF:
Nick Clifton cb347a
 	case LDPK_WEAKUNDEF:
Nick Clifton cb347a
@@ -453,15 +585,18 @@ bfd_plugin_canonicalize_symtab (bfd *abf
Nick Clifton cb347a
 	  break;
Nick Clifton cb347a
 	case LDPK_DEF:
Nick Clifton cb347a
 	case LDPK_WEAKDEF:
Nick Clifton cb347a
-	  s->section = &fake_section;
Nick Clifton cb347a
+	  s->section = &bfd_plugin_fake_text_section;
Nick Clifton cb347a
 	  break;
Nick Clifton cb347a
 	default:
Nick Clifton cb347a
 	  BFD_ASSERT (0);
Nick Clifton cb347a
 	}
Nick Clifton cb347a
-
Nick Clifton cb347a
-      s->udata.p = (void *) &syms[i];
Nick Clifton cb347a
     }
Nick Clifton cb347a
 
Nick Clifton cb347a
+  /* Copy symbols from object only section.  */
Nick Clifton cb347a
+  nsyms += plugin_data->object_only_nsyms;
Nick Clifton cb347a
+  for (j = 0; j < plugin_data->object_only_nsyms; j++, i++)
Nick Clifton cb347a
+    alocation[i] = plugin_data->object_only_syms[j];
Nick Clifton cb347a
+
Nick Clifton cb347a
   return nsyms;
Nick Clifton cb347a
 }
Nick Clifton cb347a
 
Nick Clifton cb8d97
diff -rup binutils-2.25/bfd/plugin.h binutils-2.25.patched/bfd/plugin.h
Nick Clifton cb8d97
--- binutils-2.25/bfd/plugin.h	2014-10-14 08:32:02.000000000 +0100
Nick Clifton cb8d97
+++ binutils-2.25.patched/bfd/plugin.h	2015-02-02 16:10:13.854438626 +0000
Nick Clifton cb347a
@@ -30,6 +30,8 @@ typedef struct plugin_data_struct
Nick Clifton cb347a
 {
Nick Clifton cb347a
   int nsyms;
Nick Clifton cb347a
   const struct ld_plugin_symbol *syms;
Nick Clifton cb347a
+  int object_only_nsyms;
Nick Clifton cb347a
+  asymbol **object_only_syms;
Nick Clifton cb347a
 }
Nick Clifton cb347a
 plugin_data_struct;
Nick Clifton cb347a
 
Nick Clifton cb8d97
diff -rup binutils-2.25/bfd/section.c binutils-2.25.patched/bfd/section.c
Nick Clifton cb8d97
--- binutils-2.25/bfd/section.c	2014-10-14 08:32:02.000000000 +0100
Nick Clifton cb8d97
+++ binutils-2.25.patched/bfd/section.c	2015-02-02 16:10:13.829438511 +0000
Nick Clifton cb347a
@@ -595,6 +595,9 @@ CODE_FRAGMENT
Nick Clifton cb347a
 .  || ((SEC) == bfd_com_section_ptr)		\
Nick Clifton cb347a
 .  || ((SEC) == bfd_ind_section_ptr))
Nick Clifton cb347a
 .
Nick Clifton cb347a
+.{* GNU object-only section name.  *}
Nick Clifton cb347a
+.#define GNU_OBJECT_ONLY_SECTION_NAME ".gnu_object_only"
Nick Clifton cb347a
+.
Nick Clifton cb347a
 .{* Macros to handle insertion and deletion of a bfd's sections.  These
Nick Clifton cb347a
 .   only handle the list pointers, ie. do not adjust section_count,
Nick Clifton cb347a
 .   target_index etc.  *}
Nick Clifton cb8d97
diff -rup binutils-2.25/binutils/objcopy.c binutils-2.25.patched/binutils/objcopy.c
Nick Clifton cb8d97
--- binutils-2.25/binutils/objcopy.c	2014-12-23 08:47:10.000000000 +0000
Nick Clifton cb8d97
+++ binutils-2.25.patched/binutils/objcopy.c	2015-02-02 16:10:13.883438759 +0000
Nick Clifton cb347a
@@ -1009,30 +1009,6 @@ is_specified_symbol (const char *name, h
Nick Clifton cb347a
   return htab_find (htab, name) != NULL;
Nick Clifton cb347a
 }
Nick Clifton cb347a
 
Nick Clifton cb347a
-/* Return a pointer to the symbol used as a signature for GROUP.  */
Nick Clifton cb347a
-
Nick Clifton cb347a
-static asymbol *
Nick Clifton cb347a
-group_signature (asection *group)
Nick Clifton cb347a
-{
Nick Clifton cb347a
-  bfd *abfd = group->owner;
Nick Clifton cb347a
-  Elf_Internal_Shdr *ghdr;
Nick Clifton cb347a
-
Nick Clifton cb347a
-  if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
Nick Clifton cb347a
-    return NULL;
Nick Clifton cb347a
-
Nick Clifton cb347a
-  ghdr = &elf_section_data (group)->this_hdr;
Nick Clifton cb347a
-  if (ghdr->sh_link < elf_numsections (abfd))
Nick Clifton cb347a
-    {
Nick Clifton cb347a
-      const struct elf_backend_data *bed = get_elf_backend_data (abfd);
Nick Clifton cb347a
-      Elf_Internal_Shdr *symhdr = elf_elfsections (abfd) [ghdr->sh_link];
Nick Clifton cb347a
-
Nick Clifton cb347a
-      if (symhdr->sh_type == SHT_SYMTAB
Nick Clifton cb347a
-	  && ghdr->sh_info < symhdr->sh_size / bed->s->sizeof_sym)
Nick Clifton cb347a
-	return isympp[ghdr->sh_info - 1];
Nick Clifton cb347a
-    }
Nick Clifton cb347a
-  return NULL;
Nick Clifton cb347a
-}
Nick Clifton cb347a
-
Nick Clifton cb347a
 /* Return TRUE if the section is a DWO section.  */
Nick Clifton cb347a
 
Nick Clifton cb347a
 static bfd_boolean
Nick Clifton cb347a
@@ -1114,7 +1090,7 @@ is_strip_section (bfd *abfd ATTRIBUTE_UN
Nick Clifton cb347a
       /* PR binutils/3181
Nick Clifton cb347a
 	 If we are going to strip the group signature symbol, then
Nick Clifton cb347a
 	 strip the group section too.  */
Nick Clifton cb347a
-      gsym = group_signature (sec);
Nick Clifton cb347a
+      gsym = bfd_group_signature (sec, isympp);
Nick Clifton cb347a
       if (gsym != NULL)
Nick Clifton cb347a
 	gname = gsym->name;
Nick Clifton cb347a
       else
Nick Clifton cb347a
@@ -2823,7 +2799,7 @@ setup_section (bfd *ibfd, sec_ptr isecti
Nick Clifton cb347a
 
Nick Clifton cb347a
   if ((isection->flags & SEC_GROUP) != 0)
Nick Clifton cb347a
     {
Nick Clifton cb347a
-      asymbol *gsym = group_signature (isection);
Nick Clifton cb347a
+      asymbol *gsym = bfd_group_signature (isection, isympp);
Nick Clifton cb347a
 
Nick Clifton cb347a
       if (gsym != NULL)
Nick Clifton cb347a
 	{
Nick Clifton cb8d97
diff -rup binutils-2.25/binutils/readelf.c binutils-2.25.patched/binutils/readelf.c
Nick Clifton cb8d97
--- binutils-2.25/binutils/readelf.c	2014-12-23 08:47:10.000000000 +0000
Nick Clifton cb8d97
+++ binutils-2.25.patched/binutils/readelf.c	2015-02-02 16:10:13.882438755 +0000
Nick Clifton cb347a
@@ -3624,6 +3624,7 @@ get_section_type_name (unsigned int sh_t
Nick Clifton cb347a
     case 0x7ffffffd:		return "AUXILIARY";
Nick Clifton cb347a
     case 0x7fffffff:		return "FILTER";
Nick Clifton cb347a
     case SHT_GNU_LIBLIST:	return "GNU_LIBLIST";
Nick Clifton cb347a
+    case SHT_GNU_OBJECT_ONLY:	return "GNU_OBJECT_ONLY";
Nick Clifton cb347a
 
Nick Clifton cb347a
     default:
Nick Clifton cb347a
       if ((sh_type >= SHT_LOPROC) && (sh_type <= SHT_HIPROC))
Nick Clifton cb8d97
diff -rup binutils-2.25/include/bfdlink.h binutils-2.25.patched/include/bfdlink.h
Nick Clifton cb8d97
--- binutils-2.25/include/bfdlink.h	2014-12-23 08:47:10.000000000 +0000
Nick Clifton cb8d97
+++ binutils-2.25.patched/include/bfdlink.h	2015-02-02 16:10:13.656437718 +0000
Nick Clifton cb347a
@@ -389,6 +389,12 @@ struct bfd_link_info
Nick Clifton cb347a
   /* TRUE if ok to have multiple definition.  */
Nick Clifton cb347a
   unsigned int allow_multiple_definition: 1;
Nick Clifton cb347a
 
Nick Clifton cb347a
+  /* TRUE if .gnu_object_only section should be created.  */
Nick Clifton cb347a
+  unsigned int emit_gnu_object_only: 1;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* TRUE if .gnu_object_only section is being created.  */
Nick Clifton cb347a
+  unsigned int emitting_gnu_object_only: 1;
Nick Clifton cb347a
+
Nick Clifton cb347a
   /* TRUE if ok to have version with no definition.  */
Nick Clifton cb347a
   unsigned int allow_undefined_version: 1;
Nick Clifton cb347a
 
Nick Clifton cb8d97
diff -rup binutils-2.25/include/elf/common.h binutils-2.25.patched/include/elf/common.h
Nick Clifton cb8d97
--- binutils-2.25/include/elf/common.h	2014-10-14 08:32:04.000000000 +0100
Nick Clifton cb8d97
+++ binutils-2.25.patched/include/elf/common.h	2015-02-02 16:10:13.650437690 +0000
Nick Clifton cb347a
@@ -472,6 +472,7 @@
Nick Clifton cb347a
 #define SHT_GNU_ATTRIBUTES 0x6ffffff5	/* Object attributes */
Nick Clifton cb347a
 #define SHT_GNU_HASH	0x6ffffff6	/* GNU style symbol hash table */
Nick Clifton cb347a
 #define SHT_GNU_LIBLIST	0x6ffffff7	/* List of prelink dependencies */
Nick Clifton cb347a
+#define SHT_GNU_OBJECT_ONLY 0x6ffffff8	/* Object only */
Nick Clifton cb347a
 
Nick Clifton cb347a
 /* The next three section types are defined by Solaris, and are named
Nick Clifton cb347a
    SHT_SUNW*.  We use them in GNU code, so we also define SHT_GNU*
Nick Clifton cb8d97
diff -rup binutils-2.25/ld/emultempl/alphaelf.em binutils-2.25.patched/ld/emultempl/alphaelf.em
Nick Clifton cb8d97
--- binutils-2.25/ld/emultempl/alphaelf.em	2014-10-14 08:32:04.000000000 +0100
Nick Clifton cb8d97
+++ binutils-2.25.patched/ld/emultempl/alphaelf.em	2015-02-02 16:10:13.667437768 +0000
Nick Clifton cb347a
@@ -100,7 +100,7 @@ alpha_finish (void)
Nick Clifton cb347a
   if (limit_32bit)
Nick Clifton cb347a
     elf_elfheader (link_info.output_bfd)->e_flags |= EF_ALPHA_32BIT;
Nick Clifton cb347a
 
Nick Clifton cb347a
-  finish_default ();
Nick Clifton cb347a
+  gld${EMULATION_NAME}_finish ();
Nick Clifton cb347a
 }
Nick Clifton cb347a
 EOF
Nick Clifton cb347a
 
Nick Clifton cb8d97
diff -rup binutils-2.25/ld/emultempl/armelf.em binutils-2.25.patched/ld/emultempl/armelf.em
Nick Clifton cb8d97
--- binutils-2.25/ld/emultempl/armelf.em	2014-10-14 08:32:04.000000000 +0100
Nick Clifton cb8d97
+++ binutils-2.25.patched/ld/emultempl/armelf.em	2015-02-02 16:10:13.668437773 +0000
Nick Clifton cb347a
@@ -370,7 +370,7 @@ gld${EMULATION_NAME}_after_allocation (v
Nick Clifton cb347a
 }
Nick Clifton cb347a
 
Nick Clifton cb347a
 static void
Nick Clifton cb347a
-gld${EMULATION_NAME}_finish (void)
Nick Clifton cb347a
+arm_finish (void)
Nick Clifton cb347a
 {
Nick Clifton cb347a
   struct bfd_link_hash_entry * h;
Nick Clifton cb347a
 
Nick Clifton cb347a
@@ -393,7 +393,7 @@ gld${EMULATION_NAME}_finish (void)
Nick Clifton cb347a
 	}
Nick Clifton cb347a
     }
Nick Clifton cb347a
 
Nick Clifton cb347a
-  finish_default ();
Nick Clifton cb347a
+  gld${EMULATION_NAME}_finish ();
Nick Clifton cb347a
 
Nick Clifton cb347a
   if (thumb_entry_symbol)
Nick Clifton cb347a
     {
Nick Clifton cb347a
@@ -702,4 +702,4 @@ LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=
Nick Clifton cb347a
 LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME}"_before_parse
Nick Clifton cb347a
 
Nick Clifton cb347a
 # Call the extra arm-elf function
Nick Clifton cb347a
-LDEMUL_FINISH=gld${EMULATION_NAME}_finish
Nick Clifton cb347a
+LDEMUL_FINISH=arm_finish
Nick Clifton cb8d97
diff -rup binutils-2.25/ld/emultempl/elf32.em binutils-2.25.patched/ld/emultempl/elf32.em
Nick Clifton cb8d97
--- binutils-2.25/ld/emultempl/elf32.em	2015-02-02 16:11:06.703681083 +0000
Nick Clifton cb8d97
+++ binutils-2.25.patched/ld/emultempl/elf32.em	2015-02-02 16:10:13.667437768 +0000
Nick Clifton cb347a
@@ -65,6 +65,7 @@ static void gld${EMULATION_NAME}_before_
Nick Clifton cb347a
 static void gld${EMULATION_NAME}_after_allocation (void);
Nick Clifton cb347a
 static lang_output_section_statement_type *gld${EMULATION_NAME}_place_orphan
Nick Clifton cb347a
   (asection *, const char *, int);
Nick Clifton cb347a
+static void gld${EMULATION_NAME}_finish (void);
Nick Clifton cb347a
 EOF
Nick Clifton cb347a
 
Nick Clifton cb347a
 if [ "x${USE_LIBPATH}" = xyes ] ; then
Nick Clifton cb347a
@@ -1730,6 +1731,8 @@ output_rel_find (asection *sec, int isdy
Nick Clifton cb347a
   return last;
Nick Clifton cb347a
 }
Nick Clifton cb347a
 
Nick Clifton cb347a
+static int orphan_init_done = 0;
Nick Clifton cb347a
+
Nick Clifton cb347a
 /* Place an orphan section.  We use this to put random SHF_ALLOC
Nick Clifton cb347a
    sections in the right segment.  */
Nick Clifton cb347a
 
Nick Clifton cb347a
@@ -1738,7 +1741,7 @@ gld${EMULATION_NAME}_place_orphan (asect
Nick Clifton cb347a
 				   const char *secname,
Nick Clifton cb347a
 				   int constraint)
Nick Clifton cb347a
 {
Nick Clifton cb347a
-  static struct orphan_save hold[] =
Nick Clifton cb347a
+  static struct orphan_save orig_hold[] =
Nick Clifton cb347a
     {
Nick Clifton cb347a
       { ".text",
Nick Clifton cb347a
 	SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE,
Nick Clifton cb347a
@@ -1768,6 +1771,7 @@ gld${EMULATION_NAME}_place_orphan (asect
Nick Clifton cb347a
 	SEC_HAS_CONTENTS,
Nick Clifton cb347a
 	0, 0, 0, 0 },
Nick Clifton cb347a
     };
Nick Clifton cb347a
+  static struct orphan_save hold[ARRAY_SIZE (orig_hold)];
Nick Clifton cb347a
   enum orphan_save_index
Nick Clifton cb347a
     {
Nick Clifton cb347a
       orphan_text = 0,
Nick Clifton cb347a
@@ -1780,7 +1784,6 @@ gld${EMULATION_NAME}_place_orphan (asect
Nick Clifton cb347a
       orphan_sdata,
Nick Clifton cb347a
       orphan_nonalloc
Nick Clifton cb347a
     };
Nick Clifton cb347a
-  static int orphan_init_done = 0;
Nick Clifton cb347a
   struct orphan_save *place;
Nick Clifton cb347a
   lang_output_section_statement_type *after;
Nick Clifton cb347a
   lang_output_section_statement_type *os;
Nick Clifton cb347a
@@ -1857,15 +1860,22 @@ gld${EMULATION_NAME}_place_orphan (asect
Nick Clifton cb347a
 
Nick Clifton cb347a
   if (!orphan_init_done)
Nick Clifton cb347a
     {
Nick Clifton cb347a
-      struct orphan_save *ho;
Nick Clifton cb347a
+      struct orphan_save *ho, *horig;
Nick Clifton cb347a
 
Nick Clifton cb347a
       for (ho = hold; ho < hold + sizeof (hold) / sizeof (hold[0]); ++ho)
Nick Clifton cb347a
+      for (ho = hold, horig = orig_hold;
Nick Clifton cb347a
+	   ho < hold + ARRAY_SIZE (hold);
Nick Clifton cb347a
+	   ++ho, ++horig)
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	  *ho = *horig;
Nick Clifton cb347a
+	  if (ho->name != NULL)
Nick Clifton cb347a
 	if (ho->name != NULL)
Nick Clifton cb347a
 	  {
Nick Clifton cb347a
 	    ho->os = lang_output_section_find (ho->name);
Nick Clifton cb347a
 	    if (ho->os != NULL && ho->os->flags == 0)
Nick Clifton cb347a
 	      ho->os->flags = ho->flags;
Nick Clifton cb347a
 	  }
Nick Clifton cb347a
+	}
Nick Clifton cb347a
       orphan_init_done = 1;
Nick Clifton cb347a
     }
Nick Clifton cb347a
 
Nick Clifton cb347a
@@ -1937,6 +1947,27 @@ gld${EMULATION_NAME}_place_orphan (asect
Nick Clifton cb347a
 EOF
Nick Clifton cb347a
 fi
Nick Clifton cb347a
 
Nick Clifton cb347a
+fragment <
Nick Clifton cb347a
+
Nick Clifton cb347a
+/* Final emulation specific call.  */
Nick Clifton cb347a
+
Nick Clifton cb347a
+static void
Nick Clifton cb347a
+gld${EMULATION_NAME}_finish (void)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+EOF
Nick Clifton cb347a
+if test x"$LDEMUL_PLACE_ORPHAN" != xgld"$EMULATION_NAME"_place_orphan; then
Nick Clifton cb347a
+fragment <
Nick Clifton cb347a
+  /* Support the object-only output.  */
Nick Clifton cb347a
+  if (link_info.emit_gnu_object_only)
Nick Clifton cb347a
+    orphan_init_done = 0;
Nick Clifton cb347a
+
Nick Clifton cb347a
+EOF
Nick Clifton cb347a
+fi
Nick Clifton cb347a
+fragment <
Nick Clifton cb347a
+  finish_default ();
Nick Clifton cb347a
+}
Nick Clifton cb347a
+EOF
Nick Clifton cb347a
+
Nick Clifton cb347a
 if test x"$LDEMUL_AFTER_ALLOCATION" != xgld"$EMULATION_NAME"_after_allocation; then
Nick Clifton cb347a
 fragment <
Nick Clifton cb347a
 
Nick Clifton cb347a
@@ -2505,7 +2536,7 @@ struct ld_emulation_xfer_struct ld_${EMU
Nick Clifton cb347a
   ${LDEMUL_GET_SCRIPT-gld${EMULATION_NAME}_get_script},
Nick Clifton cb347a
   "${EMULATION_NAME}",
Nick Clifton cb347a
   "${OUTPUT_FORMAT}",
Nick Clifton cb347a
-  ${LDEMUL_FINISH-finish_default},
Nick Clifton cb347a
+  ${LDEMUL_FINISH-gld${EMULATION_NAME}_finish},
Nick Clifton cb347a
   ${LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS-NULL},
Nick Clifton cb347a
   ${LDEMUL_OPEN_DYNAMIC_ARCHIVE-gld${EMULATION_NAME}_open_dynamic_archive},
Nick Clifton cb347a
   ${LDEMUL_PLACE_ORPHAN-gld${EMULATION_NAME}_place_orphan},
Nick Clifton cb8d97
diff -rup binutils-2.25/ld/emultempl/ppc64elf.em binutils-2.25.patched/ld/emultempl/ppc64elf.em
Nick Clifton cb8d97
--- binutils-2.25/ld/emultempl/ppc64elf.em	2014-12-23 08:47:10.000000000 +0000
Nick Clifton cb8d97
+++ binutils-2.25.patched/ld/emultempl/ppc64elf.em	2015-02-02 16:10:13.667437768 +0000
Nick Clifton cb347a
@@ -522,7 +522,7 @@ gld${EMULATION_NAME}_after_allocation (v
Nick Clifton cb347a
 /* Final emulation specific call.  */
Nick Clifton cb347a
 
Nick Clifton cb347a
 static void
Nick Clifton cb347a
-gld${EMULATION_NAME}_finish (void)
Nick Clifton cb347a
+ppc_finish (void)
Nick Clifton cb347a
 {
Nick Clifton cb347a
   char *msg = NULL;
Nick Clifton cb347a
   char *line, *endline;
Nick Clifton cb347a
@@ -554,7 +554,7 @@ gld${EMULATION_NAME}_finish (void)
Nick Clifton cb347a
     free (msg);
Nick Clifton cb347a
 
Nick Clifton cb347a
   ppc64_elf_restore_symbols (&link_info);
Nick Clifton cb347a
-  finish_default ();
Nick Clifton cb347a
+  gld${EMULATION_NAME}_finish ();
Nick Clifton cb347a
 }
Nick Clifton cb347a
 
Nick Clifton cb347a
 
Nick Clifton cb8d97
diff -rup binutils-2.25/ld/emultempl/spuelf.em binutils-2.25.patched/ld/emultempl/spuelf.em
Nick Clifton cb8d97
--- binutils-2.25/ld/emultempl/spuelf.em	2014-10-14 08:32:04.000000000 +0100
Nick Clifton cb8d97
+++ binutils-2.25.patched/ld/emultempl/spuelf.em	2015-02-02 16:10:13.667437768 +0000
Nick Clifton cb347a
@@ -416,7 +416,7 @@ spu_elf_relink (void)
Nick Clifton cb347a
 /* Final emulation specific call.  */
Nick Clifton cb347a
 
Nick Clifton cb347a
 static void
Nick Clifton cb347a
-gld${EMULATION_NAME}_finish (void)
Nick Clifton cb347a
+spu_finish (void)
Nick Clifton cb347a
 {
Nick Clifton cb347a
   if (is_spu_target ())
Nick Clifton cb347a
     {
Nick Clifton cb347a
@@ -432,7 +432,7 @@ gld${EMULATION_NAME}_finish (void)
Nick Clifton cb347a
 	einfo ("%P: --auto-overlay ignored with zero local store range\n");
Nick Clifton cb347a
     }
Nick Clifton cb347a
 
Nick Clifton cb347a
-  finish_default ();
Nick Clifton cb347a
+  gld${EMULATION_NAME}_finish ();
Nick Clifton cb347a
 }
Nick Clifton cb347a
 
Nick Clifton cb347a
 static char *
Nick Clifton cb347a
@@ -832,5 +832,5 @@ PARSE_AND_LIST_ARGS_CASES='
Nick Clifton cb347a
 
Nick Clifton cb347a
 LDEMUL_AFTER_OPEN=spu_after_open
Nick Clifton cb347a
 LDEMUL_BEFORE_ALLOCATION=spu_before_allocation
Nick Clifton cb347a
-LDEMUL_FINISH=gld${EMULATION_NAME}_finish
Nick Clifton cb347a
+LDEMUL_FINISH=spu_finish
Nick Clifton cb347a
 LDEMUL_CHOOSE_TARGET=gld${EMULATION_NAME}_choose_target
Nick Clifton cb8d97
diff -rup binutils-2.25/ld/ldlang.c binutils-2.25.patched/ld/ldlang.c
Nick Clifton cb8d97
--- binutils-2.25/ld/ldlang.c	2014-10-15 08:43:36.000000000 +0100
Nick Clifton cb8d97
+++ binutils-2.25.patched/ld/ldlang.c	2015-02-02 16:10:13.663437750 +0000
Nick Clifton cb347a
@@ -36,6 +36,7 @@
Nick Clifton cb347a
 #include "ldctor.h"
Nick Clifton cb347a
 #include "ldfile.h"
Nick Clifton cb347a
 #include "ldemul.h"
Nick Clifton cb347a
+#include "ldwrite.h"
Nick Clifton cb347a
 #include "fnmatch.h"
Nick Clifton cb347a
 #include "demangle.h"
Nick Clifton cb347a
 #include "hashtab.h"
Nick Clifton cb347a
@@ -45,6 +46,9 @@
Nick Clifton cb347a
 #include "plugin.h"
Nick Clifton cb347a
 #endif /* ENABLE_PLUGINS */
Nick Clifton cb347a
 
Nick Clifton cb347a
+/* FIXME: Put it here to avoid NAME conflict from ldgram.h.  */
Nick Clifton cb347a
+#include "elf-bfd.h"
Nick Clifton cb347a
+
Nick Clifton cb347a
 #ifndef offsetof
Nick Clifton cb347a
 #define offsetof(TYPE, MEMBER) ((size_t) & (((TYPE*) 0)->MEMBER))
Nick Clifton cb347a
 #endif
Nick Clifton cb347a
@@ -69,6 +73,9 @@ static lang_statement_list_type *stat_sa
Nick Clifton cb347a
 static lang_statement_list_type **stat_save_ptr = &stat_save[0];
Nick Clifton cb347a
 static struct unique_sections *unique_section_list;
Nick Clifton cb347a
 static struct asneeded_minfo *asneeded_list_head;
Nick Clifton cb347a
+static cmdline_list_type cmdline_object_only_file_list;
Nick Clifton cb347a
+static cmdline_list_type cmdline_object_only_archive_list;
Nick Clifton cb347a
+static cmdline_list_type cmdline_temp_object_only_list;
Nick Clifton cb347a
 
Nick Clifton cb347a
 /* Forward declarations.  */
Nick Clifton cb347a
 static void exp_init_os (etree_type *);
Nick Clifton cb347a
@@ -1221,14 +1232,17 @@ output_section_statement_table_free (voi
Nick Clifton cb347a
 /* Build enough state so that the parser can build its tree.  */
Nick Clifton cb347a
 
Nick Clifton cb347a
 void
Nick Clifton cb347a
-lang_init (void)
Nick Clifton cb347a
+lang_init (bfd_boolean object_only)
Nick Clifton cb347a
 {
Nick Clifton cb347a
-  obstack_begin (&stat_obstack, 1000);
Nick Clifton cb347a
+  if (!object_only)
Nick Clifton cb347a
+    obstack_begin (&stat_obstack, 1000);
Nick Clifton cb347a
 
Nick Clifton cb347a
   stat_ptr = &statement_list;
Nick Clifton cb347a
 
Nick Clifton cb347a
   output_section_statement_table_init ();
Nick Clifton cb347a
 
Nick Clifton cb347a
+  cmdline_lists_init ();
Nick Clifton cb347a
+
Nick Clifton cb347a
   lang_list_init (stat_ptr);
Nick Clifton cb347a
 
Nick Clifton cb347a
   lang_list_init (&input_file_chain);
Nick Clifton cb347a
@@ -2839,6 +2854,12 @@ load_symbols (lang_input_statement_type
Nick Clifton cb347a
 		  loaded = FALSE;
Nick Clifton cb347a
 		}
Nick Clifton cb347a
 
Nick Clifton cb347a
+	      if (link_info.emitting_gnu_object_only)
Nick Clifton cb347a
+		{
Nick Clifton cb347a
+		  if (!cmdline_on_object_only_archive_list_p (member))
Nick Clifton cb347a
+		    continue;
Nick Clifton cb347a
+		}
Nick Clifton cb347a
+
Nick Clifton cb347a
 	      subsbfd = member;
Nick Clifton cb347a
 	      if (!(*link_info.callbacks
Nick Clifton cb347a
 		    ->add_archive_element) (&link_info, member,
Nick Clifton cb347a
@@ -6740,7 +6761,37 @@ lang_process (void)
Nick Clifton cb347a
 	  open_input_bfds (statement_list.head, OPEN_BFD_RESCAN);
Nick Clifton cb347a
 	}
Nick Clifton cb347a
     }
Nick Clifton cb347a
+  else
Nick Clifton cb347a
 #endif /* ENABLE_PLUGINS */
Nick Clifton e37b50
+    if (bfd_link_relocatable (&link_info))
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      /* Check if .gnu_object_only section should be created.  */
Nick Clifton cb347a
+      bfd *p;
Nick Clifton cb347a
+      int object_type;
Nick Clifton cb347a
+
Nick Clifton cb347a
+      object_type = 0;
Nick Clifton cb347a
+      for (p = link_info.input_bfds; p != (bfd *) NULL; p = p->link.next)
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	  object_type |= 1 << p->lto_type;
Nick Clifton cb347a
+	  if ((object_type & (1 << lto_mixed_object)) != 0
Nick Clifton cb347a
+	      || ((object_type
Nick Clifton cb347a
+		   & (1 << lto_non_ir_object
Nick Clifton cb347a
+		      | 1 << lto_ir_object))
Nick Clifton cb347a
+		  == (1 << lto_non_ir_object | 1 << lto_ir_object)))
Nick Clifton cb347a
+	    {
Nick Clifton cb347a
+	      link_info.emit_gnu_object_only = TRUE;
Nick Clifton cb347a
+	      break;
Nick Clifton cb347a
+	    }
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+
Nick Clifton cb347a
+      if (trace_files
Nick Clifton cb347a
+	  && (cmdline_object_only_file_list.head
Nick Clifton cb347a
+	      || cmdline_object_only_archive_list.head))
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	  print_cmdline_list (cmdline_object_only_file_list.head);
Nick Clifton cb347a
+	  print_cmdline_list (cmdline_object_only_archive_list.head);
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+    }
Nick Clifton cb347a
 
Nick Clifton cb347a
   link_info.gc_sym_list = &entry_symbol;
Nick Clifton cb347a
   if (entry_symbol.name == NULL)
Nick Clifton e37b50
diff -rup binutils-2.25/ld/ldlang.h binutils-2.25.patched/ld/ldlang.h
Nick Clifton e37b50
--- binutils-2.25/ld/ldlang.h	2014-10-14 08:32:04.000000000 +0100
Nick Clifton e37b50
+++ binutils-2.25.patched/ld/ldlang.h	2015-02-02 16:10:13.668437773 +0000
Nick Clifton e37b50
@@ -523,7 +523,7 @@ extern struct asneeded_minfo **asneeded_
Nick Clifton e37b50
 extern void (*output_bfd_hash_table_free_fn) (struct bfd_link_hash_table *);
Nick Clifton e37b50
 
Nick Clifton e37b50
 extern void lang_init
Nick Clifton e37b50
-  (void);
Nick Clifton e37b50
+  (bfd_boolean);
Nick Clifton e37b50
 extern void lang_finish
Nick Clifton e37b50
   (void);
Nick Clifton e37b50
 extern lang_memory_region_type * lang_memory_region_lookup
Nick Clifton e37b50
diff -rup binutils-2.25/ld/ldlex.h binutils-2.25.patched/ld/ldlex.h
Nick Clifton e37b50
--- binutils-2.25/ld/ldlex.h	2014-11-04 09:54:41.000000000 +0000
Nick Clifton e37b50
+++ binutils-2.25.patched/ld/ldlex.h	2015-02-02 16:10:13.670437782 +0000
Nick Clifton e37b50
@@ -133,6 +133,7 @@ enum option_values
Nick Clifton e37b50
 #ifdef ENABLE_PLUGINS
Nick Clifton e37b50
   OPTION_PLUGIN,
Nick Clifton e37b50
   OPTION_PLUGIN_OPT,
Nick Clifton e37b50
+  OPTION_PLUGIN_SAVE_TEMPS,
Nick Clifton e37b50
 #endif /* ENABLE_PLUGINS */
Nick Clifton e37b50
   OPTION_DEFAULT_SCRIPT,
Nick Clifton e37b50
   OPTION_PRINT_OUTPUT_FORMAT,
Nick Clifton e37b50
diff -rup binutils-2.25/ld/ldmain.c binutils-2.25.patched/ld/ldmain.c
Nick Clifton e37b50
--- binutils-2.25/ld/ldmain.c	2014-10-14 08:32:04.000000000 +0100
Nick Clifton e37b50
+++ binutils-2.25.patched/ld/ldmain.c	2015-02-02 16:10:13.665437759 +0000
Nick Clifton e37b50
@@ -220,6 +220,9 @@ main (int argc, char **argv)
Nick Clifton e37b50
 
Nick Clifton e37b50
   xatexit (ld_cleanup);
Nick Clifton e37b50
 
Nick Clifton e37b50
+  /* Remove temporary object-only files.  */
Nick Clifton e37b50
+  xatexit (cmdline_remove_object_only_files);
Nick Clifton e37b50
+
Nick Clifton e37b50
   /* Set up the sysroot directory.  */
Nick Clifton e37b50
   ld_sysroot = get_sysroot (argc, argv);
Nick Clifton e37b50
   if (*ld_sysroot)
Nick Clifton e37b50
@@ -296,7 +299,7 @@ main (int argc, char **argv)
Nick Clifton e37b50
   default_target = ldemul_choose_target (argc, argv);
Nick Clifton e37b50
   config.maxpagesize = bfd_emul_get_maxpagesize (default_target);
Nick Clifton e37b50
   config.commonpagesize = bfd_emul_get_commonpagesize (default_target);
Nick Clifton e37b50
-  lang_init ();
Nick Clifton e37b50
+  lang_init (FALSE);
Nick Clifton e37b50
   ldexp_init ();
Nick Clifton e37b50
   ldemul_before_parse ();
Nick Clifton e37b50
   lang_has_input_file = FALSE;
Nick Clifton e37b50
@@ -311,34 +314,7 @@ main (int argc, char **argv)
Nick Clifton e37b50
 
Nick Clifton e37b50
   ldemul_set_symbols ();
Nick Clifton e37b50
 
Nick Clifton e37b50
-  /* If we have not already opened and parsed a linker script,
Nick Clifton e37b50
-     try the default script from command line first.  */
Nick Clifton e37b50
-  if (saved_script_handle == NULL
Nick Clifton e37b50
-      && command_line.default_script != NULL)
Nick Clifton e37b50
-    {
Nick Clifton e37b50
-      ldfile_open_command_file (command_line.default_script);
Nick Clifton e37b50
-      parser_input = input_script;
Nick Clifton e37b50
-      yyparse ();
Nick Clifton e37b50
-    }
Nick Clifton e37b50
-
Nick Clifton e37b50
-  /* If we have not already opened and parsed a linker script
Nick Clifton e37b50
-     read the emulation's appropriate default script.  */
Nick Clifton e37b50
-  if (saved_script_handle == NULL)
Nick Clifton e37b50
-    {
Nick Clifton e37b50
-      int isfile;
Nick Clifton e37b50
-      char *s = ldemul_get_script (&isfile);
Nick Clifton e37b50
-
Nick Clifton e37b50
-      if (isfile)
Nick Clifton e37b50
-	ldfile_open_default_command_file (s);
Nick Clifton e37b50
-      else
Nick Clifton e37b50
-	{
Nick Clifton e37b50
-	  lex_string = s;
Nick Clifton e37b50
-	  lex_redirect (s, _("built in linker script"), 1);
Nick Clifton e37b50
-	}
Nick Clifton e37b50
-      parser_input = input_script;
Nick Clifton e37b50
-      yyparse ();
Nick Clifton e37b50
-      lex_string = NULL;
Nick Clifton e37b50
-    }
Nick Clifton e37b50
+  ld_parse_linker_script ();
Nick Clifton e37b50
 
Nick Clifton e37b50
   if (verbose)
Nick Clifton e37b50
     {
Nick Clifton e37b50
@@ -459,6 +435,8 @@ main (int argc, char **argv)
Nick Clifton e37b50
       if (! bfd_close (link_info.output_bfd))
Nick Clifton e37b50
 	einfo (_("%F%B: final close failed: %E\n"), link_info.output_bfd);
Nick Clifton e37b50
 
Nick Clifton e37b50
+      link_info.output_bfd = NULL;
Nick Clifton e37b50
+
Nick Clifton e37b50
       /* If the --force-exe-suffix is enabled, and we're making an
Nick Clifton e37b50
 	 executable file and it doesn't end in .exe, copy it to one
Nick Clifton e37b50
 	 which does.  */
Nick Clifton e37b50
@@ -505,6 +483,9 @@ main (int argc, char **argv)
Nick Clifton e37b50
 	}
Nick Clifton cb347a
     }
Nick Clifton e37b50
 
Nick Clifton e37b50
+  if (link_info.emit_gnu_object_only)
Nick Clifton e37b50
+    cmdline_emit_object_only_section ();
Nick Clifton cb347a
+
Nick Clifton e37b50
   END_PROGRESS (program_name);
Nick Clifton e37b50
 
Nick Clifton e37b50
   if (config.stats)
Nick Clifton e37b50
@@ -1207,7 +1190,8 @@ warning_callback (struct bfd_link_info *
Nick Clifton e37b50
     einfo ("%P: %s%s\n", _("warning: "), warning);
Nick Clifton e37b50
   else if (symbol == NULL)
Nick Clifton e37b50
     einfo ("%B: %s%s\n", abfd, _("warning: "), warning);
Nick Clifton e37b50
-  else if (! symbol_warning (warning, symbol, abfd))
Nick Clifton e37b50
+  else if (((abfd->flags & BFD_PLUGIN) == 0)
Nick Clifton e37b50
+	   && ! symbol_warning (warning, symbol, abfd))
Nick Clifton e37b50
     {
Nick Clifton e37b50
       bfd *b;
Nick Clifton e37b50
       /* Search all input files for a reference to SYMBOL.  */
Nick Clifton e37b50
@@ -1493,3 +1477,38 @@ notice (struct bfd_link_info *info,
Nick Clifton e37b50
 
Nick Clifton e37b50
   return TRUE;
Nick Clifton e37b50
 }
Nick Clifton cb347a
+
Nick Clifton e37b50
+/* Parse the linker script.   */
Nick Clifton cb347a
+
Nick Clifton e37b50
+void
Nick Clifton e37b50
+ld_parse_linker_script (void)
Nick Clifton cb347a
+{
Nick Clifton e37b50
+  /* If we have not already opened and parsed a linker script,
Nick Clifton e37b50
+     try the default script from command line first.  */
Nick Clifton e37b50
+  if (saved_script_handle == NULL
Nick Clifton e37b50
+      && command_line.default_script != NULL)
Nick Clifton cb347a
+    {
Nick Clifton e37b50
+      ldfile_open_command_file (command_line.default_script);
Nick Clifton e37b50
+      parser_input = input_script;
Nick Clifton e37b50
+      yyparse ();
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton e37b50
+  /* If we have not already opened and parsed a linker script
Nick Clifton e37b50
+     read the emulation's appropriate default script.  */
Nick Clifton e37b50
+  if (saved_script_handle == NULL)
Nick Clifton e37b50
+    {
Nick Clifton e37b50
+      int isfile;
Nick Clifton e37b50
+      char *s = ldemul_get_script (&isfile);
Nick Clifton cb347a
+
Nick Clifton e37b50
+      if (isfile)
Nick Clifton e37b50
+	ldfile_open_default_command_file (s);
Nick Clifton e37b50
+      else
Nick Clifton e37b50
+	{
Nick Clifton e37b50
+	  lex_string = s;
Nick Clifton e37b50
+	  lex_redirect (s, _("built in linker script"), 1);
Nick Clifton e37b50
+	}
Nick Clifton e37b50
+      parser_input = input_script;
Nick Clifton e37b50
+      yyparse ();
Nick Clifton e37b50
+      lex_string = NULL;
Nick Clifton e37b50
+    }
Nick Clifton e37b50
+}
Nick Clifton e37b50
diff -rup binutils-2.25/ld/ldmain.h binutils-2.25.patched/ld/ldmain.h
Nick Clifton e37b50
--- binutils-2.25/ld/ldmain.h	2014-10-14 08:32:04.000000000 +0100
Nick Clifton e37b50
+++ binutils-2.25.patched/ld/ldmain.h	2015-02-02 16:10:13.665437759 +0000
Nick Clifton e37b50
@@ -59,4 +59,6 @@ extern void add_wrap (const char *);
Nick Clifton e37b50
 extern void add_ignoresym (struct bfd_link_info *, const char *);
Nick Clifton e37b50
 extern void add_keepsyms_file (const char *);
Nick Clifton e37b50
 
Nick Clifton e37b50
+extern void ld_parse_linker_script (void);
Nick Clifton e37b50
+
Nick Clifton e37b50
 #endif
Nick Clifton e37b50
diff -rup binutils-2.25/ld/lexsup.c binutils-2.25.patched/ld/lexsup.c
Nick Clifton e37b50
--- binutils-2.25/ld/lexsup.c	2014-11-04 09:54:41.000000000 +0000
Nick Clifton e37b50
+++ binutils-2.25.patched/ld/lexsup.c	2015-02-02 16:10:13.809438420 +0000
Nick Clifton e37b50
@@ -166,6 +166,9 @@ static const struct ld_option ld_options
Nick Clifton e37b50
     '\0', N_("PLUGIN"), N_("Load named plugin"), ONE_DASH },
Nick Clifton e37b50
   { {"plugin-opt", required_argument, NULL, OPTION_PLUGIN_OPT},
Nick Clifton e37b50
     '\0', N_("ARG"), N_("Send arg to last-loaded plugin"), ONE_DASH },
Nick Clifton e37b50
+  { {"plugin-save-temps", no_argument, NULL, OPTION_PLUGIN_SAVE_TEMPS},
Nick Clifton e37b50
+    '\0', NULL, N_("Store plugin intermediate files permanently"),
Nick Clifton e37b50
+    ONE_DASH },
Nick Clifton e37b50
   { {"flto", optional_argument, NULL, OPTION_IGNORE},
Nick Clifton e37b50
     '\0', NULL, N_("Ignored for GCC LTO option compatibility"),
Nick Clifton e37b50
     ONE_DASH },
Nick Clifton e37b50
diff -rup binutils-2.25/ld/plugin.c binutils-2.25.patched/ld/plugin.c
Nick Clifton e37b50
--- binutils-2.25/ld/plugin.c	2014-10-14 08:32:04.000000000 +0100
Nick Clifton e37b50
+++ binutils-2.25.patched/ld/plugin.c	2015-02-02 16:10:13.669437777 +0000
Nick Clifton e37b50
@@ -39,6 +39,9 @@
Nick Clifton e37b50
 /* Report plugin symbols.  */
Nick Clifton e37b50
 bfd_boolean report_plugin_symbols;
Nick Clifton e37b50
 
Nick Clifton e37b50
+/* Store plugin intermediate files permanently.  */
Nick Clifton e37b50
+bfd_boolean plugin_save_temps;
Nick Clifton e37b50
+
Nick Clifton e37b50
 /* The suffix to append to the name of the real (claimed) object file
Nick Clifton e37b50
    when generating a dummy BFD to hold the IR symbols sent from the
Nick Clifton e37b50
    plugin.  For cosmetic use only; appears in maps, crefs etc.  */
Nick Clifton e37b50
@@ -229,6 +232,17 @@ plugin_opt_plugin_arg (const char *arg)
Nick Clifton e37b50
 	return 0;
Nick Clifton e37b50
     }
Nick Clifton e37b50
 
Nick Clifton e37b50
+  /* Ignore -pass-through= from GCC driver.  */
Nick Clifton e37b50
+  if (*arg == '-')
Nick Clifton e37b50
+    {
Nick Clifton e37b50
+      const char *p;
Nick Clifton e37b50
+      for (p = arg + 1; p; p++)
Nick Clifton e37b50
+	if (*p != '-')
Nick Clifton e37b50
+	  break;
Nick Clifton e37b50
+      if (strncmp (p, "pass-through=", 13) == 0)
Nick Clifton e37b50
+	return 0;
Nick Clifton e37b50
+    }
Nick Clifton e37b50
+
Nick Clifton e37b50
   newarg = xmalloc (sizeof *newarg);
Nick Clifton e37b50
   newarg->arg = arg;
Nick Clifton e37b50
   newarg->next = NULL;
Nick Clifton e37b50
@@ -935,14 +952,17 @@ plugin_call_cleanup (void)
Nick Clifton e37b50
     {
Nick Clifton e37b50
       if (curplug->cleanup_handler && !curplug->cleanup_done)
Nick Clifton e37b50
 	{
Nick Clifton e37b50
-	  enum ld_plugin_status rv;
Nick Clifton e37b50
-	  curplug->cleanup_done = TRUE;
Nick Clifton e37b50
-	  called_plugin = curplug;
Nick Clifton e37b50
-	  rv = (*curplug->cleanup_handler) ();
Nick Clifton e37b50
-	  called_plugin = NULL;
Nick Clifton e37b50
-	  if (rv != LDPS_OK)
Nick Clifton e37b50
-	    info_msg (_("%P: %s: error in plugin cleanup: %d (ignored)\n"),
Nick Clifton e37b50
-		      curplug->name, rv);
Nick Clifton e37b50
+	  if (!plugin_save_temps)
Nick Clifton e37b50
+	    {
Nick Clifton e37b50
+	      enum ld_plugin_status rv;
Nick Clifton e37b50
+	      curplug->cleanup_done = TRUE;
Nick Clifton e37b50
+	      called_plugin = curplug;
Nick Clifton e37b50
+	      rv = (*curplug->cleanup_handler) ();
Nick Clifton e37b50
+	      called_plugin = NULL;
Nick Clifton e37b50
+	      if (rv != LDPS_OK)
Nick Clifton e37b50
+		info_msg (_("%P: %s: error in plugin cleanup: %d (ignored)\n"),
Nick Clifton e37b50
+			  curplug->name, rv);
Nick Clifton e37b50
+	    }
Nick Clifton e37b50
 	  dlclose (curplug->dlhandle);
Nick Clifton e37b50
 	}
Nick Clifton e37b50
       curplug = curplug->next;
Nick Clifton e37b50
diff -rup binutils-2.25/ld/plugin.h binutils-2.25.patched/ld/plugin.h
Nick Clifton e37b50
--- binutils-2.25/ld/plugin.h	2014-10-14 08:32:04.000000000 +0100
Nick Clifton e37b50
+++ binutils-2.25.patched/ld/plugin.h	2015-02-02 16:10:13.668437773 +0000
Nick Clifton e37b50
@@ -24,6 +24,9 @@
Nick Clifton e37b50
 /* Report plugin symbols.  */
Nick Clifton e37b50
 extern bfd_boolean report_plugin_symbols;
Nick Clifton e37b50
 
Nick Clifton e37b50
+/* Store plugin intermediate files permanently.  */
Nick Clifton e37b50
+extern bfd_boolean plugin_save_temps;
Nick Clifton e37b50
+
Nick Clifton e37b50
 /* Set at all symbols read time, to avoid recursively offering the plugin
Nick Clifton e37b50
    its own newly-added input files and libs to claim.  */
Nick Clifton e37b50
 extern bfd_boolean no_more_claiming;
Nick Clifton e37b50
diff -rup binutils-2.25/ld/scripttempl/armbpabi.sc binutils-2.25.patched/ld/scripttempl/armbpabi.sc
Nick Clifton e37b50
--- binutils-2.25/ld/scripttempl/armbpabi.sc	2014-10-14 08:32:04.000000000 +0100
Nick Clifton e37b50
+++ binutils-2.25.patched/ld/scripttempl/armbpabi.sc	2015-02-02 16:10:13.660437736 +0000
Nick Clifton e37b50
@@ -36,7 +36,7 @@ INTERP=".interp       0 : { *(.interp) }
Nick Clifton e37b50
 PLT=".plt          ${RELOCATING-0} : { *(.plt) }"
Nick Clifton e37b50
 RODATA=".rodata       ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
Nick Clifton e37b50
 DATARELRO=".data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro .data.rel.ro.*) }"
Nick Clifton e37b50
-DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink)  *(.gnu.lto_*) }"
Nick Clifton e37b50
+DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) *(.gnu_object_only) }"
Nick Clifton e37b50
 if test -z "${NO_SMALL_DATA}"; then
Nick Clifton e37b50
   SBSS=".sbss         ${RELOCATING-0} :
Nick Clifton e37b50
   {
Nick Clifton e37b50
diff -rup binutils-2.25/ld/scripttempl/elf32sh-symbian.sc binutils-2.25.patched/ld/scripttempl/elf32sh-symbian.sc
Nick Clifton e37b50
--- binutils-2.25/ld/scripttempl/elf32sh-symbian.sc	2014-10-14 08:32:04.000000000 +0100
Nick Clifton e37b50
+++ binutils-2.25.patched/ld/scripttempl/elf32sh-symbian.sc	2015-02-02 16:10:13.660437736 +0000
Nick Clifton e37b50
@@ -88,7 +88,7 @@ fi
Nick Clifton e37b50
     PLT=".plt            : { *(.plt) } :dynamic :dyn"
Nick Clifton e37b50
 DYNAMIC=".dynamic        : { *(.dynamic) } :dynamic :dyn"
Nick Clifton e37b50
  RODATA=".rodata    ALIGN(4) : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
Nick Clifton e37b50
-DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.directive)  *(.gnu.lto_*) }"
Nick Clifton e37b50
+DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.directive)  *(.gnu.lto_*) *(.gnu_object_only) }"
Nick Clifton e37b50
 test -z "$GOT" && GOT=".got          ${RELOCATING-0} : { *(.got.plt) *(.got) } :dynamic :dyn"
Nick Clifton e37b50
 INIT_ARRAY=".init_array   ${RELOCATING-0} :
Nick Clifton e37b50
   {
Nick Clifton e37b50
diff -rup binutils-2.25/ld/scripttempl/elf64hppa.sc binutils-2.25.patched/ld/scripttempl/elf64hppa.sc
Nick Clifton e37b50
--- binutils-2.25/ld/scripttempl/elf64hppa.sc	2014-10-14 08:32:04.000000000 +0100
Nick Clifton e37b50
+++ binutils-2.25.patched/ld/scripttempl/elf64hppa.sc	2015-02-02 16:10:13.662437745 +0000
Nick Clifton e37b50
@@ -132,7 +132,7 @@ fi
Nick Clifton e37b50
 DYNAMIC=".dynamic      ${RELOCATING-0} : { *(.dynamic) }"
Nick Clifton e37b50
 RODATA=".rodata       ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
Nick Clifton e37b50
 DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }"
Nick Clifton e37b50
-DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink)  *(.gnu.lto_*) }"
Nick Clifton e37b50
+DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) *(.gnu_object_only) }"
Nick Clifton e37b50
 if test -z "${NO_SMALL_DATA}"; then
Nick Clifton e37b50
   SBSS=".sbss         ${RELOCATING-0} :
Nick Clifton e37b50
   {
Nick Clifton e37b50
diff -rup binutils-2.25/ld/scripttempl/elf.sc binutils-2.25.patched/ld/scripttempl/elf.sc
Nick Clifton e37b50
--- binutils-2.25/ld/scripttempl/elf.sc	2014-10-14 08:32:04.000000000 +0100
Nick Clifton e37b50
+++ binutils-2.25.patched/ld/scripttempl/elf.sc	2015-02-02 16:10:13.660437736 +0000
Nick Clifton e37b50
@@ -165,7 +165,7 @@ RELA_IPLT=".rela.iplt    ${RELOCATING-0}
Nick Clifton e37b50
 DYNAMIC=".dynamic      ${RELOCATING-0} : { *(.dynamic) }"
Nick Clifton e37b50
 RODATA=".${RODATA_NAME}       ${RELOCATING-0} : { *(.${RODATA_NAME}${RELOCATING+ .${RODATA_NAME}.* .gnu.linkonce.r.*}) }"
Nick Clifton e37b50
 DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }"
Nick Clifton e37b50
-DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }"
Nick Clifton e37b50
+DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) *(.gnu_object_only) }"
Nick Clifton e37b50
 if test -z "${NO_SMALL_DATA}"; then
Nick Clifton e37b50
   SBSS=".${SBSS_NAME}         ${RELOCATING-0} :
Nick Clifton e37b50
   {
Nick Clifton e37b50
diff -rup binutils-2.25/ld/scripttempl/elfxtensa.sc binutils-2.25.patched/ld/scripttempl/elfxtensa.sc
Nick Clifton e37b50
--- binutils-2.25/ld/scripttempl/elfxtensa.sc	2014-10-14 08:32:04.000000000 +0100
Nick Clifton e37b50
+++ binutils-2.25.patched/ld/scripttempl/elfxtensa.sc	2015-02-02 16:10:13.661437741 +0000
Nick Clifton e37b50
@@ -145,7 +145,7 @@ fi
Nick Clifton e37b50
 DYNAMIC=".dynamic      ${RELOCATING-0} : { *(.dynamic) }"
Nick Clifton e37b50
 RODATA=".rodata       ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
Nick Clifton e37b50
 DATARELRO=".data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }"
Nick Clifton e37b50
-DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink)  *(.gnu.lto_*) }"
Nick Clifton e37b50
+DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) *(.gnu_object_only) }"
Nick Clifton e37b50
 INIT_LIT=".init.literal 0 : { *(.init.literal)	}"
Nick Clifton e37b50
 INIT=".init         0 : { *(.init)		}"
Nick Clifton e37b50
 FINI_LIT=".fini.literal 0 : { *(.fini.literal)	}"
Nick Clifton e37b50
diff -rup binutils-2.25/ld/scripttempl/mep.sc binutils-2.25.patched/ld/scripttempl/mep.sc
Nick Clifton e37b50
--- binutils-2.25/ld/scripttempl/mep.sc	2014-10-14 08:32:04.000000000 +0100
Nick Clifton e37b50
+++ binutils-2.25.patched/ld/scripttempl/mep.sc	2015-02-02 16:10:13.662437745 +0000
Nick Clifton e37b50
@@ -119,7 +119,7 @@ fi
Nick Clifton e37b50
 DYNAMIC=".dynamic      ${RELOCATING-0} : { *(.dynamic) }"
Nick Clifton e37b50
 RODATA=".rodata       ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
Nick Clifton e37b50
 DATARELRO=".data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro .data.rel.ro.*) }"
Nick Clifton e37b50
-DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink)  *(.gnu.lto_*) }"
Nick Clifton e37b50
+DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) *(.gnu_object_only) }"
Nick Clifton e37b50
 if test -z "${NO_SMALL_DATA}"; then
Nick Clifton e37b50
   SBSS=".sbss         ${RELOCATING-0} :
Nick Clifton e37b50
   {
Nick Clifton e37b50
diff -rup binutils-2.25/ld/scripttempl/pep.sc binutils-2.25.patched/ld/scripttempl/pep.sc
Nick Clifton e37b50
--- binutils-2.25/ld/scripttempl/pep.sc	2014-10-14 08:32:04.000000000 +0100
Nick Clifton e37b50
+++ binutils-2.25.patched/ld/scripttempl/pep.sc	2015-02-02 16:10:13.660437736 +0000
Nick Clifton e37b50
@@ -170,6 +170,7 @@ SECTIONS
Nick Clifton e37b50
     *(.drectve)
Nick Clifton e37b50
     ${RELOCATING+ *(.note.GNU-stack)}
Nick Clifton e37b50
     ${RELOCATING+ *(.gnu.lto_*)}
Nick Clifton e37b50
+    ${RELOCATING+ *(.gnu_object_only)}
Nick Clifton e37b50
   }
Nick Clifton e37b50
 
Nick Clifton e37b50
   .idata ${RELOCATING+BLOCK(__section_alignment__)} :
Nick Clifton e37b50
diff -rup binutils-2.25/ld/scripttempl/pe.sc binutils-2.25.patched/ld/scripttempl/pe.sc
Nick Clifton e37b50
--- binutils-2.25/ld/scripttempl/pe.sc	2014-10-14 08:32:04.000000000 +0100
Nick Clifton e37b50
+++ binutils-2.25.patched/ld/scripttempl/pe.sc	2015-02-02 16:10:13.662437745 +0000
Nick Clifton e37b50
@@ -165,6 +165,7 @@ SECTIONS
Nick Clifton e37b50
     *(.drectve)
Nick Clifton e37b50
     ${RELOCATING+ *(.note.GNU-stack)}
Nick Clifton e37b50
     ${RELOCATING+ *(.gnu.lto_*)}
Nick Clifton e37b50
+    ${RELOCATING+ *(.gnu_object_only)}
Nick Clifton e37b50
   }
Nick Clifton e37b50
 
Nick Clifton e37b50
   .idata ${RELOCATING+BLOCK(__section_alignment__)} :
Nick Clifton e37b50
--- binutils-2.26.orig/ld/plugin.c	2016-01-25 10:28:36.904576217 +0000
Nick Clifton e37b50
+++ binutils-2.26/ld/plugin.c	2016-01-25 10:47:19.864448255 +0000
Nick Clifton e37b50
@@ -1196,6 +1196,9 @@ plugin_maybe_claim (lang_input_statement
Nick Clifton e37b50
     {
Nick Clifton e37b50
       bfd *abfd = entry->the_bfd->plugin_dummy_bfd;
Nick Clifton e37b50
 
Nick Clifton e37b50
+      /* Check object only section.  */
Nick Clifton e37b50
+      cmdline_check_object_only_section (entry->the_bfd, TRUE);
Nick Clifton e37b50
+
Nick Clifton e37b50
       /* Discard the real file's BFD and substitute the dummy one.  */
Nick Clifton e37b50
 
Nick Clifton e37b50
       /* BFD archive handling caches elements so we can't call
Nick Clifton e37b50
--- binutils-2.26.orig/ld/lexsup.c	2016-01-25 10:28:36.904576217 +0000
Nick Clifton e37b50
+++ binutils-2.26/ld/lexsup.c	2016-01-25 10:45:22.879732578 +0000
Nick Clifton e37b50
@@ -1023,6 +1023,9 @@ parse_args (unsigned argc, char **argv)
Nick Clifton e37b50
 	  if (plugin_opt_plugin_arg (optarg))
Nick Clifton e37b50
 	    einfo (_("%P%F: bad -plugin-opt option\n"));
Nick Clifton e37b50
 	  break;
Nick Clifton e37b50
+	case OPTION_PLUGIN_SAVE_TEMPS:
Nick Clifton e37b50
+	  plugin_save_temps = TRUE;
Nick Clifton e37b50
+	  break;
Nick Clifton e37b50
 #endif /* ENABLE_PLUGINS */
Nick Clifton e37b50
 	case 'q':
Nick Clifton e37b50
 	  link_info.emitrelocations = TRUE;
Nick Clifton e37b50
--- binutils-2.26.orig/ld/ldmain.c	2016-01-25 10:28:36.904576217 +0000
Nick Clifton e37b50
+++ binutils-2.26/ld/ldmain.c	2016-01-25 10:44:07.086268897 +0000
Nick Clifton e37b50
@@ -786,7 +786,9 @@ add_archive_element (struct bfd_link_inf
Nick Clifton e37b50
 	  *subsbfd = input->the_bfd;
Nick Clifton e37b50
 	}
Nick Clifton e37b50
     }
Nick Clifton e37b50
+  else
Nick Clifton e37b50
 #endif /* ENABLE_PLUGINS */
Nick Clifton e37b50
+    cmdline_check_object_only_section (input->the_bfd, FALSE);
Nick Clifton e37b50
 
Nick Clifton e37b50
   ldlang_add_file (input);
Nick Clifton e37b50
 
Nick Clifton e37b50
--- binutils-2.26.orig/ld/ldlang.h	2016-01-25 10:28:36.904576217 +0000
Nick Clifton e37b50
+++ binutils-2.26/ld/ldlang.h	2016-01-25 10:42:57.531843385 +0000
Nick Clifton e37b50
@@ -693,4 +693,45 @@ lang_ld_feature (char *);
Nick Clifton e37b50
 extern void
Nick Clifton e37b50
 lang_print_memory_usage (void);
Nick Clifton e37b50
 
Nick Clifton e37b50
+typedef enum
Nick Clifton e37b50
+{
Nick Clifton e37b50
+  cmdline_is_file_enum,
Nick Clifton e37b50
+  cmdline_is_bfd_enum
Nick Clifton e37b50
+} cmdline_enum_type;
Nick Clifton e37b50
+
Nick Clifton e37b50
+typedef struct cmdline_header_struct
Nick Clifton e37b50
+{
Nick Clifton e37b50
+  union cmdline_union *next;
Nick Clifton e37b50
+  cmdline_enum_type type;
Nick Clifton e37b50
+} cmdline_header_type;
Nick Clifton e37b50
+
Nick Clifton e37b50
+typedef struct cmdline_file_struct
Nick Clifton e37b50
+{
Nick Clifton e37b50
+  cmdline_header_type header;
Nick Clifton e37b50
+  const char *filename;
Nick Clifton e37b50
+} cmdline_file_type;
Nick Clifton e37b50
+
Nick Clifton e37b50
+typedef struct cmdline_bfd_struct
Nick Clifton e37b50
+{
Nick Clifton e37b50
+  cmdline_header_type header;
Nick Clifton e37b50
+  bfd *abfd;
Nick Clifton e37b50
+} cmdline_bfd_type;
Nick Clifton e37b50
+
Nick Clifton e37b50
+typedef union cmdline_union
Nick Clifton e37b50
+{
Nick Clifton e37b50
+  cmdline_header_type header;
Nick Clifton e37b50
+  cmdline_file_type file;
Nick Clifton e37b50
+  cmdline_bfd_type abfd;
Nick Clifton e37b50
+} cmdline_union_type;
Nick Clifton e37b50
+
Nick Clifton e37b50
+typedef struct cmdline_list
Nick Clifton e37b50
+{
Nick Clifton e37b50
+  cmdline_union_type *head;
Nick Clifton e37b50
+  cmdline_union_type **tail;
Nick Clifton e37b50
+} cmdline_list_type;
Nick Clifton e37b50
+
Nick Clifton e37b50
+extern void cmdline_emit_object_only_section (void);
Nick Clifton e37b50
+extern void cmdline_check_object_only_section (bfd *, bfd_boolean);
Nick Clifton e37b50
+extern void cmdline_remove_object_only_files (void);
Nick Clifton e37b50
+
Nick Clifton e37b50
 #endif
Nick Clifton e37b50
--- binutils-2.26.orig/ld/ldlang.c	2016-01-25 10:28:36.904576217 +0000
Nick Clifton e37b50
+++ binutils-2.26/ld/ldlang.c	2016-01-25 10:42:00.040491670 +0000
Nick Clifton e37b50
@@ -93,6 +93,10 @@ static void lang_do_version_exports_sect
Nick Clifton e37b50
 static void lang_finalize_version_expr_head
Nick Clifton e37b50
   (struct bfd_elf_version_expr_head *);
Nick Clifton e37b50
 static void lang_do_memory_regions (void);
Nick Clifton e37b50
+static void cmdline_lists_init (void);
Nick Clifton e37b50
+static void cmdline_get_object_only_input_files (void);
Nick Clifton e37b50
+static void print_cmdline_list (cmdline_union_type *);
Nick Clifton e37b50
+static bfd_boolean cmdline_on_object_only_archive_list_p (bfd *);
Nick Clifton e37b50
 
Nick Clifton e37b50
 /* Exported variables.  */
Nick Clifton e37b50
 const char *output_target;
Nick Clifton e37b50
@@ -8284,6 +8288,962 @@ lang_ld_feature (char *str)
Nick Clifton e37b50
     }
Nick Clifton e37b50
 }
Nick Clifton e37b50
 
Nick Clifton e37b50
+
Nick Clifton e37b50
+static void
Nick Clifton e37b50
+cmdline_lists_init (void)
Nick Clifton e37b50
+{
Nick Clifton e37b50
+  cmdline_object_only_file_list.tail
Nick Clifton e37b50
+    = &cmdline_object_only_file_list.head;
Nick Clifton e37b50
+  cmdline_object_only_archive_list.tail
Nick Clifton e37b50
+    = &cmdline_object_only_archive_list.head;
Nick Clifton e37b50
+  cmdline_temp_object_only_list.tail
Nick Clifton e37b50
+    = &cmdline_temp_object_only_list.head;
Nick Clifton e37b50
+}
Nick Clifton e37b50
+
Nick Clifton e37b50
+/* Allocate an item with TYPE and DATA.  */
Nick Clifton e37b50
+
Nick Clifton e37b50
+static cmdline_union_type *
Nick Clifton e37b50
+cmdline_list_new (cmdline_enum_type type, void *data)
Nick Clifton e37b50
+{
Nick Clifton e37b50
+  cmdline_union_type *new_opt;
Nick Clifton e37b50
+
Nick Clifton e37b50
+  new_opt = (cmdline_union_type *) stat_alloc (sizeof (*new_opt));
Nick Clifton e37b50
+  new_opt->header.type = type;
Nick Clifton e37b50
+  switch (type)
Nick Clifton e37b50
+    {
Nick Clifton e37b50
+    default:
Nick Clifton e37b50
+      break;
Nick Clifton e37b50
+    case cmdline_is_file_enum:
Nick Clifton e37b50
+      new_opt->file.filename = (const char *) data;
Nick Clifton e37b50
+      break;
Nick Clifton e37b50
+    case cmdline_is_bfd_enum:
Nick Clifton e37b50
+      new_opt->abfd.abfd = (bfd *) data;
Nick Clifton e37b50
+      break;
Nick Clifton e37b50
+    }
Nick Clifton e37b50
+  return new_opt;
Nick Clifton e37b50
+}
Nick Clifton e37b50
+
Nick Clifton e37b50
+/* Append an item with TYPE and DATA to LIST.  */
Nick Clifton e37b50
+
Nick Clifton e37b50
+static void
Nick Clifton e37b50
+cmdline_list_append (cmdline_list_type *list, cmdline_enum_type type,
Nick Clifton e37b50
+		     void *data)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+  cmdline_union_type *new_opt = cmdline_list_new (type, data);
Nick Clifton cb347a
+  new_opt->header.next = NULL;
Nick Clifton cb347a
+  *list->tail = new_opt;
Nick Clifton cb347a
+  list->tail = &new_opt->header.next;
Nick Clifton cb347a
+}
Nick Clifton cb347a
+
Nick Clifton cb347a
+static void
Nick Clifton cb347a
+print_cmdline_list (cmdline_union_type *c)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+  for (; c != NULL; c = c->header.next)
Nick Clifton cb347a
+    switch (c->header.type)
Nick Clifton cb347a
+      {
Nick Clifton cb347a
+      default:
Nick Clifton cb347a
+	abort ();
Nick Clifton cb347a
+      case cmdline_is_file_enum:
Nick Clifton cb347a
+	info_msg (" %s", c->file.filename);
Nick Clifton cb347a
+	break;
Nick Clifton cb347a
+      case cmdline_is_bfd_enum:
Nick Clifton cb347a
+	info_msg (" [%B]", c->abfd.abfd);
Nick Clifton cb347a
+	break;
Nick Clifton cb347a
+      }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  info_msg ("\n");
Nick Clifton cb347a
+}
Nick Clifton cb347a
+
Nick Clifton cb347a
+/* Return TRUE if ABFD is on cmdline_object_only_archive_list.  */
Nick Clifton cb347a
+
Nick Clifton cb347a
+static bfd_boolean
Nick Clifton cb347a
+cmdline_on_object_only_archive_list_p (bfd *abfd)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+  cmdline_union_type *c, *next;
Nick Clifton cb347a
+  bfd *archive, *obfd, *oarchive;
Nick Clifton cb347a
+  ufile_ptr origin = abfd->origin;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  archive = bfd_my_archive (abfd);
Nick Clifton cb347a
+  for (c = cmdline_object_only_archive_list.head; c != NULL; c = next)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      if (c->header.type != cmdline_is_bfd_enum)
Nick Clifton cb347a
+	abort ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+      next = c->header.next;
Nick Clifton cb347a
+      obfd = c->abfd.abfd;
Nick Clifton cb347a
+      oarchive = bfd_my_archive (obfd);
Nick Clifton cb347a
+
Nick Clifton cb347a
+      /* The list is grouped by archive file name and sorted by member
Nick Clifton cb347a
+	 origin.  */
Nick Clifton cb347a
+      if (strcmp (archive->filename, oarchive->filename) != 0)
Nick Clifton cb347a
+	continue;
Nick Clifton cb347a
+
Nick Clifton cb347a
+      if (origin == obfd->origin)
Nick Clifton cb347a
+	return TRUE;
Nick Clifton cb347a
+      else if (origin < obfd->origin)
Nick Clifton cb347a
+	return FALSE;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  return FALSE;
Nick Clifton cb347a
+}
Nick Clifton cb347a
+
Nick Clifton cb347a
+/* Append an item with TYPE and DATA to cmdline_object_only_file_list
Nick Clifton cb347a
+   or cmdline_object_only_archive_list if needed.  */
Nick Clifton cb347a
+
Nick Clifton cb347a
+static void
Nick Clifton cb347a
+cmdline_object_only_list_append (cmdline_enum_type type, void *data)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+  cmdline_union_type *c;
Nick Clifton cb347a
+  cmdline_union_type *new_opt, *next, **prev;
Nick Clifton cb347a
+  bfd *abfd, *archive;
Nick Clifton cb347a
+  bfd *obfd, *oarchive;
Nick Clifton cb347a
+  bfd *nbfd, *narchive;
Nick Clifton cb347a
+  ufile_ptr origin, norigin;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Put it on cmdline_object_only_file_list if it isn't an archive
Nick Clifton cb347a
+     member.  */
Nick Clifton cb347a
+  switch (type)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+    default:
Nick Clifton cb347a
+      abort ();
Nick Clifton cb347a
+    case cmdline_is_bfd_enum:
Nick Clifton cb347a
+      abfd = (bfd *) data;
Nick Clifton cb347a
+      archive = bfd_my_archive (abfd);
Nick Clifton cb347a
+      if (archive)
Nick Clifton cb347a
+	break;
Nick Clifton cb347a
+    case cmdline_is_file_enum:
Nick Clifton cb347a
+      cmdline_list_append (&cmdline_object_only_file_list, type, data);
Nick Clifton cb347a
+      return;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Put archive member on cmdline_object_only_archive_list and sort
Nick Clifton cb347a
+     the list by archive name and archive member origin.  */
Nick Clifton cb347a
+  new_opt = (cmdline_union_type *) stat_alloc (sizeof (*new_opt));
Nick Clifton cb347a
+  new_opt->header.type = cmdline_is_bfd_enum;
Nick Clifton cb347a
+  new_opt->header.next = NULL;
Nick Clifton cb347a
+  new_opt->abfd.abfd = (bfd *) data;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  c = cmdline_object_only_archive_list.head;
Nick Clifton cb347a
+  if (c == NULL)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      cmdline_object_only_archive_list.head = new_opt;
Nick Clifton cb347a
+      cmdline_object_only_archive_list.tail = &new_opt->header.next;
Nick Clifton cb347a
+      return;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  prev = NULL;
Nick Clifton cb347a
+  origin = abfd->origin;
Nick Clifton cb347a
+  for (; c != NULL; c = next)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      if (c->header.type != cmdline_is_bfd_enum)
Nick Clifton cb347a
+	abort ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+      next = c->header.next;
Nick Clifton cb347a
+
Nick Clifton cb347a
+      obfd = c->abfd.abfd;
Nick Clifton cb347a
+      oarchive = bfd_my_archive (obfd);
Nick Clifton cb347a
+
Nick Clifton cb347a
+      if (strcmp (archive->filename, oarchive->filename) == 0)
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	  bfd_boolean after;
Nick Clifton cb347a
+
Nick Clifton cb347a
+	  if (origin < obfd->origin)
Nick Clifton cb347a
+	    {
Nick Clifton cb347a
+	      /* Insert it before the current.  */
Nick Clifton cb347a
+	      new_opt->header.next = c;
Nick Clifton cb347a
+	      if (prev)
Nick Clifton cb347a
+		*prev = new_opt;
Nick Clifton cb347a
+	      else
Nick Clifton cb347a
+		cmdline_object_only_archive_list.head = new_opt;
Nick Clifton cb347a
+	      return;
Nick Clifton cb347a
+	    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+	  after = TRUE;
Nick Clifton cb347a
+
Nick Clifton cb347a
+	  /* Check origin.  */
Nick Clifton cb347a
+	  while (next)
Nick Clifton cb347a
+	    {
Nick Clifton cb347a
+	      if (next->header.type != cmdline_is_bfd_enum)
Nick Clifton cb347a
+		abort ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+	      nbfd = next->abfd.abfd;
Nick Clifton cb347a
+	      norigin = nbfd->origin;
Nick Clifton cb347a
+	      if (origin > norigin)
Nick Clifton cb347a
+		{
Nick Clifton cb347a
+		  /* Insert it after NEXT.  */
Nick Clifton cb347a
+		  break;
Nick Clifton cb347a
+		}
Nick Clifton cb347a
+
Nick Clifton cb347a
+	      narchive = bfd_my_archive (nbfd);
Nick Clifton cb347a
+	      if (strcmp (archive->filename, narchive->filename) != 0)
Nick Clifton cb347a
+		{
Nick Clifton cb347a
+		  /* Insert it befor NEXT.  */
Nick Clifton cb347a
+		  after = FALSE;
Nick Clifton cb347a
+		  break;
Nick Clifton cb347a
+		}
Nick Clifton cb347a
+
Nick Clifton cb347a
+	      c = next;
Nick Clifton cb347a
+	      next = next->header.next;
Nick Clifton cb347a
+	    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+	  if (after && next)
Nick Clifton cb347a
+	    {
Nick Clifton cb347a
+	      c = next;
Nick Clifton cb347a
+	      next = next->header.next;
Nick Clifton cb347a
+	    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+	  if (*cmdline_object_only_archive_list.tail == c->header.next)
Nick Clifton cb347a
+	    cmdline_object_only_archive_list.tail
Nick Clifton cb347a
+	      = &new_opt->header.next;
Nick Clifton cb347a
+
Nick Clifton cb347a
+	  prev = &c->header.next;
Nick Clifton cb347a
+	  new_opt->header.next = next;
Nick Clifton cb347a
+	  *prev = new_opt;
Nick Clifton cb347a
+	  return;
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+
Nick Clifton cb347a
+      prev = &c->header.next;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  *cmdline_object_only_archive_list.tail = new_opt;
Nick Clifton cb347a
+  cmdline_object_only_archive_list.tail = &new_opt->header.next;
Nick Clifton cb347a
+}
Nick Clifton cb347a
+
Nick Clifton cb347a
+
Nick Clifton cb347a
+static void
Nick Clifton cb347a
+cmdline_get_object_only_input_files (void)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+  cmdline_union_type *c, *next;
Nick Clifton cb347a
+  bfd *abfd, *archive;
Nick Clifton cb347a
+  bfd *nbfd, *narchive;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Add files first.  */
Nick Clifton cb347a
+  for (c = cmdline_object_only_file_list.head;
Nick Clifton cb347a
+       c != NULL; c = c->header.next)
Nick Clifton cb347a
+    switch (c->header.type)
Nick Clifton cb347a
+      {
Nick Clifton cb347a
+      default:
Nick Clifton cb347a
+	abort ();
Nick Clifton cb347a
+      case cmdline_is_file_enum:
Nick Clifton cb347a
+	lang_add_input_file (c->file.filename,
Nick Clifton cb347a
+			     lang_input_file_is_file_enum, NULL);
Nick Clifton cb347a
+	break;
Nick Clifton cb347a
+      case cmdline_is_bfd_enum:
Nick Clifton cb347a
+	abfd = c->abfd.abfd;
Nick Clifton cb347a
+	if (bfd_my_archive (abfd))
Nick Clifton cb347a
+	  abort ();
Nick Clifton cb347a
+	lang_add_input_file (abfd->filename,
Nick Clifton cb347a
+			     lang_input_file_is_file_enum, NULL);
Nick Clifton cb347a
+	break;
Nick Clifton cb347a
+      }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Add archive members next.  */
Nick Clifton cb347a
+  for (c = cmdline_object_only_archive_list.head; c != NULL; c = next)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      if (c->header.type != cmdline_is_bfd_enum)
Nick Clifton cb347a
+	abort ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+      next = c->header.next;
Nick Clifton cb347a
+
Nick Clifton cb347a
+      abfd = c->abfd.abfd;
Nick Clifton cb347a
+      archive = bfd_my_archive (abfd);
Nick Clifton cb347a
+   
Nick Clifton cb347a
+      /* Add the first archive of the archive member group.  */
Nick Clifton cb347a
+      lang_add_input_file (archive->filename,
Nick Clifton cb347a
+			   lang_input_file_is_file_enum, NULL);
Nick Clifton cb347a
+
Nick Clifton cb347a
+      /* Skip the rest members in the archive member group.  */
Nick Clifton cb347a
+      do
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	  if (!next)
Nick Clifton cb347a
+	    break;
Nick Clifton cb347a
+
Nick Clifton cb347a
+	  if (next->header.type != cmdline_is_bfd_enum)
Nick Clifton cb347a
+	    abort ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+	  next = next->header.next;
Nick Clifton cb347a
+	  if (!next)
Nick Clifton cb347a
+	    break;
Nick Clifton cb347a
+	  nbfd = next->abfd.abfd;
Nick Clifton cb347a
+	  narchive = bfd_my_archive (nbfd);
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+      while (strcmp (archive->filename, narchive->filename) == 0);
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+}
Nick Clifton cb347a
+
Nick Clifton cb347a
+struct cmdline_arg
Nick Clifton cb347a
+{
Nick Clifton cb347a
+  bfd *obfd;
Nick Clifton cb347a
+  asymbol **isympp;
Nick Clifton cb347a
+  int status;
Nick Clifton cb347a
+};
Nick Clifton cb347a
+
Nick Clifton cb347a
+/* Create a section in OBFD with the same
Nick Clifton cb347a
+   name and attributes as ISECTION in IBFD.  */
Nick Clifton cb347a
+
Nick Clifton cb347a
+static void
Nick Clifton cb347a
+setup_section (bfd *ibfd, sec_ptr isection, void *p)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+  struct cmdline_arg *arg = (struct cmdline_arg *) p;
Nick Clifton cb347a
+  bfd *obfd = arg->obfd;
Nick Clifton cb347a
+  asymbol **isympp = arg->isympp;
Nick Clifton cb347a
+  const char *name = isection->name;
Nick Clifton cb347a
+  sec_ptr osection;
Nick Clifton cb347a
+  const char *err;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Skip the object-only section.  */
Nick Clifton cb347a
+  if (ibfd->object_only_section == isection)
Nick Clifton cb347a
+    return;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* If we have already failed earlier on, do not keep on generating
Nick Clifton cb347a
+     complaints now.  */
Nick Clifton cb347a
+  if (arg->status)
Nick Clifton cb347a
+    return;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  osection = bfd_make_section_anyway_with_flags (obfd, name,
Nick Clifton cb347a
+						 isection->flags);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (osection == NULL)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = _("failed to create output section");
Nick Clifton cb347a
+      goto loser;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  osection->size = isection->size;
Nick Clifton cb347a
+  osection->vma = isection->vma;
Nick Clifton cb347a
+  osection->lma = isection->lma;
Nick Clifton cb347a
+  osection->alignment_power = isection->alignment_power;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Copy merge entity size.  */
Nick Clifton cb347a
+  osection->entsize = isection->entsize;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* This used to be mangle_section; we do here to avoid using
Nick Clifton cb347a
+     bfd_get_section_by_name since some formats allow multiple
Nick Clifton cb347a
+     sections with the same name.  */
Nick Clifton cb347a
+  isection->output_section = osection;
Nick Clifton cb347a
+  isection->output_offset = 0;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if ((isection->flags & SEC_GROUP) != 0)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      asymbol *gsym = bfd_group_signature (isection, isympp);
Nick Clifton cb347a
+
Nick Clifton cb347a
+      if (gsym != NULL)
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	  gsym->flags |= BSF_KEEP;
Nick Clifton cb347a
+	  if (ibfd->xvec->flavour == bfd_target_elf_flavour)
Nick Clifton cb347a
+	    elf_group_id (isection) = gsym;
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Allow the BFD backend to copy any private data it understands
Nick Clifton cb347a
+     from the input section to the output section.  */
Nick Clifton cb347a
+  if (!bfd_copy_private_section_data (ibfd, isection, obfd, osection))
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = _("failed to copy private data");
Nick Clifton cb347a
+      goto loser;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* All went well.  */
Nick Clifton cb347a
+  return;
Nick Clifton cb347a
+
Nick Clifton cb347a
+loser:
Nick Clifton cb347a
+  arg->status = 1;
Nick Clifton cb347a
+  einfo (_("%P%F: setup_section: %s: %s\n"), err, name);
Nick Clifton cb347a
+}
Nick Clifton cb347a
+
Nick Clifton cb347a
+/* Copy the data of input section ISECTION of IBFD
Nick Clifton cb347a
+   to an output section with the same name in OBFD.
Nick Clifton cb347a
+   If stripping then don't copy any relocation info.  */
Nick Clifton cb347a
+
Nick Clifton cb347a
+static void
Nick Clifton cb347a
+copy_section (bfd *ibfd, sec_ptr isection, void *p)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+  struct cmdline_arg *arg = (struct cmdline_arg *) p;
Nick Clifton cb347a
+  bfd *obfd = arg->obfd;
Nick Clifton cb347a
+  asymbol **isympp = arg->isympp;
Nick Clifton cb347a
+  arelent **relpp;
Nick Clifton cb347a
+  long relcount;
Nick Clifton cb347a
+  sec_ptr osection;
Nick Clifton cb347a
+  bfd_size_type size;
Nick Clifton cb347a
+  long relsize;
Nick Clifton cb347a
+  flagword flags;
Nick Clifton cb347a
+  const char *err;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Skip the object-only section.  */
Nick Clifton cb347a
+  if (ibfd->object_only_section == isection)
Nick Clifton cb347a
+    return;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* If we have already failed earlier on, do not keep on generating
Nick Clifton cb347a
+     complaints now.  */
Nick Clifton cb347a
+  if (arg->status)
Nick Clifton cb347a
+    return;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  flags = bfd_get_section_flags (ibfd, isection);
Nick Clifton cb347a
+  if ((flags & SEC_GROUP) != 0)
Nick Clifton cb347a
+    return;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  osection = isection->output_section;
Nick Clifton cb347a
+  size = bfd_get_section_size (isection);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (size == 0 || osection == 0)
Nick Clifton cb347a
+    return;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  relsize = bfd_get_reloc_upper_bound (ibfd, isection);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (relsize < 0)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      /* Do not complain if the target does not support relocations.  */
Nick Clifton cb347a
+      if (relsize == -1
Nick Clifton cb347a
+	  && bfd_get_error () == bfd_error_invalid_operation)
Nick Clifton cb347a
+	relsize = 0;
Nick Clifton cb347a
+      else
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	  err = bfd_errmsg (bfd_get_error ());
Nick Clifton cb347a
+	  goto loser;
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (relsize == 0)
Nick Clifton cb347a
+    bfd_set_reloc (obfd, osection, NULL, 0);
Nick Clifton cb347a
+  else
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      relpp = (arelent **) xmalloc (relsize);
Nick Clifton cb347a
+      relcount = bfd_canonicalize_reloc (ibfd, isection, relpp, isympp);
Nick Clifton cb347a
+      if (relcount < 0)
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	  err = _("relocation count is negative");
Nick Clifton cb347a
+	  goto loser;
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+
Nick Clifton cb347a
+      bfd_set_reloc (obfd, osection,
Nick Clifton cb347a
+		     relcount == 0 ? NULL : relpp, relcount);
Nick Clifton cb347a
+      if (relcount == 0)
Nick Clifton cb347a
+	free (relpp);
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (bfd_get_section_flags (ibfd, isection) & SEC_HAS_CONTENTS)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      bfd_byte *memhunk = NULL;
Nick Clifton cb347a
+
Nick Clifton cb347a
+      if (!bfd_get_full_section_contents (ibfd, isection, &memhunk))
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	  err = bfd_errmsg (bfd_get_error ());
Nick Clifton cb347a
+	  goto loser;
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+
Nick Clifton cb347a
+      if (!bfd_set_section_contents (obfd, osection, memhunk, 0, size))
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	  err = bfd_errmsg (bfd_get_error ());
Nick Clifton cb347a
+	  goto loser;
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+      free (memhunk);
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* All went well.  */
Nick Clifton cb347a
+  return;
Nick Clifton cb347a
+
Nick Clifton cb347a
+loser:
Nick Clifton cb347a
+  einfo (_("%P%F: copy_section: %s: %s\n"), err, isection->name);
Nick Clifton cb347a
+}
Nick Clifton cb347a
+/* Open the temporary bfd created in the same directory as PATH.  */
Nick Clifton cb347a
+
Nick Clifton cb347a
+static bfd *
Nick Clifton cb347a
+cmdline_fopen_temp (const char *path, const char *target,
Nick Clifton cb347a
+		    const char *mode)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+#define template "ldXXXXXX"
Nick Clifton cb347a
+  const char *slash = strrchr (path, '/');
Nick Clifton cb347a
+  char *tmpname;
Nick Clifton cb347a
+  size_t len;
Nick Clifton cb347a
+  int fd;
Nick Clifton cb347a
+
Nick Clifton cb347a
+#ifdef HAVE_DOS_BASED_FILE_SYSTEM
Nick Clifton cb347a
+  {
Nick Clifton cb347a
+    /* We could have foo/bar\\baz, or foo\\bar, or d:bar.  */
Nick Clifton cb347a
+    char *bslash = strrchr (path, '\\');
Nick Clifton cb347a
+
Nick Clifton cb347a
+    if (slash == NULL || (bslash != NULL && bslash > slash))
Nick Clifton cb347a
+      slash = bslash;
Nick Clifton cb347a
+    if (slash == NULL && path[0] != '\0' && path[1] == ':')
Nick Clifton cb347a
+      slash = path + 1;
Nick Clifton cb347a
+  }
Nick Clifton cb347a
+#endif
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (slash != (char *) NULL)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      len = slash - path;
Nick Clifton cb347a
+      tmpname = (char *) xmalloc (len + sizeof (template) + 2);
Nick Clifton cb347a
+      memcpy (tmpname, path, len);
Nick Clifton cb347a
+
Nick Clifton cb347a
+#ifdef HAVE_DOS_BASED_FILE_SYSTEM
Nick Clifton cb347a
+      /* If tmpname is "X:", appending a slash will make it a root
Nick Clifton cb347a
+	 directory on drive X, which is NOT the same as the current
Nick Clifton cb347a
+	 directory on drive X.  */
Nick Clifton cb347a
+      if (len == 2 && tmpname[1] == ':')
Nick Clifton cb347a
+	tmpname[len++] = '.';
Nick Clifton cb347a
+#endif
Nick Clifton cb347a
+      tmpname[len++] = '/';
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+  else
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      tmpname = (char *) xmalloc (sizeof (template));
Nick Clifton cb347a
+      len = 0;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  memcpy (tmpname + len, template, sizeof (template));
Nick Clifton cb347a
+#undef template
Nick Clifton cb347a
+
Nick Clifton cb347a
+#ifdef HAVE_MKSTEMP
Nick Clifton cb347a
+  fd = mkstemp (tmpname);
Nick Clifton cb347a
+#else
Nick Clifton cb347a
+  tmpname = mktemp (tmpname);
Nick Clifton cb347a
+  if (tmpname == NULL)
Nick Clifton cb347a
+    return NULL;
Nick Clifton cb347a
+  fd = open (tmpname, O_RDWR | O_CREAT | O_EXCL, 0600);
Nick Clifton cb347a
+#endif
Nick Clifton cb347a
+  if (fd == -1)
Nick Clifton cb347a
+    return NULL;
Nick Clifton cb347a
+  return bfd_fopen (tmpname, target, mode, fd);
Nick Clifton cb347a
+}
Nick Clifton cb347a
+
Nick Clifton cb347a
+/* Add the object-only section.  */
Nick Clifton cb347a
+
Nick Clifton cb347a
+static void
Nick Clifton cb347a
+cmdline_add_object_only_section (bfd_byte *contents, size_t size)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+  bfd_vma start;
Nick Clifton cb347a
+  flagword flags;
Nick Clifton cb347a
+  enum bfd_architecture iarch;
Nick Clifton cb347a
+  unsigned int imach;
Nick Clifton cb347a
+  long symcount;
Nick Clifton cb347a
+  long symsize;
Nick Clifton cb347a
+  asymbol **isympp = NULL;
Nick Clifton cb347a
+  asymbol **osympp = NULL;
Nick Clifton cb347a
+  bfd *obfd = NULL, *ibfd;
Nick Clifton cb347a
+  const char *err;
Nick Clifton cb347a
+  struct arg
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      bfd *obfd;
Nick Clifton cb347a
+      asymbol **isympp;
Nick Clifton cb347a
+      int status;
Nick Clifton cb347a
+    } arg;
Nick Clifton cb347a
+  char **matching;
Nick Clifton cb347a
+  const char *ofilename = NULL;
Nick Clifton cb347a
+  asection *sec;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  ibfd = bfd_openr (output_filename, output_target);
Nick Clifton cb347a
+  if (!ibfd)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = bfd_errmsg (bfd_get_error ());
Nick Clifton cb347a
+      goto loser;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (!bfd_check_format_matches (ibfd, bfd_object, &matching))
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = bfd_errmsg (bfd_get_error ());
Nick Clifton cb347a
+      goto loser;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  obfd = cmdline_fopen_temp (output_filename, output_target, "w");
Nick Clifton cb347a
+  if (!obfd)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = bfd_errmsg (bfd_get_error ());
Nick Clifton cb347a
+      goto loser;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+  ofilename = bfd_get_filename (obfd);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (!bfd_set_format (obfd, bfd_object))
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = bfd_errmsg (bfd_get_error ());
Nick Clifton cb347a
+      goto loser;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Copy the start address, flags and architecture of input file to
Nick Clifton cb347a
+     output file.  */
Nick Clifton cb347a
+  flags = bfd_get_file_flags (ibfd);
Nick Clifton cb347a
+  start = bfd_get_start_address (ibfd);
Nick Clifton cb347a
+  iarch = bfd_get_arch (ibfd);
Nick Clifton cb347a
+  imach = bfd_get_mach (ibfd);
Nick Clifton cb347a
+  if (!bfd_set_start_address (obfd, start)
Nick Clifton cb347a
+      || !bfd_set_file_flags (obfd, flags)
Nick Clifton cb347a
+      || !bfd_set_arch_mach (obfd, iarch, imach))
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = bfd_errmsg (bfd_get_error ());
Nick Clifton cb347a
+      goto loser;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+	
Nick Clifton cb347a
+  symsize = bfd_get_symtab_upper_bound (ibfd);
Nick Clifton cb347a
+  if (symsize < 0)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = bfd_errmsg (bfd_get_error ());
Nick Clifton cb347a
+      goto loser;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  isympp = (asymbol **) xmalloc (symsize);
Nick Clifton cb347a
+  symcount = bfd_canonicalize_symtab (ibfd, isympp);
Nick Clifton cb347a
+  if (symcount < 0)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = bfd_errmsg (bfd_get_error ());
Nick Clifton cb347a
+      goto loser;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  arg.obfd = obfd;
Nick Clifton cb347a
+  arg.isympp = isympp;
Nick Clifton cb347a
+  arg.status = 0;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* BFD mandates that all output sections be created and sizes set before
Nick Clifton cb347a
+     any output is done.  Thus, we traverse all sections multiple times.  */
Nick Clifton cb347a
+  bfd_map_over_sections (ibfd, setup_section, &arg;;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (arg.status)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = _("error setting up sections");
Nick Clifton cb347a
+      goto loser;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Allow the BFD backend to copy any private data it understands
Nick Clifton cb347a
+     from the input section to the output section.  */
Nick Clifton cb347a
+  if (! bfd_copy_private_header_data (ibfd, obfd))
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = _("error copying private header data");
Nick Clifton cb347a
+      goto loser;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Create the object-only section.  */
Nick Clifton cb347a
+  sec = bfd_make_section_with_flags (obfd,
Nick Clifton cb347a
+				     GNU_OBJECT_ONLY_SECTION_NAME,
Nick Clifton cb347a
+				     (SEC_HAS_CONTENTS
Nick Clifton cb347a
+				      | SEC_READONLY
Nick Clifton cb347a
+				      | SEC_DATA
Nick Clifton cb347a
+				      | SEC_LINKER_CREATED));
Nick Clifton cb347a
+  if (sec == NULL)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = _("can't create object-only section");
Nick Clifton cb347a
+      goto loser;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (! bfd_set_section_size (obfd, sec, size))
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = _("can't set object-only section size");
Nick Clifton cb347a
+      goto loser;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (ibfd->object_only_section)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      /* Filter out the object-only section symbol.  */
Nick Clifton cb347a
+      long src_count = 0, dst_count = 0;
Nick Clifton cb347a
+      asymbol **from, **to;
Nick Clifton cb347a
+
Nick Clifton cb347a
+      osympp = (asymbol **) xmalloc (symcount * sizeof (asymbol *));
Nick Clifton cb347a
+      from = isympp;
Nick Clifton cb347a
+      to = osympp;
Nick Clifton cb347a
+      for (; src_count < symcount; src_count++)
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	  asymbol *sym = from[src_count];
Nick Clifton cb347a
+	  if (bfd_get_section (sym) != ibfd->object_only_section)
Nick Clifton cb347a
+	    to[dst_count++] = sym;
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+      to[dst_count] = NULL;
Nick Clifton cb347a
+      symcount = dst_count;
Nick Clifton cb347a
+      bfd_set_symtab (obfd, osympp, symcount);
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+  else
Nick Clifton cb347a
+    bfd_set_symtab (obfd, isympp, symcount);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* This has to happen after the symbol table has been set.  */
Nick Clifton cb347a
+  bfd_map_over_sections (ibfd, copy_section, &arg;;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (arg.status)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = _("error copying sections");
Nick Clifton cb347a
+      goto loser;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Copy the object-only section to the output.  */
Nick Clifton cb347a
+  if (! bfd_set_section_contents (obfd, sec, contents, 0, size))
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = _("error adding object-only section");
Nick Clifton cb347a
+      goto loser;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Allow the BFD backend to copy any private data it understands
Nick Clifton cb347a
+     from the input BFD to the output BFD.  This is done last to
Nick Clifton cb347a
+     permit the routine to look at the filtered symbol table, which is
Nick Clifton cb347a
+     important for the ECOFF code at least.  */
Nick Clifton cb347a
+  if (! bfd_copy_private_bfd_data (ibfd, obfd))
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      err = _("error copying private BFD data");
Nick Clifton cb347a
+      goto loser;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (!bfd_close (obfd))
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      unlink (ofilename);
Nick Clifton cb347a
+      einfo (_("%P%F: failed to finish output with object-only section\n"));
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Must be freed after bfd_close ().  */
Nick Clifton cb347a
+  free (isympp);
Nick Clifton cb347a
+  if (osympp)
Nick Clifton cb347a
+    free (osympp);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (rename (ofilename, output_filename))
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      unlink (ofilename);
Nick Clifton cb347a
+      einfo (_("%P%F: failed to rename output with object-only section\n"));
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  return;
Nick Clifton cb347a
+
Nick Clifton cb347a
+loser:
Nick Clifton cb347a
+  if (isympp)
Nick Clifton cb347a
+    free (isympp);
Nick Clifton cb347a
+  if (osympp)
Nick Clifton cb347a
+    free (osympp);
Nick Clifton cb347a
+  if (obfd)
Nick Clifton cb347a
+    bfd_close (obfd);
Nick Clifton cb347a
+  if (ofilename)
Nick Clifton cb347a
+    unlink (ofilename);
Nick Clifton cb347a
+  einfo (_("%P%F: failed to add object-only section: %s\n"), err);
Nick Clifton cb347a
+}
Nick Clifton cb347a
+
Nick Clifton cb347a
+/* Emit the final output with object-only section.  */
Nick Clifton cb347a
+
Nick Clifton cb347a
+void
Nick Clifton cb347a
+cmdline_emit_object_only_section (void)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+  const char *saved_output_filename = output_filename;
Nick Clifton cb347a
+  int fd;
Nick Clifton cb347a
+  size_t size, off;
Nick Clifton cb347a
+  bfd_byte *contents;
Nick Clifton cb347a
+  struct stat st;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Get a temporary object-only file.  */
Nick Clifton cb347a
+  output_filename = make_temp_file (".obj-only.o");
Nick Clifton cb347a
+
Nick Clifton cb347a
+  had_output_filename = FALSE;
Nick Clifton cb347a
+  link_info.input_bfds = NULL;
Nick Clifton cb347a
+  link_info.input_bfds_tail = &link_info.input_bfds;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  lang_init (TRUE);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  ld_parse_linker_script ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Set up the object-only output. */
Nick Clifton cb347a
+  lang_final ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Open the object-only file for output.  */
Nick Clifton cb347a
+  lang_for_each_statement (ldlang_open_output);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  ldemul_create_output_section_statements ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (!bfd_section_already_linked_table_init ())
Nick Clifton cb347a
+    einfo (_("%P%F: Failed to create hash table\n"));
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Call cmdline_on_object_only_archive_list_p to check which member
Nick Clifton cb347a
+     should be loaded.  */
Nick Clifton cb347a
+  input_flags.whole_archive = TRUE;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Set it to avoid adding more to cmdline lists.  */
Nick Clifton cb347a
+  link_info.emitting_gnu_object_only = TRUE;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  cmdline_get_object_only_input_files ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+  open_input_bfds (statement_list.head, FALSE);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  ldemul_after_open ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+  bfd_section_already_linked_table_free ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Make sure that we're not mixing architectures.  We call this
Nick Clifton cb347a
+     after all the input files have been opened, but before we do any
Nick Clifton cb347a
+     other processing, so that any operations merge_private_bfd_data
Nick Clifton cb347a
+     does on the output file will be known during the rest of the
Nick Clifton cb347a
+     link.  */
Nick Clifton cb347a
+  lang_check ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Size up the common data.  */
Nick Clifton cb347a
+  lang_common ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Update wild statements.  */
Nick Clifton cb347a
+  update_wild_statements (statement_list.head);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Run through the contours of the script and attach input sections
Nick Clifton cb347a
+     to the correct output sections.  */
Nick Clifton cb347a
+  map_input_to_output_sections (statement_list.head, NULL, NULL);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Find any sections not attached explicitly and handle them.  */
Nick Clifton cb347a
+  lang_place_orphans ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Do anything special before sizing sections.  This is where ELF
Nick Clifton cb347a
+     and other back-ends size dynamic sections.  */
Nick Clifton cb347a
+  ldemul_before_allocation ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Size up the sections.  */
Nick Clifton cb347a
+  lang_size_sections (NULL, ! RELAXATION_ENABLED);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* See if anything special should be done now we know how big
Nick Clifton cb347a
+     everything is.  This is where relaxation is done.  */
Nick Clifton cb347a
+  ldemul_after_allocation ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+  ldemul_finish ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Make sure that the section addresses make sense.  */
Nick Clifton cb347a
+  if (command_line.check_section_addresses)
Nick Clifton cb347a
+    lang_check_section_addresses ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+  lang_end ();
Nick Clifton cb347a
+  
Nick Clifton cb347a
+  ldwrite ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+  lang_finish ();
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (! bfd_close (link_info.output_bfd))
Nick Clifton cb347a
+    einfo (_("%P%F:%s: final close failed on object-only output: %E\n"),
Nick Clifton cb347a
+	   output_filename);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Read in the object-only file.  */
Nick Clifton cb347a
+  fd = open (output_filename, O_RDONLY | O_BINARY);
Nick Clifton cb347a
+  if (fd < 0)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      bfd_set_error (bfd_error_system_call);
Nick Clifton cb347a
+      einfo (_("%P%F:%s: cannot open object-only output: %E"),
Nick Clifton cb347a
+	     output_filename);
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Get the object-only file size.  */
Nick Clifton cb347a
+  if (fstat (fd, &st) != 0)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      bfd_set_error (bfd_error_system_call);
Nick Clifton cb347a
+      einfo (_("%P%F:%s: cannot stat object-only output: %E"),
Nick Clifton cb347a
+	     output_filename);
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  size = st.st_size;
Nick Clifton cb347a
+  off = 0;
Nick Clifton cb347a
+  contents = (bfd_byte *) xmalloc (size);
Nick Clifton cb347a
+  while (off != size)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      ssize_t got;
Nick Clifton cb347a
+
Nick Clifton cb347a
+      got = read (fd, contents + off, size - off);
Nick Clifton cb347a
+      if (got < 0)
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	  bfd_set_error (bfd_error_system_call);
Nick Clifton cb347a
+	  einfo (_("%P%F:%s: read failed on object-only output: %E"),
Nick Clifton cb347a
+		 output_filename);
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+
Nick Clifton cb347a
+      off += got;
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+
Nick Clifton cb347a
+  close (fd);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* Remove the temporary object-only file.  */ 
Nick Clifton cb347a
+  unlink (output_filename);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  output_filename = saved_output_filename;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  cmdline_add_object_only_section (contents, size);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  free (contents);
Nick Clifton cb347a
+}
Nick Clifton cb347a
+
Nick Clifton cb347a
+/* Extract the object-only section.  */
Nick Clifton cb347a
+
Nick Clifton cb347a
+static const char *
Nick Clifton cb347a
+cmdline_extract_object_only_section (bfd *abfd)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+  const char *name = bfd_extract_object_only_section (abfd);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (name == NULL)
Nick Clifton cb347a
+    einfo (_("%P%F: cannot extract object-only section from %B: %E"),
Nick Clifton cb347a
+	   abfd);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  /* It should be removed after it is done.  */
Nick Clifton cb347a
+  cmdline_list_append (&cmdline_temp_object_only_list,
Nick Clifton cb347a
+		       cmdline_is_file_enum, (void *) name);
Nick Clifton cb347a
+
Nick Clifton cb347a
+  return name;
Nick Clifton cb347a
+}
Nick Clifton cb347a
+
Nick Clifton cb347a
+/* Check and handle the object-only section.   */
Nick Clifton cb347a
+
Nick Clifton cb347a
+void
Nick Clifton cb347a
+cmdline_check_object_only_section (bfd *abfd, bfd_boolean lto)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+  const char *filename;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (link_info.emitting_gnu_object_only
Nick Clifton cb347a
+      || abfd->format != bfd_object)
Nick Clifton cb347a
+    return;
Nick Clifton cb347a
+
Nick Clifton cb347a
+  if (lto)
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      /* For LTO link, we only need to extract object-only section
Nick Clifton cb347a
+	 from the mixed object, add it to input, and put it on LTO
Nick Clifton cb347a
+	 claimed output.  */
Nick Clifton cb347a
+      switch (abfd->lto_type)
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	default:
Nick Clifton cb347a
+	  abort ();
Nick Clifton cb347a
+	case lto_mixed_object:
Nick Clifton cb347a
+	  filename = cmdline_extract_object_only_section (abfd);
Nick Clifton cb347a
+	  lang_add_input_file (filename,
Nick Clifton cb347a
+			       lang_input_file_is_file_enum, NULL);
Nick Clifton cb347a
+	  break;
Nick Clifton cb347a
+	case lto_non_ir_object:
Nick Clifton cb347a
+	case lto_ir_object:
Nick Clifton cb347a
+	  break;
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+    }
Nick Clifton e37b50
+  else if (bfd_link_relocatable (&link_info))
Nick Clifton cb347a
+    {
Nick Clifton cb347a
+      /* For non-LTO relocatable link, we need to append non-IR object
Nick Clifton cb347a
+	 file and the object file in object-only section to the object
Nick Clifton cb347a
+	 only list.  */
Nick Clifton cb347a
+      switch (abfd->lto_type)
Nick Clifton cb347a
+	{
Nick Clifton cb347a
+	default:
Nick Clifton cb347a
+	  abort ();
Nick Clifton cb347a
+	case lto_mixed_object:
Nick Clifton cb347a
+	  filename = cmdline_extract_object_only_section (abfd);
Nick Clifton cb347a
+	  cmdline_object_only_list_append (cmdline_is_file_enum,
Nick Clifton cb347a
+					  (void *) filename);
Nick Clifton cb347a
+	  break;
Nick Clifton cb347a
+	case lto_non_ir_object:
Nick Clifton cb347a
+	  cmdline_object_only_list_append (cmdline_is_bfd_enum, abfd);
Nick Clifton cb347a
+	  break;
Nick Clifton cb347a
+	case lto_ir_object:
Nick Clifton cb347a
+	  break;
Nick Clifton cb347a
+	}
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+}
Nick Clifton cb347a
+
Nick Clifton cb347a
+/* Remove temporary object-only files.  */
Nick Clifton cb347a
+
Nick Clifton cb347a
+void
Nick Clifton cb347a
+cmdline_remove_object_only_files (void)
Nick Clifton cb347a
+{
Nick Clifton cb347a
+  cmdline_union_type *c;
Nick Clifton cb347a
+
Nick Clifton cb347a
+#ifdef ENABLE_PLUGINS
Nick Clifton cb347a
+  if (plugin_save_temps)
Nick Clifton cb347a
+    return;
Nick Clifton cb347a
+#endif
Nick Clifton cb347a
+
Nick Clifton cb347a
+  c = cmdline_temp_object_only_list.head;
Nick Clifton cb347a
+  for (; c != NULL; c = c->header.next)
Nick Clifton cb347a
+    switch (c->header.type)
Nick Clifton cb347a
+      {
Nick Clifton cb347a
+      default:
Nick Clifton cb347a
+	abort ();
Nick Clifton cb347a
+      case cmdline_is_file_enum:
Nick Clifton cb347a
+	unlink (c->file.filename);
Nick Clifton cb347a
+	break;
Nick Clifton cb347a
+      }
Nick Clifton cb347a
+}
Nick Clifton cb347a
+
Nick Clifton e37b50
 /* Pretty print memory amount.  */
Nick Clifton cb347a
 
Nick Clifton e37b50
 static void
Nick Clifton e37b50
--- binutils-2.26.orig/ld/emultempl/ppc64elf.em	2016-01-25 10:28:36.756575308 +0000
Nick Clifton e37b50
+++ binutils-2.26/ld/emultempl/ppc64elf.em	2016-01-25 10:36:29.882471865 +0000
Nick Clifton e37b50
@@ -928,4 +928,4 @@ LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=
Nick Clifton e37b50
 LDEMUL_AFTER_OPEN=ppc_after_open
Nick Clifton e37b50
 LDEMUL_BEFORE_ALLOCATION=ppc_before_allocation
Nick Clifton e37b50
 LDEMUL_AFTER_ALLOCATION=gld${EMULATION_NAME}_after_allocation
Nick Clifton e37b50
-LDEMUL_FINISH=gld${EMULATION_NAME}_finish
Nick Clifton e37b50
+LDEMUL_FINISH=ppc_finish
Nick Clifton e37b50
--- binutils-2.26.orig/bfd/bfd-in2.h	2016-01-25 10:28:36.444573391 +0000
Nick Clifton e37b50
+++ binutils-2.26/bfd/bfd-in2.h	2016-01-25 10:34:45.072830672 +0000
Nick Clifton e37b50
@@ -6517,6 +6517,14 @@ struct bfd_build_id
Nick Clifton e37b50
     bfd_byte data[1];
Nick Clifton e37b50
   };
Nick Clifton cb347a
 
Nick Clifton e37b50
+enum bfd_lto_object_type
Nick Clifton e37b50
+  {
Nick Clifton e37b50
+    lto_non_object,
Nick Clifton e37b50
+    lto_non_ir_object,
Nick Clifton e37b50
+    lto_ir_object,
Nick Clifton e37b50
+    lto_mixed_object
Nick Clifton e37b50
+  };
Nick Clifton cb347a
+
Nick Clifton e37b50
 struct bfd
Nick Clifton e37b50
 {
Nick Clifton e37b50
   /* The filename the application opened the BFD with.  */
Nick Clifton e37b50
@@ -6807,6 +6815,9 @@ struct bfd
Nick Clifton cb347a
 
Nick Clifton e37b50
   /* For input BFDs, the build ID, if the object has one. */
Nick Clifton e37b50
   const struct bfd_build_id *build_id;
Nick Clifton cb347a
+
Nick Clifton e37b50
+  /* LTO object type.  */
Nick Clifton e37b50
+  unsigned int lto_type : 2;
Nick Clifton e37b50
 };
Nick Clifton cb347a
 
Nick Clifton e37b50
 /* See note beside bfd_set_section_userdata.  */
Nick Clifton e37b50
@@ -7019,6 +7030,8 @@ void bfd_emul_set_commonpagesize (const
Nick Clifton cb347a
 
Nick Clifton e37b50
 char *bfd_demangle (bfd *, const char *, int);
Nick Clifton cb347a
 
Nick Clifton e37b50
+asymbol *bfd_group_signature (asection *group, asymbol **isympp);
Nick Clifton cb347a
+
Nick Clifton e37b50
 void bfd_update_compression_header
Nick Clifton e37b50
    (bfd *abfd, bfd_byte *contents, asection *sec);
Nick Clifton cb347a
 
Nick Clifton e37b50
--- binutils-2.26.orig/bfd/bfd.c	2016-01-25 10:28:36.444573391 +0000
Nick Clifton e37b50
+++ binutils-2.26/bfd/bfd.c	2016-01-25 10:32:20.635947052 +0000
Nick Clifton e37b50
@@ -57,6 +57,14 @@ CODE_FRAGMENT
Nick Clifton e37b50
 .    bfd_byte data[1];
Nick Clifton e37b50
 .  };
Nick Clifton e37b50
 .
Nick Clifton e37b50
+.enum bfd_lto_object_type
Nick Clifton e37b50
+.  {
Nick Clifton e37b50
+.    lto_non_object,
Nick Clifton e37b50
+.    lto_non_ir_object,
Nick Clifton e37b50
+.    lto_ir_object,
Nick Clifton e37b50
+.    lto_mixed_object
Nick Clifton e37b50
+.  };
Nick Clifton e37b50
+.
Nick Clifton e37b50
 .struct bfd
Nick Clifton e37b50
 .{
Nick Clifton e37b50
 .  {* The filename the application opened the BFD with.  *}
Nick Clifton e37b50
@@ -347,6 +355,9 @@ CODE_FRAGMENT
Nick Clifton e37b50
 .
Nick Clifton e37b50
 .  {* For input BFDs, the build ID, if the object has one. *}
Nick Clifton e37b50
 .  const struct bfd_build_id *build_id;
Nick Clifton e37b50
+.
Nick Clifton e37b50
+.  {* LTO object type.  *}
Nick Clifton e37b50
+.  unsigned int lto_type : 2;
Nick Clifton e37b50
 .};
Nick Clifton e37b50
 .
Nick Clifton e37b50
 .{* See note beside bfd_set_section_userdata.  *}
Nick Clifton e37b50
@@ -1962,6 +1973,39 @@ bfd_demangle (bfd *abfd, const char *nam
Nick Clifton cb347a
 }
Nick Clifton e37b50
 
Nick Clifton e37b50
 /*
Nick Clifton e37b50
+FUNCTION
Nick Clifton e37b50
+	bfd_group_signature
Nick Clifton cb347a
+
Nick Clifton e37b50
+SYNOPSIS
Nick Clifton e37b50
+	asymbol *bfd_group_signature (asection *group, asymbol **isympp);
Nick Clifton cb347a
+
Nick Clifton e37b50
+DESCRIPTION
Nick Clifton e37b50
+	Return a pointer to the symbol used as a signature for GROUP.
Nick Clifton e37b50
+*/
Nick Clifton e37b50
+
Nick Clifton e37b50
+asymbol *
Nick Clifton e37b50
+bfd_group_signature (asection *group, asymbol **isympp)
Nick Clifton cb347a
+{
Nick Clifton e37b50
+  bfd *abfd = group->owner;
Nick Clifton e37b50
+  Elf_Internal_Shdr *ghdr;
Nick Clifton cb347a
+
Nick Clifton e37b50
+  if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
Nick Clifton e37b50
+    return NULL;
Nick Clifton e37b50
+
Nick Clifton e37b50
+  ghdr = &elf_section_data (group)->this_hdr;
Nick Clifton e37b50
+  if (ghdr->sh_link < elf_numsections (abfd))
Nick Clifton cb347a
+    {
Nick Clifton e37b50
+      const struct elf_backend_data *bed = get_elf_backend_data (abfd);
Nick Clifton e37b50
+      Elf_Internal_Shdr *symhdr = elf_elfsections (abfd) [ghdr->sh_link];
Nick Clifton cb347a
+
Nick Clifton e37b50
+      if (symhdr->sh_type == SHT_SYMTAB
Nick Clifton e37b50
+	  && ghdr->sh_info < symhdr->sh_size / bed->s->sizeof_sym)
Nick Clifton e37b50
+	return isympp[ghdr->sh_info - 1];
Nick Clifton cb347a
+    }
Nick Clifton e37b50
+  return NULL;
Nick Clifton cb347a
+}
Nick Clifton cb347a
+
Nick Clifton e37b50
+/*
Nick Clifton e37b50
 FUNCTION
Nick Clifton e37b50
 	bfd_update_compression_header
Nick Clifton cb347a
 
Nick Clifton c56cfc
--- binutils-2.26.orig/ld/emultempl/ppc32elf.em	2016-01-25 12:41:21.857975805 +0000
Nick Clifton c56cfc
+++ binutils-2.26/ld/emultempl/ppc32elf.em	2016-01-25 12:43:56.424910846 +0000
Nick Clifton c56cfc
@@ -215,7 +215,7 @@ ppc_finish (void)
Nick Clifton c56cfc
 {
Nick Clifton c56cfc
   if (params.ppc476_workaround)
Nick Clifton c56cfc
     lang_for_each_statement (no_zero_padding);
Nick Clifton c56cfc
-  finish_default ();
Nick Clifton c56cfc
+  gld${EMULATION_NAME}_finish ();
Nick Clifton c56cfc
 }
Nick Clifton c56cfc
 
Nick Clifton c56cfc
 EOF
Nick Clifton 987c54
--- binutils-2.26.orig/ld/emultempl/avrelf.em	2016-01-26 11:00:32.210889045 +0000
Nick Clifton 987c54
+++ binutils-2.26/ld/emultempl/avrelf.em	2016-01-26 11:00:41.222943557 +0000
Nick Clifton 54f8fd
@@ -209,7 +209,7 @@ avr_finish (void)
Nick Clifton 987c54
   else
Nick Clifton 987c54
     elf_elfheader (abfd)->e_flags &= ~EF_AVR_LINKRELAX_PREPARED;
Nick Clifton 987c54
 
Nick Clifton 987c54
-  finish_default ();
Nick Clifton 987c54
+  gld${EMULATION_NAME}_finish ();
Nick Clifton 987c54
 }
Nick Clifton 987c54
 EOF
Nick Clifton 54f8fd