diff options
| author | dim <dim@FreeBSD.org> | 2012-03-13 19:18:34 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-03-13 19:18:34 +0000 |
| commit | 181468133124a1c1985ea494e82b209c11572f4e (patch) | |
| tree | 04984dc99845f85dc1c147cdeb3d310ff5910eb3 /sys/conf/kern.mk | |
| parent | 7be39623f5d2ffb96d5e6ab8f5113a03b9c4200f (diff) | |
| download | FreeBSD-src-181468133124a1c1985ea494e82b209c11572f4e.zip FreeBSD-src-181468133124a1c1985ea494e82b209c11572f4e.tar.gz | |
Update comments and CFLAGS in sys/conf/kern.mk, introduced in r221879,
to match reality: clang does _not_ disable SSE automatically when
-mno-mmx is used, you have to specify -mno-sse explicitly.
Note this was the case even before r232894, which only makes a change in
the 'positive' flag case; e.g. when you specify -msse, MMX gets enabled
too.
MFC after: 1 week
Diffstat (limited to 'sys/conf/kern.mk')
| -rw-r--r-- | sys/conf/kern.mk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index d2ed68d..1dfc9fb 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -46,16 +46,16 @@ CWARNEXTRA?= -Wno-error-tautological-compare -Wno-error-empty-body \ # Setting -mno-sse implies -mno-sse2, -mno-sse3 and -mno-ssse3 # # clang: -# Setting -mno-mmx implies -mno-3dnow, -mno-3dnowa, -mno-sse, -mno-sse2, -# -mno-sse3, -mno-ssse3, -mno-sse41 and -mno-sse42 +# Setting -mno-mmx implies -mno-3dnow and -mno-3dnowa +# Setting -mno-sse implies -mno-sse2, -mno-sse3, -mno-ssse3, -mno-sse41 and -mno-sse42 # .if ${MACHINE_CPUARCH} == "i386" .if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang" -CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-sse +CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 .else CFLAGS+= -mno-aes -mno-avx .endif -CFLAGS+= -mno-mmx -msoft-float +CFLAGS+= -mno-mmx -mno-sse -msoft-float INLINE_LIMIT?= 8000 .endif @@ -93,17 +93,15 @@ INLINE_LIMIT?= 15000 # Setting -mno-sse implies -mno-sse2, -mno-sse3, -mno-ssse3 and -mfpmath=387 # # clang: -# Setting -mno-mmx implies -mno-3dnow, -mno-3dnowa, -mno-sse, -mno-sse2, -# -mno-sse3, -mno-ssse3, -mno-sse41 and -mno-sse42 +# Setting -mno-mmx implies -mno-3dnow and -mno-3dnowa +# Setting -mno-sse implies -mno-sse2, -mno-sse3, -mno-ssse3, -mno-sse41 and -mno-sse42 # (-mfpmath= is not supported) # .if ${MACHINE_CPUARCH} == "amd64" -.if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang" -CFLAGS+= -mno-sse -.else +.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" CFLAGS+= -mno-aes -mno-avx .endif -CFLAGS+= -mcmodel=kernel -mno-red-zone -mno-mmx -msoft-float \ +CFLAGS+= -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float \ -fno-asynchronous-unwind-tables INLINE_LIMIT?= 8000 .endif |
