6 files changed, 7 insertions, 6 deletions

diff --git a/lib/libc/arm/sys/brk.S b/lib/libc/arm/sys/brk.S
index 8112e91d93d91..9141cf06ad6af 100644
--- a/lib/libc/arm/sys/brk.S
+++ b/lib/libc/arm/sys/brk.S
@@ -87,7 +87,7 @@ ENTRY(_brk)
 
 	/* Return 0 for success */
 	mov	r0, #0x00000000
-	mov	r15, r14
+	RET
 
 	.align	2
 #ifdef PIC
diff --git a/lib/libc/arm/sys/cerror.S b/lib/libc/arm/sys/cerror.S
index b0f04a63f3056..e657248a67681 100644
--- a/lib/libc/arm/sys/cerror.S
+++ b/lib/libc/arm/sys/cerror.S
@@ -61,7 +61,7 @@ ASENTRY(CERROR)
 	str	r0, [r1]
 	mvn	r0, #0x00000000
 	mvn	r1, #0x00000000
-	mov	pc, lr
+	RET
 
 #if 0
 	.align	0
diff --git a/lib/libc/arm/sys/fork.S b/lib/libc/arm/sys/fork.S
index fb07c8787d558..a5ae1f0aa4196 100644
--- a/lib/libc/arm/sys/fork.S
+++ b/lib/libc/arm/sys/fork.S
@@ -46,4 +46,4 @@ __FBSDID("$FreeBSD$");
 _SYSCALL(fork)
 	sub	r1, r1, #1	/* r1 == 0xffffffff if parent, 0 if child */
 	and	r0, r0, r1	/* r0 == 0 if child, else unchanged */
-	mov	r15, r14
+	RET
diff --git a/lib/libc/arm/sys/pipe.S b/lib/libc/arm/sys/pipe.S
index 59ddd8815c22a..83518fc2cbbad 100644
--- a/lib/libc/arm/sys/pipe.S
+++ b/lib/libc/arm/sys/pipe.S
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(pipe, _pipe)
+WEAK_ALIAS(__sys_pipe, _pipe)
 #endif
 
 ENTRY(_pipe)
@@ -46,4 +47,4 @@ ENTRY(_pipe)
 	str	r0, [r2, #0x0000]
 	str	r1, [r2, #0x0004]
 	mov	r0, #0x00000000
-	mov	r15, r14
+	RET
diff --git a/lib/libc/arm/sys/ptrace.S b/lib/libc/arm/sys/ptrace.S
index 0aa11221dd42e..46b31bc6d4e75 100644
--- a/lib/libc/arm/sys/ptrace.S
+++ b/lib/libc/arm/sys/ptrace.S
@@ -63,7 +63,7 @@ ENTRY(ptrace)
 
 	SYSTRAP(ptrace)
 	bcs	PIC_SYM(CERROR, PLT)
-	mov	pc, lr
+	RET
 
 #ifndef _REENTRANT
 #ifdef PIC
diff --git a/lib/libc/arm/sys/sbrk.S b/lib/libc/arm/sys/sbrk.S
index cca380da64e06..20821fe18e0d9 100644
--- a/lib/libc/arm/sys/sbrk.S
+++ b/lib/libc/arm/sys/sbrk.S
@@ -77,7 +77,7 @@ ENTRY(_sbrk)
 	str	r1, [r2]
 
 	/* Return old curbrk value */
-	mov	r15, r14
+	RET
 
 	.align	0
 #ifdef PIC