PR ld/12549

bfd/
	* elflink.c (elf_link_add_object_symbols): Exclude weak refs when
	considering whether an --as-needed library is needed.
ld/
	* ld.texinfo (--as-needed): Update.
ld/testsuite/
	* ld-elf/pr14862.out: Expect no output.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 40bb0a1b8d2fde805dd10d7a7c37d39e04111b39..b710f3c5c2f681fbe58b6c3b9d88954344ec3265 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-18  Alan Modra  <amodra@gmail.com>
+
+       PR ld/12549
+       * elflink.c (elf_link_add_object_symbols): Exclude weak refs when
+       considering whether an --as-needed library is needed.
+
 2013-03-14  Tom Tromey  <tromey@redhat.com>
 
        * opncls.c (bfd_get_debug_link_info): Rename from

diff --git a/bfd/elflink.c b/bfd/elflink.c
index ba65f21aaa38935706508530105631c5d23e5002..8055d26ed7526abc618bcd857cce972f51661f8d 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -4482,10 +4482,10 @@ error_free_dyn:
          if (!add_needed
              && definition
              && ((dynsym
-                  && h->ref_regular
+                  && h->ref_regular_nonweak
                   && (undef_bfd == NULL
                       || (undef_bfd->flags & BFD_PLUGIN) == 0))
-                 || (h->ref_dynamic
+                 || (h->ref_dynamic_nonweak
                      && (elf_dyn_lib_class (abfd) & DYN_AS_NEEDED) != 0
                      && !on_needed_list (elf_dt_name (abfd), htab->needed))))
            {

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 1bb67a30e057caaea61d924b1b28b89078019f80..9d5a23dc484031c232bf3f3976ea50f4f02cb69a 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-18  Alan Modra  <amodra@gmail.com>
+
+       * ld.texinfo (--as-needed): Update.
+
 2013-03-14  Jakub Jelinek  <jakub@redhat.com>
 
        * emulparams/aarch64linux.sh (LIBPATH_SUFFIX): Set to 64 for

diff --git a/ld/ld.texinfo b/ld/ld.texinfo
index cc4e735b33a4b88a3e9a04cace507887f76167f2..1f8e34db94f5b32d15ff8cd56bdbaa6c7a41a882 100644 (file)
--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
@@ -1143,11 +1143,14 @@ on the command line after the @option{--as-needed} option.  Normally
 the linker will add a DT_NEEDED tag for each dynamic library mentioned
 on the command line, regardless of whether the library is actually
 needed or not.  @option{--as-needed} causes a DT_NEEDED tag to only be
-emitted for a library that satisfies an undefined symbol reference
-from a regular object file or, if the library is not found in the
-DT_NEEDED lists of other libraries linked up to that point, an
-undefined symbol reference from another dynamic library.
-@option{--no-as-needed} restores the default behaviour.
+emitted for a library that @emph{at that point in the link} satisfies a
+non-weak undefined symbol reference from a regular object file or, if
+the library is not found in the DT_NEEDED lists of other libraries, a
+non-weak undefined symbol reference from another dynamic library.
+Object files or libraries appearing on the command line @emph{after}
+the library in question do not affect whether the library is seen as
+needed.  This is similar to the rules for extraction of object files
+from archives.  @option{--no-as-needed} restores the default behaviour.
 
 @kindex --add-needed
 @kindex --no-add-needed

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index dec9d3669eacef4a0bdd76c5c4a358975f35f03f..c14d5791d80be62b0400fb217b416d6f5ca4846c 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-18  Alan Modra  <amodra@gmail.com>
+
+       * ld-elf/pr14862.out: Expect no output.
+
 2013-03-15  Will Newton  <will.newton@linaro.org>
 
        * ld-arm/arm-elf.exp: Expand *-*eabi test to cover *-*eabi*.

diff --git a/ld/testsuite/ld-elf/pr14862.out b/ld/testsuite/ld-elf/pr14862.out
index d86bac9de59abcc26bc7956c1e842237c7581859..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/ld/testsuite/ld-elf/pr14862.out
+++ b/ld/testsuite/ld-elf/pr14862.out
@@ -1 +0,0 @@
-OK