Skip to content

Commit 38148c7

Browse files
committed
Adjust Arm GNU Toolchain
1 parent 0eaf24d commit 38148c7

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

compile-kernel/tools/script/armbian_compile_kernel_script.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ silent_log="false"
8585
# Compile toolchain download mirror, run on Armbian
8686
dev_repo="https://github.com/ophub/kernel/releases/download/dev"
8787
# Arm GNU Toolchain source: https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads
88-
gun_file="arm-gnu-toolchain-14.2.rel1-aarch64-aarch64-none-elf.tar.xz"
88+
gun_file="arm-gnu-toolchain-14.2.rel1-aarch64-aarch64-none-linux-gnu.tar.xz"
8989
# Set the toolchain path
9090
toolchain_path="/usr/local/toolchain"
9191
# Set the default cross-compilation toolchain: [ clang / gcc / gcc-13.2, etc. ]
@@ -220,7 +220,7 @@ init_var() {
220220
# Set the gcc version code
221221
[[ "${toolchain_name}" =~ ^gcc-[0-9]+.[0-9]+ ]] && {
222222
gcc_version_code="${toolchain_name#*-}"
223-
gun_file="arm-gnu-toolchain-${gcc_version_code}.rel1-aarch64-aarch64-none-elf.tar.xz"
223+
gun_file="arm-gnu-toolchain-${gcc_version_code}.rel1-aarch64-aarch64-none-linux-gnu.tar.xz"
224224
}
225225

226226
# Set compilation parameters
@@ -300,7 +300,7 @@ toolchain_check() {
300300
export PATH="${path_gcc}"
301301

302302
# Set cross compilation parameters
303-
export CROSS_COMPILE="${toolchain_path}/${gun_file//.tar.xz/}/bin/aarch64-none-elf-"
303+
export CROSS_COMPILE="${toolchain_path}/${gun_file//.tar.xz/}/bin/aarch64-none-linux-gnu-"
304304
export CC="${CROSS_COMPILE}gcc"
305305
export LD="${CROSS_COMPILE}ld.bfd"
306306
export MFLAGS=""

compile-kernel/tools/script/ubuntu_chroot_armbian.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ armbian_kernel_path="/opt/linux-kernel"
4343
# Compile toolchain download mirror, run on Armbian
4444
dev_repo="https://github.com/ophub/kernel/releases/download/dev"
4545
# Arm GNU Toolchain source: https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads
46-
gun_file="arm-gnu-toolchain-14.2.rel1-aarch64-aarch64-none-elf.tar.xz"
46+
gun_file="arm-gnu-toolchain-14.2.rel1-aarch64-aarch64-none-linux-gnu.tar.xz"
4747
# Set the toolchain path
4848
toolchain_path="/usr/local/toolchain"
4949
# Set the kernel arch
@@ -140,7 +140,7 @@ make_kernel_scripts() {
140140
path_gcc="${toolchain_path}/${gun_file//.tar.xz/}/bin:${path_os_variable}"
141141
# Set cross compilation parameters
142142
export PATH="${path_gcc}"
143-
export CROSS_COMPILE="${toolchain_path}/${gun_file//.tar.xz/}/bin/aarch64-none-elf-"
143+
export CROSS_COMPILE="${toolchain_path}/${gun_file//.tar.xz/}/bin/aarch64-none-linux-gnu-"
144144
export CC="${CROSS_COMPILE}gcc"
145145
export LD="${CROSS_COMPILE}ld.bfd"
146146
export MFLAGS=""

documents/README.cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ cd rtl8189ES_linux
436436
gun_file="arm-gnu-toolchain-13.3.rel1-aarch64-aarch64-none-elf.tar.xz"
437437
toolchain_path="/usr/local/toolchain"
438438
toolchain_name="gcc"
439-
export CROSS_COMPILE="${toolchain_path}/${gun_file//.tar.xz/}/bin/aarch64-none-elf-"
439+
export CROSS_COMPILE="${toolchain_path}/${gun_file//.tar.xz/}/bin/aarch64-none-linux-gnu-"
440440
export CC="${CROSS_COMPILE}gcc"
441441
export LD="${CROSS_COMPILE}ld.bfd"
442442
export ARCH="arm64"

documents/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ cd rtl8189ES_linux
437437
gun_file="arm-gnu-toolchain-13.3.rel1-aarch64-aarch64-none-elf.tar.xz"
438438
toolchain_path="/usr/local/toolchain"
439439
toolchain_name="gcc"
440-
export CROSS_COMPILE="${toolchain_path}/${gun_file//.tar.xz/}/bin/aarch64-none-elf-"
440+
export CROSS_COMPILE="${toolchain_path}/${gun_file//.tar.xz/}/bin/aarch64-none-linux-gnu-"
441441
export CC="${CROSS_COMPILE}gcc"
442442
export LD="${CROSS_COMPILE}ld.bfd"
443443
export ARCH="arm64"

recompile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ silent_log="false"
8383
dev_repo="https://github.com/ophub/kernel/releases/download/dev"
8484
# Arm GNU Toolchain source: https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads
8585
gun_file_x86_64="arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-linux-gnu.tar.xz"
86-
gun_file_aarch64="arm-gnu-toolchain-14.2.rel1-aarch64-aarch64-none-elf.tar.xz"
86+
gun_file_aarch64="arm-gnu-toolchain-14.2.rel1-aarch64-aarch64-none-linux-gnu.tar.xz"
8787
# Armenian file source: https://github.com/ophub/amlogic-s9xxx-armbian/releases
8888
armbian_rootfs_file="armbian.tar.xz"
8989
# Set the toolchain path
@@ -247,7 +247,7 @@ init_var() {
247247
[[ "${toolchain_name}" =~ ^gcc-[0-9]+.[0-9]+ ]] && {
248248
gcc_version_code="${toolchain_name#*-}"
249249
gun_file_x86_64="arm-gnu-toolchain-${gcc_version_code}.rel1-x86_64-aarch64-none-linux-gnu.tar.xz"
250-
gun_file_aarch64="arm-gnu-toolchain-${gcc_version_code}.rel1-aarch64-aarch64-none-elf.tar.xz"
250+
gun_file_aarch64="arm-gnu-toolchain-${gcc_version_code}.rel1-aarch64-aarch64-none-linux-gnu.tar.xz"
251251
}
252252

253253
# Set cross compilation parameters
@@ -315,7 +315,7 @@ toolchain_check() {
315315
gun_bin="aarch64-none-linux-gnu-"
316316
else
317317
gun_file="${gun_file_aarch64}"
318-
gun_bin="aarch64-none-elf-"
318+
gun_bin="aarch64-none-linux-gnu-"
319319
fi
320320

321321
# Download Arm GNU Toolchain

0 commit comments

Comments
 (0)