diff options
| author | emaste <emaste@FreeBSD.org> | 2016-03-12 21:44:33 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2016-03-12 21:44:33 +0000 |
| commit | b1bc033d67e232dcd98d66a976a14c3325cb2c4a (patch) | |
| tree | fd22776e291ee6af273b7aeeefdc69c2946f8a58 /sys/boot/efi | |
| parent | b1e2503a5c8eb116ca3d3da924ff104d666788cd (diff) | |
| download | FreeBSD-src-b1bc033d67e232dcd98d66a976a14c3325cb2c4a.zip FreeBSD-src-b1bc033d67e232dcd98d66a976a14c3325cb2c4a.tar.gz | |
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.
Reviewed by: bdrewery
MFC after: 1 month
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D5613
Diffstat (limited to 'sys/boot/efi')
| -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 0675cca..0c23945 100644 --- a/sys/boot/efi/boot1/Makefile +++ b/sys/boot/efi/boot1/Makefile @@ -73,8 +73,8 @@ LDADD+= -lstand DPADD+= ${LDSCRIPT} +NM?= nm OBJCOPY?= objcopy -OBJDUMP?= objdump .if ${MACHINE_CPUARCH} == "amd64" EFI_TARGET= efi-app-x86_64 @@ -85,8 +85,8 @@ EFI_TARGET= binary .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 .peheader -j .text -j .sdata -j .data \ diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile index 9246bf2..f4f6cbf 100644 --- a/sys/boot/efi/loader/Makefile +++ b/sys/boot/efi/loader/Makefile @@ -98,8 +98,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 @@ -110,8 +110,8 @@ EFI_TARGET= binary .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 .peheader -j .text -j .sdata -j .data \ |
