diff options
| author | rmh <rmh@FreeBSD.org> | 2011-10-26 17:26:38 +0000 |
|---|---|---|
| committer | rmh <rmh@FreeBSD.org> | 2011-10-26 17:26:38 +0000 |
| commit | 6ae1a53eda68ab65a69718a023f2b6cd2b3dce28 (patch) | |
| tree | c9f8441c320b89807d77d558e89534888e70a563 | |
| parent | a181a3a8328cbf8ca42335ad369a1955cc8f8b6c (diff) | |
| download | FreeBSD-src-6ae1a53eda68ab65a69718a023f2b6cd2b3dce28.zip FreeBSD-src-6ae1a53eda68ab65a69718a023f2b6cd2b3dce28.tar.gz | |
Revert r226665 untill the issues with this change have been resolved.
Approved by: kib (mentor)
| -rw-r--r-- | sys/conf/kern.mk | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 80997c5..a0a595f 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -1,21 +1,11 @@ # $FreeBSD$ -.if ${CC:T:Mclang} != "clang" -FREEBSD_GCC!= ${CC} --version | grep FreeBSD || true -.endif - # # Warning flags for compiling the kernel and components of the kernel: # -.if defined(FREEBSD_GCC) && ${FREEBSD_GCC} -# FreeBSD extensions, not available in upstream GCC -format_extensions= -fformat-extensions -no_align_long_strings= -mno-align-long-strings -.endif - CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - -Wundef -Wno-pointer-sign ${format_extensions} \ + -Wundef -Wno-pointer-sign -fformat-extensions \ -Wmissing-include-dirs -fdiagnostics-show-option # # The following flags are next up for working on: @@ -42,7 +32,7 @@ CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ # .if ${MACHINE_CPUARCH} == "i386" .if ${CC:T:Mclang} != "clang" -CFLAGS+= ${no_align_long_strings} -mpreferred-stack-boundary=2 -mno-sse +CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-sse .else CFLAGS+= -mno-aes -mno-avx .endif |
