Author: dim
Date: Thu Jan 9 22:40:51 2014
New Revision: 260495
URL: http://svnweb.freebsd.org/changeset/base/260495
Log:
MFC r260102:
Similar to r260020, only use -fms-extensions with gcc, for all other
modules which require this flag to compile. Use a GCC_MS_EXTENSIONS
variable, defined in kern.pre.mk, which can be used to easily supply the
flag (or not), depending on the compiler type.
MFC r260322:
In addition to r260102, also define GCC_MS_EXTENSIONS in bsd.sys.mk,
since kernel module builds do not use kern.pre.mk.
Modified:
stable/9/share/mk/bsd.sys.mk (contents, props changed)
stable/9/sys/conf/kern.pre.mk
stable/9/sys/modules/mlx4/Makefile
stable/9/sys/modules/mlx4ib/Makefile
stable/9/sys/modules/mlxen/Makefile
stable/9/sys/modules/mthca/Makefile
Directory Properties:
stable/9/share/mk/ (props changed)
stable/9/sys/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/share/mk/bsd.sys.mk
stable/10/sys/conf/kern.pre.mk
stable/10/sys/modules/drm2/radeonkms/Makefile
stable/10/sys/modules/ibcore/Makefile
stable/10/sys/modules/ipoib/Makefile
stable/10/sys/modules/mlx4/Makefile
stable/10/sys/modules/mlx4ib/Makefile
stable/10/sys/modules/mlxen/Makefile
stable/10/sys/modules/mthca/Makefile
stable/10/sys/ofed/drivers/infiniband/hw/mlx4/Makefile
stable/10/sys/ofed/drivers/net/mlx4/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/9/share/mk/bsd.sys.mk
==============================================================================
--- stable/9/share/mk/bsd.sys.mk Thu Jan 9 22:16:30 2014
(r260494)
+++ stable/9/share/mk/bsd.sys.mk Thu Jan 9 22:40:51 2014
(r260495)
@@ -119,6 +119,7 @@ CFLAGS+= -Qunused-arguments
CFLAGS+= ${CFLAGS.clang}
CXXFLAGS+= ${CXXFLAGS.clang}
.else # !CLANG
+GCC_MS_EXTENSIONS= -fms-extensions
CFLAGS+= ${CFLAGS.gcc}
CXXFLAGS+= ${CXXFLAGS.gcc}
.endif # CLANG
Modified: stable/9/sys/conf/kern.pre.mk
==============================================================================
--- stable/9/sys/conf/kern.pre.mk Thu Jan 9 22:16:30 2014
(r260494)
+++ stable/9/sys/conf/kern.pre.mk Thu Jan 9 22:40:51 2014
(r260495)
@@ -106,6 +106,8 @@ ASM_CFLAGS= -x assembler-with-cpp -DLOCO
.if ${COMPILER_TYPE} == "clang"
CLANG_NO_IAS= -no-integrated-as
+.else
+GCC_MS_EXTENSIONS= -fms-extensions
.endif
.if defined(PROFLEVEL) && ${PROFLEVEL} >= 1
@@ -157,7 +159,7 @@ NORMAL_LINT= ${LINT} ${LINTFLAGS} ${CFLA
# 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 -fms-extensions
+OFEDNOERR= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_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}
Modified: stable/9/sys/modules/mlx4/Makefile
==============================================================================
--- stable/9/sys/modules/mlx4/Makefile Thu Jan 9 22:16:30 2014
(r260494)
+++ stable/9/sys/modules/mlx4/Makefile Thu Jan 9 22:40:51 2014
(r260495)
@@ -26,4 +26,4 @@ opt_inet6.h:
.include <bsd.kmod.mk>
-CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions
+CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
Modified: stable/9/sys/modules/mlx4ib/Makefile
==============================================================================
--- stable/9/sys/modules/mlx4ib/Makefile Thu Jan 9 22:16:30 2014
(r260494)
+++ stable/9/sys/modules/mlx4ib/Makefile Thu Jan 9 22:40:51 2014
(r260495)
@@ -24,4 +24,4 @@ opt_inet6.h:
.include <bsd.kmod.mk>
-CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions
+CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
Modified: stable/9/sys/modules/mlxen/Makefile
==============================================================================
--- stable/9/sys/modules/mlxen/Makefile Thu Jan 9 22:16:30 2014
(r260494)
+++ stable/9/sys/modules/mlxen/Makefile Thu Jan 9 22:40:51 2014
(r260495)
@@ -25,4 +25,4 @@ opt_inet6.h:
.include <bsd.kmod.mk>
-CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions
+CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
Modified: stable/9/sys/modules/mthca/Makefile
==============================================================================
--- stable/9/sys/modules/mthca/Makefile Thu Jan 9 22:16:30 2014
(r260494)
+++ stable/9/sys/modules/mthca/Makefile Thu Jan 9 22:40:51 2014
(r260495)
@@ -28,4 +28,4 @@ opt_inet6.h:
.include <bsd.kmod.mk>
-CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions
+CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
