diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-sanitizers.inc')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-sanitizers.inc | 63 |
1 files changed, 28 insertions, 35 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers.inc b/meta/recipes-devtools/gcc/gcc-sanitizers.inc index c987ccb589..668e14a59f 100644 --- a/meta/recipes-devtools/gcc/gcc-sanitizers.inc +++ b/meta/recipes-devtools/gcc/gcc-sanitizers.inc @@ -12,40 +12,29 @@ EXTRA_OECONF_PATHS = "\ " do_configure () { - mtarget=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` - target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` - if [ -d ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget ]; then - hardlinkdir ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget ${B} - fi - - echo "Configuring libsanitizer" - rm -rf ${B}/$target/libsanitizer/ - mkdir -p ${B}/$target/libsanitizer/ - # This is kind of gross, but it's an easy way to make configure happy - # without hacking it up to use the system stdc++ instead of the one it - # expects to be newly built. - rm -rf ${B}/$target/libstdc++-v3/ - mkdir -p ${B}/$target/libstdc++-v3/src/ - ln -s ${STAGING_LIBDIR}/libstdc++.la ${B}/$target/libstdc++-v3/src/ - ln -s ${STAGING_LIBDIR}/libstdc++.so ${B}/$target/libstdc++-v3/src/ - cd ${B}/$target/libsanitizer/ + rm -rf ${B}/${TARGET_SYS}/libsanitizer/ + mkdir -p ${B}/${TARGET_SYS}/libsanitizer/ + cd ${B}/${TARGET_SYS}/libsanitizer/ chmod a+x ${S}/libsanitizer/configure - ${S}/libsanitizer/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} + relpath=${@os.path.relpath("${S}/libsanitizer", "${B}/${TARGET_SYS}/libsanitizer")} + $relpath/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} # Easiest way to stop bad RPATHs getting into the library since we have a # broken libtool here - sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${B}/$target/libsanitizer/libtool + sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${B}/${TARGET_SYS}/libsanitizer/libtool + # Link to the sysroot's libstdc++ instead of one gcc thinks it just built + sed -i -e '/LIBSTDCXX_RAW_CXX_\(CXXFLAGS\|LDFLAGS\)\s*=/d' ${B}/${TARGET_SYS}/libsanitizer/*/Makefile } +EXTRACONFFUNCS += "extract_stashed_builddir" +do_configure[depends] += "${COMPILERDEP}" do_compile () { - target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` - cd ${B}/$target/libsanitizer/ - oe_runmake MULTIBUILDTOP=${B}/$target/libsanitizer/ + cd ${B}/${TARGET_SYS}/libsanitizer/ + oe_runmake MULTIBUILDTOP=${B}/${TARGET_SYS}/libsanitizer/ } do_install () { - target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` - cd ${B}/$target/libsanitizer/ - oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/libsanitizer/ install + cd ${B}/${TARGET_SYS}/libsanitizer/ + oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/${TARGET_SYS}/libsanitizer/ install if [ -d ${D}${infodir} ]; then rmdir --ignore-fail-on-non-empty -p ${D}${infodir} fi @@ -54,14 +43,16 @@ do_install () { INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY_${PN} = "1" -DEPENDS = "gcc-runtime" +DEPENDS = "virtual/crypt gcc-runtime virtual/${TARGET_PREFIX}gcc" + +# used to fix ../../../../../../../../../work-shared/gcc-8.3.0-r0/gcc-8.3.0/libsanitizer/libbacktrace/../../libbacktrace/elf.c:772:21: error: 'st.st_mode' may be used uninitialized in this function [-Werror=maybe-uninitialized] +DEBUG_OPTIMIZATION_append = " -Wno-error" BBCLASSEXTEND = "nativesdk" -PACKAGES = "${PN}" +PACKAGES = "${PN} ${PN}-dbg" PACKAGES += "libasan libubsan liblsan libtsan" PACKAGES += "libasan-dev libubsan-dev liblsan-dev libtsan-dev" -PACKAGES += "libasan-dbg libubsan-dbg liblsan-dbg libtsan-dbg" PACKAGES += "libasan-staticdev libubsan-staticdev liblsan-staticdev libtsan-staticdev" RDEPENDS_libasan += "libstdc++" @@ -73,18 +64,21 @@ RDEPENDS_libubsan-dev += "${PN}" RDEPENDS_liblsan-dev += "${PN}" RDEPENDS_libtsan-dev += "${PN}" RRECOMMENDS_${PN} += "libasan libubsan" -RRECOMMENDS_${PN}_append_x86-64 = " liblsan libtsan" RRECOMMENDS_${PN}_append_x86 = " liblsan" +RRECOMMENDS_${PN}_append_x86-64 = " liblsan libtsan" +RRECOMMENDS_${PN}_append_powerpc64 = " liblsan libtsan" +RRECOMMENDS_${PN}_append_aarch64 = " liblsan libtsan" do_package_write_ipk[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata" do_package_write_deb[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata" do_package_write_rpm[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata" -# MIPS, aarch64, and SPARC are broken. -COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm).*-linux' +# Only x86, powerpc, sparc, s390, arm, and aarch64 are supported +COMPATIBLE_HOST = '(x86_64|i.86|powerpc|sparc|s390|arm|aarch64).*-linux' +# musl is currently broken entirely +COMPATIBLE_HOST_libc-musl = 'null' FILES_libasan += "${libdir}/libasan.so.*" -FILES_libasan-dbg += "${libdir}/.debug/libasan.so.*" FILES_libasan-dev += "\ ${libdir}/libasan_preinit.o \ ${libdir}/libasan.so \ @@ -93,7 +87,6 @@ FILES_libasan-dev += "\ FILES_libasan-staticdev += "${libdir}/libasan.a" FILES_libubsan += "${libdir}/libubsan.so.*" -FILES_libubsan-dbg += "${libdir}/.debug/libubsan.so.*" FILES_libubsan-dev += "\ ${libdir}/libubsan.so \ ${libdir}/libubsan.la \ @@ -101,18 +94,18 @@ FILES_libubsan-dev += "\ FILES_libubsan-staticdev += "${libdir}/libubsan.a" FILES_liblsan += "${libdir}/liblsan.so.*" -FILES_liblsan-dbg += "${libdir}/.debug/liblsan.so.*" FILES_liblsan-dev += "\ ${libdir}/liblsan.so \ ${libdir}/liblsan.la \ + ${libdir}/liblsan_preinit.o \ " FILES_liblsan-staticdev += "${libdir}/liblsan.a" FILES_libtsan += "${libdir}/libtsan.so.*" -FILES_libtsan-dbg += "${libdir}/.debug/libtsan.so.*" FILES_libtsan-dev += "\ ${libdir}/libtsan.so \ ${libdir}/libtsan.la \ + ${libdir}/libtsan_*.o \ " FILES_libtsan-staticdev += "${libdir}/libtsan.a" |