Fri Aug 5 17:08:10 2016 UTC ()
PR port-ia64/51261

Put skiload loader.efi loader.sym in /usr/mdec


(scole)
diff -r1.3 -r1.4 src/sys/arch/ia64/stand/ia64/efi/Makefile
diff -r1.4 -r1.5 src/sys/arch/ia64/stand/ia64/ski/Makefile
cvs diff -r1.3 -r1.4 src/sys/arch/ia64/stand/ia64/efi/Makefile (expand / switch to unified diff)

--- src/sys/arch/ia64/stand/ia64/efi/Makefile 2011/01/22 19:19:19 1.3
+++ src/sys/arch/ia64/stand/ia64/efi/Makefile 2016/08/05 17:08:10 1.4
@@ -1,73 +1,62 @@ @@ -1,73 +1,62 @@
 1# $NetBSD: Makefile,v 1.4 2016/08/05 17:08:10 scole Exp $
 2
1S= ${.CURDIR}/../../../../.. 3S= ${.CURDIR}/../../../../..
2 4
3VERSIONFILE= ${.CURDIR}/version 5VERSIONFILE= ${.CURDIR}/version
4 6
5.include "../Makefile.booters" 7.include "../Makefile.booters"
6 8
7PROG= loader.sym 9PROGS= loader.sym loader.efi
8 
9MAN=# Tell bsd.prog.mk that loader.sym is not a man page. 
10 
11INTERNALPROG= 
12 10
 11MAN.loader.sym= # no man
 12MAN.loader.efi= # no man
13 13
14SRCS= start.S conf.c efimd.c vers.c main.c 
15 
16CPPFLAGS+= -I${IA64_STAND_DIR}/efi/include 
17CPPFLAGS+= -I${IA64_STAND_DIR}/efi/include/${MACHINE_ARCH} 
18CPPFLAGS+= -I${IA64_STAND_DIR}/efi/libefi/ 14CPPFLAGS+= -I${IA64_STAND_DIR}/efi/libefi/
19CPPFLAGS+= -I${IA64_STAND_DIR}/efi/libshell/ 
20CPPFLAGS+= -I${IA64_STAND_DIR}/common/ 15CPPFLAGS+= -I${IA64_STAND_DIR}/common/
21CPPFLAGS+= -I${S} 16CPPFLAGS+= -I${S}
22 17CPPFLAGS+= -DLOADER -DLIBKERN_OPTIMISE_SPACE -DHEAP_VARIABLE
23CPPFLAGS+= -DLOADER 
24 
25CPPFLAGS+= -DLIBKERN_OPTIMISE_SPACE \ 
26 -DHEAP_VARIABLE 
27 
28 
29# Pick up FreeBSD glue 
30#CPPFLAGS+= -I${.CURDIR}/../../ 
31 18
32# Always add MI sources 19# Always add MI sources
33.PATH: ${.CURDIR}/../../common 20.PATH: ${.CURDIR}/../../common
34.include "${.CURDIR}/../../common/Makefile.inc" 21.include "${.CURDIR}/../../common/Makefile.inc"
35 22
 23# need to do this after common stuff pulled in
 24SRCS.loader.sym:= start.S conf.c efimd.c vers.c main.c ${SRCS}
