From 89ef6fcef8cc61ebbada9845ed794a67337a6906 Mon Sep 17 00:00:00 2001
From: Newbyte <newbie13xd@gmail.com>
Date: Mon, 28 Nov 2022 22:57:51 +0100
Subject: [PATCH] main/crust: fix build with GCC 12 (MR 3676)

Patch picked from https://github.com/crust-firmware/crust/pull/209

[ci:skip-build]: Already built successfully in CI
---
 main/crust/APKBUILD                    |  7 +++++--
 main/crust/fix-build-with-gcc-12.patch | 29 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 main/crust/fix-build-with-gcc-12.patch

diff --git a/main/crust/APKBUILD b/main/crust/APKBUILD
index f37af9181..c0244b88c 100644
--- a/main/crust/APKBUILD
+++ b/main/crust/APKBUILD
@@ -1,13 +1,15 @@
 # Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=crust
 pkgver=0.5
-pkgrel=0
+pkgrel=1
 pkgdesc="SCP firmware for sunxi SoCs"
 arch="aarch64"
 url="https://github.com/crust-firmware/crust"
 license="BSD-1-Clause AND BSD-3-Clause AND GPL-2.0-only and MIT"
 makedepends="gcc-or1k-elf binutils-or1k-elf dtc bison flex"
-source="crust-v$pkgver.tar.gz::https://github.com/crust-firmware/crust/archive/refs/tags/v$pkgver.tar.gz"
+source="crust-v$pkgver.tar.gz::https://github.com/crust-firmware/crust/archive/refs/tags/v$pkgver.tar.gz
+	fix-build-with-gcc-12.patch
+	"
 options="!check !archcheck !tracedeps pmb:cross-native" # No tests
 
 build() {
@@ -20,4 +22,5 @@ package() {
 }
 sha512sums="
 1a3811053fd3a27285a1377888ab5b36e9363a2f5818f69966eb7f5214e571475a2a7865b9e1b68387940a9a7e9dc3841d2458544c155aecc5b9da041eb946ba  crust-v0.5.tar.gz
+cde7b2ab368533a9902fa67a8f35c012864cdaaa4f38b62715513c67bd9a0591b22a6d7c29961da9e5ea342589a2aac5beec4b84838041f7dfb2d414d6bc4d4b  fix-build-with-gcc-12.patch
 "
diff --git a/main/crust/fix-build-with-gcc-12.patch b/main/crust/fix-build-with-gcc-12.patch
new file mode 100644
index 000000000..f79bd5b86
--- /dev/null
+++ b/main/crust/fix-build-with-gcc-12.patch
@@ -0,0 +1,29 @@
+From 9c5a56c4c162dd18c3db71e770982860f850e5d3 Mon Sep 17 00:00:00 2001
+From: Kayo Phoenix <kayo@illumium.org>
+Date: Sat, 29 Oct 2022 21:30:58 +0500
+Subject: [PATCH] Fix build using GCC 12.x
+
+I have linking error like the following:
+```
+|   LD      .../crust/2022.09.13-r0/build/scp/scp.elf
+| .../crust/2022.09.13-r0/recipe-sysroot-native/usr/bin/../lib/gcc/or1k-none-elf/12.2.0/../../../../or1k-none-elf/bin/ld: warning: .../crust/2022.09.13-r0/build/scp/scp.elf has a LOAD segment with RWX permissions
+| collect2: error: ld returned 1 exit status
+| make: *** [Makefile:197: .../crust/2022.09.13-r0/build/scp/scp.elf] Error 1
+| make: Leaving directory '.../crust/2022.09.13-r0/git'
+```
+---
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile b/Makefile
+index 2f6b707a..d41838c3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -80,6 +80,7 @@ LDFLAGS		 = -nostdlib \
+ 		   -static \
+ 		   -Wl,-O1 \
+ 		   -Wl,--build-id=none \
++		   -Wl,--no-warn-rwx-segments \
+ 		   -Wl,--fatal-warnings \
+ 		   -Wl,--gc-sections \
+ 		   -Wl,--no-dynamic-linker \