__init/__fini handling on ELF has not been correct. It is supposed to

be a section which code stubs (branches) can be added to initialize/destructor
This adds MD stubs to allow this to operate as expected. should fix wine
and behave according to ELF specs. ok miod@

2 files changed, 73 insertions, 3 deletions

diff --git a/lib/csu/hppa/Makefile b/lib/csu/hppa/Makefile
index 052e293925c..10626bf1de7 100644
--- a/lib/csu/hppa/Makefile
+++ b/lib/csu/hppa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2003/05/30 19:03:24 drahn Exp $
+#	$OpenBSD: Makefile,v 1.4 2004/01/08 14:59:15 drahn Exp $
 #	from: @(#)Makefile	5.5 (Berkeley) 5/21/91
 
 CFLAGS+=	-DLIBC_SCCS
@@ -7,9 +7,9 @@ SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
 
 ELFDIR=		${.CURDIR}/../common_elf
 .PATH:		${ELFDIR}
-CFLAGS+=	-I${ELFDIR}
+CFLAGS+=	-I${ELFDIR} -I${.CURDIR}
 
-#PICFLAG?=-fPIC
+PICFLAG?=-fPIC -DPIC
 
 all: ${OBJS}
 
diff --git a/lib/csu/hppa/md_init.h b/lib/csu/hppa/md_init.h
new file mode 100644
index 00000000000..6b405c59301
--- /dev/null
+++ b/lib/csu/hppa/md_init.h
@@ -0,0 +1,70 @@
+/* $OpenBSD: md_init.h,v 1.1 2004/01/08 14:59:15 drahn Exp $ */
+
+/*
+ * Copyright (c) 2003 Dale Rahn. 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.
+ *
+ * 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.
+ */  
+
+
+#ifdef PIC
+#define MD_SECT_CALL_FUNC(section, func)			\
+	__asm (".section "#section",\"ax\",@progbits	\n"	\
+	"	stw	%r19,-32(%r30)			\n"	\
+	"	stw	%r4,-64(%r30)			\n"	\
+	"	bl	" #func ",%r2			\n"	\
+	"	copy 	%r19,%r4			\n"	\
+	"	copy 	%r4,%r19			\n"	\
+	"	.previous")
+#else
+#define MD_SECT_CALL_FUNC(section, func)			\
+	__asm (".section .rodata			\n"	\
+	"	.align 4				\n"	\
+	"L$" #func "					\n"	\
+	"	.word "#func "				\n"	\
+	"	.previous				\n"	\
+	"	.section "#section",\"ax\",@progbits	\n"	\
+	"	ldil	LR'L$" #func ",%r1		\n"	\
+	"	ldw	RR'L$" #func "(%r1), %r31	\n"	\
+	"	ble	0(%sr4,%r31)			\n"	\
+	"	copy 	%r31,%r2			\n"	\
+	"	.previous")
+#endif
+
+#define MD_SECTION_PROLOGUE(sect, entry_pt)			\
+	__asm (						   	\
+	"	.section "#sect",\"ax\",@progbits	\n"	\
+	"	.EXPORT "#entry_pt",ENTRY,PRIV_LEV=3,ARGW0=NO,ARGW1=NO,ARGW2=NO,ARGW3=NO,RTNVAL=NO					\n"	\
+	"	.align 4				\n"	\
+	#entry_pt"					\n"	\
+	"	stw %r2, -20(%r30)			\n"	\
+	"	ldo 64(%r30),%r30			\n"	\
+	"	/* fall thru */				\n"	\
+	"	.previous")
+
+
+#define MD_SECTION_EPILOGUE(sect)				\
+	__asm (							\
+	"	.section "#sect",\"ax\",@progbits	\n"	\
+	"	ldw -84(%r30),%r2			\n"	\
+	"	bv %r0(%r2)				\n"	\
+	"	ldo -64(%r30),%r30			\n"	\
+	"	.previous")