diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/meta/recipes-devtools/gcc/gcc-cross.inc | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-devtools/gcc/gcc-cross.inc')
-rw-r--r-- | poky/meta/recipes-devtools/gcc/gcc-cross.inc | 108 |
1 files changed, 14 insertions, 94 deletions
diff --git a/poky/meta/recipes-devtools/gcc/gcc-cross.inc b/poky/meta/recipes-devtools/gcc/gcc-cross.inc index 8855bb1f3..6fa8c274c 100644 --- a/poky/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/poky/meta/recipes-devtools/gcc/gcc-cross.inc @@ -61,98 +61,22 @@ do_compile () { export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}" + # Prevent native/host sysroot path from being used in configargs.h header, + # as it will be rewritten when used by other sysroots preventing support + # for gcc plugins + oe_runmake configure-gcc + sed -i 's@${STAGING_DIR_TARGET}@/host@g' ${B}/gcc/configargs.h + sed -i 's@${STAGING_DIR_HOST}@/host@g' ${B}/gcc/configargs.h + + # Prevent sysroot/workdir paths from being used in checksum-options. + # checksum-options is used to generate a checksum which is embedded into + # the output binary. + oe_runmake TARGET-gcc=checksum-options all-gcc + sed -i 's@${DEBUG_PREFIX_MAP}@@g' ${B}/gcc/checksum-options + sed -i 's@${STAGING_DIR_HOST}@/host@g' ${B}/gcc/checksum-options + oe_runmake all-host configure-target-libgcc (cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h) - # now generate script to drive testing - echo "#!/usr/bin/env sh" >${B}/${TARGET_PREFIX}testgcc - set >> ${B}/${TARGET_PREFIX}testgcc - # prune out the unneeded vars - sed -i -e "/^BASH/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^USER/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^OPT/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^DIRSTACK/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^EUID/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^FUNCNAME/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^GROUPS/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^HOST/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^HOME/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^IFS/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^LC_ALL/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^LOGNAME/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^MACHTYPE/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^OSTYPE/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^PIPE/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^SHELL/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^'/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^UID/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^TERM/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^PKG_/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^POSIXLY_/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^PPID/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^PS4/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^Q/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^SHLVL/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^STAGING/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^LD_LIBRARY_PATH/d" ${B}/${TARGET_PREFIX}testgcc - sed -i -e "/^PSEUDO/d" ${B}/${TARGET_PREFIX}testgcc - - # append execution part of the script -cat >> ${B}/${TARGET_PREFIX}testgcc << STOP -target="\$1" -usage () { - echo "Usage:" - echo "\$0 user@target 'extra options to dejagnu'" - echo "\$0 target 'extra options to dejagnu'" - echo "\$0 target" - echo "e.g. \$0 192.168.7.2 ' dg.exp=visibility-d.c'" - echo "will only run visibility-d.c test case" - echo "e.g. \$0 192.168.7.2 '/-mthumb dg.exp=visibility-d.c'" - echo "will only run visibility-d.c test case in thumb mode" - echo "You need to have dejagnu autogen expect installed" - echo "on the build host" - } -if [ "x\$target" = "x" ] -then - echo "Please specify the target machine and remote user in form of user@target\n" - usage - exit 1; -fi - -shift - -echo "\$target" | grep "@" 2>&1 > /dev/null -if [ "x\$?" = "x0" ] -then - user=\$(echo \$target | cut -d '@' -f 1) - target=\$(echo \$target | cut -d '@' -f 2) -else - user=\$USER -fi -ssh \$user@\$target date 2>&1 > /dev/null -if [ "x\$?" != "x0" ] -then - echo "Failed connecting to \$user@\$target it could be because" - echo "you don't have passwordless ssh setup to access \$target" - echo "or sometimes host key has been changed" - echo "in such case do something like below on build host" - echo "ssh-keygen -f "~/.ssh/known_hosts" -R \$target" - echo "and then try ssh \$user@\$target" - - usage - exit 1 -fi - echo "lappend boards_dir [pwd]/../../.." > ${B}/site.exp - echo "load_generic_config \"unix\"" > ${B}/${PACKAGE_ARCH}.exp - echo "set_board_info username \$user" >> ${B}/${PACKAGE_ARCH}.exp - echo "set_board_info rsh_prog ssh" >> ${B}/${PACKAGE_ARCH}.exp - echo "set_board_info rcp_prog scp" >> ${B}/${PACKAGE_ARCH}.exp - echo "set_board_info hostname \$target" >> ${B}/${PACKAGE_ARCH}.exp - DEJAGNU=${B}/site.exp make -k check RUNTESTFLAGS="--target_board=${PACKAGE_ARCH}\$@" - -STOP - - chmod +x ${B}/${TARGET_PREFIX}testgcc - } INHIBIT_PACKAGE_STRIP = "1" @@ -193,10 +117,6 @@ do_install () { cp ${S}/libquadmath/quadmath.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ cp ${S}/libquadmath/quadmath_weak.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ - # We use libiberty from binutils - find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f - find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f - find ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed -type f -not -name "README" -not -name limits.h -not -name syslimits.h | xargs rm -f } |