summaryrefslogtreecommitdiffstats
path: root/sys/ofed
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2014-01-04 17:54:06 +0000
committerdim <dim@FreeBSD.org>2014-01-04 17:54:06 +0000
commit7a170f6d982ecfa4b6f7488b0c7f32923cae613d (patch)
tree268159e54569185ab7965828eb28f97aad4f6260 /sys/ofed
parentdfba73dcd142f9eb5928d487e2792d59657a5708 (diff)
downloadFreeBSD-src-7a170f6d982ecfa4b6f7488b0c7f32923cae613d.zip
FreeBSD-src-7a170f6d982ecfa4b6f7488b0c7f32923cae613d.tar.gz
MFC r260020:
For sys/dev/drm2/radeon, only use -fms-extensions with gcc. This flag is only to stop gcc complaining about anonymous unions, which clang does not do. For clang 3.4 however, -fms-extensions enables the Microsoft __wchar_t type, which clashes with our own types.h. 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.
Diffstat (limited to 'sys/ofed')
-rw-r--r--sys/ofed/drivers/infiniband/hw/mlx4/Makefile2
-rw-r--r--sys/ofed/drivers/net/mlx4/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/ofed/drivers/infiniband/hw/mlx4/Makefile b/sys/ofed/drivers/infiniband/hw/mlx4/Makefile
index cbfa7a4..6b03ea3 100644
--- a/sys/ofed/drivers/infiniband/hw/mlx4/Makefile
+++ b/sys/ofed/drivers/infiniband/hw/mlx4/Makefile
@@ -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}
diff --git a/sys/ofed/drivers/net/mlx4/Makefile b/sys/ofed/drivers/net/mlx4/Makefile
index bac8eb3..2e2ba35 100644
--- a/sys/ofed/drivers/net/mlx4/Makefile
+++ b/sys/ofed/drivers/net/mlx4/Makefile
@@ -30,5 +30,5 @@ 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}
OpenPOWER on IntegriCloud