svn commit: r260321 - in stable: 10/sys/conf 10/sys/modules/drm2/radeonkms 10/sys/modules/ibcore 10/sys/modules/ipoib 10/sys/modules/mlx4 10/sys/modules/mlx4ib 10/sys/modules/mlxen 10/sys/modules/m...

[Dimitry Andric]

Author: dim
Date: Sun Jan  5 15:39:37 2014
New Revision: 260321
URL: http://svnweb.freebsd.org/changeset/base/260321

Log:
  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.

Modified:
  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/sys/   (props changed)

Changes in other areas also in this revision:
Modified:
  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/sys/conf/kern.pre.mk
==============================================================================
--- stable/9/sys/conf/kern.pre.mk	Sun Jan  5 15:33:33 2014	(r260320)
+++ stable/9/sys/conf/kern.pre.mk	Sun Jan  5 15:39:37 2014	(r260321)
@@ -106,8 +106,6 @@ 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
@@ -159,7 +157,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 ${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}

Modified: stable/9/sys/modules/mlx4/Makefile
==============================================================================
--- stable/9/sys/modules/mlx4/Makefile	Sun Jan  5 15:33:33 2014	(r260320)
+++ stable/9/sys/modules/mlx4/Makefile	Sun Jan  5 15:39:37 2014	(r260321)
@@ -26,4 +26,4 @@ opt_inet6.h:
 
 .include <bsd.kmod.mk>
 
-CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
+CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions

Modified: stable/9/sys/modules/mlx4ib/Makefile
==============================================================================
--- stable/9/sys/modules/mlx4ib/Makefile	Sun Jan  5 15:33:33 2014	(r260320)
+++ stable/9/sys/modules/mlx4ib/Makefile	Sun Jan  5 15:39:37 2014	(r260321)
@@ -24,4 +24,4 @@ opt_inet6.h:
 
 .include <bsd.kmod.mk>
 
-CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
+CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions

Modified: stable/9/sys/modules/mlxen/Makefile
==============================================================================
--- stable/9/sys/modules/mlxen/Makefile	Sun Jan  5 15:33:33 2014	(r260320)
+++ stable/9/sys/modules/mlxen/Makefile	Sun Jan  5 15:39:37 2014	(r260321)
@@ -25,4 +25,4 @@ opt_inet6.h:
 
 .include <bsd.kmod.mk>
 
-CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
+CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions

Modified: stable/9/sys/modules/mthca/Makefile
==============================================================================
--- stable/9/sys/modules/mthca/Makefile	Sun Jan  5 15:33:33 2014	(r260320)
+++ stable/9/sys/modules/mthca/Makefile	Sun Jan  5 15:39:37 2014	(r260321)
@@ -28,4 +28,4 @@ opt_inet6.h:
 
 .include <bsd.kmod.mk>
 
-CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
+CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions