about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-01-07 18:54:08 +0000
committerUlrich Drepper <drepper@redhat.com>2003-01-07 18:54:08 +0000
commite9c7764ec9fe328dfac0c01a7f609d6a2a9bac00 (patch)
treec3c78725d69fee180a843ee9cac5be0238f22447 /elf
parent95b0af0dd7f9982f3bf8cfb28950a746b88d0efd (diff)
downloadglibc-e9c7764ec9fe328dfac0c01a7f609d6a2a9bac00.tar.gz
glibc-e9c7764ec9fe328dfac0c01a7f609d6a2a9bac00.tar.xz
glibc-e9c7764ec9fe328dfac0c01a7f609d6a2a9bac00.zip
Update.
2003-01-07  Jakub Jelinek  <jakub@redhat.com>

	* elf/rtld.c (_rtld_global): Remove _dl_dynamic_weak initializer.
	* elf/dl-support.c (_dl_dynamic_weak): Initialize to 0.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-support.c9
-rw-r--r--elf/rtld.c9
2 files changed, 2 insertions, 16 deletions
diff --git a/elf/dl-support.c b/elf/dl-support.c
index eae08954a2..0b7c119696 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -1,5 +1,5 @@
 /* Support for dynamic linking code in static libc.
-   Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1996-2002, 2003 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
@@ -41,14 +41,7 @@ size_t _dl_platformlen;
 
 int _dl_debug_mask;
 int _dl_lazy;
-/* XXX I know about at least one case where we depend on the old weak
-   behavior (it has to do with librt).  Until we get DSO groups implemented
-   we have to make this the default.  Bummer. --drepper  */
-#if 0
 int _dl_dynamic_weak;
-#else
-int _dl_dynamic_weak = 1;
-#endif
 
 /* If nonzero print warnings about problematic situations.  */
 int _dl_verbose;
diff --git a/elf/rtld.c b/elf/rtld.c
index b8e7f9af6b..bd66149dd1 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1,5 +1,5 @@
 /* Run time dynamic linker.
-   Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1995-2002, 2003 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
@@ -91,13 +91,6 @@ struct rtld_global _rtld_global =
     /* Get architecture specific initializer.  */
 #include <dl-procinfo.c>
     ._dl_debug_fd = STDERR_FILENO,
-#ifndef RTLD_CORRECT_DYNAMIC_WEAK
-    /* XXX I know about at least one case where we depend on the old
-       weak behavior (it has to do with librt).  Until we get DSO
-       groups implemented we have to make this the default.
-       Bummer. --drepper  */
-    ._dl_dynamic_weak = 1,
-#endif
 #ifdef NEED_DL_SYSINFO
     ._dl_sysinfo = DL_SYSINFO_DEFAULT,
 #endif