d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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).

Browse Source 
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
This commit is contained in:
Stanislav Galabov 2016-02-26 08:06:25 +00:00
parent 0b3105a37d
commit 8b2db3b713
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/boot/ficl/Makefile
View File

@ -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

2
sys/boot/mips/beri/loader/Makefile
View File

@ -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