Make pmax work again after ericj's changes to ecoff execution stuff.

(A similar fix is probably needed for arc)

2 files changed, 2 insertions, 97 deletions

diff --git a/sys/arch/pmax/include/ecoff.h b/sys/arch/pmax/include/ecoff.h
deleted file mode 100644
index e3b2fef60fd..00000000000
--- a/sys/arch/pmax/include/ecoff.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*	$OpenBSD: ecoff.h,v 1.6 1998/05/08 17:34:33 millert Exp $	*/
-
-#include <mips/ecoff.h>
diff --git a/sys/arch/pmax/include/ecoff_machdep.h b/sys/arch/pmax/include/ecoff_machdep.h
index e5c88a636f4..adeba0ed8aa 100644
--- a/sys/arch/pmax/include/ecoff_machdep.h
+++ b/sys/arch/pmax/include/ecoff_machdep.h
@@ -1,95 +1,3 @@
-/*	$NetBSD: ecoff_machdep.h,v 1.5 1996/05/09 23:46:18 cgd Exp $	*/
+/*	$OpenBSD: ecoff_machdep.h,v 1.3 2000/09/09 00:56:41 miod Exp $	*/
 
-/*
- * Copyright (c) 1994 Adam Glass
- * 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 Adam Glass.
- * 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 Adam Glass ``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 Adam Glass 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.
- */
-
-#define ECOFF_LDPGSZ 4096
-
-#define ECOFF_PAD
-
-#define ECOFF_MACHDEP \
-        u_long gprmask; \
-        u_long cprmask[4]; \
-        u_long gp_value
-
-#define ECOFF_MAGIC_MIPSEL 0x0162
-#define ECOFF_BADMAG(ep) ((ep)->f.f_magic != ECOFF_MAGIC_MIPSEL)
-
-#define ECOFF_SEGMENT_ALIGNMENT(ep) ((ep)->a.vstamp < 23 ? 8 : 16)
-
-/* TTTTT - stuff from NetBSD mips dir */ 
-
-extern void	cpu_exec_ecoff_setregs __P((
-    struct proc *, struct exec_package *, u_long, register_t *));
-
-
-/*
- * ECOFF symbol definitions for 32-bit mips.
- * XXX 64-bit (mips3?) may be different.
- */
-struct ecoff_symhdr {
-	int16_t		magic;
-	int16_t		vstamp;
-	int32_t		lineMax;
-	int32_t		densenumMax;
-	int32_t		procMax;
-	int32_t		lsymMax;
-	int32_t		optsymMax;
-	int32_t		auxsymMax;
-	int32_t		lstrMax;
-	int32_t		estrMax;
-	int32_t		fdMax;
-	int32_t		rfdMax;
-	int32_t		esymMax;
-	long		linesize;
-	long		cbLineOffset;
-	long		cbDnOffset;
-	long		cbPdOffset;
-	long		cbSymOffset;
-	long		cbOptOffset;
-	long		cbAuxOffset;
-	long		cbSsOffset;
-	long		cbSsExtOffset;
-	long		cbFdOffset;
-	long		cbRfdOffset;
-	long		cbExtOffset;
-};
-
-struct ecoff_extsym {
-	int32_t		es_strindex;
-	int32_t		es_value;
-	unsigned	es_type:6;
-	unsigned	es_class:5;
-	unsigned	:1;
-	unsigned	es_symauxindex:20;
-};
-
-/* TTTTT - end of stuff from NetBSD mips dir */
+#include <mips/ecoff_machdep.h>