11 files changed, 44 insertions, 33 deletions
diff --git a/libc/sysdeps/linux/frv/brk.c b/libc/sysdeps/linux/frv/brk.c
index d6063fc27..443c03b25 100644
--- a/libc/sysdeps/linux/frv/brk.c
+++ b/libc/sysdeps/linux/frv/brk.c
@@ -9,7 +9,7 @@ extern void * __curbrk;
 extern int __init_brk (void);
 extern void *_brk(void *ptr) attribute_hidden;
 
-int attribute_hidden __brk(void * end_data_seg)
+int brk(void * end_data_seg)
 {
     if (__init_brk () == 0)
     {
@@ -20,4 +20,5 @@ int attribute_hidden __brk(void * end_data_seg)
     }
     return -1;
 }
-strong_alias(__brk,brk)
+libc_hidden_proto(brk)
+libc_hidden_def(brk)
diff --git a/libc/sysdeps/linux/frv/clone.S b/libc/sysdeps/linux/frv/clone.S
index b714b45b1..eff281499 100644
--- a/libc/sysdeps/linux/frv/clone.S
+++ b/libc/sysdeps/linux/frv/clone.S
@@ -25,10 +25,10 @@
 #include <bits/errno.h>
 
 	.text
-	.globl	__clone
-	.type __clone,@function
+	.globl	clone
+	.type clone,@function
 /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg) */
-__clone:
+clone:
 	/* Sanity check arguments.  */
 	cmp.p	gr8, gr0, icc0
 	cmp	gr9, gr0, icc1
@@ -75,11 +75,8 @@ __clone:
 	   breakpoints work.*/
 
 	mov.p	gr17, gr15
-	call	_exit_internal
+	call	HIDDEN_JUMPTARGET(_exit)
 
 	/* Should never get here.  */
 	jmpl	@(gr0, gr0)
-	.size	__clone,.-__clone
-
-.weak	clone
-	clone = __clone
+	.size	clone,.-clone
diff --git a/libc/sysdeps/linux/frv/fstat.c b/libc/sysdeps/linux/frv/fstat.c
index ce6b68e66..bf031bbbc 100644
--- a/libc/sysdeps/linux/frv/fstat.c
+++ b/libc/sysdeps/linux/frv/fstat.c
@@ -41,5 +41,7 @@
 #include <bits/stat.h>
 
 #define __NR___syscall_fstat __NR_fstat
-_syscall2(int, __syscall_fstat, int, fd, struct stat *, buf);
-strong_alias(__syscall_fstat, fstat)
+attribute_hidden _syscall2(int, __syscall_fstat, int, fd, struct stat *, buf);
+strong_alias(__syscall_fstat,fstat)
+libc_hidden_proto(fstat)
+libc_hidden_def(fstat)
diff --git a/libc/sysdeps/linux/frv/fstat64.c b/libc/sysdeps/linux/frv/fstat64.c
index 27000bf83..744c5915a 100644
--- a/libc/sysdeps/linux/frv/fstat64.c
+++ b/libc/sysdeps/linux/frv/fstat64.c
@@ -42,6 +42,8 @@
 
 #if defined __UCLIBC_HAS_LFS__
 #define __NR___syscall_fstat64 __NR_fstat64
-_syscall2(int, __syscall_fstat64, int, fd, struct stat64 *, buf);
-strong_alias(__syscall_fstat64, fstat64)
+attribute_hidden _syscall2(int, __syscall_fstat64, int, fd, struct stat64 *, buf);
+strong_alias(__syscall_fstat64,fstat64)
+libc_hidden_proto(fstat64)
+libc_hidden_def(fstat64)
 #endif
diff --git a/libc/sysdeps/linux/frv/lstat.c b/libc/sysdeps/linux/frv/lstat.c
index b9f0350c4..63c547c1b 100644
--- a/libc/sysdeps/linux/frv/lstat.c
+++ b/libc/sysdeps/linux/frv/lstat.c
@@ -41,5 +41,7 @@
 #include <bits/stat.h>
 
 #define __NR___syscall_lstat __NR_lstat
-_syscall2(int, __syscall_lstat, const char *, file_name, struct stat *, buf);
-strong_alias(__syscall_lstat, lstat)
+attribute_hidden _syscall2(int, __syscall_lstat, const char *, file_name, struct stat *, buf);
+strong_alias(__syscall_lstat,lstat)
+libc_hidden_proto(lstat)
+libc_hidden_def(lstat)
diff --git a/libc/sysdeps/linux/frv/lstat64.c b/libc/sysdeps/linux/frv/lstat64.c
index 8f9413a8d..ea8abf892 100644
--- a/libc/sysdeps/linux/frv/lstat64.c
+++ b/libc/sysdeps/linux/frv/lstat64.c
@@ -42,6 +42,8 @@
 
 #if defined __UCLIBC_HAS_LFS__
 #define __NR___syscall_lstat64 __NR_lstat64
