r341560 - Reverting r 341390 because it is causing test failures on GreenDragon.

[A Bergen via cfe-commits]

Author: sudofortune
Date: Thu Sep  6 09:29:40 2018
New Revision: 341560

URL: http://llvm.org/viewvc/llvm-project?rev=341560&view=rev
Log:
Reverting r 341390 because it is causing test failures on GreenDragon.

http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-incremental/52810/


Modified:
    cfe/trunk/lib/Driver/ToolChains/MSVC.cpp
    cfe/trunk/test/Driver/msvc-link.c

Modified: cfe/trunk/lib/Driver/ToolChains/MSVC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/MSVC.cpp?rev=341560&r1=341559&r2=341560&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains/MSVC.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains/MSVC.cpp Thu Sep  6 09:29:40 2018
@@ -355,15 +355,6 @@ void visualstudio::Linker::ConstructJob(
                   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) {

Modified: cfe/trunk/test/Driver/msvc-link.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/msvc-link.c?rev=341560&r1=341559&r2=341560&view=diff
==============================================================================
--- cfe/trunk/test/Driver/msvc-link.c (original)
+++ cfe/trunk/test/Driver/msvc-link.c Thu Sep  6 09:29:40 2018
@@ -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"