diff options
| -rwxr-xr-x | core/gcc/build | 3 | ||||
| -rw-r--r-- | core/gcc/checksums | 3 | ||||
| -rw-r--r-- | core/gcc/patches/musl-sched_h-calloc-poison.patch (renamed from testing/gcc/patches/musl-sched_h-calloc-poison.patch) | 0 | ||||
| -rw-r--r-- | core/gcc/sources | 3 | ||||
| -rw-r--r-- | core/gcc/version | 2 | ||||
| -rwxr-xr-x | testing/gcc/build | 78 | ||||
| -rw-r--r-- | testing/gcc/checksums | 8 | ||||
| -rw-r--r-- | testing/gcc/depends | 4 | ||||
| -rwxr-xr-x | testing/gcc/files/c99 | 2 | ||||
| -rw-r--r-- | testing/gcc/meta | 3 | ||||
| -rw-r--r-- | testing/gcc/patches/musl-libssp.patch | 20 | ||||
| -rw-r--r-- | testing/gcc/sources | 7 | ||||
| -rw-r--r-- | testing/gcc/version | 1 |
13 files changed, 7 insertions, 127 deletions
diff --git a/core/gcc/build b/core/gcc/build index 9b62feed..e4b826ab 100755 --- a/core/gcc/build +++ b/core/gcc/build @@ -12,8 +12,9 @@ if [ "${sys_arch#i*86}" ]; then clsed 's/lib64/lib/' gcc/gcc/config/i386/linux64.h else # Apply libssp patch for i686. - (cd gcc; patch -Np1 < ../musl-libssp.patch) + patch -d gcc -p1 < musl-libssp.patch fi +patch -d gcc -p1 < musl-sched_h-calloc-poison.patch case "$sys_arch" in i*86) archopts="--build=i686-pc-linux-musl \ diff --git a/core/gcc/checksums b/core/gcc/checksums index 53198395..a2961d42 100644 --- a/core/gcc/checksums +++ b/core/gcc/checksums @@ -1,7 +1,8 @@ %BLAKE3 -4a5c444fb45b043cfa4ebfd6cb18069135b15968652a3b8ff412434896085099 gcc-11.3.0.tar.xz +f4031aa70a30b0d14fb8b0f331860ba4faf484494208ad7a7a9399becb9a85a2 gcc-12.1.0.tar.xz 52cecfbbe286820d1f8bc118769008acb6451bd074fe6dea9e868d54b2ada855 gmp-6.2.1.tar.xz 956f9b16d0377b777e21b07d27962ec1153236ef2e94039ec1ad375859c01fc9 mpfr-4.1.0.tar.xz f967a250c85296a88bf6a2471b74558d89a59fe548e119f6d74fccb7cb73b13e mpc-1.2.1.tar.gz 0930e07dc2c5bf1172f3fd003a1be7abc3c0c420ce5bd76bc2e514c63800adcb c99 30c25e440a4ac72bf7dc50e564b94a8c4ef43e4b2030c12d3042a78fb3cbc825 musl-libssp.patch +495a5f94c38d940dc174e8d9cbd2bc4a9399062e579a0de0afddbec0f0c2f39c musl-sched_h-calloc-poison.patch diff --git a/testing/gcc/patches/musl-sched_h-calloc-poison.patch b/core/gcc/patches/musl-sched_h-calloc-poison.patch index e5621106..e5621106 100644 --- a/testing/gcc/patches/musl-sched_h-calloc-poison.patch +++ b/core/gcc/patches/musl-sched_h-calloc-poison.patch diff --git a/core/gcc/sources b/core/gcc/sources index 0f83060c..01cd92b8 100644 --- a/core/gcc/sources +++ b/core/gcc/sources @@ -1,6 +1,7 @@ -https://gcc.gnu.org/pub/gcc/releases/gcc-11.3.0/gcc-11.3.0.tar.xz gcc +https://gcc.gnu.org/pub/gcc/releases/gcc-12.1.0/gcc-12.1.0.tar.xz gcc https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz gcc/gmp https://ftp.gnu.org/gnu/mpfr/mpfr-4.1.0.tar.xz gcc/mpfr https://ftp.gnu.org/gnu/mpc/mpc-1.2.1.tar.gz gcc/mpc files/c99 patches/musl-libssp.patch +patches/musl-sched_h-calloc-poison.patch diff --git a/core/gcc/version b/core/gcc/version index 05f4f2c2..d3f2d92e 100644 --- a/core/gcc/version +++ b/core/gcc/version @@ -1 +1 @@ -11.3.0 1 +12.1.0 1 diff --git a/testing/gcc/build b/testing/gcc/build deleted file mode 100755 index e4b826ab..00000000 --- a/testing/gcc/build +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh -e - -sys_arch=${3:-$(uname -m)} - -# Make sure gmp is built with generic options. -cp gcc/gmp/configfsf.guess gcc/gmp/config.guess -cp gcc/gmp/configfsf.sub gcc/gmp/config.sub - -if [ "${sys_arch#i*86}" ]; then - # Do not create lib64 directories - clsed '/m64=/s/lib64/lib/' gcc/gcc/config/i386/t-linux64 - clsed 's/lib64/lib/' gcc/gcc/config/i386/linux64.h -else - # Apply libssp patch for i686. - patch -d gcc -p1 < musl-libssp.patch -fi -patch -d gcc -p1 < musl-sched_h-calloc-poison.patch - -case "$sys_arch" in - i*86) archopts="--build=i686-pc-linux-musl \ - --disable-libssp" ;; - x86_64) archopts="--build=x86_64-pc-linux-musl" -esac - -# Build must happen outside of gcc source. -mkdir -p gcc-build -cd gcc-build - -export libat_cv_have_ifunc=no - -../gcc/configure \ - --prefix=/usr \ - --disable-multilib \ - --disable-symvers \ - --disable-libmpx \ - --disable-libmudflap \ - --disable-libsanitizer \ - --disable-werror \ - --disable-fixed-point \ - --disable-libstdcxx-pch \ - --disable-nls \ - --without-included-gettext \ - --enable-checking=release \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --with-system-zlib \ - --enable-__cxa_atexit \ - --enable-default-pie \ - --enable-default-ssp \ - --enable-shared \ - --enable-threads \ - --enable-tls \ - --enable-languages=c,c++ \ - $archopts \ - --disable-bootstrap - -make -make DESTDIR="$1" install - -# Save 35MB. -find "$1" -name libgtkpeer.a -exec rm -f {} + -find "$1" -name libgjsmalsa.a -exec rm -f {} + -find "$1" -name libgij.a -exec rm -f {} + - -# Some legacy programs will expect cc -ln -s gcc "$1/usr/bin/cc" - -# POSIX compliance. -clinst -Dm755 ../c99 "$1/usr/bin/c99" - -# Symlink for LTO. -{ - mkdir -p "$1/usr/lib/bfd-plugins" - - ln -s "/usr/libexec/gcc/$sys_arch-pc-linux-musl/$2/liblto_plugin.so" \ - "$1/usr/lib/bfd-plugins/liblto_plugin.so" -} - diff --git a/testing/gcc/checksums b/testing/gcc/checksums deleted file mode 100644 index a2961d42..00000000 --- a/testing/gcc/checksums +++ /dev/null @@ -1,8 +0,0 @@ -%BLAKE3 -f4031aa70a30b0d14fb8b0f331860ba4faf484494208ad7a7a9399becb9a85a2 gcc-12.1.0.tar.xz -52cecfbbe286820d1f8bc118769008acb6451bd074fe6dea9e868d54b2ada855 gmp-6.2.1.tar.xz -956f9b16d0377b777e21b07d27962ec1153236ef2e94039ec1ad375859c01fc9 mpfr-4.1.0.tar.xz -f967a250c85296a88bf6a2471b74558d89a59fe548e119f6d74fccb7cb73b13e mpc-1.2.1.tar.gz -0930e07dc2c5bf1172f3fd003a1be7abc3c0c420ce5bd76bc2e514c63800adcb c99 -30c25e440a4ac72bf7dc50e564b94a8c4ef43e4b2030c12d3042a78fb3cbc825 musl-libssp.patch -495a5f94c38d940dc174e8d9cbd2bc4a9399062e579a0de0afddbec0f0c2f39c musl-sched_h-calloc-poison.patch diff --git a/testing/gcc/depends b/testing/gcc/depends deleted file mode 100644 index 3eb45901..00000000 --- a/testing/gcc/depends +++ /dev/null @@ -1,4 +0,0 @@ -binutils -byacc make -flex make -zlib diff --git a/testing/gcc/files/c99 b/testing/gcc/files/c99 deleted file mode 100755 index 692f0924..00000000 --- a/testing/gcc/files/c99 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec cc -std=c99 "$@" diff --git a/testing/gcc/meta b/testing/gcc/meta deleted file mode 100644 index fe87fa76..00000000 --- a/testing/gcc/meta +++ /dev/null @@ -1,3 +0,0 @@ -description: GNU Compiler Collection -license: GPL-3.0-or-later, LGPL-2.1-or-later -maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/testing/gcc/patches/musl-libssp.patch b/testing/gcc/patches/musl-libssp.patch deleted file mode 100644 index fe5c6143..00000000 --- a/testing/gcc/patches/musl-libssp.patch +++ /dev/null @@ -1,20 +0,0 @@ -Author: Timo Teräs <timo.teras@iki.fi> - -Alpine musl package provides libssp_nonshared.a. We link to it unconditionally, -as otherwise we get link failures if some objects are -fstack-protector built -and final link happens with -fno-stack-protector. This seems to be the common -case when bootstrapping gcc, the piepatches do not seem to fully fix the -crosstoolchain and bootstrap sequence wrt. stack-protector flag usage. - ---- gcc-6.1.0/gcc/gcc.c.orig -+++ gcc-6.1.0/gcc/gcc.c -@@ -870,8 +870,7 @@ - - #ifndef LINK_SSP_SPEC - #ifdef TARGET_LIBC_PROVIDES_SSP --#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ -- "|fstack-protector-strong|fstack-protector-explicit:}" -+#define LINK_SSP_SPEC "-lssp_nonshared" - #else - #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ - "|fstack-protector-strong|fstack-protector-explicit" \ diff --git a/testing/gcc/sources b/testing/gcc/sources deleted file mode 100644 index 01cd92b8..00000000 --- a/testing/gcc/sources +++ /dev/null @@ -1,7 +0,0 @@ -https://gcc.gnu.org/pub/gcc/releases/gcc-12.1.0/gcc-12.1.0.tar.xz gcc -https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz gcc/gmp -https://ftp.gnu.org/gnu/mpfr/mpfr-4.1.0.tar.xz gcc/mpfr -https://ftp.gnu.org/gnu/mpc/mpc-1.2.1.tar.gz gcc/mpc -files/c99 -patches/musl-libssp.patch -patches/musl-sched_h-calloc-poison.patch diff --git a/testing/gcc/version b/testing/gcc/version deleted file mode 100644 index d3f2d92e..00000000 --- a/testing/gcc/version +++ /dev/null @@ -1 +0,0 @@ -12.1.0 1 |