diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 496d1fe5f429..94744fdb966f 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.92 2000/12/20 21:13:56 christos Exp $
+#	$NetBSD: Makefile,v 1.93 2000/12/29 20:13:44 bjh21 Exp $
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
 #
 # All library objects contain sccsid strings by default; they may be
@@ -27,7 +27,7 @@ CPPFLAGS+=	-DINET6
 #LINTFLAGS+=	-w
 LINTFLAGS+=-X 272
 
-ARCHSUBDIR=	${MACHINE_ARCH:C/mipse[bl]/mips/}
+ARCHSUBDIR=	${MACHINE_ARCH:C/mipse[bl]/mips/:S/arm26/arm/}
 ARCHDIR=	${.CURDIR}/arch/${ARCHSUBDIR}
 AINC=		-I${ARCHDIR}
 .if defined(DESTDIR)
diff --git a/lib/libc/arch/arm/Makefile.inc b/lib/libc/arch/arm/Makefile.inc
new file mode 100644
index 000000000000..cbdce996b187
--- /dev/null
+++ b/lib/libc/arch/arm/Makefile.inc
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile.inc,v 1.1 2000/12/29 20:13:44 bjh21 Exp $
+
+KMINCLUDES=
+KMSRCS=arch/arm/gen/divsi3.S arch/arm/string/memmove.S \
+	arch/arm/string/memcpy.S
+
+.if ${MACHINE_ARCH} == "arm26"
+# __APCS_26__ required for SYS.h stuff, which uses ${CPP} and hence doesn't
+# get the normal predefines.
+CPPFLAGS+=-DSOFTFLOAT -D__APCS_26__
+
+.include <softfloat/Makefile.inc>
+.endif
diff --git a/lib/libc/arch/arm26/SYS.h b/lib/libc/arch/arm/SYS.h
similarity index 97%
rename from lib/libc/arch/arm26/SYS.h
rename to lib/libc/arch/arm/SYS.h
index 4f60f83ffc20..5881367123e8 100644
--- a/lib/libc/arch/arm26/SYS.h
+++ b/lib/libc/arch/arm/SYS.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: SYS.h,v 1.1 2000/05/09 21:55:45 bjh21 Exp $	*/
+/*	$NetBSD: SYS.h,v 1.1 2000/12/29 20:13:45 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/lib/libc/arch/arm26/gen/Makefile.inc b/lib/libc/arch/arm/gen/Makefile.inc
similarity index 83%
rename from lib/libc/arch/arm26/gen/Makefile.inc
rename to lib/libc/arch/arm/gen/Makefile.inc
index 14c10a39350e..bcb980945c59 100644
--- a/lib/libc/arch/arm26/gen/Makefile.inc
+++ b/lib/libc/arch/arm/gen/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2000/06/06 08:14:54 bjh21 Exp $
+# $NetBSD: Makefile.inc,v 1.1 2000/12/29 20:13:45 bjh21 Exp $
 
 SRCS+=	alloca.S byte_swap_2.S byte_swap_4.S bswap64.c divsi3.S \
 	fabs.c flt_rounds.c \
diff --git a/lib/libc/arch/arm26/gen/__setjmp14.S b/lib/libc/arch/arm/gen/__setjmp14.S
similarity index 98%
rename from lib/libc/arch/arm26/gen/__setjmp14.S
rename to lib/libc/arch/arm/gen/__setjmp14.S
index da7e3202f44a..c73a29415354 100644
--- a/lib/libc/arch/arm26/gen/__setjmp14.S
+++ b/lib/libc/arch/arm/gen/__setjmp14.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: __setjmp14.S,v 1.2 2000/12/29 13:39:39 bjh21 Exp $	*/
+/*	$NetBSD: __setjmp14.S,v 1.1 2000/12/29 20:13:45 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe
diff --git a/lib/libc/arch/arm26/gen/__sigsetjmp14.S b/lib/libc/arch/arm/gen/__sigsetjmp14.S
similarity index 97%
rename from lib/libc/arch/arm26/gen/__sigsetjmp14.S
rename to lib/libc/arch/arm/gen/__sigsetjmp14.S
index 8a482f036017..8c63de161154 100644
--- a/lib/libc/arch/arm26/gen/__sigsetjmp14.S
+++ b/lib/libc/arch/arm/gen/__sigsetjmp14.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigsetjmp14.S,v 1.2 2000/12/29 13:39:39 bjh21 Exp $	*/
+/*	$NetBSD: __sigsetjmp14.S,v 1.1 2000/12/29 20:13:46 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe
diff --git a/lib/libc/arch/arm26/gen/_setjmp.S b/lib/libc/arch/arm/gen/_setjmp.S
similarity index 98%
rename from lib/libc/arch/arm26/gen/_setjmp.S
rename to lib/libc/arch/arm/gen/_setjmp.S
index 0162e3436a72..7d2536849002 100644
--- a/lib/libc/arch/arm26/gen/_setjmp.S
+++ b/lib/libc/arch/arm/gen/_setjmp.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: _setjmp.S,v 1.2 2000/12/29 13:39:39 bjh21 Exp $	*/
+/*	$NetBSD: _setjmp.S,v 1.1 2000/12/29 20:13:46 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe
diff --git a/lib/libc/arch/arm26/gen/alloca.S b/lib/libc/arch/arm/gen/alloca.S
similarity index 97%
rename from lib/libc/arch/arm26/gen/alloca.S
rename to lib/libc/arch/arm/gen/alloca.S
index bc5ddb42e335..26491d934165 100644
--- a/lib/libc/arch/arm26/gen/alloca.S
+++ b/lib/libc/arch/arm/gen/alloca.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: alloca.S,v 1.1 2000/05/09 21:55:47 bjh21 Exp $	*/
+/*	$NetBSD: alloca.S,v 1.1 2000/12/29 20:13:46 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1995 Mark Brinicombe
diff --git a/lib/libc/arch/arm26/gen/byte_swap_2.S b/lib/libc/arch/arm/gen/byte_swap_2.S
similarity index 97%
rename from lib/libc/arch/arm26/gen/byte_swap_2.S
rename to lib/libc/arch/arm/gen/byte_swap_2.S
index 85ddc12dcbaf..da1a7811d7fa 100644
--- a/lib/libc/arch/arm26/gen/byte_swap_2.S
+++ b/lib/libc/arch/arm/gen/byte_swap_2.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: byte_swap_2.S,v 1.4 2000/12/14 20:47:26 bjh21 Exp $	*/
+/*	$NetBSD: byte_swap_2.S,v 1.1 2000/12/29 20:13:47 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/lib/libc/arch/arm26/gen/byte_swap_4.S b/lib/libc/arch/arm/gen/byte_swap_4.S
similarity index 97%
rename from lib/libc/arch/arm26/gen/byte_swap_4.S
rename to lib/libc/arch/arm/gen/byte_swap_4.S
index 0a9ff7d1c34f..79b84baeae02 100644
--- a/lib/libc/arch/arm26/gen/byte_swap_4.S
+++ b/lib/libc/arch/arm/gen/byte_swap_4.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: byte_swap_4.S,v 1.4 2000/12/14 20:47:26 bjh21 Exp $	*/
+/*	$NetBSD: byte_swap_4.S,v 1.1 2000/12/29 20:13:47 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/lib/libc/arch/arm26/gen/divsi3.S b/lib/libc/arch/arm/gen/divsi3.S
similarity index 97%
rename from lib/libc/arch/arm26/gen/divsi3.S
rename to lib/libc/arch/arm/gen/divsi3.S
index 3d72d0a16c78..1ad0646ec637 100644
--- a/lib/libc/arch/arm26/gen/divsi3.S
+++ b/lib/libc/arch/arm/gen/divsi3.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: divsi3.S,v 1.1 2000/05/09 21:55:47 bjh21 Exp $	*/
+/*	$NetBSD: divsi3.S,v 1.1 2000/12/29 20:13:47 bjh21 Exp $	*/
 
 /*
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
@@ -37,11 +37,14 @@ ENTRY(__modsi3)
 #endif
 
 L_overflow:
-#if 0 /* FIXME */
+#if !defined(_KERNEL) && !defined(_STANDALONE)
 	mov	r0, #8			/* SIGFPE */
