---
build_arm_trusted_firmware.sh | 1 +
...arm-trusted-firmware-support-PIE-GCS.patch | 30 +++++++++++++++++++
2 files changed, 31 insertions(+)
create mode 100644 patches/arm-trusted-firmware-support-PIE-GCS.patch
diff --git a/build_arm_trusted_firmware.sh b/build_arm_trusted_firmware.sh
index d223142..0b148ef 100755
--- a/build_arm_trusted_firmware.sh
+++ b/build_arm_trusted_firmware.sh
@@ -18,6 +18,7 @@ clone()
git clone $url --single-branch --branch $version --depth 1 $src
pushd $src
git am
../patches/arm-trusted-firmware-support-FEAT_TCR2-and-FEAT-SCTLR2.patch
+ git am ../patches/arm-trusted-firmware-support-PIE-GCS.patch
popd
fi
ln -s $src arm-trusted-firmware
diff --git a/patches/arm-trusted-firmware-support-PIE-GCS.patch
b/patches/arm-trusted-firmware-support-PIE-GCS.patch
new file mode 100644
index 0000000..132e939
--- /dev/null
+++ b/patches/arm-trusted-firmware-support-PIE-GCS.patch
@@ -0,0 +1,30 @@
+From 0925eadf8922bbe811ec41fb983347928f3bc63b Mon Sep 17 00:00:00 2001
+From: Richard Henderson <[email protected]>
+Date: Thu, 2 Oct 2025 11:43:11 -0700
+Subject: [PATCH] plat/qemu/common/: add support for FEAT_{S1PIE,S2PIE,GCS}
+
+---
+ plat/qemu/common/common.mk | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/plat/qemu/common/common.mk b/plat/qemu/common/common.mk
+index 6bc1084..2c344b6 100644
+--- a/plat/qemu/common/common.mk
++++ b/plat/qemu/common/common.mk
+@@ -126,6 +126,13 @@ ENABLE_FEAT_HCX := 2
+ ENABLE_FEAT_TCR2 := 2
+ ENABLE_FEAT_SCTLR2 := 2
+
++# 8.9
++ENABLE_FEAT_S1PIE := 2
++ENABLE_FEAT_S2PIE := 2
++
++# 9.4
++ENABLE_FEAT_GCS = 2
++
+ # SPM_MM is not compatible with ENABLE_SVE_FOR_NS (build breaks)
+ ifeq (${SPM_MM},1)
+ ENABLE_SVE_FOR_NS := 0
+--
+2.43.0
+
--
2.43.0
