From 3c25964fb000ed7f6bd4ec30d02b3819c581b4b3 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 29 Sep 2002 09:35:51 +0000 Subject: [PATCH] * 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. --- ChangeLog | 7 +++++++ elf/rtld.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e2ae955..e77f4e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-09-28 Roland McGrath + + * 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 * sysdeps/unix/sysv/linux/ia64/syscalls.list: Add __syscall_exit diff --git a/elf/rtld.c b/elf/rtld.c index 715dc1a..1960064 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 -- 2.7.4