* elf/dl-load.c: Don't declare __libc_stack_end. * sysdeps/generic/libc-start.c: Likewise. * sysdeps/unix/sysv/linux/dl-execstack.c: Likewise. * sysdeps/generic/segfault.c: Likewise. Include ldsodefs.h. * sysdeps/generic/backtrace.c: Likewise. linuxthreads/ * attr.c: Include ldsodefs.h. (pthread_getattr_np): Don't declare __libc_stack_end. nptl/ * allocatestack.c: Don't declare __libc_stack_end. * init.c (__pthread_initialize_minimal_internal): Likewise. * pthread_getattr_np.c (pthread_getattr_np): Likewise.

2004-01-16  Richard Henderson  <rth@redhat.com>

        * elf/dl-load.c: Don't declare __libc_stack_end.
        * sysdeps/generic/libc-start.c: Likewise.
        * sysdeps/unix/sysv/linux/dl-execstack.c: Likewise.
        * sysdeps/generic/segfault.c: Likewise.  Include ldsodefs.h.
        * sysdeps/generic/backtrace.c: Likewise.

12 files changed, 27 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 09a828d412..3797214864 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-16  Richard Henderson  <rth@redhat.com>
+
+        * elf/dl-load.c: Don't declare __libc_stack_end.
+        * sysdeps/generic/libc-start.c: Likewise.
+        * sysdeps/unix/sysv/linux/dl-execstack.c: Likewise.
+        * sysdeps/generic/segfault.c: Likewise.  Include ldsodefs.h.
+        * sysdeps/generic/backtrace.c: Likewise.
+
 2004-01-15  Ulrich Drepper  <drepper@redhat.com>
 
 	* Versions.def: Add GLIBC_2.3.4.
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 527a5f18c1..f9e2bcbbe3 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1949,7 +1949,6 @@ cannot create shared object descriptor"));
 				  N_("cannot open shared object file"));
     }
 
-  extern void *__libc_stack_end;
   void *stack_end = __libc_stack_end;
   return _dl_map_object_from_fd (name, fd, &fb, realname, loader, type, mode,
 				 &stack_end);
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 9129604ccf..70558eb72e 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-16  Richard Henderson  <rth@redhat.com>
+
+        * attr.c: Include ldsodefs.h.
+        (pthread_getattr_np): Don't declare __libc_stack_end.
+
 2004-01-09  Steven Munroe  <sjmunroe@us.ibm.com>
 
 	* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
diff --git a/linuxthreads/attr.c b/linuxthreads/attr.c
index a88fdb96c5..2adc7ccd7a 100644
--- a/linuxthreads/attr.c
+++ b/linuxthreads/attr.c
@@ -26,6 +26,8 @@
 #include "pthread.h"
 #include "internals.h"
 #include <shlib-compat.h>
