2 files changed, 49 insertions, 6 deletions
diff --git a/sysdeps/unix/arm/brk.S b/sysdeps/unix/arm/brk.S
index 0150bcde80..b3924a3d6d 100644
--- a/sysdeps/unix/arm/brk.S
+++ b/sysdeps/unix/arm/brk.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 95, 97, 98 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -33,11 +33,24 @@ C_LABEL(__curbrk)
 
 .text
 SYSCALL__ (brk, 1)
+#ifdef PIC
+	ldr r1, 1f
+	add r1, r1, pc
+2:	ldr r2, _cb_addr
+	add r1, r1, r2
+#else
 	ldr r1, _cb_addr
+#endif
 	str r0, [r1]
 	mov r0, $0
 	RETINSTR(mov, pc, r14)
-_cb_addr:	.long C_SYMBOL_NAME(__curbrk)
-
+#ifdef PIC
+1:	.long _GLOBAL_OFFSET_TABLE_ - 2b - 4
+_cb_addr:
+	.long C_SYMBOL_NAME(__curbrk)(GOTOFF)
+#else
+_cb_addr:
+	.long C_SYMBOL_NAME(__curbrk)
+#endif
 
 weak_alias (__brk, brk)
diff --git a/sysdeps/unix/arm/sysdep.S b/sysdeps/unix/arm/sysdep.S
index d59500e47a..c1da5255b0 100644
--- a/sysdeps/unix/arm/sysdep.S
+++ b/sysdeps/unix/arm/sysdep.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,96,97,98 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,8 +23,6 @@
 .globl C_SYMBOL_NAME(errno)
 .globl syscall_error
 
-_errno_loc:	.long C_SYMBOL_NAME(errno)
-
 #undef syscall_error
 #ifdef NO_UNDERSCORES
 __syscall_error:
@@ -38,12 +36,44 @@ syscall_error:
 	cmp r0, $EWOULDBLOCK_sys /* Is it the old EWOULDBLOCK?  */
 	moveq r0, $EAGAIN	/* Yes; translate it to EAGAIN.  */
 #endif
+
 #ifndef	PIC
 	ldr r1, _errno_loc
 	str r0, [r1]
+#ifdef _LIBC_REENTRANT
+	stmdb sp!, {r0, lr}
+	/* put another copy of r0 at a specific errno location */
+	bl __errno_location
+	ldmia sp!, {r1, lr}
+	str r1, [r0]
+#endif
+#else
+	stmdb sp!,{r10, lr}
+	@ we have to establish our PIC register
+	ldr r10, 1f
+	add r10, pc, r10
+0:	ldr r1, 2f
+	ldr r1, [r10, r1]
+	@ store a copy in _errno_loc
+	str r0, [r1]
+#ifdef _LIBC_REENTRANT
+	@ and another copy in thread copy of _errno_loc
+	mov r10, r0
+	bl __errno_location(PLT)
+	str r10, [r0]
+#endif
+	ldmia sp!, {r10, lr}
+	b 4f
+1:	.word _GLOBAL_OFFSET_TABLE_ - 0b - 4
+2:	.word C_SYMBOL_NAME(errno)(GOT)
+4:
 #endif
 	mvn r0, $0
 	RETINSTR(mov, pc, r14)
 
+#ifndef PIC
+_errno_loc:	.long C_SYMBOL_NAME(errno)
+#endif
+
 #undef	__syscall_error
 END (__syscall_error)