Module Name: src
Committed By: andvar
Date: Fri Oct 6 21:10:12 UTC 2023
Modified Files:
src/sys/arch/news68k/conf: Makefile.news68k
src/sys/arch/news68k/news68k: locore.s vectors.s
Log Message:
Remove fpsp include and #ifdef FPSP blocks for news68k.
FPSP is necessary for 040/060 only, and news68k doesn't have such hardware.
Noted by Izumi Tsutsui.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/news68k/conf/Makefile.news68k
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/news68k/news68k/locore.s
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/news68k/news68k/vectors.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/news68k/conf/Makefile.news68k
diff -u src/sys/arch/news68k/conf/Makefile.news68k:1.23 src/sys/arch/news68k/conf/Makefile.news68k:1.24
--- src/sys/arch/news68k/conf/Makefile.news68k:1.23 Sun Oct 1 18:50:53 2023
+++ src/sys/arch/news68k/conf/Makefile.news68k Fri Oct 6 21:10:12 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.news68k,v 1.23 2023/10/01 18:50:53 andvar Exp $
+# $NetBSD: Makefile.news68k,v 1.24 2023/10/06 21:10:12 andvar Exp $
#
# Makefile for NetBSD
#
@@ -46,8 +46,6 @@ OPT_MODULAR= %MODULAR%
##
## (4) local objects, compile rules, and dependencies
##
-# for the Motorola 68040 Floating Point Software Product
-.include "$S/arch/m68k/fpsp/Makefile.inc"
MD_OBJS= locore.o
MD_LIBS= ${FPSP}
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.69
--- src/sys/arch/news68k/news68k/locore.s:1.68 Mon May 30 09:56:03 2022
+++ src/sys/arch/news68k/news68k/locore.s Fri Oct 6 21:10:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.68 2022/05/30 09:56:03 andvar Exp $ */
+/* $NetBSD: locore.s,v 1.69 2023/10/06 21:10:12 andvar Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -44,7 +44,6 @@
#include "opt_compat_netbsd.h"
#include "opt_compat_sunos.h"
-#include "opt_fpsp.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_lockdebug.h"
Index: src/sys/arch/news68k/news68k/vectors.s
diff -u src/sys/arch/news68k/news68k/vectors.s:1.7 src/sys/arch/news68k/news68k/vectors.s:1.8
--- src/sys/arch/news68k/news68k/vectors.s:1.7 Sun Mar 6 14:54:47 2011
+++ src/sys/arch/news68k/news68k/vectors.s Fri Oct 6 21:10:12 2023
@@ -1,4 +1,4 @@
-| $NetBSD: vectors.s,v 1.7 2011/03/06 14:54:47 tsutsui Exp $
+| $NetBSD: vectors.s,v 1.8 2023/10/06 21:10:12 andvar Exp $
| Copyright (c) 1997 Jason R. Thorpe. All rights reserved.
| Copyright (c) 1988 University of Utah
@@ -109,15 +109,6 @@ GLOBAL(vectab)
VECTOR(illinst) /* 45: TRAP instruction vector */
VECTOR(illinst) /* 46: TRAP instruction vector */
VECTOR(trap15) /* 47: TRAP instruction vector */
-#ifdef FPSP
- ASVECTOR(bsun) /* 48: FPCP branch/set on unordered cond */
- ASVECTOR(inex) /* 49: FPCP inexact result */
- ASVECTOR(dz) /* 50: FPCP divide by zero */
- ASVECTOR(unfl) /* 51: FPCP underflow */
- ASVECTOR(operr) /* 52: FPCP operand error */
- ASVECTOR(ovfl) /* 53: FPCP overflow */
- ASVECTOR(snan) /* 54: FPCP signalling NAN */
-#else
VECTOR(fpfault) /* 48: FPCP branch/set on unordered cond */
VECTOR(fpfault) /* 49: FPCP inexact result */
VECTOR(fpfault) /* 50: FPCP divide by zero */
@@ -125,8 +116,6 @@ GLOBAL(vectab)
VECTOR(fpfault) /* 52: FPCP operand error */
VECTOR(fpfault) /* 53: FPCP overflow */
VECTOR(fpfault) /* 54: FPCP signalling NAN */
-#endif
-
VECTOR(fpunsupp) /* 55: FPCP unimplemented data type */
VECTOR(badtrap) /* 56: unassigned, reserved */
VECTOR(badtrap) /* 57: unassigned, reserved */
