svn commit: r287930 - in head/sys/boot/efi: boot1 loader
John Baldwin
jhb at FreeBSD.org
Thu Sep 17 18:32:52 UTC 2015
Author: jhb
Date: Thu Sep 17 18:32:51 2015
New Revision: 287930
URL: https://svnweb.freebsd.org/changeset/base/287930
Log:
Various small cleanups to EFI loader Makefiles.
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D3641
Modified:
head/sys/boot/efi/boot1/Makefile
head/sys/boot/efi/loader/Makefile
Modified: head/sys/boot/efi/boot1/Makefile
==============================================================================
--- head/sys/boot/efi/boot1/Makefile Thu Sep 17 18:21:47 2015 (r287929)
+++ head/sys/boot/efi/boot1/Makefile Thu Sep 17 18:32:51 2015 (r287930)
@@ -9,7 +9,7 @@ MAN=
MK_SSP= no
-PROG= loader.sym
+PROG= boot1.sym
INTERNALPROG=
# architecture-specific loader code
@@ -50,7 +50,7 @@ DPADD+= ${LIBSTAND}
LDADD+= -lstand
.endif
-${PROG}: ${LDSCRIPT}
+DPADD+= ${LDSCRIPT}
OBJCOPY?= objcopy
OBJDUMP?= objdump
@@ -63,19 +63,19 @@ EFI_TARGET= efi-app-ia32
EFI_TARGET= binary
.endif
-boot1.efi: loader.sym
+boot1.efi: ${PROG}
if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \
${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \
exit 1; \
fi
${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \
-j .dynamic -j .dynsym -j .rel.dyn \
- -j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \
+ -j .rela.dyn -j .reloc -j .eh_frame \
--output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET}
boot1.o: ${.CURDIR}/../../common/ufsread.c
-# The following inserts out objects into a template FAT file system
+# The following inserts our objects into a template FAT file system
# created by generate-fat.sh
.include "${.CURDIR}/Makefile.fat"
Modified: head/sys/boot/efi/loader/Makefile
==============================================================================
--- head/sys/boot/efi/loader/Makefile Thu Sep 17 18:21:47 2015 (r287929)
+++ head/sys/boot/efi/loader/Makefile Thu Sep 17 18:32:51 2015 (r287930)
@@ -12,7 +12,6 @@ MK_SSP= no
PROG= loader.sym
INTERNALPROG=
-.PATH: ${.CURDIR}/../../efi/loader
# architecture-specific loader code
SRCS= autoload.c \
bootinfo.c \
@@ -97,7 +96,7 @@ EFI_TARGET= efi-app-ia32
EFI_TARGET= binary
.endif
-loader.efi: loader.sym
+loader.efi: ${PROG}
if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \
${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \
exit 1; \
More information about the svn-src-all
mailing list