diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-04-14 18:13:22 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-18 11:37:24 +0100 |
commit | 27eadb84fe33097033e46b8a6feb66400d319d50 (patch) | |
tree | 2348d1b72df6d42eebca6d125a580f8805894176 /meta/recipes-devtools/gcc/gcc-runtime.inc | |
parent | f7150253818225ad48683de9db50aeb31188b3ea (diff) | |
download | poky-27eadb84fe33097033e46b8a6feb66400d319d50.tar.gz |
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
(From OE-Core rev: 2c8e130adb5d4d55ba732a042ec157498460ee29)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-runtime.inc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-runtime.inc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc index 9dcce26536..2aca96c408 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc | |||
@@ -49,16 +49,17 @@ RUNTIMETARGET_libc-newlib = "libstdc++-v3" | |||
49 | # libiberty | 49 | # libiberty |
50 | # libgfortran needs separate recipe due to libquadmath dependency | 50 | # libgfortran needs separate recipe due to libquadmath dependency |
51 | 51 | ||
52 | SLIB = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" | 52 | # Relative path to be repaced into debug info |
53 | SLIB_NEW = "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}" | 53 | REL_S = "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}" |
54 | 54 | ||
55 | DEBUG_PREFIX_MAP_class-target = " \ | 55 | DEBUG_PREFIX_MAP_class-target = " \ |
56 | -fdebug-prefix-map=${WORKDIR}/recipe-sysroot= \ | 56 | -fdebug-prefix-map=${WORKDIR}/recipe-sysroot= \ |
57 | -fdebug-prefix-map=${WORKDIR}/recipe-sysroot-native= \ | 57 | -fdebug-prefix-map=${WORKDIR}/recipe-sysroot-native= \ |
58 | -fdebug-prefix-map=${SLIB}=${SLIB_NEW} \ | 58 | -fdebug-prefix-map=${S}=${REL_S} \ |
59 | -fdebug-prefix-map=${SLIB}/include=${SLIB_NEW}/libstdc++-v3/../include \ | 59 | -fdebug-prefix-map=${S}/include=${REL_S}/libstdc++-v3/../include \ |
60 | -fdebug-prefix-map=${SLIB}/libiberty=${SLIB_NEW}/libstdc++-v3/../libiberty \ | 60 | -fdebug-prefix-map=${S}/libiberty=${REL_S}/libstdc++-v3/../libiberty \ |
61 | -fdebug-prefix-map=${B}=${SLIB_NEW} \ | 61 | -fdebug-prefix-map=${S}/libgcc=${REL_S}/libstdc++-v3/../libgcc \ |
62 | -fdebug-prefix-map=${B}=${REL_S} \ | ||
62 | " | 63 | " |
63 | 64 | ||
64 | do_configure () { | 65 | do_configure () { |