external-sourcery: extract src and dest sysroot paths from gcc
Rather than hardcoding the multilib path in a map, and hardcoding dest sysroot symlink creation in a hook, now we just use -print-sysroot for both, and pass the appropriate multilib args to the toolchain for particular tunes. (From OE-Core rev: b9a9c28f7052884b2a6a33cf73cb6d7e2e3d11ff) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
9205cba286
commit
286a4904d2
|
@ -42,24 +42,39 @@ ENABLE_BINARY_LOCALE_GENERATION = ""
|
|||
|
||||
TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}"
|
||||
|
||||
# Translate to CodeSourcery's names for their optimized files in the toolchain
|
||||
def csl_target_core(d):
|
||||
coredata = {
|
||||
'armv7a-vfp-neon': 'armv7-a-neon',
|
||||
'i586': 'sgxx-glibc',
|
||||
'i686': 'sgxx-glibc',
|
||||
'core2': 'sgxx-glibc',
|
||||
'mips': 'mips32',
|
||||
'mipsel': 'el',
|
||||
'powerpc-nf': 'nof',
|
||||
'ppce500': 'te500v1',
|
||||
'ppce500mc': 'te500mc',
|
||||
'ppce500v2': 'te500v2',
|
||||
'ppce600': 'te600'
|
||||
}
|
||||
return coredata.get(d.getVar('TUNE_PKGARCH', True), '')
|
||||
# Point to the appropriate multilib sysroot from the external toolchain, whose
|
||||
# files will be extracted into the OE sysroot
|
||||
def exttc_run(d, cmd):
|
||||
try:
|
||||
return bb.process.run(cmd, shell=True, env={'PATH': d.getVar('PATH', True)})[0].rstrip()
|
||||
except (OSError, bb.process.CmdError):
|
||||
return ''
|
||||
|
||||
EXTERNAL_TOOLCHAIN_SYSROOT_CMD = "${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} -print-sysroot"
|
||||
EXTERNAL_TOOLCHAIN_SYSROOT ??= "${@exttc_run(d, EXTERNAL_TOOLCHAIN_SYSROOT_CMD)}"
|
||||
|
||||
# These bits are here temporarily to sidestep the need to use a separate set
|
||||
# of tune files to pass the appropriate multilib selection arguments to the
|
||||
# sourcery toolchain, as is needed to extract the sysroot content.
|
||||
CSL_MULTILIB_ARGS[i586] ?= "-msgxx-glibc"
|
||||
CSL_MULTILIB_ARGS[i686] ?= "-msgxx-glibc"
|
||||
CSL_MULTILIB_ARGS[core2] ?= "-msgxx-glibc"
|
||||
CSL_MULTILIB_ARGS[x86] ?= "-msgxx-glibc"
|
||||
CSL_MULTILIB_ARGS[x86-64] ?= "-msgxx-glibc"
|
||||
CSL_MULTILIB_ARGS[ppce500] ?= "-te500v1"
|
||||
CSL_MULTILIB_ARGS[ppce500mc] ?= "-te500mc"
|
||||
CSL_MULTILIB_ARGS[ppce500v2] ?= "-te500v2"
|
||||
CSL_MULTILIB_ARGS[ppce600] ?= "-te600"
|
||||
|
||||
def csl_multilib_arg(d):
|
||||
argument = d.getVarFlag('CSL_MULTILIB_ARGS', d.getVar('DEFAULTTUNE', True) or '')
|
||||
if argument:
|
||||
return argument
|
||||
else:
|
||||
return ''
|
||||
|
||||
EXTERNAL_TOOLCHAIN_SYSROOT_CMD += "${@csl_multilib_arg(d)}"
|
||||
|
||||
CSL_TARGET_CORE ?= "${@csl_target_core(d)}"
|
||||
|
||||
# Unfortunately, the CSL ia32 toolchain has non-prefixed binaries in its
|
||||
# bindir (e.g. gcc, ld). To avoid this messing up our build, we avoid adding
|
||||
|
|
|
@ -24,7 +24,7 @@ PROVIDES += "\
|
|||
virtual/linux-libc-headers \
|
||||
"
|
||||
PV = "${CSL_VER_MAIN}"
|
||||
PR = "r5"
|
||||
PR = "r6"
|
||||
|
||||
#SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/${CSL_TARGET_SYS}/arm-${PV}-${TARGET_PREFIX}i686-pc-linux-gnu.tar.bz2"
|
||||
|
||||
|
@ -32,10 +32,7 @@ SRC_URI = "file://SUPPORTED"
|
|||
|
||||
do_install() {
|
||||
# Use optimized files if available
|
||||
sysroot="${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}/libc"
|
||||
if [ -d $sysroot/${CSL_TARGET_CORE} ]; then
|
||||
sysroot="$sysroot/${CSL_TARGET_CORE}"
|
||||
fi
|
||||
sysroot="${EXTERNAL_TOOLCHAIN_SYSROOT}"
|
||||
|
||||
cp -a $sysroot${base_libdir}/. ${D}${base_libdir}
|
||||
cp -a $sysroot/etc/. ${D}${sysconfdir}
|
||||
|
@ -76,15 +73,11 @@ do_install() {
|
|||
|
||||
SYSROOT_PREPROCESS_FUNCS += "external_toolchain_sysroot_adjust"
|
||||
external_toolchain_sysroot_adjust() {
|
||||
if [ -n "${CSL_TARGET_CORE}" ]; then
|
||||
rm -f ${SYSROOT_DESTDIR}/${CSL_TARGET_CORE}
|
||||
ln -s . ${SYSROOT_DESTDIR}/${CSL_TARGET_CORE}
|
||||
fi
|
||||
|
||||
if [ "${TUNE_PKGARCH}" = "i586" ]; then
|
||||
rm -f ${SYSROOT_DESTDIR}/system32
|
||||
ln -s . ${SYSROOT_DESTDIR}/system32
|
||||
fi
|
||||
dest_sysroot="$(${CC} -print-sysroot | sed -e's,^${STAGING_DIR_HOST},,; s,/$,,')"
|
||||
if [ -n "$dest_sysroot" ]; then
|
||||
rm -f ${SYSROOT_DESTDIR}/$dest_sysroot
|
||||
ln -s . ${SYSROOT_DESTDIR}/$dest_sysroot
|
||||
fi
|
||||
}
|
||||
|
||||
PACKAGES =+ "libgcc libgcc-dev libstdc++ libstdc++-dev libstdc++-staticdev linux-libc-headers linux-libc-headers-dev gdbserver gdbserver-dbg"
|
||||
|
|
Loading…
Reference in New Issue