diff --git a/src/Compilation.zig b/src/Compilation.zig
index 0914685c77f6fa3d3905ef56e5519789f4f8c236..1bc9719e1b1c0bb3bdf1349bd578c73c6b2a910e 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 e03d26d7c42d2bd456378b7df66bb2aa89d73a2a..52c202fdedac147ed23adba1c4a81dcfaf0d0f03 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) {