From 2faf47adecd22617c557b99b65089b78c8a0ebc8 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 25 Nov 2020 11:57:47 +0100 Subject: [PATCH] cross/gcc-*: upgrade to 10.2.1_pre0-r3 --- ...ial-inlining-from-O2-to-O3-or-higher.patch | 66 ------------------- cross/gcc-aarch64/APKBUILD | 6 +- ...ial-inlining-from-O2-to-O3-or-higher.patch | 66 ------------------- cross/gcc-armhf/APKBUILD | 6 +- ...ial-inlining-from-O2-to-O3-or-higher.patch | 66 ------------------- cross/gcc-armv7/APKBUILD | 6 +- 6 files changed, 3 insertions(+), 213 deletions(-) delete mode 100644 cross/gcc-aarch64/0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch delete mode 100644 cross/gcc-armhf/0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch delete mode 100644 cross/gcc-armv7/0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch diff --git a/cross/gcc-aarch64/0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch b/cross/gcc-aarch64/0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch deleted file mode 100644 index 06e402ba7..000000000 --- a/cross/gcc-aarch64/0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b36fd572e6cbe63dca6fbedd91f17d2797524eaa Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Tue, 17 Nov 2020 10:35:40 +0000 -Subject: [PATCH 40/40] opts: move -fpartial-inlining from -O2 to -O3 or - higher. - -We have observed strange behavior from the inliner on mips and on -s390x when the new partial inlining feature is enabled. ---- - gcc/doc/invoke.texi | 5 +++-- - gcc/opts.c | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 01e67e97491..6c4c2937b8f 100644 ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -9212,7 +9212,6 @@ also turns on the following optimization flags: - -flra-remat @gol - -foptimize-sibling-calls @gol - -foptimize-strlen @gol ---fpartial-inlining @gol - -fpeephole2 @gol - -freorder-blocks-algorithm=stc @gol - -freorder-blocks-and-partition -freorder-functions @gol -@@ -9234,7 +9233,8 @@ NOTE: In Alpine Linux, @option{-D_FORTIFY_SOURCE=2} is - set by default, and is activated when @option{-O} is set to 2 or higher. - This enables additional compile-time and run-time checks for several libc - functions. To disable, specify either @option{-U_FORTIFY_SOURCE} or --@option{-D_FORTIFY_SOURCE=0}. -+@option{-D_FORTIFY_SOURCE=0}. Additionally, @option{-fpartial-inlining} -+is only activated when @option{-O} is set to 3 or higher. - - @item -O3 - @opindex O3 -@@ -9246,6 +9246,7 @@ by @option{-O2} and also turns on the following optimization flags: - -fipa-cp-clone - -floop-interchange @gol - -floop-unroll-and-jam @gol -+-fpartial-inlining @gol - -fpeel-loops @gol - -fpredictive-commoning @gol - -fsplit-loops @gol -diff --git a/gcc/opts.c b/gcc/opts.c -index 73162528938..1d0d997eda2 100644 ---- a/gcc/opts.c -+++ b/gcc/opts.c -@@ -492,7 +492,6 @@ static const struct default_options default_options_table[] = - { OPT_LEVELS_2_PLUS, OPT_fisolate_erroneous_paths_dereference, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_flra_remat, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_foptimize_sibling_calls, NULL, 1 }, -- { OPT_LEVELS_2_PLUS, OPT_fpartial_inlining, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_fpeephole2, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_frerun_cse_after_loop, NULL, 1 }, -@@ -530,6 +529,7 @@ static const struct default_options default_options_table[] = - { OPT_LEVELS_3_PLUS, OPT_fipa_cp_clone, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_floop_interchange, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_floop_unroll_and_jam, NULL, 1 }, -+ { OPT_LEVELS_3_PLUS, OPT_fpartial_inlining, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_fpeel_loops, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_fsplit_loops, NULL, 1 }, --- -2.29.2 - diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD index 97557ea5c..8272a292b 100644 --- a/cross/gcc-aarch64/APKBUILD +++ b/cross/gcc-aarch64/APKBUILD @@ -31,7 +31,7 @@ pkgver=10.2.1_pre0 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname=gcc-aarch64 -pkgrel=2 +pkgrel=3 pkgdesc="Stage2 cross-compiler for aarch64" url="https://gcc.gnu.org" arch="x86_64" @@ -221,12 +221,9 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-10.2.1.tar.xz 0037-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch 0038-gcc-go-link-to-libucontext.patch 0039-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch - 0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch 0041-dlang-support-musl-1.2.0.patch " -# gcc-4.8-build-args.patch - # we build out-of-tree _gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver} _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}" @@ -699,5 +696,4 @@ f7582eaa9b6f421652b6705e28a22ba68210ea7e32d3c468e86b481a26bf391c86146e1a3ee4dda5 c7d48b3657d37fbaef0696c96f858819bbe5469d7387e99db890eb925703dbeaf11858fdf2ecd556ac85d766c739374d71c5509f5e2fba88eb427cf93e9fdcc0 0037-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch 1e85dd650a43ce96d489f77e37fd247186e4e1fe2d088be991c3ff8233c923408137d94b72788ebc2ddcac8873c6f326a92138790ab0281722c67cce400f76cc 0038-gcc-go-link-to-libucontext.patch c93e8b0797c54483174b77f942e932eeb832c0784af9948ead7d8d95ca6392ffe3edee0740e835cf3d9310904718384e846a882284c21ccf26a055f8f940a874 0039-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch -ff74dbf6a3e10f6abececdce57672e76cca8f8a92f67ed495ae2631265402fed74e9b567fc35ad16d2a62449ca4074b6868ebbc56c68b9cecf8e686018f26554 0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch eb2d8e432206250a4c4682305390883343e3c8285ac26701a910c1418b6ba5b3681612db846eb298fd47f0163772403340a348b719af751afe410742d6e92472 0041-dlang-support-musl-1.2.0.patch" diff --git a/cross/gcc-armhf/0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch b/cross/gcc-armhf/0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch deleted file mode 100644 index 06e402ba7..000000000 --- a/cross/gcc-armhf/0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b36fd572e6cbe63dca6fbedd91f17d2797524eaa Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Tue, 17 Nov 2020 10:35:40 +0000 -Subject: [PATCH 40/40] opts: move -fpartial-inlining from -O2 to -O3 or - higher. - -We have observed strange behavior from the inliner on mips and on -s390x when the new partial inlining feature is enabled. ---- - gcc/doc/invoke.texi | 5 +++-- - gcc/opts.c | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 01e67e97491..6c4c2937b8f 100644 ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -9212,7 +9212,6 @@ also turns on the following optimization flags: - -flra-remat @gol - -foptimize-sibling-calls @gol - -foptimize-strlen @gol ---fpartial-inlining @gol - -fpeephole2 @gol - -freorder-blocks-algorithm=stc @gol - -freorder-blocks-and-partition -freorder-functions @gol -@@ -9234,7 +9233,8 @@ NOTE: In Alpine Linux, @option{-D_FORTIFY_SOURCE=2} is - set by default, and is activated when @option{-O} is set to 2 or higher. - This enables additional compile-time and run-time checks for several libc - functions. To disable, specify either @option{-U_FORTIFY_SOURCE} or --@option{-D_FORTIFY_SOURCE=0}. -+@option{-D_FORTIFY_SOURCE=0}. Additionally, @option{-fpartial-inlining} -+is only activated when @option{-O} is set to 3 or higher. - - @item -O3 - @opindex O3 -@@ -9246,6 +9246,7 @@ by @option{-O2} and also turns on the following optimization flags: - -fipa-cp-clone - -floop-interchange @gol - -floop-unroll-and-jam @gol -+-fpartial-inlining @gol - -fpeel-loops @gol - -fpredictive-commoning @gol - -fsplit-loops @gol -diff --git a/gcc/opts.c b/gcc/opts.c -index 73162528938..1d0d997eda2 100644 ---- a/gcc/opts.c -+++ b/gcc/opts.c -@@ -492,7 +492,6 @@ static const struct default_options default_options_table[] = - { OPT_LEVELS_2_PLUS, OPT_fisolate_erroneous_paths_dereference, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_flra_remat, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_foptimize_sibling_calls, NULL, 1 }, -- { OPT_LEVELS_2_PLUS, OPT_fpartial_inlining, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_fpeephole2, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_frerun_cse_after_loop, NULL, 1 }, -@@ -530,6 +529,7 @@ static const struct default_options default_options_table[] = - { OPT_LEVELS_3_PLUS, OPT_fipa_cp_clone, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_floop_interchange, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_floop_unroll_and_jam, NULL, 1 }, -+ { OPT_LEVELS_3_PLUS, OPT_fpartial_inlining, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_fpeel_loops, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_fsplit_loops, NULL, 1 }, --- -2.29.2 - diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD index dd5dd0c46..9a8b3c658 100644 --- a/cross/gcc-armhf/APKBUILD +++ b/cross/gcc-armhf/APKBUILD @@ -31,7 +31,7 @@ pkgver=10.2.1_pre0 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname=gcc-armhf -pkgrel=2 +pkgrel=3 pkgdesc="Stage2 cross-compiler for armhf" url="https://gcc.gnu.org" arch="x86_64" @@ -221,12 +221,9 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-10.2.1.tar.xz 0037-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch 0038-gcc-go-link-to-libucontext.patch 0039-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch - 0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch 0041-dlang-support-musl-1.2.0.patch " -# gcc-4.8-build-args.patch - # we build out-of-tree _gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver} _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}" @@ -699,5 +696,4 @@ f7582eaa9b6f421652b6705e28a22ba68210ea7e32d3c468e86b481a26bf391c86146e1a3ee4dda5 c7d48b3657d37fbaef0696c96f858819bbe5469d7387e99db890eb925703dbeaf11858fdf2ecd556ac85d766c739374d71c5509f5e2fba88eb427cf93e9fdcc0 0037-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch 1e85dd650a43ce96d489f77e37fd247186e4e1fe2d088be991c3ff8233c923408137d94b72788ebc2ddcac8873c6f326a92138790ab0281722c67cce400f76cc 0038-gcc-go-link-to-libucontext.patch c93e8b0797c54483174b77f942e932eeb832c0784af9948ead7d8d95ca6392ffe3edee0740e835cf3d9310904718384e846a882284c21ccf26a055f8f940a874 0039-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch -ff74dbf6a3e10f6abececdce57672e76cca8f8a92f67ed495ae2631265402fed74e9b567fc35ad16d2a62449ca4074b6868ebbc56c68b9cecf8e686018f26554 0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch eb2d8e432206250a4c4682305390883343e3c8285ac26701a910c1418b6ba5b3681612db846eb298fd47f0163772403340a348b719af751afe410742d6e92472 0041-dlang-support-musl-1.2.0.patch" diff --git a/cross/gcc-armv7/0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch b/cross/gcc-armv7/0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch deleted file mode 100644 index 06e402ba7..000000000 --- a/cross/gcc-armv7/0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b36fd572e6cbe63dca6fbedd91f17d2797524eaa Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Tue, 17 Nov 2020 10:35:40 +0000 -Subject: [PATCH 40/40] opts: move -fpartial-inlining from -O2 to -O3 or - higher. - -We have observed strange behavior from the inliner on mips and on -s390x when the new partial inlining feature is enabled. ---- - gcc/doc/invoke.texi | 5 +++-- - gcc/opts.c | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 01e67e97491..6c4c2937b8f 100644 ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -9212,7 +9212,6 @@ also turns on the following optimization flags: - -flra-remat @gol - -foptimize-sibling-calls @gol - -foptimize-strlen @gol ---fpartial-inlining @gol - -fpeephole2 @gol - -freorder-blocks-algorithm=stc @gol - -freorder-blocks-and-partition -freorder-functions @gol -@@ -9234,7 +9233,8 @@ NOTE: In Alpine Linux, @option{-D_FORTIFY_SOURCE=2} is - set by default, and is activated when @option{-O} is set to 2 or higher. - This enables additional compile-time and run-time checks for several libc - functions. To disable, specify either @option{-U_FORTIFY_SOURCE} or --@option{-D_FORTIFY_SOURCE=0}. -+@option{-D_FORTIFY_SOURCE=0}. Additionally, @option{-fpartial-inlining} -+is only activated when @option{-O} is set to 3 or higher. - - @item -O3 - @opindex O3 -@@ -9246,6 +9246,7 @@ by @option{-O2} and also turns on the following optimization flags: - -fipa-cp-clone - -floop-interchange @gol - -floop-unroll-and-jam @gol -+-fpartial-inlining @gol - -fpeel-loops @gol - -fpredictive-commoning @gol - -fsplit-loops @gol -diff --git a/gcc/opts.c b/gcc/opts.c -index 73162528938..1d0d997eda2 100644 ---- a/gcc/opts.c -+++ b/gcc/opts.c -@@ -492,7 +492,6 @@ static const struct default_options default_options_table[] = - { OPT_LEVELS_2_PLUS, OPT_fisolate_erroneous_paths_dereference, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_flra_remat, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_foptimize_sibling_calls, NULL, 1 }, -- { OPT_LEVELS_2_PLUS, OPT_fpartial_inlining, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_fpeephole2, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 }, - { OPT_LEVELS_2_PLUS, OPT_frerun_cse_after_loop, NULL, 1 }, -@@ -530,6 +529,7 @@ static const struct default_options default_options_table[] = - { OPT_LEVELS_3_PLUS, OPT_fipa_cp_clone, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_floop_interchange, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_floop_unroll_and_jam, NULL, 1 }, -+ { OPT_LEVELS_3_PLUS, OPT_fpartial_inlining, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_fpeel_loops, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_fsplit_loops, NULL, 1 }, --- -2.29.2 - diff --git a/cross/gcc-armv7/APKBUILD b/cross/gcc-armv7/APKBUILD index caca574fd..b0e9f0c61 100644 --- a/cross/gcc-armv7/APKBUILD +++ b/cross/gcc-armv7/APKBUILD @@ -31,7 +31,7 @@ pkgver=10.2.1_pre0 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" pkgname=gcc-armv7 -pkgrel=2 +pkgrel=3 pkgdesc="Stage2 cross-compiler for armv7" url="https://gcc.gnu.org" arch="x86_64" @@ -221,12 +221,9 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-10.2.1.tar.xz 0037-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch 0038-gcc-go-link-to-libucontext.patch 0039-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch - 0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch 0041-dlang-support-musl-1.2.0.patch " -# gcc-4.8-build-args.patch - # we build out-of-tree _gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver} _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}" @@ -699,5 +696,4 @@ f7582eaa9b6f421652b6705e28a22ba68210ea7e32d3c468e86b481a26bf391c86146e1a3ee4dda5 c7d48b3657d37fbaef0696c96f858819bbe5469d7387e99db890eb925703dbeaf11858fdf2ecd556ac85d766c739374d71c5509f5e2fba88eb427cf93e9fdcc0 0037-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch 1e85dd650a43ce96d489f77e37fd247186e4e1fe2d088be991c3ff8233c923408137d94b72788ebc2ddcac8873c6f326a92138790ab0281722c67cce400f76cc 0038-gcc-go-link-to-libucontext.patch c93e8b0797c54483174b77f942e932eeb832c0784af9948ead7d8d95ca6392ffe3edee0740e835cf3d9310904718384e846a882284c21ccf26a055f8f940a874 0039-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch -ff74dbf6a3e10f6abececdce57672e76cca8f8a92f67ed495ae2631265402fed74e9b567fc35ad16d2a62449ca4074b6868ebbc56c68b9cecf8e686018f26554 0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch eb2d8e432206250a4c4682305390883343e3c8285ac26701a910c1418b6ba5b3681612db846eb298fd47f0163772403340a348b719af751afe410742d6e92472 0041-dlang-support-musl-1.2.0.patch"