summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-11-22 16:34:04 -0500
committerMike Frysinger <vapier@gentoo.org>2012-11-23 15:23:18 -0500
commit800938a1268309932c20dc523bb226bcab4bfe18 (patch)
tree26ac53b665a7b0b61a49f32ced6245dba1707ceb
parent4e6e34e6ca4cc94f5c049f274fb7840293277b94 (diff)
downloadglibc-800938a1268309932c20dc523bb226bcab4bfe18.tar.gz
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. <god@politeia.in> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--ChangeLog4
-rw-r--r--elf/Makefile2
-rw-r--r--nptl_db/ChangeLog4
-rw-r--r--nptl_db/Makefile2
4 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4697a3532a..b4f6e0686c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-23 Mike Frysinger <vapier@gentoo.org>
+
+ * elf/Makefile ($(objpfx)ld.so): Change readelf to $(READELF).
+
2012-11-23 Andreas Schwab <schwab@linux-m68k.org>
* sysdeps/powerpc/fpu/libm-test-ulps: Update.
diff --git a/elf/Makefile b/elf/Makefile
index 7e5c9c87e9..6c7bc97d4a 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 417514978b..bded2fe184 100644
--- a/nptl_db/ChangeLog
+++ b/nptl_db/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-23 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile ($(objpfx)db-symbols.out): Change readelf to $(READELF).
+
2012-10-08 Jonathan Nieder <jrnieder@gmail.com>
[BZ #14661]
diff --git a/nptl_db/Makefile b/nptl_db/Makefile
index 6ccb3d0ccb..54721e7b6c 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