From 569b0e03fb08ea519434d26ee77aeb3a9cdeedf3 Mon Sep 17 00:00:00 2001
From: Joakim Tjernlund <joakim.tjernlund@transmode.se>
Date: Fri, 10 Jun 2005 18:25:35 +0000
Subject: Remove TEXTREL relocations for ARM. Hide __syscall_error from outside
 libc. From Peter Mazinger.

---
 libc/sysdeps/linux/powerpc/__syscall_error.c  |  2 +-
 libc/sysdeps/linux/powerpc/__uClibc_syscall.S | 10 ++++------
 libc/sysdeps/linux/powerpc/brk.S              | 20 +++++++++-----------
 libc/sysdeps/linux/powerpc/clone.S            | 23 ++++++++---------------
 libc/sysdeps/linux/powerpc/syscall.S          | 19 ++++++-------------
 5 files changed, 28 insertions(+), 46 deletions(-)

(limited to 'libc/sysdeps/linux/powerpc')

diff --git a/libc/sysdeps/linux/powerpc/__syscall_error.c b/libc/sysdeps/linux/powerpc/__syscall_error.c
index 9ab65ed79..bb998b16a 100644
--- a/libc/sysdeps/linux/powerpc/__syscall_error.c
+++ b/libc/sysdeps/linux/powerpc/__syscall_error.c
@@ -21,7 +21,7 @@
 
 /* This routine is jumped to by all the syscall handlers, to stash
  * an error number into errno.  */
-int __syscall_error (int err_no)
+int attribute_hidden __syscall_error (int err_no)
 {
 	__set_errno (err_no);
 	return -1;
diff --git a/libc/sysdeps/linux/powerpc/__uClibc_syscall.S b/libc/sysdeps/linux/powerpc/__uClibc_syscall.S
index 09bfb89cc..5a14c948c 100644
--- a/libc/sysdeps/linux/powerpc/__uClibc_syscall.S
+++ b/libc/sysdeps/linux/powerpc/__uClibc_syscall.S
@@ -1,14 +1,12 @@
-.section ".text"
+	.text
 	.align 2
-.globl __uClibc_syscall
+	.globl __uClibc_syscall
 	.type	__uClibc_syscall,@function
 __uClibc_syscall:
 .Lsize:
 	sc
 	bnslr
-#ifdef __PIC__
-	b	__syscall_error@plt
-#else
+
 	b	__syscall_error
-#endif
+
 	.size	__uClibc_syscall,.Lsize-__uClibc_syscall
diff --git a/libc/sysdeps/linux/powerpc/brk.S b/libc/sysdeps/linux/powerpc/brk.S
index b914ce814..c0b436d96 100644
--- a/libc/sysdeps/linux/powerpc/brk.S
+++ b/libc/sysdeps/linux/powerpc/brk.S
@@ -24,10 +24,10 @@
 
 #ifdef __NR_brk
 	.comm	__curbrk,4,4
-	.section ".text"
-.globl      __brk;
-.type      __brk, @function;
-.align  2;
+	.text
+	.globl	__brk
+	.type	__brk,@function
+	.align	2
 
 __brk:
 	stwu    r1,-16(r1)
@@ -51,13 +51,11 @@ __brk:
 	li	r3,0
 	blelr+
 	li      r3,ENOMEM
-#ifdef __PIC__
-	b	__syscall_error@plt
-#else
+
 	b	__syscall_error
-#endif
-.size __brk,.-__brk
 
-.weak brk;
-brk=__brk        
+	.size __brk,.-__brk
+
+	.weak brk
+	brk=__brk        
 #endif	
diff --git a/libc/sysdeps/linux/powerpc/clone.S b/libc/sysdeps/linux/powerpc/clone.S
index edce8d569..f7c6bd18e 100644
--- a/libc/sysdeps/linux/powerpc/clone.S
+++ b/libc/sysdeps/linux/powerpc/clone.S
@@ -30,10 +30,9 @@
    		  int flags [r5], void *arg [r6]); */
 
 #ifdef __NR_clone
-.globl      __clone;
-.type      __clone, @function;
-.align  2;
-
+	.globl __clone
+	.type __clone,@function
+	.align 2
 
 __clone:
 	/* Check for child_stack == NULL || fn == NULL.  */
@@ -90,21 +89,15 @@ __clone:
 	lmw	r29,16(r1)
 	addi	r1,r1,32
 	bnslr+
-#ifdef __PIC__
-	b	__syscall_error@plt
-#else
+
 	b	__syscall_error
-#endif
 
 .Lbadargs:
 	li	r3,EINVAL
-#ifdef __PIC__
-	b	__syscall_error@plt
-#else
+
 	b	__syscall_error
-#endif
 
-.size __clone,.-__clone
-.weak clone;
-clone=__clone
+	.size __clone,.-__clone
+	.weak clone
+	clone=__clone
 #endif
diff --git a/libc/sysdeps/linux/powerpc/syscall.S b/libc/sysdeps/linux/powerpc/syscall.S
index 71f711931..b85398416 100644
--- a/libc/sysdeps/linux/powerpc/syscall.S
+++ b/libc/sysdeps/linux/powerpc/syscall.S
@@ -18,14 +18,10 @@
 
 #include <features.h>
 
-	.section ".text"
-	.globl	syscall;
-	.type	syscall,@function;
-	.align  2;
-
-.globl syscall;
-.type syscall,@function;
-.align 2;
+	.text
+	.globl	syscall
+	.type	syscall,@function
+	.align  2
 
 syscall:
 	mr 0,3
@@ -36,10 +32,7 @@ syscall:
 	mr 7,8
 	sc
 	bnslr;
-#ifdef __PIC__
-	b __syscall_error@plt
-#else
+
 	b __syscall_error
-#endif
 
-.size syscall,.-syscall
+	.size syscall,.-syscall
-- 
cgit v1.2.3