Author: Petr Hosek Date: 2022-08-24T08:24:18Z New Revision: d3b14ccafb198ac02109dae16e966ba70a6058b7
URL: https://github.com/llvm/llvm-project/commit/d3b14ccafb198ac02109dae16e966ba70a6058b7 DIFF: https://github.com/llvm/llvm-project/commit/d3b14ccafb198ac02109dae16e966ba70a6058b7.diff LOG: Revert "[Clang] Avoid using unwind library in the MSVC environment" This reverts commit eca29d4a37b8d1c93fe99be6289a60bb11cf789d since the test fails in the per-target-runtime-dir layout. Added: Modified: clang/lib/Driver/ToolChains/CommonArgs.cpp clang/test/Driver/compiler-rt-unwind.c Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp index f270a5763806b..d5b437ceed63c 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp @@ -1529,7 +1529,7 @@ static void AddUnwindLibrary(const ToolChain &TC, const Driver &D, // Targets that don't use unwind libraries. if ((TC.getTriple().isAndroid() && UNW == ToolChain::UNW_Libgcc) || TC.getTriple().isOSIAMCU() || TC.getTriple().isOSBinFormatWasm() || - TC.getTriple().isWindowsMSVCEnvironment() || UNW == ToolChain::UNW_None) + UNW == ToolChain::UNW_None) return; LibGccType LGT = getLibGccType(TC, D, Args); diff --git a/clang/test/Driver/compiler-rt-unwind.c b/clang/test/Driver/compiler-rt-unwind.c index 88e2705029032..c5f63fba065e0 100644 --- a/clang/test/Driver/compiler-rt-unwind.c +++ b/clang/test/Driver/compiler-rt-unwind.c @@ -88,12 +88,6 @@ // RTLIB-GCC-UNWINDLIB-COMPILER_RT: "{{[.|\\\n]*}}--rtlib=libgcc requires --unwindlib=libgcc" // // RUN: %clang -### %s 2>&1 \ -// RUN: --target=x86_64-pc-windows-msvc -rtlib=compiler-rt --unwindlib=libunwind \ -// RUN: | FileCheck --check-prefix=MSVC-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s -// MSVC-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT: "{{.*}}clang_rt.builtins-x86_64.lib" -// MSVC-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT-NOT: "{{.*}}unwind.lib" -// -// RUN: %clang -### %s 2>&1 \ // RUN: --target=x86_64-w64-mingw32 -rtlib=compiler-rt --unwindlib=libunwind \ // RUN: -shared-libgcc \ // RUN: --gcc-toolchain="" \ _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits