svn commit: r324642 - stable/11/sys/conf

[Brooks Davis]

Author: brooks
Date: Sun Oct 15 22:43:56 2017
New Revision: 324642
URL: https://svnweb.freebsd.org/changeset/base/324642

Log:
  MFC r321256:
  
  Include ARCH_FLAGS in CFLAGS when building modules.
  
  Without this change, modules will match the default compiler
  configuration which may not be the same as the kernel values.
  
  Reviewed by:	imp
  Obtained from:	CheriBSD
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D11633

Modified:
  stable/11/sys/conf/kern.pre.mk
  stable/11/sys/conf/kmod.mk
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/conf/kern.pre.mk
==============================================================================
--- stable/11/sys/conf/kern.pre.mk	Sun Oct 15 22:39:31 2017	(r324641)
+++ stable/11/sys/conf/kern.pre.mk	Sun Oct 15 22:43:56 2017	(r324642)
@@ -203,6 +203,7 @@ MKMODULESENV+=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMO
 MKMODULESENV+=	MACHINE_CPUARCH=${MACHINE_CPUARCH}
 MKMODULESENV+=	MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH}
 MKMODULESENV+=	MODULES_EXTRA="${MODULES_EXTRA}" WITHOUT_MODULES="${WITHOUT_MODULES}"
+MKMODULESENV+=	ARCH_FLAGS="${ARCH_FLAGS}"
 .if (${KERN_IDENT} == LINT)
 MKMODULESENV+=	ALL_MODULES=LINT
 .endif

Modified: stable/11/sys/conf/kmod.mk
==============================================================================
--- stable/11/sys/conf/kmod.mk	Sun Oct 15 22:39:31 2017	(r324641)
+++ stable/11/sys/conf/kmod.mk	Sun Oct 15 22:43:56 2017	(r324642)
@@ -357,7 +357,7 @@ ${_src}:
 .endif
 
 # Respect configuration-specific C flags.
-CFLAGS+=	${CONF_CFLAGS}
+CFLAGS+=	${ARCH_FLAGS} ${CONF_CFLAGS}
 
 .if !empty(SRCS:Mvnode_if.c)
 CLEANFILES+=	vnode_if.c