Skip to content

Commit e08bab8

Browse files
brad0tstellar
authored andcommitted
[Driver][DragonFly] -r: imply -nostdlib like GCC
Similar to D116843 for Gnu.cpp Reviewed By: MaskRay Differential Revision: https://reviews.llvm.org/D119656 (cherry picked from commit cbd9d13)
1 parent 21f87ad commit e08bab8

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

clang/lib/Driver/ToolChains/DragonFly.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ void dragonfly::Linker::ConstructJob(Compilation &C, const JobAction &JA,
9191
assert(Output.isNothing() && "Invalid output.");
9292
}
9393

94-
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
94+
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles,
95+
options::OPT_r)) {
9596
if (!Args.hasArg(options::OPT_shared)) {
9697
if (Args.hasArg(options::OPT_pg))
9798
CmdArgs.push_back(
@@ -119,7 +120,8 @@ void dragonfly::Linker::ConstructJob(Compilation &C, const JobAction &JA,
119120

120121
AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA);
121122

122-
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
123+
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs,
124+
options::OPT_r)) {
123125
CmdArgs.push_back("-L/usr/lib/gcc80");
124126

125127
if (!Args.hasArg(options::OPT_static)) {
@@ -158,7 +160,8 @@ void dragonfly::Linker::ConstructJob(Compilation &C, const JobAction &JA,
158160
}
159161
}
160162

161-
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
163+
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles,
164+
options::OPT_r)) {
162165
if (Args.hasArg(options::OPT_shared) || Args.hasArg(options::OPT_pie))
163166
CmdArgs.push_back(
164167
Args.MakeArgString(getToolChain().GetFilePath("crtendS.o")));

clang/test/Driver/dragonfly.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,9 @@
44
// CHECK: clang{{.*}}" "-cc1" "-triple" "x86_64-pc-dragonfly"
55
// CHECK: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/usr/libexec/ld-elf.so.{{.*}}" "--hash-style=gnu" "--enable-new-dtags" "-o" "a.out" "{{.*}}crt1.o" "{{.*}}crti.o" "{{.*}}crtbegin.o" "{{.*}}.o" "-L{{.*}}gcc{{.*}}" "-rpath" "{{.*}}gcc{{.*}}" "-lc" "-lgcc" "{{.*}}crtend.o" "{{.*}}crtn.o"
66

7-
7+
// -r suppresses default -l and crt*.o like -nostdlib.
8+
// RUN: %clang -### %s --target=x86_64-pc-dragonfly -r \
9+
// RUN: 2>&1 | FileCheck %s --check-prefix=RELOCATABLE
10+
// RELOCATABLE: "-r"
11+
// RELOCATABLE-NOT: "-l
12+
// RELOCATABLE-NOT: {{.*}}crt{{[^.]+}}.o

0 commit comments

Comments
 (0)