NPTL: rename __new_sem_* to sem_*

Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

14 files changed, 32 insertions, 52 deletions

diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S
index b077a20ca..e548bd160 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S
@@ -25,10 +25,10 @@
 
 	.text
 
-	.globl	__new_sem_post
-	.type	__new_sem_post,@function
+	.globl	sem_post
+	.type	sem_post,@function
 	.align	16
-__new_sem_post:
+sem_post:
 	cfi_startproc
 	pushl	%ebx
 	cfi_adjust_cfa_offset(4)
@@ -126,9 +126,7 @@ __new_sem_post:
 	cfi_restore(%ebx)
 	ret
 	cfi_endproc
-	.size	__new_sem_post,.-__new_sem_post
-weak_alias(__new_sem_post, sem_post)
-
+	.size	sem_post,.-sem_post
 
 #ifdef __PIC__
 	.section .gnu.linkonce.t.__x86.get_pc_thunk.bx,"ax",@progbits
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
index dad96858f..601665881 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
@@ -23,10 +23,10 @@
 
 	.text
 
-	.globl	__new_sem_trywait
-	.type	__new_sem_trywait,@function
+	.globl	sem_trywait
+	.type	sem_trywait,@function
 	.align	16
-__new_sem_trywait:
+sem_trywait:
 	movl	4(%esp), %ecx
 
 	movl	(%ecx), %eax
@@ -63,9 +63,7 @@ __new_sem_trywait:
 #endif
 	orl	$-1, %eax
 	ret
-	.size	__new_sem_trywait,.-__new_sem_trywait
-weak_alias(__new_sem_trywait, sem_trywait)
-
+	.size	sem_trywait,.-sem_trywait
 
 #ifdef __PIC__
 	.section .gnu.linkonce.t.__x86.get_pc_thunk.cx,"ax",@progbits
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
index b1c32ee4d..d9ea60140 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
@@ -29,10 +29,10 @@
 
 	.text
 
-	.globl	__new_sem_wait
-	.type	__new_sem_wait,@function
+	.globl	sem_wait
+	.type	sem_wait,@function
 	.align	16
-__new_sem_wait:
+sem_wait:
 .LSTARTCODE:
 	pushl	%ebx
 .Lpush_ebx:
@@ -129,8 +129,7 @@ __new_sem_wait:
 	orl	$-1, %eax
 
 	jmp	9b
-	.size	__new_sem_wait,.-__new_sem_wait
-weak_alias(__new_sem_wait, sem_wait)
+	.size	sem_wait,.-sem_wait
 
 
 	.type	sem_wait_cleanup,@function
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c
index cdc8be7e7..cae974245 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c
@@ -25,7 +25,7 @@
 #include <semaphore.h>
 
 int
-__new_sem_post (sem_t *sem)
+sem_post (sem_t *sem)
 {
   struct new_sem *isem = (struct new_sem *) sem;
 
@@ -44,4 +44,3 @@ __new_sem_post (sem_t *sem)
     }
   return 0;
 }
-weak_alias(__new_sem_post, sem_post)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sem_post.c b/libpthread/nptl/sysdeps/unix/sysv/linux/sem_post.c
index edb97c4ba..f0e8e3518 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sem_post.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sem_post.c
@@ -26,7 +26,7 @@
 #include <tls.h>
 
 int
-__new_sem_post (sem_t *sem)
+sem_post (sem_t *sem)
 {
   struct new_sem *isem = (struct new_sem *) sem;
 
@@ -55,4 +55,3 @@ __new_sem_post (sem_t *sem)
     }
   return 0;
 }
-weak_alias(__new_sem_post, sem_post)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sem_trywait.c b/libpthread/nptl/sysdeps/unix/sysv/linux/sem_trywait.c
index 3cf1d9a8a..dede93e50 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sem_trywait.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sem_trywait.c
@@ -26,7 +26,7 @@
 
 
 int
-__new_sem_trywait (sem_t *sem)
+sem_trywait (sem_t *sem)
 {
   int *futex = (int *) sem;
   int val;
@@ -41,4 +41,3 @@ __new_sem_trywait (sem_t *sem)
   __set_errno (EAGAIN);
   return -1;
 }
-weak_alias(__new_sem_trywait, sem_trywait)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sem_wait.c b/libpthread/nptl/sysdeps/unix/sysv/linux/sem_wait.c
index e661e09c8..1c5008f6c 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sem_wait.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sem_wait.c
@@ -38,7 +38,7 @@ __sem_wait_cleanup (void *arg)
 
 
 int
-__new_sem_wait (sem_t *sem)
+sem_wait (sem_t *sem)
 {
   struct new_sem *isem = (struct new_sem *) sem;
   int err;
@@ -81,4 +81,3 @@ __new_sem_wait (sem_t *sem)
 
   return err;
 }
