diff options
| author | cognet <cognet@FreeBSD.org> | 2004-11-09 16:49:14 +0000 |
|---|---|---|
| committer | cognet <cognet@FreeBSD.org> | 2004-11-09 16:49:14 +0000 |
| commit | 98ebb25e56d0f452f1cfd5d33770eeaedca698fd (patch) | |
| tree | 8ccabba1a460da5c135164486fcb8597cd0c3fc5 /lib/libc/arm/sys | |
| parent | 7e3e230230217c6f10e0156b63efa735c2f9baef (diff) | |
| download | FreeBSD-src-98ebb25e56d0f452f1cfd5d33770eeaedca698fd.zip FreeBSD-src-98ebb25e56d0f452f1cfd5d33770eeaedca698fd.tar.gz | |
Use the RET macro.
For setjmp() and longjmp(), put the signal mask where it's supposed to be,
instead of in the space reserved for fp regs.
Diffstat (limited to 'lib/libc/arm/sys')
| -rw-r--r-- | lib/libc/arm/sys/brk.S | 2 | ||||
| -rw-r--r-- | lib/libc/arm/sys/cerror.S | 2 | ||||
| -rw-r--r-- | lib/libc/arm/sys/fork.S | 2 | ||||
| -rw-r--r-- | lib/libc/arm/sys/pipe.S | 3 | ||||
| -rw-r--r-- | lib/libc/arm/sys/ptrace.S | 2 | ||||
| -rw-r--r-- | lib/libc/arm/sys/sbrk.S | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/lib/libc/arm/sys/brk.S b/lib/libc/arm/sys/brk.S index 8112e91..9141cf0 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 b0f04a6..e657248 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 fb07c87..a5ae1f0 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 59ddd88..83518fc2 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 0aa1122..46b31bc 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 cca380d..20821fe 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 |
