From owner-svn-src-all@FreeBSD.ORG  Wed Oct 26 17:26:38 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8272D106564A;
	Wed, 26 Oct 2011 17:26:38 +0000 (UTC) (envelope-from rmh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 72F248FC08;
	Wed, 26 Oct 2011 17:26:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9QHQcak060139;
	Wed, 26 Oct 2011 17:26:38 GMT (envelope-from rmh@svn.freebsd.org)
Received: (from rmh@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9QHQcrK060137;
	Wed, 26 Oct 2011 17:26:38 GMT (envelope-from rmh@svn.freebsd.org)
Message-Id: <201110261726.p9QHQcrK060137@svn.freebsd.org>
From: Robert Millan <rmh@FreeBSD.org>
Date: Wed, 26 Oct 2011 17:26:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226802 - head/sys/conf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 17:26:38 -0000

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