svn commit: r271130 - in stable/10/sys/boot: . i386/efi i386/gptboot i386/gptzfsboot i386/loader i386/zfsboot libstand32 powerpc/ofw powerpc/ps3 powerpc/uboot
Ed Maste
emaste at FreeBSD.org
Thu Sep 4 20:35:56 UTC 2014
Author: emaste
Date: Thu Sep 4 20:35:53 2014
New Revision: 271130
URL: http://svnweb.freebsd.org/changeset/base/271130
Log:
r261567: Build a 32-bit libstand under sys/boot/
A 32-bit libstand is needed on 64-bit platforms for use by various
bootloaders. Previously only the 32-bit version was built, installed
as /usr/lib/libstand.a.
A new 64-bit libstand consumer will arrive in the near future, so move
the bootloader-specific 32-bit version to sys/boot/libstand32/.
Explicitly link against this version in the 32-bit loaders.
r261614: Build a 32-bit libstand under sys/boot/ for ppc64
This change is equivalent to r261567 for i386/amd64.
Relnotes: Yes
Sponsored by: The FreeBSD Foundation
Added:
stable/10/sys/boot/libstand32/
- copied from r261567, head/sys/boot/libstand32/
Modified:
stable/10/sys/boot/Makefile.amd64
stable/10/sys/boot/Makefile.i386
stable/10/sys/boot/Makefile.powerpc
stable/10/sys/boot/i386/efi/Makefile
stable/10/sys/boot/i386/gptboot/Makefile
stable/10/sys/boot/i386/gptzfsboot/Makefile
stable/10/sys/boot/i386/loader/Makefile
stable/10/sys/boot/i386/zfsboot/Makefile
stable/10/sys/boot/powerpc/ofw/Makefile
stable/10/sys/boot/powerpc/ps3/Makefile
stable/10/sys/boot/powerpc/uboot/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/boot/Makefile.amd64
==============================================================================
--- stable/10/sys/boot/Makefile.amd64 Thu Sep 4 20:21:30 2014 (r271129)
+++ stable/10/sys/boot/Makefile.amd64 Thu Sep 4 20:35:53 2014 (r271130)
@@ -1,5 +1,6 @@
# $FreeBSD$
SUBDIR+= efi
+SUBDIR+= libstand32
SUBDIR+= zfs
SUBDIR+= userboot
Modified: stable/10/sys/boot/Makefile.i386
==============================================================================
--- stable/10/sys/boot/Makefile.i386 Thu Sep 4 20:21:30 2014 (r271129)
+++ stable/10/sys/boot/Makefile.i386 Thu Sep 4 20:35:53 2014 (r271130)
@@ -1,4 +1,5 @@
# $FreeBSD$
SUBDIR+= efi
+SUBDIR+= libstand32
SUBDIR+= zfs
Modified: stable/10/sys/boot/Makefile.powerpc
==============================================================================
--- stable/10/sys/boot/Makefile.powerpc Thu Sep 4 20:21:30 2014 (r271129)
+++ stable/10/sys/boot/Makefile.powerpc Thu Sep 4 20:35:53 2014 (r271130)
@@ -4,5 +4,6 @@
SUBDIR+= fdt
.endif
+SUBDIR+= libstand32
SUBDIR+= ofw
SUBDIR+= uboot
Modified: stable/10/sys/boot/i386/efi/Makefile
==============================================================================
--- stable/10/sys/boot/i386/efi/Makefile Thu Sep 4 20:21:30 2014 (r271129)
+++ stable/10/sys/boot/i386/efi/Makefile Thu Sep 4 20:35:53 2014 (r271130)
@@ -60,6 +60,7 @@ loader.efi: loader.sym
--target=efi-app-ia32 ${.ALLSRC} ${.TARGET}
LIBEFI= ${.OBJDIR}/../../efi/libefi/libefi.a
+LIBSTAND= ${.OBJDIR}/../../libstand32/libstand.a
CFLAGS+= -I${.CURDIR}/../libi386
CFLAGS+= -I${.CURDIR}/../btx/lib
Modified: stable/10/sys/boot/i386/gptboot/Makefile
==============================================================================
--- stable/10/sys/boot/i386/gptboot/Makefile Thu Sep 4 20:21:30 2014 (r271129)
+++ stable/10/sys/boot/i386/gptboot/Makefile Thu Sep 4 20:35:53 2014 (r271130)
@@ -41,6 +41,8 @@ CFLAGS.gcc+= --param max-inline-insns-si
LD_FLAGS=-static -N --gc-sections
+LIBSTAND= ${.OBJDIR}/../../libstand32/libstand.a
+
# Pick up ../Makefile.inc early.
.include <bsd.init.mk>
Modified: stable/10/sys/boot/i386/gptzfsboot/Makefile
==============================================================================
--- stable/10/sys/boot/i386/gptzfsboot/Makefile Thu Sep 4 20:21:30 2014 (r271129)
+++ stable/10/sys/boot/i386/gptzfsboot/Makefile Thu Sep 4 20:35:53 2014 (r271130)
@@ -38,6 +38,8 @@ CFLAGS.gcc+= --param max-inline-insns-si
LD_FLAGS=-static -N --gc-sections
+LIBSTAND= ${.OBJDIR}/../../libstand32/libstand.a
+
# Pick up ../Makefile.inc early.
.include <bsd.init.mk>
Modified: stable/10/sys/boot/i386/loader/Makefile
==============================================================================
--- stable/10/sys/boot/i386/loader/Makefile Thu Sep 4 20:21:30 2014 (r271129)
+++ stable/10/sys/boot/i386/loader/Makefile Thu Sep 4 20:35:53 2014 (r271130)
@@ -69,6 +69,8 @@ LDFLAGS= -static -Ttext 0x0
LIBI386= ${.OBJDIR}/../libi386/libi386.a
CFLAGS+= -I${.CURDIR}/..
+LIBSTAND= ${.OBJDIR}/../../libstand32/libstand.a
+
# BTX components
CFLAGS+= -I${.CURDIR}/../btx/lib
Modified: stable/10/sys/boot/i386/zfsboot/Makefile
==============================================================================
--- stable/10/sys/boot/i386/zfsboot/Makefile Thu Sep 4 20:21:30 2014 (r271129)
+++ stable/10/sys/boot/i386/zfsboot/Makefile Thu Sep 4 20:35:53 2014 (r271130)
@@ -35,6 +35,8 @@ CFLAGS.gcc+= --param max-inline-insns-si
LD_FLAGS=-static -N --gc-sections
+LIBSTAND= ${.OBJDIR}/../../libstand32/libstand.a
+
# Pick up ../Makefile.inc early.
.include <bsd.init.mk>
Modified: stable/10/sys/boot/powerpc/ofw/Makefile
==============================================================================
--- stable/10/sys/boot/powerpc/ofw/Makefile Thu Sep 4 20:21:30 2014 (r271129)
+++ stable/10/sys/boot/powerpc/ofw/Makefile Thu Sep 4 20:35:53 2014 (r271130)
@@ -89,10 +89,11 @@ LIBOFW= ${.OBJDIR}/../../ofw/libofw/lib
CFLAGS+= -I${.CURDIR}/../../ofw/libofw
# where to get libstand from
+LIBSTAND= ${.OBJDIR}/../../libstand32/libstand.a
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBOFW} -lstand
+LDADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
Modified: stable/10/sys/boot/powerpc/ps3/Makefile
==============================================================================
--- stable/10/sys/boot/powerpc/ps3/Makefile Thu Sep 4 20:21:30 2014 (r271129)
+++ stable/10/sys/boot/powerpc/ps3/Makefile Thu Sep 4 20:35:53 2014 (r271130)
@@ -95,10 +95,11 @@ CFLAGS+= -Wa,-mppc64bridge
#.include "${.CURDIR}/../../ofw/common/Makefile.inc"
# where to get libstand from
+LIBSTAND= ${.OBJDIR}/../../libstand32/libstand.a
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBOFW} -lstand
+LDADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
SC_DFLT_FONT=cp437
Modified: stable/10/sys/boot/powerpc/uboot/Makefile
==============================================================================
--- stable/10/sys/boot/powerpc/uboot/Makefile Thu Sep 4 20:21:30 2014 (r271129)
+++ stable/10/sys/boot/powerpc/uboot/Makefile Thu Sep 4 20:35:53 2014 (r271130)
@@ -95,10 +95,11 @@ CFLAGS+= -I${.CURDIR}/../../uboot/lib
CFLAGS+= -I${.OBJDIR}/../../uboot/lib
# where to get libstand from
+LIBSTAND= ${.OBJDIR}/../../libstand32/libstand.a
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND}
-LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} -lstand
+LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND}
vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
More information about the svn-src-all
mailing list