Date: Sun, 5 Jan 2014 15:39:39 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: 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... Message-ID: <201401051539.s05Fddno043545@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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/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) Changes in other areas also in this revision: 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) Modified: stable/10/sys/conf/kern.pre.mk ============================================================================== --- stable/10/sys/conf/kern.pre.mk Sun Jan 5 15:33:33 2014 (r260320) +++ stable/10/sys/conf/kern.pre.mk Sun Jan 5 15:39:37 2014 (r260321) @@ -99,8 +99,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/10/sys/modules/drm2/radeonkms/Makefile ============================================================================== --- stable/10/sys/modules/drm2/radeonkms/Makefile Sun Jan 5 15:33:33 2014 (r260320) +++ stable/10/sys/modules/drm2/radeonkms/Makefile Sun Jan 5 15:39:37 2014 (r260321) @@ -103,6 +103,9 @@ SRCS += \ iicbus_if.h \ pci_if.h -CFLAGS += -I${.CURDIR}/../../../dev/drm2/radeon ${GCC_MS_EXTENSIONS} +CFLAGS += -I${.CURDIR}/../../../dev/drm2/radeon +.if ${COMPILER_TYPE} == "gcc" +CFLAGS += -fms-extensions +.endif .include <bsd.kmod.mk> Modified: stable/10/sys/modules/ibcore/Makefile ============================================================================== --- stable/10/sys/modules/ibcore/Makefile Sun Jan 5 15:33:33 2014 (r260320) +++ stable/10/sys/modules/ibcore/Makefile Sun Jan 5 15:39:37 2014 (r260321) @@ -20,7 +20,7 @@ CFLAGS+= -DINET6 -DINET -DOFED .include <bsd.kmod.mk> -CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} +CFLAGS+= -Wno-cast-qual -Wno-pointer-arith -fms-extensions CWARNFLAGS.cm.c= -Wno-unused-function CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} Modified: stable/10/sys/modules/ipoib/Makefile ============================================================================== --- stable/10/sys/modules/ipoib/Makefile Sun Jan 5 15:33:33 2014 (r260320) +++ stable/10/sys/modules/ipoib/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 Modified: stable/10/sys/modules/mlx4/Makefile ============================================================================== --- stable/10/sys/modules/mlx4/Makefile Sun Jan 5 15:33:33 2014 (r260320) +++ stable/10/sys/modules/mlx4/Makefile Sun Jan 5 15:39:37 2014 (r260321) @@ -27,6 +27,7 @@ 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 CWARNFLAGS.mcg.c= -Wno-unused CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} Modified: stable/10/sys/modules/mlx4ib/Makefile ============================================================================== --- stable/10/sys/modules/mlx4ib/Makefile Sun Jan 5 15:33:33 2014 (r260320) +++ stable/10/sys/modules/mlx4ib/Makefile Sun Jan 5 15:39:37 2014 (r260321) @@ -31,4 +31,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/10/sys/modules/mlxen/Makefile ============================================================================== --- stable/10/sys/modules/mlxen/Makefile Sun Jan 5 15:33:33 2014 (r260320) +++ stable/10/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/10/sys/modules/mthca/Makefile ============================================================================== --- stable/10/sys/modules/mthca/Makefile Sun Jan 5 15:33:33 2014 (r260320) +++ stable/10/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 Modified: stable/10/sys/ofed/drivers/infiniband/hw/mlx4/Makefile ============================================================================== --- stable/10/sys/ofed/drivers/infiniband/hw/mlx4/Makefile Sun Jan 5 15:33:33 2014 (r260320) +++ stable/10/sys/ofed/drivers/infiniband/hw/mlx4/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 Modified: stable/10/sys/ofed/drivers/net/mlx4/Makefile ============================================================================== --- stable/10/sys/ofed/drivers/net/mlx4/Makefile Sun Jan 5 15:33:33 2014 (r260320) +++ stable/10/sys/ofed/drivers/net/mlx4/Makefile Sun Jan 5 15:39:37 2014 (r260321) @@ -30,5 +30,5 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401051539.s05Fddno043545>