source: patches/binutils-2.17-branch_update-1.patch@ f1758c8

bfd/bfd-in2.h

@@ -643 +643 @@
   DYN_NO_NEEDED = 8
 };
 
+enum notice_asneeded_action {
+  notice_as_needed,
+  notice_not_needed,
+  notice_needed
+};
+
 extern bfd_boolean bfd_elf_record_link_assignment
   (bfd *, struct bfd_link_info *, const char *, bfd_boolean,
    bfd_boolean);

bfd/bfd-in.h

@@ -636 +636 @@
   DYN_NO_NEEDED = 8
 };
 
+enum notice_asneeded_action {
+  notice_as_needed,
+  notice_not_needed,
+  notice_needed
+};
+
 extern bfd_boolean bfd_elf_record_link_assignment
   (bfd *, struct bfd_link_info *, const char *, bfd_boolean,
    bfd_boolean);

bfd/ChangeLog

@@ +1 @@
+2006-08-08  Nick Clifton  <nickc@redhat.com>
+
+        PR binutils/2724
+        * coffcode.h (coff_new_section_hook): Only modify the section
+        symbol of sections which were created by the user.
+
+2006-07-19  Alan Modra  <amodra@bigpond.net.au>
+
+        * bfd-in.h (enum notice_asneeded_action): Define.
+        * bfd-in2.h: Regenerate.
+        * elflink.c (elf_link_add_object_symbols): Call linker "notice"
+        function with NULL name for as-needed handling.
+
+2006-07-12  Matthew R. Dempsky  <mrd@alkemio.org>
+
+        * cpu-m68k.c (bfd_m68k_compatible): Handle CPU32.
+
+2006-06-23  Daniel Jacobowitz  <dan@codesourcery.com>
+
+        * Makefile.am: Clear RELEASE.
+        * Makefile.in: Regenerated.
+
 2006-06-23  Daniel Jacobowitz  <dan@codesourcery.com>
 
         * configure.in: Update version to 2.17.

bfd/coffcode.h

@@ -1546 +1546 @@
 static bfd_boolean
 coff_new_section_hook (bfd * abfd, asection * section)
 {
-  combined_entry_type *native;
-  bfd_size_type amt;
-
   section->alignment_power = COFF_DEFAULT_SECTION_ALIGNMENT_POWER;
 
 #ifdef RS6000COFF_C
@@ -1560 +1557 @@
     section->alignment_power = bfd_xcoff_data_align_power (abfd);
 #endif
 
-  /* Allocate aux records for section symbols, to store size and
-     related info.
-
-     @@ The 10 is a guess at a plausible maximum number of aux entries
-     (but shouldn't be a constant).  */
-  amt = sizeof (combined_entry_type) * 10;
-  native = bfd_zalloc (abfd, amt);
-  if (native == NULL)
-    return FALSE;
-
-  /* We don't need to set up n_name, n_value, or n_scnum in the native
-     symbol information, since they'll be overridden by the BFD symbol
-     anyhow.  However, we do need to set the type and storage class,
-     in case this symbol winds up getting written out.  The value 0
-     for n_numaux is already correct.  */
-
-  native->u.syment.n_type = T_NULL;
-  native->u.syment.n_sclass = C_STAT;
+  /* PR binutils/2724: Only real sections have a symbol that
+     has the coff_symbol_type structure allocated for it.  */
+  if (! bfd_is_const_section (section))
+    {
+      combined_entry_type *native;
+      bfd_size_type amt;
+
+      /* Allocate aux records for section symbols, to store size and
+         related info.
+
+         @@ The 10 is a guess at a plausible maximum number of aux entries
+         (but shouldn't be a constant).  */
+      amt = sizeof (combined_entry_type) * 10;
+      native = bfd_zalloc (abfd, amt);
+      if (native == NULL)
+        return FALSE;
 
-  coffsymbol (section->symbol)->native = native;
+      /* We don't need to set up n_name, n_value, or n_scnum in the native
+         symbol information, since they'll be overridden by the BFD symbol
+         anyhow.  However, we do need to set the type and storage class,
+         in case this symbol winds up getting written out.  The value 0
+         for n_numaux is already correct.  */
+      native->u.syment.n_type = T_NULL;
+      native->u.syment.n_sclass = C_STAT;
 
+      coffsymbol (section->symbol)->native = native;
+    }
+  
   coff_set_custom_section_alignment (abfd, section,
                                      coff_section_alignment_table,
                                      coff_section_alignment_table_size);

bfd/cpu-m68k.c

@@ -202 +202 @@
   if (a->mach <= bfd_mach_m68060 && b->mach <= bfd_mach_m68060)
     /* Merge m68k machine. */
     return a->mach > b->mach ? a : b;
+  else if (a->mach == bfd_mach_cpu32 && b->mach == bfd_mach_cpu32)
+    /* CPU32 is compatible with itself. */
+    return a;
   else if (a->mach >= bfd_mach_mcf_isa_a_nodiv
            && b->mach >= bfd_mach_mcf_isa_a_nodiv)
     {

bfd/elflink.c

@@ -3496 +3496 @@
       if (alloc_mark == NULL)
         goto error_free_vers;
 
+      /* Make a special call to the linker "notice" function to
+         tell it that we are about to handle an as-needed lib.  */
+      if (!(*info->callbacks->notice) (info, NULL, abfd, NULL,
+                                       notice_as_needed))
+        return FALSE;
+
+
       /* Clone the symbol table and sym hashes.  Remember some
          pointers into the symbol table, and dynamic symbol count.  */
       old_hash = (char *) old_tab + tabsize;
@@ -4169 +4176 @@
             }
         }
 
