diff -cpr ../binutils-2.23.2.orig/bfd/bfd.c bfd/bfd.c

*** ../binutils-2.23.2.orig/bfd/bfd.c	2013-05-14 16:39:24.681717759 +0100

--- bfd/bfd.c	2013-05-14 16:40:06.988718932 +0100

*************** CODE_FRAGMENT

*** 43,48 ****

--- 43,56 ----

  .    both_direction = 3

  .  };

  .

+ .enum bfd_lto_object_type

+ .  {

+ .    lto_non_object,

+ .    lto_non_ir_object,

+ .    lto_ir_object,

+ .    lto_mixed_object

+ .  };

+ .

  .struct bfd

  .{

  .  {* A unique identifier of the BFD  *}

*************** CODE_FRAGMENT

*** 190,195 ****

--- 198,206 ----

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

  .  struct bfd_section *section_last;

  .

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

+ .  struct bfd_section *object_only_section;

+ .

  .  {* The number of sections.  *}

  .  unsigned int section_count;

  .

*************** CODE_FRAGMENT

*** 308,313 ****

--- 319,327 ----

  .  {* Set if only required symbols should be added in the link hash table for

  .     this object.  Used by VMS linkers.  *}

  .  unsigned int selective_search : 1;

+ .

+ .  {* LTO object type.  *}

+ .  unsigned int lto_type : 2;

  .};

  .

  */

*************** bfd_demangle (bfd *abfd, const char *nam

*** 2026,2028 ****

--- 2040,2075 ----

    return res;

  }

+ 

+ /*

+ FUNCTION

+ 	bfd_group_signature

+ 

+ SYNOPSIS

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

+ 

+ DESCRIPTION

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

+ */

+ 

+ asymbol *

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

+ {

+   bfd *abfd = group->owner;

+   Elf_Internal_Shdr *ghdr;

+ 

+   if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)

+     return NULL;

+ 

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

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

+     {

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

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

+ 

+       if (symhdr->sh_type == SHT_SYMTAB

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

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

+     }

+   return NULL;

+ }

diff -cpr ../binutils-2.23.2.orig/bfd/bfd-in2.h bfd/bfd-in2.h

*** ../binutils-2.23.2.orig/bfd/bfd-in2.h	2013-05-14 16:39:24.640717758 +0100

--- bfd/bfd-in2.h	2013-05-14 16:42:03.217722154 +0100

*************** struct bfd_section *bfd_create_gnu_debug

*** 1050,1055 ****

--- 1050,1058 ----

  bfd_boolean bfd_fill_in_gnu_debuglink_section

     (bfd *abfd, struct bfd_section *sect, const char *filename);

+ const char *bfd_extract_object_only_section

+    (bfd *abfd);

+ 

  /* Extracted from libbfd.c.  */

  /* Byte swapping macros for user section data.  */

*************** extern asection std_section[4];

*** 1594,1599 ****

--- 1597,1605 ----

    || ((SEC) == bfd_com_section_ptr)            \

    || ((SEC) == bfd_ind_section_ptr))

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

+ #define GNU_OBJECT_ONLY_SECTION_NAME ".gnu_object_only"

+ 

  /* Macros to handle insertion and deletion of a bfd's sections.  These

     only handle the list pointers, ie. do not adjust section_count,

     target_index etc.  */

*************** enum bfd_direction

*** 5681,5686 ****

--- 5687,5700 ----

      both_direction = 3

    };

+ enum bfd_lto_object_type

+   {

+     lto_non_object,

+     lto_non_ir_object,

+     lto_ir_object,

+     lto_mixed_object

+   };

+ 

  struct bfd

  {

    /* A unique identifier of the BFD  */

*************** struct bfd

*** 5828,5833 ****

--- 5842,5850 ----

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

    struct bfd_section *section_last;

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

+   struct bfd_section *object_only_section;

+ 

    /* The number of sections.  */

    unsigned int section_count;

*************** struct bfd

*** 5946,5951 ****

--- 5963,5971 ----

    /* Set if only required symbols should be added in the link hash table for

       this object.  Used by VMS linkers.  */

    unsigned int selective_search : 1;

+ 

+   /* LTO object type.  */

+   unsigned int lto_type : 2;

  };

  typedef enum bfd_error