-weak_alias(__new_sem_wait, sem_wait)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S
index f71cd930d..09326e4a1 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S
@@ -25,10 +25,10 @@
 
 	.text
 
-	.globl	__new_sem_post
-	.type	__new_sem_post,@function
+	.globl	sem_post
+	.type	sem_post,@function
 	.align	5
-__new_sem_post:
+sem_post:
 	mov.l	@(VALUE,r4), r2
 0:
 	mov.l	.Lmax, r1
@@ -106,5 +106,4 @@ __new_sem_post:
 .Lerrloc3:
 	.long	__errno_location@PLT-(.Lerrloc3b-.)
 #endif
-	.size	__new_sem_post,.-__new_sem_post
-	weak_alias(__new_sem_post, sem_post)
+	.size	sem_post,.-sem_post
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S
index b46eb1a56..d3f8bfc53 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S
@@ -24,10 +24,10 @@
 
 	.text
 
-	.globl	__new_sem_trywait
-	.type	__new_sem_trywait,@function
+	.globl	sem_trywait
+	.type	sem_trywait,@function
 	.align	5
-__new_sem_trywait:
+sem_trywait:
 	mov.l	r12, @-r15
 	mov.l	r8, @-r15
 	sts.l	pr, @-r15
@@ -86,5 +86,4 @@ __new_sem_trywait:
 .Lerrloc1:
 	.long	__errno_location@PLT-(.Lerrloc1b-.)
 #endif
-	.size	__new_sem_trywait,.-__new_sem_trywait
-	weak_alias(__new_sem_trywait, sem_trywait)
+	.size	sem_trywait,.-sem_trywait
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S
index 00a125bc5..af46c9df4 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S
@@ -30,10 +30,10 @@
 
 	.text
 
-	.globl	__new_sem_wait
-	.type	__new_sem_wait,@function
+	.globl	sem_wait
+	.type	sem_wait,@function
 	.align	5
-__new_sem_wait:
+sem_wait:
 .LSTARTCODE:
 	mov.l	r8, @-r15
 .Lpush_r8:
@@ -161,8 +161,7 @@ __new_sem_wait:
 	.long	__pthread_enable_asynccancel-.Lenable0b
 .Ldisable0:
 	.long	__pthread_disable_asynccancel-.Ldisable0b
-	.size	__new_sem_wait,.-__new_sem_wait
-	weak_alias(__new_sem_wait, sem_wait)
+	.size	sem_wait,.-sem_wait
 
 
 	.type	sem_wait_cleanup,@function
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sem_init.c b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sem_init.c
index f694b5e93..90986b47c 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sem_init.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sem_init.c
@@ -26,7 +26,7 @@
 
 
 int
-__new_sem_init (sem, pshared, value)
+sem_init (sem, pshared, value)
      sem_t *sem;
      int pshared;
      unsigned int value;
@@ -53,5 +53,3 @@ __new_sem_init (sem, pshared, value)
 
   return 0;
 }
-weak_alias(__new_sem_init, sem_init)
-
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_post.c b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_post.c
index 940728eeb..dc9bbca44 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_post.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_post.c
@@ -25,7 +25,7 @@
 #include <semaphore.h>
 
 int
-__new_sem_post (sem_t *sem)
+sem_post (sem_t *sem)
 {
   struct sparc_new_sem *isem = (struct sparc_new_sem *) sem;
   int nr;
@@ -51,5 +51,3 @@ __new_sem_post (sem_t *sem)
     }
   return 0;
 }
-weak_alias(__new_sem_post, sem_post)
-
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_trywait.c b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_trywait.c
index d4e893805..6bbf9b25e 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_trywait.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_trywait.c
@@ -26,7 +26,7 @@
 
 
 int
-__new_sem_trywait (sem_t *sem)
+sem_trywait (sem_t *sem)
 {
   struct sparc_old_sem *isem = (struct sparc_old_sem *) sem;
   int val;
@@ -50,5 +50,3 @@ __new_sem_trywait (sem_t *sem)
   __set_errno (EAGAIN);
   return -1;
 }
-weak_alias(__new_sem_trywait, sem_trywait)
-
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c
index cfe04a802..a2ec1d46b 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c
@@ -45,7 +45,7 @@ __sem_wait_cleanup (void *arg)
 
 
 int
-__new_sem_wait (sem_t *sem)
+sem_wait (sem_t *sem)
 {
   struct sparc_new_sem *isem = (struct sparc_new_sem *) sem;
   int err;
@@ -123,5 +123,3 @@ __new_sem_wait (sem_t *sem)
 
   return err;
 }
-weak_alias(__new_sem_wait, sem_wait)
-