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

Powerpc is a 32-bit boot loader.

Browse Source 
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:
Warner Losh 2017-11-06 15:21:39 +00:00
parent db520fdd46
commit 268e2d82c4
8 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/boot/Makefile.powerpc
View File

@ -4,6 +4,5 @@
SUBDIR+= fdt
.endif
SUBDIR+= libsa32
SUBDIR+= ofw
SUBDIR+= uboot

6
sys/boot/defs.mk
View File

@ -86,4 +86,10 @@ CFLAGS+= -DLOADER_GELI_SUPPORT
.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__

2
sys/boot/libsa32/Makefile
View File

@ -9,7 +9,7 @@ LIBSA_CPUARCH=i386
LIBSA_CPUARCH=${MACHINE_CPUARCH}
.endif
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
.if ${MACHINE_ARCH} == "amd64"
CFLAGS+= -m32 -I.
.endif

4
sys/boot/powerpc/Makefile.inc
View File

@ -1,7 +1,3 @@
# $FreeBSD$
.if ${MACHINE_ARCH} == "powerpc64"
CFLAGS+= -m32 -mcpu=powerpc
.endif
.include "../Makefile.inc"

4
sys/boot/powerpc/kboot/Makefile
View File

@ -51,8 +51,8 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
# 64-bit bridge extensions
CFLAGS+= -Wa,-mppc64bridge
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
loader.help: help.common help.kboot ${FDTSRC}/help.fdt
cat ${.ALLSRC} | \

4
sys/boot/powerpc/ofw/Makefile
View File

@ -55,8 +55,8 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a
CFLAGS+= -I${BOOTSRC}/ofw/libofw
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
loader.help: help.common help.ofw ${FDTSRC}/help.fdt
cat ${.ALLSRC} | \

4
sys/boot/powerpc/ps3/Makefile
View File

@ -47,8 +47,8 @@ CFLAGS+= -DRELOC=${RELOC}
LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
DPADD= ${LIBFICL} ${LIBOFW} ${LIBSA32}
LDADD= ${LIBFICL} ${LIBOFW} ${LIBSA32}
DPADD= ${LIBFICL} ${LIBOFW} ${LIBSA}
LDADD= ${LIBFICL} ${LIBOFW} ${LIBSA}
SC_DFLT_FONT=cp437

4
sys/boot/powerpc/uboot/Makefile
View File

@ -35,8 +35,8 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
.include "${BOOTSRC}/uboot.mk"
DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA32}
LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA32}
DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA}
LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA}
loader.help: help.common help.uboot ${BOOTSRC}/fdt/help.fdt
cat ${.ALLSRC} | \