Date: Fri, 5 Apr 2002 21:08:53 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9173 for review Message-ID: <200204060508.g3658rD78374@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9173 Change 9173 by peter@peter_daintree on 2002/04/05 21:08:35 IFC @9172 (pick up stuff committed to main tree) Affected files ... ... //depot/projects/ia64/sys/boot/common/load_elf.c#4 integrate ... //depot/projects/ia64/sys/boot/efi/Makefile.inc#4 integrate ... //depot/projects/ia64/sys/boot/efi/loader/Makefile#9 integrate ... //depot/projects/ia64/sys/boot/ia64/Makefile.inc#1 branch ... //depot/projects/ia64/sys/boot/ia64/libski/Makefile#4 integrate ... //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#8 integrate Differences ... ==== //depot/projects/ia64/sys/boot/common/load_elf.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.21 2001/09/11 01:09:19 peter Exp $ + * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.22 2002/04/06 04:09:42 peter Exp $ */ #include <sys/param.h> ==== //depot/projects/ia64/sys/boot/efi/Makefile.inc#4 (text+ko) ==== @@ -1,9 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.3 2002/03/19 10:51:57 peter Exp $ +# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.4 2002/04/06 04:29:36 peter Exp $ # Options used when building app-specific efi components - -DPADD+= ${DESTDIR}/${LIBDIR}/libstand.a -LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand -LIBSTAND= -lstand -LIBEFI= ${.OBJDIR}/../libefi/libefi.a CFLAGS+= -ffreestanding ==== //depot/projects/ia64/sys/boot/efi/loader/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.12 2002/04/06 03:39:22 peter Exp $ +# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.14 2002/04/06 04:29:36 peter Exp $ .PATH: ${.CURDIR}/../common @@ -23,6 +23,19 @@ LIBFICL= .endif +# where to get libstand from +.if exists(${.OBJDIR}/../../../../lib/libstand/libstand.a) +LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a +.else +LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a +.endif + +.if exists(${.OBJDIR}/../libefi/libefi.a) +LIBEFI= ${.OBJDIR}/../libefi/libefi.a +.else +LIBEFI= ${.CURDIR}/../libefi/libefi.a +.endif + # Always add MI sources .PATH: ${.CURDIR}/../../common .include <${.CURDIR}/../../common/Makefile.inc> @@ -85,9 +98,8 @@ .include <bsd.prog.mk> -${BASE}.sym: ${OBJS} ${LIBEFI} ${CRT} vers.o +${BASE}.sym: ${OBJS} ${LIBFICL} ${LIBEFI} ${LIBSTAND} ${CRT} vers.o ${LD} ${LDFLAGS} -o ${BASE}.sym -M ${CRT} ${OBJS} vers.o \ - ${LIBFICL} ${LIBEFI} -L${DESTDIR}${LIBDIR} ${LIBSTAND} \ - > ${.OBJDIR}/${BASE}.list + ${LIBFICL} ${LIBEFI} ${LIBSTAND} > ${.OBJDIR}/${BASE}.list beforedepend ${OBJS}: machine ==== //depot/projects/ia64/sys/boot/ia64/libski/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ia64/libski/Makefile,v 1.3 2002/03/19 10:51:57 peter Exp $ +# $FreeBSD: src/sys/boot/ia64/libski/Makefile,v 1.4 2002/04/06 04:33:53 peter Exp $ LIB= ski NOPIC= true @@ -15,7 +15,6 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ CFLAGS+= -I${.CURDIR}/../../efi/include CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH} -CFLAGS+= -ffreestanding # Pick up the bootstrap header for some interface items CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. ==== //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.5 2002/03/29 22:53:56 marcel Exp $ +# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.7 2002/04/06 04:33:53 peter Exp $ .PATH: ${.CURDIR}/../common @@ -11,7 +11,7 @@ # Enable BootForth BOOT_FORTH= yes CFLAGS+= -g -CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/alpha +CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/ia64 .if BOOT_FORTH CFLAGS+= -DBOOT_FORTH .if exists(${.OBJDIR}/../../ficl/libficl.a) @@ -24,13 +24,10 @@ .endif # where to get libstand from -#XXX need a better way to do this +.if exists(${.OBJDIR}/../../../../lib/libstand/libstand.a) +LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a +.else LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a -.if !exists(${LIBSTAND}) -LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a -.if !exists(${LIBSTAND}) -LIBSTAND= -lstand -.endif .endif .if exists(${.OBJDIR}/../libski/libski.a) @@ -50,7 +47,6 @@ CFLAGS+= -I${.CURDIR}/../../.. -I. CFLAGS+= -I${.CURDIR}/../libski CFLAGS+= -DLOADER -CFLAGS+= -ffreestanding LDFLAGS= -nostdlib -T ${.CURDIR}/ldscript.ia64 @@ -74,14 +70,10 @@ ${.OBJDIR}/${PROG}.help ${DESTDIR}/boot .endif -# Other fragments still to be brought in from ../Makfile.booters? -start.o: ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/start.S - ${CC} -c ${CFLAGS} ${.IMPSRC} - machine: ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine -${PROG}: ${OBJS} ${LIBFICL} ${LIBSKI} vers.o +${PROG}: ${OBJS} ${LIBFICL} ${LIBSKI} ${LIBSTAND} vers.o ${LD} ${LDFLAGS} -o ${PROG} -M \ ${OBJS} vers.o \ ${LIBFICL} ${LIBSTAND} ${LIBSKI} ${LIBSTAND} \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204060508.g3658rD78374>