diff -u -r -N jikes-1.04.orig/src/Makefile.amiga jikes-1.04/src/Makefile.amiga
--- jikes-1.04.orig/src/Makefile.amiga	Thu Jan  1 02:00:00 1970
+++ jikes-1.04/src/Makefile.amiga	Fri Sep 17 22:27:52 1999
@@ -0,0 +1,418 @@
+# Generated automatically from Makefile.in by configure.
+# $Id: Makefile.in,v 1.8 1999/09/14 18:32:51 shields Exp $
+
+CC=c++
+CCREQUIREDFLAGS=-funsigned-char -c -ansi -DTYPE_bool -DBIGENDIAN -Dstat=mystat -Dfopen=myfopen -Dopendir=myopendir -include libc5-fix.h -I.
+CCDEBUGFLAGS=-DTEST -g
+CCOPTFLAGS=-O0 -fomit-frame-pointer -m68020-60 -m68881
+CCFLAGS=$(CCREQUIREDFLAGS) $(CCOPTFLAGS)
+CFLAGS=$(CCFLAGS)
+ERASE=rm -f
+EXECUTABLE=jikes
+LD=c++
+LDFLAGS=-s -L. -o $(EXECUTABLE) -m68020-60 -m68881
+# Use GG:lib/libnix/swapstack.o when compiling for a 68000
+# Use GG:lib/libm020/libnix/swapstack.o when compiling for a 68020+
+SYSOBJECTS=GG:lib/libm020/libnix/swapstack.o -noixemul
+
+
+
+BUILD_DIR=.
+
+srcdir		= .
+prefix		= /gg
+exec_prefix	= ${prefix}
+
+
+#
+# You should not need to edit below here
+#
+
+
+all:  $(EXECUTABLE)
+
+clean:
+	$(ERASE) $(EXECUTABLE)
+	$(ERASE) $(OBJECTS)
+
+distclean: clean
+	$(ERASE) config.cache config.log config.status
+	$(ERASE) Makefile
+
+install: all
+	mkdir -p $(prefix)/bin
+	strip $(EXECUTABLE)
+	cp $(EXECUTABLE) $(prefix)/bin
+	mkdir -p $(prefix)/man/man1
+	cp ../jikes.1 $(prefix)/man/man1
+
+OBJECTS=jikes.o scanner.o code.o zip.o unzip.o \
+        ast.o diagnose.o parser.o lpginput.o javaact.o \
+        error.o set.o symbol.o lookup.o long.o depend.o \
+        stream.o op.o control.o modifier.o system.o \
+        bytecode.o body.o decl.o definite.o dump.o expr.o \
+        getclass.o init.o double.o config.o option.o \
+        incrmnt.o case.o tab.o segment.o amiga.o
+
+$(EXECUTABLE):	$(OBJECTS)
+	$(LD) $(LDFLAGS)  $(OBJECTS) $(SYSOBJECTS)
+
+
+javasym.h: $(srcdir)/java.g
+	jikespg $(srcdir)/java.g
+	$(ERASE) java.l
+
+javadef.h: $(srcdir)/java.g
+	jikespg $(srcdir)/java.g
+	$(ERASE) java.l
+
+javadcl.h: $(srcdir)/java.g
+	jikespg $(srcdir)/java.g
+	$(ERASE) java.l
+
+javaprs.h: $(srcdir)/java.g
+	jikespg $(srcdir)/java.g
+	$(ERASE) java.l
+
+
+ast.o:  $(srcdir)/ast.cpp $(srcdir)/config.h \
+          $(srcdir)/code.h $(srcdir)/case.h $(srcdir)/ast.h \
+          $(srcdir)/stream.h $(srcdir)/javadef.h $(srcdir)/javasym.h \
+          $(srcdir)/tuple.h $(srcdir)/tab.h $(srcdir)/lookup.h $(srcdir)/long.h \
+          $(srcdir)/double.h $(srcdir)/symbol.h $(srcdir)/option.h \
+          $(srcdir)/depend.h $(srcdir)/access.h 
+	$(CC) $(CCFLAGS) $(srcdir)/ast.cpp 
+
+body.o: $(srcdir)/body.cpp $(srcdir)/config.h $(srcdir)/semantic.h \
+          $(srcdir)/ast.h $(srcdir)/stream.h $(srcdir)/javadef.h \
+          $(srcdir)/javasym.h $(srcdir)/tuple.h \
+          $(srcdir)/tab.h $(srcdir)/lookup.h $(srcdir)/long.h \
+          $(srcdir)/double.h $(srcdir)/code.h \
+	  $(srcdir)/case.h $(srcdir)/symbol.h $(srcdir)/option.h \
+          $(srcdir)/depend.h $(srcdir)/access.h $(srcdir)/diagnose.h \
+          $(srcdir)/parser.h $(srcdir)/lpginput.h $(srcdir)/javaprs.h \
+          $(srcdir)/javaact.h $(srcdir)/error.h $(srcdir)/control.h $(srcdir)/set.h 
+	$(CC) $(CCFLAGS) $(srcdir)/body.cpp 
+
+bytecode.o: $(srcdir)/bytecode.cpp $(srcdir)/config.h $(srcdir)/ast.h \
+              $(srcdir)/stream.h $(srcdir)/javadef.h $(srcdir)/javasym.h \
+              $(srcdir)/tuple.h $(srcdir)/tab.h \
+              $(srcdir)/lookup.h $(srcdir)/long.h $(srcdir)/double.h \
+              $(srcdir)/code.h $(srcdir)/case.h \
+              $(srcdir)/symbol.h $(srcdir)/option.h $(srcdir)/depend.h \
+              $(srcdir)/access.h $(srcdir)/bytecode.h $(srcdir)/class.h \
+              $(srcdir)/semantic.h $(srcdir)/diagnose.h $(srcdir)/parser.h \
+              $(srcdir)/lpginput.h $(srcdir)/javaprs.h $(srcdir)/javaact.h \
+              $(srcdir)/error.h $(srcdir)/control.h $(srcdir)/set.h \
+              $(srcdir)/op.h $(srcdir)/segment.h  \
+              $(srcdir)/op.h $(srcdir)/table.h 
+	$(CC) $(CCFLAGS) $(srcdir)/bytecode.cpp 
+
+config.o:  $(srcdir)/config.cpp $(srcdir)/config.h 
+	$(CC) $(CCFLAGS) $(srcdir)/config.cpp 
+
+code.o:  $(srcdir)/code.cpp $(srcdir)/code.h $(srcdir)/config.h 
+	$(CC) $(CCFLAGS) $(srcdir)/code.cpp 
+
+control.o:  $(srcdir)/control.cpp $(srcdir)/config.h $(srcdir)/control.h \
+              $(srcdir)/option.h $(srcdir)/code.h \
+              $(srcdir)/tuple.h $(srcdir)/symbol.h $(srcdir)/stream.h \
+              $(srcdir)/javadef.h $(srcdir)/javasym.h $(srcdir)/tab.h \
+              $(srcdir)/lookup.h $(srcdir)/long.h $(srcdir)/double.h \
+              $(srcdir)/case.h $(srcdir)/depend.h \
+              $(srcdir)/access.h $(srcdir)/set.h $(srcdir)/scanner.h \
+	      $(srcdir)/parser.h $(srcdir)/lpginput.h $(srcdir)/javaprs.h \
+              $(srcdir)/javaact.h $(srcdir)/semantic.h $(srcdir)/ast.h \
+	      $(srcdir)/diagnose.h $(srcdir)/error.h $(srcdir)/bytecode.h \
+              $(srcdir)/class.h $(srcdir)/segment.h \
+              $(srcdir)/class.h $(srcdir)/op.h 
+	$(CC) $(CCFLAGS) $(srcdir)/control.cpp 
+
+case.o:  $(srcdir)/case.cpp $(srcdir)/config.h $(srcdir)/case.h 
+	$(CC) $(CCFLAGS) $(srcdir)/case.cpp 
+
+diagnose.o:  $(srcdir)/diagnose.cpp $(srcdir)/config.h $(srcdir)/diagnose.h \
+               $(srcdir)/parser.h $(srcdir)/lpginput.h $(srcdir)/stream.h \
+	       $(srcdir)/javadef.h $(srcdir)/javasym.h $(srcdir)/tuple.h \
+               $(srcdir)/tab.h $(srcdir)/lookup.h \
+               $(srcdir)/long.h $(srcdir)/double.h \
+               $(srcdir)/code.h $(srcdir)/case.h $(srcdir)/javaprs.h \
+               $(srcdir)/javaact.h $(srcdir)/control.h $(srcdir)/option.h \
+	       $(srcdir)/symbol.h $(srcdir)/depend.h $(srcdir)/access.h \
+               $(srcdir)/set.h $(srcdir)/semantic.h $(srcdir)/ast.h \
+               $(srcdir)/error.h $(srcdir)/spell.h
+	$(CC) $(CCFLAGS) $(srcdir)/diagnose.cpp 
+
+decl.o:  $(srcdir)/decl.cpp $(srcdir)/config.h $(srcdir)/semantic.h \
+           $(srcdir)/ast.h $(srcdir)/stream.h $(srcdir)/javadef.h \
+           $(srcdir)/javasym.h $(srcdir)/tuple.h \
+           $(srcdir)/tab.h $(srcdir)/lookup.h $(srcdir)/long.h \
+           $(srcdir)/double.h $(srcdir)/code.h \
+	   $(srcdir)/case.h $(srcdir)/symbol.h $(srcdir)/option.h \
+           $(srcdir)/depend.h $(srcdir)/access.h $(srcdir)/diagnose.h \
+           $(srcdir)/parser.h $(srcdir)/lpginput.h $(srcdir)/javaprs.h \
+           $(srcdir)/javaact.h $(srcdir)/error.h $(srcdir)/control.h \
+           $(srcdir)/set.h $(srcdir)/table.h 
+	$(CC) $(CCFLAGS) $(srcdir)/decl.cpp 
+
+definite.o:  $(srcdir)/definite.cpp $(srcdir)/config.h $(srcdir)/semantic.h \
+               $(srcdir)/ast.h $(srcdir)/stream.h $(srcdir)/javadef.h \
+	       $(srcdir)/javasym.h $(srcdir)/tuple.h \
+               $(srcdir)/tab.h $(srcdir)/lookup.h $(srcdir)/long.h \
+               $(srcdir)/double.h $(srcdir)/code.h \
+               $(srcdir)/case.h $(srcdir)/symbol.h $(srcdir)/option.h \
+               $(srcdir)/depend.h $(srcdir)/access.h $(srcdir)/diagnose.h \
+	       $(srcdir)/parser.h $(srcdir)/lpginput.h $(srcdir)/javaprs.h \
+               $(srcdir)/javaact.h $(srcdir)/error.h $(srcdir)/control.h \
+               $(srcdir)/set.h 
+	$(CC) $(CCFLAGS) $(srcdir)/definite.cpp 
+
+depend.o:  $(srcdir)/depend.cpp $(srcdir)/config.h $(srcdir)/ast.h \
+             $(srcdir)/stream.h $(srcdir)/javadef.h $(srcdir)/javasym.h \
+             $(srcdir)/tuple.h $(srcdir)/tab.h \
+             $(srcdir)/lookup.h $(srcdir)/long.h $(srcdir)/double.h \
+             $(srcdir)/code.h $(srcdir)/case.h \
+	     $(srcdir)/symbol.h $(srcdir)/option.h $(srcdir)/depend.h \
+             $(srcdir)/access.h $(srcdir)/semantic.h $(srcdir)/diagnose.h \
+	     $(srcdir)/parser.h $(srcdir)/lpginput.h $(srcdir)/javaprs.h \
+             $(srcdir)/javaact.h $(srcdir)/error.h $(srcdir)/control.h \
+             $(srcdir)/set.h 
+	$(CC) $(CCFLAGS) $(srcdir)/depend.cpp 
+
+double.o:  $(srcdir)/double.cpp $(srcdir)/config.h $(srcdir)/double.h \
+             $(srcdir)/long.h 
+	$(CC) $(CCFLAGS) $(srcdir)/double.cpp 
+
+dump.o:  $(srcdir)/dump.cpp $(srcdir)/config.h $(srcdir)/javasym.h \
+           $(srcdir)/control.h $(srcdir)/option.h \
+           $(srcdir)/code.h $(srcdir)/tuple.h $(srcdir)/symbol.h \
+           $(srcdir)/stream.h $(srcdir)/javadef.h $(srcdir)/tab.h \
+           $(srcdir)/lookup.h $(srcdir)/long.h $(srcdir)/double.h \
+           $(srcdir)/case.h $(srcdir)/depend.h \
+           $(srcdir)/access.h $(srcdir)/set.h 
+	$(CC) $(CCFLAGS) $(srcdir)/dump.cpp 
+
+error.o:  $(srcdir)/error.cpp $(srcdir)/config.h \
+            $(srcdir)/code.h $(srcdir)/case.h \
+            $(srcdir)/error.h $(srcdir)/stream.h $(srcdir)/javadef.h \
+            $(srcdir)/javasym.h $(srcdir)/tuple.h $(srcdir)/tab.h \
+            $(srcdir)/lookup.h $(srcdir)/long.h $(srcdir)/double.h \
+            $(srcdir)/control.h $(srcdir)/option.h $(srcdir)/symbol.h \
+            $(srcdir)/depend.h $(srcdir)/access.h $(srcdir)/set.h \
+	    $(srcdir)/semantic.h $(srcdir)/ast.h $(srcdir)/diagnose.h \
+            $(srcdir)/parser.h $(srcdir)/lpginput.h $(srcdir)/javaprs.h \
+	    $(srcdir)/javaact.h 
+	$(CC) $(CCFLAGS) $(srcdir)/error.cpp 
+
+expr.o:  $(srcdir)/expr.cpp $(srcdir)/double.h $(srcdir)/config.h \
+           $(srcdir)/parser.h $(srcdir)/lpginput.h \
+           $(srcdir)/stream.h $(srcdir)/javadef.h $(srcdir)/javasym.h \
+           $(srcdir)/tuple.h $(srcdir)/tab.h $(srcdir)/lookup.h \
+           $(srcdir)/long.h $(srcdir)/code.h \
+           $(srcdir)/case.h $(srcdir)/javaprs.h $(srcdir)/javaact.h \
+           $(srcdir)/semantic.h $(srcdir)/ast.h $(srcdir)/symbol.h \
+	   $(srcdir)/option.h $(srcdir)/depend.h $(srcdir)/access.h \
+           $(srcdir)/diagnose.h $(srcdir)/error.h $(srcdir)/control.h \
+           $(srcdir)/set.h $(srcdir)/table.h $(srcdir)/spell.h
+	$(CC) $(CCFLAGS) $(srcdir)/expr.cpp 
+
+getclass.o:  $(srcdir)/getclass.cpp $(srcdir)/config.h $(srcdir)/control.h \
+               $(srcdir)/option.h $(srcdir)/code.h \
+               $(srcdir)/tuple.h $(srcdir)/symbol.h $(srcdir)/stream.h \
+               $(srcdir)/javadef.h $(srcdir)/javasym.h $(srcdir)/tab.h \
+               $(srcdir)/lookup.h $(srcdir)/long.h $(srcdir)/double.h \
+               $(srcdir)/case.h $(srcdir)/depend.h \
+               $(srcdir)/access.h $(srcdir)/set.h $(srcdir)/semantic.h \
+	       $(srcdir)/ast.h $(srcdir)/diagnose.h $(srcdir)/parser.h \
+               $(srcdir)/lpginput.h $(srcdir)/javaprs.h $(srcdir)/javaact.h \
+               $(srcdir)/error.h $(srcdir)/getclass.h $(srcdir)/zip.h \
+               $(srcdir)/unzip.h 
+	$(CC) $(CCFLAGS) $(srcdir)/getclass.cpp 
+
+incrmnt.o:  $(srcdir)/incrmnt.cpp $(srcdir)/config.h $(srcdir)/control.h \
+              $(srcdir)/option.h $(srcdir)/code.h \
+              $(srcdir)/tuple.h $(srcdir)/symbol.h $(srcdir)/stream.h \
+              $(srcdir)/javadef.h $(srcdir)/javasym.h $(srcdir)/tab.h \
+              $(srcdir)/lookup.h $(srcdir)/long.h $(srcdir)/double.h \
+              $(srcdir)/case.h $(srcdir)/depend.h \
+              $(srcdir)/access.h $(srcdir)/set.h $(srcdir)/scanner.h \
+	      $(srcdir)/parser.h $(srcdir)/lpginput.h $(srcdir)/javaprs.h \
+              $(srcdir)/javaact.h $(srcdir)/semantic.h $(srcdir)/ast.h \
+	      $(srcdir)/diagnose.h $(srcdir)/error.h 
+	$(CC) $(CCFLAGS) $(srcdir)/incrmnt.cpp 
+
+init.o:  $(srcdir)/init.cpp $(srcdir)/config.h $(srcdir)/semantic.h \
+           $(srcdir)/ast.h $(srcdir)/stream.h $(srcdir)/javadef.h \
+           $(srcdir)/javasym.h $(srcdir)/tuple.h \
+           $(srcdir)/tab.h $(srcdir)/lookup.h $(srcdir)/long.h \
+           $(srcdir)/double.h $(srcdir)/code.h \
+	   $(srcdir)/case.h $(srcdir)/symbol.h $(srcdir)/option.h \
+           $(srcdir)/depend.h $(srcdir)/access.h $(srcdir)/diagnose.h \
+           $(srcdir)/parser.h $(srcdir)/lpginput.h $(srcdir)/javaprs.h \
+           $(srcdir)/javaact.h $(srcdir)/error.h $(srcdir)/control.h $(srcdir)/set.h 
+	$(CC) $(CCFLAGS) $(srcdir)/init.cpp
+
+javaact.o: $(srcdir)/javaact.cpp $(srcdir)/config.h $(srcdir)/parser.h \
+             $(srcdir)/lpginput.h $(srcdir)/stream.h $(srcdir)/javadef.h \
+	     $(srcdir)/javasym.h $(srcdir)/tuple.h \
+             $(srcdir)/tab.h $(srcdir)/lookup.h $(srcdir)/long.h \
+             $(srcdir)/double.h $(srcdir)/code.h \
+             $(srcdir)/case.h $(srcdir)/javaprs.h $(srcdir)/javaact.h \
+             $(srcdir)/ast.h $(srcdir)/symbol.h $(srcdir)/option.h \
+	     $(srcdir)/depend.h $(srcdir)/access.h 
+	$(CC) $(CCFLAGS) $(srcdir)/javaact.cpp
+
+jikes.o:  $(srcdir)/jikes.cpp $(srcdir)/config.h $(srcdir)/control.h \
+            $(srcdir)/option.h $(srcdir)/code.h \
+            $(srcdir)/tuple.h $(srcdir)/symbol.h $(srcdir)/stream.h \
+            $(srcdir)/javadef.h $(srcdir)/javasym.h $(srcdir)/tab.h \
+            $(srcdir)/lookup.h $(srcdir)/long.h $(srcdir)/double.h \
+            $(srcdir)/case.h $(srcdir)/depend.h \
+            $(srcdir)/access.h $(srcdir)/set.h 
+	$(CC) $(CCFLAGS) $(srcdir)/jikes.cpp
+
+long.o:  $(srcdir)/long.cpp $(srcdir)/config.h $(srcdir)/long.h \
+           $(srcdir)/double.h 
+	$(CC) $(CCFLAGS) $(srcdir)/long.cpp 
+
+lookup.o:  $(srcdir)/lookup.cpp $(srcdir)/config.h $(srcdir)/lookup.h \
+             $(srcdir)/tuple.h $(srcdir)/long.h \
+             $(srcdir)/double.h $(srcdir)/symbol.h $(srcdir)/code.h \
+             $(srcdir)/stream.h $(srcdir)/javadef.h $(srcdir)/javasym.h \
+             $(srcdir)/tab.h $(srcdir)/case.h \
+             $(srcdir)/option.h $(srcdir)/depend.h $(srcdir)/access.h \
+             $(srcdir)/ast.h 
+	$(CC) $(CCFLAGS) $(srcdir)/lookup.cpp
+
+lpginput.o:  $(srcdir)/lpginput.cpp $(srcdir)/config.h $(srcdir)/lpginput.h \
+               $(srcdir)/stream.h $(srcdir)/javadef.h $(srcdir)/javasym.h \
+	       $(srcdir)/tuple.h $(srcdir)/tab.h \
+               $(srcdir)/lookup.h $(srcdir)/long.h $(srcdir)/double.h \
+               $(srcdir)/code.h $(srcdir)/case.h \
+               $(srcdir)/javaprs.h $(srcdir)/javadcl.h 
+	$(CC) $(CCFLAGS) $(srcdir)/lpginput.cpp 
+
+modifier.o:  $(srcdir)/modifier.cpp $(srcdir)/config.h $(srcdir)/semantic.h \
+               $(srcdir)/ast.h $(srcdir)/stream.h $(srcdir)/javadef.h \
+	       $(srcdir)/javasym.h $(srcdir)/tuple.h \
+               $(srcdir)/tab.h $(srcdir)/lookup.h $(srcdir)/long.h \
+               $(srcdir)/double.h $(srcdir)/code.h \
+               $(srcdir)/case.h $(srcdir)/symbol.h $(srcdir)/option.h \
+               $(srcdir)/depend.h $(srcdir)/access.h $(srcdir)/diagnose.h \
+	       $(srcdir)/parser.h $(srcdir)/lpginput.h $(srcdir)/javaprs.h \
+               $(srcdir)/javaact.h $(srcdir)/error.h $(srcdir)/control.h \
+               $(srcdir)/set.h 
+	$(CC) $(CCFLAGS) $(srcdir)/modifier.cpp 
+
+op.o:  $(srcdir)/op.cpp $(srcdir)/config.h $(srcdir)/op.h $(srcdir)/tuple.h \
+         $(srcdir)/class.h $(srcdir)/semantic.h $(srcdir)/ast.h \
+	 $(srcdir)/stream.h $(srcdir)/javadef.h $(srcdir)/javasym.h \
+         $(srcdir)/tab.h $(srcdir)/lookup.h $(srcdir)/long.h $(srcdir)/double.h \
+	 $(srcdir)/code.h $(srcdir)/case.h $(srcdir)/symbol.h \
+         $(srcdir)/option.h $(srcdir)/depend.h $(srcdir)/access.h \
+         $(srcdir)/diagnose.h $(srcdir)/parser.h $(srcdir)/lpginput.h \
+         $(srcdir)/javaprs.h $(srcdir)/javaact.h $(srcdir)/error.h \
+	 $(srcdir)/control.h $(srcdir)/set.h 
+	$(CC) $(CCFLAGS) $(srcdir)/op.cpp 
+
+option.o:  $(srcdir)/option.cpp $(srcdir)/option.h $(srcdir)/config.h \
+             $(srcdir)/code.h $(srcdir)/tuple.h \
+             $(srcdir)/javasym.h $(srcdir)/error.h $(srcdir)/stream.h \
+             $(srcdir)/javadef.h $(srcdir)/tab.h $(srcdir)/lookup.h \
+             $(srcdir)/long.h $(srcdir)/double.h \
+             $(srcdir)/case.h 
+	$(CC) $(CCFLAGS) $(srcdir)/option.cpp 
+
+parser.o:  $(srcdir)/parser.cpp $(srcdir)/config.h $(srcdir)/parser.h \
+             $(srcdir)/lpginput.h $(srcdir)/stream.h $(srcdir)/javadef.h \
+	     $(srcdir)/javasym.h $(srcdir)/tuple.h \
+             $(srcdir)/tab.h $(srcdir)/lookup.h $(srcdir)/long.h \
+             $(srcdir)/double.h $(srcdir)/code.h \
+             $(srcdir)/case.h $(srcdir)/javaprs.h $(srcdir)/javaact.h \
+             $(srcdir)/ast.h $(srcdir)/symbol.h $(srcdir)/option.h \
+	     $(srcdir)/depend.h $(srcdir)/access.h 
+	$(CC) $(CCFLAGS) $(srcdir)/parser.cpp
+
+scanner.o: $(srcdir)/scanner.cpp $(srcdir)/config.h $(srcdir)/scanner.h \
+             $(srcdir)/code.h $(srcdir)/javadef.h \
+             $(srcdir)/javasym.h $(srcdir)/stream.h $(srcdir)/tuple.h \
+             $(srcdir)/tab.h $(srcdir)/lookup.h $(srcdir)/long.h \
+             $(srcdir)/double.h $(srcdir)/case.h \
+             $(srcdir)/control.h $(srcdir)/option.h $(srcdir)/symbol.h \
+             $(srcdir)/depend.h $(srcdir)/access.h $(srcdir)/set.h $(srcdir)/error.h 
+	$(CC) $(CCFLAGS) $(srcdir)/scanner.cpp 
+
+set.o:  $(srcdir)/set.cpp $(srcdir)/set.h $(srcdir)/config.h \
+          $(srcdir)/symbol.h $(srcdir)/code.h \
+          $(srcdir)/stream.h $(srcdir)/javadef.h $(srcdir)/javasym.h \
+          $(srcdir)/tuple.h $(srcdir)/tab.h $(srcdir)/lookup.h \
+          $(srcdir)/long.h $(srcdir)/double.h \
+          $(srcdir)/case.h $(srcdir)/option.h $(srcdir)/depend.h \
+          $(srcdir)/access.h 
+	$(CC) $(CCFLAGS) $(srcdir)/set.cpp 
+
+stream.o:  $(srcdir)/stream.cpp $(srcdir)/config.h $(srcdir)/stream.h \
+             $(srcdir)/javadef.h $(srcdir)/javasym.h $(srcdir)/tuple.h \
+             $(srcdir)/tab.h $(srcdir)/lookup.h \
+             $(srcdir)/long.h $(srcdir)/double.h \
+             $(srcdir)/code.h $(srcdir)/case.h $(srcdir)/zip.h \
+	     $(srcdir)/unzip.h $(srcdir)/symbol.h $(srcdir)/option.h \
+             $(srcdir)/depend.h $(srcdir)/access.h $(srcdir)/control.h \
+             $(srcdir)/set.h $(srcdir)/semantic.h $(srcdir)/ast.h \
+             $(srcdir)/diagnose.h $(srcdir)/parser.h $(srcdir)/lpginput.h \
+             $(srcdir)/javaprs.h $(srcdir)/javaact.h $(srcdir)/error.h 
+	$(CC) $(CCFLAGS) $(srcdir)/stream.cpp 
+
+symbol.o:  $(srcdir)/symbol.cpp $(srcdir)/config.h $(srcdir)/stream.h \
+             $(srcdir)/javadef.h $(srcdir)/javasym.h $(srcdir)/tuple.h \
+             $(srcdir)/tab.h $(srcdir)/lookup.h \
+             $(srcdir)/long.h $(srcdir)/double.h \
+             $(srcdir)/code.h $(srcdir)/case.h $(srcdir)/control.h \
+	     $(srcdir)/option.h $(srcdir)/symbol.h $(srcdir)/depend.h \
+             $(srcdir)/access.h $(srcdir)/set.h $(srcdir)/ast.h \
+             $(srcdir)/semantic.h $(srcdir)/diagnose.h $(srcdir)/parser.h \
+             $(srcdir)/lpginput.h $(srcdir)/javaprs.h $(srcdir)/javaact.h \
+             $(srcdir)/error.h $(srcdir)/table.h $(srcdir)/zip.h $(srcdir)/unzip.h 
+	$(CC) $(CCFLAGS) $(srcdir)/symbol.cpp
+
+system.o:  $(srcdir)/system.cpp $(srcdir)/config.h $(srcdir)/control.h \
+             $(srcdir)/option.h $(srcdir)/code.h \
+             $(srcdir)/tuple.h $(srcdir)/symbol.h $(srcdir)/stream.h \
+             $(srcdir)/javadef.h $(srcdir)/javasym.h $(srcdir)/tab.h \
+             $(srcdir)/lookup.h $(srcdir)/long.h $(srcdir)/double.h \
+             $(srcdir)/case.h $(srcdir)/depend.h \
+             $(srcdir)/access.h $(srcdir)/set.h $(srcdir)/semantic.h \
+	     $(srcdir)/ast.h $(srcdir)/diagnose.h $(srcdir)/parser.h \
+             $(srcdir)/lpginput.h $(srcdir)/javaprs.h $(srcdir)/javaact.h \
+             $(srcdir)/error.h $(srcdir)/zip.h $(srcdir)/unzip.h 
+	$(CC) $(CCFLAGS) $(srcdir)/system.cpp 
+
+tab.o: $(srcdir)/tab.h $(srcdir)/tab.cpp $(srcdir)/config.h
+	$(CC) $(CCFLAGS) $(srcdir)/tab.cpp
+
+unzip.o:  $(srcdir)/unzip.cpp $(srcdir)/config.h $(srcdir)/unzip.h 
+	$(CC) $(CCFLAGS) $(srcdir)/unzip.cpp 
+
+wom.o:  $(srcdir)/wom.cpp $(srcdir)/config.h $(srcdir)/semantic.h \
+          $(srcdir)/ast.h $(srcdir)/stream.h $(srcdir)/javadef.h \
+          $(srcdir)/javasym.h $(srcdir)/tuple.h \
+          $(srcdir)/tab.h $(srcdir)/lookup.h $(srcdir)/long.h \
+          $(srcdir)/double.h $(srcdir)/code.h \
+	  $(srcdir)/case.h $(srcdir)/symbol.h $(srcdir)/option.h \
+          $(srcdir)/depend.h $(srcdir)/access.h $(srcdir)/diagnose.h \
+          $(srcdir)/parser.h $(srcdir)/lpginput.h $(srcdir)/javaprs.h \
+          $(srcdir)/javaact.h $(srcdir)/error.h $(srcdir)/control.h $(srcdir)/set.h 
+	$(CC) $(CCFLAGS) $(srcdir)/wom.cpp
+
+zip.o:  $(srcdir)/zip.cpp $(srcdir)/config.h $(srcdir)/control.h \
+          $(srcdir)/option.h $(srcdir)/code.h $(srcdir)/tuple.h \
+	  $(srcdir)/symbol.h $(srcdir)/stream.h $(srcdir)/javadef.h \
+          $(srcdir)/javasym.h $(srcdir)/tab.h $(srcdir)/lookup.h $(srcdir)/long.h \
+	  $(srcdir)/double.h $(srcdir)/case.h \
+          $(srcdir)/depend.h $(srcdir)/access.h $(srcdir)/set.h \
+          $(srcdir)/zip.h $(srcdir)/unzip.h 
+	$(CC) $(CCFLAGS) $(srcdir)/zip.cpp 
+
+segment.o:  $(srcdir)/segment.cpp $(srcdir)/segment.h $(srcdir)/tuple.h $(srcdir)/config.h 
+	$(CC) $(CCFLAGS) $(srcdir)/segment.cpp
+
diff -u -r -N jikes-1.04.orig/src/README.AMIGA jikes-1.04/src/README.AMIGA
--- jikes-1.04.orig/src/README.AMIGA	Thu Jan  1 02:00:00 1970
+++ jikes-1.04/src/README.AMIGA	Fri Sep 17 19:08:36 1999
@@ -0,0 +1,44 @@
+This is the source of the native Amiga port (no ixemul.library required)
+of jikes, the free Java compiler from IBM.
+
+The Aminet version is the latest stable version.  The current development
+version can be found at http://dias.cti.gr/~kyrimis/jikes/ .
+
+To build jikes on the Amiga, you can either run the configure script,
+e.g., type "configure --prefix=/gg" from sh and tweak the resulting
+Makefile, or simply copy Makefile.amiga to Makefile.
+
+Before typing "make", you may want to make the following changes to the
+Makefile:
+* Change the CPU and FPU options.
+* Change the optimization level. Note that using -O2 will produce a binary
+  that is about a megabyte larger, and the resulting gains in compilation
+  time will be overwhelmed by the additional loading time. Also note that
+  you will need at least 70M of memory to compile jikes with -O2, i.e.,
+  you will most likely need to use VMM, and that on a 68040@28MHz it
+  takes about a day to produce the optimized binary. In other words,
+  don't bother.
+
+INSTALLATION:
+Simply copy the jikes executable somewhere in your path.
+
+USAGE:
+Set either the CLASSPATH or the JIKESPATH environment variable to point
+to the directories and zip/jar files that you want your compiler to use.
+E.g., if you are using Kaffe, you can say:
+setenv CLASSPATH "GG:share/kaffe/Klasses.jar;GG:share/kaffe/Pizza.jar;."
+Separate the path components using semicolons. You can use UNIX "." and ".."
+notation for the current directory and for the parent directory of a
+directory.
+
+If you find a bug in the Amiga port, you can contact me at kyrimis@cti.gr
+and I'll see what I can do.
+
+Kriton Kyrimis.
+
+******************************************************************************
+This software is subject to the terms of the IBM Public License, available
+at the following URL: http://www.research.com/jikes/license/license3.htm.
+Copyright (C) 1996, 1999 International Business Machines Corporation
+and others.  All Rights Reserved.
+******************************************************************************
diff -u -r -N jikes-1.04.orig/src/amiga.c jikes-1.04/src/amiga.c
--- jikes-1.04.orig/src/amiga.c	Thu Jan  1 02:00:00 1970
+++ jikes-1.04/src/amiga.c	Fri Sep 17 19:08:37 1999
@@ -0,0 +1,121 @@
+#ifdef stat
+#undef stat
+#endif
+#ifdef fopen
+#undef fopen
+#endif
+#ifdef opendir
+#undef opendir
+#endif
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <string.h>
+#include <unistd.h>
+#include <dirent.h>
+
+__BEGIN_DECLS
+/**
+ * Provide wrappers for the stat, fopen, and opendir functions that massage
+ * the file names given to them as arguments so that UNIX "." and ".."
+ * path names are translated to their AmigaOS equivalents. This is done so
+ * that no intervention is done in terms of file semantics to the jikes
+ * source.
+ */
+static char buf[MAXPATHLEN+1];
+static char cwd[MAXPATHLEN+1];
+static char pathComponent[MAXPATHLEN+1];
+
+static void ix_out(char *s)
+{
+  int ptr;
+
+  if (strcmp(s, ".") == '\0') {
+    if (buf[0] == '\0') {
+      strcat(buf, cwd);
+    }else{
+      ptr = strlen(buf)-1;
+      if (buf[ptr] == '/') {
+        buf[ptr] = '\0';
+      }
+    }
+  }else{
+    if (strcmp(s, "..") != 0) {
+      strcat(buf, s);
+    }
+  }
+}
+
+static char *
+ix_path(const char *path)
+{
+  int len;
+  char sep[2];
+  int appendSep, skipNext = 0;
+  int i, j;
+
+  buf[0] = '\0';
+  cwd[0] = '\0';
+  pathComponent[0] = '\0';
+  sep[1] = '\0';
+  getcwd(cwd, sizeof(cwd));
+  len = strlen(path);
+
+  for (i=0, j=0; i<len; i++) {
+    if (path[i] == '/' || path[i] == ':') {
+      pathComponent[j] = '\0';
+      if (j != 0) {
+        if (buf[0] != '\0' && strcmp(pathComponent, ".") == 0 &&
+	    buf[strlen(buf)-1] == ':') {
+	  appendSep = 0;
+	}else{
+	  appendSep = 1;
+	}
+        ix_out(pathComponent);
+        j = 0;
+        pathComponent[0] = '\0';
+      }
+      sep[0] = path[i];
+      if (appendSep && !skipNext) {
+        strcat(buf, sep);
+      }
+      /* Constructs of the type FOO:/bar are *probably* caused by appending
+       * UNIX-style a path to a directory, so we skip the bogus "/".
+       */
+      if (path[i] == ':' && path[i+1] == '/') {
+        skipNext = 1;
+      }else{
+        skipNext = 0;
+      }
+    }else{
+      pathComponent[j++] = path[i];
+    }
+  }
+  if (j > 0) {
+    pathComponent[j] = '\0';
+    ix_out(pathComponent);
+  }
+  return buf;
+}
+
+int
+mystat(const char *path, struct stat *sb)
+{
+  int status = stat(ix_path(path), sb);
+  return status;
+}
+
+FILE *
+myfopen(char *path, char *mode)
+{
+  FILE *f = fopen(ix_path(path), mode);
+  return f;
+}
+
+DIR *myopendir(const char *path)
+{
+  return opendir(ix_path(path));
+}
+__END_DECLS
diff -u -r -N jikes-1.04.orig/src/bytecode.cpp jikes-1.04/src/bytecode.cpp
--- jikes-1.04.orig/src/bytecode.cpp	Tue Sep 14 19:10:40 1999
+++ jikes-1.04/src/bytecode.cpp	Fri Sep 17 19:08:38 1999
@@ -20,7 +20,9 @@
 #include "table.h"
 #include <iostream.h>
 #include <string.h>