-	bl	_C_FUNC(raise)			/* raise it */
-#endif
+	bl	_C_LABEL(raise)		/* raise it */
 	mov	r0, #0
+#else
+	/* XXX should cause a fatal error */
+	mvn	r0, #0
+#endif
 #ifdef __APCS_26__
 	movs	pc, lr
 #else
diff --git a/lib/libc/arch/arm26/gen/fabs.c b/lib/libc/arch/arm/gen/fabs.c
similarity index 96%
rename from lib/libc/arch/arm26/gen/fabs.c
rename to lib/libc/arch/arm/gen/fabs.c
index 83ca3281b9e0..279189cf43ab 100644
--- a/lib/libc/arch/arm26/gen/fabs.c
+++ b/lib/libc/arch/arm/gen/fabs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fabs.c,v 1.1 2000/05/09 21:55:48 bjh21 Exp $	*/
+/*	$NetBSD: fabs.c,v 1.1 2000/12/29 20:13:48 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
diff --git a/lib/libc/arch/arm26/gen/flt_rounds.c b/lib/libc/arch/arm/gen/flt_rounds.c
similarity index 97%
rename from lib/libc/arch/arm26/gen/flt_rounds.c
rename to lib/libc/arch/arm/gen/flt_rounds.c
index 9cc2f84575c5..2227ccd1a60a 100644
--- a/lib/libc/arch/arm26/gen/flt_rounds.c
+++ b/lib/libc/arch/arm/gen/flt_rounds.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: flt_rounds.c,v 1.1 2000/05/09 21:55:48 bjh21 Exp $	*/
+/*	$NetBSD: flt_rounds.c,v 1.1 2000/12/29 20:13:48 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
diff --git a/lib/libc/arch/arm26/gen/frexp.c b/lib/libc/arch/arm/gen/frexp.c
similarity index 95%
rename from lib/libc/arch/arm26/gen/frexp.c
rename to lib/libc/arch/arm/gen/frexp.c
index ffcd21b312e5..001a0e3eb55e 100644
--- a/lib/libc/arch/arm26/gen/frexp.c
+++ b/lib/libc/arch/arm/gen/frexp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: frexp.c,v 1.1 2000/05/09 21:55:48 bjh21 Exp $	*/
+/*	$NetBSD: frexp.c,v 1.1 2000/12/29 20:13:48 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)frexp.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: frexp.c,v 1.1 2000/05/09 21:55:48 bjh21 Exp $");
+__RCSID("$NetBSD: frexp.c,v 1.1 2000/12/29 20:13:48 bjh21 Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/arch/arm26/gen/infinity.c b/lib/libc/arch/arm/gen/infinity.c
similarity index 96%
rename from lib/libc/arch/arm26/gen/infinity.c
rename to lib/libc/arch/arm/gen/infinity.c
index e4a15e791aa9..6f199e1dcc4c 100644
--- a/lib/libc/arch/arm26/gen/infinity.c
+++ b/lib/libc/arch/arm/gen/infinity.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: infinity.c,v 1.1 2000/05/09 21:55:48 bjh21 Exp $	*/
+/*	$NetBSD: infinity.c,v 1.1 2000/12/29 20:13:49 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1996 Mark Brinicombe.
diff --git a/lib/libc/arch/arm26/gen/isinf.c b/lib/libc/arch/arm/gen/isinf.c
similarity index 95%
rename from lib/libc/arch/arm26/gen/isinf.c
rename to lib/libc/arch/arm/gen/isinf.c
index a794e05dccd9..c1a56a9f876c 100644
--- a/lib/libc/arch/arm26/gen/isinf.c
+++ b/lib/libc/arch/arm/gen/isinf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isinf.c,v 1.1 2000/05/09 21:55:49 bjh21 Exp $	*/
+/*	$NetBSD: isinf.c,v 1.1 2000/12/29 20:13:49 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: isinf.c,v 1.1 2000/05/09 21:55:49 bjh21 Exp $");
+__RCSID("$NetBSD: isinf.c,v 1.1 2000/12/29 20:13:49 bjh21 Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/arch/arm26/gen/isnan.c b/lib/libc/arch/arm/gen/isnan.c
similarity index 95%
rename from lib/libc/arch/arm26/gen/isnan.c
rename to lib/libc/arch/arm/gen/isnan.c
index 01f02d4899b1..a1b7f8bd075e 100644
--- a/lib/libc/arch/arm26/gen/isnan.c
+++ b/lib/libc/arch/arm/gen/isnan.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isnan.c,v 1.1 2000/05/09 21:55:49 bjh21 Exp $	*/
+/*	$NetBSD: isnan.c,v 1.1 2000/12/29 20:13:49 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)isinf.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: isnan.c,v 1.1 2000/05/09 21:55:49 bjh21 Exp $");
+__RCSID("$NetBSD: isnan.c,v 1.1 2000/12/29 20:13:49 bjh21 Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/arch/arm26/gen/ldexp.c b/lib/libc/arch/arm/gen/ldexp.c
similarity index 97%
rename from lib/libc/arch/arm26/gen/ldexp.c
rename to lib/libc/arch/arm/gen/ldexp.c
index eebfd26b0d1b..e151a031db07 100644
--- a/lib/libc/arch/arm26/gen/ldexp.c
+++ b/lib/libc/arch/arm/gen/ldexp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ldexp.c,v 1.1 2000/05/09 21:55:49 bjh21 Exp $	*/
+/*	$NetBSD: ldexp.c,v 1.1 2000/12/29 20:13:50 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ldexp.c,v 1.1 2000/05/09 21:55:49 bjh21 Exp $");
+__RCSID("$NetBSD: ldexp.c,v 1.1 2000/12/29 20:13:50 bjh21 Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/arch/arm26/gen/modf.c b/lib/libc/arch/arm/gen/modf.c
similarity index 98%
rename from lib/libc/arch/arm26/gen/modf.c
rename to lib/libc/arch/arm/gen/modf.c
index f37b1cb15301..057756065c97 100644
--- a/lib/libc/arch/arm26/gen/modf.c
+++ b/lib/libc/arch/arm/gen/modf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: modf.c,v 1.2 2000/06/14 06:49:03 cgd Exp $ */
+/* $NetBSD: modf.c,v 1.1 2000/12/29 20:13:50 bjh21 Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
diff --git a/lib/libc/arch/arm26/gen/nanf.c b/lib/libc/arch/arm/gen/nanf.c
similarity index 65%
rename from lib/libc/arch/arm26/gen/nanf.c
rename to lib/libc/arch/arm/gen/nanf.c
index f19ac11b51d3..bf8d55ce14f1 100644
--- a/lib/libc/arch/arm26/gen/nanf.c
+++ b/lib/libc/arch/arm/gen/nanf.c
@@ -1,8 +1,8 @@
-/*	$NetBSD: nanf.c,v 1.1 2000/05/09 21:55:49 bjh21 Exp $	*/
+/*	$NetBSD: nanf.c,v 1.1 2000/12/29 20:13:50 bjh21 Exp $	*/
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: nanf.c,v 1.1 2000/05/09 21:55:49 bjh21 Exp $");
+__RCSID("$NetBSD: nanf.c,v 1.1 2000/12/29 20:13:50 bjh21 Exp $");
 #endif /* not lint */
 
 /* nanf.c */
