Skip to content

Commit 18b6e21

Browse files
authored
[Driver] Replace usage of -Bshareable linker flag with -shared (#65842)
The two flags mean the same thing for the bfd / lld linkers so just use the same flag consistently everywhere.
1 parent cbd6ac6 commit 18b6e21

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

clang/lib/Driver/ToolChains/DragonFly.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void dragonfly::Linker::ConstructJob(Compilation &C, const JobAction &JA,
6969
if (Args.hasArg(options::OPT_rdynamic))
7070
CmdArgs.push_back("-export-dynamic");
7171
if (Args.hasArg(options::OPT_shared))
72-
CmdArgs.push_back("-Bshareable");
72+
CmdArgs.push_back("-shared");
7373
else if (!Args.hasArg(options::OPT_r)) {
7474
CmdArgs.push_back("-dynamic-linker");
7575
CmdArgs.push_back("/usr/libexec/ld-elf.so.2");

clang/lib/Driver/ToolChains/FreeBSD.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ void freebsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
161161
if (Args.hasArg(options::OPT_rdynamic))
162162
CmdArgs.push_back("-export-dynamic");
163163
if (Args.hasArg(options::OPT_shared)) {
164-
CmdArgs.push_back("-Bshareable");
164+
CmdArgs.push_back("-shared");
165165
} else if (!Args.hasArg(options::OPT_r)) {
166166
CmdArgs.push_back("-dynamic-linker");
167167
CmdArgs.push_back("/libexec/ld-elf.so.1");

clang/lib/Driver/ToolChains/NetBSD.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void netbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
139139
if (Args.hasArg(options::OPT_rdynamic))
140140
CmdArgs.push_back("-export-dynamic");
141141
if (Args.hasArg(options::OPT_shared)) {
142-
CmdArgs.push_back("-Bshareable");
142+
CmdArgs.push_back("-shared");
143143
} else if (!Args.hasArg(options::OPT_r)) {
144144
Args.AddAllArgs(CmdArgs, options::OPT_pie);
145145
CmdArgs.push_back("-dynamic-linker");

clang/test/Driver/freebsd.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
// RUN: %clang --target=x86_64-pc-freebsd -shared %s \
129129
// RUN: --sysroot=%S/Inputs/multiarch_freebsd64_tree -### 2>&1 \
130130
// RUN: | FileCheck --check-prefix=CHECK-SHARED %s
131+
// CHECK-SHARED: ld{{.*}}" "--eh-frame-hdr" "-shared"
131132
// CHECK-SHARED: crti.o
132133
// CHECK-SHARED: crtbeginS.o
133134

clang/test/Driver/netbsd.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,20 +116,20 @@
116116

117117
// STATIC: ld{{.*}}" "--eh-frame-hdr"
118118
// STATIC-NOT: "-pie"
119-
// STATIC-NOT: "-Bshareable"
119+
// STATIC-NOT: "-shared"
120120
// STATIC: "-dynamic-linker" "/libexec/ld.elf_so"
121121
// STATIC-NOT: "-pie"
122-
// STATIC-NOT: "-Bshareable"
122+
// STATIC-NOT: "-shared"
123123
// STATIC: "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
124124
// STATIC: "{{.*}}/usr/lib{{/|\\\\}}crti.o" "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o"
125125
// STATIC: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
126126

127127
// STATIC-PIE: ld{{.*}}" "--eh-frame-hdr"
128128
// STATIC-PIE-NOT: "-dynamic-linker" "/libexec/ld.elf_so"
129-
// STATIC-PIE-NOT: "-Bshareable"
129+
// STATIC-PIE-NOT: "-shared"
130130
// STATIC-PIE: "-pie"
131131
// STATIC-PIE-NOT: "-dynamic-linker" "/libexec/ld.elf_so"
132-
// STATIC-PIE-NOT: "-Bshareable"
132+
// STATIC-PIE-NOT: "-shared"
133133
// STATIC-PIE: "{{.*}}/usr/lib{{/|\\\\}}crt0.o"
134134
// STATIC-PIE: "{{.*}}/usr/lib{{/|\\\\}}crti.o" "{{.*}}/usr/lib{{/|\\\\}}crtbeginS.o"
135135
// STATIC-PIE: "{{.*}}/usr/lib{{/|\\\\}}crtendS.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
@@ -142,9 +142,9 @@
142142
// SHARED: "{{.*}}/usr/lib{{/|\\\\}}crtendS.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
143143

144144
// PIE: ld{{.*}}" "--eh-frame-hdr"
145-
// PIE-NOT: "-Bshareable"
145+
// PIE-NOT: "-shared"
146146
// PIE: "-pie" "-dynamic-linker" "/libexec/ld.elf_so"
147-
// PIE-NOT: "-Bshareable"
147+
// PIE-NOT: "-shared"
148148
// PIE: "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}crti.o"
149149
// PIE: "{{.*}}/usr/lib{{/|\\\\}}crtbeginS.o"
150150
// PIE: "{{.*}}/usr/lib{{/|\\\\}}crtendS.o"

0 commit comments

Comments
 (0)