svn commit: r226802 - head/sys/conf

Robert Millan rmh at FreeBSD.org
Wed Oct 26 17:26:38 UTC 2011


Author: rmh
Date: Wed Oct 26 17:26:38 2011
New Revision: 226802
URL: http://svn.freebsd.org/changeset/base/226802

Log:
  Revert r226665 untill the issues with this change have been resolved.
  
  Approved by:	kib (mentor)

Modified:
  head/sys/conf/kern.mk

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Wed Oct 26 17:09:09 2011	(r226801)
+++ head/sys/conf/kern.mk	Wed Oct 26 17:26:38 2011	(r226802)
@@ -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 -Wn
 #
 .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


More information about the svn-src-head mailing list