-_syscall2(int, __syscall_lstat64, const char *, file_name, struct stat64 *, buf);
-strong_alias(__syscall_lstat64, lstat64)
+attribute_hidden _syscall2(int, __syscall_lstat64, const char *, file_name, struct stat64 *, buf);
+strong_alias(__syscall_lstat64,lstat64)
+libc_hidden_proto(lstat64)
+libc_hidden_def(lstat64)
 #endif
diff --git a/libc/sysdeps/linux/frv/mmap.c b/libc/sysdeps/linux/frv/mmap.c
index fa801bb5f..01dcfb627 100644
--- a/libc/sysdeps/linux/frv/mmap.c
+++ b/libc/sysdeps/linux/frv/mmap.c
@@ -38,7 +38,7 @@ static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr,
 #  define MMAP2_PAGE_SHIFT 12
 # endif
 
-__ptr_t attribute_hidden __mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset)
+__ptr_t mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset)
 {
     if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1)) {
 	__set_errno (EINVAL);
@@ -46,4 +46,5 @@ __ptr_t attribute_hidden __mmap(__ptr_t addr, size_t len, int prot, int flags, i
     }
     return(__syscall_mmap2(addr, len, prot, flags, fd, (off_t) (offset >> MMAP2_PAGE_SHIFT)));
 }
-strong_alias(__mmap,mmap)
+libc_hidden_proto(mmap)
+libc_hidden_def(mmap)
diff --git a/libc/sysdeps/linux/frv/sbrk.c b/libc/sysdeps/linux/frv/sbrk.c
index e9faf7db0..7ccefdf58 100644
--- a/libc/sysdeps/linux/frv/sbrk.c
+++ b/libc/sysdeps/linux/frv/sbrk.c
@@ -9,8 +9,8 @@ extern void * __curbrk;
 extern int __init_brk (void);
 extern void *_brk(void *ptr) attribute_hidden;
 
-void attribute_hidden *
-__sbrk(intptr_t increment)
+void *
+sbrk(intptr_t increment)
 {
     if (__init_brk () == 0)
     {
@@ -23,4 +23,5 @@ __sbrk(intptr_t increment)
     }
     return ((void *) -1);
 }
-strong_alias(__sbrk,sbrk)
+libc_hidden_proto(sbrk)
+libc_hidden_def(sbrk)
diff --git a/libc/sysdeps/linux/frv/stat.c b/libc/sysdeps/linux/frv/stat.c
index 4a54b130f..0d531e998 100644
--- a/libc/sysdeps/linux/frv/stat.c
+++ b/libc/sysdeps/linux/frv/stat.c
@@ -41,5 +41,7 @@
 #include <bits/stat.h>
 
 #define __NR___syscall_stat __NR_stat
-_syscall2(int, __syscall_stat, const char *, file_name, struct stat *, buf);
-strong_alias(__syscall_stat, stat)
+attribute_hidden _syscall2(int, __syscall_stat, const char *, file_name, struct stat *, buf);
+strong_alias(__syscall_stat,stat)
+libc_hidden_proto(stat)
+libc_hidden_def(stat)
diff --git a/libc/sysdeps/linux/frv/stat64.c b/libc/sysdeps/linux/frv/stat64.c
index ecfe808cc..3c702d885 100644
--- a/libc/sysdeps/linux/frv/stat64.c
+++ b/libc/sysdeps/linux/frv/stat64.c
@@ -42,6 +42,8 @@
 
 #if defined __UCLIBC_HAS_LFS__
 #define __NR___syscall_stat64 __NR_stat64
-_syscall2(int, __syscall_stat64, const char *, file_name, struct stat64 *, buf);
-strong_alias(__syscall_stat64, stat64)
+attribute_hidden _syscall2(int, __syscall_stat64, const char *, file_name, struct stat64 *, buf);
+strong_alias(__syscall_stat64,stat64)
+libc_hidden_proto(stat64)
+libc_hidden_def(stat64)
 #endif
diff --git a/libc/sysdeps/linux/frv/vfork.S b/libc/sysdeps/linux/frv/vfork.S
index b5ecc09af..9a70e22ac 100644
--- a/libc/sysdeps/linux/frv/vfork.S
+++ b/libc/sysdeps/linux/frv/vfork.S
@@ -24,11 +24,10 @@
 #include <bits/errno.h>
 
        .text
-       .globl	__vfork
-       .hidden	__vfork
-       .type	__vfork,@function
+       .globl	vfork
+       .type	vfork,@function
 /* int vfork(void) */
-__vfork:
+vfork:
 	setlos.p #__NR_vfork, gr7
 	setlos	#-4096, gr4
 	tra	gr0, gr0
@@ -41,6 +40,6 @@ __vfork:
 	ldd	@(gr14, gr15), gr14
 	jmpl	@(gr14, gr0)
 
-       .size   __vfork,.-__vfork
+       .size   vfork,.-vfork
 
-strong_alias(__vfork,vfork)
+libc_hidden_def(vfork)