From a31b449b55c32eba1cb61a48753a6fc98696c98f Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 23 Aug 2022 21:24:03 -0700 Subject: [PATCH] make LLVM and Clang emit DWARF 4 instead of 5 This reverts 6d679eb2bcbe76e389c02e0bb4d4c4feb2847783 and additionally changes the command line parameters passed to Clang to match. Clang 14 defaults to DWARFv5 which is an interesting choice. v5 has been out for 5 years and yet Valgrind does not support it, and apparently neither does either GDB or LLD, I haven't determined which, but I wasn't able to use GDB to debug my LLVM-emitted dwarf 5 zig code that was linked with LLD. A couple years ago when I was working on the self-hosted ELF linker, I emitted DWARFv5 but then downgraded to v4 when I realized that third party tools were stuck in the past. Years later, they still are. Hopefully, Clang 14's bold move will inspire third party tools to get their shit together, however, in the meantime, everything's broken, so we're passing `-gdwarf-4` to clang and instructing LLVM to emit DWARFv4. Note that Zig's std.debug code *does* support DWARFv5 already as of a previous commit that I made today. --- src/Compilation.zig | 4 ++-- src/zig_llvm.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Compilation.zig b/src/Compilation.zig index 0914685c77..1bc9719e1b 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -4085,10 +4085,10 @@ pub fn addCCArgs( } if (!comp.bin_file.options.strip) { - try argv.append("-g"); switch (target.ofmt) { .coff => try argv.append("-gcodeview"), - else => {}, + .elf, .macho => try argv.append("-gdwarf-4"), + else => try argv.append("-g"), } } diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp index e03d26d7c4..52c202fded 100644 --- a/src/zig_llvm.cpp +++ b/src/zig_llvm.cpp @@ -1130,7 +1130,7 @@ void ZigLLVMGetNativeTarget(ZigLLVM_ArchType *arch_type, void ZigLLVMAddModuleDebugInfoFlag(LLVMModuleRef module) { unwrap(module)->addModuleFlag(Module::Warning, "Debug Info Version", DEBUG_METADATA_VERSION); - unwrap(module)->addModuleFlag(Module::Warning, "Dwarf Version", 5); + unwrap(module)->addModuleFlag(Module::Warning, "Dwarf Version", 4); } void ZigLLVMAddModuleCodeViewFlag(LLVMModuleRef module) {