Merge tag 'uml-for-linus-6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux

torvalds · torvalds · commit 411eb0141085 · 2023-04-10T13:13:33.000-07:00
Pull UML fix from Richard Weinberger:

 - Build regression fix for older gcc versions

* tag 'uml-for-linus-6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux:
  um: Only disable SSE on clang to work around old GCC bugs
diff --git a/arch/x86/Makefile.um b/arch/x86/Makefile.um
@@ -3,9 +3,14 @@ core-y += arch/x86/crypto/
 
 #
 # Disable SSE and other FP/SIMD instructions to match normal x86
+# This is required to work around issues in older LLVM versions, but breaks
+# GCC versions < 11. See:
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99652
 #
+ifeq ($(CONFIG_CC_IS_CLANG),y)
 KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx
 KBUILD_RUSTFLAGS += -Ctarget-feature=-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2
+endif
 
 ifeq ($(CONFIG_X86_32),y)
 START := 0x8048000

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,14 @@ core-y += arch/x86/crypto/`
`3`	`3`
`4`	`4`	`#`
`5`	`5`	`# Disable SSE and other FP/SIMD instructions to match normal x86`
	`6`	`+# This is required to work around issues in older LLVM versions, but breaks`
	`7`	`+# GCC versions < 11. See:`
	`8`	`+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99652`
`6`	`9`	`#`
	`10`	`+ifeq ($(CONFIG_CC_IS_CLANG),y)`
`7`	`11`	`KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx`
`8`	`12`	`KBUILD_RUSTFLAGS += -Ctarget-feature=-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2`
	`13`	`+endif`
`9`	`14`
`10`	`15`	`ifeq ($(CONFIG_X86_32),y)`
`11`	`16`	`START := 0x8048000`