Temporary hack to make alpha build again.

ok drahn@, deraadt@

2 files changed, 131 insertions, 3 deletions

diff --git a/lib/csu/alpha/Makefile b/lib/csu/alpha/Makefile
index f1aebe8ee1a..2a8a144c51e 100644
--- a/lib/csu/alpha/Makefile
+++ b/lib/csu/alpha/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.14 2004/01/08 14:59:15 drahn Exp $
+#	$OpenBSD: Makefile,v 1.15 2004/10/21 19:57:42 kettenis Exp $
 #	$NetBSD: Makefile,v 1.6 1996/10/18 05:27:38 thorpej Exp $
 
 CFLAGS+=	-DLIBC_SCCS -DELFSIZE=64
@@ -25,9 +25,10 @@ gcrt0.o: crt0.c
 	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
 	@rm -f ${.TARGET}.o
 
+# XXX temporary hack until __register_frame_info issue is sorted out.
 crtbegin.o: crtbegin.c
-	@echo ${COMPILE.c} ${ELFDIR}/crtbegin.c -o ${.TARGET}
-	@${COMPILE.c} ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
+	@echo ${COMPILE.c} ${.CURDIR}/crtbegin.c -o ${.TARGET}
+	@${COMPILE.c} ${.CURDIR}/crtbegin.c -o ${.TARGET}.o
 	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
 	@rm -f ${.TARGET}.o
 
diff --git a/lib/csu/alpha/crtbegin.c b/lib/csu/alpha/crtbegin.c
new file mode 100644
index 00000000000..a98d25c1ed4
--- /dev/null
+++ b/lib/csu/alpha/crtbegin.c
@@ -0,0 +1,127 @@
+/*	$OpenBSD: crtbegin.c,v 1.3 2004/10/21 19:57:42 kettenis Exp $	*/
+/*	$NetBSD: crtbegin.c,v 1.1 1996/09/12 16:59:03 cgd Exp $	*/
+
+/*
+ * 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.
+ */
+
+/*
+ * 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>
+
+#include "md_init.h"
+#include "os-note-elf.h"
+#include "extern.h"
+
+static const char __EH_FRAME_BEGIN__[]
+    __attribute__((section(".eh_frame"), aligned(4))) = { };
+
+static const init_f __CTOR_LIST__[1]
+    __attribute__((section(".ctors"))) = { (void *)-1 };	/* XXX */
+static const init_f __DTOR_LIST__[1]
+    __attribute__((section(".dtors"))) = { (void *)-1 };	/* XXX */
+
+static void	__dtors(void);
+static void	__ctors(void);
+
+static void
+__dtors()
+{
+	unsigned long i = (unsigned long) __DTOR_LIST__[0];
+	const init_f *p;
+
+	if (i == -1)  {
+		for (i = 1; __DTOR_LIST__[i] != NULL; i++)
+			;
+		i--;
+	}
+	p = __DTOR_LIST__ + i;
+	while (i--)
+		(**p--)();
+}
+
+static void
+__ctors()
+{
+	const init_f *p = __CTOR_LIST__ + 1;
+
+	while (*p)
+		(**p++)();
+}
+
+void __init(void);
+void __fini(void);
+static void __do_init(void);
+static void __do_fini(void);
+
+MD_SECTION_PROLOGUE(".init", __init);
+
+MD_SECTION_PROLOGUE(".fini", __fini);
+
+MD_SECT_CALL_FUNC(".init", __do_init);
+MD_SECT_CALL_FUNC(".fini", __do_fini);
+
+
+void
+__do_init()
+{
+	static int initialized = 0;
+
+	/*
+	 * Call global constructors.
+	 * Arrange to call global destructors at exit.
+	 */
+	if (!initialized) {
+		initialized = 1;
+
+		(__ctors)();
+
+		atexit(__fini);
+	}
+}
+
+void
+__do_fini()
+{
+	static int finalized = 0;
+
+	if (!finalized) {
+		finalized = 1;
+		/*
+		 * Call global destructors.
+		 */
+		(__dtors)();
+	}
+}