From 55cecd0f26c705838da5f5fa9457d8b759024b34 Mon Sep 17 00:00:00 2001
From: bjh21 <bjh21@NetBSD.org>
Date: Sat, 5 Apr 2003 23:15:10 +0000
Subject: [PATCH] NetBSD/acorn26 has used APCS-32 for years, so unifdef
 -U__APCS_26__.

---
 lib/libpthread/arch/arm/_context_u.S     |  6 +-----
 lib/libpthread/arch/arm/pthread_switch.S | 10 +---------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/lib/libpthread/arch/arm/_context_u.S b/lib/libpthread/arch/arm/_context_u.S
index 3c29e860afcb..269a24acfba1 100644
--- a/lib/libpthread/arch/arm/_context_u.S
+++ b/lib/libpthread/arch/arm/_context_u.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: _context_u.S,v 1.2 2003/01/18 10:34:18 thorpej Exp $	*/
+/*	$NetBSD: _context_u.S,v 1.3 2003/04/05 23:15:10 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -123,11 +123,7 @@
 ENTRY(_getcontext_u)
 	GETC(r0)
 	mov	r0, #0x00000000
-#ifdef __APCS_26__
-	movs	pc, lr
-#else
 	mov	pc, lr
-#endif
 
 ENTRY(_setcontext_u)
 	SETC(r0)
diff --git a/lib/libpthread/arch/arm/pthread_switch.S b/lib/libpthread/arch/arm/pthread_switch.S
index 9ddda9ccf9f6..3e070916332d 100644
--- a/lib/libpthread/arch/arm/pthread_switch.S
+++ b/lib/libpthread/arch/arm/pthread_switch.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_switch.S,v 1.2 2003/01/18 10:34:18 thorpej Exp $	*/
+/*	$NetBSD: pthread_switch.S,v 1.3 2003/04/05 23:15:11 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -135,11 +135,7 @@ switch_return_point:
 	add	sp, sp, #12		/* skip over r0-r2 */
 	ldmfd	sp!, {r4-r5, lr}	/* restore r4-r5, lr */
 	add	sp, sp, #(RND_CTXSIZE)	/* pop ucontext_t */
-#ifdef __APCS_26__
-	movs	pc, lr
-#else
 	mov	pc, lr
-#endif
 
 /*
  * Helper routine; r0 = from, r1 = to, r2 = decr-spinlocks (boolean)
@@ -403,8 +399,4 @@ locked_return_point:
 	add	sp, sp, #12		/* skip over r0-r2 */
 	ldmfd	sp!, {r4-r5, lr}	/* restore r4-r5, lr */
 	add	sp, sp, #(RND_CTXSIZE)	/* pop ucontext_t */
-#ifdef __APCS_26__
-	movs	pc, lr
-#else
 	mov	pc, lr
-#endif