+#ifndef __amigaos__
 #include <wchar.h>
+#endif
 
 #ifdef WIN32_FILE_SYSTEM
 #include <windows.h>
diff -u -r -N jikes-1.04.orig/src/case.h jikes-1.04/src/case.h
--- jikes-1.04.orig/src/case.h	Thu Aug 26 18:34:03 1999
+++ jikes-1.04/src/case.h	Fri Sep 17 19:08:38 1999
@@ -12,7 +12,9 @@
 #define case_INCLUDED
 
 #include "config.h"
+#ifndef __amigaos__
 #include <wchar.h>
+#endif
 
 //
 // NOTE that this class is hard-wired to work on an ASCII machine.
diff -u -r -N jikes-1.04.orig/src/config.cpp jikes-1.04/src/config.cpp
--- jikes-1.04.orig/src/config.cpp	Mon Sep 13 17:21:14 1999
+++ jikes-1.04/src/config.cpp	Fri Sep 17 19:08:39 1999
@@ -364,7 +364,7 @@
 #endif
 
 
-#if defined(GNU_LIBC5)
+#if defined(GNU_LIBC5) || defined __amigaos__
 #include <sys/stat.h>
 #ifndef UNIX
     int SystemMkdir(char *dirname)
diff -u -r -N jikes-1.04.orig/src/config.h jikes-1.04/src/config.h
--- jikes-1.04.orig/src/config.h	Mon Sep 13 17:21:14 1999
+++ jikes-1.04/src/config.h	Fri Sep 17 19:08:39 1999
@@ -10,7 +10,9 @@
 #ifndef config_INCLUDED
 #define config_INCLUDED
 