+      /* Make a special call to the linker "notice" function to
+         tell it that symbols added for crefs may need to be removed.  */
+      if (!(*info->callbacks->notice) (info, NULL, abfd, NULL,
+                                       notice_not_needed))
+        return FALSE;
+
       free (old_tab);
       objalloc_free_block ((struct objalloc *) htab->root.table.memory,
                            alloc_mark);
@@ -4179 +4192 @@
 
   if (old_tab != NULL)
     {
+      if (!(*info->callbacks->notice) (info, NULL, abfd, NULL,
+                                       notice_needed))
+        return FALSE;
       free (old_tab);
       old_tab = NULL;
     }

bfd/Makefile.am

@@ -3 +3 @@
 AUTOMAKE_OPTIONS = 1.9 cygnus
 
 # Uncomment the following line when doing a release.
-RELEASE=y
+# RELEASE=y
 
 INCDIR = $(srcdir)/../include
 CSEARCH = -I. -I$(srcdir) -I$(INCDIR)

bfd/version.h

@@ -1 @@
-#define BFD_VERSION_DATE 20060623
+#define BFD_VERSION_DATE 20061204
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING @bfd_version_string@

binutils/ChangeLog

@@ +1 @@
+2006-08-15  Nick Clifton  <nickc@redhat.com>
+
+        PR binutils/3039
+        * wrstabs.c (stab_tag_type): Initialize 'size'.
+
 2006-06-07  Joseph S. Myers  <joseph@codesourcery.com>
 
         * po/Make-in (pdf, ps): New dummy targets.

binutils/wrstabs.c

@@ -1869 +1869 @@
 {
   struct stab_write_handle *info = (struct stab_write_handle *) p;
   long index;
-  unsigned int size;
+  unsigned int size = 0;
 
   index = stab_get_struct_index (info, name, id, kind, &size);
   if (index < 0)

configure.in

@@ -130 +130 @@
 # know that we are building the simulator.
 # binutils, gas and ld appear in that order because it makes sense to run
 # "make check" in that particular order.
-host_tools="byacc flex bison binutils gas ld fixincludes gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
+host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
 
 # libgcj represents the runtime libraries only used by gcj.
 libgcj="target-libffi \

gas/ChangeLog

@@ +1 @@
+2006-07-19  Mat Hostetter  <mat@lcs.mit.edu>
+
+        * symbols.c (report_op_error): Fix pasto.  Don't use as_bad_where
+        when file and line unknown.
+
 2006-06-07  Joseph S. Myers  <joseph@codesourcery.com>
 
         * po/Make-in (pdf, ps): New dummy targets.

gas/symbols.c

@@ -928 +928 @@
           && seg_right != undefined_section)
         {
           if (right)
-            as_bad_where (file, line,
-                          _("invalid sections for operation on `%s' and `%s' setting `%s'"),
-                          S_GET_NAME (left), S_GET_NAME (right), S_GET_NAME (symp));
+            as_bad (_("invalid sections for operation on `%s' and `%s' setting `%s'"),
+                    S_GET_NAME (left), S_GET_NAME (right), S_GET_NAME (symp));
           else
-            as_bad_where (file, line,
-                          _("invalid section for operation on `%s' setting `%s'"),
-                          S_GET_NAME (left), S_GET_NAME (symp));
+            as_bad (_("invalid section for operation on `%s' setting `%s'"),
+                    S_GET_NAME (left), S_GET_NAME (symp));
         }
     }
 }

ld/ChangeLog