diff --git a/lib/libc/arch/arm26/gen/setjmp.S b/lib/libc/arch/arm/gen/setjmp.S
similarity index 98%
rename from lib/libc/arch/arm26/gen/setjmp.S
rename to lib/libc/arch/arm/gen/setjmp.S
index 0cd4a0280650..dd267ba8eee5 100644
--- a/lib/libc/arch/arm26/gen/setjmp.S
+++ b/lib/libc/arch/arm/gen/setjmp.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: setjmp.S,v 1.2 2000/12/29 13:39:39 bjh21 Exp $	*/
+/*	$NetBSD: setjmp.S,v 1.1 2000/12/29 20:13:51 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe
diff --git a/lib/libc/arch/arm26/gen/sigsetjmp.S b/lib/libc/arch/arm/gen/sigsetjmp.S
similarity index 97%
rename from lib/libc/arch/arm26/gen/sigsetjmp.S
rename to lib/libc/arch/arm/gen/sigsetjmp.S
index ccb8776b3144..c9c6f515080c 100644
--- a/lib/libc/arch/arm26/gen/sigsetjmp.S
+++ b/lib/libc/arch/arm/gen/sigsetjmp.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: sigsetjmp.S,v 1.2 2000/12/29 13:39:39 bjh21 Exp $	*/
+/*	$NetBSD: sigsetjmp.S,v 1.1 2000/12/29 20:13:51 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe
diff --git a/lib/libc/arch/arm26/hardfloat/fpgetmask.S b/lib/libc/arch/arm/hardfloat/fpgetmask.S
similarity index 96%
rename from lib/libc/arch/arm26/hardfloat/fpgetmask.S
rename to lib/libc/arch/arm/hardfloat/fpgetmask.S
index 26943e641814..4cd6625f7bc9 100644
--- a/lib/libc/arch/arm26/hardfloat/fpgetmask.S
+++ b/lib/libc/arch/arm/hardfloat/fpgetmask.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpgetmask.S,v 1.1 2000/06/06 08:14:59 bjh21 Exp $	*/
+/*	$NetBSD: fpgetmask.S,v 1.1 2000/12/29 20:13:52 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
diff --git a/lib/libc/arch/arm26/hardfloat/fpgetround.c b/lib/libc/arch/arm/hardfloat/fpgetround.c
similarity index 97%
rename from lib/libc/arch/arm26/hardfloat/fpgetround.c
rename to lib/libc/arch/arm/hardfloat/fpgetround.c
index b1492815edd8..e02064e2e8ad 100644
--- a/lib/libc/arch/arm26/hardfloat/fpgetround.c
+++ b/lib/libc/arch/arm/hardfloat/fpgetround.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpgetround.c,v 1.1 2000/06/06 08:15:00 bjh21 Exp $	*/
+/*	$NetBSD: fpgetround.c,v 1.1 2000/12/29 20:13:52 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
diff --git a/lib/libc/arch/arm26/hardfloat/fpgetsticky.S b/lib/libc/arch/arm/hardfloat/fpgetsticky.S
similarity index 96%
rename from lib/libc/arch/arm26/hardfloat/fpgetsticky.S
rename to lib/libc/arch/arm/hardfloat/fpgetsticky.S
index e739bc2838da..a36b4ad5f62c 100644
--- a/lib/libc/arch/arm26/hardfloat/fpgetsticky.S
+++ b/lib/libc/arch/arm/hardfloat/fpgetsticky.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpgetsticky.S,v 1.1 2000/06/06 08:15:00 bjh21 Exp $	*/
+/*	$NetBSD: fpgetsticky.S,v 1.1 2000/12/29 20:13:52 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
diff --git a/lib/libc/arch/arm26/hardfloat/fpsetmask.S b/lib/libc/arch/arm/hardfloat/fpsetmask.S
similarity index 97%
rename from lib/libc/arch/arm26/hardfloat/fpsetmask.S
rename to lib/libc/arch/arm/hardfloat/fpsetmask.S
index 35306e819f60..fcc51547028b 100644
--- a/lib/libc/arch/arm26/hardfloat/fpsetmask.S
+++ b/lib/libc/arch/arm/hardfloat/fpsetmask.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpsetmask.S,v 1.1 2000/06/06 08:15:00 bjh21 Exp $	*/
+/*	$NetBSD: fpsetmask.S,v 1.1 2000/12/29 20:13:52 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
diff --git a/lib/libc/arch/arm26/hardfloat/fpsetround.c b/lib/libc/arch/arm/hardfloat/fpsetround.c
similarity index 97%
rename from lib/libc/arch/arm26/hardfloat/fpsetround.c
rename to lib/libc/arch/arm/hardfloat/fpsetround.c
index d9bacf173c16..3bae7daa969b 100644
--- a/lib/libc/arch/arm26/hardfloat/fpsetround.c
+++ b/lib/libc/arch/arm/hardfloat/fpsetround.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpsetround.c,v 1.1 2000/06/06 08:15:00 bjh21 Exp $	*/
+/*	$NetBSD: fpsetround.c,v 1.1 2000/12/29 20:13:53 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
diff --git a/lib/libc/arch/arm26/hardfloat/fpsetsticky.S b/lib/libc/arch/arm/hardfloat/fpsetsticky.S
similarity index 96%
rename from lib/libc/arch/arm26/hardfloat/fpsetsticky.S
rename to lib/libc/arch/arm/hardfloat/fpsetsticky.S
index fa2fc22a8a4b..a87af9aa8c13 100644
--- a/lib/libc/arch/arm26/hardfloat/fpsetsticky.S
+++ b/lib/libc/arch/arm/hardfloat/fpsetsticky.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpsetsticky.S,v 1.1 2000/06/06 08:15:00 bjh21 Exp $	*/
+/*	$NetBSD: fpsetsticky.S,v 1.1 2000/12/29 20:13:53 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
diff --git a/lib/libc/arch/arm26/net/Makefile.inc b/lib/libc/arch/arm/net/Makefile.inc
similarity index 52%
rename from lib/libc/arch/arm26/net/Makefile.inc
rename to lib/libc/arch/arm/net/Makefile.inc
index 542eaea2811b..10fabd39b673 100644
--- a/lib/libc/arch/arm26/net/Makefile.inc
+++ b/lib/libc/arch/arm/net/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2000/05/09 21:55:49 bjh21 Exp $
+# $NetBSD: Makefile.inc,v 1.1 2000/12/29 20:13:53 bjh21 Exp $
 
 # hton* and nto* functions provided by ../gen/byte_swap_*.S
 SRCS+= 
diff --git a/lib/libc/arch/arm26/softfloat/arm-gcc.h b/lib/libc/arch/arm/softfloat/arm-gcc.h
similarity index 98%
rename from lib/libc/arch/arm26/softfloat/arm-gcc.h
rename to lib/libc/arch/arm/softfloat/arm-gcc.h
index 95f38dd249b1..ce9cdbec58c2 100644
--- a/lib/libc/arch/arm26/softfloat/arm-gcc.h
+++ b/lib/libc/arch/arm/softfloat/arm-gcc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: arm-gcc.h,v 1.1 2000/06/06 08:15:00 bjh21 Exp $ */
+/* $NetBSD: arm-gcc.h,v 1.1 2000/12/29 20:13:54 bjh21 Exp $ */
 
 /*
 -------------------------------------------------------------------------------
diff --git a/lib/libc/arch/arm26/softfloat/milieu.h b/lib/libc/arch/arm/softfloat/milieu.h
similarity index 96%
rename from lib/libc/arch/arm26/softfloat/milieu.h
rename to lib/libc/arch/arm/softfloat/milieu.h
index d379181c52ca..a3f829c4281b 100644
--- a/lib/libc/arch/arm26/softfloat/milieu.h
+++ b/lib/libc/arch/arm/softfloat/milieu.h
@@ -1,4 +1,4 @@
-/* $NetBSD: milieu.h,v 1.1 2000/06/06 08:15:01 bjh21 Exp $ */
+/* $NetBSD: milieu.h,v 1.1 2000/12/29 20:13:54 bjh21 Exp $ */
 
 /*
 ===============================================================================
diff --git a/lib/libc/arch/arm26/softfloat/softfloat-specialize b/lib/libc/arch/arm/softfloat/softfloat-specialize
similarity index 100%
rename from lib/libc/arch/arm26/softfloat/softfloat-specialize
rename to lib/libc/arch/arm/softfloat/softfloat-specialize
diff --git a/lib/libc/arch/arm26/softfloat/softfloat.h b/lib/libc/arch/arm/softfloat/softfloat.h
similarity index 100%
rename from lib/libc/arch/arm26/softfloat/softfloat.h
rename to lib/libc/arch/arm/softfloat/softfloat.h
diff --git a/lib/libc/arch/arm/stdlib/Makefile.inc b/lib/libc/arch/arm/stdlib/Makefile.inc
new file mode 100644
index 000000000000..9222d18b9170
--- /dev/null
+++ b/lib/libc/arch/arm/stdlib/Makefile.inc
@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile.inc,v 1.1 2000/12/29 20:13:56 bjh21 Exp $
+
+SRCS+=	abs.c div.c labs.c ldiv.c llabs.c
diff --git a/lib/libc/arch/arm26/string/Makefile.inc b/lib/libc/arch/arm/string/Makefile.inc
similarity index 80%
rename from lib/libc/arch/arm26/string/Makefile.inc
rename to lib/libc/arch/arm/string/Makefile.inc
index 5947b3baf886..6c008abfc51c 100644
--- a/lib/libc/arch/arm26/string/Makefile.inc
+++ b/lib/libc/arch/arm/string/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2000/05/09 21:55:50 bjh21 Exp $
+# $NetBSD: Makefile.inc,v 1.1 2000/12/29 20:13:56 bjh21 Exp $
 
 SRCS+=  memcpy.S _memcpy.S bcopy.S memmove.S memset.S bzero.S
 SRCS+=	bcmp.c ffs.c index.c memchr.c memcmp.c \
diff --git a/lib/libc/arch/arm26/string/_memcpy.S b/lib/libc/arch/arm/string/_memcpy.S
similarity index 99%
rename from lib/libc/arch/arm26/string/_memcpy.S
rename to lib/libc/arch/arm/string/_memcpy.S
index 999ecfcc8f1e..e68d16e140c8 100644
--- a/lib/libc/arch/arm26/string/_memcpy.S
+++ b/lib/libc/arch/arm/string/_memcpy.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: _memcpy.S,v 1.2 2000/12/28 18:27:24 bjh21 Exp $	*/
+/*	$NetBSD: _memcpy.S,v 1.1 2000/12/29 20:13:56 bjh21 Exp $	*/
 
 /*
  * This code is derived from software contributed to The NetBSD Foundation
@@ -61,7 +61,7 @@ ENTRY(_memcpy)
 #else
 	moveq	pc, lr
 #endif
-	
+
 	stmdb	sp!, {r0, lr}		/* memcpy() returns dest addr */
 	subs	r2, r2, #4
 	blt	Lmemcpy_fl4		/* less than 4 bytes */
