3 files changed, 4 insertions, 12 deletions
diff --git a/libpthread/nptl/pthreadP.h b/libpthread/nptl/pthreadP.h
index a2aa5a089..013b91dd4 100644
--- a/libpthread/nptl/pthreadP.h
+++ b/libpthread/nptl/pthreadP.h
@@ -355,16 +355,10 @@ extern void __pthread_cleanup_upto (__jmp_buf target, char *targetframe);
 hidden_proto (__pthread_cleanup_upto)
 #endif
 
-
-/* Functions with versioned interfaces.  */
-extern int __pthread_create_2_1 (pthread_t *newthread,
-				 const pthread_attr_t *attr,
-				 void *(*start_routine) (void *), void *arg);
-extern int __pthread_create_2_0 (pthread_t *newthread,
+extern int pthread_create (pthread_t *newthread,
 				 const pthread_attr_t *attr,
 				 void *(*start_routine) (void *), void *arg);
-extern int __pthread_attr_init_2_1 (pthread_attr_t *attr);
-extern int __pthread_attr_init_2_0 (pthread_attr_t *attr);
+extern int pthread_attr_init (pthread_attr_t *attr);
 
 
 /* Event handlers for libthread_db interface.  */
diff --git a/libpthread/nptl/pthread_attr_init.c b/libpthread/nptl/pthread_attr_init.c
index 3e38f37e8..610451840 100644
--- a/libpthread/nptl/pthread_attr_init.c
+++ b/libpthread/nptl/pthread_attr_init.c
@@ -29,7 +29,7 @@ int __attr_list_lock = LLL_LOCK_INITIALIZER;
 
 int
 attribute_protected
-__pthread_attr_init_2_1 (
+pthread_attr_init (
      pthread_attr_t *attr)
 {
   struct pthread_attr *iattr;
@@ -47,4 +47,3 @@ __pthread_attr_init_2_1 (
 
   return 0;
 }
-weak_alias(__pthread_attr_init_2_1, pthread_attr_init)
diff --git a/libpthread/nptl/pthread_create.c b/libpthread/nptl/pthread_create.c
index 49497fe30..d39cb278c 100644
--- a/libpthread/nptl/pthread_create.c
+++ b/libpthread/nptl/pthread_create.c
@@ -428,7 +428,7 @@ static const struct pthread_attr default_attr =
 
 
 int
-__pthread_create_2_1 (
+pthread_create (
      pthread_t *newthread,
      const pthread_attr_t *attr,
      void *(*start_routine) (void *),
@@ -558,7 +558,6 @@ __pthread_create_2_1 (
 
   return 0;
 }
-weak_alias(__pthread_create_2_1, pthread_create)
 
 /* Information for libthread_db.  */