+#ifndef __amigaos__
 #include <wchar.h>
+#endif
 #include <new.h>
 #include <iostream.h>
 #include <stdlib.h>
@@ -21,6 +23,17 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+
+#if defined(GNU_LIBC5) || defined __amigaos__
+    extern size_t wcslen(wchar_t *);
+    extern wchar_t *wcscpy(wchar_t *, wchar_t *);
+    extern wchar_t *wcsncpy(wchar_t *, wchar_t *, int);
+    extern wchar_t *wcscat(wchar_t *, wchar_t *);
+    extern int wcscmp(wchar_t *, wchar_t *);
+    extern int wcsncmp(wchar_t *, wchar_t *, int);
+#endif
+
+
 #ifdef TEST
 #define NO_LEAKS
 #endif
@@ -576,14 +589,8 @@
 #define UNIX_FILE_SYSTEM
 #endif
 
-
-#if defined(GNU_LIBC5)
-    extern size_t wcslen(wchar_t *);
-    extern wchar_t *wcscpy(wchar_t *, wchar_t *);
-    extern wchar_t *wcsncpy(wchar_t *, wchar_t *, int);
-    extern wchar_t *wcscat(wchar_t *, wchar_t *);
-    extern int wcscmp(wchar_t *, wchar_t *);
-    extern int wcsncmp(wchar_t *, wchar_t *, int);
+#ifdef __amigaos__
+#define AMIGAOS_FILE_SYSTEM
 #endif
 
 
