about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-03-10 22:03:24 +0000
committerUlrich Drepper <drepper@redhat.com>2009-03-10 22:03:24 +0000
commit30991b8bd9da368a917c6b7ca74342ed7c53e26f (patch)
treeaa94dd7aa0e914d054135e484a05f8bcf9a80d5c
parentbd82a24718941e31647287d72cfbfccd9ad012b5 (diff)
downloadglibc-30991b8bd9da368a917c6b7ca74342ed7c53e26f.tar.gz
glibc-30991b8bd9da368a917c6b7ca74342ed7c53e26f.tar.xz
glibc-30991b8bd9da368a917c6b7ca74342ed7c53e26f.zip
* init.c (nptl_freeres): Compile only for SHARED.
-rw-r--r--nptl/ChangeLog4
-rw-r--r--nptl/init.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 2e490176ca..15e79efdd4 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-10  Ulrich Drepper  <drepper@redhat.com>
+
+	* init.c (nptl_freeres): Compile only for SHARED.
+
 2009-03-09  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/sparc/lowlevellock.h: Define
diff --git a/nptl/init.c b/nptl/init.c
index ba3caeead8..5e9c250ff7 100644
--- a/nptl/init.c
+++ b/nptl/init.c
@@ -67,10 +67,10 @@ static const char nptl_version[] __attribute_used__ = VERSION;
 extern void __libc_setup_tls (size_t tcbsize, size_t tcbalign);
 #endif
 
+#ifdef SHARED
 static void nptl_freeres (void);
 
 
-#ifdef SHARED
 static const struct pthread_functions pthread_functions =
   {
     .ptr_pthread_attr_destroy = __pthread_attr_destroy,
@@ -138,16 +138,16 @@ static const struct pthread_functions pthread_functions =
 #endif
 
 
+#ifdef SHARED
 /* This function is called indirectly from the freeres code in libc.  */
 static void
 __libc_freeres_fn_section
 nptl_freeres (void)
 {
-#ifdef SHARED
   __unwind_freeres ();
-#endif
   __free_stacks (0);
 }
+#endif
 
 
 /* For asynchronous cancellation we use a signal.  This is the handler.  */