remove mips leftovers; ok brad

6 files changed, 7 insertions, 269 deletions

diff --git a/lib/Makefile b/lib/Makefile
index 1b8b6fda788..8e842812137 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,14 +1,9 @@
-#	$OpenBSD: Makefile,v 1.41 2001/06/27 05:53:16 art Exp $
+#	$OpenBSD: Makefile,v 1.42 2001/07/11 03:02:23 pvalchev Exp $
 #	$NetBSD: Makefile,v 1.20.4.1 1996/06/14 17:22:38 cgd Exp $
 
-SUBDIR=	csu libarch libc libc_r libcom_err libcompat libcurses libdes libedit \
-	libform libkeynote libl libm libmenu libocurses libossaudio libpanel \
-	libpcap libresolv librpcsvc libskey libsectok libssl libtelnet \
-	libutil libwrap liby libz libkvm
-
-# XXX Temporary until libcurses++ builds on mips again
-.if ${MACHINE_ARCH} != "mips"
-SUBDIR+=	libcurses++
-.endif
+SUBDIR=	csu libarch libc libc_r libcom_err libcompat libcurses libcurses++ \
+	libdes libedit libform libkeynote libl libm libmenu libocurses \
+	libossaudio libpanel libpcap libresolv librpcsvc libskey \
+	libsectok libssl libtelnet libutil libwrap liby libz libkvm
 
 .include <bsd.subdir.mk>
diff --git a/lib/csu/Makefile b/lib/csu/Makefile
index 413b1060a0b..27d9f8918da 100644
--- a/lib/csu/Makefile
+++ b/lib/csu/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.4 2001/06/26 22:42:49 miod Exp $
+#	$OpenBSD: Makefile,v 1.5 2001/07/11 03:02:26 pvalchev Exp $
 
 .if make(obj)
-SUBDIR= alpha i386 m68k mips m88k ns32k powerpc sparc vax
+SUBDIR= alpha i386 m68k m88k ns32k powerpc sparc vax
 .else
 SUBDIR= ${MACHINE_ARCH}
 .endif
