From 0c5a84f932227b6611e03708c15dd40b26fff558 Mon Sep 17 00:00:00 2001 From: apio Date: Sat, 7 Jan 2023 21:23:01 +0100 Subject: [PATCH] toolchain: Update to binutils 2.39 CI will fail, it's normal. Wait for me to build a new toolchain for it. --- tools/binutils.patch | 38 +++++++++++++++++++------------------- tools/setup-binutils.sh | 2 +- tools/setup-env.sh | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/binutils.patch b/tools/binutils.patch index d375e06f..d262e7f8 100644 --- a/tools/binutils.patch +++ b/tools/binutils.patch @@ -1,6 +1,6 @@ -diff --color -rN -u binutils-2.38/bfd/config.bfd build/binutils-2.38/bfd/config.bfd ---- a/binutils-2.38/bfd/config.bfd 2022-01-22 13:14:07.000000000 +0100 -+++ b/binutils-2.38/bfd/config.bfd 2022-10-01 22:12:16.914033792 +0200 +diff --color -rN -u binutils-2.39/bfd/config.bfd build/binutils-2.39/bfd/config.bfd +--- a/binutils-2.39/bfd/config.bfd 2022-01-22 13:14:07.000000000 +0100 ++++ b/binutils-2.39/bfd/config.bfd 2022-10-01 22:12:16.914033792 +0200 @@ -651,6 +651,11 @@ targ_selvecs="iamcu_elf32_vec i386_pei_vec" targ64_selvecs="x86_64_elf64_vec x86_64_elf32_vec x86_64_pe_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec" @@ -25,9 +25,9 @@ diff --color -rN -u binutils-2.38/bfd/config.bfd build/binutils-2.38/bfd/config. x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep | x86_64-*-cygwin) targ_defvec=x86_64_pe_vec targ_selvecs="x86_64_pe_vec x86_64_pei_vec x86_64_pe_big_vec x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec i386_pe_vec i386_pei_vec i386_elf32_vec iamcu_elf32_vec" -diff --color -rN -u binutils-2.38/gas/configure.tgt build/binutils-2.38/gas/configure.tgt ---- a/binutils-2.38/gas/configure.tgt 2022-01-22 13:14:08.000000000 +0100 -+++ b/binutils-2.38/gas/configure.tgt 2022-10-01 22:12:38.115093972 +0200 +diff --color -rN -u binutils-2.39/gas/configure.tgt build/binutils-2.39/gas/configure.tgt +--- a/binutils-2.39/gas/configure.tgt 2022-01-22 13:14:08.000000000 +0100 ++++ b/binutils-2.39/gas/configure.tgt 2022-10-01 22:12.39.115093972 +0200 @@ -238,6 +238,7 @@ x86_64*-linux-gnux32) arch=x86_64:32 ;; esac ;; @@ -36,9 +36,9 @@ diff --color -rN -u binutils-2.38/gas/configure.tgt build/binutils-2.38/gas/conf i386-*-redox*) fmt=elf ;; i386-*-solaris*) fmt=elf em=solaris ;; i386-*-freebsd* \ -diff --color -rN -u binutils-2.38/ld/configure.tgt build/binutils-2.38/ld/configure.tgt ---- a/binutils-2.38/ld/configure.tgt 2022-01-22 15:19:36.000000000 +0100 -+++ b/binutils-2.38/ld/configure.tgt 2022-10-01 22:15:04.853571062 +0200 +diff --color -rN -u binutils-2.39/ld/configure.tgt build/binutils-2.39/ld/configure.tgt +--- a/binutils-2.39/ld/configure.tgt 2022-01-22 15:19:36.000000000 +0100 ++++ b/binutils-2.39/ld/configure.tgt 2022-10-01 22:15:04.853571062 +0200 @@ -329,6 +329,11 @@ targ64_extra_emuls="elf_x86_64 elf32_x86_64 elf_l1om elf_k1om" targ64_extra_libpath="elf_x86_64 elf32_x86_64" @@ -62,24 +62,24 @@ diff --color -rN -u binutils-2.38/ld/configure.tgt build/binutils-2.38/ld/config x86_64-*-redox*) targ_emul=elf_x86_64 targ_extra_emuls=elf_i386 ;; -diff --color -rN -u binutils-2.38/ld/emulparams/elf_i386_luna.sh build/binutils-2.38/ld/emulparams/elf_i386_luna.sh +diff --color -rN -u binutils-2.39/ld/emulparams/elf_i386_luna.sh build/binutils-2.39/ld/emulparams/elf_i386_luna.sh --- a/dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ b/binutils-2.38/ld/emulparams/elf_i386_luna.sh 2022-10-01 21:52:12.394068335 +0200 ++++ b/binutils-2.39/ld/emulparams/elf_i386_luna.sh 2022-10-01 21:52:12.394068335 +0200 @@ -0,0 +1,3 @@ +source_sh ${srcdir}/emulparams/elf_i386.sh +TEXT_START_ADDR=0x08000000 +MAXPAGESIZE=0x1000 \ No newline at end of file -diff --color -rN -u binutils-2.38/ld/emulparams/elf_x86_64_luna.sh build/binutils-2.38/ld/emulparams/elf_x86_64_luna.sh +diff --color -rN -u binutils-2.39/ld/emulparams/elf_x86_64_luna.sh build/binutils-2.39/ld/emulparams/elf_x86_64_luna.sh --- a/dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ b/binutils-2.38/ld/emulparams/elf_x86_64_luna.sh 2022-10-01 21:53:00.411200592 +0200 ++++ b/binutils-2.39/ld/emulparams/elf_x86_64_luna.sh 2022-10-01 21:53:00.411200592 +0200 @@ -0,0 +1,2 @@ +source_sh ${srcdir}/emulparams/elf_x86_64.sh +MAXPAGESIZE=0x1000 \ No newline at end of file -diff --color -rN -u binutils-2.38/ld/Makefile.am build/binutils-2.38/ld/Makefile.am ---- a/binutils-2.38/ld/Makefile.am 2022-01-22 13:14:09.000000000 +0100 -+++ b/binutils-2.38/ld/Makefile.am 2022-10-01 22:18:02.660263017 +0200 +diff --color -rN -u binutils-2.39/ld/Makefile.am build/binutils-2.39/ld/Makefile.am +--- a/binutils-2.39/ld/Makefile.am 2022-01-22 13:14:09.000000000 +0100 ++++ b/binutils-2.39/ld/Makefile.am 2022-10-01 22:18:02.660263017 +0200 @@ -278,6 +278,7 @@ eelf32xtensa.c \ eelf32z80.c \ @@ -96,9 +96,9 @@ diff --color -rN -u binutils-2.38/ld/Makefile.am build/binutils-2.38/ld/Makefile ehppa64linux.c \ ei386pep.c \ emmo.c -diff --color -rN -u binutils-2.38/ld/Makefile.in build/binutils-2.38/ld/Makefile.in ---- a/binutils-2.38/ld/Makefile.in 2022-02-09 12:49:03.000000000 +0100 -+++ b/binutils-2.38/ld/Makefile.in 2022-10-01 22:17:46.740196925 +0200 +diff --color -rN -u binutils-2.39/ld/Makefile.in build/binutils-2.39/ld/Makefile.in +--- a/binutils-2.39/ld/Makefile.in 2022-02-09 12:49:03.000000000 +0100 ++++ b/binutils-2.39/ld/Makefile.in 2022-10-01 22:17:46.740196925 +0200 @@ -769,6 +769,7 @@ eelf32xtensa.c \ eelf32z80.c \ diff --git a/tools/setup-binutils.sh b/tools/setup-binutils.sh index e1b98559..8360520a 100755 --- a/tools/setup-binutils.sh +++ b/tools/setup-binutils.sh @@ -39,7 +39,7 @@ unset CXX unset LD unset AR -../binutils-$LUNA_BINUTILS_VERSION_REQUIRED/configure --prefix="$BUILD_PREFIX" --target=$BUILD_TARGET --disable-nls --with-sysroot=$BUILD_SYSROOT --disable-werror +../binutils-$LUNA_BINUTILS_VERSION_REQUIRED/configure --prefix="$BUILD_PREFIX" --target=$BUILD_TARGET --disable-nls --with-sysroot=$BUILD_SYSROOT --disable-werror --enable-warn-rwx-segments=no echo Building Binutils... diff --git a/tools/setup-env.sh b/tools/setup-env.sh index 6e92d193..13885c62 100755 --- a/tools/setup-env.sh +++ b/tools/setup-env.sh @@ -2,7 +2,7 @@ source $(dirname $0)/env.sh export LUNA_GCC_VERSION_REQUIRED=12.2.0 -export LUNA_BINUTILS_VERSION_REQUIRED=2.38 +export LUNA_BINUTILS_VERSION_REQUIRED=2.39 export BUILD_PREFIX=$LUNA_ROOT/toolchain/x86_64-luna export BUILD_TARGET=x86_64-luna