diff options
| -rw-r--r-- | clang/lib/Driver/ToolChains/MSVC.h | 8 | ||||
| -rw-r--r-- | clang/test/Misc/win32-macho.c | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/clang/lib/Driver/ToolChains/MSVC.h b/clang/lib/Driver/ToolChains/MSVC.h index aba9417c972..a8ef4815564 100644 --- a/clang/lib/Driver/ToolChains/MSVC.h +++ b/clang/lib/Driver/ToolChains/MSVC.h @@ -78,10 +78,12 @@ public: bool isPIEDefault() const override; bool isPICDefaultForced() const override; - /// Set CodeView as the default debug info format. Users can use -gcodeview - /// and -gdwarf to override the default. + /// Set CodeView as the default debug info format for non-MachO binary + /// formats, and to DWARF otherwise. Users can use -gcodeview and -gdwarf to + /// override the default. codegenoptions::DebugInfoFormat getDefaultDebugFormat() const override { - return codegenoptions::DIF_CodeView; + return getTriple().isOSBinFormatMachO() ? codegenoptions::DIF_DWARF + : codegenoptions::DIF_CodeView; } /// Set the debugger tuning to "default", since we're definitely not tuning diff --git a/clang/test/Misc/win32-macho.c b/clang/test/Misc/win32-macho.c index 517bde9af93..1eab5381bfa 100644 --- a/clang/test/Misc/win32-macho.c +++ b/clang/test/Misc/win32-macho.c @@ -1,2 +1,5 @@ // Check that basic use of win32-macho targets works. // RUN: %clang -fsyntax-only -target x86_64-pc-win32-macho %s + +// RUN: %clang -fsyntax-only -target x86_64-pc-win32-macho -g %s -### 2>&1 | FileCheck %s -check-prefix=DEBUG-INFO +// DEBUG-INFO: -dwarf-version={{.*}} |