diff --git a/lib/libc/arch/arm26/string/bcopy.S b/lib/libc/arch/arm/string/bcopy.S
similarity index 97%
rename from lib/libc/arch/arm26/string/bcopy.S
rename to lib/libc/arch/arm/string/bcopy.S
index b071fe0c6aa1..1fb047bdf18b 100644
--- a/lib/libc/arch/arm26/string/bcopy.S
+++ b/lib/libc/arch/arm/string/bcopy.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: bcopy.S,v 1.3 2000/12/28 18:33:54 bjh21 Exp $	*/
+/*	$NetBSD: bcopy.S,v 1.1 2000/12/29 20:13:57 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/lib/libc/arch/arm26/string/bzero.S b/lib/libc/arch/arm/string/bzero.S
similarity index 97%
rename from lib/libc/arch/arm26/string/bzero.S
rename to lib/libc/arch/arm/string/bzero.S
index 52b4e754a937..315a835589bd 100644
--- a/lib/libc/arch/arm26/string/bzero.S
+++ b/lib/libc/arch/arm/string/bzero.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: bzero.S,v 1.2 2000/12/14 19:40:22 bjh21 Exp $	*/
+/*	$NetBSD: bzero.S,v 1.1 2000/12/29 20:13:57 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/lib/libc/arch/arm26/string/memcpy.S b/lib/libc/arch/arm/string/memcpy.S
similarity index 97%
rename from lib/libc/arch/arm26/string/memcpy.S
rename to lib/libc/arch/arm/string/memcpy.S
index 56347a9cd354..a66897c228d4 100644
--- a/lib/libc/arch/arm26/string/memcpy.S
+++ b/lib/libc/arch/arm/string/memcpy.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: memcpy.S,v 1.2 2000/12/14 19:40:22 bjh21 Exp $	*/
+/*	$NetBSD: memcpy.S,v 1.1 2000/12/29 20:13:57 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/lib/libc/arch/arm26/string/memmove.S b/lib/libc/arch/arm/string/memmove.S
similarity index 97%
rename from lib/libc/arch/arm26/string/memmove.S
rename to lib/libc/arch/arm/string/memmove.S
index 76e1e4507523..52a25050cee9 100644
--- a/lib/libc/arch/arm26/string/memmove.S
+++ b/lib/libc/arch/arm/string/memmove.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: memmove.S,v 1.2 2000/12/14 19:40:22 bjh21 Exp $	*/
+/*	$NetBSD: memmove.S,v 1.1 2000/12/29 20:13:57 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/lib/libc/arch/arm26/string/memset.S b/lib/libc/arch/arm/string/memset.S
similarity index 98%
rename from lib/libc/arch/arm26/string/memset.S
rename to lib/libc/arch/arm/string/memset.S
index b5ebc037b72d..245add8e5215 100644
--- a/lib/libc/arch/arm26/string/memset.S
+++ b/lib/libc/arch/arm/string/memset.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: memset.S,v 1.1 2000/05/09 21:55:50 bjh21 Exp $	*/
+/*	$NetBSD: memset.S,v 1.1 2000/12/29 20:13:59 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -120,7 +120,7 @@ Lmemset_lessthanfour:
 #else
 	moveq	pc, lr			/* Zero length so exit */
 #endif
