From 36586e6107c21c4964beeb7950a54d47d731d76b Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Mon, 11 Apr 2022 16:29:06 -0700 Subject: [PATCH] cross/gcc-*: upgrade to 11.2.1_git20220219-r2 --- cross/gcc-aarch64/APKBUILD | 4 +++- cross/gcc-aarch64/libgo-musl-1.2.3.patch | 13 +++++++++++++ cross/gcc-armhf/APKBUILD | 4 +++- cross/gcc-armhf/libgo-musl-1.2.3.patch | 13 +++++++++++++ cross/gcc-armv7/APKBUILD | 4 +++- cross/gcc-armv7/libgo-musl-1.2.3.patch | 13 +++++++++++++ 6 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 cross/gcc-aarch64/libgo-musl-1.2.3.patch create mode 100644 cross/gcc-armhf/libgo-musl-1.2.3.patch create mode 100644 cross/gcc-armv7/libgo-musl-1.2.3.patch diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD index 138c5ccdc..1d93ecf10 100644 --- a/cross/gcc-aarch64/APKBUILD +++ b/cross/gcc-aarch64/APKBUILD @@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname=gcc-aarch64 -pkgrel=1 +pkgrel=2 pkgdesc="Stage2 cross-compiler for aarch64" url="https://gcc.gnu.org" arch="x86_64" @@ -252,6 +252,7 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz 0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch 0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch 0051-go-gospec-forcibly-disable-fsplit-stack-support.patch + libgo-musl-1.2.3.patch " # we build out-of-tree @@ -767,4 +768,5 @@ c44c6e5b28b622897af60e7e2dbf0d0284379eb57b39b480936e6d8b3743a24287c2a9ed69a530ef 160ef16fde90546474e1548f1487c18d9b8edbae1d42a13ad06041b03214d06ff2c3586acd4d0bae27d48e48bb651861c6b9a140ade4ac59f00a268e85275da4 0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch f4d9ebf6d5c80d2f303404b9bf315bf81435c0d369b03b92f8e8510d82db72c2a30d84603307ddc0697df3845862ba93045e4a3724f8e491e7c01bd4396d8864 0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch 8ac54b3a46f7270d975fa3e1198ac37a2311a4b9940938958ffc148e4e9c82c3e81cf3e3c3abd43cef29137897cd6768220b432f828672e036308f7994422d2e 0051-go-gospec-forcibly-disable-fsplit-stack-support.patch +fa59b0fb081d97f8f63506b8793699588a95c602b5d468140eb1e80456597e52e1cc45dc0b234ac8e60e2b0cd606d94d111c8b0ae64c0a2be1bc1b8a184ceb93 libgo-musl-1.2.3.patch " diff --git a/cross/gcc-aarch64/libgo-musl-1.2.3.patch b/cross/gcc-aarch64/libgo-musl-1.2.3.patch new file mode 100644 index 000000000..15a4229f4 --- /dev/null +++ b/cross/gcc-aarch64/libgo-musl-1.2.3.patch @@ -0,0 +1,13 @@ +diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh +index 6fef104..06289a4 100755 +--- a/libgo/mksysinfo.sh ++++ b/libgo/mksysinfo.sh +@@ -126,7 +126,7 @@ if ! grep '^const SIGCLD ' ${OUT} >/dev/null 2>&1; then + fi + + # The syscall numbers. We force the names to upper case. +-grep '^const _SYS_' gen-sysinfo.go | \ ++grep '^const _SYS_[a-z]' gen-sysinfo.go | \ + sed -e 's/const _\(SYS_[^= ]*\).*$/\1/' | \ + while read sys; do + sup=`echo $sys | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ` diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD index 9331f344e..06548ef87 100644 --- a/cross/gcc-armhf/APKBUILD +++ b/cross/gcc-armhf/APKBUILD @@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname=gcc-armhf -pkgrel=1 +pkgrel=2 pkgdesc="Stage2 cross-compiler for armhf" url="https://gcc.gnu.org" arch="x86_64" @@ -252,6 +252,7 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz 0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch 0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch 0051-go-gospec-forcibly-disable-fsplit-stack-support.patch + libgo-musl-1.2.3.patch " # we build out-of-tree @@ -767,4 +768,5 @@ c44c6e5b28b622897af60e7e2dbf0d0284379eb57b39b480936e6d8b3743a24287c2a9ed69a530ef 160ef16fde90546474e1548f1487c18d9b8edbae1d42a13ad06041b03214d06ff2c3586acd4d0bae27d48e48bb651861c6b9a140ade4ac59f00a268e85275da4 0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch f4d9ebf6d5c80d2f303404b9bf315bf81435c0d369b03b92f8e8510d82db72c2a30d84603307ddc0697df3845862ba93045e4a3724f8e491e7c01bd4396d8864 0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch 8ac54b3a46f7270d975fa3e1198ac37a2311a4b9940938958ffc148e4e9c82c3e81cf3e3c3abd43cef29137897cd6768220b432f828672e036308f7994422d2e 0051-go-gospec-forcibly-disable-fsplit-stack-support.patch +fa59b0fb081d97f8f63506b8793699588a95c602b5d468140eb1e80456597e52e1cc45dc0b234ac8e60e2b0cd606d94d111c8b0ae64c0a2be1bc1b8a184ceb93 libgo-musl-1.2.3.patch " diff --git a/cross/gcc-armhf/libgo-musl-1.2.3.patch b/cross/gcc-armhf/libgo-musl-1.2.3.patch new file mode 100644 index 000000000..15a4229f4 --- /dev/null +++ b/cross/gcc-armhf/libgo-musl-1.2.3.patch @@ -0,0 +1,13 @@ +diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh +index 6fef104..06289a4 100755 +--- a/libgo/mksysinfo.sh ++++ b/libgo/mksysinfo.sh +@@ -126,7 +126,7 @@ if ! grep '^const SIGCLD ' ${OUT} >/dev/null 2>&1; then + fi + + # The syscall numbers. We force the names to upper case. +-grep '^const _SYS_' gen-sysinfo.go | \ ++grep '^const _SYS_[a-z]' gen-sysinfo.go | \ + sed -e 's/const _\(SYS_[^= ]*\).*$/\1/' | \ + while read sys; do + sup=`echo $sys | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ` diff --git a/cross/gcc-armv7/APKBUILD b/cross/gcc-armv7/APKBUILD index 9790b12a5..c54f4b06d 100644 --- a/cross/gcc-armv7/APKBUILD +++ b/cross/gcc-armv7/APKBUILD @@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname=gcc-armv7 -pkgrel=1 +pkgrel=2 pkgdesc="Stage2 cross-compiler for armv7" url="https://gcc.gnu.org" arch="x86_64" @@ -252,6 +252,7 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz 0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch 0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch 0051-go-gospec-forcibly-disable-fsplit-stack-support.patch + libgo-musl-1.2.3.patch " # we build out-of-tree @@ -767,4 +768,5 @@ c44c6e5b28b622897af60e7e2dbf0d0284379eb57b39b480936e6d8b3743a24287c2a9ed69a530ef 160ef16fde90546474e1548f1487c18d9b8edbae1d42a13ad06041b03214d06ff2c3586acd4d0bae27d48e48bb651861c6b9a140ade4ac59f00a268e85275da4 0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch f4d9ebf6d5c80d2f303404b9bf315bf81435c0d369b03b92f8e8510d82db72c2a30d84603307ddc0697df3845862ba93045e4a3724f8e491e7c01bd4396d8864 0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch 8ac54b3a46f7270d975fa3e1198ac37a2311a4b9940938958ffc148e4e9c82c3e81cf3e3c3abd43cef29137897cd6768220b432f828672e036308f7994422d2e 0051-go-gospec-forcibly-disable-fsplit-stack-support.patch +fa59b0fb081d97f8f63506b8793699588a95c602b5d468140eb1e80456597e52e1cc45dc0b234ac8e60e2b0cd606d94d111c8b0ae64c0a2be1bc1b8a184ceb93 libgo-musl-1.2.3.patch " diff --git a/cross/gcc-armv7/libgo-musl-1.2.3.patch b/cross/gcc-armv7/libgo-musl-1.2.3.patch new file mode 100644 index 000000000..15a4229f4 --- /dev/null +++ b/cross/gcc-armv7/libgo-musl-1.2.3.patch @@ -0,0 +1,13 @@ +diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh +index 6fef104..06289a4 100755 +--- a/libgo/mksysinfo.sh ++++ b/libgo/mksysinfo.sh +@@ -126,7 +126,7 @@ if ! grep '^const SIGCLD ' ${OUT} >/dev/null 2>&1; then + fi + + # The syscall numbers. We force the names to upper case. +-grep '^const _SYS_' gen-sysinfo.go | \ ++grep '^const _SYS_[a-z]' gen-sysinfo.go | \ + sed -e 's/const _\(SYS_[^= ]*\).*$/\1/' | \ + while read sys; do + sup=`echo $sys | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`