Page MenuHomeFreeBSD
Files F152465730

D3641.id8682.diff
No OneTemporary
Actions

D3641.id8682.diff
View Options

Index: sys/boot/efi/boot1/Makefile
===================================================================
--- sys/boot/efi/boot1/Makefile
+++ sys/boot/efi/boot1/Makefile
@@ -9,7 +9,7 @@
MK_SSP= no
-PROG= loader.sym
+PROG= boot1.sym
INTERNALPROG=
# architecture-specific loader code
@@ -50,7 +50,7 @@
LDADD+= -lstand
.endif
-${PROG}: ${LDSCRIPT}
+DPADD+= ${LDSCRIPT}
OBJCOPY?= objcopy
OBJDUMP?= objdump
@@ -63,19 +63,19 @@
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"
Index: sys/boot/efi/loader/Makefile
===================================================================
--- sys/boot/efi/loader/Makefile
+++ sys/boot/efi/loader/Makefile
@@ -12,7 +12,6 @@
PROG= loader.sym
INTERNALPROG=
-.PATH: ${.CURDIR}/../../efi/loader
# architecture-specific loader code
SRCS= autoload.c \
bootinfo.c \
@@ -97,7 +96,7 @@
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; \

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 16, 3:29 AM (13 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31574939
Default Alt Text
D3641.id8682.diff (1 KB)

Event Timeline