Skip to content

Commit 7f9e12f

Browse files
quic-garvguptquic-garvgupt
committed
Propogate linker flags when -static-pie is enabled in BareMetal
toolchain Change-Id: I580875585e9eac2e9568e84650265f71d028f3ff
1 parent 6f96fc8 commit 7f9e12f

File tree

7 files changed

+52
-28
lines changed

7 files changed

+52
-28
lines changed

‎clang/lib/Driver/ToolChains/BareMetal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA,
605605
CmdArgs.push_back(Args.MakeArgString("--sysroot=" + D.SysRoot));
606606

607607
CmdArgs.push_back("-Bstatic");
608-
if(IsStaticPIE) {
608+
if (IsStaticPIE) {
609609
CmdArgs.push_back("-pie");
610610
CmdArgs.push_back("--no-dynamic-linker");
611611
CmdArgs.push_back("-z");

‎clang/lib/Driver/ToolChains/CommonArgs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2089,7 +2089,7 @@ tools::ParsePICArgs(const ToolChain &ToolChain, const ArgList &Args) {
20892089
return std::make_tuple(RelocM, 0U, false);
20902090
}
20912091

2092-
bool getStaticPIE(const ArgList &Args, const ToolChain &TC) {
2092+
bool tools::getStaticPIE(const ArgList &Args, const ToolChain &TC) {
20932093
bool HasStaticPIE = Args.hasArg(options::OPT_static_pie);
20942094
if (HasStaticPIE && Args.hasArg(options::OPT_no_pie)) {
20952095
const Driver &D = TC.getDriver();

‎clang/test/Driver/aarch64-toolchain.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,15 @@
157157
// AARCH64-BAREMETAL-UNWINDLIB: "{{.*}}clang_rt.crtbegin.o"
158158
// AARCH64-BAREMETAL-UNWINDLIB: "--start-group" "{{.*}}libclang_rt.builtins{{.*}}.a" "--as-needed" "-lunwind" "--no-as-needed" "-lc" "-lgloss" "--end-group"
159159
// AARCH64-BAREMETAL-UNWINDLIB: "{{.*}}clang_rt.crtend.o"
160+
161+
// RUN: %clang -static-pie -### %s -fuse-ld= \
162+
// RUN: --target=aarch64-none-elf --rtlib=libgcc --unwindlib=platform \
163+
// RUN: --gcc-toolchain=%S/Inputs/basic_aarch64_gcc_tree \
164+
// RUN: --sysroot=%S/Inputs/basic_arm_gcc_tree/aarch64-none-elf 2>&1 \
165+
// RUN: | FileCheck -check-prefix=C-ARM-STATIC-PIE %s
166+
167+
// C-ARM-STATIC-PIE: "-Bstatic" "-pie" "--no-dynamic-linker" "-z" "text" "-m" "aarch64linux" "-EL"
168+
// C-ARM-STATIC-PIE: "{{.*}}rcrt1.o"
169+
// C-ARM-STATIC-PIE: "{{.*}}crtbeginS.o"
170+
// C-ARM-STATIC-PIE: "--start-group" "-lgcc" "-lgcc_eh" "-lc" "-lgloss" "--end-group"
171+
// C-ARM-STATIC-PIE: "{{.*}}crtendS.o"

‎clang/test/Driver/arm-toolchain.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,3 +158,15 @@
158158
// ARM-BAREMETAL-UNWINDLIB: "{{.*}}clang_rt.crtbegin.o"
159159
// ARM-BAREMETAL-UNWINDLIB: "--start-group" "{{.*}}libclang_rt.builtins.a" "--as-needed" "-lunwind" "--no-as-needed" "-lc" "-lgloss" "--end-group"
160160
// ARM-BAREMETAL-UNWINDLIB: "{{.*}}clang_rt.crtend.o"
161+
162+
// RUN: %clang -static-pie -### %s -fuse-ld= \
163+
// RUN: --target=armv6m-none-eabi --rtlib=libgcc --unwindlib=platform \
164+
// RUN: --gcc-toolchain=%S/Inputs/basic_arm_gcc_tree \
165+
// RUN: --sysroot=%S/Inputs/basic_arm_gcc_tree/armv6m-none-eabi 2>&1 \
166+
// RUN: | FileCheck -check-prefix=C-ARM-STATIC-PIE %s
167+
168+
// C-ARM-STATIC-PIE: "-Bstatic" "-pie" "--no-dynamic-linker" "-z" "text" "-m" "armelf_linux_eabi" "-EL"
169+
// C-ARM-STATIC-PIE: "{{.*}}rcrt1.o"
170+
// C-ARM-STATIC-PIE: "{{.*}}crtbeginS.o"
171+
// C-ARM-STATIC-PIE: "--start-group" "-lgcc" "-lgcc_eh" "-lc" "-lgloss" "--end-group"
172+
// C-ARM-STATIC-PIE: "{{.*}}crtendS.o"

‎clang/test/Driver/baremetal.cpp

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -591,29 +591,3 @@
591591
// RUN: --sysroot=%S/Inputs/basic_riscv64_tree/riscv64-unknown-elf \
592592
// RUN: | FileCheck --check-prefix=CHECK-RV64-RELAX %s
593593
// CHECK-RV64-RELAX-NOT: "--no-relax"
594-
595-
// Check that "-static -pie" is forwarded to linker when "-static-pie" is used
596-
597-
// RUN: %clang -static-pie -### %s 2>&1 \
598-
// RUN: --target=armv6m-none-eabi -rtlib=platform --unwindlib=platform \
599-
// RUN: --sysroot=%S/Inputs/baremetal_arm \
600-
// RUN: | FileCheck --check-prefix=CHECK-CLANG-LD-STATIC-PIE %s
601-
602-
// RUN: %clang -static-pie -### %s 2>&1 \
603-
// RUN: --target=aarch64-none-elf -rtlib=platform --unwindlib=platform \
604-
// RUN: --sysroot=%S/Inputs/baremetal_arm \
605-
// RUN: | FileCheck --check-prefix=CHECK-CLANG-LD-STATIC-PIE %s
606-
607-
// RUN: %clang -static-pie -### %s 2>&1 \
608-
// RUN: --target=riscv32-unknown-elf-rtlib=platform --unwindlib=platform \
609-
// RUN: --sysroot=%S/Inputs/basic_riscv32_tree/riscv32-unknown-elf \
610-
// RUN: | FileCheck --check-prefix=CHECK-CLANG-LD-STATIC-PIE %s
611-
612-
// RUN: %clang -static-pie -### %s 2>&1 \
613-
// RUN: --target=riscv64-unknown-elf-rtlib=platform --unwindlib=platform \
614-
// RUN: --sysroot=%S/Inputs/basic_riscv32_tree/riscv64-unknown-elf \
615-
// RUN: | FileCheck --check-prefix=CHECK-CLANG-LD-STATIC-PIE %s
616-
617-
// CHECK-CLANG-LD-STATIC-PIE: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
618-
// CHECK-CLANG-LD-STATIC-PIE-SAME: "-static" "-pie" "--no-dynamic-linker" "-z" "text"
619-
// CHECK-CLANG-LD-STATIC-PIE: "{{.*}}rcrt1.o"

‎clang/test/Driver/riscv32-toolchain.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,19 @@
247247
// RUN: | FileCheck -check-prefix=CHECK-RV32-GNU-RELAX %s
248248
// CHECK-RV32-GNU-RELAX-NOT: "--no-relax"
249249

250+
// Check that "-static -pie" is forwarded to linker when "-static-pie" is used
251+
// RUN: %clang -static-pie -### %s -fuse-ld= \
252+
// RUN: --target=riscv32-unknown-elf -rtlib=platform --unwindlib=platform \
253+
// RUN: --gcc-toolchain=%S/Inputs/basic_riscv32_tree \
254+
// RUN: --sysroot=%S/Inputs/basic_riscv32_tree/riscv32-unknown-elf 2>&1 \
255+
// RUN: | FileCheck -check-prefix=C-RV32-STATIC-PIE %s
256+
257+
// C-RV32-STATIC-PIE: "-Bstatic" "-pie" "--no-dynamic-linker" "-z" "text" "-m" "elf32lriscv" "-X"
258+
// C-RV32-STATIC-PIE: "{{.*}}rcrt1.o"
259+
// C-RV32-STATIC-PIE: "{{.*}}crtbeginS.o"
260+
// C-RV32-STATIC-PIE: "--start-group" "-lgcc" "-lc" "-lgloss" "--end-group"
261+
// C-RV32-STATIC-PIE: "{{.*}}crtendS.o"
262+
250263
typedef __builtin_va_list va_list;
251264
typedef __SIZE_TYPE__ size_t;
252265
typedef __PTRDIFF_TYPE__ ptrdiff_t;

‎clang/test/Driver/riscv64-toolchain.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,19 @@
203203
// RUN: | FileCheck -check-prefix=CHECK-RV64-GNU-RELAX %s
204204
// CHECK-RV64-GNU-RELAX-NOT: "--no-relax"
205205

206+
// Check that "-static -pie" is forwarded to linker when "-static-pie" is used
207+
// RUN: %clang -static-pie -### %s -fuse-ld= \
208+
// RUN: --target=riscv64-unknown-elf -rtlib=platform --unwindlib=platform \
209+
// RUN: --gcc-toolchain=%S/Inputs/basic_riscv64_tree \
210+
// RUN: --sysroot=%S/Inputs/basic_riscv64_tree/riscv64-unknown-elf 2>&1 \
211+
// RUN: | FileCheck -check-prefix=C-RV64-STATIC-PIE %s
212+
213+
// C-RV64-STATIC-PIE: "-Bstatic" "-pie" "--no-dynamic-linker" "-z" "text" "-m" "elf64lriscv" "-X"
214+
// C-RV64-STATIC-PIE: "{{.*}}rcrt1.o"
215+
// C-RV64-STATIC-PIE: "{{.*}}crtbeginS.o"
216+
// C-RV64-STATIC-PIE: "--start-group" "-lgcc" "-lc" "-lgloss" "--end-group"
217+
// C-RV64-STATIC-PIE: "{{.*}}crtendS.o"
218+
206219
typedef __builtin_va_list va_list;
207220
typedef __SIZE_TYPE__ size_t;
208221
typedef __PTRDIFF_TYPE__ ptrdiff_t;

0 commit comments

Comments
 (0)