From 7414d2028d003d37f46b92ed2625f41f234c06d1 Mon Sep 17 00:00:00 2001 From: A Bergen Date: Thu, 6 Sep 2018 16:29:40 +0000 Subject: [PATCH] Reverting r 341390 because it is causing test failures on GreenDragon. http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-incremental/52810/ git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@341560 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/ToolChains/MSVC.cpp | 9 --------- test/Driver/msvc-link.c | 12 ------------ 2 files changed, 21 deletions(-) diff --git a/lib/Driver/ToolChains/MSVC.cpp b/lib/Driver/ToolChains/MSVC.cpp index 105544840c..4df43ac8ce 100644 --- a/lib/Driver/ToolChains/MSVC.cpp +++ b/lib/Driver/ToolChains/MSVC.cpp @@ -355,15 +355,6 @@ void visualstudio::Linker::ConstructJob(Compilation &C, const JobAction &JA, options::OPT__SLASH_Zd)) CmdArgs.push_back("-debug"); - // Pass on /Brepro if it was passed to the compiler. - // Note that /Brepro maps to -mno-incremental-linker-compatible. - bool DefaultIncrementalLinkerCompatible = - C.getDefaultToolChain().getTriple().isWindowsMSVCEnvironment(); - if (!Args.hasFlag(options::OPT_mincremental_linker_compatible, - options::OPT_mno_incremental_linker_compatible, - DefaultIncrementalLinkerCompatible)) - CmdArgs.push_back("-Brepro"); - bool DLL = Args.hasArg(options::OPT__SLASH_LD, options::OPT__SLASH_LDd, options::OPT_shared); if (DLL) { diff --git a/test/Driver/msvc-link.c b/test/Driver/msvc-link.c index 412f4ad05d..8fe57331ee 100644 --- a/test/Driver/msvc-link.c +++ b/test/Driver/msvc-link.c @@ -3,7 +3,6 @@ // BASIC: "-out:a.exe" // BASIC: "-defaultlib:libcmt" // BASIC: "-nologo" -// BASIC-NOT: "-Brepro" // RUN: %clang -target i686-pc-windows-msvc -shared -o a.dll -### %s 2>&1 | FileCheck --check-prefix=DLL %s // DLL: link.exe" @@ -17,14 +16,3 @@ // LIBPATH: "-libpath:/usr/lib" // LIBPATH: "-nologo" -// RUN: %clang_cl /Brepro -### %s 2>&1 | FileCheck --check-prefix=REPRO %s -// REPRO: link.exe" -// REPRO: "-out:msvc-link.exe" -// REPRO: "-nologo" -// REPRO: "-Brepro" - -// RUN: %clang_cl /Brepro- -### %s 2>&1 | FileCheck --check-prefix=NOREPRO %s -// NOREPRO: link.exe" -// NOREPRO: "-out:msvc-link.exe" -// NOREPRO: "-nologo" -// NOREPRO-NOT: "-Brepro" -- 2.40.0