1 files changed, 8 insertions, 18 deletions
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index acadfc94..ca003988 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -88,24 +88,6 @@ if [ "${CARCH}" = "i486" ]; then
       '
   )"
 
-  # disable CET (Control Flow instructions endbr32/enbr64)
-  eval "$(
-    declare -f build | \
-      sed '
-        s/--enable-cet=auto/--disable-cet/
-      '
-  )"
-
-else
-
-  # force enable CET (Control Flow instructions endbr32/enbr64)
-  eval "$(
-    declare -f build | \
-      sed '
-        s/--enable-cet=auto/--enable-cet/
-      '
-  )"
-
 fi
 
 makedepends=(${makedepends[@]//lib32-glibc/})
@@ -133,3 +115,11 @@ fi
 if [ "${CARCH}" = "i486" ]; then
   unset check
 fi
+
+# disable CET on all subarchitectures (Control Flow instructions endbr32/enbr64)
+eval "$(
+  declare -f build | \
+    sed '
+      s/--enable-cet=auto/--disable-cet/
+    '
+)"