diff -u -r -N jikes-1.04.orig/src/configure jikes-1.04/src/configure
--- jikes-1.04.orig/src/configure	Wed Aug 25 15:11:06 1999
+++ jikes-1.04/src/configure	Fri Sep 17 19:15:59 1999
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12 
+# Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -52,11 +52,16 @@
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 infodir='${prefix}/info'
+guidedir='${prefix}/guide'
+htmldir='${prefix}/html'
+psdir='${prefix}/ps'
+dvidir='${prefix}/dvi'
 mandir='${prefix}/man'
 
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 # Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
 
@@ -168,6 +173,10 @@
   --includedir=DIR        C header files in DIR [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
   --infodir=DIR           info documentation in DIR [PREFIX/info]
+  --guidedir=DIR          Amigaguide documentation in DIR [PREFIX/guide]
+  --htmldir=DIR           HTML documentation in DIR [PREFIX/html]
+  --psdir=DIR             postscript documentation in DIR [PREFIX/ps]
+  --dvidir=DIR            TeX dvi documentation in DIR [PREFIX/dvi]
   --mandir=DIR            man documentation in DIR [PREFIX/man]
   --srcdir=DIR            find the sources in DIR [configure dir or ..]
   --program-prefix=PREFIX prepend PREFIX to installed program names
@@ -210,6 +219,22 @@
   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
     infodir="$ac_optarg" ;;
 
+ -guidedir | --guidedir | --guidedi | --guided | --guide | --gui)
+   ac_prev=guidedir ;;
+ -guidedir=* | --guidedir=* | --guidedi=* | --guided=* | --guide=* |--gui=*)+    guidedir="$ac_optarg" ;;
+
+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm)
+   ac_prev=htmldir ;;
+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* |--htm=*)+    htmldir="$ac_optarg" ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+   ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)+    psdir="$ac_optarg" ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+   ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* |--dv=*)+    dvidir="$ac_optarg" ;;
+
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)
@@ -340,7 +365,7 @@
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
+    echo "configure generated by autoconf version 2.13"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -510,9 +535,11 @@
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+ac_exeext=
+ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -572,7 +599,7 @@
         # Extract the first word of "icc", so it can be a program name with args.
 set dummy icc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:576: checking for $ac_word" >&5
