diff --git a/lib/csu/Makefile.csu.aout b/lib/csu/Makefile.csu.aout
index a9eca1e08a8b..1374397c8135 100644
--- a/lib/csu/Makefile.csu.aout
+++ b/lib/csu/Makefile.csu.aout
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile.csu.aout,v 1.1 1997/10/27 01:03:39 lukem Exp $
+#	$NetBSD: Makefile.csu.aout,v 1.2 1999/02/27 03:28:30 tv Exp $
 #	from: @(#)Makefile	5.5 (Berkeley) 5/21/91
 
 CPPFLAGS+=	-DLIBC_SCCS -I${.CURDIR}/..
-OBJS=		crt0.o gcrt0.o scrt0.o
+OBJS+=		crt0.o gcrt0.o scrt0.o
 SRCS=		crt0.c
 
 all: ${OBJS}
diff --git a/lib/csu/arm32/Makefile b/lib/csu/arm32/Makefile
index 05dca6d72cf5..0bf4ac263d0f 100644
--- a/lib/csu/arm32/Makefile
+++ b/lib/csu/arm32/Makefile
@@ -1,3 +1,10 @@
-#	$NetBSD: Makefile,v 1.11 1997/10/27 01:03:45 lukem Exp $
+#	$NetBSD: Makefile,v 1.12 1999/02/27 03:28:30 tv Exp $
+
+OBJS+=		c++rt0.o
+
+c++rt0.o: c++rt0.c
+	${COMPILE.c} -fpic ${.ALLSRC}
+	@${LD} -x -r ${.TARGET}
+	@mv a.out ${.TARGET}
 
 .include "${.CURDIR}/../Makefile.csu.aout"
