diff options
| author | emaste <emaste@FreeBSD.org> | 2014-09-04 20:35:53 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2014-09-04 20:35:53 +0000 |
| commit | a3fd928a8025c53b2f93830718dfbb232f2964df (patch) | |
| tree | 96296ddf83c8124d105375c572c9d7721852c49d /sys/boot/i386 | |
| parent | 2c0d103cf13ff4497eae2aad237bfc048fe34f9e (diff) | |
| download | FreeBSD-src-a3fd928a8025c53b2f93830718dfbb232f2964df.zip FreeBSD-src-a3fd928a8025c53b2f93830718dfbb232f2964df.tar.gz | |
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
Diffstat (limited to 'sys/boot/i386')
| -rw-r--r-- | sys/boot/i386/efi/Makefile | 1 | ||||
| -rw-r--r-- | sys/boot/i386/gptboot/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/i386/gptzfsboot/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/i386/loader/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/i386/zfsboot/Makefile | 2 |
5 files changed, 9 insertions, 0 deletions
diff --git a/sys/boot/i386/efi/Makefile b/sys/boot/i386/efi/Makefile index 8e3e776..5a04466 100644 --- a/sys/boot/i386/efi/Makefile +++ b/sys/boot/i386/efi/Makefile @@ -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 diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile index 4806f13..f96616c 100644 --- a/sys/boot/i386/gptboot/Makefile +++ b/sys/boot/i386/gptboot/Makefile @@ -41,6 +41,8 @@ CFLAGS.gcc+= --param max-inline-insns-single=100 LD_FLAGS=-static -N --gc-sections +LIBSTAND= ${.OBJDIR}/../../libstand32/libstand.a + # Pick up ../Makefile.inc early. .include <bsd.init.mk> diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile index d7d079f2..a9d6ac8 100644 --- a/sys/boot/i386/gptzfsboot/Makefile +++ b/sys/boot/i386/gptzfsboot/Makefile @@ -38,6 +38,8 @@ CFLAGS.gcc+= --param max-inline-insns-single=100 LD_FLAGS=-static -N --gc-sections +LIBSTAND= ${.OBJDIR}/../../libstand32/libstand.a + # Pick up ../Makefile.inc early. .include <bsd.init.mk> diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index 0ee8bd8..b0a129e 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -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 diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile index b70aa9e..f4da642 100644 --- a/sys/boot/i386/zfsboot/Makefile +++ b/sys/boot/i386/zfsboot/Makefile @@ -35,6 +35,8 @@ CFLAGS.gcc+= --param max-inline-insns-single=100 LD_FLAGS=-static -N --gc-sections +LIBSTAND= ${.OBJDIR}/../../libstand32/libstand.a + # Pick up ../Makefile.inc early. .include <bsd.init.mk> |
