From e0921b64c344f530c3f77307bca1413aacf6e8d5 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Wed, 25 May 2022 08:34:44 +0200
Subject: [PATCH] cross/gcc4-aarch64: regenerate to fix build (MR 3156)

---
 .../1001-fix-reload1-compile-error.patch        | 17 +++++++++++++++++
 cross/gcc4-aarch64/APKBUILD                     | 11 ++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 cross/gcc4-aarch64/1001-fix-reload1-compile-error.patch

diff --git a/cross/gcc4-aarch64/1001-fix-reload1-compile-error.patch b/cross/gcc4-aarch64/1001-fix-reload1-compile-error.patch
new file mode 100644
index 000000000..2f4699d7b
--- /dev/null
+++ b/cross/gcc4-aarch64/1001-fix-reload1-compile-error.patch
@@ -0,0 +1,17 @@
+Avoid gcc/reload1.c compile error when building with newer gcc (e.g. gcc 11.2 on Ubuntu 21.10).
+
+The error was:
+
+.../esp-open-sdk/crosstool-NG/.build/src/gcc-4.8.5/gcc/reload1.c:89:24: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17
+
+--- gcc-4.8.5/gcc/reload1.c~	2013-01-21 06:55:05.000000000 -0800
++++ gcc-4.8.5/gcc/reload1.c	2022-01-05 17:18:10.148547719 -0800
+@@ -440,7 +440,7 @@
+ 
+   while (memory_address_p (QImode, tem))
+     {
+-      spill_indirect_levels++;
++      spill_indirect_levels = 1;
+       tem = gen_rtx_MEM (Pmode, tem);
+     }
+ 
diff --git a/cross/gcc4-aarch64/APKBUILD b/cross/gcc4-aarch64/APKBUILD
index 3fadff279..580fe4035 100644
--- a/cross/gcc4-aarch64/APKBUILD
+++ b/cross/gcc4-aarch64/APKBUILD
@@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 pkgname=gcc4-aarch64
 pkgver=9999
 _pkgver=4.9.2
-pkgrel=2
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="http://gcc.gnu.org"
 arch="x86_64"
@@ -215,6 +215,8 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkg
 	hardenednossp.specs
 	hardenednopie.specs
 	hardenednopiessp.specs
+
+	1001-fix-reload1-compile-error.patch
 	"
 
 # we build out-of-tree
@@ -432,7 +434,8 @@ package() {
 	done
 }
 
-sha512sums="35a1386ae2b8629cd464383fbb3c61e94a07f3691f48b8029b97cc62a60c792ffb870aad2343b2ad8185bf46f77e1e1dd62309ecdadc42f919874c6e2c58b936  gcc-4.9.2.tar.gz
+sha512sums="
+35a1386ae2b8629cd464383fbb3c61e94a07f3691f48b8029b97cc62a60c792ffb870aad2343b2ad8185bf46f77e1e1dd62309ecdadc42f919874c6e2c58b936  gcc-4.9.2.tar.gz
 28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226  ecj-4.9.jar
 618a8d037ccad15e60182acc9c85ba844cb9b5800a22ece0b814e43541b01b4e390a2847f86debb351f4b05580241747fde87e86a17060744e7bb2b9a3dc5bd4  01_all_gcc49_configure.patch
 21770259c7916e55568027926e4a543eea468b04436cc61c28f749be5a6635c48e68b7924a8eb19a76733a9d2f00921ba06faddaedbf14b1cdad5ab1810cc6c6  02_all_gcc48_config.in.patch
@@ -480,4 +483,6 @@ b37195a126476775e2ef16e0adc9173664c514339fb319f628debd8a4133fa53e022278387c68fc2
 83a0996a48096032bcc674a6d28524f1cd2d81837621ebe4c15b5aedbd551c77ce5576b6307adb673ef0e4ac0431d935ad6a427edca2af5c21b6be9176bfaddb  vanilla.specs
 e4d38905527c500c61c421d782a8ac6ef2b034b15fd81d868486ac330a70922937d3c47e0684e9f3250744569b56a8df199499a4a5c107a6d544dca84458dc12  hardenednossp.specs
 b56f7c308c5aefd0cfc647abd75939508a6640c53fce7c19da7c7d8ef4405d29b0d88800117fc7ff8d0022b035d511fb6d478e745bb2ed12a1b63f9f8cf3e168  hardenednopie.specs
-f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a  hardenednopiessp.specs"
+f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a  hardenednopiessp.specs
+6f3d708269cc3f1d28ad9af8cd1206753b7d4ddde6589c303ce201d34b531f1abb73a14032a7f8e16c5ec3041e0c227b3451c09b1952a58893a64a2765d12a00  1001-fix-reload1-compile-error.patch
+"