From c2744090b9a16ea85a3b0d250ff66ec3b64d45c4 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 12 Jan 2020 21:23:36 +0000
Subject: [PATCH] gcc-arm-arm-linux-gnueabihf: update to 9.2-2019.12 and rename

---
 .../package.mk                                 | 18 +++++++++---------
 projects/Rockchip/devices/RK3288/options       |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename packages/lang/{gcc-arm-arm-linux-gnueabihf => gcc-arm-arm-none-linux-gnueabihf}/package.mk (53%)

diff --git a/packages/lang/gcc-arm-arm-linux-gnueabihf/package.mk b/packages/lang/gcc-arm-arm-none-linux-gnueabihf/package.mk
similarity index 53%
rename from packages/lang/gcc-arm-arm-linux-gnueabihf/package.mk
rename to packages/lang/gcc-arm-arm-none-linux-gnueabihf/package.mk
index 39107d5a30..40a20b403c 100644
--- a/packages/lang/gcc-arm-arm-linux-gnueabihf/package.mk
+++ b/packages/lang/gcc-arm-arm-none-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-arm-arm-linux-gnueabihf"
-PKG_VERSION="8.3-2019.03"
-PKG_SHA256="d4f6480ecaa99e977e3833cc8a8e1263f9eecd1ce2d022bb548a24c4f32670f5"
+PKG_NAME="gcc-arm-arm-none-linux-gnueabihf"
+PKG_VERSION="9.2-2019.12"
+PKG_SHA256="51bbaf22a4d3e7a393264c4ef1e45566701c516274dde19c4892c911caa85617"
 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-arm-linux-gnueabihf.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-arm-none-linux-gnueabihf.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
-PKG_LONGDESC="ARM GNU Linux Binary Toolchain"
+PKG_LONGDESC="ARM AArch32 GNU Linux Binary Toolchain"
 PKG_TOOLCHAIN="manual"
 
 makeinstall_host() {
-  mkdir -p $TOOLCHAIN/lib/gcc-arm-arm-linux-gnueabihf/
-    cp -a * $TOOLCHAIN/lib/gcc-arm-arm-linux-gnueabihf
+  mkdir -p $TOOLCHAIN/lib/gcc-arm-arm-none-linux-gnueabihf/
+    cp -a * $TOOLCHAIN/lib/gcc-arm-arm-none-linux-gnueabihf
 
   # wrap gcc and g++ with ccache like in gcc package.mk
-  PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-arm-arm-linux-gnueabihf/bin/arm-linux-gnueabihf-"
+  PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-arm-arm-none-linux-gnueabihf/bin/arm-none-linux-gnueabihf-"
 
   cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real"
 cat > "${PKG_GCC_PREFIX}gcc" << EOF
diff --git a/projects/Rockchip/devices/RK3288/options b/projects/Rockchip/devices/RK3288/options
index 99d2d28945..0e1dcaed95 100644
--- a/projects/Rockchip/devices/RK3288/options
+++ b/projects/Rockchip/devices/RK3288/options
@@ -10,7 +10,7 @@
         TARGET_CPU="cortex-a17"
         TARGET_FPU="neon-vfpv4"
         TARGET_FEATURES="32bit"
-        KERNEL_TOOLCHAIN="arm-linux-gnueabihf"
+        KERNEL_TOOLCHAIN="arm-none-linux-gnueabihf"
         ;;
     esac