diff --git a/config/path b/config/path index d04b6f8ce0..64a592d9a9 100644 --- a/config/path +++ b/config/path @@ -44,7 +44,7 @@ TARGET_PREFIX=$TOOLCHAIN/bin/$TARGET_NAME- # 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" + KERNEL_TOOLCHAIN="aarch64-none-linux-gnu" fi if [ -n "$KERNEL_TOOLCHAIN" ]; then TARGET_KERNEL_PREFIX=$TOOLCHAIN/lib/gcc-arm-$KERNEL_TOOLCHAIN/bin/$KERNEL_TOOLCHAIN- diff --git a/packages/lang/gcc-arm-aarch64-linux-gnu/package.mk b/packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk similarity index 58% rename from packages/lang/gcc-arm-aarch64-linux-gnu/package.mk rename to packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk index e7f3456946..e8d85f1030 100644 --- a/packages/lang/gcc-arm-aarch64-linux-gnu/package.mk +++ b/packages/lang/gcc-arm-aarch64-none-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-arm-aarch64-linux-gnu" -PKG_VERSION="8.3-2019.03" -PKG_SHA256="8ce3e7688a47d8cd2d8e8323f147104ae1c8139520eca50ccf8a7fa933002731" +PKG_NAME="gcc-arm-aarch64-none-linux-gnu" +PKG_VERSION="9.2-2019.12" +PKG_SHA256="8dfe681531f0bd04fb9c53cf3c0a3368c616aa85d48938eebe2b516376e06a66" PKG_LICENSE="GPL" -PKG_SITE="" -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_SITE="https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a" +PKG_URL="https://developer.arm.com/-/media/Files/downloads/gnu-a/${PKG_VERSION}/binrel/gcc-arm-${PKG_VERSION}-x86_64-aarch64-none-linux-gnu.tar.xz" PKG_DEPENDS_HOST="ccache:host" PKG_LONGDESC="ARM Aarch64 GNU Linux Binary Toolchain" PKG_TOOLCHAIN="manual" makeinstall_host() { - mkdir -p $TOOLCHAIN/lib/gcc-arm-aarch64-linux-gnu/ - cp -a * $TOOLCHAIN/lib/gcc-arm-aarch64-linux-gnu + mkdir -p $TOOLCHAIN/lib/gcc-arm-aarch64-none-linux-gnu/ + cp -a * $TOOLCHAIN/lib/gcc-arm-aarch64-none-linux-gnu # wrap gcc and g++ with ccache like in gcc package.mk - PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-arm-aarch64-linux-gnu/bin/aarch64-linux-gnu-" + PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-arm-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-" cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real" cat > "${PKG_GCC_PREFIX}gcc" << EOF