diff options
| author | cognet <cognet@FreeBSD.org> | 2006-11-09 01:28:16 +0000 |
|---|---|---|
| committer | cognet <cognet@FreeBSD.org> | 2006-11-09 01:28:16 +0000 |
| commit | 93ee84a57833987497e5dc8602b0ff60c4426c78 (patch) | |
| tree | c3a7901c5b23639b8a0f92ed47cc558628f66fe7 /lib/libc | |
| parent | 6a11c108bf3d367f1a2ab19568fd628702f9212f (diff) | |
| download | FreeBSD-src-93ee84a57833987497e5dc8602b0ff60c4426c78.zip FreeBSD-src-93ee84a57833987497e5dc8602b0ff60c4426c78.tar.gz | |
Cleanup: we always have to use __error() now, and we shouldn't provide a
errno symbol, so completely remove the !_REENTRANT case.
Spotted out by: ru
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/arm/sys/cerror.S | 28 | ||||
| -rw-r--r-- | lib/libc/arm/sys/ptrace.S | 31 |
2 files changed, 1 insertions, 58 deletions
diff --git a/lib/libc/arm/sys/cerror.S b/lib/libc/arm/sys/cerror.S index e657248..e807285 100644 --- a/lib/libc/arm/sys/cerror.S +++ b/lib/libc/arm/sys/cerror.S @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); .type _C_LABEL(__error),%function ASENTRY(CERROR) -#if 1 stmfd sp!, {r4, lr} mov r4, r0 bl PIC_SYM(_C_LABEL(__error), PLT) @@ -47,30 +46,3 @@ ASENTRY(CERROR) mvn r0, #0x00000000 mvn r1, #0x00000000 ldmfd sp!, {r4, pc} -#else -#ifdef PIC - /* Setup the GOT */ - ldr r3, .Lgot - add r3, pc, r3 -.L1: - ldr r1, .Lerrno - ldr r1, [r3, r1] -#else - ldr r1, .Lerrno -#endif /* PIC */ - str r0, [r1] - mvn r0, #0x00000000 - mvn r1, #0x00000000 - RET - -#if 0 - .align 0 -.Lgot: - .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) + (. - (.L1+4)) -#endif /* PIC */ - - .globl _C_LABEL(errno) - -.Lerrno: - .word PIC_SYM(_C_LABEL(errno), GOT) -#endif /* _REENTRANT */ diff --git a/lib/libc/arm/sys/ptrace.S b/lib/libc/arm/sys/ptrace.S index 46b31bc..3cc13f3 100644 --- a/lib/libc/arm/sys/ptrace.S +++ b/lib/libc/arm/sys/ptrace.S @@ -36,42 +36,13 @@ __FBSDID("$FreeBSD$"); #include "SYS.h" ENTRY(ptrace) -#ifdef _REENTRANT stmfd sp!, {r0-r3, lr} sub sp, sp, #4 /* align stack */ - bl PIC_SYM(_C_LABEL(__errno), PLT) + bl PIC_SYM(_C_LABEL(__error), PLT) add sp, sp, #4 /* unalign stack */ mov r1, #0x00000000 str r1, [r0] ldmfd sp!, {r0-r3, lr} -#else - stmfd sp!, {r0, r1} -#ifdef PIC - /* Setup the GOT */ - ldr r0, .Lgot - add r0, pc, r0 -.L1: - ldr r1, .Lerrno - ldr r1, [r0, r1] -#else - ldr r1, .Lerrno -#endif /* PIC */ - mov r0, #0x00000000 - str r0, [r1] - ldmfd sp!, {r0, r1} -#endif /* _REENTRANT */ - SYSTRAP(ptrace) bcs PIC_SYM(CERROR, PLT) RET - -#ifndef _REENTRANT -#ifdef PIC - .align 0 -.Lgot: - .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) + (. - (.L1+4)) -#endif /* PIC */ - -.Lerrno: - .word PIC_SYM(_C_LABEL(errno), GOT) -#endif /* !_REENTRANT */ |
