Author: Jon Roelofs Date: 2020-09-18T09:19:37-07:00 New Revision: 51c5add8547a66caa5fbc9a19a91cd7976944229
URL: https://github.com/llvm/llvm-project/commit/51c5add8547a66caa5fbc9a19a91cd7976944229 DIFF: https://github.com/llvm/llvm-project/commit/51c5add8547a66caa5fbc9a19a91cd7976944229.diff LOG: Extending Baremetal toolchain's support for the rtlib option. Differential Revision: https://reviews.llvm.org/D87164 Patch by Manuel Carrasco! Added: Modified: clang/lib/Driver/ToolChains/BareMetal.cpp clang/test/Driver/baremetal.cpp Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/BareMetal.cpp b/clang/lib/Driver/ToolChains/BareMetal.cpp index 97cfa7d0e156..61839a9e31b0 100644 --- a/clang/lib/Driver/ToolChains/BareMetal.cpp +++ b/clang/lib/Driver/ToolChains/BareMetal.cpp @@ -156,8 +156,17 @@ void BareMetal::AddCXXStdlibLibArgs(const ArgList &Args, void BareMetal::AddLinkRuntimeLib(const ArgList &Args, ArgStringList &CmdArgs) const { - CmdArgs.push_back(Args.MakeArgString("-lclang_rt.builtins-" + - getTriple().getArchName())); + ToolChain::RuntimeLibType RLT = GetRuntimeLibType(Args); + switch (RLT) { + case ToolChain::RLT_CompilerRT: + CmdArgs.push_back( + Args.MakeArgString("-lclang_rt.builtins-" + getTriple().getArchName())); + return; + case ToolChain::RLT_Libgcc: + CmdArgs.push_back("-lgcc"); + return; + } + llvm_unreachable("Unhandled RuntimeLibType."); } void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA, diff --git a/clang/test/Driver/baremetal.cpp b/clang/test/Driver/baremetal.cpp index 3ef5a56425a3..3a5c1555dc2c 100644 --- a/clang/test/Driver/baremetal.cpp +++ b/clang/test/Driver/baremetal.cpp @@ -83,3 +83,7 @@ // RUN: %clangxx -target arm-none-eabi -mthread-model posix -v 2>&1 \ // RUN: | FileCheck %s --check-prefix=CHECK-THREAD-MODEL-POSIX // CHECK-THREAD-MODEL-POSIX: Thread model: posix + +// RUN: %clang -### -target arm-none-eabi -rtlib=libgcc -v %s 2>&1 \ +// RUN: | FileCheck %s --check-prefix=CHECK-RTLIB-GCC +// CHECK-RTLIB-GCC: -lgcc _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
