Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:5.14 commit in: /
Date: Fri, 17 Sep 2021 12:48:45
Message-Id: 1631882896.85d76d624355214078ba879920b222f449b5c858.mpagano@gentoo
1 commit: 85d76d624355214078ba879920b222f449b5c858
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 17 12:48:16 2021 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 17 12:48:16 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=85d76d62
7
8 Add correct CPU OPT Patch
9
10 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
11
12 5010_enable-cpu-optimizations-universal.patch | 158 +++++++++++++-------------
13 1 file changed, 82 insertions(+), 76 deletions(-)
14
15 diff --git a/5010_enable-cpu-optimizations-universal.patch b/5010_enable-cpu-optimizations-universal.patch
16 index b9e8ebb..d437e1a 100644
17 --- a/5010_enable-cpu-optimizations-universal.patch
18 +++ b/5010_enable-cpu-optimizations-universal.patch
19 @@ -1,7 +1,7 @@
20 -From d31d2b0747ab55e65c2366d51149a0ec9896155e Mon Sep 17 00:00:00 2001
21 +From 4af44fbc97bc51eb742f0d6555bde23cf580d4e3 Mon Sep 17 00:00:00 2001
22 From: graysky <graysky@×××××××××.us>
23 -Date: Tue, 14 Sep 2021 15:35:34 -0400
24 -Subject: [PATCH] more uarches for kernel 5.15+
25 +Date: Sun, 6 Jun 2021 09:41:36 -0400
26 +Subject: [PATCH] more uarches for kernel 5.8-5.14
27 MIME-Version: 1.0
28 Content-Type: text/plain; charset=UTF-8
29 Content-Transfer-Encoding: 8bit
30 @@ -86,7 +86,7 @@ See the following experimental evidence supporting this statement:
31 https://github.com/graysky2/kernel_gcc_patch
32
33 REQUIREMENTS
34 -linux version >=5.15
35 +linux version 5.8-5.14
36 gcc version >=9.0 or clang version >=9.0
37
38 ACKNOWLEDGMENTS
39 @@ -102,17 +102,17 @@ REFERENCES
40 Signed-off-by: graysky <graysky@×××××××××.us>
41 ---
42 arch/x86/Kconfig.cpu | 332 ++++++++++++++++++++++++++++++--
43 - arch/x86/Makefile | 40 +++-
44 + arch/x86/Makefile | 47 ++++-
45 arch/x86/include/asm/vermagic.h | 66 +++++++
46 - 3 files changed, 424 insertions(+), 14 deletions(-)
47 + 3 files changed, 428 insertions(+), 17 deletions(-)
48
49 diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
50 -index 814fe0d349b0..61f0d7757499 100644
51 +index 814fe0d349b0..8acf6519d279 100644
52 --- a/arch/x86/Kconfig.cpu
53 +++ b/arch/x86/Kconfig.cpu
54 @@ -157,7 +157,7 @@ config MPENTIUM4
55 -
56 -
57 +
58 +
59 config MK6
60 - bool "K6/K6-II/K6-III"
61 + bool "AMD K6/K6-II/K6-III"
62 @@ -121,7 +121,7 @@ index 814fe0d349b0..61f0d7757499 100644
63 Select this for an AMD K6-family processor. Enables use of
64 @@ -165,7 +165,7 @@ config MK6
65 flags to GCC.
66 -
67 +
68 config MK7
69 - bool "Athlon/Duron/K7"
70 + bool "AMD Athlon/Duron/K7"
71 @@ -130,7 +130,7 @@ index 814fe0d349b0..61f0d7757499 100644
72 Select this for an AMD Athlon K7-family processor. Enables use of
73 @@ -173,12 +173,98 @@ config MK7
74 flags to GCC.
75 -
76 +
77 config MK8
78 - bool "Opteron/Athlon64/Hammer/K8"
79 + bool "AMD Opteron/Athlon64/Hammer/K8"
80 @@ -138,7 +138,7 @@ index 814fe0d349b0..61f0d7757499 100644
81 Select this for an AMD Opteron or Athlon64 Hammer-family processor.
82 Enables use of some extended instructions, and passes appropriate
83 optimization flags to GCC.
84 -
85 +
86 +config MK8SSE3
87 + bool "AMD Opteron/Athlon64/Hammer/K8 with SSE3"
88 + help
89 @@ -230,17 +230,17 @@ index 814fe0d349b0..61f0d7757499 100644
90 depends on X86_32
91 @@ -270,7 +356,7 @@ config MPSC
92 in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one.
93 -
94 +
95 config MCORE2
96 - bool "Core 2/newer Xeon"
97 + bool "Intel Core 2"
98 help
99 -
100 +
101 Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and
102 @@ -278,6 +364,8 @@ config MCORE2
103 family in /proc/cpuinfo. Newer ones have 6 and older ones 15
104 (not a typo)
105 -
106 +
107 + Enables -march=core2
108 +
109 config MATOM
110 @@ -249,7 +249,7 @@ index 814fe0d349b0..61f0d7757499 100644
111 @@ -287,6 +375,182 @@ config MATOM
112 accordingly optimized code. Use a recent GCC with specific Atom
113 support in order to fully benefit from selecting this option.
114 -
115 +
116 +config MNEHALEM
117 + bool "Intel Nehalem"
118 + select X86_P6_NOP
119 @@ -432,7 +432,7 @@ index 814fe0d349b0..61f0d7757499 100644
120 @@ -294,6 +558,50 @@ config GENERIC_CPU
121 Generic x86-64 CPU.
122 Run equally well on all x86-64 CPUs.
123 -
124 +
125 +config GENERIC_CPU2
126 + bool "Generic-x86-64-v2"
127 + depends on (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
128 @@ -478,7 +478,7 @@ index 814fe0d349b0..61f0d7757499 100644
129 + Enables -march=native
130 +
131 endchoice
132 -
133 +
134 config X86_GENERIC
135 @@ -318,7 +626,7 @@ config X86_INTERNODE_CACHE_SHIFT
136 config X86_L1_CACHE_SHIFT
137 @@ -488,19 +488,19 @@ index 814fe0d349b0..61f0d7757499 100644
138 + default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MNATIVE_INTEL || MNATIVE_AMD || X86_GENERIC || GENERIC_CPU || GENERIC_CPU2 || GENERIC_CPU3 || GENERIC_CPU4
139 default "4" if MELAN || M486SX || M486 || MGEODEGX1
140 default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
141 -
142 +
143 @@ -336,11 +644,11 @@ config X86_ALIGNMENT_16
144 -
145 +
146 config X86_INTEL_USERCOPY
147 def_bool y
148 - depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2
149 + depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MNATIVE_INTEL
150 -
151 +
152 config X86_USE_PPRO_CHECKSUM
153 def_bool y
154 - depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MATOM
155 + depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MATOM || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MNATIVE_INTEL || MNATIVE_AMD
156 -
157 +
158 config X86_USE_3DNOW
159 def_bool y
160 @@ -360,26 +668,26 @@ config X86_USE_3DNOW
161 @@ -509,24 +509,24 @@ index 814fe0d349b0..61f0d7757499 100644
162 depends on X86_64
163 - depends on (MCORE2 || MPENTIUM4 || MPSC)
164 + depends on (MCORE2 || MPENTIUM4 || MPSC || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MNATIVE_INTEL)
165 -
166 +
167 config X86_TSC
168 def_bool y
169 - depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MATOM) || X86_64
170 + depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MATOM || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MNATIVE_INTEL || MNATIVE_AMD) || X86_64
171 -
172 +
173 config X86_CMPXCHG64
174 def_bool y
175 - depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586TSC || M586MMX || MATOM || MGEODE_LX || MGEODEGX1 || MK6 || MK7 || MK8
176 + depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586TSC || M586MMX || MATOM || MGEODE_LX || MGEODEGX1 || MK6 || MK7 || MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MNATIVE_INTEL || MNATIVE_AMD
177 -
178 +
179 # this should be set for all -march=.. options where the compiler
180 # generates cmov.
181 config X86_CMOV
182 def_bool y
183 - depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
184 + depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MNATIVE_INTEL || MNATIVE_AMD)
185 -
186 +
187 config X86_MINIMUM_CPU_FAMILY
188 int
189 default "64" if X86_64
190 @@ -534,58 +534,65 @@ index 814fe0d349b0..61f0d7757499 100644
191 + default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MCRUSOE || MCORE2 || MK7 || MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MNATIVE_INTEL || MNATIVE_AMD)
192 default "5" if X86_32 && X86_CMPXCHG64
193 default "4"
194 -
195 +
196 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
197 -index 7488cfbbd2f6..01876b6fb8e1 100644
198 +index 78faf9c7e3ae..ee0cd507af8b 100644
199 --- a/arch/x86/Makefile
200 +++ b/arch/x86/Makefile
201 -@@ -119,8 +119,44 @@ else
202 +@@ -114,11 +114,48 @@ else
203 # FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu)
204 - cflags-$(CONFIG_MK8) += -march=k8
205 - cflags-$(CONFIG_MPSC) += -march=nocona
206 -- cflags-$(CONFIG_MCORE2) += -march=core2
207 -- cflags-$(CONFIG_MATOM) += -march=atom
208 -+ cflags-$(CONFIG_MK8SSE3) += -march=k8-sse3
209 -+ cflags-$(CONFIG_MK10) += -march=amdfam10
210 -+ cflags-$(CONFIG_MBARCELONA) += -march=barcelona
211 -+ cflags-$(CONFIG_MBOBCAT) += -march=btver1
212 -+ cflags-$(CONFIG_MJAGUAR) += -march=btver2
213 -+ cflags-$(CONFIG_MBULLDOZER) += -march=bdver1
214 -+ cflags-$(CONFIG_MPILEDRIVER) += -march=bdver2
215 -+ cflags-$(CONFIG_MSTEAMROLLER) += -march=bdver3
216 -+ cflags-$(CONFIG_MEXCAVATOR) += -march=bdver4
217 -+ cflags-$(CONFIG_MZEN) += -march=znver1
218 -+ cflags-$(CONFIG_MZEN2) += -march=znver2
219 -+ cflags-$(CONFIG_MZEN3) += -march=znver3
220 -+ cflags-$(CONFIG_MNATIVE_INTEL) += -march=native
221 -+ cflags-$(CONFIG_MNATIVE_AMD) += -march=native
222 -+ cflags-$(CONFIG_MATOM) += -march=bonnell
223 -+ cflags-$(CONFIG_MCORE2) += -march=core2
224 -+ cflags-$(CONFIG_MNEHALEM) += -march=nehalem
225 -+ cflags-$(CONFIG_MWESTMERE) += -march=westmere
226 -+ cflags-$(CONFIG_MSILVERMONT) += -march=silvermont
227 -+ cflags-$(CONFIG_MGOLDMONT) += -march=goldmont
228 -+ cflags-$(CONFIG_MGOLDMONTPLUS) += -march=goldmont-plus
229 -+ cflags-$(CONFIG_MSANDYBRIDGE) += -march=sandybridge
230 -+ cflags-$(CONFIG_MIVYBRIDGE) += -march=ivybridge
231 -+ cflags-$(CONFIG_MHASWELL) += -march=haswell
232 -+ cflags-$(CONFIG_MBROADWELL) += -march=broadwell
233 -+ cflags-$(CONFIG_MSKYLAKE) += -march=skylake
234 -+ cflags-$(CONFIG_MSKYLAKEX) += -march=skylake-avx512
235 -+ cflags-$(CONFIG_MCANNONLAKE) += -march=cannonlake
236 -+ cflags-$(CONFIG_MICELAKE) += -march=icelake-client
237 -+ cflags-$(CONFIG_MCASCADELAKE) += -march=cascadelake
238 -+ cflags-$(CONFIG_MCOOPERLAKE) += -march=cooperlake
239 -+ cflags-$(CONFIG_MTIGERLAKE) += -march=tigerlake
240 -+ cflags-$(CONFIG_MSAPPHIRERAPIDS) += -march=sapphirerapids
241 -+ cflags-$(CONFIG_MROCKETLAKE) += -march=rocketlake
242 -+ cflags-$(CONFIG_MALDERLAKE) += -march=alderlake
243 -+ cflags-$(CONFIG_GENERIC_CPU2) += -march=x86-64-v2
244 -+ cflags-$(CONFIG_GENERIC_CPU3) += -march=x86-64-v3
245 -+ cflags-$(CONFIG_GENERIC_CPU4) += -march=x86-64-v4
246 - cflags-$(CONFIG_GENERIC_CPU) += -mtune=generic
247 + cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)
248 + cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)
249 +-
250 +- cflags-$(CONFIG_MCORE2) += \
251 +- $(call cc-option,-march=core2,$(call cc-option,-mtune=generic))
252 +- cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom) \
253 +- $(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
254 ++ cflags-$(CONFIG_MK8SSE3) += $(call cc-option,-march=k8-sse3)
255 ++ cflags-$(CONFIG_MK10) += $(call cc-option,-march=amdfam10)
256 ++ cflags-$(CONFIG_MBARCELONA) += $(call cc-option,-march=barcelona)
257 ++ cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1)
258 ++ cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2)
259 ++ cflags-$(CONFIG_MBULLDOZER) += $(call cc-option,-march=bdver1)
260 ++ cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2)
261 ++ cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-mno-tbm)
262 ++ cflags-$(CONFIG_MSTEAMROLLER) += $(call cc-option,-march=bdver3)
263 ++ cflags-$(CONFIG_MSTEAMROLLER) += $(call cc-option,-mno-tbm)
264 ++ cflags-$(CONFIG_MEXCAVATOR) += $(call cc-option,-march=bdver4)
265 ++ cflags-$(CONFIG_MEXCAVATOR) += $(call cc-option,-mno-tbm)
266 ++ cflags-$(CONFIG_MZEN) += $(call cc-option,-march=znver1)
267 ++ cflags-$(CONFIG_MZEN2) += $(call cc-option,-march=znver2)
268 ++ cflags-$(CONFIG_MZEN3) += $(call cc-option,-march=znver3)
269 ++
270 ++ cflags-$(CONFIG_MNATIVE_INTEL) += $(call cc-option,-march=native)
271 ++ cflags-$(CONFIG_MNATIVE_AMD) += $(call cc-option,-march=native)
272 ++ cflags-$(CONFIG_MATOM) += $(call cc-option,-march=bonnell)
273 ++ cflags-$(CONFIG_MCORE2) += $(call cc-option,-march=core2)
274 ++ cflags-$(CONFIG_MNEHALEM) += $(call cc-option,-march=nehalem)
275 ++ cflags-$(CONFIG_MWESTMERE) += $(call cc-option,-march=westmere)
276 ++ cflags-$(CONFIG_MSILVERMONT) += $(call cc-option,-march=silvermont)
277 ++ cflags-$(CONFIG_MGOLDMONT) += $(call cc-option,-march=goldmont)
278 ++ cflags-$(CONFIG_MGOLDMONTPLUS) += $(call cc-option,-march=goldmont-plus)
279 ++ cflags-$(CONFIG_MSANDYBRIDGE) += $(call cc-option,-march=sandybridge)
280 ++ cflags-$(CONFIG_MIVYBRIDGE) += $(call cc-option,-march=ivybridge)
281 ++ cflags-$(CONFIG_MHASWELL) += $(call cc-option,-march=haswell)
282 ++ cflags-$(CONFIG_MBROADWELL) += $(call cc-option,-march=broadwell)
283 ++ cflags-$(CONFIG_MSKYLAKE) += $(call cc-option,-march=skylake)
284 ++ cflags-$(CONFIG_MSKYLAKEX) += $(call cc-option,-march=skylake-avx512)
285 ++ cflags-$(CONFIG_MCANNONLAKE) += $(call cc-option,-march=cannonlake)
286 ++ cflags-$(CONFIG_MICELAKE) += $(call cc-option,-march=icelake-client)
287 ++ cflags-$(CONFIG_MCASCADELAKE) += $(call cc-option,-march=cascadelake)
288 ++ cflags-$(CONFIG_MCOOPERLAKE) += $(call cc-option,-march=cooperlake)
289 ++ cflags-$(CONFIG_MTIGERLAKE) += $(call cc-option,-march=tigerlake)
290 ++ cflags-$(CONFIG_MSAPPHIRERAPIDS) += $(call cc-option,-march=sapphirerapids)
291 ++ cflags-$(CONFIG_MROCKETLAKE) += $(call cc-option,-march=rocketlake)
292 ++ cflags-$(CONFIG_MALDERLAKE) += $(call cc-option,-march=alderlake)
293 ++ cflags-$(CONFIG_GENERIC_CPU2) += $(call cc-option,-march=x86-64-v2)
294 ++ cflags-$(CONFIG_GENERIC_CPU3) += $(call cc-option,-march=x86-64-v3)
295 ++ cflags-$(CONFIG_GENERIC_CPU4) += $(call cc-option,-march=x86-64-v4)
296 + cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)
297 KBUILD_CFLAGS += $(cflags-y)
298 -
299 +
300 diff --git a/arch/x86/include/asm/vermagic.h b/arch/x86/include/asm/vermagic.h
301 index 75884d2cdec3..4e6a08d4c7e5 100644
302 --- a/arch/x86/include/asm/vermagic.h
303 @@ -670,7 +677,6 @@ index 75884d2cdec3..4e6a08d4c7e5 100644
304 #elif defined CONFIG_MELAN
305 #define MODULE_PROC_FAMILY "ELAN "
306 #elif defined CONFIG_MCRUSOE
307 ---
308 -2.33.0
309 -
310 +--
311 +2.31.1