From: Fangrui Song <maskray@google.com>
To: binutils@sourceware.org, Alan Modra <amodra@gmail.com>,
Nick Clifton <nickc@redhat.com>
Cc: Fangrui Song <maskray@google.com>
Subject: [PATCH] objcopy --weaken-symbol: apply to STB_GNU_UNIQUE symbols
Date: Tue, 1 Mar 2022 13:36:06 -0800 [thread overview]
Message-ID: <20220301213606.259903-1-maskray@google.com> (raw)
PR binutils/28926
* objcopy.c (filter_symbols): Apply weaken to STB_GNU_UNIQUE symbols
* NEWS: Mention feature.
* testsuite/binutils-all/objcopy.exp (objcopy_test_symbol_manipulation): New test.
* testsuite/binutils-all/weaken-gnu-unique.s: New.
---
binutils/NEWS | 3 +++
binutils/objcopy.c | 4 ++--
binutils/testsuite/binutils-all/objcopy.exp | 4 ++++
binutils/testsuite/binutils-all/weaken-gnu-unique.d | 8 ++++++++
4 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 binutils/testsuite/binutils-all/weaken-gnu-unique.d
diff --git a/binutils/NEWS b/binutils/NEWS
index c188b469a77..06f34c9a992 100644
--- a/binutils/NEWS
+++ b/binutils/NEWS
@@ -1,5 +1,8 @@
-*- text -*-
+* objcopy --weaken, --weaken-symbol, and --weaken-symbols now make ELF
+ STB_GNU_UNIQUE symbols weak.
+
Changes in 2.38:
* elfedit: Add --output-abiversion option to update ABIVERSION.
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index d53aa5c6000..aaa5aa9b2af 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -1681,11 +1681,11 @@ filter_symbols (bfd *abfd, bfd *obfd, asymbol **osyms,
if (keep)
{
- if (((flags & BSF_GLOBAL) != 0
+ if (((flags & (BSF_GLOBAL | BSF_GNU_UNIQUE))
|| undefined)
&& (weaken || is_specified_symbol (name, weaken_specific_htab)))
{
- sym->flags &= ~ BSF_GLOBAL;
+ sym->flags &= ~ (BSF_GLOBAL | BSF_GNU_UNIQUE);
sym->flags |= BSF_WEAK;
}
diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index 32c76a11f3b..9a5dad5384e 100644
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -1144,6 +1144,10 @@ proc objcopy_test_symbol_manipulation {} {
verbose [file rootname $t]
run_dump_test [file rootname $t]
}
+
+ if { [supports_gnu_unique] } {
+ run_dump_test "weaken-gnu-unique"
+ }
}
proc objcopy_test_elf_common_symbols {} {
diff --git a/binutils/testsuite/binutils-all/weaken-gnu-unique.d b/binutils/testsuite/binutils-all/weaken-gnu-unique.d
new file mode 100644
index 00000000000..b0e60c4ff80
--- /dev/null
+++ b/binutils/testsuite/binutils-all/weaken-gnu-unique.d
@@ -0,0 +1,8 @@
+#name: weaken STB_GNU_UNIQUE symbols
+#PROG: objcopy
+#objcopy: -W foo
+#source: unique.s
+#readelf: -s
+
+#...
+ +[0-9]+: +[0-9a-f]+ +[0-9]+ +OBJECT +WEAK +DEFAULT +[1-9] foo
--
2.35.1.574.g5d30c73bfb-goog
next reply other threads:[~2022-03-01 21:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-01 21:36 Fangrui Song [this message]
2022-03-01 21:56 ` Fangrui Song
2022-03-09 0:15 ` [PING] " Fangrui Song
[not found] ` <CAN30aBFa+x5SpgE9HvY467jj2vR=YMUWrMVUq=yD723g5xh+mA@mail.gmail.com>
2022-03-16 1:12 ` Fangrui Song
[not found] ` <BN6PR1201MB00972ACA5F0D8900F1E72764CB119@BN6PR1201MB0097.namprd12.prod.outlook.com>
2022-03-16 13:54 ` Nick Clifton
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=20220301213606.259903-1-maskray@google.com \
--to=maskray@google.com \
--cc=amodra@gmail.com \
--cc=binutils@sourceware.org \
--cc=nickc@redhat.com \
/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).