aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAriadne Conill <ariadne@dereferenced.org>2020-12-03 21:40:53 +0000
committerAriadne Conill <ariadne@dereferenced.org>2020-12-03 21:40:53 +0000
commit39a770c14786c887c44b4bc48174071a7531ec15 (patch)
tree8e376b181f7c0e0fe1ff29cb0859e5efd282f4a2
parent5f5263f6b8c0f69de15e7cc7d0a05760b8cb4fdf (diff)
downloadaports-39a770c14786c887c44b4bc48174071a7531ec15.tar.gz
aports-39a770c14786c887c44b4bc48174071a7531ec15.tar.bz2
aports-39a770c14786c887c44b4bc48174071a7531ec15.tar.xz
main/gcc: drop partial inlining patch again, forgot to remove it from the patchset
-rw-r--r--main/gcc/0039-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch65
-rw-r--r--main/gcc/APKBUILD4
2 files changed, 1 insertions, 68 deletions
diff --git a/main/gcc/0039-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch b/main/gcc/0039-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch
deleted file mode 100644
index e4506bbfd6..0000000000
--- a/main/gcc/0039-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 29ce230e8c3f3204d7f97557be62cd25a8e5b577 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 17 Nov 2020 10:35:40 +0000
-Subject: [PATCH] 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 a3e5e002fa5..6d5bcffc1e1 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/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 9483807ef7..7c8b9776d3 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -7,7 +7,7 @@ pkgver=10.2.1_pre1
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
pkgname="$pkgname$_target"
-pkgrel=0
+pkgrel=1
pkgdesc="The GNU Compiler Collection"
url="https://gcc.gnu.org"
arch="all"
@@ -200,7 +200,6 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
0037-gcc-go-link-to-libucontext.patch
0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
- 0039-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch
0040-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
"
@@ -678,5 +677,4 @@ abc2ae2ea2ff270226c45321508c3641011b23172d043c55239a52fee9ed8451e8e23a2a65612c5f
21ff83b1f5f8c71c41e7c22ba59f194bc789c8e67a6be9e5185f215adf4ddb175551a261556e5c9bd57dd9c302e1f966de01ff90e097d7ace2c2e43208b6e0f9 0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
5f0230f9e542bcbfa39f1a3da1f171229bd926971a924ec3e9f3ad8178645d3853659a58a89a48906ffdd77e9c5ff2af43dc54cfc4ac335a219267dddc4afad1 0037-gcc-go-link-to-libucontext.patch
08ffdce5d1ef722364faf5e824b62d0e58655acbba99b58f24c609abb1d90577432863e769fbe269e4151c997b8bbb0cbed29032752b6e6c3356f8fb3086d607 0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-c3d99dda05270f0dfb612b211a1302f020461f3cca3080d6272486b46032d70941324a25466f504578970357428bb5ef24b65193d32cc0e7517d525e8826fa50 0039-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch
81bcffde9635c9c4b3214afd8bb16048f15dc8c4ce82c5576b15ee552d6ca8eeee2c5444e2949fec3b938e69fc7a2a2259a07d437e004788ac232c43ae9a83d2 0040-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch"