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

Make it a bit closer to the EFI build and tie up some loose ends.

Browse Source
This commit is contained in:
Peter Wemm 2002-04-06 04:33:53 +00:00
parent e91ab65ef6
commit 01c0b884af
4 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/boot/ia64/Makefile.inc Normal file
View File

@ -0,0 +1,4 @@
# $FreeBSD$
# Options used when building standalone components
CFLAGS+= -ffreestanding

1
sys/boot/ia64/libski/Makefile
View File

@ -15,7 +15,6 @@ CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH}
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
CFLAGS+= -I${.CURDIR}/../../efi/include CFLAGS+= -I${.CURDIR}/../../efi/include
CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH} CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH}
CFLAGS+= -ffreestanding
# Pick up the bootstrap header for some interface items # Pick up the bootstrap header for some interface items
CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.

16
sys/boot/ia64/ski/Makefile
View File

@ -24,13 +24,10 @@ LIBFICL=
.endif .endif
# where to get libstand from # where to get libstand from
#XXX need a better way to do this .if exists(${.OBJDIR}/../../../../lib/libstand/libstand.a)
LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a
.if !exists(${LIBSTAND})
LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a
.if !exists(${LIBSTAND}) .else
LIBSTAND= -lstand LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a
.endif
.endif .endif
.if exists(${.OBJDIR}/../libski/libski.a) .if exists(${.OBJDIR}/../libski/libski.a)
@ -50,7 +47,6 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}
CFLAGS+= -I${.CURDIR}/../../.. -I. CFLAGS+= -I${.CURDIR}/../../.. -I.
CFLAGS+= -I${.CURDIR}/../libski CFLAGS+= -I${.CURDIR}/../libski
CFLAGS+= -DLOADER CFLAGS+= -DLOADER
CFLAGS+= -ffreestanding
LDFLAGS= -nostdlib -T ${.CURDIR}/ldscript.ia64 LDFLAGS= -nostdlib -T ${.CURDIR}/ldscript.ia64
@ -74,14 +70,10 @@ beforeinstall:
${.OBJDIR}/${PROG}.help ${DESTDIR}/boot ${.OBJDIR}/${PROG}.help ${DESTDIR}/boot
.endif .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: machine:
ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include 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 \ ${LD} ${LDFLAGS} -o ${PROG} -M \
${OBJS} vers.o \ ${OBJS} vers.o \
${LIBFICL} ${LIBSTAND} ${LIBSKI} ${LIBSTAND} \ ${LIBFICL} ${LIBSTAND} ${LIBSKI} ${LIBSTAND} \

16
sys/boot/ia64/skiload/Makefile
View File

@ -24,13 +24,10 @@ LIBFICL=
.endif .endif
# where to get libstand from # where to get libstand from
#XXX need a better way to do this .if exists(${.OBJDIR}/../../../../lib/libstand/libstand.a)
LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a
.if !exists(${LIBSTAND})
LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a
.if !exists(${LIBSTAND}) .else
LIBSTAND= -lstand LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a
.endif
.endif .endif
.if exists(${.OBJDIR}/../libski/libski.a) .if exists(${.OBJDIR}/../libski/libski.a)
@ -50,7 +47,6 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}
CFLAGS+= -I${.CURDIR}/../../.. -I. CFLAGS+= -I${.CURDIR}/../../.. -I.
CFLAGS+= -I${.CURDIR}/../libski CFLAGS+= -I${.CURDIR}/../libski
CFLAGS+= -DLOADER CFLAGS+= -DLOADER
CFLAGS+= -ffreestanding
LDFLAGS= -nostdlib -T ${.CURDIR}/ldscript.ia64 LDFLAGS= -nostdlib -T ${.CURDIR}/ldscript.ia64
@ -74,14 +70,10 @@ beforeinstall:
${.OBJDIR}/${PROG}.help ${DESTDIR}/boot ${.OBJDIR}/${PROG}.help ${DESTDIR}/boot
.endif .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: machine:
ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include 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 \ ${LD} ${LDFLAGS} -o ${PROG} -M \
${OBJS} vers.o \ ${OBJS} vers.o \
${LIBFICL} ${LIBSTAND} ${LIBSKI} ${LIBSTAND} \ ${LIBFICL} ${LIBSTAND} ${LIBSKI} ${LIBSTAND} \