@@ +1 @@
+2006-07-19  Alan Modra  <amodra@bigpond.net.au>
+
+        * ld.h (handle_asneeded_cref): Declare.
+        * ldcref.c: Include objalloc.h.
+        (old_table, old_tab, alloc_mark): New variables.
+        (tabsize, entsize, refsize, old_symcount): Likewise.
+        (add_cref): Use bfd_hash_allocate for refs.
+        (handle_asneeded_cref): New function.
+        * ldmain.c (notice): Call handle_asneeded_cref for NULL name.
+
+2006-07-04  Daniel Jacobowitz  <dan@codesourcery.com>
+
+        Backport:
+        2006-05-19  Alan Modra  <amodra@bigpond.net.au>
+        * ldlang.c (lang_size_sections_1): Don't check mem regions for
+        os->ignored sections.
+
 2006-06-12  Fred Fish  <fnf@specifix.com>
 
         * emulparams/elf32bmip.sh (OTHER_SECTIONS): Keep the

ld/ldcref.c

@@ -27 +27 @@
 #include "sysdep.h"
 #include "bfdlink.h"
 #include "libiberty.h"
+#include "objalloc.h"
 
 #include "ld.h"
 #include "ldmain.h"
@@ -101 +102 @@
 
 static size_t cref_symcount;
 
+/* Used to take a snapshot of the cref hash table when starting to
+   add syms from an as-needed library.  */
+static struct bfd_hash_entry **old_table;
+static unsigned int old_size;
+static void *old_tab;
+static void *alloc_mark;
+static size_t tabsize, entsize, refsize;
+static size_t old_symcount;
+
 /* Create an entry in a cref hash table.  */
 
 static struct bfd_hash_entry *
@@ -165 +175 @@
 
   if (r == NULL)
     {
-      r = xmalloc (sizeof *r);
+      r = bfd_hash_allocate (&cref_table.root, sizeof *r);
+      if (r == NULL)
+        einfo (_("%X%P: cref alloc failed: %E\n"));
       r->next = h->refs;
       h->refs = r;
       r->abfd = abfd;
@@ -182 +194 @@
     r->def = TRUE;
 }
 
+/* Called before loading an as-needed library to take a snapshot of
+   the cref hash table, and after we have loaded or found that the
+   library was not needed.  */
+
+bfd_boolean
+handle_asneeded_cref (bfd *abfd ATTRIBUTE_UNUSED,
+                      enum notice_asneeded_action act)
+{
+  unsigned int i;
+
+  if (!cref_initialized)
+    return TRUE;
+
+  if (act == notice_as_needed)
+    {
+      char *old_ent, *old_ref;
+
+      for (i = 0; i < cref_table.root.size; i++)
+        {
+          struct bfd_hash_entry *p;
+          struct cref_hash_entry *c;
+          struct cref_ref *r;
+
+          for (p = cref_table.root.table[i]; p != NULL; p = p->next)
+            {
+              entsize += cref_table.root.entsize;
+              c = (struct cref_hash_entry *) p;
+              for (r = c->refs; r != NULL; r = r->next)
+                refsize += sizeof (struct cref_hash_entry);
+            }
+        }
+
+      tabsize = cref_table.root.size * sizeof (struct bfd_hash_entry *);
+      old_tab = xmalloc (tabsize + entsize + refsize);
+
+      alloc_mark = bfd_hash_allocate (&cref_table.root, 1);
+      if (alloc_mark == NULL)
+        return FALSE;
+
+      memcpy (old_tab, cref_table.root.table, tabsize);
+      old_ent = (char *) old_tab + tabsize;
+      old_ref = (char *) old_ent + entsize;
+      old_table = cref_table.root.table;
+      old_size = cref_table.root.size;
+      old_symcount = cref_symcount;
+
+      for (i = 0; i < cref_table.root.size; i++)
+        {
+          struct bfd_hash_entry *p;
+          struct cref_hash_entry *c;
+          struct cref_ref *r;
+
+          for (p = cref_table.root.table[i]; p != NULL; p = p->next)
+            {
+              memcpy (old_ent, p, cref_table.root.entsize);
+              old_ent = (char *) old_ent + cref_table.root.entsize;
+              c = (struct cref_hash_entry *) p;
+              for (r = c->refs; r != NULL; r = r->next)
+                {
+                  memcpy (old_ref, r, sizeof (struct cref_hash_entry));
+                  old_ref = (char *) old_ref + sizeof (struct cref_hash_entry);
+                }
+            }
+        }
+      return TRUE;
+    }
+
+  if (act == notice_not_needed)
+    {
+      char *old_ent, *old_ref;
+
+      if (old_tab == NULL)
+        {
+          /* The only way old_tab can be NULL is if the cref hash table
+             had not been initialised when notice_as_needed.  */
+          bfd_hash_table_free (&cref_table.root);
+          cref_initialized = FALSE;
+          return TRUE;
+        }
+
+      old_ent = (char *) old_tab + tabsize;
+      old_ref = (char *) old_ent + entsize;
+      cref_table.root.table = old_table;
+      cref_table.root.size = old_size;
+      memcpy (cref_table.root.table, old_tab, tabsize);
+      cref_symcount = old_symcount;
+
+      for (i = 0; i < cref_table.root.size; i++)
+        {
+          struct bfd_hash_entry *p;
+          struct cref_hash_entry *c;
+          struct cref_ref *r;
+
+          for (p = cref_table.root.table[i]; p != NULL; p = p->next)
+            {
+              memcpy (p, old_ent, cref_table.root.entsize);
+              old_ent = (char *) old_ent + cref_table.root.entsize;
+              c = (struct cref_hash_entry *) p;
+              for (r = c->refs; r != NULL; r = r->next)
+                {
+                  memcpy (r, old_ref, sizeof (struct cref_hash_entry));
+                  old_ref = (char *) old_ref + sizeof (struct cref_hash_entry);
+                }
+            }
+        }
+
+      objalloc_free_block ((struct objalloc *) cref_table.root.memory,
+                           alloc_mark);
+    }
+  else if (act != notice_needed)
+    return FALSE;
+
+  free (old_tab);
+  old_tab = NULL;
+  return TRUE;
+}
+
 /* Copy the addresses of the hash table entries into an array.  This
    is called via cref_hash_traverse.  We also fill in the demangled
    name.  */