*************** void bfd_emul_set_commonpagesize (const

*** 6167,6172 ****

--- 6187,6194 ----

  char *bfd_demangle (bfd *, const char *, int);

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

+ 

  /* Extracted from archive.c.  */

  symindex bfd_get_next_mapent

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

diff -cpr ../binutils-2.23.2.orig/bfd/elf.c bfd/elf.c

*** ../binutils-2.23.2.orig/bfd/elf.c	2013-05-14 16:39:25.317717777 +0100

--- bfd/elf.c	2013-05-14 16:40:06.993718932 +0100

*************** static const struct bfd_elf_special_sect

*** 2092,2097 ****

--- 2092,2098 ----

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

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

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

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

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

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

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

diff -cpr ../binutils-2.23.2.orig/bfd/elflink.c bfd/elflink.c

*** ../binutils-2.23.2.orig/bfd/elflink.c	2013-05-14 16:39:25.280717776 +0100

--- bfd/elflink.c	2013-05-14 16:40:06.997718932 +0100

*************** elf_link_add_archive_symbols (bfd *abfd,

*** 5127,5132 ****

--- 5127,5135 ----

  	     something wrong with the archive.  */

  	  if (element->archive_pass != 0)

  	    {

+ 	      /* Don't load the IR archive member twice.  */

+ 	      if (element->lto_type == lto_ir_object)

+ 		continue;

  	      bfd_set_error (bfd_error_bad_value);

  	      goto error_return;

  	    }

diff -cpr ../binutils-2.23.2.orig/bfd/format.c bfd/format.c

*** ../binutils-2.23.2.orig/bfd/format.c	2013-05-14 16:39:24.265717748 +0100

--- bfd/format.c	2013-05-14 16:40:07.006718933 +0100

*************** bfd_check_format (bfd *abfd, bfd_format

*** 95,100 ****

--- 95,127 ----

    return bfd_check_format_matches (abfd, format, NULL);

  }

+ /* Set lto_type in ABFD.  */

+ 

+ static void

+ bfd_set_lto_type (bfd *abfd)

+ {

+   if (abfd->format == bfd_object

+       && abfd->lto_type == lto_non_object

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

+     {

+       asection *sec;

+       enum bfd_lto_object_type type = lto_non_ir_object;

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

+ 	{

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

+ 	    {

+ 	      type = lto_mixed_object;

+ 	      abfd->object_only_section = sec;

+ 	      break;

+ 	    }

+ 	  else if (type != lto_ir_object

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

+ 	    type = lto_ir_object;

+ 	}

+       abfd->lto_type = type;

+     }

+ }

+ 

  struct bfd_preserve

  {

    void *marker;

*************** bfd_check_format_matches (bfd *abfd, bfd

*** 136,142 ****

      }

    if (abfd->format != bfd_unknown)

!     return abfd->format == format;

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

      {

--- 163,172 ----

      }

    if (abfd->format != bfd_unknown)

!     {

!       bfd_set_lto_type (abfd);

!       return abfd->format == format;

!     }

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

      {

*************** bfd_check_format_matches (bfd *abfd, bfd

*** 322,327 ****

--- 352,360 ----

        if (matching_vector)

  	free (matching_vector);

+ 

+       bfd_set_lto_type (abfd);

+ 

        /* File position has moved, BTW.  */

        return TRUE;

diff -cpr ../binutils-2.23.2.orig/bfd/opncls.c bfd/opncls.c

*** ../binutils-2.23.2.orig/bfd/opncls.c	2013-05-14 16:39:23.701717732 +0100

--- bfd/opncls.c	2013-05-14 16:40:07.008718933 +0100

*************** bfd_fill_in_gnu_debuglink_section (bfd *

*** 1569,1571 ****

--- 1569,1637 ----

    return TRUE;

  }

+ 

+ /*

+ FUNCTION

+ 	bfd_extract_object_only_section

+ 

+ SYNOPSIS

+ 	const char *bfd_extract_object_only_section

+ 	  (bfd *abfd);

+ 

+ DESCRIPTION

+ 

+ 	Takes a @var{ABFD} and extract the .gnu_object_only section into

+ 	a temporary file.

+ 

+ RETURNS

+ 	The name of the temporary file is returned if all is ok.

+ 	Otherwise <<NULL>> is returned and bfd_error is set.

+ */

+ 

+ const char *

+ bfd_extract_object_only_section (bfd *abfd)

+ {

+   asection *sec = abfd->object_only_section;

+   const char *name;

+   FILE *file;

+   bfd_byte *memhunk = NULL;

+   size_t off, size;

+   bfd_error_type err;

+ 

+   /* Get a temporary object-only file.  */

+   name = make_temp_file (".obj-only.o");

+ 

+   /* Open the object-only file.  */

+   file = real_fopen (name, FOPEN_WB);

+   if (!bfd_get_full_section_contents (abfd, sec, &memhunk))

+     {

+       err = bfd_get_error ();

+ 

+ loser:

+       free (memhunk);

+       fclose (file);

+       unlink (name);

+       bfd_set_error (err);

+       return NULL;

+     }

+ 

+   off = 0;

+   size = sec->size;

+   while (off != size)

+     {

+       size_t written, nwrite = size - off;

+ 

+       written = fwrite (memhunk + off, 1, nwrite, file);

+       if (written < nwrite && ferror (file))

+ 	{

+ 	  err = bfd_error_system_call;

+ 	  goto loser;

+ 	}

+ 

+       off += written;

+     }

+ 

+   free (memhunk);

+   fclose (file);

+   return name;

+ }

diff -cpr ../binutils-2.23.2.orig/bfd/plugin.c bfd/plugin.c

*** ../binutils-2.23.2.orig/bfd/plugin.c	2013-05-14 16:39:25.137717772 +0100

--- bfd/plugin.c	2013-05-14 16:40:07.010718933 +0100

*************** register_claim_file (ld_plugin_claim_fil

*** 130,135 ****

--- 130,268 ----

    return LDPS_OK;

  }

+ static asection bfd_plugin_fake_text_section

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

+ static asection bfd_plugin_fake_common_section

+   = BFD_FAKE_SECTION (bfd_plugin_fake_common_section, SEC_IS_COMMON, 0,

+ 		      NULL, 0);

+ 

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

+ 

+ static void

+ bfd_plugin_get_symbols_in_object_only (bfd *abfd)

+ {

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

+   const char *object_only_file;

+   bfd *nbfd;

+   long storage;

+   long object_only_nsyms, added_nsyms, i;

+   asymbol **object_only_syms, **added_syms;

+ 

+   plugin_data->object_only_syms = NULL;

+   plugin_data->object_only_nsyms = 0;

+ 

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

+     {

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

+       if (nbfd == NULL || !bfd_check_format (nbfd, bfd_object))

+ 	{

+ 	  (*_bfd_error_handler)

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

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

+ 	  bfd_close (nbfd);

+ 	  return;

+ 	}

+     }

+   else

+     {

+       if (!bfd_check_format (abfd, bfd_object))

+ 	{

+ 	  (*_bfd_error_handler)

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

+ 	     abfd, bfd_errmsg (bfd_get_error ()));

+ 	  return;

+ 	}

+       nbfd = abfd;

+     }

+ 

+   if (nbfd->lto_type == lto_mixed_object

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

+     {

+       object_only_file = bfd_extract_object_only_section (nbfd);

+       if (object_only_file == NULL)

+ 	(*_bfd_error_handler)

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

+ 	   abfd, bfd_errmsg (bfd_get_error ()));

+     }

+   else

+     object_only_file = NULL;

+ 

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

+   if (nbfd != abfd)

+     bfd_close (nbfd);

+ 

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

+      symbol in object only section.  */

+   if (!object_only_file)

+     return;

+ 

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

+   nbfd = bfd_openr (object_only_file, NULL);

+   if (!bfd_check_format (nbfd, bfd_object))

+     {

+       (*_bfd_error_handler)

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

+ 	 abfd, bfd_errmsg (bfd_get_error ()));

+       goto quit;

+     }

+ 

+   storage = bfd_get_symtab_upper_bound (nbfd);

+   if (storage <= 0)

+     {

+       if (storage < 0)

+ 	(*_bfd_error_handler)

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

+ 	   abfd, bfd_errmsg (bfd_get_error ()));

+ 

+       goto quit;

+     }

+ 

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

+   object_only_nsyms = bfd_canonicalize_symtab (nbfd, object_only_syms);

+ 

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

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

+   added_nsyms = 0;

+ 

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

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

+     {

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

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

+       asymbol *s;

+ 

+       if (bfd_is_com_section (sec))

+ 	sec = &bfd_plugin_fake_common_section;

+       else if (bfd_is_und_section (sec))

+ 	;

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

+ 	sec = &bfd_plugin_fake_text_section;

+       else

+ 	continue;

+ 

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

+       BFD_ASSERT (s);

+       added_syms[added_nsyms++] = s;

+ 

+       s->section = sec;

+       s->the_bfd = abfd;

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

+       s->value = 0;

+       s->flags = flags;

+       s->udata.p = NULL;

+     }

+ 

+   plugin_data->object_only_syms = added_syms;

+   plugin_data->object_only_nsyms = added_nsyms;

+ 

+   free (object_only_syms);

+ 

+ quit:

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

+   bfd_close (nbfd);

+   unlink (object_only_file);

+ }

+ 

  static enum ld_plugin_status

  add_symbols (void * handle,

  	     int nsyms,

*************** add_symbols (void * handle,

*** 142,148 ****

    plugin_data->nsyms = nsyms;

    plugin_data->syms = syms;

!   if (nsyms != 0)

      abfd->flags |= HAS_SYMS;

    abfd->tdata.plugin_data = plugin_data;

--- 275,283 ----

    plugin_data->nsyms = nsyms;

    plugin_data->syms = syms;

!   bfd_plugin_get_symbols_in_object_only (abfd);

! 

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

      abfd->flags |= HAS_SYMS;

    abfd->tdata.plugin_data = plugin_data;

*************** static long

*** 389,395 ****

  bfd_plugin_get_symtab_upper_bound (bfd *abfd)

  {

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

!   long nsyms = plugin_data->nsyms;

    BFD_ASSERT (nsyms >= 0);

--- 524,531 ----

  bfd_plugin_get_symtab_upper_bound (bfd *abfd)

  {

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

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

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

    BFD_ASSERT (nsyms >= 0);

*************** bfd_plugin_canonicalize_symtab (bfd *abf

*** 423,434 ****

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

    long nsyms = plugin_data->nsyms;

    const struct ld_plugin_symbol *syms = plugin_data->syms;

!   static asection fake_section;

!   static asection fake_common_section;

!   int i;

! 

!   fake_section.name = ".text";

!   fake_common_section.flags = SEC_IS_COMMON;

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

      {

--- 559,565 ----

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

    long nsyms = plugin_data->nsyms;

    const struct ld_plugin_symbol *syms = plugin_data->syms;

!   int i, j;

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

      {

*************** bfd_plugin_canonicalize_symtab (bfd *abf

*** 441,450 ****

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

        s->value = 0;

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

        switch (syms[i].def)

  	{

  	case LDPK_COMMON:

! 	  s->section = &fake_common_section;

  	  break;

  	case LDPK_UNDEF:

  	case LDPK_WEAKUNDEF:

--- 572,582 ----

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

        s->value = 0;

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

+       s->udata.p = NULL;

        switch (syms[i].def)

  	{

  	case LDPK_COMMON:

! 	  s->section = &bfd_plugin_fake_common_section;

  	  break;

  	case LDPK_UNDEF:

  	case LDPK_WEAKUNDEF:

*************** bfd_plugin_canonicalize_symtab (bfd *abf

*** 452,466 ****

  	  break;

  	case LDPK_DEF:

  	case LDPK_WEAKDEF:

! 	  s->section = &fake_section;

  	  break;

  	default:

  	  BFD_ASSERT (0);

  	}

- 

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

      }

    return nsyms;

  }

--- 584,601 ----

  	  break;

  	case LDPK_DEF:

  	case LDPK_WEAKDEF:

! 	  s->section = &bfd_plugin_fake_text_section;

  	  break;

  	default:

  	  BFD_ASSERT (0);

  	}

      }

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

+   nsyms += plugin_data->object_only_nsyms;

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

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

+ 

    return nsyms;

  }

diff -cpr ../binutils-2.23.2.orig/bfd/plugin.h bfd/plugin.h

*** ../binutils-2.23.2.orig/bfd/plugin.h	2013-05-14 16:39:25.481717782 +0100

--- bfd/plugin.h	2013-05-14 16:40:07.010718933 +0100

*************** typedef struct plugin_data_struct

*** 30,35 ****

--- 30,37 ----

  {

    int nsyms;

    const struct ld_plugin_symbol *syms;

+   int object_only_nsyms;

+   asymbol **object_only_syms;

  }

  plugin_data_struct;

diff -cpr ../binutils-2.23.2.orig/bfd/section.c bfd/section.c

*** ../binutils-2.23.2.orig/bfd/section.c	2013-05-14 16:39:26.180717801 +0100

--- bfd/section.c	2013-05-14 16:43:06.082723897 +0100

*************** CODE_FRAGMENT

*** 571,576 ****

--- 571,579 ----

  .  || ((SEC) == bfd_com_section_ptr)		\

  .  || ((SEC) == bfd_ind_section_ptr))

  .

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

+ .#define GNU_OBJECT_ONLY_SECTION_NAME ".gnu_object_only"

+ .

  .{* Macros to handle insertion and deletion of a bfd's sections.  These

  .   only handle the list pointers, ie. do not adjust section_count,

  .   target_index etc.  *}

diff -cpr ../binutils-2.23.2.orig/binutils/objcopy.c binutils/objcopy.c

*** ../binutils-2.23.2.orig/binutils/objcopy.c	2013-05-14 16:39:36.214718079 +0100

--- binutils/objcopy.c	2013-05-14 16:45:04.631727183 +0100

*************** is_specified_symbol (const char *name, h

*** 943,972 ****

    return htab_find (htab, name) != NULL;

  }

- /* Return a pointer to the symbol used as a signature for GROUP.  */

- 

- static asymbol *

- group_signature (asection *group)

- {

-   bfd *abfd = group->owner;

-   Elf_Internal_Shdr *ghdr;

- 

-   if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)

-     return NULL;

- 

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

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

-     {

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

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

- 

-       if (symhdr->sh_type == SHT_SYMTAB

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

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

-     }

-   return NULL;

- }

- 

  /* Return TRUE if the section is a DWO section.  */

  static bfd_boolean

--- 943,948 ----

*************** is_strip_section (bfd *abfd ATTRIBUTE_UN

*** 1034,1040 ****

        /* PR binutils/3181

  	 If we are going to strip the group signature symbol, then

  	 strip the group section too.  */

!       gsym = group_signature (sec);

        if (gsym != NULL)

  	gname = gsym->name;

        else

--- 1010,1016 ----

        /* PR binutils/3181

  	 If we are going to strip the group signature symbol, then

  	 strip the group section too.  */

!       gsym = bfd_group_signature (sec, isympp);

        if (gsym != NULL)

  	gname = gsym->name;

        else

*************** setup_section (bfd *ibfd, sec_ptr isecti

*** 2633,2639 ****

    if ((isection->flags & SEC_GROUP) != 0)

      {

!       asymbol *gsym = group_signature (isection);

        if (gsym != NULL)

  	{

--- 2609,2615 ----

    if ((isection->flags & SEC_GROUP) != 0)

      {

!       asymbol *gsym = bfd_group_signature (isection, isympp);

        if (gsym != NULL)

  	{

diff -cpr ../binutils-2.23.2.orig/binutils/readelf.c binutils/readelf.c

*** ../binutils-2.23.2.orig/binutils/readelf.c	2013-05-14 16:39:35.668718064 +0100

--- binutils/readelf.c	2013-05-14 16:40:07.022718933 +0100

*************** get_section_type_name (unsigned int sh_t

*** 3101,3106 ****

--- 3101,3107 ----

      case 0x7ffffffd:		return "AUXILIARY";

      case 0x7fffffff:		return "FILTER";

      case SHT_GNU_LIBLIST:	return "GNU_LIBLIST";

+     case SHT_GNU_OBJECT_ONLY:	return "GNU_OBJECT_ONLY";

      default:

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

diff -cpr ../binutils-2.23.2.orig/include/bfdlink.h include/bfdlink.h

*** ../binutils-2.23.2.orig/include/bfdlink.h	2013-05-14 16:39:19.745717623 +0100

--- include/bfdlink.h	2013-05-14 16:40:07.023718933 +0100

*************** struct bfd_link_info

*** 380,385 ****

--- 380,391 ----

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

    unsigned int allow_multiple_definition: 1;

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

+   unsigned int emit_gnu_object_only: 1;

+ 

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

+   unsigned int emitting_gnu_object_only: 1;

+ 

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

    unsigned int allow_undefined_version: 1;

diff -cpr ../binutils-2.23.2.orig/include/elf/common.h include/elf/common.h

*** ../binutils-2.23.2.orig/include/elf/common.h	2013-05-14 16:39:19.628717619 +0100

--- include/elf/common.h	2013-05-14 16:40:07.023718933 +0100

***************

*** 472,477 ****

--- 472,478 ----

  #define SHT_GNU_ATTRIBUTES 0x6ffffff5	/* Object attributes */

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

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

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

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

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

diff -cpr ../binutils-2.23.2.orig/ld/emultempl/alphaelf.em ld/emultempl/alphaelf.em

*** ../binutils-2.23.2.orig/ld/emultempl/alphaelf.em	2013-05-14 16:39:37.461718114 +0100

--- ld/emultempl/alphaelf.em	2013-05-14 16:40:07.030718933 +0100

*************** alpha_finish (void)

*** 100,106 ****

    if (limit_32bit)

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

!   finish_default ();

  }

  EOF

--- 100,106 ----

    if (limit_32bit)

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

!   gld${EMULATION_NAME}_finish ();

  }

  EOF

diff -cpr ../binutils-2.23.2.orig/ld/emultempl/armelf.em ld/emultempl/armelf.em

*** ../binutils-2.23.2.orig/ld/emultempl/armelf.em	2013-05-14 16:39:37.458718114 +0100

--- ld/emultempl/armelf.em	2013-05-14 16:40:07.033718933 +0100

*************** gld${EMULATION_NAME}_after_allocation (v

*** 366,372 ****

  }

  static void

! gld${EMULATION_NAME}_finish (void)

  {

    struct bfd_link_hash_entry * h;

--- 366,372 ----

  }

  static void

! arm_finish (void)

  {

    struct bfd_link_hash_entry * h;

*************** gld${EMULATION_NAME}_finish (void)

*** 389,395 ****

  	}

      }

!   finish_default ();

    if (thumb_entry_symbol)

      {

--- 389,395 ----

  	}

      }

!   gld${EMULATION_NAME}_finish ();

    if (thumb_entry_symbol)

      {

*************** LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=

*** 690,693 ****

  LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME}"_before_parse

  # Call the extra arm-elf function

! LDEMUL_FINISH=gld${EMULATION_NAME}_finish

--- 690,693 ----

  LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME}"_before_parse

  # Call the extra arm-elf function

! LDEMUL_FINISH=arm_finish

diff -cpr ../binutils-2.23.2.orig/ld/emultempl/elf32.em ld/emultempl/elf32.em

*** ../binutils-2.23.2.orig/ld/emultempl/elf32.em	2013-05-14 16:39:37.465718114 +0100

--- ld/emultempl/elf32.em	2013-05-14 16:40:07.035718933 +0100

*************** static void gld${EMULATION_NAME}_before_

*** 68,73 ****

--- 68,74 ----

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

  static lang_output_section_statement_type *gld${EMULATION_NAME}_place_orphan

    (asection *, const char *, int);

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

  EOF

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

*************** output_rel_find (asection *sec, int isdy

*** 1764,1769 ****

--- 1765,1772 ----

    return last;

  }

+ static int orphan_init_done = 0;

+ 

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

     sections in the right segment.  */

*************** gld${EMULATION_NAME}_place_orphan (asect

*** 1772,1778 ****

  				   const char *secname,

  				   int constraint)

  {

!   static struct orphan_save hold[] =

      {

        { ".text",

  	SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE,

--- 1775,1781 ----

  				   const char *secname,

  				   int constraint)

  {

!   static struct orphan_save orig_hold[] =

      {

        { ".text",

  	SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE,

*************** gld${EMULATION_NAME}_place_orphan (asect

*** 1799,1804 ****

--- 1802,1808 ----

  	SEC_HAS_CONTENTS,

  	0, 0, 0, 0 },

      };

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

    enum orphan_save_index

      {

        orphan_text = 0,

*************** gld${EMULATION_NAME}_place_orphan (asect

*** 1810,1816 ****

        orphan_sdata,

        orphan_nonalloc

      };

-   static int orphan_init_done = 0;

    struct orphan_save *place;

    lang_output_section_statement_type *after;

    lang_output_section_statement_type *os;

--- 1814,1819 ----

*************** gld${EMULATION_NAME}_place_orphan (asect

*** 1887,1901 ****

    if (!orphan_init_done)

      {