CODEOWNERS

@@ -3,7 +3,6 @@
 device/*/*-pine64-pinephone/        @craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
 device/*/*-purism-librem5/          @craftyguy @bshah
 main/osk-sdl/                       @craftyguy
-main/mesa-pvr-dri-classic/          @xc-racer99
 main/postmarketos-ui-plasma-mobile/ @bshah
 temp/u-boot-librem5/                @craftyguy @bshah
 device/community/*-qcom-sdm845      @calebccff @joelselvaraj

cross/gcc4-aarch64/1001-fix-reload1-compile-error.patch

+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);
+     }
+ 

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
+"

cross/gcc4-armv7/1001-fix-reload1-compile-error.patch

+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);
+     }
+ 

cross/gcc4-armv7/APKBUILD

@@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 pkgname=gcc4-armv7
 pkgver=9999
 _pkgver=4.9.2
-pkgrel=2
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for armv7"
 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
+"

device/community/firmware-qcom-adreno/APKBUILD

 pkgname=firmware-qcom-adreno
-pkgver=20210919
+pkgver=20220509
 pkgrel=0
 pkgdesc="Qualcomm Adreno GPU firmware from linux-firmware"
 url="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/"
@@ -15,7 +15,7 @@ builddir="$srcdir/linux-firmware-$pkgver"
 replaces="linux-firmware-qcom"
 _fwdir="/lib/firmware/qcom"
 
-_gpus="a300 a530 a630 a650 a660"
+_gpus="a300 a330 a420 a530 a630 a650 a660"
 for gpu in $_gpus; do
 	subpackages="$subpackages $pkgname-$gpu:_gpu"
 done
@@ -37,5 +37,5 @@ _gpu() {
 }
 
 sha512sums="
-94628158011e65dd65225e687823fc3611b2b2d431b3484a66108959c7fafbcdc0a7be73b7b9e1d1a2d62d40cb7bd81e33d96d822a7b159adc15894607a76a31  linux-firmware-20210919.tar.gz
+0591a35a14a6994ac60571a8e47c00ec013afbfedd4b3326cfe1971b9bd9a07ca7622b17177b3fb57a6c244d2caae12318fcbfac5da5f78a2c085285c9d85cf6  linux-firmware-20220509.tar.gz
 "

device/testing/device-fairphone-fp2/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-fairphone-fp2
 pkgdesc="Fairphone 2"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -64,7 +64,7 @@ downstream_firmware() {
 
 mainline_firmware() {
 	pkgdesc="Firmware support packages for mainline kernel"
-	depends="msm-modem firmware-qcom-adreno-a330"
+	depends="msm-modem msm-modem-uim-selection firmware-qcom-adreno-a330"
 	install_if="$pkgname-kernel-mainline $pkgname-nonfree-firmware"
 	mkdir "$subpkgdir"
 
@@ -87,7 +87,7 @@ phosh() {
 }
 
 sha512sums="
-9c069d0f1076498df7d5d8f1a861b9d53c6b49e69575466c269df70130c51a9f45b1f9371f8e5182e11ed2d408af6c6bd3a9a353a3650efc93a47242f12c2bde  deviceinfo
+d18aba816d5f825cb221010c1f7cb762a0cf5d184da4ee00ba073312e719eaf086db04eadbdcde731e6314bb81ca06ca8971c066c6d8f47718f6e62c95661cb1  deviceinfo
 55360b1ba4ddadea341c9edb13c32ba5f19aabf75ab28602f30cfb79b9df8834f115ef979c70569f23ec1293b1fcd408baf320d87803293ce7106bdc73a26c9f  FP2.conf
 b834461c6866bb0c473dd089dd5da641dd42a00f610aad6503117aa50fe6e200db9ad0a264bb609f12350d59faee1f772907bacd75439f702ea7d52f6f85e2b1  hifi
 cef2fd633cddbcf4ac9b4d2fa6bf3a1e3e8d810a2ea8050767fe649d289db753662821d5e41e2c8d20fb9c765c1babcb6a4d95e4c9345f5ea32d1b1d2b1e5126  phoc.ini

device/testing/device-fairphone-fp2/deviceinfo

@@ -20,6 +20,7 @@ deviceinfo_screen_height="1920"
 deviceinfo_getty_downstream="ttyHSL0;115200"
 deviceinfo_getty_mainline="ttyMSM0;115200"
 deviceinfo_mesa_driver_mainline="msm"
+deviceinfo_gpu_accelerated="true"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"

device/testing/device-lg-hammerhead/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-hammerhead
 pkgver=4
-pkgrel=0
+pkgrel=1
 pkgdesc="Google Nexus 5"
 url="https://postmarketos.org"
 arch="armv7"
@@ -66,7 +66,6 @@ nonfree_firmware() {
 		firmware-lg-hammerhead-bluetooth
 		linux-firmware-brcm
 		linux-firmware-cypress
-		linux-firmware-qcom
 		msm-modem
 	"
 	mkdir "$subpkgdir"

device/testing/device-motorola-lux/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-lux
 pkgdesc="Motorola Moto X Play"
-pkgver=0.2
-pkgrel=7
+pkgver=0.3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="armhf"
+arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-motorola-lux mkbootimg mesa-dri-gallium msm-fb-refresher"
 makedepends="devicepkg-dev"
@@ -20,6 +20,6 @@ package() {
 }
 
 sha512sums="
-55120fadb739a97cedd12572643b2bfa3970ee813ed7a8badb688824bdafc19883b278360e356b857d476b1462f00ea343727418447e9fc9ad65656f4dd929ef  deviceinfo
+dd7b7f9e5cd065f6a569ba27df3e1dafe1ec648d426e60df486217b78d298606381a3656003a09c633a3e34f864535c3a2aed3a59a8548213866c15bd7cfb21f  deviceinfo
 1777c382a73b6e45ee6b4f34b1fd996ad1bae42801dec6de6742f9bf6bf0a0fb5648a7b51ac5b79b7df6d026deca3d4b14a13fae02938e845ed564a9a741c171  initfs-hook.sh
 "

device/testing/device-motorola-lux/deviceinfo

@@ -6,7 +6,7 @@ deviceinfo_name="Motorola Moto X Play"
 deviceinfo_manufacturer="Motorola"
 deviceinfo_codename="motorola-lux"
 deviceinfo_year="2015"
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_chassis="handset"

device/testing/device-sony-sirius/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-sirius
 pkgver=1
-pkgrel=21
+pkgrel=22
 pkgdesc="Sony Xperia Z2 device package"
 url="https://postmarketos.org"
 arch="armv7"
@@ -52,7 +52,7 @@ weston() {
 
 nonfree_firmware() {
 	pkgdesc="Wifi/GPU firmware"
-	depends="linux-firmware-qcom linux-firmware-brcm linux-firmware-cypress firmware-qcom-adreno-a330"
+	depends="linux-firmware-brcm linux-firmware-cypress firmware-qcom-adreno-a330"
 	mkdir "$subpkgdir"
 }
 

device/testing/firmware-qcom-adreno-extra/APKBUILD

-pkgname=firmware-qcom-adreno-extra
-pkgver=2
-pkgrel=1
-pkgdesc="Extra Qualcomm Adreno GPU firmware from TheMuppets"
-url="https://github.com/TheMuppets/proprietary_vendor_sony"
-arch="armhf aarch64 armv7"
-license="proprietary"
-options="!check !archcheck !strip !spdx !tracedeps pmb:cross-native"
-replaces="firmware-adreno"
-
-# Sources
-_files1="a225_pm4.fw a225_pfp.fw a225p5_pm4.fw a330_pfp.fw a330_pm4.fw"
-_files2="a420_pfp.fw a420_pm4.fw"
-_commit="bf15795df1d1dcd61d37f6215c1eda47e669d54e"
-_url1="https://github.com/TheMuppets/proprietary_vendor_sony/raw/$_commit/shinano-common/proprietary/etc/firmware"
-_url2="https://github.com/TheMuppets/proprietary_vendor_sony/raw/$_commit/ivy/proprietary/etc/firmware"
-for _i in $_files1; do
-	source="$source $pkgname-$_commit-$_i::$_url1/$_i";
-done
-for _i in $_files2; do
-	source="$source $pkgname-$_commit-$_i::$_url2/$_i";
-done
-
-_gpus="a225 a330 a420"
-for gpu in $_gpus; do
-	subpackages="$subpackages firmware-qcom-adreno-$gpu:_gpu"
-done
-
-package() {
-	for _i in $_files1 $_files2; do
-		install -Dm644 "$srcdir/$pkgname-$_commit-$_i" \
-			"$pkgdir/lib/firmware/qcom/$_i"
-	done
-}
-
-_gpu() {
-	local gpu=${subpkgname##firmware-qcom-adreno-}
-	pkgdesc="$pkgdesc ($gpu)"
-
-	amove lib/firmware/qcom/$gpu*
-}
-
-sha512sums="
-b278ea24a84036f24f3fa583e63b2c1236312d8b163398d874367ffc91b4652ceb0b3ce5dd2097748dd2083ea1222c0f9413efcc5b72553da3ef753f5910f24a  firmware-qcom-adreno-extra-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a225_pm4.fw
-d127fdca476233fca6e6e59e62bced8563663bac65de30a81eb1912f182cd27fdf8726085e65820c4c26c389daa1ffef9792a598c7b7568f277e781b5e775d5f  firmware-qcom-adreno-extra-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a225_pfp.fw
-339a632a554a8c6e7fd1ff1465c3c985417f9e199e6934a5b149862245566f0c7171c924fc0a7a0d96bc6c5c5efd3c86dd0252d7064f7fee8ac502be8fc977f0  firmware-qcom-adreno-extra-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a225p5_pm4.fw
-a642584990333d62ba6a985eeaddc6898c37a8e80aabb61121f93a90d5076861eb698422101e7b00706b7d3dfc00f9f358ea5e44a70fda7369931eb58b455931  firmware-qcom-adreno-extra-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a330_pfp.fw
-999e3e0777b8dffc0e0d20b214c8217dab577a31753b6a29af2fae57293693196e992a905265e35a586a7978c04547aa8c88496dbe6f836b74ed39026eaa5f05  firmware-qcom-adreno-extra-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a330_pm4.fw
-dc6c1ce867f31a3e04a299b380c5625a7acf55fbf93c3f1b7097fe5e518b1649996d902f528c0e45859bfb436044401ddeebb70266da58d4ef7eacab926702b9  firmware-qcom-adreno-extra-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a420_pfp.fw
-7e7bc1fb80445de09b0eaaef0f49d1c817c91cbbcc031e0ee94e17a36945321c3ee2c8b1766e54e9de28de2f89e09ba3e4a2aee202aed2199afce879b3e343b8  firmware-qcom-adreno-extra-bf15795df1d1dcd61d37f6215c1eda47e669d54e-a420_pm4.fw
-"

device/testing/linux-kobo-clara-mainline/APKBUILD

+# Maintainer: Andreas Kemnade <andreas@kemnade.info>
 # Kernel config based on: arch/arm/configs/kobo_defconfig
 
 pkgname=linux-kobo-clara-mainline
-pkgver=5.16.0
+pkgver=5.17.9
 pkgrel=0
 pkgdesc="Kobo Clara HD kernel fork, close to mainline"
 arch="armv7"
@@ -27,9 +28,9 @@ makedepends="
 
 # Source
 _repository="linux"
-_commit="9be9fd52253701860b03e0d31557021943d7e0a0"
+_commit="ed1f542d165b9d01e09497cb5583549972529aef"
 _rtl8189fs_repository="rtl8189ES_linux"
-_rtl8189fs_commit="3129a665f835ce0342f9a85a0ce14a556e656b8c"
+_rtl8189fs_commit="71500c28164369800041d1716ac513457179ce93"
 _config="config-$_flavor.$arch"
 source="
 	$pkgname-$_commit.tar.gz::https://github.com/akemnade/$_repository/archive/$_commit.tar.gz
@@ -66,7 +67,7 @@ package() {
 }
 
 sha512sums="
-8b171751da8c6b228cfeda9ffa77742fbeb70a588c9d22856e097431571e0b6b6737040c15d0849125bafc0cca600a934b0cf9cee36515d840b5d4c5665771ce  linux-kobo-clara-mainline-9be9fd52253701860b03e0d31557021943d7e0a0.tar.gz
-ef45b210ccd9ebb59552561a40bf37f0ef65c6d23c85ddefa1287c79bbea5fd0be9571e850b8980d8d4198a2076b75d9683c6620582a08b79564bec6639b2857  rtl8189ES_linux-3129a665f835ce0342f9a85a0ce14a556e656b8c.tar.gz
-e60b676f69e77102f21b9b6322f545da24556664f9cb3cb914e5f0e53d4efa817da8830c274c89ebc15fa5aad4e7fe11b91cad4837f56d1d28405dfbc185753a  config-kobo-clara-mainline.armv7
+412fd300adace68f28f0e7cd2a709d798d65a3178a11666e5302f4017119cc94bc87b80045e511f2500b33eb425751e61f8ec1489df5334ebd24b05e9ff1cb3e  linux-kobo-clara-mainline-ed1f542d165b9d01e09497cb5583549972529aef.tar.gz
+d147907ec2e2258963fd97fa00be674211800576741e6631d778c1ba72f572fb2ed421a320a15950c55f73e99a0687fe5b0113a7a27a77dcbbfa2b129f7fbfa9  rtl8189ES_linux-71500c28164369800041d1716ac513457179ce93.tar.gz
+8fbc974ad17775dd5e6c69b4fc828cd0d7ad8d10620a3814c290e230ccb49677b62591cfe6a4c51a89f208cb6d4846d62b92fac93062d0f0c2354eebe1623662  config-kobo-clara-mainline.armv7
 "

device/testing/linux-motorola-lux/APKBUILD

@@ -3,9 +3,9 @@
 
 pkgname=linux-motorola-lux
 pkgver=3.10.49
-pkgrel=3
+pkgrel=4
 pkgdesc="Motorola Moto X Play kernel fork"
-arch="armhf"
+arch="armv7"
 _carch="arm"
 _flavor="motorola-lux"
 url="https://kernel.org"
@@ -49,9 +49,11 @@ package() {
 		"$pkgdir/boot/dt.img"
 }
 
-sha512sums="eb22bf2f84cdac011563c5d92e38e1b5b25f5247fd8aa658175518846a44841c8c30d7d7279c92400cd0e7e2cb48100c79815361851f9081224d1d1d63f45e38  linux-motorola-lux-d86037d30519f2e1f26af75bdcf11a74d08dfed4.tar.gz
-ac927cf8811b705ed9c7405ea68d2415b8150abd7f23e460359abaccd4311d3ad2472c38b6030a8c1513e14c0be56bc8e3257c21fabb3eef6736a8a72790f90e  config-motorola-lux.armhf
+sha512sums="
+eb22bf2f84cdac011563c5d92e38e1b5b25f5247fd8aa658175518846a44841c8c30d7d7279c92400cd0e7e2cb48100c79815361851f9081224d1d1d63f45e38  linux-motorola-lux-d86037d30519f2e1f26af75bdcf11a74d08dfed4.tar.gz
+ac927cf8811b705ed9c7405ea68d2415b8150abd7f23e460359abaccd4311d3ad2472c38b6030a8c1513e14c0be56bc8e3257c21fabb3eef6736a8a72790f90e  config-motorola-lux.armv7
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
-ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c  kernel-use-the-gnu89-standard-explicitly.patch"
+ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c  kernel-use-the-gnu89-standard-explicitly.patch
+"

main/gcc4/1001-fix-reload1-compile-error.patch

+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);
+     }
+ 

main/gcc4/APKBUILD

 pkgname=gcc4
 pkgver=9999
 _pkgver=4.9.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Old GCC for old vendor kernels (C compiler only)"
 url="http://gcc.gnu.org"
 arch="all"
@@ -192,6 +192,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
@@ -412,7 +414,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
@@ -460,4 +463,6 @@ b37195a126476775e2ef16e0adc9173664c514339fb319f628debd8a4133fa53e022278387c68fc2
 83a0996a48096032bcc674a6d28524f1cd2d81837621ebe4c15b5aedbd551c77ce5576b6307adb673ef0e4ac0431d935ad6a427edca2af5c21b6be9176bfaddb  vanilla.specs
 e4d38905527c500c61c421d782a8ac6ef2b034b15fd81d868486ac330a70922937d3c47e0684e9f3250744569b56a8df199499a4a5c107a6d544dca84458dc12  hardenednossp.specs
 b56f7c308c5aefd0cfc647abd75939508a6640c53fce7c19da7c7d8ef4405d29b0d88800117fc7ff8d0022b035d511fb6d478e745bb2ed12a1b63f9f8cf3e168  hardenednopie.specs
-f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a  hardenednopiessp.specs"
+f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a  hardenednopiessp.specs
+6f3d708269cc3f1d28ad9af8cd1206753b7d4ddde6589c303ce201d34b531f1abb73a14032a7f8e16c5ec3041e0c227b3451c09b1952a58893a64a2765d12a00  1001-fix-reload1-compile-error.patch
+"

main/gcc6/0015-fix-error_p-null-error.patch

+This fixes
+
+/wrkdirs/usr/ports/lang/gcc7/work/gcc-7.5.0/gcc/config/i386/i386.c:9631:8: error: cannot initialize a variable of type 'bool' with an rvalue of type 'nullptr_t'
+  bool error_p = NULL;
+       ^         ~~~~
+
+and comes from upstream as part of
+
+  commit 9f36390d429502f0a0dee20bda5b4870da948f6a
+  Author: Uros Bizjak <ubizjak@gmail.com>
+  Date:   Sat May 6 09:01:51 2017 +0200
+
+  i386.c (ext_80387_constant_init): Do not explicitly initialize to zero.
+   
+	* config/i386/i386.c (ext_80387_constant_init): Do not explicitly
+	initialize to zero.
+	(init_regs): Remove declaration.
+        (function_arg_advance_32): Initialize error_p as boolean variable.
+
+--- a/gcc/config/i386/i386.c	2019-11-01 20:30:26 UTC
++++ b/gcc/config/i386/i386.c	2019-11-01 20:30:26 UTC
+@@ -9628,7 +9628,7 @@ function_arg_advance_32 (CUMULATIVE_ARGS *cum, machine
+ 			 HOST_WIDE_INT words)
+ {
+   int res = 0;
+-  bool error_p = NULL;
++  bool error_p = false;
+ 
+   if (TARGET_IAMCU)
+     {