+echo "configure:603: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -580,9 +607,13 @@
   /*)
   ac_cv_path_CC="$CC" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_CC="$CC" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_CC="$ac_dir/$ac_word"
@@ -605,7 +636,7 @@
             # Extract the first word of "xlC", so it can be a program name with args.
 set dummy xlC; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:609: checking for $ac_word" >&5
+echo "configure:640: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -613,9 +644,13 @@
   /*)
   ac_cv_path_CC="$CC" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_CC="$CC" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_CC="$ac_dir/$ac_word"
@@ -674,7 +709,7 @@
         # Extract the first word of "CC", so it can be a program name with args.
 set dummy CC; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:678: checking for $ac_word" >&5
+echo "configure:713: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -682,9 +717,13 @@
   /*)
   ac_cv_path_CC="$CC" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_CC="$CC" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_CC="$ac_dir/$ac_word"
@@ -726,20 +765,21 @@
 #--------------------------------------------------------------------
 
 if test "$CC_NAME" = ""; then
-    for ac_prog in $CCC c++ g++ gcc CC cxx cc++
+    for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:735: checking for $ac_word" >&5
+echo "configure:774: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_CXX="$ac_prog"
@@ -762,21 +802,23 @@
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:766: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:806: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cxx_cross
 
-cat > conftest.$ac_ext <<EOF
-#line 776 "configure"
+cat > conftest.$ac_ext << EOF
+
+#line 817 "configure"
 #include "confdefs.h"
-main(){return(0);}
+
+int main(){return(0);}
 EOF
-if { (eval echo configure:780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -794,7 +836,7 @@
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
@@ -802,12 +844,12 @@
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:806: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:848: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:811: checking whether we are using GNU C++" >&5
+echo "configure:853: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -816,7 +858,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -827,11 +869,15 @@
 
 if test $ac_cv_prog_gxx = yes; then
   GXX=yes
-  ac_test_CXXFLAGS="${CXXFLAGS+set}"
-  ac_save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS=
-  echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:835: checking whether ${CXX-g++} accepts -g" >&5
+else
+  GXX=
+fi
+
+ac_test_CXXFLAGS="${CXXFLAGS+set}"
+ac_save_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS=
+echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+echo "configure:881: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -846,16 +892,20 @@
 fi
 
 echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
-  if test "$ac_test_CXXFLAGS" = set; then
-    CXXFLAGS="$ac_save_CXXFLAGS"
-  elif test $ac_cv_prog_cxx_g = yes; then
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS="$ac_save_CXXFLAGS"
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
     CXXFLAGS="-g -O2"
   else
-    CXXFLAGS="-O2"
+    CXXFLAGS="-g"
   fi
 else
-  GXX=
-  test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
 fi
 
 
@@ -883,14 +933,14 @@
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cxx_cross
 
 
 echo $ac_n "checking builtin bool type""... $ac_c" 1>&6
-echo "configure:892: checking builtin bool type" >&5
+echo "configure:942: checking builtin bool type" >&5
 cat > conftest.$ac_ext <<EOF
-#line 894 "configure"
+#line 944 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -899,7 +949,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 CCREQUIREDFLAGS="$CCREQUIREDFLAGS -DTYPE_bool"
@@ -919,7 +969,7 @@
 # echo the compiler we are using
 
 echo $ac_n "checking for the compiler to use""... $ac_c" 1>&6
-echo "configure:923: checking for the compiler to use" >&5
+echo "configure:973: checking for the compiler to use" >&5
 echo "$ac_t""$CC." 1>&6
 
 
@@ -1050,6 +1100,16 @@
                 ;;
         esac
 	;;
+    AmigaOS)
+        CCREQUIREDFLAGS="$CCREQUIREDFLAGS -DBIGENDIAN -Dstat=mystat -Dfopen=myfopen -Dopendir=myopendir"
+	SYSOBJECTS="-noixemul"
+
+        case "$CC_NAME" in
+            ?++)
+                CCREQUIREDFLAGS="-funsigned-char $CCREQUIREDFLAGS"
+                ;;
+        esac
+	;;
     *)
         { echo "configure: error: platform '`uname -s`' is not supported." 1>&2; exit 1; }
         ;;
@@ -1081,19 +1141,19 @@
 # 	Check for libc brokenness (linux libc5, maybe others?) - CSA
 #--------------------------------------------------------------------
 echo $ac_n "checking for a broken wchar.h""... $ac_c" 1>&6
-echo "configure:1085: checking for a broken wchar.h" >&5
+echo "configure:1145: checking for a broken wchar.h" >&5
 if eval "test \"`echo '$''{'jikes_cv_broken_wchar'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1090 "configure"
+#line 1150 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 int main() {
 wint_t foo;
 ; return 0; }
 EOF
-if { (eval echo configure:1097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   jikes_cv_broken_wchar=no
 else
@@ -1108,17 +1168,19 @@
 echo "$ac_t""$jikes_cv_broken_wchar" 1>&6
 if test $jikes_cv_broken_wchar = yes; then
 	cat > conftest.$ac_ext <<EOF
-#line 1112 "configure"
+#line 1172 "configure"
 #include "confdefs.h"
 
 #include "libc5-fix.h"
+#ifndef __amigaos__
 #include <wchar.h>
+#endif
 
 int main() {
 wint_t foo;
 ; return 0; }
 EOF
-if { (eval echo configure:1122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   CCREQUIREDFLAGS="$CCREQUIREDFLAGS -include libc5-fix.h"
 else
@@ -1170,7 +1232,7 @@
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  case `(ac_space=' '; set) 2>&1` in
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
     # turns \\\\ into \\, and sed turns \\ into \).
@@ -1210,6 +1272,7 @@
 
 trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 
+
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
@@ -1228,7 +1291,9 @@
 : ${CONFIG_STATUS=./config.status}
 
 echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
+# Some systems, like AmigaOS, won't allow you to remove a script that is
+# being executed, so just move it out of the way instead.
+if test -f $CONFIG_STATUS; then mv $CONFIG_STATUS $CONFIG_STATUS.old; else true; fi
 cat > $CONFIG_STATUS <<EOF
 #! /bin/sh
 # Generated automatically by configure.
@@ -1249,7 +1314,7 @@
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -1268,9 +1333,11 @@
  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
+s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
 s%@DEFS@%$DEFS%g
 s%@LDFLAGS@%$LDFLAGS%g
 s%@LIBS@%$LIBS%g
@@ -1288,6 +1355,10 @@
 s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
+s%@guidedir@%$guidedir%g
+s%@htmldir@%$htmldir%g
+s%@psdir@%$psdir%g
+s%@dvidir@%$dvidir%g
 s%@mandir@%$mandir%g
 s%@CC@%$CC%g
 s%@CXX@%$CXX%g
@@ -1405,6 +1476,7 @@
 exit 0
 EOF
 chmod +x $CONFIG_STATUS
+rm -f CONFIG.STATUS.old
 rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
diff -u -r -N jikes-1.04.orig/src/configure.in jikes-1.04/src/configure.in
--- jikes-1.04.orig/src/configure.in	Wed Aug 25 15:11:06 1999
+++ jikes-1.04/src/configure.in	Fri Sep 17 19:08:40 1999
@@ -263,6 +263,16 @@
                 ;;
         esac
 	;;
+    AmigaOS)
+        CCREQUIREDFLAGS="$CCREQUIREDFLAGS -DBIGENDIAN -Dstat=mystat -Dfopen=myfopen -Dopendir=myopendir"
+	SYSOBJECTS="-noixemul"
+
+        case "$CC_NAME" in
+            ?++)
+                CCREQUIREDFLAGS="-funsigned-char $CCREQUIREDFLAGS"
+                ;;
+        esac
+	;;
     *)
         AC_MSG_ERROR([platform '`uname -s`' is not supported.])
         ;;
@@ -293,7 +303,9 @@
 if test $jikes_cv_broken_wchar = yes; then
 	AC_TRY_COMPILE([
 #include "libc5-fix.h"
+#ifndef __amigaos__
 #include <wchar.h>
+#endif
 ],[wint_t foo;],
 	CCREQUIREDFLAGS="$CCREQUIREDFLAGS -include libc5-fix.h",
 	AC_MSG_ERROR([Can't fix broken wchar.h]))
diff -u -r -N jikes-1.04.orig/src/control.cpp jikes-1.04/src/control.cpp
--- jikes-1.04.orig/src/control.cpp	Mon Sep 13 17:21:14 1999
+++ jikes-1.04/src/control.cpp	Fri Sep 17 19:08:41 1999
@@ -631,7 +631,7 @@
 // When searching for a directory in the system, if it is not already present in the hierarchy
 // insert it and attempt to read it from the system...
 //
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
     DirectorySymbol *Control::ProcessSubdirectories(wchar_t *source_name, int source_name_length)
     {
         int name_length = (source_name_length < 0 ? 0 : source_name_length);
@@ -939,7 +939,7 @@
     //
     DirectorySymbol *directory_symbol;
     NameSymbol *file_name_symbol;
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
     int len;
     for (len = name_length - 1; len >= 0 && name[len] != U_SLASH; len--)
         ;
diff -u -r -N jikes-1.04.orig/src/getclass.cpp jikes-1.04/src/getclass.cpp
--- jikes-1.04.orig/src/getclass.cpp	Wed Sep  1 17:58:25 1999
+++ jikes-1.04/src/getclass.cpp	Fri Sep 17 19:08:41 1999
@@ -366,7 +366,7 @@
     }
     else
     {
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
         FILE *classfile = ::SystemFopen(file_symbol -> FileName(), "rb");
         if (classfile == NULL)
         {
diff -u -r -N jikes-1.04.orig/src/jikes.cpp jikes-1.04/src/jikes.cpp
--- jikes-1.04.orig/src/jikes.cpp	Tue Sep 14 16:31:13 1999
+++ jikes-1.04/src/jikes.cpp	Fri Sep 17 19:08:41 1999
@@ -14,6 +14,15 @@
 #include "control.h"
 #include <stdio.h>
 
+#ifdef __amigaos__
+// Jikes definitely needs more than the default 4K stack. I've had no problems
+// running it with a stack of 20000, so we'll use that value, to play it safe,
+// even though the actual stack used is probably a lot less.
+extern "C" {
+  unsigned long __stack = 20000;
+}
+#endif
+
 int main(int argc, char *argv[])
 {
     int return_code;
diff -u -r -N jikes-1.04.orig/src/lookup.h jikes-1.04/src/lookup.h
--- jikes-1.04.orig/src/lookup.h	Wed Sep  1 17:58:25 1999
+++ jikes-1.04/src/lookup.h	Fri Sep 17 19:08:41 1999
@@ -11,7 +11,9 @@
 #define lookup_INCLUDED
 
 #include "config.h"
+#ifndef __amigaos__
 #include <wchar.h>
+#endif
 #include <string.h>
 #include <sys/stat.h>
 #include <time.h>
diff -u -r -N jikes-1.04.orig/src/option.cpp jikes-1.04/src/option.cpp
--- jikes-1.04.orig/src/option.cpp	Thu Aug 26 18:34:09 1999
+++ jikes-1.04/src/option.cpp	Fri Sep 17 19:08:41 1999
@@ -241,7 +241,7 @@
             else if (strcmp(arguments.argv[i], "-d") == 0 && ((i + 1) < arguments.argc))
             {
                 ++i;
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
                 int length = strlen(arguments.argv[i]);
                 directory = new char[length + 1];
                 strcpy(directory, arguments.argv[i]);
diff -u -r -N jikes-1.04.orig/src/option.h jikes-1.04/src/option.h
--- jikes-1.04.orig/src/option.h	Tue Jul  6 16:49:24 1999
+++ jikes-1.04/src/option.h	Fri Sep 17 19:08:41 1999
@@ -17,6 +17,10 @@
 #include <ctype.h>
 #include "code.h"
 #include "tuple.h"
+#ifdef AMIGAOS_FILE_SYSTEM
+#include <unistd.h>
+#include <sys/param.h>
+#endif
 
 class ArgumentExpander
 {
@@ -101,6 +105,13 @@
     char *GetMainCurrentDirectory()
     {
         return current_directory[main_disk];
+    }
+#elif defined(AMIGAOS_FILE_SYSTEM)
+public:
+    char *GetMainCurrentDirectory()
+    {
+	static char buf[MAXPATHLEN+1];
+	return getcwd(buf, sizeof(buf));
     }
 #endif
 
diff -u -r -N jikes-1.04.orig/src/parser.h jikes-1.04/src/parser.h
--- jikes-1.04.orig/src/parser.h	Thu Aug 26 18:34:09 1999
+++ jikes-1.04/src/parser.h	Fri Sep 17 19:08:42 1999
@@ -13,7 +13,9 @@
 #include "config.h"
 #include <limits.h>
 #include <ctype.h>
+#ifndef __amigaos__
 #include <wchar.h>
+#endif
 #include <string.h>
 #include <stdio.h>
 #include "lpginput.h"
diff -u -r -N jikes-1.04.orig/src/semantic.h jikes-1.04/src/semantic.h
--- jikes-1.04.orig/src/semantic.h	Sun Sep 12 21:04:44 1999
+++ jikes-1.04/src/semantic.h	Fri Sep 17 19:08:42 1999
@@ -11,7 +11,9 @@
 #define semantic_INCLUDED
 
 #include "config.h"
+#ifndef __amigaos__
 #include <wchar.h>
+#endif
 #include "ast.h"
 #include "diagnose.h"
 #include "error.h"
diff -u -r -N jikes-1.04.orig/src/stream.cpp jikes-1.04/src/stream.cpp
--- jikes-1.04.orig/src/stream.cpp	Thu Aug 26 18:34:10 1999
+++ jikes-1.04/src/stream.cpp	Fri Sep 17 19:08:42 1999
@@ -303,7 +303,7 @@
         file_symbol -> mtime = status.st_mtime; // actual time stamp of file read
         file_symbol -> lex_stream = this;
 
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
         FILE *srcfile = ::SystemFopen(FileName(), "r");
         if (srcfile != NULL)
         {
@@ -363,7 +363,7 @@
 
         if (status.st_mtime == file_symbol -> mtime)
         {
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
             FILE *srcfile = ::SystemFopen(FileName(), "r");
             if (srcfile != NULL)
             {
diff -u -r -N jikes-1.04.orig/src/symbol.cpp jikes-1.04/src/symbol.cpp
--- jikes-1.04.orig/src/symbol.cpp	Sun Sep 12 21:04:45 1999
+++ jikes-1.04/src/symbol.cpp	Fri Sep 17 19:08:43 1999
@@ -19,7 +19,7 @@
 #include "set.h"
 #include "case.h"
 
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
 #include <dirent.h>
 #elif defined(WIN32_FILE_SYSTEM)
 #include <windows.h>
@@ -763,7 +763,7 @@
     {
         entries = new DirectoryTable();
 
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
         DIR *directory = opendir(this -> DirectoryName());
         if (directory)
         {
diff -u -r -N jikes-1.04.orig/src/symbol.h jikes-1.04/src/symbol.h
--- jikes-1.04.orig/src/symbol.h	Wed Sep  1 17:58:26 1999
+++ jikes-1.04/src/symbol.h	Fri Sep 17 19:08:43 1999
@@ -2310,6 +2310,19 @@
     {
         return Case::StringSegmentEqual(suffix, java_suffix, java_suffix_length);
     }
+#elif defined(AMIGAOS_FILE_SYSTEM)
+    // Do not use StringSegmentEqual() as in the WIN32 case, because that
+    // function may check beyond the end of the string, thus possibly causing
+    // enforcer hits.
+    inline bool FileSymbol::IsClassSuffix(char *suffix)
+    {
+        return (strncasecmp(suffix, class_suffix, class_suffix_length) == 0);
+    }
+
+    inline bool  FileSymbol::IsJavaSuffix(char *suffix)
+    {
+        return (strncasecmp(suffix, java_suffix, java_suffix_length) == 0);
+    }
 #endif
 
 #endif // ifndef symbol_INCLUDED
diff -u -r -N jikes-1.04.orig/src/system.cpp jikes-1.04/src/system.cpp
--- jikes-1.04.orig/src/system.cpp	Sun Sep 12 21:04:45 1999
+++ jikes-1.04/src/system.cpp	Fri Sep 17 19:08:43 1999
@@ -428,7 +428,7 @@
 
 void Control::ProcessPath()
 {
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
     NameSymbol *dot_path_name_symbol = dot_name_symbol;
 
     //
@@ -496,7 +496,7 @@
                 path_name[i] = head[i];
             path_name[path_name_length] = U_NULL;
 
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
 
             input_name = path_name;
 
diff -u -r -N jikes-1.04.orig/src/tab.h jikes-1.04/src/tab.h
--- jikes-1.04.orig/src/tab.h	Fri Feb 12 16:39:13 1999
+++ jikes-1.04/src/tab.h	Fri Sep 17 19:08:44 1999
@@ -11,7 +11,9 @@
 #define tab_INCLUDED
 
 #include "config.h"
+#ifndef __amigaos__
 #include <wchar.h>
+#endif
 #include <string.h>
 
 class Tab
diff -u -r -N jikes-1.04.orig/src/tuple.h jikes-1.04/src/tuple.h
--- jikes-1.04.orig/src/tuple.h	Thu Aug 26 18:34:10 1999
+++ jikes-1.04/src/tuple.h	Fri Sep 17 19:08:44 1999
@@ -413,7 +413,7 @@
 
     inline bool WriteToFile(char *file_name)
     {
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
         FILE *file = ::SystemFopen(file_name, "wb");
         if (file  ==  (FILE *) NULL)
             return false;
diff -u -r -N jikes-1.04.orig/src/unzip.cpp jikes-1.04/src/unzip.cpp
--- jikes-1.04.orig/src/unzip.cpp	Thu Aug 26 18:34:10 1999
+++ jikes-1.04/src/unzip.cpp	Fri Sep 17 19:08:44 1999
@@ -44,7 +44,7 @@
 struct huft *Unzip::global_fixed_td;    /* inflate static */
 int Unzip::global_fixed_bl,
     Unzip::global_fixed_bd;
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
     FILE *Unzip::global_file; /* file pointer for zip file */
 #elif defined(WIN32_FILE_SYSTEM)
     char *Unzip::global_file; /* file pointer for zip file */
