diff options
| author | Reid Kleckner <reid@kleckner.net> | 2014-02-19 22:05:59 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2014-02-19 22:05:59 +0000 |
| commit | c688dafe3100397ac4cdad20b0960c9ae1ede62b (patch) | |
| tree | 547dd45a6b5802f7bbe1e33750ad17216852f1dd | |
| parent | 3b49fdb6404edb4d387312fb3965c13949212740 (diff) | |
| download | bcm5719-llvm-c688dafe3100397ac4cdad20b0960c9ae1ede62b.tar.gz bcm5719-llvm-c688dafe3100397ac4cdad20b0960c9ae1ede62b.zip | |
clang-cl: Pass /Z7 when we fallback to cl with debug info enabled
Clang itself only emits CodeView line tables, so it seems more
consistent to ask cl.exe for the same format.
llvm-svn: 201721
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Driver/cl-fallback.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index c4982d72ec2..532c863414f 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -7221,6 +7221,8 @@ Command *visualstudio::Compile::GetCommand(Compilation &C, const JobAction &JA, : "/GR-"); if (Args.hasArg(options::OPT_fsyntax_only)) CmdArgs.push_back("/Zs"); + if (Args.hasArg(options::OPT_g_Flag, options::OPT_gline_tables_only)) + CmdArgs.push_back("/Z7"); std::vector<std::string> Includes = Args.getAllArgValues(options::OPT_include); for (size_t I = 0, E = Includes.size(); I != E; ++I) diff --git a/clang/test/Driver/cl-fallback.c b/clang/test/Driver/cl-fallback.c index d67fa42ca8a..62a71e9835d 100644 --- a/clang/test/Driver/cl-fallback.c +++ b/clang/test/Driver/cl-fallback.c @@ -5,7 +5,7 @@ // command-line option, e.g. on Mac where %s is commonly under /Users. // RUN: %clang_cl /fallback /Dfoo=bar /Ubaz /Ifoo /O0 /Ox /GR /GR- /LD /LDd \ -// RUN: /MD /MDd /MTd /MT /FImyheader.h -### -- %s 2>&1 | FileCheck %s +// RUN: /MD /MDd /MTd /MT /FImyheader.h /Zi -### -- %s 2>&1 | FileCheck %s // CHECK: "-fdiagnostics-format" "msvc-fallback" // CHECK: || // CHECK: cl.exe @@ -17,6 +17,7 @@ // CHECK: "-I" "foo" // CHECK: "/Ox" // CHECK: "/GR-" +// CHECK: "/Z7" // CHECK: "/FImyheader.h" // CHECK: "/LD" // CHECK: "/LDd" |

