Powerpc is a 32-bit boot loader.
Stop building libsa32 on powerpc. Build everything on powerpc64 -m32. Transition to using LIBSA from LIBSA32. This elimiantes the useless build of libsa on powerpc64 (nothing used to use it) and should be a more direct way of saying this. Sponsored by: Netflix
This commit is contained in:
parent
db520fdd46
commit
268e2d82c4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=325478
@ -4,6 +4,5 @@
|
|||||||
SUBDIR+= fdt
|
SUBDIR+= fdt
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
SUBDIR+= libsa32
|
|
||||||
SUBDIR+= ofw
|
SUBDIR+= ofw
|
||||||
SUBDIR+= uboot
|
SUBDIR+= uboot
|
||||||
|
@ -86,4 +86,10 @@ CFLAGS+= -DLOADER_GELI_SUPPORT
|
|||||||
.endif
|
.endif
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
# All PowerPC builds are 32 bit. We have no 64-bit loaders on powerpc
|
||||||
|
# or powerpc64.
|
||||||
|
.if ${MACHINE_ARCH} == "powerpc64"
|
||||||
|
CFLAGS+= -m32 -mcpu=powerpc
|
||||||
|
.endif
|
||||||
|
|
||||||
.endif # __BOOT_DEFS_MK__
|
.endif # __BOOT_DEFS_MK__
|
||||||
|
@ -9,7 +9,7 @@ LIBSA_CPUARCH=i386
|
|||||||
LIBSA_CPUARCH=${MACHINE_CPUARCH}
|
LIBSA_CPUARCH=${MACHINE_CPUARCH}
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
|
.if ${MACHINE_ARCH} == "amd64"
|
||||||
CFLAGS+= -m32 -I.
|
CFLAGS+= -m32 -I.
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
@ -1,7 +1,3 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
.if ${MACHINE_ARCH} == "powerpc64"
|
|
||||||
CFLAGS+= -m32 -mcpu=powerpc
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.include "../Makefile.inc"
|
.include "../Makefile.inc"
|
||||||
|
@ -51,8 +51,8 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
|
|||||||
# 64-bit bridge extensions
|
# 64-bit bridge extensions
|
||||||
CFLAGS+= -Wa,-mppc64bridge
|
CFLAGS+= -Wa,-mppc64bridge
|
||||||
|
|
||||||
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
|
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
|
||||||
LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
|
LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
|
||||||
|
|
||||||
loader.help: help.common help.kboot ${FDTSRC}/help.fdt
|
loader.help: help.common help.kboot ${FDTSRC}/help.fdt
|
||||||
cat ${.ALLSRC} | \
|
cat ${.ALLSRC} | \
|
||||||
|
@ -55,8 +55,8 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
|
|||||||
LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a
|
LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a
|
||||||
CFLAGS+= -I${BOOTSRC}/ofw/libofw
|
CFLAGS+= -I${BOOTSRC}/ofw/libofw
|
||||||
|
|
||||||
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
|
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
|
||||||
LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
|
LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
|
||||||
|
|
||||||
loader.help: help.common help.ofw ${FDTSRC}/help.fdt
|
loader.help: help.common help.ofw ${FDTSRC}/help.fdt
|
||||||
cat ${.ALLSRC} | \
|
cat ${.ALLSRC} | \
|
||||||
|
@ -47,8 +47,8 @@ CFLAGS+= -DRELOC=${RELOC}
|
|||||||
|
|
||||||
LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
|
LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
|
||||||
|
|
||||||
DPADD= ${LIBFICL} ${LIBOFW} ${LIBSA32}
|
DPADD= ${LIBFICL} ${LIBOFW} ${LIBSA}
|
||||||
LDADD= ${LIBFICL} ${LIBOFW} ${LIBSA32}
|
LDADD= ${LIBFICL} ${LIBOFW} ${LIBSA}
|
||||||
|
|
||||||
SC_DFLT_FONT=cp437
|
SC_DFLT_FONT=cp437
|
||||||
|
|
||||||
|
@ -35,8 +35,8 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
|
|||||||
|
|
||||||
.include "${BOOTSRC}/uboot.mk"
|
.include "${BOOTSRC}/uboot.mk"
|
||||||
|
|
||||||
DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA32}
|
DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA}
|
||||||
LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA32}
|
LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA}
|
||||||
|
|
||||||
loader.help: help.common help.uboot ${BOOTSRC}/fdt/help.fdt
|
loader.help: help.common help.uboot ${BOOTSRC}/fdt/help.fdt
|
||||||
cat ${.ALLSRC} | \
|
cat ${.ALLSRC} | \
|
||||||
|
Loading…
Reference in New Issue
Block a user