From dafd81e458aa56a9841e3c51b18340409c362b0b Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Sun, 5 Jan 2014 15:39:37 +0000
Subject: Revert MFC of r260102 for now, until I can merge the required fix
 from head.  This should fix building modules which require -fms-extensions to
 compile them with gcc.

---
 sys/conf/kern.pre.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'sys/conf/kern.pre.mk')

diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 966a9e8..b01d506 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -99,8 +99,6 @@ ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
 
 .if ${COMPILER_TYPE} == "clang"
 CLANG_NO_IAS= -no-integrated-as
-.else
-GCC_MS_EXTENSIONS= -fms-extensions
 .endif
 
 .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1
@@ -159,7 +157,7 @@ NORMAL_LINT=	${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC}
 # Infiniband C flags.  Correct include paths and omit errors that linux
 # does not honor.
 OFEDINCLUDES=	-I$S/ofed/include/
-OFEDNOERR=	-Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
+OFEDNOERR=	-Wno-cast-qual -Wno-pointer-arith -fms-extensions
 OFEDCFLAGS=	${CFLAGS:N-I*} ${OFEDINCLUDES} ${CFLAGS:M-I*} ${OFEDNOERR}
 OFED_C_NOIMP=	${CC} -c -o ${.TARGET} ${OFEDCFLAGS} ${WERROR} ${PROF}
 OFED_C=		${OFED_C_NOIMP} ${.IMPSRC}
-- 
cgit v1.1