From Jordan via. Paul K.

This fixes the problems Warner's having with ctors not being called
again with the latest round of ld changes and updates the file-names to what
Paul is using now.

The name change will not affect anything as we are not (yet) using it.

2 files changed, 85 insertions, 5 deletions

diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile
index 6dd5110..12558ea 100644
--- a/lib/csu/i386/Makefile
+++ b/lib/csu/i386/Makefile
@@ -1,8 +1,8 @@
 #	from: @(#)Makefile	5.6 (Berkeley) 5/22/91
-#	$Id: Makefile,v 1.7 1993/11/18 00:08:03 ache Exp $
+#	$Id: Makefile,v 1.8 1993/12/24 02:11:37 jkh Exp $
 
 CFLAGS+=	-DLIBC_SCCS -DDYNAMIC
-OBJS=		crt0.o gcrt0.o crt1.so
+OBJS=		crt0.o gcrt0.o c++rt0.o
 CLEANFILES+=	gmon.o moncrt0.o core a.out
 
 all: ${OBJS}
@@ -12,9 +12,9 @@ crt0.o: crt0.c
 	${LD} -x -r ${.TARGET}
 	mv a.out ${.TARGET}
 
-crt1.so: crt1.c
-	${CC} ${CFLAGS} -fpic -c ${.ALLSRC} -o ${.TARGET}
-	${LD} -X -r ${.TARGET}
+c++rt0.o: c++rt0.c
+	${CC} ${CFLAGS} -fpic -c ${.ALLSRC}
+	@${LD} -x -r ${.TARGET}
 	@mv a.out ${.TARGET}
 
 moncrt0.o: crt0.c
diff --git a/lib/csu/i386/c++rt0.c b/lib/csu/i386/c++rt0.c
new file mode 100644
index 0000000..44da438
--- /dev/null
+++ b/lib/csu/i386/c++rt0.c
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 1993 Paul Kranenburg
+ * 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 Paul Kranenburg.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ *
+ *	$Id: c++rt0.c,v 1.2 1994/01/29 01:58:31 jtc Exp $
+ */
+
+/*
+ * 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.
+ */
+void (*__CTOR_LIST__[0])(void);
+void (*__DTOR_LIST__[0])(void);
+
+static void
+__dtors(void)
+{
+	unsigned long i = (unsigned long) __DTOR_LIST__[0];
+	void (**p)(void) = __DTOR_LIST__ + i;
+ 
+	while (i--)
+		(**p--)();
+}
+
+static void
+__ctors(void)
+{
+	void (**p)(void) = __CTOR_LIST__ + 1;
+
+	while (*p)
+		(**p++)();
+}
+
+extern void __init() asm(".init");
+
+void
+__init(void)
+{
+	static int initialized = 0;
+
+	/*
+	 * Call global constructors.
+	 * Arrange to call global destructors at exit.
+	 */
+	if (!initialized) {
+		initialized = 1;
+		__ctors();
+		atexit(__dtors);
+	}
+
+}