Update to 12.1.0-1

5 files changed, 28 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 30982ed3168d..1704ee4c5cc3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = arm-linux-gnueabihf-gcc-stage1
 	pkgdesc = The GNU Compiler Collection. Stage 1 for toolchain building (arm-linux-gnueabihf)
-	pkgver = 11.2.0
-	pkgrel = 2
+	pkgver = 12.1.0
+	pkgrel = 1
 	url = https://gcc.gnu.org
 	arch = i686
 	arch = x86_64
@@ -9,27 +9,25 @@ pkgbase = arm-linux-gnueabihf-gcc-stage1
 	license = LGPL
 	license = FDL
 	license = custom
-	depends = arm-linux-gnueabihf-binutils>=2.37-1
+	depends = arm-linux-gnueabihf-binutils>=2.38-1
 	depends = libmpc
 	depends = zlib
 	options = !emptydirs
 	options = !distcc
 	options = !strip
-	source = https://sourceware.org/pub/gcc/releases/gcc-11.2.0/gcc-11.2.0.tar.xz
-	source = https://sourceware.org/pub/gcc/releases/gcc-11.2.0/gcc-11.2.0.tar.xz.sig
+	source = https://sourceware.org/pub/gcc/releases/gcc-12.1.0/gcc-12.1.0.tar.xz
+	source = https://sourceware.org/pub/gcc/releases/gcc-12.1.0/gcc-12.1.0.tar.xz.sig
 	source = https://libisl.sourceforge.io/isl-0.24.tar.xz
-	source = all_default-ssp-fix.patch
+	source = 844a5c8ca.patch::https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=844a5c8ca768dc0cc90c1a943756610832d686a8
 	source = gcc-ada-repro.patch
-	source = gcc11-Wno-format-security.patch
 	validpgpkeys = F3691687D867B81B51CE07D9BBE43771487328A9
 	validpgpkeys = 86CFFCA918CF3AF47147588051E8B148A9999C34
 	validpgpkeys = 13975A70E63C361C73AE69EF6EEB81F8981C74C7
 	validpgpkeys = D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62
-	sha256sums = d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b
+	sha256sums = 62fd634889f31c02b64af2c468f064b47ad1ca78411c45abe6ac4b5f8dd19c7b
 	sha256sums = SKIP
 	sha256sums = 043105cc544f416b48736fff8caf077fb0663a717d06b1113f16e391ac99ebad
-	sha256sums = 88acab8b777759a002e186a1f9d96f96b651bf20454bfdf891a0d64231097c32
-	sha256sums = 867e7ef398932bec08b1d381c297877dceec031c0077a02dce2d662c5fa23183
-	sha256sums = f2878f006949165ba5a400a10f008249e8e27a833ebb92b3221d4e6bf5886992
+	sha256sums = 6dc8d32e76bc6c7c1a24ae527062ec1b4f393c9f7e0e25f6ab4acc98f622a80f
+	sha256sums = 1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f
 
 pkgname = arm-linux-gnueabihf-gcc-stage1
diff --git a/PKGBUILD b/PKGBUILD
index 8917abaa519d..f5eb5b141ad9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,31 +7,29 @@
 
 _target="arm-linux-gnueabihf"
 pkgname=${_target}-gcc-stage1
-pkgver=11.2.0
+pkgver=12.1.0
 _majorver=${pkgver%%.*}
 _islver=0.24
-pkgrel=2
+pkgrel=1
 pkgdesc="The GNU Compiler Collection. Stage 1 for toolchain building (${_target})"
 arch=(i686 x86_64)
 license=(GPL LGPL FDL custom)
 url='https://gcc.gnu.org'
-depends=("${_target}-binutils>=2.37-1" libmpc zlib)
+depends=("${_target}-binutils>=2.38-1" libmpc zlib)
 options=(!emptydirs !distcc !strip)
 source=(https://sourceware.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz{,.sig}
         https://libisl.sourceforge.io/isl-${_islver}.tar.xz
-        all_default-ssp-fix.patch
-        gcc-ada-repro.patch
-        gcc11-Wno-format-security.patch)
+        844a5c8ca.patch::'https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=844a5c8ca768dc0cc90c1a943756610832d686a8'
+        gcc-ada-repro.patch)
 validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.org
               86CFFCA918CF3AF47147588051E8B148A9999C34  # evangelos@foutrelis.com
               13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther@gmail.com
               D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62) # Jakub Jelinek <jakub@redhat.com>