36 25
37FILES= loader.efi 26# XXX verify
38 27BINDIR?= /usr/mdec
39 28
40LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH} 29LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH}
41LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic -nostdlib 30LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic -nostdlib
42 31
43${PROG}: ${LDSCRIPT} 32loader.sym: ${LDSCRIPT}
44 33
45CLEANFILES+= vers.c loader.efi ${OBJS} 34CLEANFILES+= vers.c ${OBJS}
46 35
47NEWVERSWHAT= "EFI boot" ${MACHINE_ARCH} 36NEWVERSWHAT= "EFI boot" ${MACHINE_ARCH}
48 37
49vers.c: ${VERSIONFILE} ${SOURCES} 38vers.c: ${VERSIONFILE} ${SOURCES}
50 ${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \ 39 ${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
51 ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT} 40 ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
52 41
53loader.efi: ${PROG} 42loader.efi: loader.sym
54 if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \ 43 if [ `${OBJDUMP} -t loader.sym | fgrep '*UND*' | wc -l` != 0 ]; then \
55 ${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \ 44 ${OBJDUMP} -t loader.sym | fgrep '*UND*'; \
56 exit 1; \ 45 exit 1; \
57 fi 46 fi
58 ${OBJCOPY} -j .data -j .dynamic -j .dynstr -j .dynsym -j .hash \ 47 ${OBJCOPY} -j .data -j .dynamic -j .dynstr -j .dynsym -j .hash \
59 -j .rela.dyn -j .reloc -j .sdata -j .text \ 48 -j .rela.dyn -j .reloc -j .sdata -j .text \
60 --target=efi-app-${MACHINE_ARCH} ${.ALLSRC} ${.TARGET} 49 --target=efi-app-${MACHINE_ARCH} loader.sym ${.TARGET}
61 @echo link finished. 50 @echo link finished.
62 51
63all: loader.efi 52all: loader.efi
64 53
65# Pull in libefi 54# Pull in libefi
66.include "${IA64_STAND_DIR}/efi/libefi/Makefile.inc" 55.include "${IA64_STAND_DIR}/efi/libefi/Makefile.inc"
67LIBEFI= ${EFILIB} 56LIBEFI= ${EFILIB}
68 57
69DPADD= ${LIBEFI} ${LIBLIST} 58DPADD= ${LIBEFI} ${LIBLIST}
70 59
71# Cross dependencies between LIBEFI and LIB(SA|KERN). Need to elaborate below. 60# Cross dependencies between LIBEFI and LIB(SA|KERN). Need to elaborate below.
72LDADD= ${LIBEFI} ${LIBLIST} ${LIBEFI} ${LIBLIST} 61LDADD= ${LIBEFI} ${LIBLIST} ${LIBEFI} ${LIBLIST}
73 62
cvs diff -r1.4 -r1.5 src/sys/arch/ia64/stand/ia64/ski/Makefile (expand / switch to unified diff)

--- src/sys/arch/ia64/stand/ia64/ski/Makefile 2011/01/22 19:19:19 1.4
+++ src/sys/arch/ia64/stand/ia64/ski/Makefile 2016/08/05 17:08:10 1.5
@@ -1,33 +1,32 @@ @@ -1,33 +1,32 @@
1S= ${.CURDIR}/../../../../.. 1S= ${.CURDIR}/../../../../..
2 2
3VERSIONFILE= ${.CURDIR}/version 3VERSIONFILE= ${.CURDIR}/version
4 4
5.include "../Makefile.booters" 5.include "../Makefile.booters"
6 6
7PROG= skiload 7PROG= skiload
8MAN=# 8MAN=#
 9BINDIR?= /usr/mdec
9 10
10STRIP= # We must not strip skiload at install time. 11STRIP= # We must not strip skiload at install time.
11 12
12SRCS= conf.c copy.c delay.c devicename.c efi_stub.c exit.c \ 13SRCS= conf.c copy.c delay.c devicename.c efi_stub.c exit.c \
13 main.c skiconsole.c pal_stub.S sal_stub.c skifs.c ssc.c \ 14 main.c skiconsole.c pal_stub.S sal_stub.c skifs.c ssc.c \
14 start.S time.c vers.c acpi_stub.c bootinfo.c exec.c 15 start.S time.c vers.c acpi_stub.c bootinfo.c exec.c
15 16
16CPPFLAGS+= -DLOADER -DSKIFS 17CPPFLAGS+= -DLOADER -DSKIFS
17CPPFLAGS+= -I${S} 18CPPFLAGS+= -I${S}
18CPPFLAGS+= -I${IA64_STAND_DIR}/common 19CPPFLAGS+= -I${IA64_STAND_DIR}/common
19CPPFLAGS+= -I${IA64_STAND_DIR}/efi/include 
20CPPFLAGS+= -I${IA64_STAND_DIR}/efi/include/${MACHINE_ARCH} 
21 20
22CPPFLAGS+= -DLIBKERN_OPTIMISE_SPACE \ 21CPPFLAGS+= -DLIBKERN_OPTIMISE_SPACE \
23 -DHEAP_VARIABLE 22 -DHEAP_VARIABLE
24 23
25# Always add MI sources 24# Always add MI sources
26.PATH: ${.CURDIR}/../../common 25.PATH: ${.CURDIR}/../../common
27.include "${.CURDIR}/../../common/Makefile.inc" 26.include "${.CURDIR}/../../common/Makefile.inc"
28 27
29LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH} 28LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH}
30LDFLAGS= -Wl,-T${LDSCRIPT} -symbolic -nostdlib #-shared 29LDFLAGS= -Wl,-T${LDSCRIPT} -symbolic -nostdlib #-shared
31 30
32${PROG}: ${LDSCRIPT} 31${PROG}: ${LDSCRIPT}
33 32