From 0cd74f3c9084eac17b3168907d0783707c1308f7 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Tue, 6 Feb 2024 19:24:31 +0100
Subject: core/binutils: disable CET on all subarchs

---
 core/binutils/PKGBUILD | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

(limited to 'core/binutils')

diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index c1110778..f4694854 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -32,29 +32,13 @@ eval "$(
     '
 )"
 
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # disable CET (Control Flow instructions endbr32/enbr64)
-  eval "$(
-    declare -f build | \
-      sed '
-        s/--enable-cet/--enable-cet=no/
-      '
-  )"
-else
-  # explicitely enable CET (Control Flow instructions endbr32/enbr64)
-  # avoid "corrupt GNU_PROPERTY_TYPE (5) size: 0" warnings,
-  # see:
-  # https://bbs.archlinux32.org/viewtopic.php?pid=6160#p6160
-  # https://bugs.archlinux32.org/index.php?do=details&task_id=82
-  #
-  eval "$(
-    declare -f build | \
-      sed '
-        s/--enable-cet/--enable-cet=yes/
-      '
-  )"
-fi
+# disable CET on all subarchs (Control Flow instructions endbr32/enbr64)
+eval "$(
+  declare -f build | \
+    sed '
+      s/--enable-cet/--enable-cet=no/
+    '
+)"
 
 # i486-specific: disable PGO/LTO build, uses too much resources,
 # also disabling LTO for now, also disabling the gold linker
-- 
cgit v1.2.3-70-g09d2