From 750d84c78c82bc29e7b7108cc20e8880824ad54f Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sun, 13 Dec 2020 09:57:07 +0700 Subject: [PATCH] Remove SGI Irix platform support. (#33) This platform had no emulation-related changes. Remove code for IRIX40, INDIGO definitions. In disk code, simplify a chain of #ifdef's around fsync handling. --- bin/makefile-init.sgi | 95 -------------------------------- bin/makefile-irix.sgi-x | 107 ------------------------------------ bin/usermakefile-irix.sgi | 0 bin/usermakefile-irix.sgi-x | 0 inc/medleyfp.h | 5 -- inc/nfswatch.h | 7 --- inc/os.h | 8 --- inc/version.h | 16 +----- src/dir.c | 4 -- src/dsk.c | 14 +---- src/keytst.c | 2 - src/mnwevent.c | 5 -- src/ufs.c | 3 - src/unixcomm.c | 12 +--- src/unixfork.c | 22 +------- src/uraid.c | 4 -- src/uutils.c | 4 -- 17 files changed, 10 insertions(+), 298 deletions(-) delete mode 100644 bin/makefile-init.sgi delete mode 100644 bin/makefile-irix.sgi-x delete mode 100755 bin/usermakefile-irix.sgi delete mode 100755 bin/usermakefile-irix.sgi-x diff --git a/bin/makefile-init.sgi b/bin/makefile-init.sgi deleted file mode 100644 index 5b6d0ef..0000000 --- a/bin/makefile-init.sgi +++ /dev/null @@ -1,95 +0,0 @@ -# -# -#************************************************************************/ -#* */ -#* (C) Copyright 1991 Venue. All Rights Reserved. */ -#* Manufactured in the United States of America. */ -#* */ -#************************************************************************/ - -# Options for SGI Indigo under IRIX operating system, X windows. - - -XFILES = $(OBJECTDIR)xlspwin.o \ - $(OBJECTDIR)xbbt.o \ - $(OBJECTDIR)xmkicon.o \ - $(OBJECTDIR)xrdopt.o \ - $(OBJECTDIR)xscroll.o \ - $(OBJECTDIR)xcursor.o \ - $(OBJECTDIR)xwinman.o \ - $(OBJECTDIR)dspif.o \ - $(OBJECTDIR)kbdif.o \ - $(OBJECTDIR)xinit.o - -### XFILES used to include: - -#XFILES = $(OBJECTDIR)XClose.o \ - $(OBJECTDIR)Cursor.o \ - $(OBJECTDIR)XWindow.o \ - $(OBJECTDIR)Xkbd.o \ - $(OBJECTDIR)Xreconf.o \ - $(OBJECTDIR)Xscrolb.o \ - $(OBJECTDIR)DoRing.o \ - $(OBJECTDIR)DoScroll.o \ - $(OBJECTDIR)XEvent.o \ - $(OBJECTDIR)Xsubwin.o \ - $(OBJECTDIR)XGravity.o \ - $(OBJECTDIR)XInit.o \ - $(OBJECTDIR)Xevinit.o \ - $(OBJECTDIR)Xkbdmus.o \ - $(OBJECTDIR)Xopendsp.o \ - $(OBJECTDIR)XMouse.o \ - $(OBJECTDIR)Xcolor.o \ - - -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -D$(XVERSION) - -# This is to make the %$#@! Apollo cc happy -OEXT = .o -# OPTFLAGS is normally -O -OPTFLAGS = -g -DISPOPTFLAGS = -g -FPFLAGS = -DFLAGS = -DFSERROR -DNEW_STORAGE -DAIX -DFORKCOMM -DLOGINT $(XFLAGS) \ - -D_IEEE -DINDIGO -DSYSVONLY -DNOETHER -DNOPIXRECT -DSYSVSIGNALS -DNOFORN \ - -DNOASM -DBIGATOMS -DINIT -DNOVERSION -DBIGVM -DNEWCDRCODING -LDFLAGS = -L/usr/lib/X11R4 -L/d/scsistr2/guest/gcc2 -lsun -lX11 -lm -LDELDFLAGS = $(LDFLAGS) -# -Dsparc? - -CC = cc -RANLIB = touch -MAIN = main - -INLINE = -BITBLTFILE = -BYTESWAPFILES = $(OBJECTDIR)byteswap.o - -OBJECTDIR = ../$(RELEASENAME)/ - -default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether - -# Special rules to create xc.c on HP/Apollo Series 700 or 800 - -#run cpp to expand macros -$(OBJECTDIR)xc.o: $(SRCDIR)xc.c $(INCDIR)lispemul.h $(INCDIR)emlglob.h $(INCDIR)address.h \ - $(INCDIR)adr68k.h $(INCDIR)stack.h $(INCDIR)lspglob.h \ - $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)cell.h \ - $(INCDIR)initatms.h $(INCDIR)gcdata.h \ - $(INCDIR)arith.h $(INCDIR)stream.h \ - $(INCDIR)tos1defs.h $(INCDIR)tosret.h \ - $(INCDIR)tosfns.h $(INCDIR)inlineC.h \ - $(INCDIR)inln68k.h - $(CC) -c $(DISPOPTFLAGS) $(DFLAGS) -I$(INCDIR) $(SRCDIR)xc.c -o $(OBJECTDIR)xc.o - -#$(OBJECTDIR)xc.o: $(SRCDIR)xc.i $(INCDIR)lispemul.h $(INCDIR)emlglob.h $(INCDIR)address.h \ -# $(INCDIR)adr68k.h $(INCDIR)stack.h $(INCDIR)lspglob.h \ -# $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)cell.h \ -# $(INCDIR)initatms.h $(INCDIR)gcdata.h \ -# $(INCDIR)arith.h $(INCDIR)stream.h \ -# $(INCDIR)tos1defs.h $(INCDIR)tosret.h \ -# $(INCDIR)tosfns.h $(INCDIR)inlineC.h \ -# $(INCDIR)inln68k.h -# $(CC) -c $(DISPOPTFLAGS) $(SRCDIR)xc.i -o $(OBJECTDIR)xc.o - diff --git a/bin/makefile-irix.sgi-x b/bin/makefile-irix.sgi-x deleted file mode 100644 index e0adf43..0000000 --- a/bin/makefile-irix.sgi-x +++ /dev/null @@ -1,107 +0,0 @@ -# -#************************************************************************/ -#* */ -#* (C) Copyright 1991 Venue. All Rights Reserved. */ -#* Manufactured in the United States of America. */ -#* */ -#************************************************************************/ - -# Options for SGI Indigo under IRIX operating system, X windows. - -ANSICC = gcc - -XFILES = $(OBJECTDIR)xmkicon.o \ - $(OBJECTDIR)xbbt.o \ - $(OBJECTDIR)dspif.o \ - $(OBJECTDIR)xinit.o \ - $(OBJECTDIR)xscroll.o \ - $(OBJECTDIR)xcursor.o \ - $(OBJECTDIR)xlspwin.o \ - $(OBJECTDIR)xrdopt.o \ - $(OBJECTDIR)xwinman.o - -OLDXFILES = $(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)Xevinit.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 - -LPFILES = $(OBJECTDIR)lpmain.o \ - $(OBJECTDIR)lpread.o \ - $(OBJECTDIR)lpsolve.o \ - $(OBJECTDIR)lpkit.o -# $(OBJECTDIR)lptran.o \ -# $(OBJECTDIR)lpdual.o \ -# $(OBJECTDIR)lpwrite.o - -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -D$(XVERSION) - -# This is to make the %$#@! Apollo cc happy -OEXT = .o -# OPTFLAGS is normally -O2 -Olimit 1600 -OPTFLAGS = -O2 -Olimit 1600 -ANSIOPTFLAGS = -O4 -DISPOPTFLAGS = -O2 -Olimit 1600 -FPFLAGS = -DFLAGS = -DFSERROR -DNEW_STORAGE -DAIX -DFORKCOMM -DLOGINT $(XFLAGS)\ - -D_IEEE -DINDIGO -DSYSVONLY -DNOETHER -DNOPIXRECT -DSYSVSIGNALS -DNOFORN \ - -DNOASM -DBIGATOMS -DLPSOLVE -DNOVERSION -DBIGVM -DNEWCDRCODING -LDFLAGS = -L/usr/lib/X11R4 -L/d/scsistr2/guest/gcc2 -lX11 -ll -lm -ly -lsun -LDELDFLAGS = $(LDFLAGS) -# -Dsparc? - -CC = cc -RANLIB = touch -MAIN = main - -INLINE = -BITBLTFILE = -BYTESWAPFILES = $(OBJECTDIR)byteswap.o - -OBJECTDIR = ../$(RELEASENAME)/ - -default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether - -# Special rules to create xc.c on HP/Apollo Series 700 or 800 - -#run cpp to expand macros -$(OBJECTDIR)xc.o: $(SRCDIR)xc.c $(INCDIR)lispemul.h $(INCDIR)emlglob.h $(INCDIR)address.h \ - $(INCDIR)adr68k.h $(INCDIR)stack.h $(INCDIR)lspglob.h \ - $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)cell.h \ - $(INCDIR)initatms.h $(INCDIR)gcdata.h \ - $(INCDIR)arith.h $(INCDIR)stream.h \ - $(INCDIR)tos1defs.h $(INCDIR)tosret.h \ - $(INCDIR)tosfns.h $(INCDIR)inlineC.h \ - $(INCDIR)inln68k.h - $(CC) -c $(DISPOPTFLAGS) $(DFLAGS) -I$(INCDIR) $(SRCDIR)xc.c -o $(OBJECTDIR)xc.o - -#$(OBJECTDIR)xc.o: $(SRCDIR)xc.i $(INCDIR)lispemul.h $(INCDIR)emlglob.h $(INCDIR)address.h \ -# $(INCDIR)adr68k.h $(INCDIR)stack.h $(INCDIR)lspglob.h \ -# $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)cell.h \ -# $(INCDIR)initatms.h $(INCDIR)gcdata.h \ -# $(INCDIR)arith.h $(INCDIR)stream.h \ -# $(INCDIR)tos1defs.h $(INCDIR)tosret.h \ -# $(INCDIR)tosfns.h $(INCDIR)inlineC.h \ -# $(INCDIR)inln68k.h -# $(CC) -c $(DISPOPTFLAGS) $(SRCDIR)xc.i -o $(OBJECTDIR)xc.o - diff --git a/bin/usermakefile-irix.sgi b/bin/usermakefile-irix.sgi deleted file mode 100755 index e69de29..0000000 diff --git a/bin/usermakefile-irix.sgi-x b/bin/usermakefile-irix.sgi-x deleted file mode 100755 index e69de29..0000000 diff --git a/inc/medleyfp.h b/inc/medleyfp.h index 121faec..6b30778 100755 --- a/inc/medleyfp.h +++ b/inc/medleyfp.h @@ -72,11 +72,6 @@ volatile extern int FP_error; #define FPCLEAR #define FPTEST(result) (!FINITE(result)) -#elif defined(INDIGO) -#include -#define FPCLEAR -#define FPTEST(result) (IsNANorINF(result)) - #elif defined(AIX) #define FPCLEAR #define FPTEST(result) ((!finite(result)) || isnan(result)) diff --git a/inc/nfswatch.h b/inc/nfswatch.h index f659596..e74594a 100755 --- a/inc/nfswatch.h +++ b/inc/nfswatch.h @@ -195,13 +195,6 @@ typedef u_int32 ipaddrt; #define PFILT_CHUNKSIZE 8192 /* chunk size for grabbing pkts */ #endif -/* - * Snoop definitions. - */ -#ifdef USE_SNOOP -#define SNOOP_BUFFER_SIZE (55 * 1024) /* for grabbing packets */ -#endif - /* * Data Link Provider Interface (DLPI) definitions. */ diff --git a/inc/os.h b/inc/os.h index 3acaeea..6a577ae 100755 --- a/inc/os.h +++ b/inc/os.h @@ -54,14 +54,6 @@ * Initial revision * */ -#ifdef IRIX40 -#ifndef USE_SNOOP -#define USE_SNOOP 1 -#endif -#define signal sigset -#define U_INT32_DECLARED_IN_AUTH 1 -#endif - #ifdef OS4 #ifndef USE_NIT #define USE_NIT 1 diff --git a/inc/version.h b/inc/version.h index 64288a3..1ea0a99 100755 --- a/inc/version.h +++ b/inc/version.h @@ -316,18 +316,6 @@ typedef signed char s_char; - /********************************************************/ - /* */ - /********************************************************/ -#ifdef INDIGO -typedef signed char s_char; -#undef UNALIGNED_FETCH_OK -#undef REGISTER -#define REGISTER -#endif /* INDIGO */ - - - /********************************************************/ /* */ /********************************************************/ @@ -433,10 +421,10 @@ typedef unsigned short u_short; #ifdef SYSVONLY -#if defined(INDIGO) || defined(OS5) || defined(MACOSX) || defined(FREEBSD) || defined(LINUX) +#if defined(OS5) || defined(MACOSX) || defined(FREEBSD) || defined(LINUX) #else #define seteuid(x) setresuid(-1, (x), -1) -#endif /* INDIGO, OS5, MACOSX, FREEBSD, LINUX do have seteuid */ +#endif /* OS5, MACOSX, FREEBSD, LINUX do have seteuid */ #if !defined(LINUX) && !defined(MACOSX) && !defined(FREEBSD) /* these are in the POSIX standard */ diff --git a/src/dir.c b/src/dir.c index 63e1a5b..140f1fb 100644 --- a/src/dir.c +++ b/src/dir.c @@ -33,10 +33,6 @@ static char *id = "$Id: dir.c,v 1.4 2001/12/26 22:17:01 sybalsky Exp $ Copyright #include #endif /* LINUX */ -#ifdef INDIGO -#include -#endif - #ifdef RISCOS #include #define direct dirent diff --git a/src/dsk.c b/src/dsk.c index d473130..e6a632e 100644 --- a/src/dsk.c +++ b/src/dsk.c @@ -2212,16 +2212,9 @@ LispPTR COM_truncatefile(register LispPTR *args) * TRUNCATEFILE FDEV method is invoked from FORCEOUTPUT Lisp function. * Thus we have to sync the file state here. */ -#ifdef INDIGO +#ifndef DOS TIMEOUT(rval = fsync(fd)); -#elif OS5 - TIMEOUT(rval = fsync(fd)); -#elif DOS -#elif SYSVONLY - TIMEOUT(rval = fsync(fd)); -#else - TIMEOUT(rval = fsync(fd)); -#endif /* INDIGO */ +#endif if (rval != 0) { *Lisp_errno = errno; @@ -2446,9 +2439,6 @@ LispPTR COM_getfreeblock(register LispPTR *args) #elif HPUX TIMEOUT(rval = statfs(dir, &sfsbuf)); if (rval != 0) { -#elif INDIGO - TIMEOUT(rval = statfs(dir, &sfsbuf, sizeof(struct statfs), 0)); - if (rval != 0) { #elif defined(SYSVONLY) TIMEOUT(rval = statfs(dir, &sfsbuf, sizeof(struct statfs), 0)); if (rval != 0) { diff --git a/src/keytst.c b/src/keytst.c index ded9ffd..a871f3e 100644 --- a/src/keytst.c +++ b/src/keytst.c @@ -110,8 +110,6 @@ int read_hex(char *s1, long unsigned int *array) { /* convert key to numeric format*/ #ifdef HPUX *(array + i) = strtoul(ptr, NULL, 16); /* On HP, must convert to unsigned */ -#elif defined(INDIGO) - *(array + i) = strtoul(ptr, NULL, 16); /* On Indigo, must convert to unsigned */ #elif defined(RS6000) *(array + i) = strtoul(ptr, NULL, 16); /* On RS/6000, must convert to unsigned */ #elif defined(OSF1) diff --git a/src/mnwevent.c b/src/mnwevent.c index f768aba..54b5e2e 100644 --- a/src/mnwevent.c +++ b/src/mnwevent.c @@ -255,12 +255,7 @@ void HandleStructure(Widget widget, WindowInterface wif, XAnyEvent *xevent, Bool l = ev->x; b = ev->y; -#ifdef INDIGO - /* apparent bug in SGI's x server */ - if ((!xevent->send_event) && (l == 0) && (b == 0)) -#else if ((!xevent->send_event)) -#endif /* INDIGO */ { Window parent, root, *children; int nch; diff --git a/src/ufs.c b/src/ufs.c index 1415d2b..8830ffb 100644 --- a/src/ufs.c +++ b/src/ufs.c @@ -20,8 +20,6 @@ static char *id = "$Id: ufs.c,v 1.2 1999/01/03 02:07:41 sybalsky Exp $ Copyright #endif /* SYSVONLY */ #include -#ifndef INDIGO -/* Indigo has this duplicated in dirent.h, sigh. */ #ifndef OS5 #ifndef HPUX #ifndef FREEBSD @@ -29,7 +27,6 @@ static char *id = "$Id: ufs.c,v 1.2 1999/01/03 02:07:41 sybalsky Exp $ Copyright #endif #endif #endif -#endif /* INDIGO */ #include #include diff --git a/src/unixcomm.c b/src/unixcomm.c index 62c8a40..a824f16 100644 --- a/src/unixcomm.c +++ b/src/unixcomm.c @@ -20,11 +20,9 @@ Unix Interface Communications #ifndef DOS /* FULLSLAVENAME => use a full file name for slave PTY */ -#ifdef INDIGO +#ifdef OS5 #define FULLSLAVENAME -#elif OS5 -#define FULLSLAVENAME -#endif /* INDIGO or OS5 */ +#endif /* OS5 */ /* JRB - timeout.h needs setjmp.h */ #include @@ -356,12 +354,8 @@ int FindUnixPipes(void) { int FindAvailablePty(char *Master, char *Slave) { int res, flags; char *let, *num; -#ifdef INDIGO - - let = (char *)_getpty(&res, O_RDWR | O_NDELAY, 0600, 0); - strcpy(Slave, let); -#elif OS5 +#ifdef OS5 res = open("/dev/ptmx", O_RDWR); if (res < 0) { perror("ptmx open"); diff --git a/src/unixfork.c b/src/unixfork.c index e20913e..e05cf4c 100644 --- a/src/unixfork.c +++ b/src/unixfork.c @@ -31,22 +31,15 @@ static char *id = "$Id: unixfork.c,v 1.6 2001/12/26 22:17:05 sybalsky Exp $ Copy #define FULLSLAVENAME #endif -#ifdef INDIGO -#define USETERMIOS -#define TCSETS TCSETA -#define TCGETS TCGETA -#define FULLSLAVENAME -#endif - #include #ifndef USETERMIOS #include #else -#if defined(INDIGO) || defined(MACOSX) || defined(FREEBSD) +#if defined(MACOSX) || defined(FREEBSD) #include #else #include -#endif /* INDIGO */ +#endif /* MACOSX or FREEBSD */ #endif /* USETERMIOS */ #ifdef OSF1 @@ -83,11 +76,6 @@ typedef int clockid_t; #include #endif /* RISCOS */ -#ifdef INDIGO -/* #include */ -#include -#endif - #include "unixfork.h" #ifdef DEBUG @@ -199,11 +187,7 @@ int ForkUnixShell(int slot, char ltr, char numb, char *termtype, char *shellarg) #else ioctl(SlaveFD, TCGETS, (char *)&tio); #endif -#ifdef INDIGO - tio.c_lflag |= ICANON | ECHO | ECHOE; -#else tio.c_lflag |= ICANON | ECHO | ECHOE | ECHOCTL | ECHOKE; -#endif /* INDIGO */ #if defined(MACOSX) || defined(FREEBSD) tcsetattr(SlaveFD, TCSANOW, &tio); #else @@ -405,7 +389,7 @@ int fork_Unix() { if (SAFEREAD(LispPipeIn, (char *)&tmp, 2) < 0) perror("Slave reading slave pty len"); if (SAFEREAD(LispPipeIn, slavepty, tmp) < 0) perror("Slave reading slave pty id"); -#endif /* INDIGO */ +#endif /* FULLSLAVENAME */ if (IOBuf[0] == 'P') { /* The new style, which takes term type & command to csh */ if (SAFEREAD(LispPipeIn, (char *)&tmp, 2) < 0) perror("Slave reading cmd length"); diff --git a/src/uraid.c b/src/uraid.c index b952336..11c6e3e 100644 --- a/src/uraid.c +++ b/src/uraid.c @@ -29,10 +29,6 @@ static char *id = "@(#) uraid.c 1.52 4/23/92 (Venue & Fuji Xerox)"; #define vfork fork #endif /* ISC */ -#ifdef INDIGO -#define vfork fork -#endif /* INDIGO */ - #include #ifndef DOS #include diff --git a/src/uutils.c b/src/uutils.c index 5d34386..0369fe3 100644 --- a/src/uutils.c +++ b/src/uutils.c @@ -242,8 +242,6 @@ LispPTR unix_getparm(LispPTR *args) { envvalue = "hp9000"; #elif defined(ISC) envvalue = "i386"; -#elif defined(INDIGO) - envvalue = "mips"; #elif defined(RISCOS) envvalue = "mips"; #elif defined(DOS) @@ -265,8 +263,6 @@ LispPTR unix_getparm(LispPTR *args) { envvalue = "hp9000"; #elif defined(ISC) envvalue = "i386"; -#elif defined(INDIGO) - envvalue = "mips"; #elif defined(RISCOS) envvalue = "mips"; #elif defined(DOS)