diff --git a/ChangeLog b/ChangeLog
index e2ae9556d1..e77f4e0454 100644
--- 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 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