Module Name: src
Committed By: thorpej
Date: Wed Jan 17 12:33:51 UTC 2024
Modified Files:
src/sys/arch/amiga/amiga: locore.s
src/sys/arch/atari/atari: locore.s
src/sys/arch/cesfic/cesfic: locore.s
src/sys/arch/hp300/hp300: locore.s
src/sys/arch/luna68k/luna68k: locore.s
src/sys/arch/m68k/conf: files.m68k
src/sys/arch/m68k/m68k: sigcode.s sunos_sigcode.s
src/sys/arch/mac68k/mac68k: locore.s
src/sys/arch/mvme68k/mvme68k: locore.s
src/sys/arch/news68k/news68k: locore.s
src/sys/arch/next68k/next68k: locore.s
src/sys/arch/sun2/sun2: locore.s
src/sys/arch/sun3/sun3: locore.s
src/sys/arch/sun3/sun3x: locore.s
src/sys/arch/virt68k/virt68k: locore.s
src/sys/arch/x68k/x68k: locore.s
Log Message:
Make sigcode.s and sunos_sigcode.s build as their own stand-alone files.
To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/sys/arch/amiga/amiga/locore.s
cvs rdiff -u -r1.125 -r1.126 src/sys/arch/atari/atari/locore.s
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.183 -r1.184 src/sys/arch/hp300/hp300/locore.s
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/m68k/conf/files.m68k
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/m68k/m68k/sigcode.s
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/m68k/m68k/sunos_sigcode.s
cvs rdiff -u -r1.182 -r1.183 src/sys/arch/mac68k/mac68k/locore.s
cvs rdiff -u -r1.129 -r1.130 src/sys/arch/mvme68k/mvme68k/locore.s
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/news68k/news68k/locore.s
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/next68k/next68k/locore.s
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/sun2/sun2/locore.s
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/sun3/sun3/locore.s
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/sun3/sun3x/locore.s
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/virt68k/virt68k/locore.s
cvs rdiff -u -r1.130 -r1.131 src/sys/arch/x68k/x68k/locore.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/amiga/locore.s
diff -u src/sys/arch/amiga/amiga/locore.s:1.169 src/sys/arch/amiga/amiga/locore.s:1.170
--- src/sys/arch/amiga/amiga/locore.s:1.169 Wed Jan 17 12:19:05 2024
+++ src/sys/arch/amiga/amiga/locore.s Wed Jan 17 12:33:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.169 2024/01/17 12:19:05 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.170 2024/01/17 12:33:49 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -1048,14 +1048,6 @@ Lnoflush:
rte
/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
-/*
* Primitives
*/
Index: src/sys/arch/atari/atari/locore.s
diff -u src/sys/arch/atari/atari/locore.s:1.125 src/sys/arch/atari/atari/locore.s:1.126
--- src/sys/arch/atari/atari/locore.s:1.125 Wed Jan 17 12:19:05 2024
+++ src/sys/arch/atari/atari/locore.s Wed Jan 17 12:33:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.125 2024/01/17 12:19:05 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.126 2024/01/17 12:33:49 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -1037,14 +1037,6 @@ Lnoflush:
rte
/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
-/*
* Primitives
*/
Index: src/sys/arch/cesfic/cesfic/locore.s
diff -u src/sys/arch/cesfic/cesfic/locore.s:1.45 src/sys/arch/cesfic/cesfic/locore.s:1.46
--- src/sys/arch/cesfic/cesfic/locore.s:1.45 Wed Jan 17 12:19:06 2024
+++ src/sys/arch/cesfic/cesfic/locore.s Wed Jan 17 12:33:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.45 2024/01/17 12:19:06 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.46 2024/01/17 12:33:49 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -720,14 +720,6 @@ Ldorte:
rte | real return
/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
-/*
* Primitives
*/
Index: src/sys/arch/hp300/hp300/locore.s
diff -u src/sys/arch/hp300/hp300/locore.s:1.183 src/sys/arch/hp300/hp300/locore.s:1.184
--- src/sys/arch/hp300/hp300/locore.s:1.183 Wed Jan 17 12:19:06 2024
+++ src/sys/arch/hp300/hp300/locore.s Wed Jan 17 12:33:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.183 2024/01/17 12:19:06 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.184 2024/01/17 12:33:49 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -942,14 +942,6 @@ Laststkadj:
rte | and do real RTE
/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
-/*
* Primitives
*/
Index: src/sys/arch/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.81 src/sys/arch/luna68k/luna68k/locore.s:1.82
--- src/sys/arch/luna68k/luna68k/locore.s:1.81 Wed Jan 17 12:19:06 2024
+++ src/sys/arch/luna68k/luna68k/locore.s Wed Jan 17 12:33:49 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.81 2024/01/17 12:19:06 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.82 2024/01/17 12:33:49 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -644,14 +644,6 @@ Laststkadj:
rte | and do real RTE
/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
-/*
* Primitives
*/
Index: src/sys/arch/m68k/conf/files.m68k
diff -u src/sys/arch/m68k/conf/files.m68k:1.53 src/sys/arch/m68k/conf/files.m68k:1.54
--- src/sys/arch/m68k/conf/files.m68k:1.53 Wed Jan 17 12:19:07 2024
+++ src/sys/arch/m68k/conf/files.m68k Wed Jan 17 12:33:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: files.m68k,v 1.53 2024/01/17 12:19:07 thorpej Exp $
+# $NetBSD: files.m68k,v 1.54 2024/01/17 12:33:51 thorpej Exp $
#
defflag opt_fpsp.h FPSP
@@ -26,9 +26,13 @@ file arch/m68k/m68k/process_machdep.c
file arch/m68k/m68k/reenter_syscall.s
file arch/m68k/m68k/regdump.c
file arch/m68k/m68k/sig_machdep.c
+file arch/m68k/m68k/sigcode.s
file arch/m68k/m68k/support.s
file arch/m68k/m68k/m68k_syscall.c
+
+file arch/m68k/m68k/sunos_sigcode.s compat_sunos
file arch/m68k/m68k/sunos_syscall.c compat_sunos
+
file arch/m68k/m68k/linux_syscall.c compat_linux
file arch/m68k/m68k/compat_13_machdep.c compat_13
Index: src/sys/arch/m68k/m68k/sigcode.s
diff -u src/sys/arch/m68k/m68k/sigcode.s:1.15 src/sys/arch/m68k/m68k/sigcode.s:1.16
--- src/sys/arch/m68k/m68k/sigcode.s:1.15 Thu Aug 1 13:42:52 2013
+++ src/sys/arch/m68k/m68k/sigcode.s Wed Jan 17 12:33:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sigcode.s,v 1.15 2013/08/01 13:42:52 matt Exp $ */
+/* $NetBSD: sigcode.s,v 1.16 2024/01/17 12:33:50 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -38,12 +38,11 @@
* @(#)locore.s 8.6 (Berkeley) 5/27/94
*/
-/*
- * NOTICE: This is not a standalone file. To use it, #include it in
- * your port's locore.s, like so:
- *
- * #include <m68k/m68k/sigcode.s>
- */
+#include <machine/asm.h>
+
+#include "assym.h"
+
+ .file "sigcode.s"
/*
* Signal trampoline; copied to top of user stack.
Index: src/sys/arch/m68k/m68k/sunos_sigcode.s
diff -u src/sys/arch/m68k/m68k/sunos_sigcode.s:1.7 src/sys/arch/m68k/m68k/sunos_sigcode.s:1.8
--- src/sys/arch/m68k/m68k/sunos_sigcode.s:1.7 Tue Sep 26 14:33:55 2023
+++ src/sys/arch/m68k/m68k/sunos_sigcode.s Wed Jan 17 12:33:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_sigcode.s,v 1.7 2023/09/26 14:33:55 tsutsui Exp $ */
+/* $NetBSD: sunos_sigcode.s,v 1.8 2024/01/17 12:33:50 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -40,13 +40,7 @@
#include <machine/asm.h>
-/*
- * NOTICE: This is typically included in port's locore.s, like so:
- *
- * #ifdef COMPAT_SUNOS
- * #include <m68k/m68k/sunos_sigcode.s>
- * #endif
- */
+ .file "sunos_sigcode.s"
.data
.align 2
Index: src/sys/arch/mac68k/mac68k/locore.s
diff -u src/sys/arch/mac68k/mac68k/locore.s:1.182 src/sys/arch/mac68k/mac68k/locore.s:1.183
--- src/sys/arch/mac68k/mac68k/locore.s:1.182 Wed Jan 17 12:19:06 2024
+++ src/sys/arch/mac68k/mac68k/locore.s Wed Jan 17 12:33:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.182 2024/01/17 12:19:06 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.183 2024/01/17 12:33:50 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -884,14 +884,6 @@ ASENTRY_NOPROFILE(rei)
rte | real return
/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
-/*
* Primitives
*/
Index: src/sys/arch/mvme68k/mvme68k/locore.s
diff -u src/sys/arch/mvme68k/mvme68k/locore.s:1.129 src/sys/arch/mvme68k/mvme68k/locore.s:1.130
--- src/sys/arch/mvme68k/mvme68k/locore.s:1.129 Wed Jan 17 12:19:06 2024
+++ src/sys/arch/mvme68k/mvme68k/locore.s Wed Jan 17 12:33:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.129 2024/01/17 12:19:06 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.130 2024/01/17 12:33:50 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -955,14 +955,6 @@ Laststkadj:
rte | and do real RTE
/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
-/*
* Primitives
*/
Index: src/sys/arch/news68k/news68k/locore.s
diff -u src/sys/arch/news68k/news68k/locore.s:1.84 src/sys/arch/news68k/news68k/locore.s:1.85
--- src/sys/arch/news68k/news68k/locore.s:1.84 Wed Jan 17 12:19:06 2024
+++ src/sys/arch/news68k/news68k/locore.s Wed Jan 17 12:33:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.84 2024/01/17 12:19:06 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.85 2024/01/17 12:33:50 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -762,14 +762,6 @@ Laststkadj:
rte | real return
/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
-/*
* Primitives
*/
Index: src/sys/arch/next68k/next68k/locore.s
diff -u src/sys/arch/next68k/next68k/locore.s:1.84 src/sys/arch/next68k/next68k/locore.s:1.85
--- src/sys/arch/next68k/next68k/locore.s:1.84 Wed Jan 17 12:19:06 2024
+++ src/sys/arch/next68k/next68k/locore.s Wed Jan 17 12:33:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.84 2024/01/17 12:19:06 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.85 2024/01/17 12:33:50 thorpej Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -709,14 +709,6 @@ Laststkadj:
rte | and do real RTE
/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
-/*
* Primitives
*/
Index: src/sys/arch/sun2/sun2/locore.s
diff -u src/sys/arch/sun2/sun2/locore.s:1.37 src/sys/arch/sun2/sun2/locore.s:1.38
--- src/sys/arch/sun2/sun2/locore.s:1.37 Wed Jan 17 12:19:07 2024
+++ src/sys/arch/sun2/sun2/locore.s Wed Jan 17 12:33:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.37 2024/01/17 12:19:07 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.38 2024/01/17 12:33:50 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -476,16 +476,6 @@ Ldorte:
*/
/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
- .text
-
-/*
* Primitives
*/
Index: src/sys/arch/sun3/sun3/locore.s
diff -u src/sys/arch/sun3/sun3/locore.s:1.109 src/sys/arch/sun3/sun3/locore.s:1.110
--- src/sys/arch/sun3/sun3/locore.s:1.109 Wed Jan 17 12:19:07 2024
+++ src/sys/arch/sun3/sun3/locore.s Wed Jan 17 12:33:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.109 2024/01/17 12:19:07 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.110 2024/01/17 12:33:50 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -522,16 +522,6 @@ Ldorte:
*/
/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
- .text
-
-/*
* Primitives
*/
Index: src/sys/arch/sun3/sun3x/locore.s
diff -u src/sys/arch/sun3/sun3x/locore.s:1.77 src/sys/arch/sun3/sun3x/locore.s:1.78
--- src/sys/arch/sun3/sun3x/locore.s:1.77 Wed Jan 17 12:19:07 2024
+++ src/sys/arch/sun3/sun3x/locore.s Wed Jan 17 12:33:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.77 2024/01/17 12:19:07 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.78 2024/01/17 12:33:51 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -507,16 +507,6 @@ Ldorte:
*/
/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
- .text
-
-/*
* Primitives
*/
Index: src/sys/arch/virt68k/virt68k/locore.s
diff -u src/sys/arch/virt68k/virt68k/locore.s:1.12 src/sys/arch/virt68k/virt68k/locore.s:1.13
--- src/sys/arch/virt68k/virt68k/locore.s:1.12 Wed Jan 17 12:19:07 2024
+++ src/sys/arch/virt68k/virt68k/locore.s Wed Jan 17 12:33:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.12 2024/01/17 12:19:07 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.13 2024/01/17 12:33:51 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -552,14 +552,6 @@ Laststkadj:
rte | and do real RTE
/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
-/*
* Primitives
*/
Index: src/sys/arch/x68k/x68k/locore.s
diff -u src/sys/arch/x68k/x68k/locore.s:1.130 src/sys/arch/x68k/x68k/locore.s:1.131
--- src/sys/arch/x68k/x68k/locore.s:1.130 Wed Jan 17 12:19:07 2024
+++ src/sys/arch/x68k/x68k/locore.s Wed Jan 17 12:33:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.130 2024/01/17 12:19:07 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.131 2024/01/17 12:33:51 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -758,14 +758,6 @@ Laststkadj:
rte | and do real RTE
/*
- * Use common m68k sigcode.
- */
-#include <m68k/m68k/sigcode.s>
-#ifdef COMPAT_SUNOS
-#include <m68k/m68k/sunos_sigcode.s>
-#endif
-
-/*
* Primitives
*/