diff --git a/lib/csu/mips/Makefile b/lib/csu/mips/Makefile
deleted file mode 100644
index 7778b5caf06..00000000000
--- a/lib/csu/mips/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#	$OpenBSD: Makefile,v 1.10 2001/03/24 18:40:20 tholo Exp $
-#	from: @(#)Makefile	8.1 (Berkeley) 6/1/93
-
-CFLAGS+=	-DLIBC_SCCS -I${.CURDIR}
-OBJS=		crt0.o gcrt0.o scrt0.o crtn.o
-CLEANFILES+=	core a.out
-SRCS=		crt0.c
-DEPS=
-
-all: ${OBJS}
-
-crt0.o: ${SRCS} ${DEPS}
-	@echo "${COMPILE.c} -DCRT0 -DDYNAMIC ${.CURDIR}/${SRCS} -o ${.TARGET}"
-	@${COMPILE.c} -DCRT0 -DDYNAMIC ${.CURDIR}/${SRCS} -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: ${SRCS} ${DEPS}
-	@echo "${COMPILE.c} -DMCRT0 ${.CURDIR}/${SRCS} -o ${.TARGET}"
-	@${COMPILE.c} -DMCRT0 ${.CURDIR}/${SRCS} -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
-
-scrt0.o: ${SRCS} ${DEPS}
-	@echo "${COMPILE.c} -DSCRT0 ${.CURDIR}/${SRCS} -o ${.TARGET}"
-	@${COMPILE.c} -DSCRT0 ${.CURDIR}/${SRCS} -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-depend lint tags:
-
-.include <bsd.prog.mk>
diff --git a/lib/csu/mips/crt0.S b/lib/csu/mips/crt0.S
deleted file mode 100644
index 8d19c126ebc..00000000000
--- a/lib/csu/mips/crt0.S
+++ /dev/null
@@ -1,115 +0,0 @@
-/*	$OpenBSD: crt0.S,v 1.2 1999/08/20 14:11:35 niklas Exp $	*/
-
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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 University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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.
- *
- *	from: @(#)crt0.s	8.2 (Berkeley) 3/21/94
- */
-
-#include <machine/regdef.h>
-#include <machine/machAsmDefs.h>
-
-	.comm	_C_LABEL(environ), 4
-	.comm	_C_LABEL(__progname), 4
-	.data
-$L1:
-	.word	0		# null string plus padding
-	.text
-
-NON_LEAF(__start, 24, ra)
-	.set	noreorder
-#ifdef __GP_SUPPORT__
-	la	gp, _C_LABEL (_gp)
-#endif
-	lw	s0, 0(sp)		# get argc from stack
-	addu	s1, sp, 4		# get pointer to argv
-	addu	s2, s1, 4		# skip null pointer on stack
-	sll	v0, s0, 2		# add number of argv pointers
-	addu	s2, s2, v0		# final pointer to environment list
-	sw	s2, _C_LABEL(environ)	# save environment pointer
-	subu	sp, sp, 24		# allocate standard frame
-	.mask	0x80000000, -4
-	sw	zero, 20(sp)		# clear return address for debugging
-#ifdef MCRT0
-eprol:
-	la	a0, eprol
-	la	a1, etext
-	jal	_C_LABEL(monstartup)	# monstartup(eprol, etext);
-	nop
-	la	a0, _C_LABEL(mcleanup)
-	jal	_C_LABEL(atexit)	# atexit(mcleanup);
-	nop
-	sw	zero, _C_LABEL(errno)
-#endif
-	lw	a0, 0(s1)		# a0 = argv[0];
-	nop
-	bne	a0, zero, 2f		# If a0 is NULL, use null string.
-	nop
-	la	a0, $L1
-	nop
-2:
-	move	s3, a0			# save argv[0]
-	jal	_C_LABEL(strrchr)
-	li	a1, 0x2f		# a1 = '/'
-	bne	v0, zero, 1f		# if slash found
-	addu	v0, v0, 1
-	move	v0, s3			# v0 = argv[0];
-1:
-	sw	v0, _C_LABEL(__progname)
-	move	a0, s0
-	move	a1, s1
-	jal	_C_LABEL(main)		# v0 = main(argc, argv, env);
-	move	a2, s2
-	jal	_C_LABEL(exit)		# exit(v0);
-	move	a0, v0
-	break	0
-	.set	reorder
-END(__start)
-
-#ifndef MCRT0
-LEAF(moncontrol)
-	j	ra
-END(moncontrol)
-
-LEAF(_mcount)
-	.set	noreorder
-	.set	noat
-	addu	sp, sp, 8		# undo push
-	j	ra
-	move	ra, AT
-	.set	at
-	.set	reorder
-END(_mcount)
-#endif
diff --git a/lib/csu/mips/crt0.c b/lib/csu/mips/crt0.c
deleted file mode 100644
index a67eaefb8d6..00000000000
--- a/lib/csu/mips/crt0.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*	$OpenBSD: crt0.c,v 1.4 1999/08/20 14:11:35 niklas Exp $	*/
-/*	$NetBSD: crt0.c,v 1.7 1995/06/03 13:16:15 pk 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.
- *
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: crt0.c,v 1.4 1999/08/20 14:11:35 niklas Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-extern void	start __P((long)) asm("start");
-extern void     _mcleanup __P((void));
-extern unsigned char    eprol asm ("eprol");
-extern unsigned char    etext;
-
-char			**environ;
-static char		empty[1];
-char			*__progname = empty;
-
-void
-__start()
-{
-	struct kframe {
-		int	kargc;
-		char	*kargv[1];	/* size depends on kargc */
-		char	kargstr[1];	/* size varies */
-		char	kenvstr[1];	/* size varies */
-	};
-
-	register struct kframe *kfp;
-	register char **argv, *ap;
-
-#ifndef DYNAMIC
-	asm("	la	$28,_gp");
-	asm("	addiu	%0,$29,32" : "=r" (kfp));
-#else
-	asm("	addiu	%0,$29,48" : "=r" (kfp));
-#endif
-	/* just above the saved frame pointer
-	kfp = (struct kframe *) (&param-1);*/
-	argv = &kfp->kargv[0];
-	environ = argv + kfp->kargc + 1;
-
-	if (ap = argv[0])
-		if ((__progname = strrchr(ap, '/')) == NULL)
-			__progname = ap;
-		else
-			++__progname;
-
-asm("eprol:");
-
-#ifdef MCRT0
-	atexit(_mcleanup);
-	monstartup((u_long)&eprol, (u_long)&etext);
-#endif MCRT0
-
-asm ("_callmain:");		/* Defined for the benefit of debuggers */
-	exit(main(kfp->kargc, argv, environ));
-}
-
-#ifdef MCRT0
-asm ("	.text");
-asm ("_eprol:");
-#endif
diff --git a/lib/csu/mips/crtn.c b/lib/csu/mips/crtn.c
deleted file mode 100644
index d25502a8de1..00000000000
--- a/lib/csu/mips/crtn.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/*	$OpenBSD: crtn.c,v 1.2 1999/08/20 14:11:35 niklas Exp $	*/
-
-/*
- *	Empty file to create crtn.o.
- *	This is something constructors/destructors
- *	later will depend on...
- */
-
-__crtn()
-{}