about summary refs log tree commit diff
path: root/elf/rtld.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-08-25 07:22:45 +0000
committerUlrich Drepper <drepper@redhat.com>2002-08-25 07:22:45 +0000
commit5a47e7f2a85ecc103175095c0f4104065fd4d8db (patch)
tree34005c5173e4e43e2e62ab82a8eec354e5375e83 /elf/rtld.c
parente2084ba07167ab49c5fadae4c34aa014b694317e (diff)
downloadglibc-5a47e7f2a85ecc103175095c0f4104065fd4d8db.tar.gz
glibc-5a47e7f2a85ecc103175095c0f4104065fd4d8db.tar.xz
glibc-5a47e7f2a85ecc103175095c0f4104065fd4d8db.zip
Update.
2002-08-25  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/i386/elf/configure.in: Unconditionally define
	PI_STATIC_AND_HIDDEN.
	* elf/rtld.c (DONT_USE_BOOTSTRAP_MAP): Define only if
	PI_STATIC_AND_HIDDEN is defined as well.
	* config.h.in: Add PI_STATIC_AND_HIDDEN entry.

	* elf/rtld.c (dl_main): Likewise.
Diffstat (limited to 'elf/rtld.c')
-rw-r--r--elf/rtld.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index e74da5438c..69075053a7 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -129,7 +129,7 @@ TLS_INIT_HELPER
    is fine, too.  The latter is impotant here.  We can avoid setting
    up a temporary link map for ld.so if we can mark _rtld_global as
    hidden.  */
-#ifdef HAVE_HIDDEN
+#if defined PI_STATIC_AND_HIDDEN && defined HAVE_HIDDEN
 # define DONT_USE_BOOTSTRAP_MAP	1
 #endif
 
@@ -1215,7 +1215,7 @@ cannot allocate TLS data structures for initial thread");
 	}
 
       if (__builtin_expect (mode, trace) != trace)
-	for (i = 1; i < _dl_argc; ++i)
+	for (i = 1; i < (unsigned int) _dl_argc; ++i)
 	  {
 	    const ElfW(Sym) *ref = NULL;
 	    ElfW(Addr) loadbase;