Move -fdebug-default-version=4 closer to other debug info controls

nemo-cpt · nemo-cpt · commit fba2db3ebebc · 2024-12-09T09:50:56.000+03:00
commit_hash:3f063a842b4fe5e505de07c55dd6cb78980526a7
diff --git a/build/conf/compilers/gnu_compiler.conf b/build/conf/compilers/gnu_compiler.conf
@@ -24,11 +24,14 @@ when ($CLANG == "yes") {
 }
 
 _DEBUG_INFO_FLAGS=-g
-when ($OS_LINUX == "yes") {
-    _DEBUG_INFO_FLAGS=-g -ggnu-pubnames
-    # Clang's more accurate debug info for sampling-PGO purposes. PGO only makes sense in release builds
-    when ($CLANG == "yes" && $_BUILD_RELEASE == "yes") {
-        _DEBUG_INFO_FLAGS+=-fdebug-info-for-profiling
+when ($CLANG == "yes") {
+    _DEBUG_INFO_FLAGS+=-fdebug-default-version=4
+    when ($OS_LINUX == "yes") {
+        _DEBUG_INFO_FLAGS+=-ggnu-pubnames
+        when ($_BUILD_RELEASE == "yes") {
+            # Clang's more accurate debug info for sampling-PGO purposes. PGO only makes sense in release builds
+            _DEBUG_INFO_FLAGS+=-fdebug-info-for-profiling
+        }
     }
 }
 
diff --git a/build/ymake_conf.py b/build/ymake_conf.py
@@ -1449,7 +1449,6 @@ def __init__(self, tc, build):
                 '-fcolor-diagnostics',
                 # Enable aligned allocation
                 '-faligned-allocation',
-                '-fdebug-default-version=4',
             ]
         elif self.tc.is_gcc:
             if self.target.is_xtensa or self.target.is_tc32:

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,14 @@ when ($CLANG == "yes") {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`_DEBUG_INFO_FLAGS=-g`
`27`		`-when ($OS_LINUX == "yes") {`
`28`		`- _DEBUG_INFO_FLAGS=-g -ggnu-pubnames`
`29`		`- # Clang's more accurate debug info for sampling-PGO purposes. PGO only makes sense in release builds`
`30`		`- when ($CLANG == "yes" && $_BUILD_RELEASE == "yes") {`
`31`		`- _DEBUG_INFO_FLAGS+=-fdebug-info-for-profiling`
	`27`	`+when ($CLANG == "yes") {`
	`28`	`+ _DEBUG_INFO_FLAGS+=-fdebug-default-version=4`
	`29`	`+ when ($OS_LINUX == "yes") {`
	`30`	`+ _DEBUG_INFO_FLAGS+=-ggnu-pubnames`
	`31`	`+ when ($_BUILD_RELEASE == "yes") {`
	`32`	`+ # Clang's more accurate debug info for sampling-PGO purposes. PGO only makes sense in release builds`
	`33`	`+ _DEBUG_INFO_FLAGS+=-fdebug-info-for-profiling`
	`34`	`+ }`
`32`	`35`	`}`
`33`	`36`	`}`
`34`	`37`
Original file line number	Diff line number	Diff line change
`@@ -1449,7 +1449,6 @@ def __init__(self, tc, build):`
`1449`	`1449`	`'-fcolor-diagnostics',`
`1450`	`1450`	`# Enable aligned allocation`
`1451`	`1451`	`'-faligned-allocation',`
`1452`		`- '-fdebug-default-version=4',`
`1453`	`1452`	`]`
`1454`	`1453`	`elif self.tc.is_gcc:`
`1455`	`1454`	`if self.target.is_xtensa or self.target.is_tc32:`