From: H.J. Lu <hjl@sourceware.org>
To: binutils-cvs@sourceware.org
Subject: [binutils-gdb] elf: Skip the archive if the symbol isn't referenced
Date: Wed, 17 Apr 2024 00:51:15 +0000 (GMT) [thread overview]
Message-ID: <20240417005115.0C8ED3858D20@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=c2fbf57864a2da2ceda81706a54d125ef3fce0a7
commit c2fbf57864a2da2ceda81706a54d125ef3fce0a7
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Tue Apr 16 15:48:21 2024 -0700
elf: Skip the archive if the symbol isn't referenced
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.
Diff:
---
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(-)
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 321e3d5e2ff..9c53bfcf7d4 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -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. */
diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
index 35ce38731d0..7b4b3492a2f 100644
--- a/ld/testsuite/ld-plugin/lto.exp
+++ b/ld/testsuite/ld-plugin/lto.exp
@@ -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
diff --git a/ld/testsuite/ld-plugin/pr31644a.c b/ld/testsuite/ld-plugin/pr31644a.c
new file mode 100644
index 00000000000..1c03a955c37
--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr31644a.c
@@ -0,0 +1,13 @@
+#include <stdio.h>
+
+void
+bar (void)
+{
+}
+
+int
+main()
+{
+ printf ("PASS\n");
+ return 0;
+}
diff --git a/ld/testsuite/ld-plugin/pr31644b.c b/ld/testsuite/ld-plugin/pr31644b.c
new file mode 100644
index 00000000000..8b23ec8f2b7
--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr31644b.c
@@ -0,0 +1,7 @@
+extern void bar (void);
+
+void
+foo (void)
+{
+ bar ();
+}
diff --git a/ld/testsuite/ld-plugin/pr31644c.c b/ld/testsuite/ld-plugin/pr31644c.c
new file mode 100644
index 00000000000..3d54205ea4d
--- /dev/null
+++ b/ld/testsuite/ld-plugin/pr31644c.c
@@ -0,0 +1,5 @@
+__attribute__ ((weak))
+void
+foo (void)
+{
+}
reply other threads:[~2024-04-17 0:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240417005115.0C8ED3858D20@sourceware.org \
--to=hjl@sourceware.org \
--cc=binutils-cvs@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).