Skip to content

Commit 299b636

Browse files
committed
Revert "Reland "[Win32][ELF] Make CodeView a DebugInfoFormat only for COFF format" (#87987)"
This reverts commit 4a93872. Sorry, there're still buildbot failures.
1 parent 469caa3 commit 299b636

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

clang/lib/Driver/ToolChains/MSVC.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ class LLVM_LIBRARY_VISIBILITY MSVCToolChain : public ToolChain {
6161
/// formats, and to DWARF otherwise. Users can use -gcodeview and -gdwarf to
6262
/// override the default.
6363
llvm::codegenoptions::DebugInfoFormat getDefaultDebugFormat() const override {
64-
return getTriple().isOSBinFormatCOFF() ? llvm::codegenoptions::DIF_CodeView
65-
: llvm::codegenoptions::DIF_DWARF;
64+
return getTriple().isOSBinFormatMachO()
65+
? llvm::codegenoptions::DIF_DWARF
66+
: llvm::codegenoptions::DIF_CodeView;
6667
}
6768

6869
/// Set the debugger tuning to "default", since we're definitely not tuning

clang/test/Driver/gcodeview-command-line.c

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Note: %s must be preceded by --, otherwise it may be interpreted as a
22
// command-line option, e.g. on Mac where %s is commonly under /Users.
3-
// REQUIRES: aarch64-registered-target,arm-registered-target,x86-registered-target
43

54
// ON-NOT: "-gno-codview-commandline"
65
// OFF: "-gno-codeview-command-line"

clang/test/Misc/win32-elf.c

-5
This file was deleted.

0 commit comments

Comments
 (0)