diff --git a/lib/csu/arm32/c++rt0.c b/lib/csu/arm32/c++rt0.c
new file mode 100644
index 000000000000..fe9d160a7151
--- /dev/null
+++ b/lib/csu/arm32/c++rt0.c
@@ -0,0 +1,163 @@
+/*	$NetBSD: c++rt0.c,v 1.1 1999/02/27 03:28:30 tv Exp $	*/
+
+/*-
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Paul Kranenburg.
+ *
+ * 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 NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+/*
+ * Run-time module for GNU C++ compiled shared libraries.
+ *
+ * The linker constructs the following arrays of pointers to global
+ * constructors and destructors. The first element contains the
+ * number of pointers in each.
+ * The tables are also null-terminated.
+ */
+#include <stdlib.h>
+
+
+/*
+ * We make the __{C,D}TOR_LIST__ symbols appear as type `SETD' and
+ * include a dummy local function in the set. This keeps references
+ * to these symbols local to the shared object this module is linked to.
+ */
+static void dummy __P((void)) { return; }
+
+/* Note: this is "a.out" dependent. */
+__asm(".stabs \"___CTOR_LIST__\",22,0,0,_dummy");
+__asm(".stabs \"___DTOR_LIST__\",22,0,0,_dummy");
+
+#ifdef __arm32__			/* XXX ARM32_BROKEN_RELOCATIONS */
+#define ARM32_BROKEN_RELOCATIONS	/* XXX ARM32_BROKEN_RELOCATIONS */
+#endif					/* XXX ARM32_BROKEN_RELOCATIONS */
+
+void (*__CTOR_LIST__[0]) __P((void));
+void (*__DTOR_LIST__[0]) __P((void));
+
+#ifdef ARM32_BROKEN_RELOCATIONS		/* XXX ARM32_BROKEN_RELOCATIONS */
+static void	__dtors __P((long));	/* XXX ARM32_BROKEN_RELOCATIONS */
+static void	__ctors __P((long));	/* XXX ARM32_BROKEN_RELOCATIONS */
+#else					/* XXX ARM32_BROKEN_RELOCATIONS */
+static void	__dtors __P((void));
+static void	__ctors __P((void));
+#endif
+
+static void
+#ifdef ARM32_BROKEN_RELOCATIONS		/* XXX ARM32_BROKEN_RELOCATIONS */
+__dtors(base)				/* XXX ARM32_BROKEN_RELOCATIONS */
+	long base;			/* XXX ARM32_BROKEN_RELOCATIONS */
+#else					/* XXX ARM32_BROKEN_RELOCATIONS */
+__dtors()
+#endif
+{
+	unsigned long i = (unsigned long) __DTOR_LIST__[0];
+	void (**p)(void) = __DTOR_LIST__ + i;
+ 
+	while (i--)
+#ifdef ARM32_BROKEN_RELOCATIONS		/* XXX ARM32_BROKEN_RELOCATIONS */
+		(*(void (*)(void))((char *)(*p--) + base))(); /* XXX ... */
+#else					/* XXX ARM32_BROKEN_RELOCATIONS */
+		(**p--)();
+#endif
+}
+
+static void
+#ifdef ARM32_BROKEN_RELOCATIONS		/* XXX ARM32_BROKEN_RELOCATIONS */
+__ctors(base)				/* XXX ARM32_BROKEN_RELOCATIONS */
+	long base;			/* XXX ARM32_BROKEN_RELOCATIONS */
+#else					/* XXX ARM32_BROKEN_RELOCATIONS */
+__ctors()
+#endif
+{
+	unsigned long i = (unsigned long) __CTOR_LIST__[0];
+	void (**p)(void) = __CTOR_LIST__ + 1;
+
+	while (i--)
+#ifdef ARM32_BROKEN_RELOCATIONS		/* XXX ARM32_BROKEN_RELOCATIONS */
+		(*(void (*)(void))((char *)(*p++) + base))(); /* XXX ... */
+#else					/* XXX ARM32_BROKEN_RELOCATIONS */
+		(**p++)();
+#endif
+}
+
+#ifdef ARM32_BROKEN_RELOCATIONS		/* XXX ARM32_BROKEN_RELOCATIONS */
+extern void __init __P((long)) asm(".init"); /* XXX ARM32_BROKEN_RELOCATIONS */
+extern void __fini __P((long)) asm(".fini"); /* XXX ARM32_BROKEN_RELOCATIONS */
+#else					/* XXX ARM32_BROKEN_RELOCATIONS */
+extern void __init __P((void)) asm(".init");
+extern void __fini __P((void)) asm(".fini");
+#endif
+
+void
+#ifdef ARM32_BROKEN_RELOCATIONS		/* XXX ARM32_BROKEN_RELOCATIONS */
+__init(base)				/* XXX ARM32_BROKEN_RELOCATIONS */
+	long base;			/* XXX ARM32_BROKEN_RELOCATIONS */
+#else					/* XXX ARM32_BROKEN_RELOCATIONS */
+__init()
+#endif
+{
+	static int initialized = 0;
+
+	/*
+	 * Call global constructors.
+	 * Arrange to call global destructors at exit.
+	 */
+	if (!initialized) {
+		initialized = 1;
+#ifdef ARM32_BROKEN_RELOCATIONS		/* XXX ARM32_BROKEN_RELOCATIONS */
+		__ctors(base);		/* XXX ARM32_BROKEN_RELOCATIONS */
+#else					/* XXX ARM32_BROKEN_RELOCATIONS */
+		__ctors();
+#endif					/* XXX ARM32_BROKEN_RELOCATIONS */
+	}
+
+}
+
+void
+#ifdef ARM32_BROKEN_RELOCATIONS		/* XXX ARM32_BROKEN_RELOCATIONS */
+__fini(base)				/* XXX ARM32_BROKEN_RELOCATIONS */
+	long base;			/* XXX ARM32_BROKEN_RELOCATIONS */
+#else					/* XXX ARM32_BROKEN_RELOCATIONS */
+__fini()
+#endif					/* XXX ARM32_BROKEN_RELOCATIONS */
+{
+	/*
+	 * Call global destructors.
+	 */
+#ifdef ARM32_BROKEN_RELOCATIONS		/* XXX ARM32_BROKEN_RELOCATIONS */
+	__dtors(base);			/* XXX ARM32_BROKEN_RELOCATIONS */
+#else					/* XXX ARM32_BROKEN_RELOCATIONS */
+	__dtors();
+#endif					/* XXX ARM32_BROKEN_RELOCATIONS */
+}
diff --git a/lib/csu/common_aout/Makefile.inc b/lib/csu/common_aout/Makefile.inc
index 5ef850d76978..9a1b736284a6 100644
--- a/lib/csu/common_aout/Makefile.inc
+++ b/lib/csu/common_aout/Makefile.inc
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile.inc,v 1.1 1997/10/27 01:03:39 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.2 1999/02/27 03:28:30 tv Exp $
 #	from: @(#)Makefile	5.5 (Berkeley) 5/21/91
 
 CPPFLAGS+=	-DLIBC_SCCS -I${.CURDIR}/..
-OBJS=		crt0.o gcrt0.o scrt0.o
+OBJS+=		crt0.o gcrt0.o scrt0.o
 SRCS=		crt0.c
 
 all: ${OBJS}