Module Name: src
Committed By: scole
Date: Fri Aug 5 17:08:10 UTC 2016
Modified Files:
src/sys/arch/ia64/stand/ia64/efi: Makefile
src/sys/arch/ia64/stand/ia64/ski: Makefile
Log Message:
PR port-ia64/51261
Put skiload loader.efi loader.sym in /usr/mdec
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/ia64/efi/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/stand/ia64/ski/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/ia64/stand/ia64/efi/Makefile
diff -u src/sys/arch/ia64/stand/ia64/efi/Makefile:1.3 src/sys/arch/ia64/stand/ia64/efi/Makefile:1.4
--- src/sys/arch/ia64/stand/ia64/efi/Makefile:1.3 Sat Jan 22 19:19:19 2011
+++ src/sys/arch/ia64/stand/ia64/efi/Makefile Fri Aug 5 17:08:10 2016
@@ -1,48 +1,37 @@
+# $NetBSD: Makefile,v 1.4 2016/08/05 17:08:10 scole Exp $
+
S= ${.CURDIR}/../../../../..
VERSIONFILE= ${.CURDIR}/version
.include "../Makefile.booters"
-PROG= loader.sym
-
-MAN=# Tell bsd.prog.mk that loader.sym is not a man page.
-
-INTERNALPROG=
+PROGS= loader.sym loader.efi
+MAN.loader.sym= # no man
+MAN.loader.efi= # no man
-SRCS= start.S conf.c efimd.c vers.c main.c
-
-CPPFLAGS+= -I${IA64_STAND_DIR}/efi/include
-CPPFLAGS+= -I${IA64_STAND_DIR}/efi/include/${MACHINE_ARCH}
CPPFLAGS+= -I${IA64_STAND_DIR}/efi/libefi/
-CPPFLAGS+= -I${IA64_STAND_DIR}/efi/libshell/
CPPFLAGS+= -I${IA64_STAND_DIR}/common/
CPPFLAGS+= -I${S}
-
-CPPFLAGS+= -DLOADER
-
-CPPFLAGS+= -DLIBKERN_OPTIMISE_SPACE \
- -DHEAP_VARIABLE
-
-
-# Pick up FreeBSD glue
-#CPPFLAGS+= -I${.CURDIR}/../../
+CPPFLAGS+= -DLOADER -DLIBKERN_OPTIMISE_SPACE -DHEAP_VARIABLE
# Always add MI sources
.PATH: ${.CURDIR}/../../common
.include "${.CURDIR}/../../common/Makefile.inc"
+# need to do this after common stuff pulled in
+SRCS.loader.sym:= start.S conf.c efimd.c vers.c main.c ${SRCS}
-FILES= loader.efi
-
+# XXX verify
+BINDIR?= /usr/mdec
LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH}
LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic -nostdlib
-${PROG}: ${LDSCRIPT}
+loader.sym: ${LDSCRIPT}
-CLEANFILES+= vers.c loader.efi ${OBJS}
+CLEANFILES+= vers.c ${OBJS}
NEWVERSWHAT= "EFI boot" ${MACHINE_ARCH}
@@ -50,14 +39,14 @@ vers.c: ${VERSIONFILE} ${SOURCES}
${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
-loader.efi: ${PROG}
- if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \
- ${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \
+loader.efi: loader.sym
+ if [ `${OBJDUMP} -t loader.sym | fgrep '*UND*' | wc -l` != 0 ]; then \
+ ${OBJDUMP} -t loader.sym | fgrep '*UND*'; \
exit 1; \
fi
${OBJCOPY} -j .data -j .dynamic -j .dynstr -j .dynsym -j .hash \
-j .rela.dyn -j .reloc -j .sdata -j .text \
- --target=efi-app-${MACHINE_ARCH} ${.ALLSRC} ${.TARGET}
+ --target=efi-app-${MACHINE_ARCH} loader.sym ${.TARGET}
@echo link finished.
all: loader.efi
Index: src/sys/arch/ia64/stand/ia64/ski/Makefile
diff -u src/sys/arch/ia64/stand/ia64/ski/Makefile:1.4 src/sys/arch/ia64/stand/ia64/ski/Makefile:1.5
--- src/sys/arch/ia64/stand/ia64/ski/Makefile:1.4 Sat Jan 22 19:19:19 2011
+++ src/sys/arch/ia64/stand/ia64/ski/Makefile Fri Aug 5 17:08:10 2016
@@ -6,6 +6,7 @@ VERSIONFILE= ${.CURDIR}/version
PROG= skiload
MAN=#
+BINDIR?= /usr/mdec
STRIP= # We must not strip skiload at install time.
@@ -16,8 +17,6 @@ SRCS= conf.c copy.c delay.c devicename.
CPPFLAGS+= -DLOADER -DSKIFS
CPPFLAGS+= -I${S}
CPPFLAGS+= -I${IA64_STAND_DIR}/common
-CPPFLAGS+= -I${IA64_STAND_DIR}/efi/include
-CPPFLAGS+= -I${IA64_STAND_DIR}/efi/include/${MACHINE_ARCH}
CPPFLAGS+= -DLIBKERN_OPTIMISE_SPACE \
-DHEAP_VARIABLE
