From b2b095fcddbef5a555655f2a689d27d40cbf4d42 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 5 Jul 2019 14:06:35 +0200
Subject: core/gcc: fix cet for i686/pentium4 and remove obsolete doxygen patch
 for i486

---
 core/gcc/PKGBUILD | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'core')

diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 95e0af60..b2d6ed81 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -51,27 +51,6 @@ eval "$(
 
 # i486-specific
 
-# disable doxygen documentation
-makedepends=(${makedepends[@]//doxygen/})
-makedepends_i686+=('doxygen')
-
-if [ "${CARCH}" = "i486" ]; then
-  eval "$(
-    declare -f build | \
-      sed '
-        /make.*doc-man-doxygen/d
-      '
-  )"
-
-  eval "$(
-    declare -f package_gcc | \
-      sed '
-        /make.*doc-man-doxygen/d
-        /make.*doc-install-man/d
-      '
-  )"
-fi
-
 # no ADA
 makedepends=(${makedepends[@]//gcc-ada/})
 makedepends_i686+=('gcc-ada')
@@ -116,6 +95,16 @@ if [ "${CARCH}" = "i486" ]; then
       '
   )"
 
+else
+
+  # force enable CET (Control Flow instructions endbr32/enbr64)
+  eval "$(
+    declare -f build | \
+      sed '
+        s/--enable-cet=auto/--enable-cet/
+      '
+  )"
+
 fi
 
 makedepends_pentium4=("${makedepends_i686[@]}")
-- 
cgit v1.2.3