diff --git a/main/gcc/0038-LoongArch-Fix-MUSL_DYNAMIC_LINKER.patch b/main/gcc/0038-LoongArch-Fix-MUSL_DYNAMIC_LINKER.patch deleted file mode 100644 index aea1ee886ba0f90c4808808fa151427270e8e2ab..0000000000000000000000000000000000000000 --- a/main/gcc/0038-LoongArch-Fix-MUSL_DYNAMIC_LINKER.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a80c68a08604b0ac625ac7fc59eae40b551b1176 Mon Sep 17 00:00:00 2001 -From: Peng Fan <fanpeng@loongson.cn> -Date: Wed, 19 Apr 2023 16:23:42 +0800 -Subject: [PATCH] LoongArch: Fix MUSL_DYNAMIC_LINKER - -The system based on musl has no '/lib64', so change it. - -https://wiki.musl-libc.org/guidelines-for-distributions.html, -"Multilib/multi-arch" section of this introduces it. - -gcc/ - * config/loongarch/gnu-user.h (MUSL_DYNAMIC_LINKER): Redefine. - -Signed-off-by: Peng Fan <fanpeng@loongson.cn> -Suggested-by: Xi Ruoyao <xry111@xry111.site> ---- - gcc/config/loongarch/gnu-user.h | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/gcc/config/loongarch/gnu-user.h b/gcc/config/loongarch/gnu-user.h -index aecaa02a199..fa1a5211419 100644 ---- a/gcc/config/loongarch/gnu-user.h -+++ b/gcc/config/loongarch/gnu-user.h -@@ -33,9 +33,14 @@ along with GCC; see the file COPYING3. If not see - #define GLIBC_DYNAMIC_LINKER \ - "/lib" ABI_GRLEN_SPEC "/ld-linux-loongarch-" ABI_SPEC ".so.1" - -+#define MUSL_ABI_SPEC \ -+ "%{mabi=lp64d:-lp64d}" \ -+ "%{mabi=lp64f:-lp64f}" \ -+ "%{mabi=lp64s:-lp64s}" -+ - #undef MUSL_DYNAMIC_LINKER - #define MUSL_DYNAMIC_LINKER \ -- "/lib" ABI_GRLEN_SPEC "/ld-musl-loongarch-" ABI_SPEC ".so.1" -+ "/lib/ld-musl-loongarch" ABI_GRLEN_SPEC MUSL_ABI_SPEC ".so.1" - - #undef GNU_USER_TARGET_LINK_SPEC - #define GNU_USER_TARGET_LINK_SPEC \ --- -2.27.0 - diff --git a/main/gcc/0039-LoongArch-Modify-MUSL_DYNAMIC_LINKER.patch b/main/gcc/0039-LoongArch-Modify-MUSL_DYNAMIC_LINKER.patch deleted file mode 100644 index cfd39571e71ba0c7fb3adee933f27b25c7b10e3a..0000000000000000000000000000000000000000 --- a/main/gcc/0039-LoongArch-Modify-MUSL_DYNAMIC_LINKER.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8bccee51f0deac64b79cd9ad75df599422f4c8ff Mon Sep 17 00:00:00 2001 -From: Lulu Cheng <chenglulu@loongson.cn> -Date: Sat, 18 Nov 2023 11:04:42 +0800 -Subject: [PATCH] LoongArch: Modify MUSL_DYNAMIC_LINKER. - -Use no suffix at all in the musl dynamic linker name for hard -float ABI. Use -sf and -sp suffixes in musl dynamic linker name -for soft float and single precision ABIs. The following table -outlines the musl interpreter names for the LoongArch64 ABI names. - -musl interpreter | LoongArch64 ABI ---------------------------- | ----------------- -ld-musl-loongarch64.so.1 | loongarch64-lp64d -ld-musl-loongarch64-sp.so.1 | loongarch64-lp64f -ld-musl-loongarch64-sf.so.1 | loongarch64-lp64s - -gcc/ChangeLog: - - * config/loongarch/gnu-user.h (MUSL_ABI_SPEC): Modify suffix. ---- - gcc/config/loongarch/gnu-user.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gcc/config/loongarch/gnu-user.h b/gcc/config/loongarch/gnu-user.h -index 9616d6e8a0b..e9f4bcef1d4 100644 ---- a/gcc/config/loongarch/gnu-user.h -+++ b/gcc/config/loongarch/gnu-user.h -@@ -34,9 +34,9 @@ along with GCC; see the file COPYING3. If not see - "/lib" ABI_GRLEN_SPEC "/ld-linux-loongarch-" ABI_SPEC ".so.1" - - #define MUSL_ABI_SPEC \ -- "%{mabi=lp64d:-lp64d}" \ -- "%{mabi=lp64f:-lp64f}" \ -- "%{mabi=lp64s:-lp64s}" -+ "%{mabi=lp64d:}" \ -+ "%{mabi=lp64f:-sp}" \ -+ "%{mabi=lp64s:-sf}" - - #undef MUSL_DYNAMIC_LINKER - #define MUSL_DYNAMIC_LINKER \ --- -2.27.0 - diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index bb908e3bd365433d3747952aac7963966dbe839d..fba9f49c48f755606bd0817df330b7c40150274b 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Ariadne Conill <ariadne@dereferenced.org> pkgname=gcc -pkgver=13.2.1_git20231014 +pkgver=13.2.1_git20240309 # i.e. 13.2.1, must match gcc/BASE-VER _pkgbase="${pkgver%%_git*}" # date component from snapshots @@ -12,7 +12,7 @@ _pkgsnap="${pkgver##*_git}" [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname="$pkgname$_target" -pkgrel=1 +pkgrel=0 pkgdesc="The GNU Compiler Collection" url="https://gcc.gnu.org" arch="all" @@ -257,8 +257,6 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${ 0034-libgo-fix-lfs64-use.patch 0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch 0037-loongarch-disable-multilib-support.patch - 0038-LoongArch-Fix-MUSL_DYNAMIC_LINKER.patch - 0039-LoongArch-Modify-MUSL_DYNAMIC_LINKER.patch " # secfixes: @@ -777,7 +775,7 @@ gdb() { } sha512sums=" -406673a62deba759fc0532a801b3f57cabf894ea328587b23e62a707ba5767b0e3ae9b3f86bf3c6fcf13e8a3c30bc470e6598b625c8231efb629034211c162c2 gcc-13-20231014.tar.xz +2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e gcc-13-20240309.tar.xz 1ecffba1b07d60e1b4422302b032bbea918b674c8e12b30aa6965b544d700ce86b61e9f7b8d402c6caf59257f491a394dd0912f0948565d6eae9335ee54f3b35 0001-posix_memalign.patch 163f282455b6a4df33f011bcd8b0440566ba0ffaeeab30d8ac52d39948980a56881ca0eff60687129d59556389a58b9d64e7768750bd70b1fe0fedbc9fc30dc2 0002-gcc-poison-system-directories.patch 3f24bb6a50d3c45b71ea05590e32fe3e69b91377ab185352891d5035c76ed193117c6d0b314a4c364bcf136b9a9dd5c926d6c7c30ab436976c121ebfea8d3ddd 0003-specs-turn-on-Wl-z-now-by-default.patch @@ -814,6 +812,4 @@ c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0 c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c 0034-libgo-fix-lfs64-use.patch cc1e10ac6e72db816f09325e301103109cc212a6f3de3ce0b9b038d149233c467319d203941695dbf3d7b9e2dcbbcd17609cdb056e831fcc323cd592423882d8 0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch d834f5f95f4ebe70ec0af0748c8632c99a4f57b69dc14db1a38becdfcb03406b32febf39f772f37bd145538147099fa7433edce845e14ee77cd8f38fd9774fc1 0037-loongarch-disable-multilib-support.patch -5f53260018fc1b12989de42af2c6819a3cb9e6a147257e49104b8fe940a2227caef4a058ef8f64b8f78b588908e8aad21385377badad5ae637d5dc74ebb30202 0038-LoongArch-Fix-MUSL_DYNAMIC_LINKER.patch -d640bcacfc85b51d3e000bd69794b9a6334276dc6818fd7fb69033fc945af0ea348e88860f617224262227ce178595430ae0243d4e9d239bfef2a567eb9c2557 0039-LoongArch-Modify-MUSL_DYNAMIC_LINKER.patch "