diff --git a/ChangeLog b/ChangeLog
index 5d57defef5..d140360f48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-19  Ulrich Drepper  <drepper@redhat.com>
+
+	* elf/Versions [ld, GLIBC_PRIVATE]: Add _dl_debug_state.
+	* elf/dl-debug.c (_dl_debug_state): Add rtld_hidden_def.
+	* sysdeps/generic/ldsodefs.h (_dl_debug_state): Don't maek as
+	hidden but use rtld_hidden_proto.
+
 2004-10-19  Alfred M. Szmidt  <ams@gnu.org>
 
 	* sysdeps/generic/readonly-area.c (__readonly_str): Renamed to ...
diff --git a/elf/Versions b/elf/Versions
index 3797cc4eee..e24b2de04c 100644
--- a/elf/Versions
+++ b/elf/Versions
@@ -54,5 +54,7 @@ ld {
     _dl_get_tls_static_info; _dl_allocate_tls_init;
     _dl_tls_setup; _dl_rtld_di_serinfo;
     _dl_make_stack_executable;
+    # Only here for gdb while a better method is developed.
+    _dl_debug_state;
   }
 }
diff --git a/elf/dl-debug.c b/elf/dl-debug.c
index 2e7b9e84b9..bd6ee69189 100644
--- a/elf/dl-debug.c
+++ b/elf/dl-debug.c
@@ -57,3 +57,4 @@ void
 _dl_debug_state (void)
 {
 }
+rtld_hidden_def (_dl_debug_state)
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index f1062e7fa6..fd45bdc87f 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -785,7 +785,8 @@ extern void _dl_fini (void) internal_function;
    any shared object mappings.  The `r_state' member of `struct r_debug'
    says what change is taking place.  This function's address is
    the value of the `r_brk' member.  */
-extern void _dl_debug_state (void) attribute_hidden;
+extern void _dl_debug_state (void);
+rtld_hidden_proto (_dl_debug_state)
 
 /* Initialize `struct r_debug' if it has not already been done.  The
    argument is the run-time load address of the dynamic linker, to be put