-	
+
 	cmp	r2, #0x00000002
 	strb	r1, [r0], #0x0001	/* Set 1 byte */
 	strgeb	r1, [r0], #0x0001	/* Set another byte */
diff --git a/lib/libc/arch/arm26/sys/Ovfork.S b/lib/libc/arch/arm/sys/Ovfork.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/Ovfork.S
rename to lib/libc/arch/arm/sys/Ovfork.S
index 884eba6abcd2..a931c4a1367e 100644
--- a/lib/libc/arch/arm26/sys/Ovfork.S
+++ b/lib/libc/arch/arm/sys/Ovfork.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: Ovfork.S,v 1.1 2000/05/09 21:55:50 bjh21 Exp $	*/
+/*	$NetBSD: Ovfork.S,v 1.1 2000/12/29 20:14:00 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/lib/libc/arch/arm26/sys/__semctl.S b/lib/libc/arch/arm/sys/__semctl.S
similarity index 96%
rename from lib/libc/arch/arm26/sys/__semctl.S
rename to lib/libc/arch/arm/sys/__semctl.S
index 3499c9a3274d..ef37e208f05d 100644
--- a/lib/libc/arch/arm26/sys/__semctl.S
+++ b/lib/libc/arch/arm/sys/__semctl.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: __semctl.S,v 1.1 2000/05/09 21:55:50 bjh21 Exp $	*/
+/*	$NetBSD: __semctl.S,v 1.1 2000/12/29 20:14:00 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/lib/libc/arch/arm26/sys/__sigreturn14.S b/lib/libc/arch/arm/sys/__sigreturn14.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/__sigreturn14.S
rename to lib/libc/arch/arm/sys/__sigreturn14.S
index 3ba14dcc8110..808c13f1ddbd 100644
--- a/lib/libc/arch/arm26/sys/__sigreturn14.S
+++ b/lib/libc/arch/arm/sys/__sigreturn14.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: __sigreturn14.S,v 1.1 2000/05/09 21:55:50 bjh21 Exp $	*/
+/*	$NetBSD: __sigreturn14.S,v 1.1 2000/12/29 20:14:01 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/lib/libc/arch/arm/sys/__syscall.S b/lib/libc/arch/arm/sys/__syscall.S
new file mode 100644
index 000000000000..e3296e7e3375
--- /dev/null
+++ b/lib/libc/arch/arm/sys/__syscall.S
@@ -0,0 +1,47 @@
+/*	$NetBSD: __syscall.S,v 1.1 2000/12/29 20:14:01 bjh21 Exp $	*/
+
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	from: @(#)syscall.s	5.1 (Berkeley) 4/23/90
+ */
+
+#include "SYS.h"
+
+ENTRY(__syscall)
+	swi	SYS___syscall
+	bcs	cerror
+#ifdef __APCS_26__
+	movs	pc, lr
+#else
+	mov	pc, lr
+#endif
diff --git a/lib/libc/arch/arm26/sys/__vfork14.S b/lib/libc/arch/arm/sys/__vfork14.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/__vfork14.S
rename to lib/libc/arch/arm/sys/__vfork14.S
index 8b867e6bfb2e..8b2db8871f1c 100644
--- a/lib/libc/arch/arm26/sys/__vfork14.S
+++ b/lib/libc/arch/arm/sys/__vfork14.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: __vfork14.S,v 1.1 2000/05/09 21:55:50 bjh21 Exp $	*/
+/*	$NetBSD: __vfork14.S,v 1.1 2000/12/29 20:14:01 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/lib/libc/arch/arm26/sys/brk.S b/lib/libc/arch/arm/sys/brk.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/brk.S
rename to lib/libc/arch/arm/sys/brk.S
index a3df82466a79..98cb4fa1ae7f 100644
--- a/lib/libc/arch/arm26/sys/brk.S
+++ b/lib/libc/arch/arm/sys/brk.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: brk.S,v 1.3 2000/06/26 06:25:38 kleink Exp $	*/
+/*	$NetBSD: brk.S,v 1.1 2000/12/29 20:14:02 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/lib/libc/arch/arm26/sys/cerror.S b/lib/libc/arch/arm/sys/cerror.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/cerror.S
rename to lib/libc/arch/arm/sys/cerror.S
index 649e316056f9..cd3a140e357d 100644
--- a/lib/libc/arch/arm26/sys/cerror.S
+++ b/lib/libc/arch/arm/sys/cerror.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: cerror.S,v 1.1 2000/05/09 21:55:51 bjh21 Exp $	*/
+/*	$NetBSD: cerror.S,v 1.1 2000/12/29 20:14:02 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/lib/libc/arch/arm26/sys/exect.S b/lib/libc/arch/arm/sys/exect.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/exect.S
rename to lib/libc/arch/arm/sys/exect.S
index 534b73b4ae2b..11c2d8b8d1fc 100644
--- a/lib/libc/arch/arm26/sys/exect.S
+++ b/lib/libc/arch/arm/sys/exect.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: exect.S,v 1.1 2000/05/09 21:55:51 bjh21 Exp $	*/
+/*	$NetBSD: exect.S,v 1.1 2000/12/29 20:14:02 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/lib/libc/arch/arm26/sys/fork.S b/lib/libc/arch/arm/sys/fork.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/fork.S
rename to lib/libc/arch/arm/sys/fork.S
index f19aabe32dfb..d68c0f86bce0 100644
--- a/lib/libc/arch/arm26/sys/fork.S
+++ b/lib/libc/arch/arm/sys/fork.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: fork.S,v 1.2 2000/06/26 06:32:56 kleink Exp $	*/
+/*	$NetBSD: fork.S,v 1.1 2000/12/29 20:14:02 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/lib/libc/arch/arm26/sys/msgctl.S b/lib/libc/arch/arm/sys/msgctl.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/msgctl.S
rename to lib/libc/arch/arm/sys/msgctl.S
index 6256c2b6ae5d..d316d5cf966b 100644
--- a/lib/libc/arch/arm26/sys/msgctl.S
+++ b/lib/libc/arch/arm/sys/msgctl.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: msgctl.S,v 1.1 2000/05/09 21:55:51 bjh21 Exp $	*/
+/*	$NetBSD: msgctl.S,v 1.1 2000/12/29 20:14:03 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/lib/libc/arch/arm26/sys/pipe.S b/lib/libc/arch/arm/sys/pipe.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/pipe.S
rename to lib/libc/arch/arm/sys/pipe.S
index 625ed53059c1..5bfb1442361f 100644
--- a/lib/libc/arch/arm26/sys/pipe.S
+++ b/lib/libc/arch/arm/sys/pipe.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: pipe.S,v 1.2 2000/09/28 08:38:54 kleink Exp $	*/
+/*	$NetBSD: pipe.S,v 1.1 2000/12/29 20:14:03 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/lib/libc/arch/arm26/sys/ptrace.S b/lib/libc/arch/arm/sys/ptrace.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/ptrace.S
rename to lib/libc/arch/arm/sys/ptrace.S
index 2986a2d2bad2..03097b95dcac 100644
--- a/lib/libc/arch/arm26/sys/ptrace.S
+++ b/lib/libc/arch/arm/sys/ptrace.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: ptrace.S,v 1.1 2000/05/09 21:55:51 bjh21 Exp $ */
+/*	$NetBSD: ptrace.S,v 1.1 2000/12/29 20:14:03 bjh21 Exp $ */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/lib/libc/arch/arm26/sys/sbrk.S b/lib/libc/arch/arm/sys/sbrk.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/sbrk.S
rename to lib/libc/arch/arm/sys/sbrk.S
index e8b84c392cb3..c264b21bda56 100644
--- a/lib/libc/arch/arm26/sys/sbrk.S
+++ b/lib/libc/arch/arm/sys/sbrk.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: sbrk.S,v 1.3 2000/06/26 06:25:38 kleink Exp $	*/
+/*	$NetBSD: sbrk.S,v 1.1 2000/12/29 20:14:03 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/lib/libc/arch/arm26/sys/setlogin.S b/lib/libc/arch/arm/sys/setlogin.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/setlogin.S
rename to lib/libc/arch/arm/sys/setlogin.S
index b10d69815dc3..0eb50f48df3b 100644
--- a/lib/libc/arch/arm26/sys/setlogin.S
+++ b/lib/libc/arch/arm/sys/setlogin.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: setlogin.S,v 1.1 2000/05/09 21:55:51 bjh21 Exp $	*/
+/*	$NetBSD: setlogin.S,v 1.1 2000/12/29 20:14:04 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
diff --git a/lib/libc/arch/arm/sys/shmat.S b/lib/libc/arch/arm/sys/shmat.S
new file mode 100644
index 000000000000..13bdd0d878a3
--- /dev/null
+++ b/lib/libc/arch/arm/sys/shmat.S
@@ -0,0 +1,5 @@
+/*	$NetBSD: shmat.S,v 1.1 2000/12/29 20:14:04 bjh21 Exp $	*/
+
+#include "SYS.h"
+
+RSYSCALL(shmat)
diff --git a/lib/libc/arch/arm26/sys/shmctl.S b/lib/libc/arch/arm/sys/shmctl.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/shmctl.S
rename to lib/libc/arch/arm/sys/shmctl.S
index e8b77627eba5..3fd889a5e288 100644
--- a/lib/libc/arch/arm26/sys/shmctl.S
+++ b/lib/libc/arch/arm/sys/shmctl.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: shmctl.S,v 1.1 2000/05/09 21:55:51 bjh21 Exp $	*/
+/*	$NetBSD: shmctl.S,v 1.1 2000/12/29 20:14:04 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/lib/libc/arch/arm26/sys/sigaction.S b/lib/libc/arch/arm/sys/sigaction.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/sigaction.S
rename to lib/libc/arch/arm/sys/sigaction.S
index 5dd1f67a6831..60191cbfac65 100644
--- a/lib/libc/arch/arm26/sys/sigaction.S
+++ b/lib/libc/arch/arm/sys/sigaction.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: sigaction.S,v 1.1 2000/05/09 21:55:51 bjh21 Exp $	*/
+/*	$NetBSD: sigaction.S,v 1.1 2000/12/29 20:14:04 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/lib/libc/arch/arm26/sys/sigpending.S b/lib/libc/arch/arm/sys/sigpending.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/sigpending.S
rename to lib/libc/arch/arm/sys/sigpending.S
index 23f326a4e970..d92ab9878045 100644
--- a/lib/libc/arch/arm26/sys/sigpending.S
+++ b/lib/libc/arch/arm/sys/sigpending.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: sigpending.S,v 1.1 2000/05/09 21:55:51 bjh21 Exp $	*/
+/*	$NetBSD: sigpending.S,v 1.1 2000/12/29 20:14:05 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/lib/libc/arch/arm26/sys/sigprocmask.S b/lib/libc/arch/arm/sys/sigprocmask.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/sigprocmask.S
rename to lib/libc/arch/arm/sys/sigprocmask.S
index 413938afea0b..095f2059b587 100644
--- a/lib/libc/arch/arm26/sys/sigprocmask.S
+++ b/lib/libc/arch/arm/sys/sigprocmask.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: sigprocmask.S,v 1.1 2000/05/09 21:55:52 bjh21 Exp $	*/
+/*	$NetBSD: sigprocmask.S,v 1.1 2000/12/29 20:14:05 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/lib/libc/arch/arm26/sys/sigreturn.S b/lib/libc/arch/arm/sys/sigreturn.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/sigreturn.S
rename to lib/libc/arch/arm/sys/sigreturn.S
index 5d000888baa1..ea1624643ee1 100644
--- a/lib/libc/arch/arm26/sys/sigreturn.S
+++ b/lib/libc/arch/arm/sys/sigreturn.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: sigreturn.S,v 1.1 2000/05/09 21:55:52 bjh21 Exp $	*/
+/*	$NetBSD: sigreturn.S,v 1.1 2000/12/29 20:14:05 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/lib/libc/arch/arm26/sys/sigsuspend.S b/lib/libc/arch/arm/sys/sigsuspend.S
similarity index 97%
rename from lib/libc/arch/arm26/sys/sigsuspend.S
rename to lib/libc/arch/arm/sys/sigsuspend.S
index 85bd62244bf0..c179193e4032 100644
--- a/lib/libc/arch/arm26/sys/sigsuspend.S
+++ b/lib/libc/arch/arm/sys/sigsuspend.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: sigsuspend.S,v 1.1 2000/05/09 21:55:52 bjh21 Exp $	*/
+/*	$NetBSD: sigsuspend.S,v 1.1 2000/12/29 20:14:05 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/lib/libc/arch/arm26/sys/syscall.S b/lib/libc/arch/arm/sys/syscall.S
similarity index 96%
rename from lib/libc/arch/arm26/sys/syscall.S
rename to lib/libc/arch/arm/sys/syscall.S
index 2103847cfd41..d0a1ac011383 100644
--- a/lib/libc/arch/arm26/sys/syscall.S
+++ b/lib/libc/arch/arm/sys/syscall.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: syscall.S,v 1.1 2000/05/09 21:55:52 bjh21 Exp $	*/
+/*	$NetBSD: syscall.S,v 1.1 2000/12/29 20:14:05 bjh21 Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
diff --git a/lib/libc/arch/arm26/Makefile.inc b/lib/libc/arch/arm26/Makefile.inc
deleted file mode 100644
index ce4676287f07..000000000000
--- a/lib/libc/arch/arm26/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.2 2000/06/06 08:14:49 bjh21 Exp $
-
-KMINCLUDES=
-KMSRCS=arch/arm26/gen/divsi3.S arch/arm26/string/memmove.S \
-	arch/arm26/string/memcpy.S
-# __APCS_26__ required for SYS.h stuff
-CPPFLAGS+=-DSOFTFLOAT -D__APCS_26__
-
-.include <softfloat/Makefile.inc>
diff --git a/lib/libc/arch/arm26/stdlib/Makefile.inc b/lib/libc/arch/arm26/stdlib/Makefile.inc
deleted file mode 100644
index 08616abffd78..000000000000
--- a/lib/libc/arch/arm26/stdlib/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2000/05/09 21:55:49 bjh21 Exp $
-
-SRCS+=	abs.c div.c labs.c ldiv.c llabs.c
diff --git a/lib/libc/arch/arm26/sys/shmat.S b/lib/libc/arch/arm26/sys/shmat.S
deleted file mode 100644
index 90e318516cae..000000000000
--- a/lib/libc/arch/arm26/sys/shmat.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.1 2000/07/07 08:20:51 itohy Exp $	*/
-
-#include "SYS.h"
-
-RSYSCALL(shmat)