+#include <ldsodefs.h>
+
 
 int __pthread_attr_init_2_1(pthread_attr_t *attr)
 {
@@ -415,9 +417,6 @@ int pthread_getattr_np (pthread_t thread, pthread_attr_t *attr)
   if (descr == &__pthread_initial_thread)
 #endif
     {
-      /* Defined in ld.so.  */
-      extern void *__libc_stack_end;
-
       /* Stack size limit.  */
       struct rlimit rl;
 
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index af51441396..3409861329 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-16  Richard Henderson  <rth@redhat.com>
+
+        * allocatestack.c: Don't declare __libc_stack_end.
+        * init.c (__pthread_initialize_minimal_internal): Likewise.
+        * pthread_getattr_np.c (pthread_getattr_np): Likewise.
+
 2004-01-15  Richard Henderson  <rth@redhat.com>
 
 	* sysdeps/alpha/tls.h (tcbhead_t): Add private.
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 02de7f0ed7..7aa5af21e4 100644
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -661,8 +661,6 @@ __deallocate_stack (struct pthread *pd)
 }
 
 
-extern void *__libc_stack_end;
-
 int
 internal_function
 __make_stacks_executable (void **stack_endp)
diff --git a/nptl/init.c b/nptl/init.c
index 876b9d3bbd..fd4544c99f 100644
--- a/nptl/init.c
+++ b/nptl/init.c
@@ -217,9 +217,6 @@ __pthread_initialize_minimal_internal (void)
   THREAD_SETMEM (pd, cpuclock_offset, GL(dl_cpuclock_offset));
 #endif
 
-  /* Defined in ld.so.  */
-  extern void *__libc_stack_end;
-
   /* Set initial thread's stack block from 0 up to __libc_stack_end.
      It will be bigger than it actually is, but for unwind.c/pt-longjmp.c
      purposes this is good enough.  */
diff --git a/nptl/pthread_getattr_np.c b/nptl/pthread_getattr_np.c
index 0e1082079a..769f4f5e31 100644
--- a/nptl/pthread_getattr_np.c
+++ b/nptl/pthread_getattr_np.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -72,9 +72,6 @@ pthread_getattr_np (thread_id, attr)
 	 thread.  Get the info in some magical way.  */
       assert (abs (thread->pid) == thread->tid);
 
-      /* Defined in ld.so.  */
-      extern void *__libc_stack_end;
-
       /* Stack size limit.  */
       struct rlimit rl;
 
diff --git a/sysdeps/generic/backtrace.c b/sysdeps/generic/backtrace.c
index f27f890bc4..6a3336c6d2 100644
--- a/sysdeps/generic/backtrace.c
+++ b/sysdeps/generic/backtrace.c
@@ -1,5 +1,5 @@
 /* Return backtrace of current program state.  Generic version.
-   Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000, 2002, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -23,11 +23,7 @@
 #include <frame.h>
 #include <sigcontextinfo.h>
 #include <bp-checks.h>
-
-/* This is a global variable set at program start time.  It marks the
-   highest used stack address.  */
-extern void *__libc_stack_end;
-
+#include <ldsodefs.h>
 
 /* This implementation assumes a stack layout that matches the defaults
    used by gcc's `__builtin_frame_address' and `__builtin_return_address'
diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c
index 716bbc7018..582ae0b6a2 100644
--- a/sysdeps/generic/libc-start.c
+++ b/sysdeps/generic/libc-start.c
@@ -26,7 +26,6 @@
 extern void __libc_init_first (int argc, char **argv, char **envp);
 
 extern int __libc_multiple_libcs;
-extern void *__libc_stack_end;
 
 #include <tls.h>
 #ifndef SHARED
diff --git a/sysdeps/generic/segfault.c b/sysdeps/generic/segfault.c
index 168731479a..47f2447169 100644
--- a/sysdeps/generic/segfault.c
+++ b/sysdeps/generic/segfault.c
@@ -1,5 +1,6 @@
 /* Catch segmentation faults and print backtrace.
-   Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -28,6 +29,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdio-common/_itoa.h>
+#include <ldsodefs.h>
 
 #include <bp-checks.h>
 
@@ -41,11 +43,6 @@
 /* Get code to possibly dump the content of all registers.  */
 #include <register-dump.h>
 
-/* This is a global variable set at program start time.  It marks the
-   highest used stack address.  */
-extern void *__libc_stack_end;
-
-
 /* This implementation assumes a stack layout that matches the defaults
    used by gcc's `__builtin_frame_address' and `__builtin_return_address'
    (FP is the frame pointer register):
diff --git a/sysdeps/unix/sysv/linux/dl-execstack.c b/sysdeps/unix/sysv/linux/dl-execstack.c
index e96197a22e..48512ede7d 100644
--- a/sysdeps/unix/sysv/linux/dl-execstack.c
+++ b/sysdeps/unix/sysv/linux/dl-execstack.c
@@ -26,8 +26,6 @@
 #include "kernel-features.h"
 
 
-extern void *__libc_stack_end attribute_hidden;
-
 int
 internal_function
 _dl_make_stack_executable (void **stack_endp)