nptl: Move pthread_attr_init implementation into libc

Both the original GLIB_2.0 version and the current GLIBC_2.1 version
need to be moved.

5 files changed, 4 insertions, 21 deletions

diff --git a/nptl/Makefile b/nptl/Makefile
index df47bba8f2..2cc47620c6 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -31,7 +31,7 @@ routines = alloca_cutoff forward libc-lowlevellock libc-cancellation \
 	   libc-cleanup libc_pthread_init libc_multiple_threads \
 	   register-atfork pthread_atfork pthread_self thrd_current \
 	   thrd_equal thrd_sleep thrd_yield pthread_equal \
-	   pthread_attr_destroy
+	   pthread_attr_destroy pthread_attr_init
 shared-only-routines = forward
 static-only-routines = pthread_atfork
 
@@ -54,7 +54,6 @@ libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \
 		      pthread_getconcurrency pthread_setconcurrency \
 		      pthread_getschedparam pthread_setschedparam \
 		      pthread_setschedprio \
-		      pthread_attr_init \
 		      pthread_attr_getdetachstate pthread_attr_setdetachstate \
 		      pthread_attr_getguardsize pthread_attr_setguardsize \
 		      pthread_attr_getschedparam pthread_attr_setschedparam \
diff --git a/nptl/Versions b/nptl/Versions
index 3aea423548..6d7dba9f3a 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -49,7 +49,6 @@ libpthread {
 
     pthread_getschedparam; pthread_setschedparam;
 
-    pthread_attr_init;
     pthread_attr_getdetachstate; pthread_attr_setdetachstate;
     pthread_attr_getschedparam; pthread_attr_setschedparam;
     pthread_attr_getschedpolicy; pthread_attr_setschedpolicy;
@@ -121,7 +120,6 @@ libpthread {
 
   GLIBC_2.1 {
     pthread_create;
-    pthread_attr_init;
 
     pthread_attr_getguardsize; pthread_attr_setguardsize;
     pthread_attr_getstackaddr; pthread_attr_setstackaddr;
diff --git a/nptl/forward.c b/nptl/forward.c
index c7d385be6e..d52b85b1c6 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -56,14 +56,6 @@ name decl								      \
   FORWARD2 (name, int, decl, params, return defretval)
 
 
-#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_1)
-FORWARD (__pthread_attr_init_2_0, (pthread_attr_t *attr), (attr), 0)
-compat_symbol (libc, __pthread_attr_init_2_0, pthread_attr_init, GLIBC_2_0);
-#endif
-
-FORWARD (__pthread_attr_init_2_1, (pthread_attr_t *attr), (attr), 0)
-versioned_symbol (libc, __pthread_attr_init_2_1, pthread_attr_init, GLIBC_2_1);
-
 FORWARD (pthread_attr_getdetachstate,
 	 (const pthread_attr_t *attr, int *detachstate), (attr, detachstate),
 	 0)
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 8fc4f46e05..dd052a5d1b 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -72,10 +72,6 @@ void __nptl_set_robust (struct pthread *);
 #ifdef SHARED
 static const struct pthread_functions pthread_functions =
   {
-# if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
-    .ptr___pthread_attr_init_2_0 = __pthread_attr_init_2_0,
-# endif
-    .ptr___pthread_attr_init_2_1 = __pthread_attr_init_2_1,
     .ptr_pthread_attr_getdetachstate = __pthread_attr_getdetachstate,
     .ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate,
     .ptr_pthread_attr_getinheritsched = __pthread_attr_getinheritsched,
diff --git a/nptl/pthread_attr_init.c b/nptl/pthread_attr_init.c
index f684b12c6b..f7ddf625e3 100644
--- a/nptl/pthread_attr_init.c
+++ b/nptl/pthread_attr_init.c
@@ -48,11 +48,10 @@ __pthread_attr_init_2_1 (pthread_attr_t *attr)
 
   return 0;
 }
-versioned_symbol (libpthread, __pthread_attr_init_2_1, pthread_attr_init,
-		  GLIBC_2_1);
+versioned_symbol (libc, __pthread_attr_init_2_1, pthread_attr_init, GLIBC_2_1);
 
 
-#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_1)
 int
 __pthread_attr_init_2_0 (pthread_attr_t *attr)
 {
@@ -81,6 +80,5 @@ __pthread_attr_init_2_0 (pthread_attr_t *attr)
      old attribute structure.  */
   return 0;
 }
-compat_symbol (libpthread, __pthread_attr_init_2_0, pthread_attr_init,
-	       GLIBC_2_0);
+compat_symbol (libc, __pthread_attr_init_2_0, pthread_attr_init, GLIBC_2_0);
 #endif