diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-12-31 23:31:14 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-12-31 23:31:14 +0000 |
| commit | aa782bbd25b92573c5332297dd87a1dd8daa9509 (patch) | |
| tree | df0cfa3adfcf5769f3c0ea9c077493b55d1e8b7a /lib | |
| parent | 099c2b2a86d7c415897a8a8b7a91699387241a1c (diff) | |
Remove #ifdef _REENTRANT code that isn't used here. These days, the code
handling per-thread errno lives in librthread.
ok miod@, espie@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/arch/arm/sys/cerror.S | 12 | ||||
| -rw-r--r-- | lib/libc/arch/sh/sys/cerror.S | 23 |
2 files changed, 2 insertions, 33 deletions
diff --git a/lib/libc/arch/arm/sys/cerror.S b/lib/libc/arch/arm/sys/cerror.S index 8c941bd0042..4481a0918f8 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.5 2012/08/22 17:19:34 pascal Exp $ */ +/* $OpenBSD: cerror.S,v 1.6 2013/12/31 23:31:13 kettenis Exp $ */ /* $NetBSD: cerror.S,v 1.5 2003/08/07 16:42:04 agc Exp $ */ /*- @@ -37,15 +37,6 @@ WEAK_ALIAS(CERROR, _CERROR) ASENTRY(_CERROR) -#ifdef _REENTRANT - stmfd sp!, {r4, lr} - mov r4, r0 - bl PIC_SYM(_C_LABEL(__errno), PLT) - str r4, [r0] - mvn r0, #0x00000000 - mvn r1, #0x00000000 - ldmfd sp!, {r4, pc} -#else #ifdef __PIC__ /* Setup the GOT */ ldr r3, .Lgot @@ -71,4 +62,3 @@ ASENTRY(_CERROR) .Lerrno: .word PIC_SYM(_C_LABEL(errno), GOT) -#endif /* _REENTRANT */ diff --git a/lib/libc/arch/sh/sys/cerror.S b/lib/libc/arch/sh/sys/cerror.S index c873e076a4d..3df872707ef 100644 --- a/lib/libc/arch/sh/sys/cerror.S +++ b/lib/libc/arch/sh/sys/cerror.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cerror.S,v 1.3 2012/08/22 17:19:35 pascal Exp $ */ +/* $OpenBSD: cerror.S,v 1.4 2013/12/31 23:31:13 kettenis Exp $ */ /* $NetBSD: cerror.S,v 1.10 2006/01/06 05:14:39 uwe Exp $ */ /*- @@ -40,26 +40,6 @@ WEAK_ALIAS(CERROR, _CERROR) ASENTRY(_CERROR) -#ifdef _REENTRANT - mov.l .L___errno, r1 - PIC_PROLOGUE(.L_got) - sts.l pr, @-sp -1: CALL r1 - mov.l r4, @-sp ! save error code - mov.l @sp+, r4 - lds.l @sp+, pr - PIC_EPILOGUE - mov.l r4, @r0 - mov #-1, r1 - rts - mov #-1, r0 - - .align 2 -.L_got: PIC_GOT_DATUM -.L___errno: CALL_DATUM(_C_LABEL(__errno), 1b) - SET_ASENTRY_SIZE(_CERROR) - -#else /* !_REENTRANT */ #ifdef __PIC__ mova L_GOT, r0 mov.l L_GOT, r1 @@ -82,4 +62,3 @@ L_errno: .long _C_LABEL(errno)@GOT #else L_errno: .long _C_LABEL(errno) #endif -#endif /* !_REENTRANT */ |