From: Denys Dmytriyenko denys@ti.com
When backporting Arm toolchain from master to thud, several commits were missed, as well as one addition of crosssdk-inital recipe was missing. This series addresses those issues.
Denys Dmytriyenko (2): gcc-crosssdk-initial: add missing arm-8.2 version tcmode-external-arm: uncomment preference for virtual/${TARGET_PREFIX}binutils
Koen Kooi (4): tcmode-external-arm.inc: fix some ELT⇒ EAT conversions that were missed previously tcmode-external-arm.inc: prefer virtual/libc-locale = external-arm-toolchain tcmode-external-arm.inc: set glibc override tcmode-external-arm.inc: add 'libc-locales libc-locale-code libc-charsets' to DISTRO_FEATURES_LIBC
.../conf/distro/include/tcmode-external-arm.inc | 18 ++++++++++-------- .../gcc/gcc-crosssdk-initial_arm-8.2.bb | 3 +++ 2 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_arm-8.2.bb
From: Denys Dmytriyenko denys@ti.com
When backporting arm-8.2 from master, where cross-initial and crosssdk-initial were eliminated, crosssdk-initial recipe was not added. Fix it here.
Signed-off-by: Denys Dmytriyenko denys@ti.com --- .../recipes-devtools/gcc/gcc-crosssdk-initial_arm-8.2.bb | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_arm-8.2.bb
diff --git a/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_arm-8.2.bb b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_arm-8.2.bb new file mode 100644 index 0000000..c0b6626 --- /dev/null +++ b/meta-linaro-toolchain/recipes-devtools/gcc/gcc-crosssdk-initial_arm-8.2.bb @@ -0,0 +1,3 @@ +require recipes-devtools/gcc/gcc-cross-initial_${PV}.bb +require recipes-devtools/gcc/gcc-crosssdk-initial.inc +
From: Koen Kooi koen.kooi@linaro.org
Change-Id: I3a1416cea0c80031a5e72c7877d7f86133ee15c5 Signed-off-by: Koen Kooi koen.kooi@linaro.org Signed-off-by: Denys Dmytriyenko denys@ti.com --- .../conf/distro/include/tcmode-external-arm.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc b/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc index b8dc528..fc92d96 100644 --- a/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc +++ b/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc @@ -7,10 +7,10 @@ EXTERNAL_TOOLCHAIN ?= "/usr/local/arm-binary-toolchain/${TARGET_ARCH}" TOOLCHAIN_PATH_ADD = "${EXTERNAL_TOOLCHAIN}/bin:" PATH =. "${TOOLCHAIN_PATH_ADD}"
-ELT_TARGET_SYS_arm ?= "arm-linux-gnueabihf" -ELT_TARGET_SYS_aarch64 ?= "aarch64-linux-gnu" -ELT_TARGET_SYS = "${TARGET_SYS}" -TARGET_PREFIX = "${ELT_TARGET_SYS}-" +EAT_TARGET_SYS_arm ?= "arm-linux-gnueabihf" +EAT_TARGET_SYS_aarch64 ?= "aarch64-linux-gnu" +EAT_TARGET_SYS = "${TARGET_SYS}" +TARGET_PREFIX = "${EAT_TARGET_SYS}-"
EAT_LIBDIR_arm = "lib" EAT_LIBDIR_aarch64 = "lib64" @@ -43,8 +43,8 @@ PREFERRED_PROVIDER_glibc-mtrace = "external-arm-toolchain" PREFERRED_PROVIDER_libc-mtrace = "external-arm-toolchain" PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-arm-toolchain"
-TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/include " -TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${ELT_TARGET_SYS}/lib " +TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/include " +TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/lib "
TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}"
From: Denys Dmytriyenko denys@ti.com
external-arm-toolchain does provide virtual/${TARGET_PREFIX}binutils, so set default preference accordingly.
Change-Id: I8b9a70f4c6e2194a4a52dcddf3239f0c543cf7ef Signed-off-by: Denys Dmytriyenko denys@ti.com Signed-off-by: Koen Kooi koen.kooi@linaro.org --- meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc b/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc index fc92d96..4074d6d 100644 --- a/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc +++ b/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc @@ -29,7 +29,7 @@ PREFERRED_PROVIDER_linux-libc-headers-dev = "external-arm-toolchain" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "external-arm-toolchain" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "external-arm-toolchain" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-arm-toolchain" -#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-arm-toolchain" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-arm-toolchain" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-arm-toolchain" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-arm-toolchain" PREFERRED_PROVIDER_glibc = "external-arm-toolchain"
From: Koen Kooi koen.kooi@linaro.org
Change-Id: I1d9b4e38d6957eeb729175b9c293690ff4f318c7 Signed-off-by: Koen Kooi koen.kooi@linaro.org Signed-off-by: Denys Dmytriyenko denys@ti.com --- meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc b/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc index 4074d6d..e6becf1 100644 --- a/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc +++ b/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc @@ -35,6 +35,7 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-arm-toolchai PREFERRED_PROVIDER_glibc = "external-arm-toolchain" PREFERRED_PROVIDER_libgcc = "external-arm-toolchain" PREFERRED_PROVIDER_virtual/libc = "external-arm-toolchain" +PREFERRED_PROVIDER_virtual/libc-locale = "external-arm-toolchain" PREFERRED_PROVIDER_virtual/libintl = "external-arm-toolchain" PREFERRED_PROVIDER_virtual/libiconv = "external-arm-toolchain" PREFERRED_PROVIDER_virtual/crypt = "external-arm-toolchain" @@ -42,7 +43,6 @@ PREFERRED_PROVIDER_glibc-thread-db = "external-arm-toolchain" PREFERRED_PROVIDER_glibc-mtrace = "external-arm-toolchain" PREFERRED_PROVIDER_libc-mtrace = "external-arm-toolchain" PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-arm-toolchain" - TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/include " TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${EAT_TARGET_SYS}/lib "
From: Koen Kooi koen.kooi@linaro.org
Change-Id: Ib25927becd05e0f9c7895d833994ff223ef49afd Signed-off-by: Koen Kooi koen.kooi@linaro.org Signed-off-by: Denys Dmytriyenko denys@ti.com --- meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc | 1 + 1 file changed, 1 insertion(+)
diff --git a/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc b/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc index e6becf1..1dcc8a8 100644 --- a/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc +++ b/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc @@ -57,6 +57,7 @@ DISTRO_FEATURES_LIBC = "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-c
ENABLE_BINARY_LOCALE_GENERATION = "0" GLIBC_INTERNAL_USE_BINARY_LOCALE = "precompiled" +LIBCOVERRIDE = ":libc-glibc"
ERROR_QA[type] ?= "list" python toolchain_metadata_setup () {
From: Koen Kooi koen.kooi@linaro.org
Change-Id: Ib58e56550eb718d7fb9be1800fb923af7a29e733 Signed-off-by: Koen Kooi koen.kooi@linaro.org Signed-off-by: Denys Dmytriyenko denys@ti.com --- meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc | 1 + 1 file changed, 1 insertion(+)
diff --git a/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc b/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc index 1dcc8a8..3051881 100644 --- a/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc +++ b/meta-linaro-toolchain/conf/distro/include/tcmode-external-arm.inc @@ -51,6 +51,7 @@ TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}" DISTRO_FEATURES_LIBC = "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-crypt \ libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \ libc-getlogin libc-idn libc-inet-anl libc-libm libc-libm-big \ + libc-locales libc-locale-code libc-charsets \ libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \ libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \ libc-posix-wchar-io"
-
Denys Dmytriyenko