5 files changed, 13 insertions, 21 deletions
diff --git a/libc/sysdeps/linux/cris/brk.c b/libc/sysdeps/linux/cris/brk.c
index 10965d3b9..8b5aa680c 100644
--- a/libc/sysdeps/linux/cris/brk.c
+++ b/libc/sysdeps/linux/cris/brk.c
@@ -7,7 +7,7 @@ extern void * __curbrk;
 
 extern int __init_brk (void);
 
-int attribute_hidden __brk(void * end_data_seg)
+int brk(void * end_data_seg)
 {
 	if (__init_brk () == 0) {
 		/*
@@ -29,4 +29,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/cris/clone.S b/libc/sysdeps/linux/cris/clone.S
index 19ba71996..046073b58 100644
--- a/libc/sysdeps/linux/cris/clone.S
+++ b/libc/sysdeps/linux/cris/clone.S
@@ -25,7 +25,7 @@
 	.syntax no_register_prefix
 
         .text
-ENTRY (__clone)
+ENTRY (clone)
 	/* Sanity check arguments: No NULL function pointers.  Allow a NULL
 	   stack pointer though; it makes the kernel allocate stack.  */
 	test.d	r10
@@ -69,7 +69,7 @@ ENTRY (__clone)
 	jsr	r0
 
 	SETUP_PIC
-	PLTCALL	(_exit_internal)
+	PLTCALL	(HIDDEN_JUMPTARGET(_exit))
 
 	/* Die horribly.  */
 	test.d	[6809]
@@ -83,7 +83,4 @@ ENTRY (__clone)
 1:
 	movs.w	-EINVAL,r10
 	/* Drop through into the ordinary error handler.  */
-PSEUDO_END (__clone)
-
-.globl clone
-	clone = __clone
+PSEUDO_END (clone)
diff --git a/libc/sysdeps/linux/cris/fork.c b/libc/sysdeps/linux/cris/fork.c
index 4dd8e0269..11b546127 100644
--- a/libc/sysdeps/linux/cris/fork.c
+++ b/libc/sysdeps/linux/cris/fork.c
@@ -8,4 +8,6 @@ SYSCALL__ (__libc_fork, 0)
 	   R0&-1==R0, and the child gets R0&0==0.  */
      /* i dunno what the blurb above is useful for. we just return. */
 __asm__("ret\n\tnop");
-weak_alias(__libc_fork, fork)
+strong_alias(__libc_fork,fork)
+libc_hidden_proto(fork)
+libc_hidden_def(fork)
diff --git a/libc/sysdeps/linux/cris/sbrk.c b/libc/sysdeps/linux/cris/sbrk.c
index 3683435bf..9eb9a2a0e 100644
--- a/libc/sysdeps/linux/cris/sbrk.c
+++ b/libc/sysdeps/linux/cris/sbrk.c
@@ -9,8 +9,8 @@ extern void * __curbrk;
 
 extern int __init_brk (void);
 
-void attribute_hidden *
-__sbrk(intptr_t increment)
+void *
+sbrk(intptr_t increment)
 {
 	if (__init_brk () == 0) {
 		void * tmp = __curbrk + increment;
@@ -34,4 +34,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/cris/setjmp.S b/libc/sysdeps/linux/cris/setjmp.S
index a5ea0e2d8..2d959cbed 100644
--- a/libc/sysdeps/linux/cris/setjmp.S
+++ b/libc/sysdeps/linux/cris/setjmp.S
@@ -65,12 +65,3 @@ weak_extern (__setjmp)
 weak_extern (_setjmp)
 weak_extern (setjmp)
 */
-
-
-
-
-
-
-
-
-