svn commit: r296079 - in head/sys/boot: ficl mips/beri/loader

[Stanislav Galabov]

Author: sgalabov
Date: Fri Feb 26 08:06:25 2016
New Revision: 296079
URL: https://svnweb.freebsd.org/changeset/base/296079

Log:
  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

Modified:
  head/sys/boot/ficl/Makefile
  head/sys/boot/mips/beri/loader/Makefile

Modified: head/sys/boot/ficl/Makefile
==============================================================================
--- head/sys/boot/ficl/Makefile	Fri Feb 26 03:34:32 2016	(r296078)
+++ head/sys/boot/ficl/Makefile	Fri Feb 26 08:06:25 2016	(r296079)
@@ -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

Modified: head/sys/boot/mips/beri/loader/Makefile
==============================================================================
--- head/sys/boot/mips/beri/loader/Makefile	Fri Feb 26 03:34:32 2016	(r296078)
+++ head/sys/boot/mips/beri/loader/Makefile	Fri Feb 26 08:06:25 2016	(r296079)
@@ -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