summaryrefslogtreecommitdiff
path: root/sys/boot/ficl.mk
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2017-11-06 15:21:51 +0000
committerWarner Losh <imp@FreeBSD.org>2017-11-06 15:21:51 +0000
commit47804274694dd189e97c7b255af29a544730dd6e (patch)
treead277909aa1abda252d503ab61172bb6c99e13a6 /sys/boot/ficl.mk
parent7e3b76ca57ada0285ec32428dc870a2ab73fcdeb (diff)
downloadsrc-test2-47804274694dd189e97c7b255af29a544730dd6e.tar.gz
src-test2-47804274694dd189e97c7b255af29a544730dd6e.zip
Use DO32 for all the places that we need to flag we're building a 32
bit version of a library. Use a generic name since this may be usefule elsewhere. Sponsored by: Netflix
Notes
Notes: svn path=/head/; revision=325480
Diffstat (limited to 'sys/boot/ficl.mk')
-rw-r--r--sys/boot/ficl.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/boot/ficl.mk b/sys/boot/ficl.mk
index c26787b914ce..3c74e3495979 100644
--- a/sys/boot/ficl.mk
+++ b/sys/boot/ficl.mk
@@ -4,7 +4,7 @@
.include "defs.mk"
-.if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32)
+.if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 1
FICL_CPUARCH= i386
.elif ${MACHINE_ARCH:Mmips64*} != ""
FICL_CPUARCH= mips64
@@ -15,7 +15,7 @@ FICL_CPUARCH= ${MACHINE_CPUARCH}
.PATH: ${FICLSRC} ${FICLSRC}/${FICL_CPUARCH}
.if ${MACHINE_CPUARCH} == "amd64"
-.if defined(FICL32)
+.if ${DO32:U0} == 1
CFLAGS+= -m32 -I.
.else
CFLAGS+= -fPIC
@@ -30,7 +30,7 @@ CFLAGS+= -I${FICLSRC} -I${FICLSRC}/${FICL_CPUARCH} -I${LDRSRC}
CFLAGS+= -DBOOT_FORTH
CFLAGS+= -DBF_DICTSIZE=15000
-.if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32)
+.if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 1
.if !exists(machine)
${SRCS:M*.c:R:S/$/.o/g}: machine