diff options
author | Vyacheslav Razykov | 2021-05-29 19:25:29 +0300 |
---|---|---|
committer | Vyacheslav Razykov | 2021-05-29 19:25:29 +0300 |
commit | da3dba9c4aeaed9507aa9687e79ef85aca043f28 (patch) | |
tree | b79891342b586866634bfbdb38fdcc5037061ca2 | |
parent | 6b7944586d0c3407deeb4a36fe7654e0313a002b (diff) | |
download | aur-da3dba9c4aeaed9507aa9687e79ef85aca043f28.tar.gz |
Update to 11.1.0-1
-rw-r--r-- | PKGBUILD | 26 | ||||
-rw-r--r-- | all_default-ssp-fix.patch | 6 | ||||
-rw-r--r-- | gcc-ada-repro.patch | 15 | ||||
-rw-r--r-- | gcc11-Wno-format-security.patch | 27 |
4 files changed, 63 insertions, 11 deletions
@@ -7,9 +7,9 @@ _target="arm-linux-gnueabihf" pkgname=${_target}-gcc-stage1 -pkgver=10.3.0 +pkgver=11.1.0 _majorver=${pkgver%%.*} -_islver=0.21 +_islver=0.24 pkgrel=1 pkgdesc="The GNU Compiler Collection. Stage 1 for toolchain building (${_target})" arch=(i686 x86_64) @@ -19,15 +19,19 @@ depends=("${_target}-binutils>=2.36.1-1" libmpc zlib) options=(!emptydirs !distcc !strip) source=(https://sourceware.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz{,.sig} http://isl.gforge.inria.fr/isl-${_islver}.tar.xz - all_default-ssp-fix.patch) + all_default-ssp-fix.patch + gcc-ada-repro.patch + gcc11-Wno-format-security.patch) validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9 # bpiotrowski@archlinux.org 86CFFCA918CF3AF47147588051E8B148A9999C34 # evangelos@foutrelis.com 13975A70E63C361C73AE69EF6EEB81F8981C74C7 # richard.guenther@gmail.com - 33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub@redhat.com> -sha256sums=('64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344' + D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62) # Jakub Jelinek <jakub@redhat.com> +sha256sums=('4c4a6fb8a8396059241c2e674b85b351c26a5d678274007f076957afa1cc9ddf' 'SKIP' - '777058852a3db9500954361e294881214f6ecd4b594c00da5eee974cd6a54960' - '5481035e3a714c6ad7bbf06b342c8b278a474b131d88e3cdc00a6221fe4d12ac') + '043105cc544f416b48736fff8caf077fb0663a717d06b1113f16e391ac99ebad' + '88acab8b777759a002e186a1f9d96f96b651bf20454bfdf891a0d64231097c32' + '1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f' + '504e4b5a08eb25b6c35f19fdbe0c743ae4e9015d0af4759e74150006c283585e') prepare() { [[ ! -d gcc ]] && ln -s gcc-${pkgver/+/-} gcc @@ -44,7 +48,13 @@ prepare() { # Turn off SSP for nostdlib|nodefaultlibs|ffreestanding # https://bugs.archlinux.org/task/64270 - patch -p1 -i "$srcdir/all_default-ssp-fix.patch" + #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" mkdir -p "$srcdir/gcc-build" } diff --git a/all_default-ssp-fix.patch b/all_default-ssp-fix.patch index 832a6a586ec8..41544b53cb4c 100644 --- a/all_default-ssp-fix.patch +++ b/all_default-ssp-fix.patch @@ -2,7 +2,7 @@ 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 -@@ -874,6 +874,12 @@ +@@ -977,6 +977,12 @@ #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}" #endif @@ -15,10 +15,10 @@ Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding #ifndef LINK_SSP_SPEC #ifdef TARGET_LIBC_PROVIDES_SSP #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ -@@ -1155,7 +1161,7 @@ +@@ -1273,7 +1273,7 @@ %{-version:--version}\ %{-help=*:--help=%*}\ - %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\ + %{!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}\ diff --git a/gcc-ada-repro.patch b/gcc-ada-repro.patch new file mode 100644 index 000000000000..66256369fac1 --- /dev/null +++ b/gcc-ada-repro.patch @@ -0,0 +1,15 @@ +Avoid leaking current data on generated file for Ada. + +Index: gcc/ada/gcc-interface/Makefile.in +=================================================================== +--- 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) ++ touch -r $(fsrcpfx)ada/gsocket.h $@ + + 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 new file mode 100644 index 000000000000..974ea44d0f85 --- /dev/null +++ b/gcc11-Wno-format-security.patch @@ -0,0 +1,27 @@ +2017-02-25 Jakub Jelinek <jakub@redhat.com> + + * configure.ac: When adding -Wno-format, also add -Wno-format-security. + * configure: Regenerated. + +--- gcc/configure.ac.jj 2017-02-13 12:20:53.000000000 +0100 ++++ gcc/configure.ac 2017-02-25 12:42:32.859175403 +0100 +@@ -480,7 +480,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.jj 2017-02-13 12:20:52.000000000 +0100 ++++ gcc/configure 2017-02-25 12:42:50.041946391 +0100 +@@ -6647,7 +6647,7 @@ else + fi + + if test $enable_build_format_warnings = no; then : +- wf_opt=-Wno-format ++ wf_opt="-Wno-format -Wno-format-security" + else + wf_opt= + fi |