ld/ld.h

@@ -1 +1 @@
 /* ld.h -- general linker header file
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005
+   2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
 
    This file is part of GLD, the Gnu Linker.
@@ -282 +282 @@
 
 extern int yyparse (void);
 extern void add_cref (const char *, bfd *, asection *, bfd_vma);
+extern bfd_boolean handle_asneeded_cref (bfd *, enum notice_asneeded_action);
 extern void output_cref (FILE *);
 extern void check_nocrossrefs (void);
 extern void ld_abort (const char *, int, const char *) ATTRIBUTE_NORETURN;

ld/ldlang.c

@@ -4207 +4207 @@
                     /* If a loadable section is using the default memory
                        region, and some non default memory regions were
                        defined, issue an error message.  */
-                    if (!IGNORE_SECTION (os->bfd_section)
+                    if (!os->ignored
+                        && !IGNORE_SECTION (os->bfd_section)
                         && ! link_info.relocatable
                         && check_regions
                         && strcmp (os->region->name,

ld/ldmain.c

@@ -1511 +1511 @@
         asection *section,
         bfd_vma value)
 {
+  if (name == NULL)
+    {
+      if (command_line.cref || nocrossref_list != NULL)
+        return handle_asneeded_cref (abfd, value);
+      return TRUE;
+    }
+
   if (! info->notice_all
       || (info->notice_hash != NULL
           && bfd_hash_lookup (info->notice_hash, name, FALSE, FALSE) != NULL))

ld/testsuite/ChangeLog

@@ +1 @@
+2006-07-12  Richard Sandiford  <richard@codesourcery.com>
+
+        * ld-m68k/merge-ok-1c.d: New test.
+        * ld-m68k/m68k.exp: Run it.
+
+2006-07-04  Daniel Jacobowitz  <dan@codesourcery.com>
+
+        Backport:
+        2006-05-19  Alan Modra  <amodra@bigpond.net.au>
+        * ld-scripts/empty-orphan.d: Update again.
+
+        * ld-scripts/empty-orphan.t: Discard .reginfo.
+        * ld-scripts/empty-orphan.d: Update.
+
 2006-06-12  Daniel Jacobowitz  <dan@codesourcery.com>
 
         Backport:

ld/testsuite/ld-m68k/m68k.exp

@@ -53 +53 @@
 run_dump_test "merge-error-1e"
 run_dump_test "merge-ok-1a"
 run_dump_test "merge-ok-1b"
+run_dump_test "merge-ok-1c"

ld/testsuite/ld-m68k/merge-ok-1c.d

@@ +1 @@
+#source: merge-error-1a.s -march=cpu32
+#source: merge-error-1b.s -march=cpu32
+#ld: -r
+#objdump: -p
+#...
+private flags = 810000: \[cpu32\]

ld/testsuite/ld-scripts/empty-orphan.d

@@ -1 +1 @@
 #source: empty-orphan.s
 #ld: -T empty-orphan.t
-#error: no memory region specified for loadable section
+#readelf: -l --wide
+#...
+ +LOAD +[x0-9a-f]+ [x0]+70000000 [x0]+70000000 [x0]+(2|4|8|10|20|40|80) .*
+#pass

ld/testsuite/ld-scripts/empty-orphan.t

@@ -17 +17 @@
    .text : { *(.text) } > text_mem : text_phdr
    .data : { *(.data) } > data_mem : data_phdr
    .bss : { *(.bss) } > data_mem : data_phdr
+   /DISCARD/ : { *(.reginfo) }
    /* .orphan_data is an orphan */
 }