diff options
| author | emaste <emaste@FreeBSD.org> | 2016-04-11 14:26:02 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2016-04-11 14:26:02 +0000 |
| commit | 48db6cc4af720f4e97712819de72f37ca0140725 (patch) | |
| tree | 81df69f2e15cc2908e62babd4010f9c3de43b499 /sys/boot | |
| parent | d1b3dae178716d84ed93c932b66dc63df8ef91c6 (diff) | |
| download | FreeBSD-src-48db6cc4af720f4e97712819de72f37ca0140725.zip FreeBSD-src-48db6cc4af720f4e97712819de72f37ca0140725.tar.gz | |
MFC r296769: boot/efi: Prefer nm to objdump
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
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/efi/boot1/Makefile | 6 | ||||
| -rw-r--r-- | sys/boot/efi/loader/Makefile | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/boot/efi/boot1/Makefile b/sys/boot/efi/boot1/Makefile index 5c2c239..6b04d58 100644 --- a/sys/boot/efi/boot1/Makefile +++ b/sys/boot/efi/boot1/Makefile @@ -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 \ diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile index c554044..bc38ea6 100644 --- a/sys/boot/efi/loader/Makefile +++ b/sys/boot/efi/loader/Makefile @@ -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 \ |
