Module Name: src
Committed By: martin
Date: Thu Jun 27 19:27:29 UTC 2024
Modified Files:
src/sys/arch/amiga/amiga [netbsd-10]: locore.s
src/sys/arch/atari/atari [netbsd-10]: locore.s
src/sys/arch/cesfic/cesfic [netbsd-10]: locore.s
src/sys/arch/hp300/hp300 [netbsd-10]: locore.s
src/sys/arch/luna68k/luna68k [netbsd-10]: locore.s
src/sys/arch/m68k/conf [netbsd-10]: files.m68k
src/sys/arch/m68k/include [netbsd-10]: pte_motorola.h
src/sys/arch/m68k/m68k [netbsd-10]: compat_13_sigreturn13.s
compat_16_sigreturn14.s
src/sys/arch/mac68k/mac68k [netbsd-10]: locore.s
src/sys/arch/mvme68k/mvme68k [netbsd-10]: locore.s
src/sys/arch/news68k/news68k [netbsd-10]: locore.s
src/sys/arch/next68k/next68k [netbsd-10]: locore.s
src/sys/arch/sun2/sun2 [netbsd-10]: locore.s
src/sys/arch/sun3/sun3 [netbsd-10]: locore.s
src/sys/arch/sun3/sun3x [netbsd-10]: locore.s
src/sys/arch/x68k/x68k [netbsd-10]: locore.s
Removed Files:
src/sys/arch/m68k/m68k [netbsd-10]: sigreturn.s
Log Message:
Pull up following revision(s) (requested by rin in ticket #724
to fix build fallout on the branch):
sys/arch/m68k/m68k/compat_16_sigreturn14.s: revision 1.6
sys/arch/mvme68k/mvme68k/locore.s: revision 1.129
sys/arch/news68k/news68k/locore.s: revision 1.84
sys/arch/hp300/hp300/locore.s: revision 1.183
sys/arch/m68k/m68k/compat_13_sigreturn13.s: revision 1.8
sys/arch/m68k/m68k/sigreturn.s: file removal
sys/arch/m68k/include/pte_motorola.h: revision 1.10
sys/arch/atari/atari/locore.s: revision 1.125
sys/arch/amiga/amiga/locore.s: revision 1.169
sys/arch/sun2/sun2/locore.s: revision 1.37
sys/arch/next68k/next68k/locore.s: revision 1.84
sys/arch/x68k/x68k/locore.s: revision 1.130
sys/arch/sun3/sun3x/locore.s: revision 1.77
sys/arch/cesfic/cesfic/locore.s: revision 1.45
sys/arch/m68k/conf/files.m68k: revision 1.53
sys/arch/sun3/sun3/locore.s: revision 1.109
sys/arch/luna68k/luna68k/locore.s: revision 1.81
sys/arch/mac68k/mac68k/locore.s: revision 1.182
Define PTE used in the pmap module int terms of the bit definitions
in mmu_{51,40}.h.
Make compat_13_sigreturn13.s and compat_16_sigreturn14.s build as their
own stand-alone files and G/C the now-empty sigreturn.s.
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.161.4.1 src/sys/arch/amiga/amiga/locore.s
cvs rdiff -u -r1.116 -r1.116.4.1 src/sys/arch/atari/atari/locore.s
cvs rdiff -u -r1.34 -r1.34.4.1 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.173 -r1.173.4.1 src/sys/arch/hp300/hp300/locore.s
cvs rdiff -u -r1.68 -r1.68.4.1 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.51 -r1.51.20.1 src/sys/arch/m68k/conf/files.m68k
cvs rdiff -u -r1.8 -r1.8.86.1 src/sys/arch/m68k/include/pte_motorola.h
cvs rdiff -u -r1.7 -r1.7.60.1 src/sys/arch/m68k/m68k/compat_13_sigreturn13.s
cvs rdiff -u -r1.5 -r1.5.60.1 src/sys/arch/m68k/m68k/compat_16_sigreturn14.s
cvs rdiff -u -r1.11 -r0 src/sys/arch/m68k/m68k/sigreturn.s
cvs rdiff -u -r1.175 -r1.175.4.1 src/sys/arch/mac68k/mac68k/locore.s
cvs rdiff -u -r1.118 -r1.118.4.1 src/sys/arch/mvme68k/mvme68k/locore.s
cvs rdiff -u -r1.68 -r1.68.4.1 src/sys/arch/news68k/news68k/locore.s
cvs rdiff -u -r1.68.4.2 -r1.68.4.3 src/sys/arch/next68k/next68k/locore.s
cvs rdiff -u -r1.29 -r1.29.4.1 src/sys/arch/sun2/sun2/locore.s
cvs rdiff -u -r1.101 -r1.101.4.1 src/sys/arch/sun3/sun3/locore.s
cvs rdiff -u -r1.69 -r1.69.4.1 src/sys/arch/sun3/sun3x/locore.s
cvs rdiff -u -r1.121 -r1.121.4.1 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.161 src/sys/arch/amiga/amiga/locore.s:1.161.4.1
--- src/sys/arch/amiga/amiga/locore.s:1.161 Mon May 30 09:56:02 2022
+++ src/sys/arch/amiga/amiga/locore.s Thu Jun 27 19:27:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.161 2022/05/30 09:56:02 andvar Exp $ */
+/* $NetBSD: locore.s,v 1.161.4.1 2024/06/27 19:27:28 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -423,9 +423,6 @@ ENTRY_NOPROFILE(trace)
moveq #T_TRACE,%d0
jra _ASM_LABEL(fault)
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers.
*
Index: src/sys/arch/atari/atari/locore.s
diff -u src/sys/arch/atari/atari/locore.s:1.116 src/sys/arch/atari/atari/locore.s:1.116.4.1
--- src/sys/arch/atari/atari/locore.s:1.116 Mon May 30 09:56:03 2022
+++ src/sys/arch/atari/atari/locore.s Thu Jun 27 19:27:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.116 2022/05/30 09:56:03 andvar Exp $ */
+/* $NetBSD: locore.s,v 1.116.4.1 2024/06/27 19:27:28 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -618,9 +618,6 @@ Lbrkpt3:
movl %sp@,%sp | ... and sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers.
*
Index: src/sys/arch/cesfic/cesfic/locore.s
diff -u src/sys/arch/cesfic/cesfic/locore.s:1.34 src/sys/arch/cesfic/cesfic/locore.s:1.34.4.1
--- src/sys/arch/cesfic/cesfic/locore.s:1.34 Mon May 30 09:56:03 2022
+++ src/sys/arch/cesfic/cesfic/locore.s Thu Jun 27 19:27:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.34 2022/05/30 09:56:03 andvar Exp $ */
+/* $NetBSD: locore.s,v 1.34.4.1 2024/06/27 19:27:28 martin Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -600,9 +600,6 @@ Lbrkpt2:
movl %sp@,%sp | ... and %sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers.
* All device interrupts are auto-vectored. The CPU provides
Index: src/sys/arch/hp300/hp300/locore.s
diff -u src/sys/arch/hp300/hp300/locore.s:1.173 src/sys/arch/hp300/hp300/locore.s:1.173.4.1
--- src/sys/arch/hp300/hp300/locore.s:1.173 Mon May 30 09:56:03 2022
+++ src/sys/arch/hp300/hp300/locore.s Thu Jun 27 19:27:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.173 2022/05/30 09:56:03 andvar Exp $ */
+/* $NetBSD: locore.s,v 1.173.4.1 2024/06/27 19:27:27 martin Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -849,9 +849,6 @@ Lbrkpt3:
movl %sp@,%sp | ... and %sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers.
* All device interrupts are auto-vectored. The CPU provides
Index: src/sys/arch/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.68 src/sys/arch/luna68k/luna68k/locore.s:1.68.4.1
--- src/sys/arch/luna68k/luna68k/locore.s:1.68 Fri Jun 10 21:42:24 2022
+++ src/sys/arch/luna68k/luna68k/locore.s Thu Jun 27 19:27:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.68 2022/06/10 21:42:24 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.68.4.1 2024/06/27 19:27:29 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -581,9 +581,6 @@ Lbrkpt3:
movl %sp@,%sp | ... and %sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers.
*
Index: src/sys/arch/m68k/conf/files.m68k
diff -u src/sys/arch/m68k/conf/files.m68k:1.51 src/sys/arch/m68k/conf/files.m68k:1.51.20.1
--- src/sys/arch/m68k/conf/files.m68k:1.51 Wed Oct 21 13:31:51 2020
+++ src/sys/arch/m68k/conf/files.m68k Thu Jun 27 19:27:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: files.m68k,v 1.51 2020/10/21 13:31:51 christos Exp $
+# $NetBSD: files.m68k,v 1.51.20.1 2024/06/27 19:27:28 martin Exp $
#
defflag opt_fpsp.h FPSP
@@ -31,6 +31,9 @@ file arch/m68k/m68k/sunos_syscall.c com
file arch/m68k/m68k/linux_syscall.c compat_linux
file arch/m68k/m68k/compat_13_machdep.c compat_13
+file arch/m68k/m68k/compat_13_sigreturn13.s compat_13 | compat_sunos
+
file arch/m68k/m68k/compat_16_machdep.c compat_16
+file arch/m68k/m68k/compat_16_sigreturn14.s compat_16
include "compat/m68k4k/files.m68k4k"
Index: src/sys/arch/m68k/include/pte_motorola.h
diff -u src/sys/arch/m68k/include/pte_motorola.h:1.8 src/sys/arch/m68k/include/pte_motorola.h:1.8.86.1
--- src/sys/arch/m68k/include/pte_motorola.h:1.8 Tue Feb 8 20:20:16 2011
+++ src/sys/arch/m68k/include/pte_motorola.h Thu Jun 27 19:27:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pte_motorola.h,v 1.8 2011/02/08 20:20:16 rmind Exp $ */
+/* $NetBSD: pte_motorola.h,v 1.8.86.1 2024/06/27 19:27:28 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -59,21 +59,21 @@ typedef u_int pt_entry_t; /* page table
#define SG_RO 0x00000004
#define SG_RW 0x00000000
#define SG_U 0x00000008 /* modified bit (68040) */
-#define SG_FRAME ((~0) << PG_SHIFT)
+#define SG_FRAME ((~0U) << PG_SHIFT)
#define SG_ISHIFT ((PG_SHIFT << 1) - 2) /* 24 or 22 */
-#define SG_IMASK ((~0) << SG_ISHIFT)
+#define SG_IMASK ((~0U) << SG_ISHIFT)
#define SG_PSHIFT PG_SHIFT
-#define SG_PMASK (((~0) << SG_PSHIFT) & ~SG_IMASK)
+#define SG_PMASK (((~0U) << SG_PSHIFT) & ~SG_IMASK)
/* 68040 additions */
#define SG4_MASK1 0xfe000000
#define SG4_SHIFT1 25
#define SG4_MASK2 0x01fc0000
#define SG4_SHIFT2 18
-#define SG4_MASK3 (((~0) << PG_SHIFT) & ~(SG4_MASK1 | SG4_MASK2))
+#define SG4_MASK3 (((~0U) << PG_SHIFT) & ~(SG4_MASK1 | SG4_MASK2))
#define SG4_SHIFT3 PG_SHIFT
#define SG4_ADDR1 0xfffffe00
-#define SG4_ADDR2 ((~0) << (20 - PG_SHIFT))
+#define SG4_ADDR2 ((~0U) << (20 - PG_SHIFT))
#define SG4_LEV1SIZE 128
#define SG4_LEV2SIZE 128
#define SG4_LEV3SIZE (1 << (SG4_SHIFT2 - PG_SHIFT)) /* 64 or 32 */
@@ -86,7 +86,7 @@ typedef u_int pt_entry_t; /* page table
#define PG_W 0x00000100
#define PG_RO 0x00000004
#define PG_RW 0x00000000
-#define PG_FRAME ((~0) << PG_SHIFT)
+#define PG_FRAME ((~0U) << PG_SHIFT)
#define PG_CI 0x00000040
#define PG_PFNUM(x) (((x) & PG_FRAME) >> PG_SHIFT)
Index: src/sys/arch/m68k/m68k/compat_13_sigreturn13.s
diff -u src/sys/arch/m68k/m68k/compat_13_sigreturn13.s:1.7 src/sys/arch/m68k/m68k/compat_13_sigreturn13.s:1.7.60.1
--- src/sys/arch/m68k/m68k/compat_13_sigreturn13.s:1.7 Sat Sep 7 19:06:29 2013
+++ src/sys/arch/m68k/m68k/compat_13_sigreturn13.s Thu Jun 27 19:27:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_13_sigreturn13.s,v 1.7 2013/09/07 19:06:29 chs Exp $ */
+/* $NetBSD: compat_13_sigreturn13.s,v 1.7.60.1 2024/06/27 19:27:27 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -38,9 +38,12 @@
* @(#)locore.s 8.6 (Berkeley) 5/27/94
*/
-/*
- * NOTICE: This file is included by <m68k/m68k/sigreturn.s>.
- */
+#include <machine/asm.h>
+
+#include "assym.h"
+
+ .file "compat_13_sigreturn13.s"
+ .text
/*
* The compat_13_sigreturn13() syscall comes here. It requires special
@@ -61,19 +64,19 @@ ENTRY_NOPROFILE(m68k_compat_13_sigreturn
movl FR_SP(%sp),%a0 | grab and restore
movl %a0,%usp | user SP
lea FR_HW(%sp),%a1 | pointer to HW frame
- movw FR_ADJ(%sp),%d0 | do we need to adjust the stack?
- jeq .Lc13sigr1 | no, just continue
+ movw FR_ADJ(%sp),%d0 | do we need to adjust the stack?
+ jeq 2f | no, just continue
moveq #92,%d1 | total size
subw %d0,%d1 | - hole size = frame size
lea 92(%a1),%a0 | destination
addw %d1,%a1 | source
lsrw #1,%d1 | convert to word count
subqw #1,%d1 | minus 1 for dbf
-.Lc13sigrlp:
+1:
movw -(%a1),-(%a0) | copy a word
- dbf %d1,.Lc13sigrlp | continue
+ dbf %d1,1b | continue
movl %a0,%a1 | new HW frame base
-.Lc13sigr1:
+2:
movl %a1,FR_SP(%sp) | new SP value
moveml (%sp)+,#0x7FFF | restore user registers
movl (%sp),%sp | and our SP
Index: src/sys/arch/m68k/m68k/compat_16_sigreturn14.s
diff -u src/sys/arch/m68k/m68k/compat_16_sigreturn14.s:1.5 src/sys/arch/m68k/m68k/compat_16_sigreturn14.s:1.5.60.1
--- src/sys/arch/m68k/m68k/compat_16_sigreturn14.s:1.5 Sat Sep 7 19:06:29 2013
+++ src/sys/arch/m68k/m68k/compat_16_sigreturn14.s Thu Jun 27 19:27:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_sigreturn14.s,v 1.5 2013/09/07 19:06:29 chs Exp $ */
+/* $NetBSD: compat_16_sigreturn14.s,v 1.5.60.1 2024/06/27 19:27:27 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -38,9 +38,12 @@
* @(#)locore.s 8.6 (Berkeley) 5/27/94
*/
-/*
- * NOTICE: This file is included by <m68k/m68k/sigreturn.s>.
- */
+#include <machine/asm.h>
+
+#include "assym.h"
+
+ .file "compat_13_sigreturn13.s"
+ .text
/*
* The compat_16_sigreturn14() syscall comes here. It requires special
@@ -62,18 +65,18 @@ ENTRY_NOPROFILE(m68k_compat_16_sigreturn
movl %a0,%usp | user SP
lea FR_HW(%sp),%a1 | pointer to HW frame
movw FR_ADJ(%sp),%d0 | do we need to adjust the stack?
- jeq .Lsigr1 | no, just continue
+ jeq 2f | no, just continue
moveq #92,%d1 | total size
subw %d0,%d1 | - hole size = frame size
lea 92(%a1),%a0 | destination
addw %d1,%a1 | source
lsrw #1,%d1 | convert to word count
subqw #1,%d1 | minus 1 for dbf
-.Lsigrlp:
+1:
movw -(%a1),-(%a0) | copy a word
- dbf %d1,.Lsigrlp | continue
+ dbf %d1,1b | continue
movl %a0,%a1 | new HW frame base
-.Lsigr1:
+2:
movl %a1,FR_SP(%sp) | new SP value
moveml (%sp)+,#0x7FFF | restore user registers
movl (%sp),%sp | and our SP
Index: src/sys/arch/mac68k/mac68k/locore.s
diff -u src/sys/arch/mac68k/mac68k/locore.s:1.175 src/sys/arch/mac68k/mac68k/locore.s:1.175.4.1
--- src/sys/arch/mac68k/mac68k/locore.s:1.175 Mon May 30 09:56:03 2022
+++ src/sys/arch/mac68k/mac68k/locore.s Thu Jun 27 19:27:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.175 2022/05/30 09:56:03 andvar Exp $ */
+/* $NetBSD: locore.s,v 1.175.4.1 2024/06/27 19:27:29 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -713,9 +713,6 @@ Lbrkpt3:
movl %sp@,%sp | ... and %sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers.
*
Index: src/sys/arch/mvme68k/mvme68k/locore.s
diff -u src/sys/arch/mvme68k/mvme68k/locore.s:1.118 src/sys/arch/mvme68k/mvme68k/locore.s:1.118.4.1
--- src/sys/arch/mvme68k/mvme68k/locore.s:1.118 Mon May 30 09:56:03 2022
+++ src/sys/arch/mvme68k/mvme68k/locore.s Thu Jun 27 19:27:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.118 2022/05/30 09:56:03 andvar Exp $ */
+/* $NetBSD: locore.s,v 1.118.4.1 2024/06/27 19:27:27 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -929,11 +929,6 @@ Lbrkpt3:
rte | all done
/*
- * Use common m68k sigreturn routine.
- */
-#include <m68k/m68k/sigreturn.s>
-
-/*
* Interrupt handlers.
*
* For auto-vectored interrupts, the CPU provides the
Index: src/sys/arch/news68k/news68k/locore.s
diff -u src/sys/arch/news68k/news68k/locore.s:1.68 src/sys/arch/news68k/news68k/locore.s:1.68.4.1
--- src/sys/arch/news68k/news68k/locore.s:1.68 Mon May 30 09:56:03 2022
+++ src/sys/arch/news68k/news68k/locore.s Thu Jun 27 19:27:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.68 2022/05/30 09:56:03 andvar Exp $ */
+/* $NetBSD: locore.s,v 1.68.4.1 2024/06/27 19:27:27 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -684,11 +684,6 @@ Lbrkpt3:
rte | all done
/*
- * Use common m68k sigreturn routine.
- */
-#include <m68k/m68k/sigreturn.s>
-
-/*
* Interrupt handlers.
*
* For auto-vectored interrupts, the CPU provides the
Index: src/sys/arch/next68k/next68k/locore.s
diff -u src/sys/arch/next68k/next68k/locore.s:1.68.4.2 src/sys/arch/next68k/next68k/locore.s:1.68.4.3
--- src/sys/arch/next68k/next68k/locore.s:1.68.4.2 Wed Feb 15 19:35:14 2023
+++ src/sys/arch/next68k/next68k/locore.s Thu Jun 27 19:27:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.68.4.2 2023/02/15 19:35:14 martin Exp $ */
+/* $NetBSD: locore.s,v 1.68.4.3 2024/06/27 19:27:28 martin Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -682,9 +682,6 @@ Lbrkpt3:
movl %sp@,%sp | ... and %sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers.
*
Index: src/sys/arch/sun2/sun2/locore.s
diff -u src/sys/arch/sun2/sun2/locore.s:1.29 src/sys/arch/sun2/sun2/locore.s:1.29.4.1
--- src/sys/arch/sun2/sun2/locore.s:1.29 Wed Mar 16 20:31:02 2022
+++ src/sys/arch/sun2/sun2/locore.s Thu Jun 27 19:27:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.29 2022/03/16 20:31:02 andvar Exp $ */
+/* $NetBSD: locore.s,v 1.29.4.1 2024/06/27 19:27:28 martin Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -389,9 +389,6 @@ Lbrkpt2:
movl %sp@,%sp | ... and sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers. Most are auto-vectored,
* and hard-wired the same way on all sun3 models.
Index: src/sys/arch/sun3/sun3/locore.s
diff -u src/sys/arch/sun3/sun3/locore.s:1.101 src/sys/arch/sun3/sun3/locore.s:1.101.4.1
--- src/sys/arch/sun3/sun3/locore.s:1.101 Wed Mar 16 20:31:02 2022
+++ src/sys/arch/sun3/sun3/locore.s Thu Jun 27 19:27:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.101 2022/03/16 20:31:02 andvar Exp $ */
+/* $NetBSD: locore.s,v 1.101.4.1 2024/06/27 19:27:29 martin Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -435,9 +435,6 @@ Lbrkpt2:
movl %sp@,%sp | ... and sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers. Most are auto-vectored,
* and hard-wired the same way on all sun3 models.
Index: src/sys/arch/sun3/sun3x/locore.s
diff -u src/sys/arch/sun3/sun3x/locore.s:1.69 src/sys/arch/sun3/sun3x/locore.s:1.69.4.1
--- src/sys/arch/sun3/sun3x/locore.s:1.69 Wed Mar 16 20:31:02 2022
+++ src/sys/arch/sun3/sun3x/locore.s Thu Jun 27 19:27:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.69 2022/03/16 20:31:02 andvar Exp $ */
+/* $NetBSD: locore.s,v 1.69.4.1 2024/06/27 19:27:28 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -420,9 +420,6 @@ Lbrkpt2:
movl %sp@,%sp | ... and sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Interrupt handlers. Most are auto-vectored,
* and hard-wired the same way on all sun3 models.
Index: src/sys/arch/x68k/x68k/locore.s
diff -u src/sys/arch/x68k/x68k/locore.s:1.121 src/sys/arch/x68k/x68k/locore.s:1.121.4.1
--- src/sys/arch/x68k/x68k/locore.s:1.121 Mon May 30 09:56:03 2022
+++ src/sys/arch/x68k/x68k/locore.s Thu Jun 27 19:27:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.121 2022/05/30 09:56:03 andvar Exp $ */
+/* $NetBSD: locore.s,v 1.121.4.1 2024/06/27 19:27:28 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -628,9 +628,6 @@ Lbrkpt3:
movl %sp@,%sp | ... and %sp
rte | all done
-/* Use common m68k sigreturn */
-#include <m68k/m68k/sigreturn.s>
-
/*
* Provide a generic interrupt dispatcher, only handle hardclock (int6)
* specially, to improve performance
