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

MFC r296769: boot/efi: Prefer nm to objdump

Browse Source 
Both objdump and nm are equally capable of reporting undefined symbols.

  This gets us a step closer to building without binutils as we have an nm
  implementation from ELF Tool Chain.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
emaste 2016-04-11 14:26:02 +00:00
parent d1b3dae178
commit 48db6cc4af
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/boot/efi/boot1/Makefile
View File

@ -68,8 +68,8 @@ LDADD+= -lstand
DPADD+= ${LDSCRIPT}
NM?= nm
OBJCOPY?= objcopy
OBJDUMP?= objdump
.if ${MACHINE_CPUARCH} == "amd64"
EFI_TARGET= efi-app-x86_64
@ -78,8 +78,8 @@ EFI_TARGET= efi-app-ia32
.endif
boot1.efi: ${PROG}
if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \
${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \
if ${NM} ${.ALLSRC} | grep ' U '; then \
echo "Undefined symbols in ${.ALLSRC}"; \
exit 1; \
fi
${OBJCOPY} -j .text -j .sdata -j .data \

6
sys/boot/efi/loader/Makefile
View File

@ -83,8 +83,8 @@ NEWVERSWHAT= "EFI loader" ${MACHINE}
vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/../../efi/loader/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
NM?= nm
OBJCOPY?= objcopy
OBJDUMP?= objdump
.if ${MACHINE_CPUARCH} == "amd64"
EFI_TARGET= efi-app-x86_64
@ -93,8 +93,8 @@ EFI_TARGET= efi-app-ia32
.endif
loader.efi: ${PROG}
if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \
${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \
if ${NM} ${.ALLSRC} | grep ' U '; then \
echo "Undefined symbols in ${.ALLSRC}"; \
exit 1; \
fi
${OBJCOPY} -j .text -j .sdata -j .data \