svn commit: r311566 - head

[John Baldwin]

Author: jhb
Date: Fri Jan  6 23:20:59 2017
New Revision: 311566
URL: https://svnweb.freebsd.org/changeset/base/311566

Log:
  Set -m32 in MD LIB32CPUCFLAGS rather than MI LIB32CFLAGS.
  
  Both amd64 and powerpc64 use -m32 to compile 32-bit binaries, but not
  all platforms follow this convention.  Move the -m32 compile flag into
  the per-architecture flags to accomodate other architectures.
  
  Sponsored by:	DARPA / AFRL

Modified:
  head/Makefile.libcompat

Modified: head/Makefile.libcompat
==============================================================================
--- head/Makefile.libcompat	Fri Jan  6 23:05:29 2017	(r311565)
+++ head/Makefile.libcompat	Fri Jan  6 23:20:59 2017	(r311566)
@@ -15,6 +15,7 @@ LIB32CPUFLAGS=	-march=i686 -mmmx -msse -
 .else
 LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
 .endif
+LIB32CPUFLAGS+=	-m32
 LIB32WMAKEENV=	MACHINE=i386 MACHINE_ARCH=i386 \
 		MACHINE_CPU="i686 mmx sse sse2"
 LIB32WMAKEFLAGS=	\
@@ -28,6 +29,7 @@ LIB32CPUFLAGS=	-mcpu=powerpc
 .else
 LIB32CPUFLAGS=	-mcpu=${TARGET_CPUTYPE}
 .endif
+LIB32CPUFLAGS+=	-m32
 LIB32WMAKEENV=	MACHINE=powerpc MACHINE_ARCH=powerpc
 LIB32WMAKEFLAGS=	\
 		LD="${XLD} -m elf32ppc_fbsd" \
@@ -35,7 +37,7 @@ LIB32WMAKEFLAGS=	\
 .endif
 
 
-LIB32CFLAGS=	-m32 -DCOMPAT_32BIT
+LIB32CFLAGS=	-DCOMPAT_32BIT
 LIB32DTRACE=	${DTRACE} -32
 LIB32WMAKEFLAGS+=	-DCOMPAT_32BIT