about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--elf/dl-dst.h8
2 files changed, 3 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index cb5f6c67ee..6b40eeb4e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-08-12  Ulrich Drepper  <drepper@redhat.com>
 
+	* elf/dl-dst.h: No need for _dl_dst_count, _dl_dst_substitute,
+	and _dl_get_origin defines anymore.
+
 	* sysdeps/unix/sysv/linux/clock_gettime.c (maybe_syscall_gettime_cpu):
 	Build fix for systems which might lack POSIX timer support.
 
diff --git a/elf/dl-dst.h b/elf/dl-dst.h
index 175b7cd195..76076a6036 100644
--- a/elf/dl-dst.h
+++ b/elf/dl-dst.h
@@ -29,9 +29,6 @@
       __cnt = _dl_dst_count (__sf, is_path);			      \
 									      \
     __cnt; })
-#ifndef IS_IN_rtld
-# define _dl_dst_count GLRO(dl_dst_count)
-#endif
 
 
 /* Guess from the number of DSTs the length of the result string.  */
@@ -79,8 +76,3 @@
     }									      \
   else
 #endif
-
-#ifndef IS_IN_rtld
-# define _dl_get_origin GLRO(dl_get_origin)
-# define _dl_dst_substitute GLRO(dl_dst_substitute)
-#endif