8 files changed, 39 insertions, 34 deletions
diff --git a/libc/sysdeps/linux/arm/__longjmp.S b/libc/sysdeps/linux/arm/__longjmp.S
index 822e15a69..ee588b2c8 100644
--- a/libc/sysdeps/linux/arm/__longjmp.S
+++ b/libc/sysdeps/linux/arm/__longjmp.S
@@ -60,3 +60,4 @@ __longjmp:
 	ldmia     ip ,  {v1-v6, sl, fp, sp, pc}
 
 .size __longjmp,.-__longjmp
+libc_hidden_def(__longjmp)
diff --git a/libc/sysdeps/linux/arm/brk.c b/libc/sysdeps/linux/arm/brk.c
index e711db3b1..88f489e26 100644
--- a/libc/sysdeps/linux/arm/brk.c
+++ b/libc/sysdeps/linux/arm/brk.c
@@ -24,7 +24,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk = 0;
 
-int attribute_hidden __brk (void *addr)
+int brk (void *addr)
 {
 	void *newbrk = (void*)INTERNAL_SYSCALL(brk, , 1, addr);
 
@@ -37,4 +37,4 @@ int attribute_hidden __brk (void *addr)
 
 	return 0;
 }
-strong_alias(__brk,brk)
+libc_hidden_def(brk)
diff --git a/libc/sysdeps/linux/arm/clone.S b/libc/sysdeps/linux/arm/clone.S
index 946d4bdda..550d43f4d 100644
--- a/libc/sysdeps/linux/arm/clone.S
+++ b/libc/sysdeps/linux/arm/clone.S
@@ -28,10 +28,10 @@
 /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */
 
 .text
-.global __clone
-.type __clone,%function
+.global clone
+.type clone,%function
 .align 4
-__clone:
+clone:
 	@ sanity check args
 	cmp	r0, #0
 	cmpne	r1, #0
@@ -59,14 +59,11 @@ __clone:
 	ldr 	pc, [sp]
 
 	@ and we are done, passing the return value through r0
-	b	_exit_internal
+	b	HIDDEN_JUMPTARGET(_exit)
 
 __error:
 	b	__syscall_error
 
-.size __clone,.-__clone
-
-.weak clone
-	clone = __clone
+.size clone,.-clone
 
 #endif
diff --git a/libc/sysdeps/linux/arm/ioperm.c b/libc/sysdeps/linux/arm/ioperm.c
index 0c0c21182..ed370d551 100644
--- a/libc/sysdeps/linux/arm/ioperm.c
+++ b/libc/sysdeps/linux/arm/ioperm.c
@@ -33,12 +33,6 @@
    the area affected (this is a kernel limitation).  So we now just
    enable all the ports all of the time.  */
 
-#define readlink __readlink
-#define mmap __mmap
-#define sscanf __sscanf
-#define fscanf __fscanf
-#define fgets __fgets
-
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -53,6 +47,18 @@
 #include <asm/page.h>
 #include <sys/sysctl.h>
 
+libc_hidden_proto(readlink)
+libc_hidden_proto(mmap)
+libc_hidden_proto(sscanf)
+libc_hidden_proto(fscanf)
+libc_hidden_proto(fprintf)
+libc_hidden_proto(fgets)
+libc_hidden_proto(fopen)
+libc_hidden_proto(fclose)
+libc_hidden_proto(strcmp)
+libc_hidden_proto(open)
+libc_hidden_proto(close)
+
 #include <linux/version.h>
 
 #define PATH_ARM_SYSTYPE	"/etc/arm_systype"
