* 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.

diff --git a/ChangeLog b/ChangeLog
index e2ae9556d189b196ebb9e72afe61c8a4f347e74e..e77f4e0454ab8436bd4992bf9cbd987139144522 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-28  Roland McGrath  <roland@redhat.com>
+
+       * 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.
+
 2002-09-28  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/ia64/syscalls.list: Add __syscall_exit

diff --git a/elf/rtld.c b/elf/rtld.c
index 715dc1a7bfe2a6eaed543a84f1d5fb6a35ec6a67..19600644fb98eb0b4c4586015d5e536a7152b4e1 100644 (file)
--- 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