ammann@topgun.UUCP (Cheryl Ann Ammann ) (04/19/91)
Here are the changes I made to compile ISIS on an ALLIANT FX/8.
These are patches to version 2.1, ISIS only, not meta or magic.
1) After you've extracted ISIS from the tar file, copy the
bottom of this message (the shar file) to
<your_isis_home>/isisv2.1/<file>.
2) % sh <file>
3) % patch_alliant
4) % make ALLIANT
(I've set the options to enable bypass, and to compile
optimized. If you want different, either edit
FILES/ALLIANT.MAKEFILE before this step; or kill the
make after all files have been copied, and before
compilation starts, cd to ALLIANT and edit the
makefile there.
If you have problems, ask Ken! (Okay, you can ask me, too.)
Cheryl Ammann
ammann@agps.lanl.gov
(505) 667-8495
#! /bin/sh
# This is a shell archive. Remove anything before this line, then unpack
# it by saving it into a file and typing "sh file". To overwrite existing
# files, type "sh file -c". You can also feed this as standard input via
# unshar, or by typing "sh <file", e.g.. If this archive is complete, you
# will see the following message at the end:
# "End of shell archive."
# Contents: FILES/ALLIANT.MAKEFILE FILES/ALLIANT.README Makefile.patch
# cl_task.c.patch cl_typedefs.h.patch isis.h.patch lmgr.c.patch
# long_haul.c.patch makefile.patch msg_fmt.c.patch pr.h.patch
# pr_task.c.patch patch_alliant
# Wrapped by ammann@killi.agps.lanl.gov on Wed Apr 17 14:20:47 1991
PATH=/bin:/usr/bin:/usr/ucb ; export PATH
if test -f 'FILES/ALLIANT.MAKEFILE' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'FILES/ALLIANT.MAKEFILE'\"
else
echo shar: Extracting \"'FILES/ALLIANT.MAKEFILE'\" \(2843 characters\)
sed "s/^X//" >'FILES/ALLIANT.MAKEFILE' <<'END_OF_FILE'
X# $RCSfile: makefile,v $ $Revision: 1.6 $ $Date: 90/08/07 09:21:57 $
XSHELL = /bin/sh
XMCH = MCHTYPE=ALLIANT
X
X#MCHDEP = $(MCH) MCHDEPCFLAGS="-DNOSUNLWP" OPLIBS=
X# Use the following line if you want to use Sun lightweight tasks.
X#MCHDEP = $(MCH) MCHDEPCFLAGS="-DSUNLWP" OPLIBS=-llwp
X# Use the following line if you want to enable bypass communication mode.
XMCHDEP = $(MCH) MCHDEPCFLAGS="-DNOSUNLWP -DBYPASS" OPLIBS=
X
X# The following lines define useful sets of options for using either the
X# gcc compiler or the standard C compiler on your system.
XOPTIMSTD = CC=cc OPTIM="-O3"
XDEBUGSTD = CC=cc OPTIM="-g"
XOPTIMGCC = CC=gcc OPTIM="-g -O"
XDEBUGGCC = CC=gcc OPTIM="-g"
XWARNGCC = CC=gcc OPTIM="-g -O -W"
XWALLGCC = CC=gcc OPTIM="-g -Wall -O"
XNOWARNGCC = CC=gcc OPTIM="-g -w -O"
X
XALLEGRO_DIR = /usr/u/isis/allegro4/run/
XALLEGRO_DEP = $(MCH) MCHDEPCFLAGS="-DALLEGRO_CL -DNOALARMS -I$(ALLEGRO_DIR)lib/misc" OPTIM=-g
X
XLUCID_DEP = $(MCH) MCHDEPCFLAGS="-DLUCID_CL" OPTIM=-g
X
Xall: readme mlib clib protos util demos
X
Xreadme:
X @cat README
X
Xallegro: allegro_action
Xlucid: lucid_action
Xprotos: pr_action
Xclib: cl_action
Xmlib: ml_action
Xutil: ut_action
Xdemos: de_action
X
Xallegro_action:
X cd allegro_clib; make allegro_clib $(ALLEGRO_DEP) ; cd ..
Xlucid_action:
X cd lucid_clib; make lucid_clib $(LUCID_DEP) ; cd ..
Xpr_action:
X cd protos; make $(MCHDEP) $(OPTIMSTD) ; cd ..
Xcl_action:
X cd clib; make $(MCHDEP) $(OPTIMSTD) ; cd ..
Xml_action:
X cd mlib; make $(MCHDEP) $(OPTIMSTD) ; cd ..
Xut_action:
X cd util; make $(MCHDEP) $(OPTIMSTD) ; cd ..
Xde_action:
X cd demos; make $(MCHDEP) $(OPTIMSTD) ; cd ..
X
XUTILPROGS = cmd isis lmgr news prstat rexec \
X rmgr rmgr_cmd spooler tabex xmgr
XDEMOPROGS = bank fortran_test grid lh_sp_test lisp_test \
X qa selftest silentjoins sun_grid teller testjoins \
X testtasks twenty wanClient wanServer spread
X
Xinstall:
X (cd bin; /bin/rm -f protos $(UTILPROGS) $(DEMOPROGS) )
X - (cd demos/pmk; make install )
X ln protos/protos bin
X (cd util; ln $(UTILPROGS) ../bin )
X - (cd demos; ln $(DEMOPROGS) ../bin )
X /bin/rm -f lib/libisis1.a lib/libisis2.a lib/libisism.a
X ln clib/libisis1.a clib/libisis2.a mlib/libisism.a lib
X
Xclean:
X /bin/rm -f protos/*.[os] clib/*.[os] mlib/*.o util/*.o demos/*.o
X /bin/rm -f util/cmd[ly].[ch]
X - (cd demos/pmk; make clean )
X - /bin/rm -f allegro_clib/*.[os] lucid_clib/*.[os]
X
Xrealclean: clean
X - (cd demos/pmk; make realclean )
X /bin/rm -f protos/protos
X (cd util; /bin/rm -f $(UTILPROGS) )
X (cd demos; /bin/rm -f $(DEMOPROGS) )
X /bin/rm -f bin/*
X /bin/rm -f clib/libisis1.a clib/libisis2.a mlib/libisism.a
X /bin/rm -f lib/*.a
X - (cd allegro_clib; /bin/rm -f *.fasl libisis1.a libisis2.a libisism.a *.a )
X - (cd lucid_clib; /bin/rm -f *.sbin libisis1.a libisis2.a libisism.a *.a )
X (cd run_demos; /bin/rm -f *.log core )
X (cd run_isis; /bin/rm -f *.log core )
X
END_OF_FILE
if test 2843 -ne `wc -c <'FILES/ALLIANT.MAKEFILE'`; then
echo shar: \"'FILES/ALLIANT.MAKEFILE'\" unpacked with wrong size!
fi
# end of 'FILES/ALLIANT.MAKEFILE'
fi
if test -f 'FILES/ALLIANT.README' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'FILES/ALLIANT.README'\"
else
echo shar: Extracting \"'FILES/ALLIANT.README'\" \(370 characters\)
sed "s/^X//" >'FILES/ALLIANT.README' <<'END_OF_FILE'
XHow to enable BYPASS communication:
X
X Release 2.1 of ISIS provides the "BYPASS" communication mode which
X can speed up multicast up to 10 times over normal ISIS multicasts.
X To enable this, uncomment the appropriate line that defines the MCHDEP
X compiler option, near the beginning of this makefile.
X This will supply the -DBYPASS option to the compiler.
X
XKen
END_OF_FILE
if test 370 -ne `wc -c <'FILES/ALLIANT.README'`; then
echo shar: \"'FILES/ALLIANT.README'\" unpacked with wrong size!
fi
# end of 'FILES/ALLIANT.README'
fi
if test -f 'Makefile.patch' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'Makefile.patch'\"
else
echo shar: Extracting \"'Makefile.patch'\" \(2754 characters\)
sed "s/^X//" >'Makefile.patch' <<'END_OF_FILE'
X*** Makefile.orig Thu Mar 21 08:57:46 1991
X--- Makefile Tue Mar 26 16:11:47 1991
X***************
X*** 1,5 ****
X! HOSTS = AIX-RS AIX-RT AIX-RT43 APOLLO AUX DEC2100 DEC3100 GOULD HPSPECT \
X! HPUX MACH MIPS NEXT SGI SUN3 SUN4 VAX CONVEX
X
X help:
X @cat README
X--- 1,5 ----
X! HOSTS = AIX-RS AIX-RT AIX-RT43 APOLLO AUX DEC2100 DEC3100 DEC5000 GOULD \
X! HPSPECT HPUX MACH MIPS NEXT SGI SUN3 SUN4 VAX CONVEX ALLIANT
X
X help:
X @cat README
X***************
X*** 25,30 ****
X--- 25,36 ----
X @cp FILES/AIX-RT43.README AIX-RT43/README
X @cp FILES/AIX-RT43.MAKEFILE AIX-RT43/makefile
X @date > AIX-RT43_DIR_MADE
X+ ALLIANT_DIR_MADE:
X+ @echo "Creating binary area..."
X+ @(cd BINARY-TEMPLATE; tar -cf - .) | (mkdir ALLIANT; cd ALLIANT; tar -xf -)
X+ @cp FILES/ALLIANT.README ALLIANT/README
X+ @cp FILES/ALLIANT.MAKEFILE ALLIANT/makefile
X+ @date > ALLIANT_DIR_MADE
X APOLLO_DIR_MADE:
X @echo "Creating binary area..."
X @(cd BINARY-TEMPLATE; tar -cf - .) | (mkdir APOLLO; cd APOLLO; tar -xf -)
X***************
X*** 49,54 ****
X--- 55,66 ----
X @cp FILES/DEC3100.README DEC3100/README
X @cp FILES/DEC3100.MAKEFILE DEC3100/makefile
X @date > DEC3100_DIR_MADE
X+ DEC5000_DIR_MADE:
X+ @echo "Creating binary area..."
X+ @(cd BINARY-TEMPLATE; tar -cf - .) | (mkdir DEC5000; cd DEC5000; tar -xf -)
X+ @cp FILES/DEC3100.README DEC5000/README
X+ @cp FILES/DEC3100.MAKEFILE DEC5000/makefile
X+ @date > DEC5000_DIR_MADE
X GOULD_DIR_MADE:
X @echo "Creating binary area..."
X @(cd BINARY-TEMPLATE; tar -cf - .) | (mkdir GOULD; cd GOULD; tar -xf -)
X***************
X*** 126,131 ****
X--- 138,145 ----
X cd AIX-RT; make; make install; date > AIX-RT_LAST_MAKE
X AIX-RT43: AIX-RT43_DIR_MADE AIX-RT43_LAST_MAKE
X cd AIX-RT43; make; make install; date > AIX-RT43_LAST_MAKE
X+ ALLIANT: ALLIANT_DIR_MADE ALLIANT_LAST_MAKE
X+ cd ALLIANT; make; make install; date > ALLIANT_LAST_MAKE
X APOLLO: APOLLO_DIR_MADE APOLLO_LAST_MAKE
X cd APOLLO; make; make install; date > APOLLO_LAST_MAKE
X AUX: AUX_DIR_MADE AUX_LAST_MAKE
X***************
X*** 134,139 ****
X--- 148,155 ----
X cd DEC2100; make; make install; date > DEC2100_LAST_MAKE
X DEC3100: DEC3100_DIR_MADE DEC3100_LAST_MAKE
X cd DEC3100; make; make install; date > DEC3100_LAST_MAKE
X+ DEC5000: DEC5000_DIR_MADE DEC5000_LAST_MAKE
X+ cd DEC5000; make; make install; date > DEC5000_LAST_MAKE
X GOULD: GOULD_DIR_MADE GOULD_LAST_MAKE
X cd GOULD; make; make install; date > GOULD_LAST_MAKE
X HPSPECT: HPSPECT_DIR_MADE HPSPECT_LAST_MAKE
X***************
X*** 158,167 ****
X--- 174,185 ----
X AIX-RS_LAST_MAKE:
X AIX-RT_LAST_MAKE:
X AIX-RT43_LAST_MAKE:
X+ ALLIANT_LAST_MAKE:
X APOLLO_LAST_MAKE:
X AUX_LAST_MAKE:
X DEC2100_LAST_MAKE:
X DEC3100_LAST_MAKE:
X+ DEC5000_LAST_MAKE:
X GOULD_LAST_MAKE:
X HPSPECT_LAST_MAKE:
X HPUX_LAST_MAKE:
END_OF_FILE
if test 2754 -ne `wc -c <'Makefile.patch'`; then
echo shar: \"'Makefile.patch'\" unpacked with wrong size!
fi
# end of 'Makefile.patch'
fi
if test -f 'cl_task.c.patch' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'cl_task.c.patch'\"
else
echo shar: Extracting \"'cl_task.c.patch'\" \(1519 characters\)
sed "s/^X//" >'cl_task.c.patch' <<'END_OF_FILE'
X*** cl_task.c.orig Thu Mar 21 09:04:50 1991
X--- cl_task.c Thu Mar 21 09:10:25 1991
X***************
X*** 45,54 ****
X
X /* On some machine setjmp and longjmp work fine for ISIS */
X #ifndef THREADS
X! # if (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX)
X # define isis_setjmp _setjmp
X # define isis_longjmp _longjmp
X! # endif (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX)
X # if (AIX)
X # define isis_setjmp setjmp
X # define isis_longjmp longjmp
X--- 45,54 ----
X
X /* On some machine setjmp and longjmp work fine for ISIS */
X #ifndef THREADS
X! # if (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX|ALLIANT)
X # define isis_setjmp _setjmp
X # define isis_longjmp _longjmp
X! # endif (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX|ALLIANT)
X # if (AIX)
X # define isis_setjmp setjmp
X # define isis_longjmp longjmp
X***************
X*** 451,457 ****
X asm("movw _stackp,b2");
X }
X # endif
X! # if(SUN3)
X {
X stackp = &tp->task_stack[STACKLEN-(2 words)];
X stackp = (char*)((int)stackp & ~0x3);
X--- 451,457 ----
X asm("movw _stackp,b2");
X }
X # endif
X! # if(SUN3|ALLIANT)
X {
X stackp = &tp->task_stack[STACKLEN-(2 words)];
X stackp = (char*)((int)stackp & ~0x3);
END_OF_FILE
if test 1519 -ne `wc -c <'cl_task.c.patch'`; then
echo shar: \"'cl_task.c.patch'\" unpacked with wrong size!
fi
# end of 'cl_task.c.patch'
fi
if test -f 'cl_typedefs.h.patch' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'cl_typedefs.h.patch'\"
else
echo shar: Extracting \"'cl_typedefs.h.patch'\" \(533 characters\)
sed "s/^X//" >'cl_typedefs.h.patch' <<'END_OF_FILE'
X*** cl_typedefs.h.orig Thu Mar 21 09:10:37 1991
X--- cl_typedefs.h Thu Mar 21 09:12:22 1991
X***************
X*** 52,58 ****
X struct token;
X struct bc_node;
X #else
X! #if (MIPS|VAX|AIX|GOULD|RT43)
X # define VOID char /* Many compilers crash on void* args and assigns! */
X #else
X # define VOID void
X--- 52,58 ----
X struct token;
X struct bc_node;
X #else
X! #if (MIPS|VAX|AIX|GOULD|RT43|ALLIANT)
X # define VOID char /* Many compilers crash on void* args and assigns! */
X #else
X # define VOID void
END_OF_FILE
if test 533 -ne `wc -c <'cl_typedefs.h.patch'`; then
echo shar: \"'cl_typedefs.h.patch'\" unpacked with wrong size!
fi
# end of 'cl_typedefs.h.patch'
fi
if test -f 'isis.h.patch' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'isis.h.patch'\"
else
echo shar: Extracting \"'isis.h.patch'\" \(289 characters\)
sed "s/^X//" >'isis.h.patch' <<'END_OF_FILE'
X*** isis.h.orig Thu Mar 21 09:12:47 1991
X--- isis.h Thu Mar 21 09:14:10 1991
X***************
X*** 111,116 ****
X--- 111,120 ----
X # endif
X #endif SUN
X
X+ #ifdef ALLIANT
X+ # define UNIX_DOM 1
X+ #endif ALLIANT
X+
X #ifdef AUX
X # define UNIX_DOM 1
X #endif AUX
END_OF_FILE
if test 289 -ne `wc -c <'isis.h.patch'`; then
echo shar: \"'isis.h.patch'\" unpacked with wrong size!
fi
# end of 'isis.h.patch'
fi
if test -f 'lmgr.c.patch' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'lmgr.c.patch'\"
else
echo shar: Extracting \"'lmgr.c.patch'\" \(649 characters\)
sed "s/^X//" >'lmgr.c.patch' <<'END_OF_FILE'
X*** lmgr.c.orig Thu Mar 21 09:37:22 1991
X--- lmgr.c Thu Mar 21 09:40:27 1991
X***************
X*** 20,26 ****
X--- 20,32 ----
X #include <sys/stat.h>
X #include <stdio.h>
X #include <sys/errno.h>
X+
X+ #ifdef ALLIANT
X+ #include <dir.h>
X+ #else ALLIANT
X #include <dirent.h>
X+ #endif ALLIANT
X+
X #include "isis.h"
X
X /* By not replying, leave /bin/xmgr hung until /bin/lmgr exits */
X***************
X*** 111,117 ****
X--- 117,127 ----
X char *ldir;
X {
X register DIR *dirp;
X+ #ifdef ALLIANT
X+ struct direct *dp;
X+ #else ALLIANT
X struct dirent *dp;
X+ #endif ALLIANT
X chdir(ldir);
X dirp = opendir(".");
X while((dp = readdir(dirp)) != NULL)
END_OF_FILE
if test 649 -ne `wc -c <'lmgr.c.patch'`; then
echo shar: \"'lmgr.c.patch'\" unpacked with wrong size!
fi
# end of 'lmgr.c.patch'
fi
if test -f 'long_haul.c.patch' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'long_haul.c.patch'\"
else
echo shar: Extracting \"'long_haul.c.patch'\" \(405 characters\)
sed "s/^X//" >'long_haul.c.patch' <<'END_OF_FILE'
X*** long_haul.c.orig Wed Apr 17 09:00:09 1991
X--- long_haul.c Wed Apr 17 13:39:10 1991
X***************
X*** 2660,2666 ****
X struct sockaddr *addr;
X int *addrlen;
X {
X! int i, j=*addrlen;
X again:
X *addrlen = j;
X i = accept(s, addr, addrlen);
X--- 2660,2666 ----
X struct sockaddr *addr;
X int *addrlen;
X {
X! int i, j = *addrlen;
X again:
X *addrlen = j;
X i = accept(s, addr, addrlen);
END_OF_FILE
if test 405 -ne `wc -c <'long_haul.c.patch'`; then
echo shar: \"'long_haul.c.patch'\" unpacked with wrong size!
fi
# end of 'long_haul.c.patch'
fi
if test -f 'makefile.patch' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'makefile.patch'\"
else
echo shar: Extracting \"'makefile.patch'\" \(1927 characters\)
sed "s/^X//" >'makefile.patch' <<'END_OF_FILE'
X*** makefile.orig Thu Mar 21 09:14:25 1991
X--- makefile Thu Mar 21 09:19:07 1991
X***************
X*** 68,75 ****
X ap_dummy.o: $(S)/ap_dummy.c; $(CC) -c $(CFLAGS) $(S)/ap_dummy.c
X cl_sundummy.o: $(S)/cl_sundummy.c; $(CC) -c $(CFLAGS) $(S)/cl_sundummy.c
X cl_setjmp.o: cl_setjmp.s $(S)/cl_setjmp.c
X! -if test $(MCHTYPE) != GOULD -a $(MCHTYPE) != RT43 -a $(MCHTYPE) != MIPS -a $(MCHTYPE) != AIX -a $(MCHTYPE) != MACH -a $(MCHTYPE) != APOLLO -a $(MCHTYPE) != SGI -a $(MCHTYPE) != CONVEX ; then cc -c $(CPPFLAGS) cl_setjmp.s; fi
X! -if test $(MCHTYPE) = GOULD -o $(MCHTYPE) = RT43 -o $(MCHTYPE) = MIPS -o $(MCHTYPE) = AIX -o $(MCHTYPE) = MACH -o $(MCHTYPE) = APOLLO -o $(MCHTYPE) = SGI -o $(MCHTYPE) = CONVEX; then $(CC) -c $(CFLAGS) $(S)/cl_setjmp.c; fi
X cl_setjmp.s: $(S)/cl_setjmp.s; /lib/cpp $(CPPFLAGS) $(S)/cl_setjmp.s > x; mv x cl_setjmp.s
X tk_xaction.o: $(S)/tk_xaction.c; $(CC) -c $(CFLAGS) $(S)/tk_xaction.c
X cl_token.o: $(S)/cl_token.c; $(CC) -c $(CFLAGS) $(S)/cl_token.c
X--- 68,75 ----
X ap_dummy.o: $(S)/ap_dummy.c; $(CC) -c $(CFLAGS) $(S)/ap_dummy.c
X cl_sundummy.o: $(S)/cl_sundummy.c; $(CC) -c $(CFLAGS) $(S)/cl_sundummy.c
X cl_setjmp.o: cl_setjmp.s $(S)/cl_setjmp.c
X! -if test $(MCHTYPE) != GOULD -a $(MCHTYPE) != RT43 -a $(MCHTYPE) != MIPS -a $(MCHTYPE) != AIX -a $(MCHTYPE) != MACH -a $(MCHTYPE) != APOLLO -a $(MCHTYPE) != SGI -a $(MCHTYPE) != CONVEX -a $(MCHTYPE) != ALLIANT ; then cc -c $(CPPFLAGS) cl_setjmp.s; fi
X! -if test $(MCHTYPE) = GOULD -o $(MCHTYPE) = RT43 -o $(MCHTYPE) = MIPS -o $(MCHTYPE) = AIX -o $(MCHTYPE) = MACH -o $(MCHTYPE) = APOLLO -o $(MCHTYPE) = SGI -o $(MCHTYPE) = CONVEX -o $(MCHTYPE) = ALLIANT ; then $(CC) -c $(CFLAGS) $(S)/cl_setjmp.c; fi
X cl_setjmp.s: $(S)/cl_setjmp.s; /lib/cpp $(CPPFLAGS) $(S)/cl_setjmp.s > x; mv x cl_setjmp.s
X tk_xaction.o: $(S)/tk_xaction.c; $(CC) -c $(CFLAGS) $(S)/tk_xaction.c
X cl_token.o: $(S)/cl_token.c; $(CC) -c $(CFLAGS) $(S)/cl_token.c
END_OF_FILE
if test 1927 -ne `wc -c <'makefile.patch'`; then
echo shar: \"'makefile.patch'\" unpacked with wrong size!
fi
# end of 'makefile.patch'
fi
if test -f 'msg_fmt.c.patch' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'msg_fmt.c.patch'\"
else
echo shar: Extracting \"'msg_fmt.c.patch'\" \(3678 characters\)
sed "s/^X//" >'msg_fmt.c.patch' <<'END_OF_FILE'
X*** msg_fmt.c.orig Thu Mar 21 09:22:00 1991
X--- msg_fmt.c Thu Mar 21 09:32:16 1991
X***************
X*** 136,142 ****
X--- 136,146 ----
X while(c = *format++)
X if(c == '%')
X {
X+ #ifdef ALLIANT
X+ int vectr = 0, *where, len, by_ref = 0;
X+ #else ALLIANT
X int vector = 0, *where, len, by_ref = 0;
X+ #endif ALLIANT
X register format_item *fi;
X c = *format++;
X if(c == '*')
X***************
X*** 151,157 ****
X--- 155,165 ----
X }
X if(isupper(c))
X {
X+ #ifdef ALLIANT
X+ ++vectr;
X+ #else ALLIANT
X ++vector;
X+ #endif ALLIANT
X c = tolower(c);
X if(dp)
X {
X***************
X*** 193,199 ****
X--- 201,211 ----
X isis_errno = IE_BADFITEM;
X return(-1);
X default:
X+ #ifdef ALLIANT
X+ if(vectr)
X+ #else ALLIANT
X if(vector)
X+ #endif ALLIANT
X {
X /* changed this to allow for null deallocators */
X vfunc *dealloc =
X***************
X*** 244,250 ****
X--- 256,266 ----
X }
X break;
X case FMESSAGE:
X+ #ifdef ALLIANT
X+ if(vectr)
X+ #else ALLIANT
X if(vector)
X+ #endif ALLIANT
X {
X isis_errno = IE_NOTIMP;
X return(-1);
X***************
X*** 258,264 ****
X--- 274,284 ----
X msg_insertmsg(mp, fname, VA_ARG(*ap, message*));
X break;
X case FSTRING:
X+ #ifdef ALLIANT
X+ if(vectr)
X+ #else ALLIANT
X if(vector)
X+ #endif ALLIANT
X {
X isis_errno = IE_NOTIMP;
X return(-1);
X***************
X*** 406,412 ****
X--- 426,436 ----
X isis_format = format = fmt;
X while(c = *format++) if(c == '%')
X {
X+ #ifdef ALLIANT
X+ int vectr = 0, do_malloc = 0, do_copy = 1, len, vlen;
X+ #else ALLIANT
X int vector = 0, do_malloc = 0, do_copy = 1, len, vlen;
X+ #endif ALLIANT
X register format_item *fi;
X register char **ptr;
X c = *format++;
X***************
X*** 427,433 ****
X--- 451,461 ----
X }
X if(isupper(c))
X {
X+ #ifdef ALLIANT
X+ ++vectr;
X+ #else ALLIANT
X ++vector;
X+ #endif ALLIANT
X c = tolower(c);
X vlen = -1;
X if(*format == '[')
X***************
X*** 500,506 ****
X--- 528,538 ----
X else
X *(*(char***)ptr)++ = len? source: (char*)0;
X len /= fi->fi_size;
X+ #ifdef ALLIANT
X+ if(vectr && argp)
X+ #else ALLIANT
X if(vector && argp)
X+ #endif ALLIANT
X {
X if(vlen == -1)
X {
X***************
X*** 515,521 ****
X--- 547,557 ----
X return(-1);
X }
X }
X+ #ifdef ALLIANT
X+ else if(vectr)
X+ #else ALLIANT
X else if(vector)
X+ #endif ALLIANT
X {
X isis_errno = IE_BADARG;
X return(-1);
X***************
X*** 522,528 ****
X--- 558,568 ----
X }
X break;
X case FMESSAGE:
X+ #ifdef ALLIANT
X+ if(vectr)
X+ #else ALLIANT
X if(vector)
X+ #endif ALLIANT
X {
X isis_errno = IE_NOTIMP;
X return(-1);
END_OF_FILE
if test 3678 -ne `wc -c <'msg_fmt.c.patch'`; then
echo shar: \"'msg_fmt.c.patch'\" unpacked with wrong size!
fi
# end of 'msg_fmt.c.patch'
fi
if test -f 'pr.h.patch' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'pr.h.patch'\"
else
echo shar: Extracting \"'pr.h.patch'\" \(281 characters\)
sed "s/^X//" >'pr.h.patch' <<'END_OF_FILE'
X*** pr.h.orig Thu Mar 21 09:32:49 1991
X--- pr.h Thu Mar 21 09:33:46 1991
X***************
X*** 46,51 ****
X--- 46,55 ----
X # endif SUNLWP
X #endif SUN
X
X+ #ifdef ALLIANT
X+ # define UNIX_DOM 1
X+ #endif ALLIANT
X+
X #ifdef AUX
X # define UNIX_DOM 1
X #endif
END_OF_FILE
if test 281 -ne `wc -c <'pr.h.patch'`; then
echo shar: \"'pr.h.patch'\" unpacked with wrong size!
fi
# end of 'pr.h.patch'
fi
if test -f 'pr_task.c.patch' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'pr_task.c.patch'\"
else
echo shar: Extracting \"'pr_task.c.patch'\" \(1519 characters\)
sed "s/^X//" >'pr_task.c.patch' <<'END_OF_FILE'
X*** pr_task.c.orig Thu Mar 21 09:34:11 1991
X--- pr_task.c Thu Mar 21 09:37:01 1991
X***************
X*** 28,37 ****
X
X /* On some machine setjmp and longjmp work fine for ISIS */
X #ifndef THREADS
X! # if (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX)
X # define isis_setjmp _setjmp
X # define isis_longjmp _longjmp
X! # endif (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX)
X # if (AIX)
X # define isis_setjmp setjmp
X # define isis_longjmp longjmp
X--- 28,37 ----
X
X /* On some machine setjmp and longjmp work fine for ISIS */
X #ifndef THREADS
X! # if (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX|ALLIANT)
X # define isis_setjmp _setjmp
X # define isis_longjmp _longjmp
X! # endif (AIXRS|GOULD|hp9000s800|NEXT|MIPS|RT43|SGI|CONVEX|ALLIANT)
X # if (AIX)
X # define isis_setjmp setjmp
X # define isis_longjmp longjmp
X***************
X*** 258,264 ****
X asm("mov.l stackp,%sp");
X }
X # endif
X! # if(SUN3)
X {
X stackp = &ctp->task_stack[STACKLEN-(2 words)];
X stackp = (char*)((int)stackp & ~0x3);
X--- 258,264 ----
X asm("mov.l stackp,%sp");
X }
X # endif
X! # if(SUN3|ALLIANT)
X {
X stackp = &ctp->task_stack[STACKLEN-(2 words)];
X stackp = (char*)((int)stackp & ~0x3);
END_OF_FILE
if test 1519 -ne `wc -c <'pr_task.c.patch'`; then
echo shar: \"'pr_task.c.patch'\" unpacked with wrong size!
fi
# end of 'pr_task.c.patch'
fi
if test -f 'patch_alliant' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'patch_alliant'\"
else
echo shar: Extracting \"'patch_alliant'\" \(442 characters\)
sed "s/^X//" >'patch_alliant' <<'END_OF_FILE'
X#/usr/bin/csh -f
X
Xcd util
X patch lmgr.c < ../lmgr.c.patch
X patch long_haul.c < ../long_haul.c.patch
Xcd ..
X
Xcd protos
X patch pr.h < ../pr.h.patch
X patch pr_task.c < ../pr_task.c.patch
Xcd ..
X
Xcd mlib
X patch msg_fmt.c < ../msg_fmt.c.patch
Xcd ..
X
Xcd clib
X patch cl_task.c < ../cl_task.c.patch
X patch cl_typedefs.h < ../cl_typedefs.h.patch
X patch isis.h < ../isis.h.patch
X patch makefile < ../makefile.patch
Xcd ..
X
Xpatch Makefile < Makefile.patch
END_OF_FILE
if test 442 -ne `wc -c <'patch_alliant'`; then
echo shar: \"'patch_alliant'\" unpacked with wrong size!
fi
chmod +x 'patch_alliant'
# end of 'patch_alliant'
fi
echo shar: End of shell archive.
exit 0