elf: Skip the archive if the symbol isn't referenced
Checks
Commit Message
Also skip the archive if the symbol isn't referenced by a regular object.
bfd/
PR ld/31644
* elflink.c (elf_link_add_archive_symbols): Also skip the archive
if the symbol isn't referenced by a regular object.
ld/
PR ld/31644
* testsuite/ld-plugin/lto.exp: Run PR ld/31644 tests.
* testsuite/ld-plugin/pr31644a.c: New test.
* testsuite/ld-plugin/pr31644b.c: Likewise.
* testsuite/ld-plugin/pr31644c.c: Likewise.
---
bfd/elflink.c | 8 +++++---
ld/testsuite/ld-plugin/lto.exp | 24 ++++++++++++++++++++++++
ld/testsuite/ld-plugin/pr31644a.c | 13 +++++++++++++
ld/testsuite/ld-plugin/pr31644b.c | 7 +++++++
ld/testsuite/ld-plugin/pr31644c.c | 5 +++++
5 files changed, 54 insertions(+), 3 deletions(-)
create mode 100644 ld/testsuite/ld-plugin/pr31644a.c
create mode 100644 ld/testsuite/ld-plugin/pr31644b.c
create mode 100644 ld/testsuite/ld-plugin/pr31644c.c
Comments
On Tue, Apr 16, 2024 at 03:48:21PM -0700, H.J. Lu wrote:
> Also skip the archive if the symbol isn't referenced by a regular object.
>
> bfd/
>
> PR ld/31644
> * elflink.c (elf_link_add_archive_symbols): Also skip the archive
> if the symbol isn't referenced by a regular object.
>
> ld/
>
> PR ld/31644
> * testsuite/ld-plugin/lto.exp: Run PR ld/31644 tests.
> * testsuite/ld-plugin/pr31644a.c: New test.
> * testsuite/ld-plugin/pr31644b.c: Likewise.
> * testsuite/ld-plugin/pr31644c.c: Likewise.
OK.
@@ -6261,9 +6261,11 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info)
if (!is_elf_hash_table (info->hash))
continue;
- /* Ignore the archive if the symbol isn't defined in a
- shared object. */
- if (!((struct elf_link_hash_entry *) h)->def_dynamic)
+ struct elf_link_hash_entry *eh
+ = (struct elf_link_hash_entry *) h;
+ /* Ignore the archive if the symbol isn't referenced by a
+ regular object or isn't defined in a shared object. */
+ if (!eh->ref_regular || !eh->def_dynamic)
continue;
/* Ignore the dynamic definition if symbol is first
defined in this archive. */
@@ -579,6 +579,22 @@ set lto_link_elf_tests [list \
"" \
"pr31615d.so" \
] \
+ [list \
+ "Build pr31644b.a" \
+ "" \
+ "" \
+ {pr31644b.c} \
+ "" \
+ "pr31644b.a" \
+ ] \
+ [list \
+ "Build pr31644c.so" \
+ "-shared" \
+ "-fPIC" \
+ {pr31644c.c} \
+ "" \
+ "pr31644c.so" \
+ ] \
]
# PR 14918 checks that libgcc is not spuriously included in a shared link of
@@ -788,6 +804,14 @@ set lto_run_elf_shared_tests [list \
{pr31615a.c} {pr31615b.exe} {pass.out} {-O3 -flto} {c} {} \
{-Wl,--as-needed tmpdir/pr31615c.so -Wl,--no-as-needed \
tmpdir/pr31615d.so}] \
+ [list {pr31644a} \
+ {-Wl,-R,tmpdir} {} \
+ {pr31644a.c} {pr31644a.exe} {pass.out} {-flto} {c} {} \
+ {-Wl,--no-as-needed tmpdir/pr31644b.a tmpdir/pr31644c.so}] \
+ [list {pr31644b} \
+ {-Wl,-R,tmpdir} {} \
+ {pr31644a.c} {pr31644b.exe} {pass.out} {-flto} {c} {} \
+ {-Wl,--as-needed tmpdir/pr31644b.a tmpdir/pr31644c.so}] \
]
# LTO run-time tests for ELF
new file mode 100644
@@ -0,0 +1,13 @@
+#include <stdio.h>
+
+void
+bar (void)
+{
+}
+
+int
+main()
+{
+ printf ("PASS\n");
+ return 0;
+}
new file mode 100644
@@ -0,0 +1,7 @@
+extern void bar (void);
+
+void
+foo (void)
+{
+ bar ();
+}
new file mode 100644
@@ -0,0 +1,5 @@
+__attribute__ ((weak))
+void
+foo (void)
+{
+}