From 800938a1268309932c20dc523bb226bcab4bfe18 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 22 Nov 2012 16:34:04 -0500 Subject: [PATCH] use $(READELF) rather than readelf We setup $(READELF) and use it everywhere, so fix the two places that were using readelf directly. Reported-by: Denis M. Signed-off-by: Mike Frysinger --- ChangeLog | 4 ++++ elf/Makefile | 2 +- nptl_db/ChangeLog | 4 ++++ nptl_db/Makefile | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4697a35..b4f6e06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-11-23 Mike Frysinger + + * elf/Makefile ($(objpfx)ld.so): Change readelf to $(READELF). + 2012-11-23 Andreas Schwab * sysdeps/powerpc/fpu/libm-test-ulps: Update. diff --git a/elf/Makefile b/elf/Makefile index 7e5c9c8..6c7bc97 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -336,7 +336,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map) $(filter-out $(map-file),$^) $(load-map-file) \ -Wl,-soname=$(rtld-installed-name) \ -Wl,-defsym=_begin=0 - readelf -s $@ \ + $(READELF) -s $@ \ | $(AWK) '($$7 ~ /^UND(|EF)$$/ && $$1 != "0:" && $$4 != "REGISTER") { print; p=1 } END { exit p != 0 }' # interp.c exists just to get this string into the libraries. diff --git a/nptl_db/ChangeLog b/nptl_db/ChangeLog index 4175149..bded2fe 100644 --- a/nptl_db/ChangeLog +++ b/nptl_db/ChangeLog @@ -1,3 +1,7 @@ +2012-11-23 Mike Frysinger + + * Makefile ($(objpfx)db-symbols.out): Change readelf to $(READELF). + 2012-10-08 Jonathan Nieder [BZ #14661] diff --git a/nptl_db/Makefile b/nptl_db/Makefile index 6ccb3d0..54721e7 100644 --- a/nptl_db/Makefile +++ b/nptl_db/Makefile @@ -60,6 +60,6 @@ $(objpfx)libthread_db.so: $(common-objpfx)libc.so \ tests: $(objpfx)db-symbols.out $(objpfx)db-symbols.out: $(objpfx)db-symbols.v.i \ $(common-objpfx)nptl/libpthread.so - LC_ALL=C readelf -W -s $(filter %.so,$^) | $(AWK) -f $< > $@ + LC_ALL=C $(READELF) -W -s $(filter %.so,$^) | $(AWK) -f $< > $@ $(objpfx)db-symbols.v.i: db-symbols.awk -- 2.7.4