Skip to contentSkip to conversation

gcc-runtime: Make DEBUG_PREFIX_MAP relative to S

PATCH New Khem Raj 1 participant 1 message Apr 15, 2021

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 gcc-runtime: Make DEBUG_PREFIX_MAP relative to S

Current definition of SLIB is actually equal to S but is hardcoded, this means when we have altered location of S, then the regexp for DEBUG_PREFIX_MAP will not be effective, which could result in S being emitted into debug_line sections. Simplify the maps to use S variable instead of SLIB

Secondly, rename SLIB_NEW to REL_S to make it more appropritate to what it represents

---
 meta/recipes-devtools/gcc/gcc-runtime.inc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
meta/recipes-devtools/gcc/gcc-runtime.inc +7 -6
index 9dcce26536..2aca96c408 100644
@@ -49,16 +49,17 @@ RUNTIMETARGET_libc-newlib = "libstdc++-v3"
 # libiberty
 # libgfortran needs separate recipe due to libquadmath dependency
 
-SLIB = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
-SLIB_NEW = "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
+# Relative path to be repaced into debug info
+REL_S = "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
 
 DEBUG_PREFIX_MAP_class-target = " \
    -fdebug-prefix-map=${WORKDIR}/recipe-sysroot= \
    -fdebug-prefix-map=${WORKDIR}/recipe-sysroot-native= \
-   -fdebug-prefix-map=${SLIB}=${SLIB_NEW} \
-   -fdebug-prefix-map=${SLIB}/include=${SLIB_NEW}/libstdc++-v3/../include \
-   -fdebug-prefix-map=${SLIB}/libiberty=${SLIB_NEW}/libstdc++-v3/../libiberty \
-   -fdebug-prefix-map=${B}=${SLIB_NEW} \
+   -fdebug-prefix-map=${S}=${REL_S} \
+   -fdebug-prefix-map=${S}/include=${REL_S}/libstdc++-v3/../include \
+   -fdebug-prefix-map=${S}/libiberty=${REL_S}/libstdc++-v3/../libiberty \
+   -fdebug-prefix-map=${S}/libgcc=${REL_S}/libstdc++-v3/../libgcc \
+   -fdebug-prefix-map=${B}=${REL_S} \
    "
 
 do_configure () {
Signature · 1 line
2.31.1