From 452a3101674c96bc97913f2e7b38be13c7ee7f20 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Fri, 6 Jan 2017 23:20:59 +0000 Subject: [PATCH] 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 --- Makefile.libcompat | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.libcompat b/Makefile.libcompat index a2a25cfd2bba..b1aa86249aac 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -15,6 +15,7 @@ LIB32CPUFLAGS= -march=i686 -mmmx -msse -msse2 .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