diff options
Diffstat (limited to 'lib/libc/arch/arm/sys')
| -rw-r--r-- | lib/libc/arch/arm/sys/Ovfork.S | 4 | ||||
| -rw-r--r-- | lib/libc/arch/arm/sys/brk.S | 4 | ||||
| -rw-r--r-- | lib/libc/arch/arm/sys/cerror.S | 4 | ||||
| -rw-r--r-- | lib/libc/arch/arm/sys/sbrk.S | 4 | ||||
| -rw-r--r-- | lib/libc/arch/arm/sys/sigpending.S | 4 | ||||
| -rw-r--r-- | lib/libc/arch/arm/sys/sigprocmask.S | 4 | ||||
| -rw-r--r-- | lib/libc/arch/arm/sys/sigsuspend.S | 4 | ||||
| -rw-r--r-- | lib/libc/arch/arm/sys/tfork_thread.S | 6 |
8 files changed, 16 insertions, 18 deletions
diff --git a/lib/libc/arch/arm/sys/Ovfork.S b/lib/libc/arch/arm/sys/Ovfork.S index 560949a3237..396a1e82faf 100644 --- a/lib/libc/arch/arm/sys/Ovfork.S +++ b/lib/libc/arch/arm/sys/Ovfork.S @@ -1,4 +1,4 @@ -/* $OpenBSD: Ovfork.S,v 1.6 2016/05/07 19:05:21 guenther Exp $ */ +/* $OpenBSD: Ovfork.S,v 1.7 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: Ovfork.S,v 1.6 2003/08/07 16:42:03 agc Exp $ */ /*- @@ -40,6 +40,6 @@ SYSENTRY_HIDDEN(vfork) mov r2, r14 SYSTRAP(vfork) - bcs PIC_SYM(CERROR, PLT) + bcs CERROR mov r15, r2 SYSCALL_END_HIDDEN(vfork) diff --git a/lib/libc/arch/arm/sys/brk.S b/lib/libc/arch/arm/sys/brk.S index 691264cf417..f88bc6b97f5 100644 --- a/lib/libc/arch/arm/sys/brk.S +++ b/lib/libc/arch/arm/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.8 2016/05/30 05:18:52 guenther Exp $ */ +/* $OpenBSD: brk.S,v 1.9 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: brk.S,v 1.7 2003/12/26 11:23:44 martin Exp $ */ /*- @@ -71,7 +71,7 @@ ENTRY(brk) movcc r0, r1 mov r2, r0 SYSTRAP(break) - bcs PIC_SYM(CERROR, PLT) + bcs CERROR #ifdef __PIC__ ldr r1, .Lcurbrk diff --git a/lib/libc/arch/arm/sys/cerror.S b/lib/libc/arch/arm/sys/cerror.S index 05ac31af3c0..ec6bce8a1aa 100644 --- a/lib/libc/arch/arm/sys/cerror.S +++ b/lib/libc/arch/arm/sys/cerror.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cerror.S,v 1.8 2016/05/07 19:05:21 guenther Exp $ */ +/* $OpenBSD: cerror.S,v 1.9 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: cerror.S,v 1.5 2003/08/07 16:42:04 agc Exp $ */ /*- @@ -37,7 +37,7 @@ _ENTRY(CERROR) stmfd sp!, {r4, lr} mov r4, r0 - bl PIC_SYM(_C_LABEL(__errno), PLT) + bl _HIDDEN(__errno) str r4, [r0] mvn r0, #0x00000000 mvn r1, #0x00000000 diff --git a/lib/libc/arch/arm/sys/sbrk.S b/lib/libc/arch/arm/sys/sbrk.S index 4c3e57668df..9a66b791660 100644 --- a/lib/libc/arch/arm/sys/sbrk.S +++ b/lib/libc/arch/arm/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.8 2016/05/30 05:18:52 guenther Exp $ */ +/* $OpenBSD: sbrk.S,v 1.9 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: sbrk.S,v 1.7 2003/08/07 16:42:05 agc Exp $ */ /*- @@ -67,7 +67,7 @@ ENTRY(sbrk) mov r3, r0 add r0, r0, r1 SYSTRAP(break) - bcs PIC_SYM(CERROR, PLT) + bcs CERROR /* Store new curbrk value */ ldr r0, [r2] diff --git a/lib/libc/arch/arm/sys/sigpending.S b/lib/libc/arch/arm/sys/sigpending.S index 7f324fd62e2..72b6042c52e 100644 --- a/lib/libc/arch/arm/sys/sigpending.S +++ b/lib/libc/arch/arm/sys/sigpending.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigpending.S,v 1.4 2015/09/10 13:29:09 guenther Exp $ */ +/* $OpenBSD: sigpending.S,v 1.5 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: sigpending.S,v 1.5 2003/08/07 16:42:05 agc Exp $ */ /*- @@ -37,7 +37,7 @@ SYSENTRY(sigpending) mov r2, r0 SYSTRAP(sigpending) - bcs PIC_SYM(CERROR, PLT) + bcs CERROR str r0, [r2] mov r0, #0x00000000 mov r15, r14 diff --git a/lib/libc/arch/arm/sys/sigprocmask.S b/lib/libc/arch/arm/sys/sigprocmask.S index b0ca0387990..6bb5948ad50 100644 --- a/lib/libc/arch/arm/sys/sigprocmask.S +++ b/lib/libc/arch/arm/sys/sigprocmask.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigprocmask.S,v 1.4 2015/10/23 04:39:24 guenther Exp $ */ +/* $OpenBSD: sigprocmask.S,v 1.5 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: sigprocmask.S,v 1.5 2003/08/07 16:42:05 agc Exp $ */ /*- @@ -40,7 +40,7 @@ SYSENTRY_HIDDEN(sigprocmask) moveq r1, #0x00000000 ldrne r1, [r1] SYSTRAP(sigprocmask) - bcs PIC_SYM(CERROR, PLT) + bcs CERROR teq r2, #0x00000000 strne r0, [r2] mov r0, #0x00000000 diff --git a/lib/libc/arch/arm/sys/sigsuspend.S b/lib/libc/arch/arm/sys/sigsuspend.S index 3360eab7021..d5dea5397c3 100644 --- a/lib/libc/arch/arm/sys/sigsuspend.S +++ b/lib/libc/arch/arm/sys/sigsuspend.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigsuspend.S,v 1.5 2016/05/07 19:05:21 guenther Exp $ */ +/* $OpenBSD: sigsuspend.S,v 1.6 2016/08/06 19:16:09 guenther Exp $ */ /* $NetBSD: sigsuspend.S,v 1.6 2003/08/07 16:42:05 agc Exp $ */ /*- @@ -37,7 +37,7 @@ SYSENTRY_HIDDEN(sigsuspend) ldr r0, [r0] SYSTRAP(sigsuspend) - bcs PIC_SYM(CERROR, PLT) + bcs CERROR mov r0, #0x00000000 mov r15, r14 SYSCALL_END_HIDDEN(sigsuspend) diff --git a/lib/libc/arch/arm/sys/tfork_thread.S b/lib/libc/arch/arm/sys/tfork_thread.S index a24ef6758ef..6b0a624a62d 100644 --- a/lib/libc/arch/arm/sys/tfork_thread.S +++ b/lib/libc/arch/arm/sys/tfork_thread.S @@ -1,4 +1,4 @@ -/* $OpenBSD: tfork_thread.S,v 1.3 2015/09/10 13:29:09 guenther Exp $ */ +/* $OpenBSD: tfork_thread.S,v 1.4 2016/08/06 19:16:09 guenther Exp $ */ /* * Copyright (c) 2005 Dale Rahn <drahn@openbsd.org> * @@ -25,7 +25,7 @@ ENTRY(__tfork_thread) SYSTRAP(__tfork) - bcs 1f /* XXX can this be PIC_SYM(CERROR, PLT) ? */ + bcs CERROR /* check if we are parent or child */ cmp r0, #0 @@ -37,6 +37,4 @@ ENTRY(__tfork_thread) mov pc, r2 nop SYSTRAP(__threxit) -1: - b PIC_SYM(CERROR, PLT) END(__tfork_thread) |