LD/ELF: Unify STB_GNU_UNIQUE handling

[deliverable/binutils-gdb.git] / bfd / stabs.c

diff --git a/bfd/stabs.c b/bfd/stabs.c
index 93ab0a68861f5a109b4cd67d2124d2e2ee817dac..8049bb0ac162fa953b3eda7152838a4138aeaef7 100644 (file)
--- a/bfd/stabs.c
+++ b/bfd/stabs.c
@@ -1,13 +1,12 @@
 /* Stabs in sections linking support.
 /* Stabs in sections linking support.

-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006 Free Software Foundation, Inc.
+   Copyright (C) 1996-2016 Free Software Foundation, Inc.

    Written by Ian Lance Taylor, Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Written by Ian Lance Taylor, Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -17,13 +16,15 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+

 
 /* This file contains support for linking stabs in sections, as used
    on COFF and ELF.  */
 
 
 /* This file contains support for linking stabs in sections, as used
    on COFF and ELF.  */
 

-#include "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "libbfd.h"
 #include "aout/stab_gnu.h"
 #include "safe-ctype.h"
 #include "libbfd.h"
 #include "aout/stab_gnu.h"
 #include "safe-ctype.h"


@@ -125,8 +126,8 @@ stab_link_includes_newfunc (struct bfd_hash_entry *entry,
   /* Allocate the structure if it has not already been allocated by a
      subclass.  */
   if (ret == NULL)
   /* Allocate the structure if it has not already been allocated by a
      subclass.  */
   if (ret == NULL)

-    ret = bfd_hash_allocate (table,
-                            sizeof (struct stab_link_includes_entry));
+    ret = (struct stab_link_includes_entry *)
+        bfd_hash_allocate (table, sizeof (struct stab_link_includes_entry));

   if (ret == NULL)
     return NULL;
 
   if (ret == NULL)
     return NULL;
 


@@ -335,7 +336,7 @@ _bfd_link_section_stabs (bfd *abfd,
                      if (num_chars >= buf_len)
                        {
                          buf_len += 32 * 1024;
                      if (num_chars >= buf_len)
                        {
                          buf_len += 32 * 1024;

-                         symb = bfd_realloc (symb, buf_len);
+                         symb = (char *) bfd_realloc_or_free (symb, buf_len);

                          if (symb == NULL)
                            goto error_return;
                          symb_rover = symb + num_chars;
                          if (symb == NULL)
                            goto error_return;
                          symb_rover = symb + num_chars;


@@ -373,7 +374,7 @@ _bfd_link_section_stabs (bfd *abfd,
          /* Record this symbol, so that we can set the value
             correctly.  */
          amt = sizeof *ne;
          /* Record this symbol, so that we can set the value
             correctly.  */
          amt = sizeof *ne;

-         ne = bfd_alloc (abfd, amt);
+         ne = (struct stab_excl_list *) bfd_alloc (abfd, amt);

          if (ne == NULL)
            goto error_return;
          ne->offset = sym - stabbuf;
          if (ne == NULL)
            goto error_return;
          ne->offset = sym - stabbuf;


@@ -386,12 +387,14 @@ _bfd_link_section_stabs (bfd *abfd,
            {
              /* This is the first time we have seen this header file
                 with this set of stabs strings.  */
            {
              /* This is the first time we have seen this header file
                 with this set of stabs strings.  */

-             t = bfd_hash_allocate (&sinfo->includes, sizeof *t);
+             t = (struct stab_link_includes_totals *)
+                  bfd_hash_allocate (&sinfo->includes, sizeof *t);

              if (t == NULL)
                goto error_return;
              t->sum_chars = sum_chars;
              t->num_chars = num_chars;
              if (t == NULL)
                goto error_return;
              t->sum_chars = sum_chars;
              t->num_chars = num_chars;

-             t->symb = bfd_realloc (symb, num_chars); /* Trim data down.  */
+              /* Trim data down.  */
+             t->symb = symb = (char *) bfd_realloc_or_free (symb, num_chars);

              t->next = incl_entry->totals;
              incl_entry->totals = t;
            }
              t->next = incl_entry->totals;
              incl_entry->totals = t;
            }


@@ -469,7 +472,7 @@ _bfd_link_section_stabs (bfd *abfd,
       bfd_size_type *pskips;
 
       amt = count * sizeof (bfd_size_type);
       bfd_size_type *pskips;
 
       amt = count * sizeof (bfd_size_type);

-      secinfo->cumulative_skips = bfd_alloc (abfd, amt);
+      secinfo->cumulative_skips = (bfd_size_type *) bfd_alloc (abfd, amt);

       if (secinfo->cumulative_skips == NULL)
        goto error_return;
 
       if (secinfo->cumulative_skips == NULL)
        goto error_return;
 


@@ -533,7 +536,7 @@ _bfd_discard_section_stabs (bfd *abfd,
        link, so we should just ignore them.  */
     return FALSE;
 
        link, so we should just ignore them.  */
     return FALSE;
 

-  /* We should have initialized our data in _bfd_link_stab_sections.
+  /* We should have initialized our data in _bfd_link_section_stabs.

      If there was some bizarre error reading the string sections, though,
      we might not have.  Bail rather than asserting.  */
   if (psecinfo == NULL)
      If there was some bizarre error reading the string sections, though,
      we might not have.  Bail rather than asserting.  */
   if (psecinfo == NULL)


@@ -622,7 +625,7 @@ _bfd_discard_section_stabs (bfd *abfd,
       if (secinfo->cumulative_skips == NULL)
        {
          amt = count * sizeof (bfd_size_type);
       if (secinfo->cumulative_skips == NULL)
        {
          amt = count * sizeof (bfd_size_type);

-         secinfo->cumulative_skips = bfd_alloc (abfd, amt);
+         secinfo->cumulative_skips = (bfd_size_type *) bfd_alloc (abfd, amt);

          if (secinfo->cumulative_skips == NULL)
            goto error_return;
        }
          if (secinfo->cumulative_skips == NULL)
            goto error_return;
        }