From 398cee91cb207231a5ed4f69a4cd85b05195a2e9 Mon Sep 17 00:00:00 2001 From: deraadt Date: Wed, 11 Dec 1996 08:31:44 +0000 Subject: [PATCH] generate reboot.o like other system calls --- lib/libc/arch/alpha/sys/reboot.S | 41 ----------------------- lib/libc/arch/arm32/sys/reboot.S | 42 ----------------------- lib/libc/arch/i386/sys/reboot.S | 45 ------------------------- lib/libc/arch/m68k/sys/reboot.S | 47 -------------------------- lib/libc/arch/mips/sys/reboot.S | 57 -------------------------------- lib/libc/arch/ns32k/sys/reboot.S | 25 -------------- lib/libc/arch/sparc/sys/reboot.S | 46 -------------------------- lib/libc/arch/vax/sys/reboot.S | 42 ----------------------- lib/libc/sys/Makefile.inc | 6 ++-- 9 files changed, 3 insertions(+), 348 deletions(-) delete mode 100644 lib/libc/arch/alpha/sys/reboot.S delete mode 100644 lib/libc/arch/arm32/sys/reboot.S delete mode 100644 lib/libc/arch/i386/sys/reboot.S delete mode 100644 lib/libc/arch/m68k/sys/reboot.S delete mode 100644 lib/libc/arch/mips/sys/reboot.S delete mode 100644 lib/libc/arch/ns32k/sys/reboot.S delete mode 100644 lib/libc/arch/sparc/sys/reboot.S delete mode 100644 lib/libc/arch/vax/sys/reboot.S diff --git a/lib/libc/arch/alpha/sys/reboot.S b/lib/libc/arch/alpha/sys/reboot.S deleted file mode 100644 index 0bf5da831ee..00000000000 --- a/lib/libc/arch/alpha/sys/reboot.S +++ /dev/null @@ -1,41 +0,0 @@ -/* $OpenBSD: reboot.S,v 1.3 1996/11/13 22:05:13 niklas Exp $ */ -/* $NetBSD: reboot.S,v 1.1 1995/02/10 17:50:37 cgd Exp $ */ - -/* - * Copyright (c) 1994, 1995 Carnegie-Mellon University. - * All rights reserved. - * - * Author: Chris G. Demetriou - * - * Permission to use, copy, modify and distribute this software and - * its documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND - * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie the - * rights to redistribute these changes. - */ - -#include "SYS.h" - -#if defined(SYSLIBC_SCCS) - .text - .asciz "$OpenBSD: reboot.S,v 1.3 1996/11/13 22:05:13 niklas Exp $" -#endif /* SYSLIBC_SCCS */ - -SYSCALL(reboot) - /* Should never get here. */ - call_pal PAL_halt /* Privileged; will fault. */ -END(reboot) diff --git a/lib/libc/arch/arm32/sys/reboot.S b/lib/libc/arch/arm32/sys/reboot.S deleted file mode 100644 index ab2ff25f630..00000000000 --- a/lib/libc/arch/arm32/sys/reboot.S +++ /dev/null @@ -1,42 +0,0 @@ -/*- - * Copyright (c) 1990 The Regents of the University of California. - * 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 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. - */ - -#include "SYS.h" - -#if defined(SYSLIBC_SCCS) - .text - .asciz "$OpenBSD: reboot.S,v 1.3 1996/08/19 08:11:58 tholo Exp $" -#endif /* SYSLIBC_SCCS */ - -SYSCALL(reboot) - mov r15, r14 diff --git a/lib/libc/arch/i386/sys/reboot.S b/lib/libc/arch/i386/sys/reboot.S deleted file mode 100644 index c73ed8328a7..00000000000 --- a/lib/libc/arch/i386/sys/reboot.S +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * William Jolitz. - * - * 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. - */ - -#include "SYS.h" - -#if defined(SYSLIBC_SCCS) - .text - .asciz "$OpenBSD: reboot.S,v 1.2 1996/08/19 08:13:36 tholo Exp $" -#endif /* SYSLIBC_SCCS */ - -SYSCALL(reboot) - iret diff --git a/lib/libc/arch/m68k/sys/reboot.S b/lib/libc/arch/m68k/sys/reboot.S deleted file mode 100644 index 6d144614d67..00000000000 --- a/lib/libc/arch/m68k/sys/reboot.S +++ /dev/null @@ -1,47 +0,0 @@ -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * the Systems Programming Group of the University of Utah Computer - * Science Department. - * - * 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. - */ - -#if defined(SYSLIBC_SCCS) - .text - .asciz "$OpenBSD: reboot.S,v 1.2 1996/08/19 08:15:39 tholo Exp $" -#endif /* SYSLIBC_SCCS */ - -#include "SYS.h" - -SYSCALL(reboot) - stop #0 - diff --git a/lib/libc/arch/mips/sys/reboot.S b/lib/libc/arch/mips/sys/reboot.S deleted file mode 100644 index d00d53f8833..00000000000 --- a/lib/libc/arch/mips/sys/reboot.S +++ /dev/null @@ -1,57 +0,0 @@ -/*- - * 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. - */ - -#include "SYS.h" - -#if defined(SYSLIBC_SCCS) - .text - .asciz "$OpenBSD: reboot.S,v 1.4 1996/08/19 08:16:24 tholo Exp $" -#endif /* SYSLIBC_SCCS */ - -LEAF(reboot) -#ifdef ABICALLS - subu sp, sp, 32 - .cprestore 16 -#endif - .set reorder - li v0, SYS_reboot - syscall - bne a3, zero, 1f - jal _C_LABEL(abort) -1: - la t9, _C_LABEL(cerror) - jr t9 -END(reboot) diff --git a/lib/libc/arch/ns32k/sys/reboot.S b/lib/libc/arch/ns32k/sys/reboot.S deleted file mode 100644 index 722f4ad46d0..00000000000 --- a/lib/libc/arch/ns32k/sys/reboot.S +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 1992 Helsinki University of Technology - * All Rights Reserved. - * - * Permission to use, copy, modify and distribute this software and its - * documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * HELSINKI UNIVERSITY OF TECHNOLOGY ALLOWS FREE USE OF THIS SOFTWARE IN - * ITS "AS IS" CONDITION. HELSINKI UNIVERSITY OF TECHNOLOGY DISCLAIMS ANY - * LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE - * USE OF THIS SOFTWARE. - */ - -#include "SYS.h" - -#if defined(SYSLIBC_SCCS) - .text - .asciz "$OpenBSD: reboot.S,v 1.2 1996/08/19 08:17:11 tholo Exp $" -#endif /* SYSLIBC_SCCS */ - -SYSCALL(reboot) - dia diff --git a/lib/libc/arch/sparc/sys/reboot.S b/lib/libc/arch/sparc/sys/reboot.S deleted file mode 100644 index 3f364f77cde..00000000000 --- a/lib/libc/arch/sparc/sys/reboot.S +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * This software was developed by the Computer Systems Engineering group - * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and - * contributed to Berkeley. - * - * 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. - */ - -#if defined(SYSLIBC_SCCS) - .text - .asciz "$OpenBSD: reboot.S,v 1.2 1996/08/19 08:18:09 tholo Exp $" -#endif /* SYSLIBC_SCCS */ - -#include "SYS.h" - -SYSCALL(reboot) - unimp 0 diff --git a/lib/libc/arch/vax/sys/reboot.S b/lib/libc/arch/vax/sys/reboot.S deleted file mode 100644 index 3160d1045a4..00000000000 --- a/lib/libc/arch/vax/sys/reboot.S +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 1983, 1993 - * The Regents of the University of California. 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 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. - */ - -#include "SYS.h" - -#if defined(SYSLIBC_SCCS) - .text - .asciz "$OpenBSD: reboot.S,v 1.2 1996/08/19 08:19:03 tholo Exp $" -#endif /* SYSLIBC_SCCS */ - -SYSCALL(reboot) - halt diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 46e26fb2c19..172d042cc5e 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -5,7 +5,7 @@ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/sys ${.CURDIR}/sys # modules with non-default implementations on at least one architecture: -SRCS+= Ovfork.S brk.S cerror.S exect.S fork.S pipe.S ptrace.S reboot.S \ +SRCS+= Ovfork.S brk.S cerror.S exect.S fork.S pipe.S ptrace.S \ sbrk.S setlogin.S sigpending.S sigprocmask.S sigreturn.S \ sigsuspend.S syscall.S @@ -29,8 +29,8 @@ ASM= accept.o access.o acct.o adjtime.o bind.o chdir.o chflags.o chmod.o \ munlock.o munmap.o nfssvc.o \ ntp_gettime.o ntp_adjtime.o \ open.o pathconf.o poll.o profil.o quotactl.o \ - read.o readlink.o readv.o recvfrom.o recvmsg.o rename.o revoke.o \ - rfork.o \ + read.o readlink.o readv.o reboot.o recvfrom.o recvmsg.o rename.o \ + revoke.o rfork.o \ rmdir.o select.o semconfig.o semget.o semop.o sendmsg.o sendto.o \ setegid.o seteuid.o setgid.o setgroups.o setitimer.o setpgid.o \ setpriority.o setrlimit.o setsid.o setsockopt.o settimeofday.o \ -- 2.20.1