Author: Brad Smith Date: 2022-02-21T23:11:13-05:00 New Revision: 95fed2b267ee87e6cba72ebe73f0d6fdab37f995
URL: https://github.com/llvm/llvm-project/commit/95fed2b267ee87e6cba72ebe73f0d6fdab37f995 DIFF: https://github.com/llvm/llvm-project/commit/95fed2b267ee87e6cba72ebe73f0d6fdab37f995.diff LOG: [Driver][OpenBSD] Pass sysroot to the linker Added: Modified: clang/lib/Driver/ToolChains/OpenBSD.cpp clang/test/Driver/openbsd.c Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/OpenBSD.cpp b/clang/lib/Driver/ToolChains/OpenBSD.cpp index bcd54bedfa89..7f19587f5f82 100644 --- a/clang/lib/Driver/ToolChains/OpenBSD.cpp +++ b/clang/lib/Driver/ToolChains/OpenBSD.cpp @@ -123,6 +123,9 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA, // handled somewhere else. Args.ClaimAllArgs(options::OPT_w); + if (!D.SysRoot.empty()) + CmdArgs.push_back(Args.MakeArgString("--sysroot=" + D.SysRoot)); + if (ToolChain.getArch() == llvm::Triple::mips64) CmdArgs.push_back("-EB"); else if (ToolChain.getArch() == llvm::Triple::mips64el) diff --git a/clang/test/Driver/openbsd.c b/clang/test/Driver/openbsd.c index d6d5ae994e67..da35d0441eb8 100644 --- a/clang/test/Driver/openbsd.c +++ b/clang/test/Driver/openbsd.c @@ -54,6 +54,12 @@ // CHECK-MIPS64EL-LD: clang{{.*}}" "-cc1" "-triple" "mips64el-unknown-openbsd" // CHECK-MIPS64EL-LD: ld{{.*}}" "-EL" "-e" "__start" "--eh-frame-hdr" "-Bdynamic" "-dynamic-linker" "{{.*}}ld.so" "-o" "a.out" "{{.*}}crt0.o" "{{.*}}crtbegin.o" "-L{{.*}}" "{{.*}}.o" "-lcompiler_rt" "-lc" "-lcompiler_rt" "{{.*}}crtend.o" +// Check that --sysroot is passed to the linker +// RUN: %clang -no-canonical-prefixes -target i686-pc-openbsd %s -### 2>&1 \ +// RUN: --sysroot=%S/Inputs/basic_netbsd_tree \ +// RUN: | FileCheck --check-prefix=CHECK-LD-SYSROOT %s +// CHECK-LD-SYSROOT: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]" + // Check passing options to the assembler for various OpenBSD targets // RUN: %clang -target amd64-pc-openbsd -m32 -### -no-integrated-as -c %s 2>&1 \ // RUN: | FileCheck -check-prefix=CHECK-AMD64-M32 %s _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits