summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-02-15 01:43:12 +0000
committerUlrich Drepper <drepper@redhat.com>2000-02-15 01:43:12 +0000
commit1ca7cbcb451bd3cdb8f84fe9f4d952e3a87a1e8e (patch)
treebb9772bb4ad43beda15e6e4d5d38ace864dcf560
parenta496e4ce9546e451567a601600847675a5e76fe8 (diff)
downloadglibc-1ca7cbcb451bd3cdb8f84fe9f4d952e3a87a1e8e.tar.gz
glibc-1ca7cbcb451bd3cdb8f84fe9f4d952e3a87a1e8e.tar.xz
glibc-1ca7cbcb451bd3cdb8f84fe9f4d952e3a87a1e8e.zip
Update.
2000-02-14  Andreas Jaeger  <aj@suse.de>

	* elf/rtld.c (dl_main): Fix check for references to dynamic linker.
-rw-r--r--ChangeLog4
-rw-r--r--elf/rtld.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bbfbaa4ad7..2aa4a1a9b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-02-14  Andreas Jaeger  <aj@suse.de>
+
+	* elf/rtld.c (dl_main): Fix check for references to dynamic linker.
+
 2000-02-14  Ulrich Drepper  <drepper@redhat.com>
 
 	* manual/job.texi: Fix typos.
diff --git a/elf/rtld.c b/elf/rtld.c
index 5d0244990c..c7b98a1336 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1,5 +1,5 @@
 /* Run time dynamic linker.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -1041,7 +1041,7 @@ of this helper program; chances are you did not intend to run this program.\n\
       /* We must prepare the profiling.  */
       _dl_start_profile (_dl_profile_map, _dl_profile_output);
 
-    if (_dl_rtld_map.l_opencount > 0)
+    if (_dl_rtld_map.l_opencount > 1)
       {
 	/* There was an explicit ref to the dynamic linker as a shared lib.
 	   Re-relocate ourselves with user-controlled symbol definitions.  */