mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-20 11:11:24 +00:00
Code Issues Releases Activity

Cleanup: we always have to use __error() now, and we shouldn't provide a

Browse Source 
errno symbol, so completely remove the !_REENTRANT case.

Spotted out by:	ru
This commit is contained in:
Olivier Houchard 2006-11-09 01:28:16 +00:00
parent 42013c462c
commit c0b6c4a212
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=164109
2 changed files with 1 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/libc/arm/sys/cerror.S
View File

@ -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 */

31
lib/libc/arm/sys/ptrace.S
View File

@ -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 */