svn commit: r325479 - in head/sys/boot: . i386/loader

[Warner Losh]

Author: imp
Date: Mon Nov  6 15:21:45 2017
New Revision: 325479
URL: https://svnweb.freebsd.org/changeset/base/325479

Log:
  Define LIBFICL32 to be libficl.a on i386 and libficl32.a on amd64.
  
  Sponsored by: Netflix

Modified:
  head/sys/boot/defs.mk
  head/sys/boot/i386/loader/Makefile

Modified: head/sys/boot/defs.mk
==============================================================================
--- head/sys/boot/defs.mk	Mon Nov  6 15:21:39 2017	(r325478)
+++ head/sys/boot/defs.mk	Mon Nov  6 15:21:45 2017	(r325479)
@@ -25,7 +25,11 @@ BINDIR?=	/boot
 # NB: The makefiles depend on these being empty when we don't build forth.
 .if ${MK_FORTH} != "no"
 LIBFICL=	${BOOTOBJ}/ficl/libficl.a
+.if ${MACHINE} == "i386"
+LIBFICL32=	${LIBFICL}
+.else
 LIBFICL32=	${BOOTOBJ}/ficl32/libficl.a
+.endif
 .endif
 LIBSA=		${BOOTOBJ}/libsa/libsa.a
 .if ${MACHINE} == "i386"

Modified: head/sys/boot/i386/loader/Makefile
==============================================================================
--- head/sys/boot/i386/loader/Makefile	Mon Nov  6 15:21:39 2017	(r325478)
+++ head/sys/boot/i386/loader/Makefile	Mon Nov  6 15:21:45 2017	(r325479)
@@ -101,15 +101,8 @@ FILES+=	loader.rc menu.rc
 # XXX crt0.o needs to be first for pxeboot(8) to work
 OBJS=	${BTXCRT}
 
-# XXX not happy with this construct, revisit
-.if ${MACHINE_CPUARCH} == "amd64"
-FICL=	${LIBFICL32}
-.else
-FICL=	${LIBFICL}
-.endif
-
-DPADD=	${FICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBGELIBOOT} ${LIBSA32}
-LDADD=	${FICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBGELIBOOT} ${LIBSA32}
+DPADD=	${LIBFICL32} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBGELIBOOT} ${LIBSA32}
+LDADD=	${LIBFICL32} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBGELIBOOT} ${LIBSA32}
 
 .include <bsd.prog.mk>