@@ -163,7 +169,7 @@ init_iosys (void)
 
     /* translate systype name into i/o system: */
     for (i = 0; i < sizeof (platform) / sizeof (platform[0]); ++i) {
-	if (__strcmp (platform[i].name, systype) == 0) {
+	if (strcmp (platform[i].name, systype) == 0) {
 	    io.shift = platform[i].shift;
 	    io.io_base = platform[i].io_base;
 	    io.initdone = 1;
@@ -191,14 +197,14 @@ int ioperm (unsigned long int from, unsigned long int num, int turn_on)
 	if (! io.base) {
 	    int fd;
 
-	    fd = __open ("/dev/mem", O_RDWR);
+	    fd = open ("/dev/mem", O_RDWR);
 	    if (fd < 0)
 		return -1;
 
 	    io.base = (unsigned long int) mmap (0, MAX_PORT << io.shift,
 					  PROT_READ | PROT_WRITE,
 					  MAP_SHARED, fd, io.io_base);
-	    __close (fd);
+	    close (fd);
 	    if ((long) io.base == -1)
 		return -1;
 	}
@@ -206,6 +212,8 @@ int ioperm (unsigned long int from, unsigned long int num, int turn_on)
 
     return 0;
 }
+libc_hidden_proto(ioperm)
+libc_hidden_def(ioperm)
 
 
 void
diff --git a/libc/sysdeps/linux/arm/iopl.c b/libc/sysdeps/linux/arm/iopl.c
index 0cd306d42..552ba6c67 100644
--- a/libc/sysdeps/linux/arm/iopl.c
+++ b/libc/sysdeps/linux/arm/iopl.c
@@ -21,6 +21,8 @@
 #include <sys/io.h>
 #include <errno.h>
 
+libc_hidden_proto(ioperm)
+
 #define MAX_PORT	0x10000
 
 int iopl(int level) 
diff --git a/libc/sysdeps/linux/arm/mmap64.S b/libc/sysdeps/linux/arm/mmap64.S
index dd6f3c477..784d73440 100644
--- a/libc/sysdeps/linux/arm/mmap64.S
+++ b/libc/sysdeps/linux/arm/mmap64.S
@@ -52,7 +52,7 @@ mmap64:
 	mov	r0, ip			@ first arg was clobbered
 	teq	r5, $0
 	ldmeqfd	sp!, {r4, r5, lr}
-	beq	__mmap
+	beq	HIDDEN_JUMPTARGET(mmap)
 .Linval:
 	mov	r0, $-EINVAL
 	ldmfd	sp!, {r4, r5, lr}
diff --git a/libc/sysdeps/linux/arm/sigaction.c b/libc/sysdeps/linux/arm/sigaction.c
index c2f79c337..3d3112a29 100644
--- a/libc/sysdeps/linux/arm/sigaction.c
+++ b/libc/sysdeps/linux/arm/sigaction.c
@@ -39,10 +39,9 @@ extern void __default_rt_sa_restorer(void);
   __default_sa_restorer
 #endif
 
-
-
 #ifdef __NR_rt_sigaction
 
+libc_hidden_proto(memcpy)
 
 /* If ACT is not NULL, change the action for SIG to *ACT.
    If OACT is not NULL, put the old action for SIG in *OACT.  */
@@ -53,7 +52,7 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa
 
     if (act) {
 	kact.k_sa_handler = act->sa_handler;
-	__memcpy (&kact.sa_mask, &act->sa_mask, sizeof (sigset_t));
+	memcpy (&kact.sa_mask, &act->sa_mask, sizeof (sigset_t));
 	kact.sa_flags = act->sa_flags;
 # ifdef HAVE_SA_RESTORER
 	/* If the user specified SA_ONSTACK this means she is trying to
@@ -78,7 +77,7 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa
 	    oact ? __ptrvalue (&koact) : NULL, _NSIG / 8);
     if (oact && result >= 0) {
 	oact->sa_handler = koact.k_sa_handler;
-	__memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (sigset_t));
+	memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (sigset_t));
 	oact->sa_flags = koact.sa_flags;
 # ifdef HAVE_SA_RESTORER
 	oact->sa_restorer = koact.sa_restorer;
@@ -90,8 +89,6 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa
 
 #else
 
-
-
 /* If ACT is not NULL, change the action for SIG to *ACT.
    If OACT is not NULL, put the old action for SIG in *OACT.  */
 int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
@@ -129,6 +126,7 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa
 #endif
 
 #ifndef LIBC_SIGACTION
-hidden_weak_alias(__libc_sigaction,__sigaction)
-weak_alias(__libc_sigaction,sigaction)
+strong_alias(__libc_sigaction,sigaction)
+libc_hidden_proto(sigaction)
+libc_hidden_def(sigaction)
 #endif
diff --git a/libc/sysdeps/linux/arm/vfork.S b/libc/sysdeps/linux/arm/vfork.S
index 68798995a..0bf97c223 100644
--- a/libc/sysdeps/linux/arm/vfork.S
+++ b/libc/sysdeps/linux/arm/vfork.S
@@ -16,12 +16,11 @@
 
 #ifdef __NR_fork
 .text
-.global	__vfork
-.hidden	__vfork
-.type	__vfork,%function
+.global	vfork
+.type	vfork,%function
 .align 4
 
-__vfork:
+vfork:
 
 #ifdef __NR_vfork
 	swi	__NR_vfork
@@ -44,6 +43,6 @@ __vfork:
 __error:
 	b	__syscall_error
 
-.size __vfork,.-__vfork
-strong_alias(__vfork,vfork)
+.size vfork,.-vfork
+libc_hidden_def(vfork)
 #endif