From cd240f4b37b60f00858db0f311659eab6994627f Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sat, 31 Jul 2021 10:00:50 +0000 Subject: [PATCH] ALL: Various toolchain updates --- toolchains/android-common/functions-sdk.sh | 4 +- .../packages/xcode-extractor/build.sh | 2 +- toolchains/devkitarm/Dockerfile.m4 | 2 +- toolchains/devkitppc/Dockerfile.m4 | 2 +- toolchains/devkitswitch/Dockerfile.m4 | 2 +- toolchains/m4/debian-toolchain-base.m4 | 2 +- .../packages/osxcross-clang/build.sh | 2 +- .../macosx-common/packages/osxcross/build.sh | 2 +- ...d-arm64-support-to-osxcross-macports.patch | 25 ----- toolchains/ps3/packages/toolchain/build.sh | 2 +- ...-Fix-geohot-tool-for-big-executables.patch | 97 ------------------- ...tils.patch => 0002-Upgrade-binutils.patch} | 12 +-- toolchains/psp/packages/toolchain/build.sh | 2 +- workers/m4/debian-builder-base.m4 | 2 +- 14 files changed, 18 insertions(+), 140 deletions(-) delete mode 100644 toolchains/macosx-common/packages/osxcross/patches/0002-Add-arm64-support-to-osxcross-macports.patch delete mode 100644 toolchains/ps3/packages/toolchain/patches/0002-Fix-geohot-tool-for-big-executables.patch rename toolchains/ps3/packages/toolchain/patches/{0003-Upgrade-binutils.patch => 0002-Upgrade-binutils.patch} (90%) diff --git a/toolchains/android-common/functions-sdk.sh b/toolchains/android-common/functions-sdk.sh index f36c9a4..bff3a7c 100644 --- a/toolchains/android-common/functions-sdk.sh +++ b/toolchains/android-common/functions-sdk.sh @@ -1,5 +1,5 @@ -CMDLINE_TOOLS_VERSION=7302050 -CMDLINE_TOOLS_CHECKSUM="sha256:7a00faadc0864f78edd8f4908a629a46d622375cbe2e5814e82934aebecdb622" +CMDLINE_TOOLS_VERSION=7583922 +CMDLINE_TOOLS_CHECKSUM="sha256:124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf" CMDLINE_TOOLS_SUBDIR=cmdline-tools do_install_sdk_tools () { diff --git a/toolchains/apple-sdks/packages/xcode-extractor/build.sh b/toolchains/apple-sdks/packages/xcode-extractor/build.sh index 28e01ad..6fcff58 100755 --- a/toolchains/apple-sdks/packages/xcode-extractor/build.sh +++ b/toolchains/apple-sdks/packages/xcode-extractor/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -OSXCROSS_VERSION=447cf3b3ea4323d24648f5f7f775f5977a0d15bd +OSXCROSS_VERSION=5710723c525696156c7b20c0a12390844524a52a export PBZX_VERSION=2a4d7c3300c826d918def713a24d25c237c8ed53 export XAR_VERSION=2b9a4ab7003f1db8c54da4fea55fcbb424fdecb0 diff --git a/toolchains/devkitarm/Dockerfile.m4 b/toolchains/devkitarm/Dockerfile.m4 index 681370e..e8fceaa 100644 --- a/toolchains/devkitarm/Dockerfile.m4 +++ b/toolchains/devkitarm/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`DEVKITARM_VERSION',20210622) +m4_define(`DEVKITARM_VERSION',20210726) # This version of devkitARM depends on a Debian Stretch # For now it works with stable-slim, we will have to ensure it stays like that FROM devkitpro/devkitarm:DEVKITARM_VERSION AS original-toolchain diff --git a/toolchains/devkitppc/Dockerfile.m4 b/toolchains/devkitppc/Dockerfile.m4 index 8fa8591..b389b52 100644 --- a/toolchains/devkitppc/Dockerfile.m4 +++ b/toolchains/devkitppc/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`DEVKITPPC_VERSION',20210619) +m4_define(`DEVKITPPC_VERSION',20210726) # This version of devkitPPC depends on a Debian Stretch # For now it works with stable-slim, we will have to ensure it stays like that FROM devkitpro/devkitppc:DEVKITPPC_VERSION AS original-toolchain diff --git a/toolchains/devkitswitch/Dockerfile.m4 b/toolchains/devkitswitch/Dockerfile.m4 index 0f84ed1..1ab0ffe 100644 --- a/toolchains/devkitswitch/Dockerfile.m4 +++ b/toolchains/devkitswitch/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`DEVKITA64_VERSION',20210703) +m4_define(`DEVKITA64_VERSION',20210726) # This version of devkitA64 depends on a Debian Stretch # For now it works with stable-slim, we will have to ensure it stays like that FROM devkitpro/devkita64:DEVKITA64_VERSION AS original-toolchain diff --git a/toolchains/m4/debian-toolchain-base.m4 b/toolchains/m4/debian-toolchain-base.m4 index 40b6da8..ac8b015 100644 --- a/toolchains/m4/debian-toolchain-base.m4 +++ b/toolchains/m4/debian-toolchain-base.m4 @@ -1,4 +1,4 @@ -m4_define(`DEBIAN_VERSION',20210621) +m4_define(`DEBIAN_VERSION',20210721) FROM toolchains/common AS helpers FROM debian:stable-DEBIAN_VERSION-slim m4_ifdef(`STAGE_IMAGE_NAME',AS STAGE_IMAGE_NAME,) diff --git a/toolchains/macosx-common/packages/osxcross-clang/build.sh b/toolchains/macosx-common/packages/osxcross-clang/build.sh index 06c0405..e72562c 100755 --- a/toolchains/macosx-common/packages/osxcross-clang/build.sh +++ b/toolchains/macosx-common/packages/osxcross-clang/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -OSXCROSS_VERSION=447cf3b3ea4323d24648f5f7f775f5977a0d15bd +OSXCROSS_VERSION=5710723c525696156c7b20c0a12390844524a52a PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/macosx-common/packages/osxcross/build.sh b/toolchains/macosx-common/packages/osxcross/build.sh index 87c028d..e92be81 100755 --- a/toolchains/macosx-common/packages/osxcross/build.sh +++ b/toolchains/macosx-common/packages/osxcross/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -OSXCROSS_VERSION=447cf3b3ea4323d24648f5f7f775f5977a0d15bd +OSXCROSS_VERSION=5710723c525696156c7b20c0a12390844524a52a export XAR_VERSION=2b9a4ab7003f1db8c54da4fea55fcbb424fdecb0 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) diff --git a/toolchains/macosx-common/packages/osxcross/patches/0002-Add-arm64-support-to-osxcross-macports.patch b/toolchains/macosx-common/packages/osxcross/patches/0002-Add-arm64-support-to-osxcross-macports.patch deleted file mode 100644 index 1e1215e..0000000 --- a/toolchains/macosx-common/packages/osxcross/patches/0002-Add-arm64-support-to-osxcross-macports.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3589fd3f17631c976659ce650ce9886bab12f691 Mon Sep 17 00:00:00 2001 -From: Le Philousophe -Date: Sat, 6 Feb 2021 23:22:32 +0100 -Subject: [PATCH 2/2] Add arm64 support to osxcross-macports - ---- - tools/osxcross-macports | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tools/osxcross-macports b/tools/osxcross-macports -index e3f88b0..208121b 100755 ---- a/tools/osxcross-macports -+++ b/tools/osxcross-macports -@@ -586,6 +586,8 @@ main() - ARCH="i386" - elif [ $opt == "-universal" -o $opt == "--universal" ]; then - ARCH="i386-x86_64" -+ elif [ $opt == "--arm64" ]; then -+ ARCH="arm64" - elif [ $opt == "-sm" -o $opt == "--select-mirror" ]; then - selectMirror - exit --- -2.25.1 - diff --git a/toolchains/ps3/packages/toolchain/build.sh b/toolchains/ps3/packages/toolchain/build.sh index f9c1884..158dac0 100755 --- a/toolchains/ps3/packages/toolchain/build.sh +++ b/toolchains/ps3/packages/toolchain/build.sh @@ -1,7 +1,7 @@ #! /bin/sh TOOLCHAIN_VERSION=0824344cb72bcc22bb76168edfd94548dbca927e -export PSL1GHT_VERSION=f720b858bd56ed83ffc9093a6e5d63b0854bef7b +export PSL1GHT_VERSION=87506a5c68668a250f18e2fc5470a669363857aa export PS3LIBRARIES_VERSION=60e761843be6aee00d0126b0a9ce8d7d8798c5d5 export SDL_PSL1GHT_VERSION=641a8ca2efa3f775d489daa37878ada1d92c24ab export SDL_PSL1GHT_LIBS_VERSION=5732608d69e0e7f6fc9ac2b6af906c38ab1d9475 diff --git a/toolchains/ps3/packages/toolchain/patches/0002-Fix-geohot-tool-for-big-executables.patch b/toolchains/ps3/packages/toolchain/patches/0002-Fix-geohot-tool-for-big-executables.patch deleted file mode 100644 index fedea06..0000000 --- a/toolchains/ps3/packages/toolchain/patches/0002-Fix-geohot-tool-for-big-executables.patch +++ /dev/null @@ -1,97 +0,0 @@ -From a4af6c3840265134ac5f5624148053c95cbb19b4 Mon Sep 17 00:00:00 2001 -From: Le Philousophe -Date: Sun, 11 Jul 2021 22:06:50 +0200 -Subject: [PATCH 2/2] Fix geohot tool for big executables - ---- - patches/psl1ght-fix-big-exe.patch | 64 +++++++++++++++++++++++++++++++ - scripts/008-psl1ght.sh | 3 ++ - 2 files changed, 67 insertions(+) - create mode 100644 patches/psl1ght-fix-big-exe.patch - -diff --git a/patches/psl1ght-fix-big-exe.patch b/patches/psl1ght-fix-big-exe.patch -new file mode 100644 -index 0000000..2e0219a ---- /dev/null -+++ b/patches/psl1ght-fix-big-exe.patch -@@ -0,0 +1,64 @@ -+commit c8905b904491d5103f899ba697a077b9bcdb9ecd -+Author: Le Philousophe -+Date: Sun Jul 11 21:59:48 2021 +0200 -+ -+ Don't use fixed buffer size it fails with big executables -+ -+diff --git a/tools/geohot/make_self.c b/tools/geohot/make_self.c -+index 565fc3e..4a79e4c 100644 -+--- a/tools/geohot/make_self.c -++++ b/tools/geohot/make_self.c -+@@ -78,11 +78,9 @@ AES_KEY aes_key; -+ -+ u8* input_elf_data; -+ -+-#define ZLIB_LEVEL 6 -+-#define DEFLATION_BUFFER_SIZE 0x1000000 -+-u8 def_buffer[DEFLATION_BUFFER_SIZE]; -++#define ZLIB_LEVEL 9 -+ -+-int def(u8 *source, int source_size, u8 *dest, int* dest_size) { -++int def(u8 *source, int source_size, u8 **dest, int* dest_size) { -+ int ret; -+ unsigned have; -+ z_stream strm; -+@@ -91,14 +89,18 @@ int def(u8 *source, int source_size, u8 *dest, int* dest_size) { -+ strm.zalloc = Z_NULL; -+ strm.zfree = Z_NULL; -+ strm.opaque = Z_NULL; -+- strm.avail_in = source_size; -+- strm.next_in = source; -+- strm.avail_out = *dest_size; -+- strm.next_out = dest; -+ ret = deflateInit(&strm, ZLIB_LEVEL); -+ if(ret != Z_OK) -+ return ret; -+ -++ *dest_size = deflateBound(&strm, source_size); -++ *dest = (u8 *)malloc(*dest_size); -++ -++ strm.avail_in = source_size; -++ strm.next_in = source; -++ strm.avail_out = *dest_size; -++ strm.next_out = *dest; -++ -+ ret = deflate(&strm, Z_FINISH); -+ (*dest_size) -= strm.avail_out; -+ -+@@ -208,11 +210,12 @@ void enumerate_segments() { -+ u8* in_data = &input_elf_data[in_data_offset]; -+ -+ if(segment_ptr->compressed) { -+- int def_size = DEFLATION_BUFFER_SIZE; -+- printf("deflated...", def(in_data, segment_ptr->rlen, def_buffer, &def_size)); fflush(stdout); -++ int def_size; -++ u8 *def_buffer; -++ printf("deflated... %s ", def(in_data, segment_ptr->rlen, &def_buffer, &def_size) == Z_OK ? "OK" : "FAIL"); -++ fflush(stdout); -+ segment_ptr->len = def_size; -+- segment_ptr->data = (u8*)malloc(segment_ptr->len); -+- memcpy(segment_ptr->data, def_buffer, def_size); -++ segment_ptr->data = def_buffer; -+ } else { -+ segment_ptr->len = segment_ptr->rlen; -+ segment_ptr->data = (u8*)malloc(segment_ptr->len); -diff --git a/scripts/008-psl1ght.sh b/scripts/008-psl1ght.sh -index 3815aa4..90d2848 100755 ---- a/scripts/008-psl1ght.sh -+++ b/scripts/008-psl1ght.sh -@@ -10,5 +10,8 @@ rm -Rf psl1ght && mkdir psl1ght && tar --strip-components=1 --directory=psl1ght - ## Create the build directory. - cd psl1ght - -+## Patch geohot tool for big executables -+cat ../../patches/psl1ght-fix-big-exe.patch | patch -p1 -+ - ## Compile and install. - ${MAKE:-make} install-ctrl && ${MAKE:-make} && ${MAKE:-make} install --- -2.30.2 - diff --git a/toolchains/ps3/packages/toolchain/patches/0003-Upgrade-binutils.patch b/toolchains/ps3/packages/toolchain/patches/0002-Upgrade-binutils.patch similarity index 90% rename from toolchains/ps3/packages/toolchain/patches/0003-Upgrade-binutils.patch rename to toolchains/ps3/packages/toolchain/patches/0002-Upgrade-binutils.patch index 2a3da04..5894594 100644 --- a/toolchains/ps3/packages/toolchain/patches/0003-Upgrade-binutils.patch +++ b/toolchains/ps3/packages/toolchain/patches/0002-Upgrade-binutils.patch @@ -1,7 +1,7 @@ -From 636528188e56458a1eb90884c2b20183aef5d8d5 Mon Sep 17 00:00:00 2001 +From e97ff4a876c33fd75d577eafbddfddf6c853f4ff Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sun, 18 Jul 2021 18:36:15 +0200 -Subject: [PATCH 3/3] Upgrade binutils +Subject: [PATCH 2/2] Upgrade binutils This avoids linker bug with stub not being produced although TOC address must be adjusted @@ -62,12 +62,12 @@ index 14e295c..aa54270 100755 -${MAKE:-make} -j $PROCS && ${MAKE:-make} libdir=host-libs/lib install +${MAKE:-make} -j $PROCS && ${MAKE:-make} libdir=$(pwd)/host-libs/lib install diff --git a/scripts/008-psl1ght.sh b/scripts/008-psl1ght.sh -index 90d2848..48bb708 100755 +index 3815aa4..ec8b758 100755 --- a/scripts/008-psl1ght.sh +++ b/scripts/008-psl1ght.sh -@@ -13,5 +13,8 @@ cd psl1ght - ## Patch geohot tool for big executables - cat ../../patches/psl1ght-fix-big-exe.patch | patch -p1 +@@ -10,5 +10,8 @@ rm -Rf psl1ght && mkdir psl1ght && tar --strip-components=1 --directory=psl1ght + ## Create the build directory. + cd psl1ght +## Patch linker script for new LD +cat ../../patches/psl1ght-fix-new-ld.patch | patch -p1 diff --git a/toolchains/psp/packages/toolchain/build.sh b/toolchains/psp/packages/toolchain/build.sh index 7e62693..7425b91 100755 --- a/toolchains/psp/packages/toolchain/build.sh +++ b/toolchains/psp/packages/toolchain/build.sh @@ -6,7 +6,7 @@ export NEWLIB_VERSION=f8d6259c204fd0fa76e01926ec4e3e4fe04f6b22 export PSPLINKUSB_VERSION=9a9512ed115c3415ac953b64613d53283a75ada9 export EBOOTSIGNER_VERSION=10cfbb51ea87adfe02d63dc3a262c8480fdf31e7 export PSP_PKGCONF_VERSION=c50b45fd551c08eefebd9cb02edc55887fd68b28 -export PSPLIBRARIES_VERSION=7df26487dd1b8b4b3547101b1d4402873e953356 +export PSPLIBRARIES_VERSION=a909bc116231e0123ee9f1eaf5145155fd0d6440 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/workers/m4/debian-builder-base.m4 b/workers/m4/debian-builder-base.m4 index 67c15f0..f6eeea0 100644 --- a/workers/m4/debian-builder-base.m4 +++ b/workers/m4/debian-builder-base.m4 @@ -1,4 +1,4 @@ -m4_define(`DEBIAN_VERSION',20210621) +m4_define(`DEBIAN_VERSION',20210721) m4_define(`BASE_DEBIAN',`')m4_dnl FROM debian:stable-DEBIAN_VERSION-slim USER root