diff -u -r -N jikes-1.11.orig/src/Makefile.amiga jikes-1.11/src/Makefile.amiga --- jikes-1.11.orig/src/Makefile.amiga Thu Jan 1 02:00:00 1970 +++ jikes-1.11/src/Makefile.amiga Mon Jan 17 21:10:19 2000 @@ -0,0 +1,443 @@ +# Generated automatically from Makefile.in by configure. +# $Id: Makefile.in,v 1.14 2000/01/06 06:46:47 lord Exp $ + +# This software is subject to the terms of the IBM Jikes Compiler +# License Agreement available at the following URL: +# http://www.ibm.com/research/jikes. +# Copyright (C) 1996, 1998, International Business Machines Corporation +# and others. All Rights Reserved. +# You must accept the terms of that agreement to use this software. + + +CXX=c++ +CXXREQUIREDFLAGS=-c -ansi -DBIGENDIAN -Dstat=mystat -Dfopen=myfopen -Dopendir=myopendir -Dmkdir=mymkdir -DHAVE_BOOL -DHAVE_WCSLEN -DHAVE_WCSCPY -DHAVE_WCSNCPY -DHAVE_WCSCAT -DHAVE_WCSCMP -DHAVE_WCSNCMP -DHAVE_LIB_ICU_UC -I. +CXXDEBUGFLAGS=-DTEST -g +CXXOPTFLAGS=-O0 -m68020-60 -m68881 +CXXFLAGS=$(CXXREQUIREDFLAGS) $(CXXOPTFLAGS) -DWORDS_BIGENDIAN=1 -DHAVE_WCHAR_H=1 +CFLAGS=$(CXXFLAGS) +ERASE=rm -f +EXECUTABLE=jikes +LD=c++ +LDFLAGS=-s -L. -o $(EXECUTABLE) -m68020-60 -m68881 +LIBS=-lw -licu-uc +# 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) + $(ERASE) core + $(ERASE) gencode.class + +distclean: clean + $(ERASE) config.cache config.log config.status + $(ERASE) Makefile TAGS + $(ERASE) *~ + +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 unparse.o amiga.o + +$(EXECUTABLE): $(OBJECTS) + $(LD) $(LDFLAGS) $(OBJECTS) $(SYSOBJECTS) $(LIBS) + + +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 + $(CXX) $(CXXFLAGS) $(srcdir)/ast.cpp + +unparse.o: $(srcdir)/unparse.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 + $(CXX) $(CXXFLAGS) $(srcdir)/unparse.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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(srcdir)/bytecode.cpp + +config.o: $(srcdir)/config.cpp $(srcdir)/config.h + $(CXX) $(CXXFLAGS) $(srcdir)/config.cpp + +code.o: $(srcdir)/code.cpp $(srcdir)/code.h $(srcdir)/config.h + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(srcdir)/control.cpp + +case.o: $(srcdir)/case.cpp $(srcdir)/config.h $(srcdir)/case.h + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(srcdir)/depend.cpp + +double.o: $(srcdir)/double.cpp $(srcdir)/config.h $(srcdir)/double.h \ + $(srcdir)/long.h + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(srcdir)/jikes.cpp + +long.o: $(srcdir)/long.cpp $(srcdir)/config.h $(srcdir)/long.h \ + $(srcdir)/double.h + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(srcdir)/system.cpp + +tab.o: $(srcdir)/tab.h $(srcdir)/tab.cpp $(srcdir)/config.h + $(CXX) $(CXXFLAGS) $(srcdir)/tab.cpp + +unzip.o: $(srcdir)/unzip.cpp $(srcdir)/config.h $(srcdir)/unzip.h + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(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 + $(CXX) $(CXXFLAGS) $(srcdir)/zip.cpp + +segment.o: $(srcdir)/segment.cpp $(srcdir)/segment.h $(srcdir)/tuple.h $(srcdir)/config.h + $(CXX) $(CXXFLAGS) $(srcdir)/segment.cpp + + +tags: + etags *.h *.cpp + + +TAGS: tags diff -u -r -N jikes-1.11.orig/src/README.AMIGA jikes-1.11/src/README.AMIGA --- jikes-1.11.orig/src/README.AMIGA Thu Jan 1 02:00:00 1970 +++ jikes-1.11/src/README.AMIGA Thu Jan 20 18:10:38 2000 @@ -0,0 +1,59 @@ +This is the source of the native Amiga port (no ixemul.library required) +of jikes, the free Java compiler from IBM. + +The distinction between stable and development version has been +dropped, so the Aminet version is the latest version. The relevant +files can also be downloaded from the Amiga Jikes home page at +http://dias.cti.gr/~kyrimis/jikes/ . + +To build jikes on the Amiga, you need: +* A wide character library (e.g., the simple wchar library that I have + extracted from the Jikes source, available at both Aminet and the Amiga + Jikes web site). +* If you want to enable support for the "-encoding" option, then you must + also install ICU, IBM's International Classes for Unicode. (This + library also requires a wide character library, which is the reason + why the Jikes wide character code cannot be used in place.) + +You can then either run the configure script, e.g., type "LIBS=-lw +configure --prefix=/gg" from sh and tweak the resulting Makefile, or +simply copy Makefile.amiga to Makefile. If you use Makefile.amiga, note +that support for "-encoding" is turned on, so you will have to disable +it if you do not want it. (The relevant items in the Makefile are the +"-DHAVE_LIB_ICU_UC" option in CXXREQUIREDFLAGS and the -licu-uc option +in LIBS.) + +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.11.orig/src/amiga.c jikes-1.11/src/amiga.c --- jikes-1.11.orig/src/amiga.c Thu Jan 1 02:00:00 1970 +++ jikes-1.11/src/amiga.c Sun Jan 16 17:48:56 2000 @@ -0,0 +1,132 @@ +#ifdef stat +#undef stat +#endif +#ifdef fopen +#undef fopen +#endif +#ifdef opendir +#undef opendir +#endif +#ifdef mkdir +#undef mkdir +#endif + +#include +#include +#include +#include +#include +#include +#include + +__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, "/"); + }else{ + 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 0) { + pathComponent[j] = '\0'; + ix_out(pathComponent); + } + return buf; +} + +int +mystat(const char *path, struct stat *sb) +{ + return stat(ix_path(path), sb); +} + +FILE * +myfopen(char *path, char *mode) +{ + return fopen(ix_path(path), mode); +} + +DIR +*myopendir(const char *path) +{ + return opendir(ix_path(path)); +} + +int +mymkdir(const char *path, mode_t mode) +{ + return mkdir(ix_path(path), mode); +} +__END_DECLS diff -u -r -N jikes-1.11.orig/src/config.cpp jikes-1.11/src/config.cpp --- jikes-1.11.orig/src/config.cpp Thu Jan 6 08:46:47 2000 +++ jikes-1.11/src/config.cpp Sun Jan 16 17:48:57 2000 @@ -826,7 +826,7 @@ return (((::SystemStat(name, &status) == 0) && (status.st_mode & STAT_S_IFDIR)) ? 1 : 0); } -#if defined(GNU_LIBC5) +#if defined(GNU_LIBC5) || defined __amigaos__ #include #ifndef UNIX int SystemMkdir(char *dirname) diff -u -r -N jikes-1.11.orig/src/config.h jikes-1.11/src/config.h --- jikes-1.11.orig/src/config.h Thu Jan 6 10:45:44 2000 +++ jikes-1.11/src/config.h Sun Jan 16 17:56:26 2000 @@ -28,6 +28,17 @@ #include #include + +#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); +#endif + + #ifdef TEST #define NO_LEAKS #endif @@ -585,6 +596,10 @@ char info[TAIL_INDEX + 1], // + 1 for '\0' *str; }; + +#ifdef __amigaos__ +#define AMIGAOS_FILE_SYSTEM +#endif // // The configure script check each of these to see if we need our own implementation diff -u -r -N jikes-1.11.orig/src/configure jikes-1.11/src/configure --- jikes-1.11.orig/src/configure Sat Jan 8 00:19:45 2000 +++ jikes-1.11/src/configure Sun Jan 16 18:33:42 2000 @@ -54,6 +54,10 @@ 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. @@ -171,6 +175,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 @@ -213,6 +221,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=*) @@ -553,7 +577,7 @@ # 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:557: checking for $ac_word" >&5 +echo "configure:581: 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 @@ -585,7 +609,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:589: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:613: 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. @@ -596,12 +620,12 @@ cat > conftest.$ac_ext << EOF -#line 600 "configure" +#line 624 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:629: \"$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 @@ -627,12 +651,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:631: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:655: 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:636: checking whether we are using GNU C++" >&5 +echo "configure:660: 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 @@ -641,7 +665,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:645: \"$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:669: \"$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 @@ -660,7 +684,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:664: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:688: 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 @@ -692,12 +716,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:696: checking for Cygwin environment" >&5 +echo "configure:720: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -725,13 +749,13 @@ CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:729: checking for object suffix" >&5 +echo "configure:753: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -749,19 +773,19 @@ ac_objext=$ac_cv_objext echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:753: checking for mingw32 environment" >&5 +echo "configure:777: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -780,7 +804,7 @@ echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:784: checking for executable suffix" >&5 +echo "configure:808: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -790,10 +814,10 @@ rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj) ;; + *.c | *.o | *.obj | *.xSYM) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -856,7 +880,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:860: checking for $ac_word" >&5 +echo "configure:884: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -893,7 +917,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:897: checking for $ac_word" >&5 +echo "configure:921: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -963,7 +987,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:967: checking for $ac_word" >&5 +echo "configure:991: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1058,7 +1082,7 @@ # Extract the first word of "c++", so it can be a program name with args. set dummy c++; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1062: checking for $ac_word" >&5 +echo "configure:1086: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TMP_PROG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1113,7 +1137,7 @@ # echo the compiler we are using echo $ac_n "checking for the compiler to use""... $ac_c" 1>&6 -echo "configure:1117: checking for the compiler to use" >&5 +echo "configure:1141: checking for the compiler to use" >&5 echo "$ac_t""$CXX." 1>&6 @@ -1248,6 +1272,15 @@ EXEEXT=.exe ;; + AmigaOS) + CXXREQUIREDFLAGS="$CXXREQUIREDFLAGS -DBIGENDIAN -Dstat=mystat -Dfopen=myfopen -Dopendir=myopendir -Dmkdir=mymkdir" + SYSOBJECTS="GG:lib/libnix/swapstack.o -noixemul" + case "$CC_NAME" in + ?++) + CXXREQUIREDFLAGS="-funsigned-char $CXXREQUIREDFLAGS" + ;; + esac + ;; *) { echo "configure: error: platform '`uname -s`' is not supported." 1>&2; exit 1; } ;; @@ -1258,14 +1291,14 @@ # Check for endianness #-------------------------------------------------------------------- echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:1262: checking whether byte ordering is bigendian" >&5 +echo "configure:1295: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -1276,11 +1309,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:1280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -1291,7 +1324,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:1295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1311,7 +1344,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -1356,19 +1389,19 @@ #-------------------------------------------------------------------- echo $ac_n "checking builtin bool type""... $ac_c" 1>&6 -echo "configure:1360: checking builtin bool type" >&5 +echo "configure:1393: checking builtin bool type" >&5 if eval "test \"`echo '$''{'jikes_cv_has_bool'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* jikes_cv_has_bool=yes else @@ -1390,12 +1423,12 @@ #-------------------------------------------------------------------------- echo $ac_n "checking for broken ushrt_max""... $ac_c" 1>&6 -echo "configure:1394: checking for broken ushrt_max" >&5 +echo "configure:1427: checking for broken ushrt_max" >&5 if eval "test \"`echo '$''{'jikes_cv_ushrt_max_is_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1407,7 +1440,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:1411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* jikes_cv_ushrt_max_is_broken=no else @@ -1428,7 +1461,7 @@ # Check for some headers which are not present on all supported platforms #---------------------------------------------------------------------------------- echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1432: checking how to run the C++ preprocessor" >&5 +echo "configure:1465: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1441,12 +1474,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1474,17 +1507,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1478: checking for $ac_hdr" >&5 +echo "configure:1511: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1515,12 +1548,12 @@ # Check for wint_t in wchar.h (broken on linux libc5, cygwin, maybe others?) #-------------------------------------------------------------------- echo $ac_n "checking for wint_t in wchar.h""... $ac_c" 1>&6 -echo "configure:1519: checking for wint_t in wchar.h" >&5 +echo "configure:1552: checking for wint_t in wchar.h" >&5 if eval "test \"`echo '$''{'jikes_cv_has_wint_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* CXXREQUIREDFLAGS="$CXXREQUIREDFLAGS -DHAVE_WINT_T" jikes_cv_has_wint_t=yes @@ -1548,7 +1581,7 @@ if test $jikes_cv_has_wint_t = "no"; then cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1583,12 +1616,12 @@ fi echo $ac_n "checking for declaration of wcslen""... $ac_c" 1>&6 -echo "configure:1587: checking for declaration of wcslen" >&5 +echo "configure:1620: checking for declaration of wcslen" >&5 if eval "test \"`echo '$''{'ac_cv_declared_wcslen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_declared_wcslen=yes else @@ -1619,12 +1652,12 @@ fi echo $ac_n "checking for declaration of wcscpy""... $ac_c" 1>&6 -echo "configure:1623: checking for declaration of wcscpy" >&5 +echo "configure:1656: checking for declaration of wcscpy" >&5 if eval "test \"`echo '$''{'ac_cv_declared_wcscpy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_declared_wcscpy=yes else @@ -1655,12 +1688,12 @@ fi echo $ac_n "checking for declaration of wcsncpy""... $ac_c" 1>&6 -echo "configure:1659: checking for declaration of wcsncpy" >&5 +echo "configure:1692: checking for declaration of wcsncpy" >&5 if eval "test \"`echo '$''{'ac_cv_declared_wcsncpy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_declared_wcsncpy=yes else @@ -1691,12 +1724,12 @@ fi echo $ac_n "checking for declaration of wcscat""... $ac_c" 1>&6 -echo "configure:1695: checking for declaration of wcscat" >&5 +echo "configure:1728: checking for declaration of wcscat" >&5 if eval "test \"`echo '$''{'ac_cv_declared_wcscat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_declared_wcscat=yes else @@ -1727,12 +1760,12 @@ fi echo $ac_n "checking for declaration of wcscmp""... $ac_c" 1>&6 -echo "configure:1731: checking for declaration of wcscmp" >&5 +echo "configure:1764: checking for declaration of wcscmp" >&5 if eval "test \"`echo '$''{'ac_cv_declared_wcscmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_declared_wcscmp=yes else @@ -1763,12 +1796,12 @@ fi echo $ac_n "checking for declaration of wcsncmp""... $ac_c" 1>&6 -echo "configure:1767: checking for declaration of wcsncmp" >&5 +echo "configure:1800: checking for declaration of wcsncmp" >&5 if eval "test \"`echo '$''{'ac_cv_declared_wcsncmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_declared_wcsncmp=yes else @@ -1806,7 +1839,7 @@ ac_saved_ld_flags=$LDFLAGS LDFLAGS= echo $ac_n "checking for ucnv_getDefaultName in -licu-uc""... $ac_c" 1>&6 -echo "configure:1810: checking for ucnv_getDefaultName in -licu-uc" >&5 +echo "configure:1843: checking for ucnv_getDefaultName in -licu-uc" >&5 ac_lib_var=`echo icu-uc'_'ucnv_getDefaultName | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1814,7 +1847,7 @@ ac_save_LIBS="$LIBS" LIBS="-licu-uc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1858,7 +1891,7 @@ # Extract the first word of "javac ", so it can be a program name with args. set dummy javac ; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1862: checking for $ac_word" >&5 +echo "configure:1895: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_JAVAC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1892,7 +1925,7 @@ # Extract the first word of "jikes ", so it can be a program name with args. set dummy jikes ; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1896: checking for $ac_word" >&5 +echo "configure:1929: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_JAVAC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1931,7 +1964,7 @@ # Extract the first word of "java ", so it can be a program name with args. set dummy java ; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1935: checking for $ac_word" >&5 +echo "configure:1968: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_JAVA'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2078,6 +2111,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. @@ -2096,7 +2130,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 <= 0 && name[len] != U_SLASH; len--) ; diff -u -r -N jikes-1.11.orig/src/getclass.cpp jikes-1.11/src/getclass.cpp --- jikes-1.11.orig/src/getclass.cpp Wed Nov 3 02:46:31 1999 +++ jikes-1.11/src/getclass.cpp Sun Jan 16 17:49:02 2000 @@ -371,7 +371,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.11.orig/src/jikes.cpp jikes-1.11/src/jikes.cpp --- jikes-1.11.orig/src/jikes.cpp Tue Jan 11 04:50:15 2000 +++ jikes-1.11/src/jikes.cpp Sun Jan 16 17:49:02 2000 @@ -14,6 +14,15 @@ #include "control.h" #include +#ifdef __amigaos__ +// Jikes definitely needs more than the default 4K stack. Without ICU support, +// about 8K seem to be enough. With ICU support stack requirements rise to +// about 26K, so we round this value up to 30K to play it safe. +extern "C" { + unsigned long __stack = 30000; +} +#endif + int main(int argc, char *argv[]) { int return_code; diff -u -r -N jikes-1.11.orig/src/option.cpp jikes-1.11/src/option.cpp --- jikes-1.11.orig/src/option.cpp Thu Jan 6 10:24:30 2000 +++ jikes-1.11/src/option.cpp Sun Jan 16 17:58:29 2000 @@ -265,7 +265,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.11.orig/src/option.h jikes-1.11/src/option.h --- jikes-1.11.orig/src/option.h Fri Jan 7 23:23:58 2000 +++ jikes-1.11/src/option.h Sun Jan 16 17:49:08 2000 @@ -17,6 +17,10 @@ #include #include "code.h" #include "tuple.h" +#ifdef AMIGAOS_FILE_SYSTEM +#include +#include +#endif #ifdef HAVE_LIB_ICU_UC # include @@ -105,6 +109,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.11.orig/src/stream.cpp jikes-1.11/src/stream.cpp --- jikes-1.11.orig/src/stream.cpp Tue Dec 14 19:31:53 1999 +++ jikes-1.11/src/stream.cpp Sun Jan 16 17:49:09 2000 @@ -309,7 +309,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) { @@ -375,7 +375,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.11.orig/src/symbol.cpp jikes-1.11/src/symbol.cpp --- jikes-1.11.orig/src/symbol.cpp Thu Jan 6 10:24:30 2000 +++ jikes-1.11/src/symbol.cpp Sun Jan 16 17:49:10 2000 @@ -19,7 +19,7 @@ #include "set.h" #include "case.h" -#ifdef UNIX_FILE_SYSTEM +#if defined(UNIX_FILE_SYSTEM) || defined(AMIGAOS_FILE_SYSTEM) #include #elif defined(WIN32_FILE_SYSTEM) #include @@ -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.11.orig/src/symbol.h jikes-1.11/src/symbol.h --- jikes-1.11.orig/src/symbol.h Thu Nov 18 05:37:23 1999 +++ jikes-1.11/src/symbol.h Sun Jan 16 17:49:11 2000 @@ -2307,6 +2307,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.11.orig/src/system.cpp jikes-1.11/src/system.cpp --- jikes-1.11.orig/src/system.cpp Thu Nov 18 05:37:23 1999 +++ jikes-1.11/src/system.cpp Sun Jan 16 17:49:11 2000 @@ -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; // @@ -498,7 +498,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.11.orig/src/tuple.h jikes-1.11/src/tuple.h --- jikes-1.11.orig/src/tuple.h Fri Oct 15 05:30:42 1999 +++ jikes-1.11/src/tuple.h Sun Jan 16 17:49:11 2000 @@ -419,7 +419,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.11.orig/src/unzip.cpp jikes-1.11/src/unzip.cpp --- jikes-1.11.orig/src/unzip.cpp Thu Aug 26 18:34:10 1999 +++ jikes-1.11/src/unzip.cpp Sun Jan 16 17:49:12 2000 @@ -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.11.orig/src/unzip.h jikes-1.11/src/unzip.h --- jikes-1.11.orig/src/unzip.h Thu Aug 26 18:34:10 1999 +++ jikes-1.11/src/unzip.h Sun Jan 16 17:49:12 2000 @@ -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.11.orig/src/zip.cpp jikes-1.11/src/zip.cpp --- jikes-1.11.orig/src/zip.cpp Thu Aug 26 18:34:11 1999 +++ jikes-1.11/src/zip.cpp Sun Jan 16 17:49:12 2000 @@ -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.11.orig/src/zip.h jikes-1.11/src/zip.h --- jikes-1.11.orig/src/zip.h Tue Jul 6 17:00:40 1999 +++ jikes-1.11/src/zip.h Sun Jan 16 17:49:12 2000 @@ -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;