From 1f7ebbc3a8e419a46d4f5de68e2d3a2a6e3c7bbe Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 25 May 2019 16:10:15 -0700
Subject: Updated to 5.0.18.a Reorganized patches

---
 PKGBUILD                     | 19 +++++++++++--------
 bdver2-fix-for-graysky.patch | 11 -----------
 graysky_bdver2-hotfix.patch  | 11 +++++++++++
 3 files changed, 22 insertions(+), 19 deletions(-)
 delete mode 100644 bdver2-fix-for-graysky.patch
 create mode 100644 graysky_bdver2-hotfix.patch

diff --git a/PKGBUILD b/PKGBUILD
index e80a79e..7192d22 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,8 @@
 
 # # I maintain this because:
 # Parabola version patch script does not apply consistently
-# Parabola version lacks ath9k, bdver2, greysky2, and raid6 patches
+# Parabola version lacks graysky gcc patch with bdver2 fix
+# Parabola version lacks ath9k regdom and raid6 algo patches
 # Parabola version allows SEED, SM3, SM4, and Streebog
 # Parabola version is 300 Hz
 # Parabola version supports Intel ME
@@ -39,8 +40,8 @@ source=(
         https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/linux-libre-${_gnumajver}.tar.xz{,.sign}
         https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnupkgver}/patch-${_gnumajver}-${_gnupkgver}.xz{,.sign}
         https://github.com/anthraxx/linux-hardened/releases/download/${pkgver}/linux-hardened-${pkgver}.patch{,.sig}
+        graysky_bdver2-hotfix.patch
         enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz
-        bdver2-fix-for-graysky.patch
         ath9k-regdom-hack.patch
         raid6-default-algo.patch
         config.x86_64  # the main kernel config files
@@ -54,8 +55,8 @@ sha256sums=('7df5025d1960520bfea158054130467770eca379999d5ac48175ed5ee804faa1'
             'SKIP'
             'e9c0b0d389c166ea6f2c0e5d526d294a5fa39ddc04a6733c2aa2fd5c60962269'
             'SKIP'
+            '229e063a578db0a278108f37b24da20c2a2a18d825e98a67e426cb0f4b492e4a'
             '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'
-            'd35338c92d0dbf27ffedaf100bd852dd13fd9b5d49b12a10b91194a2ae654447'
             'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503'
             '0f81d6e4158b7beeb0eb514f1b9401f7e23699cb0f7b0d513e25dae1815daaeb'
             'e379fcaeb0ea7f51a3a26b558b539df69adc7df327fc79f1dc9e829ac100b483'
@@ -85,14 +86,16 @@ prepare() {
   # linux hardened patch
   msg2 "Applying hardened patch"
   patch -Np1 < ../linux-hardened-${pkgver}.patch
+  
 
-  # graysky2 gcc patch
-  msg2 "Applying graysky2 cpu patch"
+  # graysky gcc hotfixes
+  msg2 "Applying graysky gcc patch hotfixes"
+  patch -p1 -i ../graysky_bdver2-hotfix.patch "$srcdir/kernel_gcc_patch-${_gcc_more_v}/enable_additional_cpu_optimizations_for_gcc_v8.1+_kernel_v4.13+.patch"
+
+  # graysky gcc patch
+  msg2 "Applying graysky cpu patch"
   patch -p1 -i ../kernel_gcc_patch-${_gcc_more_v}/enable_additional_cpu_optimizations_for_gcc_v8.1+_kernel_v4.13+.patch
 
-  # Fix stack warnings and ldconfig segfaults on bdver2 with graysky2 gcc patch
-  msg2 "Applying bdver2 fix for graysky2 cpu patch"
-  patch -p1 -i ../bdver2-fix-for-graysky.patch
 
   # Ignore ath9k eeprom patch
   msg2 "Applying ath9k patch"
diff --git a/bdver2-fix-for-graysky.patch b/bdver2-fix-for-graysky.patch
deleted file mode 100644
index b7e5402..0000000
--- a/bdver2-fix-for-graysky.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/x86/Makefile
-+++ b/arch/x86/Makefile
-@@ -492,7 +492,7 @@
-         cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1)
-         cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2)
-         cflags-$(CONFIG_MBULLDOZER) += $(call cc-option,-march=bdver1)
--        cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2)
-+        cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2) $(call cc-option,-mno-tbm)
-         cflags-$(CONFIG_MSTEAMROLLER) += $(call cc-option,-march=bdver3)
-         cflags-$(CONFIG_MEXCAVATOR) += $(call cc-option,-march=bdver4)
-         cflags-$(CONFIG_MZEN) += $(call cc-option,-march=znver1)
diff --git a/graysky_bdver2-hotfix.patch b/graysky_bdver2-hotfix.patch
new file mode 100644
index 0000000..5cd9dbc
--- /dev/null
+++ b/graysky_bdver2-hotfix.patch
@@ -0,0 +1,11 @@
+--- a/kernel_gcc_patch-20180509/enable_additional_cpu_optimizations_for_gcc_v8.1+_kernel_v4.13+.patch
++++ b/kernel_gcc_patch-20180509/enable_additional_cpu_optimizations_for_gcc_v8.1+_kernel_v4.13+.patch
+@@ -492,7 +492,7 @@   +        cflags-$(CONFIG_MBARCELONA) += $(call cc-option,-march=barcelona)
+ +        cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1)
+ +        cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2)
+ +        cflags-$(CONFIG_MBULLDOZER) += $(call cc-option,-march=bdver1)
+-+        cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2)
+++        cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2) $(call cc-option,-mno-tbm)
+ +        cflags-$(CONFIG_MSTEAMROLLER) += $(call cc-option,-march=bdver3)
+ +        cflags-$(CONFIG_MEXCAVATOR) += $(call cc-option,-march=bdver4)
+ +        cflags-$(CONFIG_MZEN) += $(call cc-option,-march=znver1)
-- 
cgit v1.2.1