From 8b2db3b713c21531ac3351b336aac42a40c8671e Mon Sep 17 00:00:00 2001 From: Stanislav Galabov Date: Fri, 26 Feb 2016 08:06:25 +0000 Subject: [PATCH] Currently BERI's loader is including the 32-bit version of the FICL MIPS sysdep.h (sys/boot/ficl/mips/sysdep.h) instead of the 64-bit version (sys/boot/ficl/mips64/sysdep.h). Although this may not be an issue in practice, it would be more correct if the 64-bit version was used. Also, using the 64-bit version would make it easier to add support for 64-bit ubldr on MIPS. Approved by: adrian (mentor) Differential Revision: https://reviews.freebsd.org/D5310 --- sys/boot/ficl/Makefile | 2 ++ sys/boot/mips/beri/loader/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile index e404acd280b..0451aa9835c 100644 --- a/sys/boot/ficl/Makefile +++ b/sys/boot/ficl/Makefile @@ -55,6 +55,8 @@ CFLAGS+= -m32 -mcpu=powerpc -I. .if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32) FICL_CPUARCH= i386 +.elif ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el" +FICL_CPUARCH= mips64 .else FICL_CPUARCH= ${MACHINE_CPUARCH} .endif diff --git a/sys/boot/mips/beri/loader/Makefile b/sys/boot/mips/beri/loader/Makefile index 7223492068b..d20c01fbdc7 100644 --- a/sys/boot/mips/beri/loader/Makefile +++ b/sys/boot/mips/beri/loader/Makefile @@ -72,7 +72,7 @@ CFLAGS+= -DLOADER_BZIP2_SUPPORT # Enable BootForth BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../ficl -CFLAGS+= -I${.CURDIR}/../../../ficl/mips +CFLAGS+= -I${.CURDIR}/../../../ficl/mips64 LIBFICL= ${.OBJDIR}/../../../ficl/libficl.a .endif -- 2.45.2