aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-04-10 13:13:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2023-04-10 13:13:33 -0700
commit411eb014108594d160a20381e8738de6c62e2e5b (patch)
tree39b65f481ffda186aeafd6bcd1c11c5e6bf8bcec
parent09a9639e56c01c7a00d6c0ca63f4c7c41abe075d (diff)
parenta3046a618a284579d1189af8711765f553eed707 (diff)
downloadnvme-411eb014108594d160a20381e8738de6c62e2e5b.tar.gz
Merge tag 'uml-for-linus-6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux
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
-rw-r--r--arch/x86/Makefile.um5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/Makefile.um b/arch/x86/Makefile.um
index b70559b821df80..2106a2bd152bfa 100644
--- 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