OSDN Git Service

binutils/
authorAlan Modra <amodra@bigpond.net.au>
Sat, 31 Jan 2009 11:44:37 +0000 (11:44 +0000)
committerAlan Modra <amodra@bigpond.net.au>
Sat, 31 Jan 2009 11:44:37 +0000 (11:44 +0000)
* NEWS: Mention --as-needed change.
ld/
* ld.texinfo (--as-needed): Update.
bfd/
* elflink.c (on_needed_list): New function.
(elf_link_add_object_symbols): Link in --as-needed libs if they
satisfy undefined symbols in other libs.

bfd/ChangeLog
bfd/elflink.c

index d47fbe2..ba07018 100644 (file)
@@ -1,3 +1,9 @@
+2009-01-31  Alan Modra  <amodra@bigpond.net.au>
+
+       * elflink.c (on_needed_list): New function.
+       (elf_link_add_object_symbols): Link in --as-needed libs if they
+       satisfy undefined symbols in other libs.
+
 2009-01-30  Julian Brown  <julian@codesourcery.com>
 
        * elf32-arm.c (bfd_elf32_arm_vfp11_erratum_scan): Skip BFDs with
index 927f1c4..8685a2f 100644 (file)
@@ -3199,6 +3199,16 @@ elf_add_dt_needed_tag (bfd *abfd,
   return 0;
 }
 
+static bfd_boolean
+on_needed_list (const char *soname, struct bfd_link_needed_list *needed)
+{
+  for (; needed != NULL; needed = needed->next)
+    if (strcmp (soname, needed->name) == 0)
+      return TRUE;
+
+  return FALSE;
+}
+
 /* Sort symbol by value and section.  */
 static int
 elf_sort_symbol (const void *arg1, const void *arg2)
@@ -4434,8 +4444,11 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
 
          if (!add_needed
              && definition
-             && dynsym
-             && h->ref_regular)
+             && ((dynsym
+                  && h->ref_regular)
+                 || (h->ref_dynamic
+                     && (elf_dyn_lib_class (abfd) & DYN_AS_NEEDED) != 0
+                     && !on_needed_list (elf_dt_name (abfd), htab->needed))))
            {
              int ret;
              const char *soname = elf_dt_name (abfd);