-sha256sums=('d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b'
+sha256sums=('62fd634889f31c02b64af2c468f064b47ad1ca78411c45abe6ac4b5f8dd19c7b'
             'SKIP'
             '043105cc544f416b48736fff8caf077fb0663a717d06b1113f16e391ac99ebad'
-            '88acab8b777759a002e186a1f9d96f96b651bf20454bfdf891a0d64231097c32'
-            '867e7ef398932bec08b1d381c297877dceec031c0077a02dce2d662c5fa23183'
-            'f2878f006949165ba5a400a10f008249e8e27a833ebb92b3221d4e6bf5886992')
+            '6dc8d32e76bc6c7c1a24ae527062ec1b4f393c9f7e0e25f6ab4acc98f622a80f'
+            '1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f')
 
 prepare() {
   [[ ! -d gcc ]] && ln -s gcc-${pkgver/+/-} gcc
@@ -46,15 +44,11 @@ prepare() {
   # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
 
-  # Turn off SSP for nostdlib|nodefaultlibs|ffreestanding
-  # https://bugs.archlinux.org/task/64270
-  #patch -p1 -i "$srcdir/all_default-ssp-fix.patch"
-
   # Reproducible gcc-ada
   patch -Np0 < "$srcdir/gcc-ada-repro.patch"
 
-  # configure.ac: When adding -Wno-format, also add -Wno-format-security
-  patch -Np0 < "$srcdir/gcc11-Wno-format-security.patch"
+  # tree-optimization/105562 - avoid uninit diagnostic with better FRE
+  patch -Np1 < "$srcdir/844a5c8ca.patch"
 
   mkdir -p "$srcdir/gcc-build"
 }
@@ -67,6 +61,11 @@ build() {
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
 
+  # using -Werror=format-security causes libcpp buildig failures
+  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100207 
+  CFLAGS="${CFLAGS/ -Werror=format-security/}"
+  CXXFLAGS="${CXXFLAGS/ -Werror=format-security/}"
+
   "$srcdir/gcc/configure" --prefix=/usr \
       --program-prefix=${_target}- \
       --with-local-prefix=/usr/${_target} \
diff --git a/all_default-ssp-fix.patch b/all_default-ssp-fix.patch
deleted file mode 100644
index 41544b53cb4c..000000000000
--- a/all_default-ssp-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
-
---- a/gcc/gcc.c	2021-04-08 22:48:03.395002871 +0300
-+++ b/gcc/gcc.c	2021-04-08 22:52:27.701661788 +0300
-@@ -977,6 +977,12 @@
- #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
- #endif
- 
-+#ifdef ENABLE_DEFAULT_SSP
-+#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} "
-+#else
-+#define NO_SSP_SPEC ""
-+#endif
-+
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1273,7 +1273,7 @@
-  %{-version:--version}\
-  %{-help=*:--help=%*}\
-  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%b.s}}}\
-- %{fsyntax-only:-o %j} %{-param*}\
-+ %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
-  %{coverage:-fprofile-arcs -ftest-coverage}\
-  %{fprofile-arcs|fprofile-generate*|coverage:\
-    %{!fprofile-update=single:\
diff --git a/gcc-ada-repro.patch b/gcc-ada-repro.patch
index 91c56d9c6a25..66256369fac1 100644
--- a/gcc-ada-repro.patch
+++ b/gcc-ada-repro.patch
@@ -2,9 +2,9 @@ Avoid leaking current data on generated file for Ada.
 
 Index: gcc/ada/gcc-interface/Makefile.in
 ===================================================================
---- gcc/ada/gcc-interface/Makefile.in	2021-07-28 09:55:06.816280772 +0300
-+++ gcc/ada/gcc-interface/Makefile.in	2021-09-17 02:16:17.169904292 +0300
-@@ -613,6 +613,7 @@
+--- gcc/ada/gcc-interface/Makefile.in	(revision 268977)
++++ gcc/ada/gcc-interface/Makefile.in	(working copy)
+@@ -2407,6 +2407,7 @@ $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib
  	    $(OSCONS_CPP) ; \
  	    $(OSCONS_EXTRACT) ; \
  	    ../bldtools/oscons/xoscons s-oscons)
@@ -12,3 +12,4 @@ Index: gcc/ada/gcc-interface/Makefile.in
  
  gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../stamp-gnatlib2-$(RTSDIR) $(RTSDIR)/s-oscons.ads
  	test -f $(RTSDIR)/s-oscons.ads || exit 1
+
diff --git a/gcc11-Wno-format-security.patch b/gcc11-Wno-format-security.patch
deleted file mode 100644
index 7680a5859474..000000000000
--- a/gcc11-Wno-format-security.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-2017-02-25  Jakub Jelinek  <jakub@redhat.com>
-
-	* configure.ac: When adding -Wno-format, also add -Wno-format-security.
-	* configure: Regenerated.
-
---- gcc/configure.ac	2017-02-13 12:20:53.000000000 +0100
-+++ gcc/configure.ac	2017-02-25 12:42:32.859175403 +0100
-@@ -523,7 +523,7 @@ AC_ARG_ENABLE(build-format-warnings,
-   AS_HELP_STRING([--disable-build-format-warnings],[don't use -Wformat while building GCC]),
-   [],[enable_build_format_warnings=yes])
- AS_IF([test $enable_build_format_warnings = no],
--      [wf_opt=-Wno-format],[wf_opt=])
-+      [wf_opt="-Wno-format -Wno-format-security"],[wf_opt=])
- ACX_PROG_CXX_WARNING_OPTS(
- 	m4_quote(m4_do([-W -Wall -Wno-narrowing -Wwrite-strings ],
- 		       [-Wcast-qual -Wno-error=format-diag $wf_opt])),
---- gcc/configure	2017-02-13 12:20:52.000000000 +0100
-+++ gcc/configure	2017-02-25 12:42:50.041946391 +0100
-@@ -6833,7 +6833,7 @@
- fi
- 
- if test $enable_build_format_warnings = no; then :
--  wf_opt=-Wno-format
-+  wf_opt="-Wno-format -Wno-format-security"
- else
-   wf_opt=
- fi