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