Remove RISCOS platform support. (#39)

2026-02-26 16:53:30 +00:00 · 2020-12-14 08:38:57 +07:00
parent 7313de4274
commit 7119613aee
12 changed files with 7 additions and 139 deletions
--- a/bin/compile-flags
+++ b/bin/compile-flags
@@ -30,7 +30,6 @@ sparc		True if we're compiling on a SPARC machine.
 mc68020		True if we're compiling on a Motorola 680x0 machine.
 sun3		We're compiling for a Sun-3.
 RS6000		We're compiling for the RS/6000 processor.
-RISCOS		We're compiling for the MIPS RISCstation under RISCOS.

 UNSAFE		If true, enables the "fast" version of 68020 opcodes.
 NOASM		If true, suppress any attempt to include assembler
--- a/bin/makefile-riscos.mips-x
+++ b/bin/makefile-riscos.mips-x
@@ -1,81 +0,0 @@
-# Options for RISCOS, and X-Window
-
-
-# CC = gcc
-
-# CLXFLAGS = -DCLX -DTCP_NODELAY
-
-# CLXFILES = $(OBJECTDIR)socket.o \
-#           $(OBJECTDIR)socketdvr.o
-
-
-XFILES = $(OBJECTDIR)XClose.o \
-	$(OBJECTDIR)Cursor.o \
-	$(OBJECTDIR)XWindow.o \
-	$(OBJECTDIR)DoRing.o \
-	$(OBJECTDIR)DoScroll.o \
-	$(OBJECTDIR)XEvent.o \
-	$(OBJECTDIR)XGravity.o \
-	$(OBJECTDIR)XInit.o \
-	$(OBJECTDIR)Xinit.o \
-	$(OBJECTDIR)Xkbdmus.o \
-	$(OBJECTDIR)Xlspwin.o \
-        $(OBJECTDIR)Xbbt.o \
-	$(OBJECTDIR)Xkbd.o \
-	$(OBJECTDIR)Xmkicon.o \
-	$(OBJECTDIR)Xopendsp.o \
-	$(OBJECTDIR)Xrdopt.o \
-	$(OBJECTDIR)Xreconf.o \
-	$(OBJECTDIR)XScroll.o \
-	$(OBJECTDIR)Xscrolb.o \
-	$(OBJECTDIR)XCursor.o \
-	$(OBJECTDIR)XMouse.o \
-	$(OBJECTDIR)Xsubwin.o \
-	$(OBJECTDIR)Xcolor.o \
-	$(OBJECTDIR)Xwinman.o \
-	$(CLXFILES)  
-
-BYTESWAPFILES = $(OBJECTDIR)byteswap.o
-
-XVERSION = XV11R4
-XFLAGS = -DXWINDOW -D$(XVERSION) $(CLXFLAGS)
-
-# This is to make the %$#@! Apollo cc happy
-OEXT = .o
-# OPTFLAGS is normally -O; the Olimit lets us optimize the BIG files
-#                          (i.e., bitblt* and xc).
-OPTFLAGS = -O -Olimit 1000
-DISPOPTFLAGS = -O -Olimit 1000 
-FPFLAGS =
-DFLAGS =   -DFSERROR \
-	-DNEW_STORAGE -DAIX -DOLD_CURSOR -DNOPIXRECT -DRISCOS \
-	-DSYSVSIGNALS -DSYSVONLY  \
-	-DBIGATOMS -DFORKCOMM -DLOGINT -DSYS5 -DNOETHER -DNOFORN \
-	$(XFLAGS) -I/usr/include -I/usr/include/bsd 
-LDFLAGS = -lX11 -lc -lm -lbsd
-LDELDFLAGS = $(LDFLAGS)
-
-MAIN = main
-
-# -Dsparc?
-INLINE = 
-
-
-OBJECTDIR = ../$(RELEASENAME)/
-
-default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether
-
-# Special rules to create xc.c on MIPS RISCstation.
-
-#run cpp to expand macros
-$(OBJECTDIR)xc.o:	$(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emulglobal.h  $(INCDIR)address.h \
-	 $(INCDIR)address68k.h  $(INCDIR)stack.h  $(INCDIR)lispglobal.h \
-	 $(INCDIR)lisptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
-	 $(INCDIR)initatoms.h  $(INCDIR)gcdata.h  \
-	 $(INCDIR)arith.h $(INCDIR)stream.h \
-	 $(INCDIR)tos1defs.h  $(INCDIR)tosretmacro.h \
-	 $(INCDIR)tosfuncall.h  $(INCDIR)inlineC.h   \
-	 $(INCDIR)inline68K.h
-	$(CC) -c $(DISPOPTFLAGS)  $(DFLAGS) -I$(INCDIR) $(SRCDIR)xc.c -o  $(OBJECTDIR)xc.o
-
-
--- a/inc/medleyfp.h
+++ b/inc/medleyfp.h
@@ -20,13 +20,6 @@
 #include <i32.h>
 #endif /* DOS */

-#ifdef RISCOS
-/*#include <ieeefp.h> */
-/*#define isnan isnand */
-#define isnan(x) 0
-#endif /* RISCOS */
-
-
 /*  --------------------------------------------------
    FPCLEAR         - clear status as necessary
    FPTEST(result)  - check result or status
--- a/inc/version.h
+++ b/inc/version.h
@@ -247,18 +247,6 @@ typedef signed char s_char;



-	/********************************************************/
-	/*							*/
-	/********************************************************/
-#ifdef RISCOS
-typedef signed char s_char;
-#undef UNALIGNED_FETCH_OK
-#define USE_UTIME
-#define LOCK_X_UPDATES 1
-#endif
-
-
-
 	/********************************************************/
 	/*							*/
 	/********************************************************/
--- a/src/dir.c
+++ b/src/dir.c
@@ -33,11 +33,6 @@ static char *id = "$Id: dir.c,v 1.4 2001/12/26 22:17:01 sybalsky Exp $ Copyright
 #include <string.h>
 #endif /* LINUX */

-#ifdef RISCOS
-#include <dirent.h>
-#define direct dirent
-#endif /* RISCOS */
-
 #ifdef ISC
 #include <dirent.h>
 #include <unistd.h>
--- a/src/dsk.c
+++ b/src/dsk.c
@@ -55,13 +55,6 @@ static char *id = "$Id: dsk.c,v 1.4 2001/12/24 01:09:01 sybalsky Exp $ Copyright
 #define alarm(x) 0
 #endif /* DOS */

-#ifdef RISCOS
-#include <dirent.h>
-#include <unistd.h>
-#define direct dirent
-#define d_namlen d_reclen
-#endif /* RISCOS */
-
 #ifdef OS5
 #define index strchr
 #define rindex strrchr
--- a/src/ldsout.c
+++ b/src/ldsout.c
@@ -58,10 +58,10 @@ extern int errno;
  is going to expand or not */
 int Storage_expanded; /*  T or NIL */

-/* RISCOS doesn't have valloc, and malloc works OK there. */
-#if defined(SYSVONLY) || defined(RISCOS)
+/* This used to be ifdef for RISCOS and OSF/1. */
+#if defined(SYSVONLY)
 #define valloc malloc
-#endif /* SYSVONLY || RISCOS */
+#endif /* SYSVONLY */

 /************************************************************************/
 /*									*/
--- a/src/main.c
+++ b/src/main.c
@@ -63,10 +63,6 @@ static char *id = "$Id: main.c,v 1.4 2001/12/26 22:17:03 sybalsky Exp $ Copyrigh
 #include <pwd.h>
 #endif /* DOS */

-#ifdef RISCOS
-#include <unistd.h>
-#endif /* RISCOS */
-
 #ifdef ISC
 #include <unistd.h>
 #include <sys/dirent.h>
--- a/src/mkvdate.c
+++ b/src/mkvdate.c
@@ -33,15 +33,13 @@ static char *id = "$Id: mkvdate.c,v 1.5 2001/12/26 22:17:03 sybalsky Exp $ Copyr
 #endif

 #include <stdio.h>
-#ifdef USETIMEFN
-#include <time.h>
-#elif DOS
+#ifdef DOS
 #include <time.h>
 #else
 #include <sys/time.h>
-#endif /* USETIMEFN */
+#endif /* DOS */

-#ifdef USETIMEFN
+#ifdef DOS
 /* RISCOS doesn't have the BSD time functions */
 int main(void) {
  long dtime;
--- a/src/unixcomm.c
+++ b/src/unixcomm.c
@@ -936,16 +936,13 @@ LispPTR Unix_handlecomm(LispPTR *args) {
    case 10: /* Change window */
    {
      int rows, cols, pgrp, pty;
-#if !defined(RISCOS)
      struct winsize w;
-#endif /* !RISCOS */

      /* Get job #, rows, columns */
      N_GETNUMBER(args[1], slot, bad);
      N_GETNUMBER(args[2], rows, bad);
      N_GETNUMBER(args[3], cols, bad);

-#if !defined(RISCOS)
      if (valid_slot(slot) && (UJ[slot].type == UJSHELL) && (UJ[slot].status == -1)) {
        w.ws_row = rows;
        w.ws_col = cols;
@@ -965,12 +962,11 @@ LispPTR Unix_handlecomm(LispPTR *args) {
            (kill(-pgrp, SIGWINCH) >= 0))
 #else
            (killpg(pgrp, SIGWINCH) >= 0))
-#endif /* RISCOS */
+#endif /* SYSVONLY */

          return (ATOM_T);
        return (GetSmallp(errno));
      }
-#endif /* !RISCOS */

      return (NIL);
    }
--- a/src/unixfork.c
+++ b/src/unixfork.c
@@ -59,11 +59,6 @@ static char *id = "$Id: unixfork.c,v 1.6 2001/12/26 22:17:05 sybalsky Exp $ Copy

 #include <sys/un.h>

-#ifdef RISCOS
-/* #include <sys/un.h> */
-#include <sgtty.h>
-#endif /* RISCOS */
-
 #include "unixfork.h"

 #ifdef DEBUG
--- a/src/uutils.c
+++ b/src/uutils.c
@@ -239,8 +239,6 @@ LispPTR unix_getparm(LispPTR *args) {
    envvalue = "rs/6000";
 #elif defined(ISC)
    envvalue = "i386";
-#elif defined(RISCOS)
-    envvalue = "mips";
 #elif defined(DOS)
    envvalue = "386";
 #elif defined(MACOSX)
@@ -258,8 +256,6 @@ LispPTR unix_getparm(LispPTR *args) {
    envvalue = "rs/6000";
 #elif defined(ISC)
    envvalue = "i386";
-#elif defined(RISCOS)
-    envvalue = "mips";
 #elif defined(DOS)
    envvalue = "dos";
 #elif defined(MACOSX)