@@ -749,7 +749,7 @@
   return 0;
 }
 
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
     int Unzip::unzip8(FILE * zipfile, char *buffer)
 #elif defined(WIN32_FILE_SYSTEM)
     int Unzip::unzip8(char *zipfile, char *buffer)
@@ -790,7 +790,7 @@
 }
 
 
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
     int Unzip::UncompressFile0(FILE *zipfile, char *buffer, long buffer_length)
     {
         fread(buffer, sizeof(char), buffer_length, zipfile);
diff -u -r -N jikes-1.04.orig/src/unzip.h jikes-1.04/src/unzip.h
--- jikes-1.04.orig/src/unzip.h	Thu Aug 26 18:34:10 1999
+++ jikes-1.04/src/unzip.h	Fri Sep 17 19:08:44 1999
@@ -176,7 +176,7 @@
 
 #ifndef NEXTBYTE        /* default is to simply get a byte from stdin */
 /* default for   define NEXTBYTE is  getchar() */
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
     #define NEXTBYTE getc(global_file)
 #elif defined(WIN32_FILE_SYSTEM)
     #define NEXTBYTE ((u1) (*global_file++))
@@ -279,7 +279,7 @@
     static struct huft *global_fixed_td;    /* inflate static */
     static int global_fixed_bl,
                global_fixed_bd;
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
     static FILE *global_file; /* file pointer for zip file */
 #elif defined(WIN32_FILE_SYSTEM)
     static char *global_file;
@@ -341,7 +341,7 @@
     static int inflate_block(int *);
     static int inflate_free();
 
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
     static int unzip8(FILE * zipfile, char *buffer);
 
     static int UncompressFile0(FILE *, char *, long);
diff -u -r -N jikes-1.04.orig/src/zip.cpp jikes-1.04/src/zip.cpp
--- jikes-1.04.orig/src/zip.cpp	Thu Aug 26 18:34:11 1999
+++ jikes-1.04/src/zip.cpp	Fri Sep 17 19:08:44 1999
@@ -20,7 +20,7 @@
 // The ZipFile methods follow
 //
 //************************************************************************************************
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
     int (*ZipFile::uncompress_file[10]) (FILE *, char *, long) =
     {
         UncompressFile0,
@@ -71,6 +71,7 @@
     {
         file_buffer += length;
     }
+
 #endif
 
 
@@ -100,7 +101,7 @@
 
     assert(zip -> IsValid());
 
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
     zipfile = zip -> zipfile;
     int rc = fseek(zipfile, file_symbol -> offset, SEEK_SET);
 
@@ -123,7 +124,7 @@
     u2 extra_field_length                    = GetU2();
     Skip(filename_length + extra_field_length);
 
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
     this -> buffer = new char[file_symbol -> uncompressed_size];
     if (! uncompress_file[compression_method < 9 ? compression_method : 9](zipfile, this -> buffer, file_symbol -> uncompressed_size))
     {
@@ -319,7 +320,7 @@
                                                   magic(0),
                                                   zipbuffer(NULL)
 {
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
     zipfile = ::SystemFopen(zipfile_name, "rb");
     if (zipfile)
     {
@@ -355,7 +356,7 @@
 
 Zip::~Zip()
 {
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
     delete [] zipbuffer;
     if (zipfile)
         fclose(zipfile);
@@ -392,7 +393,7 @@
                  // u2 total_number_of_entries_in_the_  = GetU2();
         u4 central_directory_size                       = GetU4();
 
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
         int rc = fseek(zipfile, -((int) central_directory_size + 22), SEEK_END);
 
         assert(rc == 0);
diff -u -r -N jikes-1.04.orig/src/zip.h jikes-1.04/src/zip.h
--- jikes-1.04.orig/src/zip.h	Tue Jul  6 17:00:40 1999
+++ jikes-1.04/src/zip.h	Fri Sep 17 19:08:44 1999
@@ -41,7 +41,7 @@
     u4 GetU4();
     void Skip(u4 length);
 
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
         FILE *zipfile;
         static int (*uncompress_file[10]) (FILE *, char *, long);
     public:
@@ -88,7 +88,7 @@
     DirectorySymbol *ProcessSubdirectoryEntries(DirectorySymbol *, char *, int);
     void ProcessDirectoryEntry();
 
-#ifdef UNIX_FILE_SYSTEM
+#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM)
     FILE *zipfile;
 #elif defined(WIN32_FILE_SYSTEM)
     HANDLE zipfile, mapfile;