add back -mno-tbm try 1

graysky2 · Nov 14, 2021 · af5c6eb · af5c6eb
1 parent b3967a7
commit af5c6eb
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/more-uarches-for-kernel-5.15+.patch b/more-uarches-for-kernel-5.15+.patch
@@ -102,9 +102,9 @@ REFERENCES
 Signed-off-by: graysky <graysky@archlinux.us>
 ---
  arch/x86/Kconfig.cpu            | 332 ++++++++++++++++++++++++++++++--
- arch/x86/Makefile               |  40 +++-
+ arch/x86/Makefile               |  43 ++++-
  arch/x86/include/asm/vermagic.h |  66 +++++++
- 3 files changed, 424 insertions(+), 14 deletions(-)
+ 3 files changed, 427 insertions(+), 14 deletions(-)
 
 diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
 index 814fe0d349b0..61f0d7757499 100644
@@ -536,10 +536,10 @@ index 814fe0d349b0..61f0d7757499 100644
  	default "4"
 
 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
-index 7488cfbbd2f6..01876b6fb8e1 100644
+index 7488cfbbd2f6..72d12beb9031 100644
 --- a/arch/x86/Makefile
 +++ b/arch/x86/Makefile
-@@ -119,8 +119,44 @@ else
+@@ -119,8 +119,47 @@ else
          # FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu)
          cflags-$(CONFIG_MK8)		+= -march=k8
          cflags-$(CONFIG_MPSC)		+= -march=nocona
@@ -552,8 +552,11 @@ index 7488cfbbd2f6..01876b6fb8e1 100644
 +        cflags-$(CONFIG_MJAGUAR) 	+= -march=btver2
 +        cflags-$(CONFIG_MBULLDOZER) 	+= -march=bdver1
 +        cflags-$(CONFIG_MPILEDRIVER)	+= -march=bdver2
++        cflags-$(CONFIG_MPILEDRIVER)	+= $(call cc-option,-mno-tbm)
 +        cflags-$(CONFIG_MSTEAMROLLER) 	+= -march=bdver3
++        cflags-$(CONFIG_MSTEAMROLLER) 	+= $(call cc-option,-mno-tbm)
 +        cflags-$(CONFIG_MEXCAVATOR) 	+= -march=bdver4
++        cflags-$(CONFIG_MEXCAVATOR) 	+= $(call cc-option,-mno-tbm)
 +        cflags-$(CONFIG_MZEN) 		+= -march=znver1
 +        cflags-$(CONFIG_MZEN2) 	+= -march=znver2
 +        cflags-$(CONFIG_MZEN3) 	+= -march=znver3
@@ -671,6 +674,4 @@ index 75884d2cdec3..4e6a08d4c7e5 100644
  #define MODULE_PROC_FAMILY "ELAN "
  #elif defined CONFIG_MCRUSOE
 --
-2.33.0
-
-
+2.33.1