From 292809694e266bfec2b2e0d2d03862855fb53aa6 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sun, 13 Dec 2020 09:07:08 +0700 Subject: [PATCH] Remove platform support for Apollo/Domain. (#30) --- bin/compile-flags | 1 - bin/makefile-domain.mc68020-x | 74 ----------------------------------- inc/lpglob.h | 4 +- inc/lpglobl.h | 4 +- inc/medleyfp.h | 14 ------- inc/version.h | 10 ----- src/dsk.c | 9 ----- src/gcarray.c | 9 ----- src/keyevent.c | 2 +- src/keytst.c | 2 - src/osmsg.c | 2 - src/timer.c | 5 --- src/ufs.c | 2 - src/unixcomm.c | 2 - src/xinit.c | 2 - 15 files changed, 5 insertions(+), 137 deletions(-) delete mode 100644 bin/makefile-domain.mc68020-x diff --git a/bin/compile-flags b/bin/compile-flags index a512442..5bca3cf 100755 --- a/bin/compile-flags +++ b/bin/compile-flags @@ -26,7 +26,6 @@ NOPIXRECT Used to suppress pixrect/pixwin options when they're not AIX True if compiling for AIX AIXPS2 True if compiling for PS/2 under AIX (our flag) -APOLLO True if compiling for the Apollo 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. diff --git a/bin/makefile-domain.mc68020-x b/bin/makefile-domain.mc68020-x deleted file mode 100644 index 6d309df..0000000 --- a/bin/makefile-domain.mc68020-x +++ /dev/null @@ -1,74 +0,0 @@ -# Options for Domain/OS, APOLLO Workstation 680x0, and X-Window - -CLXFLAGS = -DCLX -DTCP_NODELAY - -CLXFILES = $(OBJECTDIR)socket.o \ - $(OBJECTDIR)socdvr.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) - -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -DNOPIXRECT -D$(XVERSION) $(CLXFLAGS) - -# This is to make the %$#@! Apollo cc happy -OEXT = .o -# OPTFLAGS is normally -O2. -OPTFLAGS = -g -O -W0,-natural -DISPOPTFLAGS = -g -O -W0,-natural -FPFLAGS = -DFLAGS = -DAPOLLO -DFSERROR -DNEW_STORAGE -DNOFORN \ - -DFORKCOMM -DLOGINT -DBIGATOMS $(XFLAGS) \ - -DNOETHER -DNOASM -DNOEUROKBD - -LDFLAGS = -lX11 -lc -lm -LDELDFLAGS = -lX11 -lc -lm -MAIN = main - -INLINE = # $(SRCDIR)dsp68K.il -BITBLTFILE = # $(OBJECTDIR)bbt68k.o -BYTESWAPFILES = $(OBJECTDIR)byteswap.o - -OBJECTDIR = ../$(RELEASENAME)/ - -default : ../$(OSARCHNAME)/lde # ../$(OSARCHNAME)/ldeether - -# Special rules to create xc.c on Apollo - -#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 - $(CC) -c $(DISPOPTFLAGS) $(DFLAGS) -I$(INCDIR) $(SRCDIR)xc.c -o $(OBJECTDIR)xc.o - -#$(OBJECTDIR)xc.o: $(OBJECTDIR)xc.i $(INCDIR)lispemul.h -# $(CC) -c $(DISPOPTFLAGS) $(DFLAGS) -I$(INCDIR) $(SRCDIR)xc.c -o $(OBJECTDIR)xc.o - diff --git a/inc/lpglob.h b/inc/lpglob.h index c3599fc..ddb9329 100755 --- a/inc/lpglob.h +++ b/inc/lpglob.h @@ -64,8 +64,8 @@ extern int Lin_term_count; extern int Sign; extern constraint_name *First_constraint_name; /* I hate #ifdefs, but there seems to be no "standard" way to do this */ -#if defined(__hpux) || defined(__apollo) || defined(_AIX) -/* for HP and Apollo (and possibly others) */ +#if defined(__hpux) || defined(_AIX) +/* for HP, AIX, and possibly others */ extern unsigned char yytext[]; #else /* For other computers */ diff --git a/inc/lpglobl.h b/inc/lpglobl.h index a1c27f6..baf9bab 100755 --- a/inc/lpglobl.h +++ b/inc/lpglobl.h @@ -57,8 +57,8 @@ extern int Sign; /* I hate #ifdefs, but there seems to be no "standard" way to do this */ -#if defined(__hpux) || defined(__apollo) -/* for HP and Apollo (and possibly others) */ +#if defined(__hpux) +/* for HP (and possibly others) */ extern unsigned char yytext[]; #else /* For other computers */ diff --git a/inc/medleyfp.h b/inc/medleyfp.h index a1878e0..578ad0e 100755 --- a/inc/medleyfp.h +++ b/inc/medleyfp.h @@ -71,20 +71,6 @@ volatile extern int FP_error; #define FPCLEAR #define FPTEST(result) (isinf(result) || isnan(result)) -#elif defined(APOLLO) - /**********************************************************/ - /* Need values.h & nan.h, so we all parts of IsNANorINF */ - /* are defined. IsNANorINF uses structure aliasing to */ - /* get at pieces of the float to test it, so the item */ - /* being tested can't be a register variable. Sigh. */ - /**********************************************************/ -#include -#include -#define FPCLEAR -#define FPTEST(result) (IsNANorINF(result)) -#undef REGISTER -#define REGISTER - #elif defined(OSF1) #include #define FPCLEAR diff --git a/inc/version.h b/inc/version.h index 5e1ae55..64288a3 100755 --- a/inc/version.h +++ b/inc/version.h @@ -328,16 +328,6 @@ typedef signed char s_char; - /********************************************************/ - /* */ - /********************************************************/ -#ifdef APOLLO -typedef signed char s_char; -#endif /* APOLLO */ - - - - /********************************************************/ /* */ /********************************************************/ diff --git a/src/dsk.c b/src/dsk.c index 755c992..3cf245f 100644 --- a/src/dsk.c +++ b/src/dsk.c @@ -134,12 +134,6 @@ static char *id = "$Id: dsk.c,v 1.4 2001/12/24 01:09:01 sybalsky Exp $ Copyright #endif /* ULTRIX */ -#ifdef APOLLO -#include -#define d_fileno d_ino -#define f_bavail f_bfree -#endif /* APOLLO */ - #ifdef GCC386 #include "inlnPS2.h" #endif /* GCC386 */ @@ -2450,9 +2444,6 @@ LispPTR COM_getfreeblock(register LispPTR *args) #elif defined(ISC) TIMEOUT(rval = statfs(dir, &sfsbuf, sizeof(struct statfs), 0)); if (rval != 0) { -#elif APOLLO - TIMEOUT(rval = statfs(dir, &sfsbuf, sizeof(struct statfs), 0)); - if (rval != 0) { #elif defined(LINUX) TIMEOUT(rval = statfs(dir, &sfsbuf)); if (rval != 0) { diff --git a/src/gcarray.c b/src/gcarray.c index 550f01d..e1674eb 100644 --- a/src/gcarray.c +++ b/src/gcarray.c @@ -127,16 +127,7 @@ LispPTR aref1(LispPTR array, int index) { base = actarray->base; switch (typenumber) { case 3: /* unsigned 8bits */ -/* the following code confuses the Apollo compiler; */ -/* its equivalent doesn't */ -#ifndef APOLLO retval = (GETBYTE(((char *)Addr68k_from_LADDR(base)) + index)) & 0x0ff; -#else - { - register char *eightbitbase = (char *)Addr68k_from_LADDR(base); - retval = GETBYTE(eightbitbase + index) & 0xff; - } -#endif retval |= S_POSITIVE; break; case 4: /* unsigned 16bits */ diff --git a/src/keyevent.c b/src/keyevent.c index 7eb035c..f587506 100644 --- a/src/keyevent.c +++ b/src/keyevent.c @@ -322,7 +322,7 @@ void getsignaldata(int sig, int code, void *scp) #endif #ifdef XWINDOW -#if (defined(APOLLO) || defined(sun)) +#if defined(sun) if (Event_Req) { if (!XLocked++) getXsignaldata(currentdsp); diff --git a/src/keytst.c b/src/keytst.c index 0d7c59f..ded9ffd 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(APOLLO) - *(array + i) = strtoul(ptr, NULL, 16); /* On APOLLO, must convert to unsigned */ #elif defined(INDIGO) *(array + i) = strtoul(ptr, NULL, 16); /* On Indigo, must convert to unsigned */ #elif defined(RS6000) diff --git a/src/osmsg.c b/src/osmsg.c index 5c384b8..8502d7e 100644 --- a/src/osmsg.c +++ b/src/osmsg.c @@ -36,13 +36,11 @@ static char *id = "$Id: osmsg.c,v 1.2 1999/01/03 02:07:29 sybalsky Exp $ Copyrig #endif /* AIX */ #include #ifndef AIX -#ifndef APOLLO #ifndef MACOSX #ifndef FREEBSD #include #endif /* FREEBSD */ #endif /* MACOSX */ -#endif /* APOLLO */ #endif /* AIX */ #ifndef SYSVONLY #include diff --git a/src/timer.c b/src/timer.c index f56dbd4..66f9d68 100644 --- a/src/timer.c +++ b/src/timer.c @@ -82,11 +82,6 @@ extern int ether_fd; #include #endif /* AIXPS2 */ -/* Apollo and Sun have different ideas about the name of this field */ -#ifdef APOLLO -#define sv_flags sv_onstack -#endif - #ifdef OSF1 /* This is where FPE_FLTOVF & friends are defined */ #include diff --git a/src/ufs.c b/src/ufs.c index 41a2dee..1415d2b 100644 --- a/src/ufs.c +++ b/src/ufs.c @@ -34,13 +34,11 @@ static char *id = "$Id: ufs.c,v 1.2 1999/01/03 02:07:41 sybalsky Exp $ Copyright #include #include #ifndef AIX -#ifndef APOLLO #ifndef MACOSX #ifndef FREEBSD #include #endif /* FREEBSD */ #endif /* MACOSX */ -#endif /* APOLLO */ #endif /* AIX */ #if defined(SYSVONLY) || defined(FREEBSD) || defined(OS5) diff --git a/src/unixcomm.c b/src/unixcomm.c index 1a4b004..62c8a40 100644 --- a/src/unixcomm.c +++ b/src/unixcomm.c @@ -34,8 +34,6 @@ Unix Interface Communications #include /* for strcpy etc. */ #ifdef OS4 #include -#elif APOLLO -#include #elif LINUX #include /* this was called termio in the past, but no longer diff --git a/src/xinit.c b/src/xinit.c index 2e97599..e8ff049 100644 --- a/src/xinit.c +++ b/src/xinit.c @@ -41,7 +41,6 @@ static char *id = "$Id: xinit.c,v 1.5 2001/12/26 22:17:06 sybalsky Exp $ Copyrig #include #include -#ifndef APOLLO #ifndef HPUX #ifndef ULTRIX #ifndef LINUX @@ -53,7 +52,6 @@ static char *id = "$Id: xinit.c,v 1.5 2001/12/26 22:17:06 sybalsky Exp $ Copyrig #endif /* LINUX */ #endif /* ULTRIX */ #endif /* HPUX */ -#endif /* APOLLO */ #ifdef ISC #define FASYNC O_NONBLOCK