summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/x86/Makefrag.am3
-rw-r--r--arch/x86/configfrag.ac8
2 files changed, 8 insertions, 3 deletions
diff --git a/arch/x86/Makefrag.am b/arch/x86/Makefrag.am
index 7d4415d3..224ca59b 100644
--- a/arch/x86/Makefrag.am
+++ b/arch/x86/Makefrag.am
@@ -10,9 +10,6 @@ AM_CFLAGS += -fno-asynchronous-unwind-tables
# For now, use frame pointers for convenient stack tracing.
AM_CFLAGS += -fno-omit-frame-pointer
-# Never generate instructions that are unhandled in kernel mode.
-AM_CFLAGS += -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-avx
-
x15_LDFLAGS += -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096
if I386
diff --git a/arch/x86/configfrag.ac b/arch/x86/configfrag.ac
index d40a51ab..0ce93e0a 100644
--- a/arch/x86/configfrag.ac
+++ b/arch/x86/configfrag.ac
@@ -39,6 +39,14 @@ m4_define([x86_SELECT],
AS_IF([test x"$opt_i386" = xyes], [x86_SELECT_I386],
[test x"$opt_amd64" = xyes], [x86_SELECT_AMD64])
+ # Never generate instructions that are unhandled in kernel mode
+ AX_APPEND_COMPILE_FLAGS([ \
+ -mno-mmx \
+ -mno-3dnow \
+ -mno-sse \
+ -mno-sse2 \
+ -mno-avx])
+
AC_DEFINE_UNQUOTED([X15_X86_MACHINE], [$machine], [machine])
AC_MSG_NOTICE([machine type: $arch ($machine)])])