From a16579b131d29900a75fc8e1e930e38363d6c2ec Mon Sep 17 00:00:00 2001 From: kszaq Date: Wed, 3 Apr 2019 21:58:32 +0200 Subject: [PATCH 1/5] Rename KERNEL_LINARO_TOOLCHAIN to KERNEL_TOOLCHAIN in case there is a need to use non-Linaro toolchain. --- config/path | 8 ++++---- packages/linux/package.mk | 6 +++--- projects/Rockchip/devices/MiQi/options | 2 +- projects/Rockchip/devices/TinkerBoard/options | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/path b/config/path index fd0dddc544..831b4614e9 100644 --- a/config/path +++ b/config/path @@ -43,11 +43,11 @@ LIB_PREFIX=$SYSROOT_PREFIX/usr TARGET_PREFIX=$TOOLCHAIN/bin/$TARGET_NAME- # use linaro toolchain on 64/32 split builds -if [ -z "$KERNEL_LINARO_TOOLCHAIN" -a "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then - KERNEL_LINARO_TOOLCHAIN="aarch64-linux-gnu" +if [ -z "$KERNEL_TOOLCHAIN" -a "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then + KERNEL_TOOLCHAIN="aarch64-linux-gnu" fi -if [ -n "$KERNEL_LINARO_TOOLCHAIN" ]; then - TARGET_KERNEL_PREFIX=$TOOLCHAIN/lib/gcc-linaro-$KERNEL_LINARO_TOOLCHAIN/bin/$KERNEL_LINARO_TOOLCHAIN- +if [ -n "$KERNEL_TOOLCHAIN" ]; then + TARGET_KERNEL_PREFIX=$TOOLCHAIN/lib/gcc-linaro-$KERNEL_TOOLCHAIN/bin/$KERNEL_TOOLCHAIN- else TARGET_KERNEL_PREFIX=$TARGET_PREFIX fi diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 05b0fce80b..4e235a653e 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -45,9 +45,9 @@ esac PKG_KERNEL_CFG_FILE=$(kernel_config_path) -if [ -n "$KERNEL_LINARO_TOOLCHAIN" ]; then - PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-linaro-$KERNEL_LINARO_TOOLCHAIN:host" - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-$KERNEL_LINARO_TOOLCHAIN:host" +if [ -n "$KERNEL_TOOLCHAIN" ]; then + PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-linaro-$KERNEL_TOOLCHAIN:host" + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-$KERNEL_TOOLCHAIN:host" HEADERS_ARCH=$TARGET_ARCH fi diff --git a/projects/Rockchip/devices/MiQi/options b/projects/Rockchip/devices/MiQi/options index 7e3c0d849c..dacda11285 100644 --- a/projects/Rockchip/devices/MiQi/options +++ b/projects/Rockchip/devices/MiQi/options @@ -10,7 +10,7 @@ TARGET_CPU="cortex-a17" TARGET_FPU="neon-vfpv4" TARGET_FEATURES="32bit" - KERNEL_LINARO_TOOLCHAIN="arm-linux-gnueabihf" + KERNEL_TOOLCHAIN="arm-linux-gnueabihf" ;; esac diff --git a/projects/Rockchip/devices/TinkerBoard/options b/projects/Rockchip/devices/TinkerBoard/options index 76a8e4fd34..563aa7d36a 100644 --- a/projects/Rockchip/devices/TinkerBoard/options +++ b/projects/Rockchip/devices/TinkerBoard/options @@ -10,7 +10,7 @@ TARGET_CPU="cortex-a17" TARGET_FPU="neon-vfpv4" TARGET_FEATURES="32bit" - KERNEL_LINARO_TOOLCHAIN="arm-linux-gnueabihf" + KERNEL_TOOLCHAIN="arm-linux-gnueabihf" ;; esac From e4bb77914c588aa488f81db5a86bf6f8dbca267e Mon Sep 17 00:00:00 2001 From: kszaq Date: Tue, 2 Apr 2019 13:29:25 +0200 Subject: [PATCH 2/5] gcc-linaro-aarch64-linux-gnu: bump to 8.3-2019.03 and rename to gcc-arm-aarch64-linux-gnu Align aarch64 toolchain with the version used to compile userspace. ARM took over the builds from Linaro, rename package accordingly. --- .../package.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename packages/lang/{gcc-linaro-aarch64-linux-gnu => gcc-arm-aarch64-linux-gnu}/package.mk (54%) diff --git a/packages/lang/gcc-linaro-aarch64-linux-gnu/package.mk b/packages/lang/gcc-arm-aarch64-linux-gnu/package.mk similarity index 54% rename from packages/lang/gcc-linaro-aarch64-linux-gnu/package.mk rename to packages/lang/gcc-arm-aarch64-linux-gnu/package.mk index 3cb8bf933a..e7f3456946 100644 --- a/packages/lang/gcc-linaro-aarch64-linux-gnu/package.mk +++ b/packages/lang/gcc-arm-aarch64-linux-gnu/package.mk @@ -1,22 +1,22 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) -PKG_NAME="gcc-linaro-aarch64-linux-gnu" -PKG_VERSION="7.3.1-2018.05" -PKG_SHA256="73eed74e593e2267504efbcf3678918bb22409ab7afa3dc7c135d2c6790c2345" +PKG_NAME="gcc-arm-aarch64-linux-gnu" +PKG_VERSION="8.3-2019.03" +PKG_SHA256="8ce3e7688a47d8cd2d8e8323f147104ae1c8139520eca50ccf8a7fa933002731" PKG_LICENSE="GPL" PKG_SITE="" -PKG_URL="https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/aarch64-linux-gnu/gcc-linaro-${PKG_VERSION}-x86_64_aarch64-linux-gnu.tar.xz" +PKG_URL="https://developer.arm.com/-/media/Files/downloads/gnu-a/${PKG_VERSION}/binrel/gcc-arm-${PKG_VERSION}-x86_64-aarch64-linux-gnu.tar.xz" PKG_DEPENDS_HOST="ccache:host" -PKG_LONGDESC="Linaro Aarch64 GNU Linux Binary Toolchain" +PKG_LONGDESC="ARM Aarch64 GNU Linux Binary Toolchain" PKG_TOOLCHAIN="manual" makeinstall_host() { - mkdir -p $TOOLCHAIN/lib/gcc-linaro-aarch64-linux-gnu/ - cp -a * $TOOLCHAIN/lib/gcc-linaro-aarch64-linux-gnu + mkdir -p $TOOLCHAIN/lib/gcc-arm-aarch64-linux-gnu/ + cp -a * $TOOLCHAIN/lib/gcc-arm-aarch64-linux-gnu # wrap gcc and g++ with ccache like in gcc package.mk - PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-linaro-aarch64-linux-gnu/bin/aarch64-linux-gnu-" + PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-arm-aarch64-linux-gnu/bin/aarch64-linux-gnu-" cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real" cat > "${PKG_GCC_PREFIX}gcc" << EOF From 2f5d831efe395480b90dbc30b16e638583361044 Mon Sep 17 00:00:00 2001 From: kszaq Date: Tue, 2 Apr 2019 22:33:59 +0200 Subject: [PATCH 3/5] gcc-linaro-arm-linux-gnueabihf: bump to 8.3-2019.03 and rename to gcc-arm-arm-linux-gnueabihf ARM took over the builds from Linaro, rename package accordingly. --- .../package.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename packages/lang/{gcc-linaro-arm-linux-gnueabihf => gcc-arm-arm-linux-gnueabihf}/package.mk (53%) diff --git a/packages/lang/gcc-linaro-arm-linux-gnueabihf/package.mk b/packages/lang/gcc-arm-arm-linux-gnueabihf/package.mk similarity index 53% rename from packages/lang/gcc-linaro-arm-linux-gnueabihf/package.mk rename to packages/lang/gcc-arm-arm-linux-gnueabihf/package.mk index ce75f76ed4..39107d5a30 100644 --- a/packages/lang/gcc-linaro-arm-linux-gnueabihf/package.mk +++ b/packages/lang/gcc-arm-arm-linux-gnueabihf/package.mk @@ -1,22 +1,22 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) -PKG_NAME="gcc-linaro-arm-linux-gnueabihf" -PKG_VERSION="7.3.1-2018.05" -PKG_SHA256="7248bf105d0d468887a9b8a7120bb281ac8ad0223d9cb3d00dc7c2d498485d91" +PKG_NAME="gcc-arm-arm-linux-gnueabihf" +PKG_VERSION="8.3-2019.03" +PKG_SHA256="d4f6480ecaa99e977e3833cc8a8e1263f9eecd1ce2d022bb548a24c4f32670f5" PKG_LICENSE="GPL" PKG_SITE="" -PKG_URL="https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/arm-linux-gnueabihf/gcc-linaro-${PKG_VERSION}-x86_64_arm-linux-gnueabihf.tar.xz" +PKG_URL="https://developer.arm.com/-/media/Files/downloads/gnu-a/${PKG_VERSION}/binrel/gcc-arm-${PKG_VERSION}-x86_64-arm-linux-gnueabihf.tar.xz" PKG_DEPENDS_HOST="ccache:host" -PKG_LONGDESC="Linaro ARM GNU Linux Binary Toolchain" +PKG_LONGDESC="ARM GNU Linux Binary Toolchain" PKG_TOOLCHAIN="manual" makeinstall_host() { - mkdir -p $TOOLCHAIN/lib/gcc-linaro-arm-linux-gnueabihf/ - cp -a * $TOOLCHAIN/lib/gcc-linaro-arm-linux-gnueabihf + mkdir -p $TOOLCHAIN/lib/gcc-arm-arm-linux-gnueabihf/ + cp -a * $TOOLCHAIN/lib/gcc-arm-arm-linux-gnueabihf # wrap gcc and g++ with ccache like in gcc package.mk - PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-linaro-arm-linux-gnueabihf/bin/arm-linux-gnueabihf-" + PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-arm-arm-linux-gnueabihf/bin/arm-linux-gnueabihf-" cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real" cat > "${PKG_GCC_PREFIX}gcc" << EOF From 847fc62e04df7325c410fd762554c76b792c6987 Mon Sep 17 00:00:00 2001 From: kszaq Date: Wed, 3 Apr 2019 22:07:18 +0200 Subject: [PATCH 4/5] config/path: rename gcc-linaro to gcc-arm --- config/path | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/path b/config/path index 831b4614e9..f6b781428c 100644 --- a/config/path +++ b/config/path @@ -42,12 +42,12 @@ SYSROOT_PREFIX=$TOOLCHAIN/$TARGET_NAME/sysroot LIB_PREFIX=$SYSROOT_PREFIX/usr TARGET_PREFIX=$TOOLCHAIN/bin/$TARGET_NAME- -# use linaro toolchain on 64/32 split builds +# use ARM toolchain on 64/32 split builds if [ -z "$KERNEL_TOOLCHAIN" -a "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then KERNEL_TOOLCHAIN="aarch64-linux-gnu" fi if [ -n "$KERNEL_TOOLCHAIN" ]; then - TARGET_KERNEL_PREFIX=$TOOLCHAIN/lib/gcc-linaro-$KERNEL_TOOLCHAIN/bin/$KERNEL_TOOLCHAIN- + TARGET_KERNEL_PREFIX=$TOOLCHAIN/lib/gcc-arm-$KERNEL_TOOLCHAIN/bin/$KERNEL_TOOLCHAIN- else TARGET_KERNEL_PREFIX=$TARGET_PREFIX fi From b458bf4e8422372381c65694af4f32bc5f68cd36 Mon Sep 17 00:00:00 2001 From: kszaq Date: Wed, 3 Apr 2019 22:48:28 +0200 Subject: [PATCH 5/5] linux: rename gcc-linaro to gcc-arm --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 4e235a653e..c09eb497c2 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -46,8 +46,8 @@ esac PKG_KERNEL_CFG_FILE=$(kernel_config_path) if [ -n "$KERNEL_TOOLCHAIN" ]; then - PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-linaro-$KERNEL_TOOLCHAIN:host" - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-$KERNEL_TOOLCHAIN:host" + PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-arm-$KERNEL_TOOLCHAIN:host" + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-arm-$KERNEL_TOOLCHAIN:host" HEADERS_ARCH=$TARGET_ARCH fi