Merge pull request #149 from kergoth/x32

Fix two issues with x32 builds
This commit is contained in:
Christopher Larson
2016-12-22 09:40:50 -07:00
committed by GitHub

View File

@@ -17,6 +17,7 @@ NO32LIBS ?= "${HAS_64BIT_TOOLCHAIN}"
# Align paths with the external toolchain
BASELIB_aarch64 = "lib64"
BASELIB_x86-64 = "lib64"
BASELIB_x86-64_linux-gnux32 = "libx32"
# Ensure that we only attempt to package up locales which are available in the
# external toolchain. In the future, we should examine the external toolchain
@@ -134,6 +135,7 @@ LDEMULATION_ENDIAN = "${@'bt' if 'bigendian' in '${TUNE_FEATURES}'.split() else
LDEMULATION_BITS = "${@'64' if 'n64' in '${TUNE_FEATURES}'.split() else '32'}"
LDEMULATION_mips64 = "elf${LDEMULATION_BITS}${LDEMULATION_ENDIAN}smip${@bb.utils.contains('TUNE_FEATURES', 'n32', 'n32', '', d)}"
LDEMULATION_x86-64 = "elf_${TARGET_ARCH}"
LDEMULATION_x86-64_linux-gnux32 = "elf32_${TARGET_ARCH}"
TUNE_LDARGS += "${@'-m ${LDEMULATION}' if '${LDEMULATION}' else ''}"
# Ensure that the licensing variables are available to the toolchain.