Author: Martin Storsjö Date: 2022-08-24T11:39:03+03:00 New Revision: 0a4c6c9f98a6dd5f12b8ff55c60f446b75958ac7
URL: https://github.com/llvm/llvm-project/commit/0a4c6c9f98a6dd5f12b8ff55c60f446b75958ac7 DIFF: https://github.com/llvm/llvm-project/commit/0a4c6c9f98a6dd5f12b8ff55c60f446b75958ac7.diff LOG: [clang] Allow using -rtlib=platform to switching to the default rtlib on all targets Normally, passing -rtlib=platform overrides any earlier -rtlib options, and overrides any hardcoded CLANG_DEFAULT_RTLIB option. However, some targets, MSVC and Darwin, have custom logic for disallowing specific -rtlib= option values; amend these checks for allowing the -rtlib=platform option. Differential Revision: https://reviews.llvm.org/D132444 Added: clang/test/Driver/rtlib-darwin.c Modified: clang/lib/Driver/ToolChains/CommonArgs.cpp clang/lib/Driver/ToolChains/Darwin.cpp clang/test/Driver/msvc-compiler-rt.c Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp index d5b437ceed63c..b48dd40760ccd 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp @@ -1602,9 +1602,10 @@ void tools::AddRunTimeLibs(const ToolChain &TC, const Driver &D, if (TC.getTriple().isKnownWindowsMSVCEnvironment()) { // Issue error diagnostic if libgcc is explicitly specified // through command line as --rtlib option argument. - if (Args.hasArg(options::OPT_rtlib_EQ)) { + Arg *A = Args.getLastArg(options::OPT_rtlib_EQ); + if (A && A->getValue() != StringRef("platform")) { TC.getDriver().Diag(diag::err_drv_unsupported_rtlib_for_platform) - << Args.getLastArg(options::OPT_rtlib_EQ)->getValue() << "MSVC"; + << A->getValue() << "MSVC"; } } else AddLibgcc(TC, D, CmdArgs, Args); diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp index c2a344d241a9f..4482a55a05019 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp @@ -1385,7 +1385,7 @@ ToolChain::RuntimeLibType DarwinClang::GetRuntimeLibType( const ArgList &Args) const { if (Arg* A = Args.getLastArg(options::OPT_rtlib_EQ)) { StringRef Value = A->getValue(); - if (Value != "compiler-rt") + if (Value != "compiler-rt" && Value != "platform") getDriver().Diag(clang::diag::err_drv_unsupported_rtlib_for_platform) << Value << "darwin"; } diff --git a/clang/test/Driver/msvc-compiler-rt.c b/clang/test/Driver/msvc-compiler-rt.c index abbca507ae7f4..9651662aa703e 100644 --- a/clang/test/Driver/msvc-compiler-rt.c +++ b/clang/test/Driver/msvc-compiler-rt.c @@ -1,5 +1,7 @@ // RUN: %clang -target x86_64-pc-windows-msvc --rtlib=compiler-rt -### %s 2>&1 | FileCheck %s -check-prefix MSVC-COMPILER-RT +// RUN: %clang -target x86_64-pc-windows-msvc --rtlib=compiler-rt --rtlib=platform -### %s 2>&1 | FileCheck %s -check-prefix MSVC-DEFAULT // RUN: not %clang %s -target x86_64-pc-windows-msvc --rtlib=libgcc 2>&1 | FileCheck %s -check-prefix CHECK-ERROR // MSVC-COMPILER-RT: "{{.*}}clang_rt.builtins{{.*}}" +// MSVC-DEFAULT-NOT: "{{.*}}clang_rt.builtins{{.*}}" // CHECK-ERROR: unsupported runtime library 'libgcc' for platform 'MSVC' diff --git a/clang/test/Driver/rtlib-darwin.c b/clang/test/Driver/rtlib-darwin.c new file mode 100644 index 0000000000000..cee8a80a5d266 --- /dev/null +++ b/clang/test/Driver/rtlib-darwin.c @@ -0,0 +1,6 @@ +// RUN: %clang -target x86_64-apple-darwin -resource-dir=%S/Inputs/resource_dir --rtlib=compiler-rt -### %s 2>&1 | FileCheck %s -check-prefix DARWIN-COMPILER-RT +// RUN: %clang -target x86_64-apple-darwin -resource-dir=%S/Inputs/resource_dir --rtlib=platform -### %s 2>&1 | FileCheck %s -check-prefix DARWIN-COMPILER-RT +// RUN: not %clang %s -target x86_64-apple-darwin --rtlib=libgcc 2>&1 | FileCheck %s -check-prefix CHECK-ERROR + +// DARWIN-COMPILER-RT: "{{.*}}clang_rt.osx{{.*}}" +// CHECK-ERROR: unsupported runtime library 'libgcc' for platform 'darwin' _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
