about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-09-29 09:35:51 +0000
committerRoland McGrath <roland@gnu.org>2002-09-29 09:35:51 +0000
commit3c25964fb000ed7f6bd4ec30d02b3819c581b4b3 (patch)
tree8b13c4cb612f4116bfd13c8d5b51c38987769a2b /elf
parent70d633a059d1e4560cd703e0d8bc3545a3226e7c (diff)
downloadglibc-3c25964fb000ed7f6bd4ec30d02b3819c581b4b3.tar.gz
glibc-3c25964fb000ed7f6bd4ec30d02b3819c581b4b3.tar.xz
glibc-3c25964fb000ed7f6bd4ec30d02b3819c581b4b3.zip
* elf/rtld.c (_dl_start): Fix conditional for declaring CNT.
	* aclocal.m4 (LIBC_PROG_BINUTILS): Don't clobber $RANLIB with ranlib
	before we check it.
Diffstat (limited to 'elf')
-rw-r--r--elf/rtld.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index 715dc1a7bf..19600644fb 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -276,7 +276,7 @@ _dl_start (void *arg)
   struct dl_start_final_info info;
 # define bootstrap_map info.l
 #endif
-#if !defined HAVE_BUILTIN_MEMSET || defined USE_TLS
+#if USE_TLS || (!DONT_USE_BOOTSTRAP_MAP && !HAVE_BUILTIN_MEMSET)
   size_t cnt;
 #endif
 #ifdef USE_TLS