Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/hppa Remove references to COMPAT_OSF1 in HPPA, it h...
details: https://anonhg.NetBSD.org/src/rev/a189ff6dbc89
branches: trunk
changeset: 840101:a189ff6dbc89
user: maxv <maxv%NetBSD.org@localhost>
date: Sat Mar 23 13:05:24 2019 +0000
description:
Remove references to COMPAT_OSF1 in HPPA, it has never been supported on
this architecture.
diffstat:
sys/arch/hppa/conf/GENERIC | 5 ++---
sys/arch/hppa/conf/files.hppa | 5 +----
sys/arch/hppa/hppa/trap.S | 28 +---------------------------
3 files changed, 4 insertions(+), 34 deletions(-)
diffs (101 lines):
diff -r 0cec04b15309 -r a189ff6dbc89 sys/arch/hppa/conf/GENERIC
--- a/sys/arch/hppa/conf/GENERIC Sat Mar 23 12:01:18 2019 +0000
+++ b/sys/arch/hppa/conf/GENERIC Sat Mar 23 13:05:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.24 2019/02/06 11:58:31 rin Exp $
+# $NetBSD: GENERIC,v 1.25 2019/03/23 13:05:24 maxv Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-#ident "GENERIC-$Revision: 1.24 $"
+#ident "GENERIC-$Revision: 1.25 $"
maxusers 32 # estimated number of users
@@ -76,7 +76,6 @@
# Compatibility options
include "conf/compat_netbsd20.config"
-#options COMPAT_OSF1 # OSF1 binary compatibility
#options COMPAT_LINUX # binary compatibility with Linux
# File systems
diff -r 0cec04b15309 -r a189ff6dbc89 sys/arch/hppa/conf/files.hppa
--- a/sys/arch/hppa/conf/files.hppa Sat Mar 23 12:01:18 2019 +0000
+++ b/sys/arch/hppa/conf/files.hppa Sat Mar 23 13:05:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.hppa,v 1.18 2014/02/24 07:23:42 skrll Exp $
+# $NetBSD: files.hppa,v 1.19 2019/03/23 13:05:24 maxv Exp $
#
# $OpenBSD: files.hppa,v 1.31 2001/06/26 02:41:25 mickey Exp $
#
@@ -22,9 +22,6 @@
#
include "compat/ossaudio/files.ossaudio"
-include "compat/osf1/files.osf1"
-file arch/hppa/hppa/osf1_machdep.c compat_osf1
-
include "compat/linux/files.linux"
file arch/hppa/hppa/linux_machdep.c compat_linux
diff -r 0cec04b15309 -r a189ff6dbc89 sys/arch/hppa/hppa/trap.S
--- a/sys/arch/hppa/hppa/trap.S Sat Mar 23 12:01:18 2019 +0000
+++ b/sys/arch/hppa/hppa/trap.S Sat Mar 23 13:05:24 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.S,v 1.68 2012/04/06 13:13:13 skrll Exp $ */
+/* $NetBSD: trap.S,v 1.69 2019/03/23 13:05:24 maxv Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -95,7 +95,6 @@
* Utah $Hdr: locore.s 1.63 95/01/20$
*/
-#include "opt_compat_osf1.h"
#include "opt_multiprocessor.h"
#include "opt_cputype.h"
@@ -131,38 +130,13 @@
gateway_page:
nop /* @ 0.C0000000 (Nothing) */
gate,n bsd_syscall,%r0 /* @ 0.C0000004 (HPUX/BSD) */
-#ifdef COMPAT_OSF1
- bl,n osf_syscall,%r0
- bl,n osf_syscall,%r0
-#else
nop /* @ 0.C0000008 (HPOSF UNIX) */
nop /* @ 0.C000000C (HPOSF Mach) */
-#endif
nop
nop
nop
nop
-#ifdef COMPAT_OSF1
-osf_syscall:
- /*
- * Ripped screaming from OSF/MkLinux:
- *
- * Convert HPOSF system call to a BSD one by stashing arg4 and arg5
- * back into the frame, and moving the system call number into r22.
- * Fortunately, the HPOSF compiler has a bigger stack frame, which
- * allows this horrible hack.
- *
- * We also need to save r29 (aka ret1) for the emulator since it may
- * get clobbered between here and there.
- */
- stw %r22, HPPA_FRAME_ARG(4)(%sp)
- stw %r21, HPPA_FRAME_ARG(5)(%sp)
- stw %r29, HPPA_FRAME_SL(%sp)
- gate bsd_syscall,%r0
- copy %r1, %r22
-#endif /* COMPAT_OSF1 */
-
bsd_syscall:
/*
* Set up a space register and a protection id so that we can access
Home |
Main Index |
Thread Index |
Old Index