maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "clang-cl: Hook up /Za to prevent adding oldnames.lib dependency" 

This reverts commit r187991 and adjusts the comment.  /Za is much more
involved, and we don't want to give anyone the impression we actually
support it.

llvm-svn: 187998
This commit is contained in:
Reid Kleckner 2013-08-08 19:33:10 +00:00
parent 8c9742051d
commit 6beca0e1cf
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Driver/CLCompatOptions.td
View File

@ -98,7 +98,6 @@ def _SLASH_TC : CLFlag<"TC">, HelpText<"Treat all source files as C">;
def _SLASH_Tp : CLJoinedOrSeparate<"Tp">, HelpText<"Specify a C++ source file">,
MetaVarName<"<filename>">;
def _SLASH_TP : CLFlag<"TP">, HelpText<"Treat all source files as C++">;
def _SLASH_Za : CLFlag<"Za">;
// Ignored:
@ -130,6 +129,7 @@ def _SLASH_Oi : CLFlag<"Oi">;
def _SLASH_RTC : CLJoined<"RTC">;
def _SLASH_showIncludes : CLJoined<"showIncludes">;
def _SLASH_w : CLJoined<"w">;
def _SLASH_Za : CLFlag<"Za">;
def _SLASH_Zc : CLJoined<"Zc:">;
def _SLASH_ZI : CLFlag<"ZI">;
def _SLASH_Zi : CLFlag<"Zi">;

9
clang/lib/Driver/Tools.cpp
View File

@ -3719,11 +3719,10 @@ void Clang::AddClangCLArgs(const ArgList &Args, ArgStringList &CmdArgs) const {
llvm_unreachable("Unexpected option ID.");
}
if (!Args.hasArg(options::OPT__SLASH_Za)) {
// This provides POSIX compatibility (maps 'open' to '_open'),
// which most users want.
CmdArgs.push_back("--dependent-lib=oldnames");
}
// This provides POSIX compatibility (maps 'open' to '_open'), which most
// users want. The /Za flag to cl.exe turns this off, but it's not
// implemented in clang.
CmdArgs.push_back("--dependent-lib=oldnames");
}
void ClangAs::ConstructJob(Compilation &C, const JobAction &JA,

11
clang/test/Driver/cl-Za.c
View File

@ -1,11 +0,0 @@
// Don't attempt slash switches on msys bash.
// REQUIRES: shell-preserves-root
// Note: %s must be preceded by --, otherwise it may be interpreted as a
// command-line option, e.g. on Mac where %s is commonly under /Users.
// RUN: %clang_cl -### -- %s 2>&1 | FileCheck -check-prefix=DEFAULT %s
// DEFAULT: "--dependent-lib=oldnames"
// RUN: %clang_cl /Za -### -- %s 2>&1 | FileCheck -check-prefix=Za %s
// Za-NOT: "--dependent-lib=oldnames"