Index: clang/lib/Driver/ToolChains/MSVC.h =================================================================== --- clang/lib/Driver/ToolChains/MSVC.h +++ clang/lib/Driver/ToolChains/MSVC.h @@ -81,7 +81,8 @@ /// Set CodeView as the default debug info format. 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 Index: clang/test/Misc/win32-macho.c =================================================================== --- clang/test/Misc/win32-macho.c +++ 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={{.*}}