Merge pull request #18443 from keithc-ca/dwarf4

UMA: Use DWARF version 4 on Linux
eclipse-openj9 · Jan 3, 2024 · 1b60ab8 · 1b60ab8
2 parents 4e04228 + 6d1540e
commit 1b60ab8
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/runtime/makelib/targets.mk.linux.inc.ftl b/runtime/makelib/targets.mk.linux.inc.ftl
@@ -254,6 +254,12 @@ ifdef j9vm_uma_gnuDebugSymbols
   <#if uma.spec.processor.x86 || uma.spec.processor.amd64>
     ASFLAGS += --gdwarf2
   </#if>
+
+  # Tell gcc to use DWARF version 4, not 5 (which is the default for compiler
+  # versions 11+). All GNU compiler versions, that might reasonably be used,
+  # understand these options, so this doesn't need to check the compiler version.
+  CFLAGS   += -gdwarf-4
+  CXXFLAGS += -gdwarf-4
 endif
 
 <#if uma.spec.processor.x86 || uma.spec.processor.amd64 || uma.spec.processor.riscv64>