[kaffe] CVS kaffe (robilad): moved gnu.bytecodecvssnap and org.objectweb packages to javatools directory
Kaffe CVS
cvs-commits at kaffe.org
Sat Jul 22 20:28:37 PDT 2006
PatchSet 7367
Date: 2006/07/23 03:16:10
Author: robilad
Branch: HEAD
Tag: (none)
Log:
moved gnu.bytecodecvssnap and org.objectweb packages to javatools directory
Members:
ChangeLog:1.4871->1.4872
configure:1.561->1.562
configure.ac:1.239->1.240
kaffe/scripts/javap.in:1.9->1.10
kaffe/scripts/rmic.in:1.10->1.11
libraries/javalib/Makefile.am:1.449->1.450
libraries/javalib/Makefile.in:1.563->1.564
libraries/javalib/external/classpath/config.guess:1.27->1.28
libraries/javalib/external/classpath/ltmain.sh:1.27->1.28
libraries/javalib/external/classpath/doc/tools.info:1.5->1.6
libraries/javalib/external/classpath/doc/vmintegration.info:1.16->1.17
libraries/javalib/vmspecific/gnu/bytecodecvssnap/Access.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/ArrayClassLoader.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/ArrayType.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/AttrContainer.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/Attribute.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/ClassFileInput.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/ClassType.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/ClassTypeWriter.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/CodeAttr.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/ConstantPool.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/ConstantValueAttr.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolClass.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolEntry.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolFloat.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolNameAndType.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolRef.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolString.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolUtf8.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolValue1.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolValue2.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/ExceptionsAttr.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/Field.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/Filter.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/IfState.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/InnerClassesAttr.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/Label.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/LineNumbersAttr.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/LocalVarsAttr.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/Location.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/Method.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/MiscAttr.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/ObjectType.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/PrimType.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/Scope.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/SourceDebugExtAttr.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/SourceFileAttr.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/SwitchState.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/TryState.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/Type.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/VarEnumerator.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/Variable.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/ZipArchive.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/ZipLoader.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/dump.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/gnu/bytecodecvssnap/package.html:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/objectweb/asm153/Attribute.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/objectweb/asm153/ByteVector.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/objectweb/asm153/ClassReader.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/objectweb/asm153/ClassVisitor.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/objectweb/asm153/ClassWriter.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/objectweb/asm153/CodeVisitor.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/objectweb/asm153/CodeWriter.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/objectweb/asm153/Constants.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/objectweb/asm153/Edge.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/objectweb/asm153/Item.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/objectweb/asm153/Label.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/objectweb/asm153/Type.java:1.1->1.2(DEAD)
scripts/ltmain.sh:1.31->1.32
tools/javatools/Makefile.am:1.1->1.2
tools/javatools/Makefile.in:1.27->1.28
tools/javatools/gnu/bytecodecvssnap/Access.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/ArrayClassLoader.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/ArrayType.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/AttrContainer.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/Attribute.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/ClassFileInput.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/ClassType.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/ClassTypeWriter.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/CodeAttr.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/ConstantPool.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/ConstantValueAttr.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/CpoolClass.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/CpoolEntry.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/CpoolFloat.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/CpoolNameAndType.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/CpoolRef.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/CpoolString.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/CpoolUtf8.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/CpoolValue1.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/CpoolValue2.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/ExceptionsAttr.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/Field.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/Filter.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/IfState.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/InnerClassesAttr.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/Label.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/LineNumbersAttr.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/LocalVarsAttr.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/Location.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/Method.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/MiscAttr.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/ObjectType.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/PrimType.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/Scope.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/SourceDebugExtAttr.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/SourceFileAttr.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/SwitchState.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/TryState.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/Type.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/VarEnumerator.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/Variable.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/ZipArchive.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/ZipLoader.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/dump.java:INITIAL->1.1
tools/javatools/gnu/bytecodecvssnap/package.html:INITIAL->1.1
tools/javatools/gnu/classpath/tools/Util.java:INITIAL->1.1
tools/javatools/gnu/classpath/tools/javap/GnuByteCodeJavap.java:INITIAL->1.1
tools/javatools/gnu/classpath/tools/javap/Javap.java:INITIAL->1.1
tools/javatools/gnu/classpath/tools/javap/JavapMain.java:INITIAL->1.1
tools/javatools/gnu/classpath/tools/rmi/rmic/RMIC.java:INITIAL->1.1
tools/javatools/gnu/classpath/tools/rmi/rmic/RMICException.java:INITIAL->1.1
tools/javatools/gnu/classpath/tools/rmi/rmic/Variables.java:INITIAL->1.1
tools/javatools/javalib/.cvsignore:1.1->1.2(DEAD)
tools/javatools/javalib/Makefile.am:1.7->1.8(DEAD)
tools/javatools/javalib/gnu/classpath/tools/Util.java:1.1->1.2(DEAD)
tools/javatools/javalib/gnu/classpath/tools/javap/GnuByteCodeJavap.java:1.1->1.2(DEAD)
tools/javatools/javalib/gnu/classpath/tools/javap/Javap.java:1.1->1.2(DEAD)
tools/javatools/javalib/gnu/classpath/tools/javap/JavapMain.java:1.1->1.2(DEAD)
tools/javatools/javalib/gnu/classpath/tools/rmi/rmic/RMIC.java:1.1->1.2(DEAD)
tools/javatools/javalib/gnu/classpath/tools/rmi/rmic/RMICException.java:1.1->1.2(DEAD)
tools/javatools/javalib/gnu/classpath/tools/rmi/rmic/Variables.java:1.1->1.2(DEAD)
tools/javatools/org/objectweb/asm153/Attribute.java:INITIAL->1.1
tools/javatools/org/objectweb/asm153/ByteVector.java:INITIAL->1.1
tools/javatools/org/objectweb/asm153/ClassReader.java:INITIAL->1.1
tools/javatools/org/objectweb/asm153/ClassVisitor.java:INITIAL->1.1
tools/javatools/org/objectweb/asm153/ClassWriter.java:INITIAL->1.1
tools/javatools/org/objectweb/asm153/CodeVisitor.java:INITIAL->1.1
tools/javatools/org/objectweb/asm153/CodeWriter.java:INITIAL->1.1
tools/javatools/org/objectweb/asm153/Constants.java:INITIAL->1.1
tools/javatools/org/objectweb/asm153/Edge.java:INITIAL->1.1
tools/javatools/org/objectweb/asm153/Item.java:INITIAL->1.1
tools/javatools/org/objectweb/asm153/Label.java:INITIAL->1.1
tools/javatools/org/objectweb/asm153/Type.java:INITIAL->1.1
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4871 kaffe/ChangeLog:1.4872
--- kaffe/ChangeLog:1.4871 Sat Jul 22 14:09:03 2006
+++ kaffe/ChangeLog Sun Jul 23 03:16:10 2006
@@ -1,3 +1,150 @@
+2006-07-23 Dalibor Topic <robilad at kaffe.org>
+
+ * configure.ac:
+ Don't output tools/javalib/javalib/Makefile.
+
+ * kaffe/scripts/javap.in,
+ kaffe/scripts/rmic.in: Use kaffe-classpath-tools.jar.
+
+ * libraries/javalib/vmspecific/gnu/bytecodecvssnap/Access.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/ArrayClassLoader.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/ArrayType.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/AttrContainer.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/Attribute.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/ClassFileInput.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/ClassType.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/ClassTypeWriter.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/CodeAttr.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/ConstantPool.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/ConstantValueAttr.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolClass.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolEntry.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolFloat.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolNameAndType.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolRef.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolString.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolUtf8.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolValue1.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/CpoolValue2.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/ExceptionsAttr.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/Field.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/Filter.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/IfState.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/InnerClassesAttr.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/Label.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/LineNumbersAttr.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/LocalVarsAttr.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/Location.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/Method.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/MiscAttr.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/ObjectType.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/PrimType.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/Scope.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/SourceDebugExtAttr.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/SourceFileAttr.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/SwitchState.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/TryState.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/Type.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/VarEnumerator.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/Variable.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/ZipArchive.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/ZipLoader.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/dump.java,
+ libraries/javalib/vmspecific/gnu/bytecodecvssnap/package.html,
+ libraries/javalib/vmspecific/org/objectweb/asm153/Attribute.java,
+ libraries/javalib/vmspecific/org/objectweb/asm153/ByteVector.java,
+ libraries/javalib/vmspecific/org/objectweb/asm153/ClassReader.java,
+ libraries/javalib/vmspecific/org/objectweb/asm153/ClassVisitor.java,
+ libraries/javalib/vmspecific/org/objectweb/asm153/ClassWriter.java,
+ libraries/javalib/vmspecific/org/objectweb/asm153/CodeVisitor.java,
+ libraries/javalib/vmspecific/org/objectweb/asm153/CodeWriter.java,
+ libraries/javalib/vmspecific/org/objectweb/asm153/Constants.java,
+ libraries/javalib/vmspecific/org/objectweb/asm153/Edge.java,
+ libraries/javalib/vmspecific/org/objectweb/asm153/Item.java,
+ libraries/javalib/vmspecific/org/objectweb/asm153/Label.java,
+ libraries/javalib/vmspecific/org/objectweb/asm153/Type.java,
+ tools/javatools/javalib/gnu/classpath/tools/Util.java,
+ tools/javatools/javalib/gnu/classpath/tools/javap/GnuByteCodeJavap.java,
+ tools/javatools/javalib/gnu/classpath/tools/javap/Javap.java,
+ tools/javatools/javalib/gnu/classpath/tools/javap/JavapMain.java,
+ tools/javatools/javalib/gnu/classpath/tools/rmi/rmic/RMIC.java,
+ tools/javatools/javalib/gnu/classpath/tools/rmi/rmic/RMICException.java,
+ tools/javatools/javalib/gnu/classpath/tools/rmi/rmic/Variables.java:
+ Removed, moved ...
+
+ * tools/javatools/gnu/classpath/tools/Util.java,
+ tools/javatools/gnu/classpath/tools/javap/GnuByteCodeJavap.java,
+ tools/javatools/gnu/classpath/tools/javap/Javap.java,
+ tools/javatools/gnu/classpath/tools/javap/JavapMain.java,
+ tools/javatools/gnu/classpath/tools/rmi/rmic/RMIC.java,
+ tools/javatools/gnu/classpath/tools/rmi/rmic/RMICException.java,
+ tools/javatools/gnu/classpath/tools/rmi/rmic/Variables.java:
+ tools/javatools/gnu/bytecodecvssnap/Access.java,
+ tools/javatools/gnu/bytecodecvssnap/ArrayClassLoader.java,
+ tools/javatools/gnu/bytecodecvssnap/ArrayType.java,
+ tools/javatools/gnu/bytecodecvssnap/AttrContainer.java,
+ tools/javatools/gnu/bytecodecvssnap/Attribute.java,
+ tools/javatools/gnu/bytecodecvssnap/ClassFileInput.java,
+ tools/javatools/gnu/bytecodecvssnap/ClassType.java,
+ tools/javatools/gnu/bytecodecvssnap/ClassTypeWriter.java,
+ tools/javatools/gnu/bytecodecvssnap/CodeAttr.java,
+ tools/javatools/gnu/bytecodecvssnap/ConstantPool.java,
+ tools/javatools/gnu/bytecodecvssnap/ConstantValueAttr.java,
+ tools/javatools/gnu/bytecodecvssnap/CpoolClass.java,
+ tools/javatools/gnu/bytecodecvssnap/CpoolEntry.java,
+ tools/javatools/gnu/bytecodecvssnap/CpoolFloat.java,
+ tools/javatools/gnu/bytecodecvssnap/CpoolNameAndType.java,
+ tools/javatools/gnu/bytecodecvssnap/CpoolRef.java,
+ tools/javatools/gnu/bytecodecvssnap/CpoolString.java,
+ tools/javatools/gnu/bytecodecvssnap/CpoolUtf8.java,
+ tools/javatools/gnu/bytecodecvssnap/CpoolValue1.java,
+ tools/javatools/gnu/bytecodecvssnap/CpoolValue2.java,
+ tools/javatools/gnu/bytecodecvssnap/ExceptionsAttr.java,
+ tools/javatools/gnu/bytecodecvssnap/Field.java,
+ tools/javatools/gnu/bytecodecvssnap/Filter.java,
+ tools/javatools/gnu/bytecodecvssnap/IfState.java,
+ tools/javatools/gnu/bytecodecvssnap/InnerClassesAttr.java,
+ tools/javatools/gnu/bytecodecvssnap/Label.java,
+ tools/javatools/gnu/bytecodecvssnap/LineNumbersAttr.java,
+ tools/javatools/gnu/bytecodecvssnap/LocalVarsAttr.java,
+ tools/javatools/gnu/bytecodecvssnap/Location.java,
+ tools/javatools/gnu/bytecodecvssnap/Method.java,
+ tools/javatools/gnu/bytecodecvssnap/MiscAttr.java,
+ tools/javatools/gnu/bytecodecvssnap/ObjectType.java,
+ tools/javatools/gnu/bytecodecvssnap/PrimType.java,
+ tools/javatools/gnu/bytecodecvssnap/Scope.java,
+ tools/javatools/gnu/bytecodecvssnap/SourceDebugExtAttr.java,
+ tools/javatools/gnu/bytecodecvssnap/SourceFileAttr.java,
+ tools/javatools/gnu/bytecodecvssnap/SwitchState.java,
+ tools/javatools/gnu/bytecodecvssnap/TryState.java,
+ tools/javatools/gnu/bytecodecvssnap/Type.java,
+ tools/javatools/gnu/bytecodecvssnap/VarEnumerator.java,
+ tools/javatools/gnu/bytecodecvssnap/Variable.java,
+ tools/javatools/gnu/bytecodecvssnap/ZipArchive.java,
+ tools/javatools/gnu/bytecodecvssnap/ZipLoader.java,
+ tools/javatools/gnu/bytecodecvssnap/dump.java,
+ tools/javatools/gnu/bytecodecvssnap/package.html,
+ tools/javatools/org/objectweb/asm153/Attribute.java,
+ tools/javatools/org/objectweb/asm153/ByteVector.java,
+ tools/javatools/org/objectweb/asm153/ClassReader.java,
+ tools/javatools/org/objectweb/asm153/ClassVisitor.java,
+ tools/javatools/org/objectweb/asm153/ClassWriter.java,
+ tools/javatools/org/objectweb/asm153/CodeVisitor.java,
+ tools/javatools/org/objectweb/asm153/CodeWriter.java,
+ tools/javatools/org/objectweb/asm153/Constants.java,
+ tools/javatools/org/objectweb/asm153/Edge.java,
+ tools/javatools/org/objectweb/asm153/Item.java,
+ tools/javatools/org/objectweb/asm153/Label.java,
+ tools/javatools/org/objectweb/asm153/Type.java:
+ ... and moved over here.
+
+ * tools/javatools/Makefile.am: Rewritted to use automake Java support.
+
+ * tools/javatools/javalib/.cvsignore,
+ tools/javatools/javalib/Makefile.am:
+ Removed.
+
+
2006-07-22 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/dnsjava/gnu/java/net/DNSJavaInetAddressImpl.java,
Index: kaffe/configure
diff -u kaffe/configure:1.561 kaffe/configure:1.562
--- kaffe/configure:1.561 Sat Jul 22 14:09:09 2006
+++ kaffe/configure Sun Jul 23 03:16:22 2006
@@ -51133,8 +51133,6 @@
ac_config_files="$ac_config_files tools/javatools/Makefile"
- ac_config_files="$ac_config_files tools/javatools/javalib/Makefile"
-
ac_config_files="$ac_config_files test/Makefile"
ac_config_files="$ac_config_files test/internal/Makefile"
@@ -52101,7 +52099,6 @@
"tools/gjdoc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/gjdoc/Makefile" ;;
"tools/gjdoc/javalib/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/gjdoc/javalib/Makefile" ;;
"tools/javatools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/javatools/Makefile" ;;
- "tools/javatools/javalib/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/javatools/javalib/Makefile" ;;
"test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"test/internal/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/internal/Makefile" ;;
"test/regression/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/regression/Makefile" ;;
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.239 kaffe/configure.ac:1.240
--- kaffe/configure.ac:1.239 Sat Jul 22 14:09:20 2006
+++ kaffe/configure.ac Sun Jul 23 03:16:32 2006
@@ -2555,7 +2555,6 @@
AC_CONFIG_FILES([tools/gjdoc/Makefile])
AC_CONFIG_FILES([tools/gjdoc/javalib/Makefile])
AC_CONFIG_FILES([tools/javatools/Makefile])
-AC_CONFIG_FILES([tools/javatools/javalib/Makefile])
AC_CONFIG_FILES([test/Makefile])
AC_CONFIG_FILES([test/internal/Makefile])
AC_CONFIG_FILES([test/regression/Makefile])
Index: kaffe/kaffe/scripts/javap.in
diff -u kaffe/kaffe/scripts/javap.in:1.9 kaffe/kaffe/scripts/javap.in:1.10
--- kaffe/kaffe/scripts/javap.in:1.9 Tue Sep 13 21:37:44 2005
+++ kaffe/kaffe/scripts/javap.in Sun Jul 23 03:16:33 2006
@@ -1,6 +1,6 @@
#! /bin/sh
prefix=@prefix@
exec_prefix=@exec_prefix@
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS -cp @toolslibdir@/tools.jar gnu.classpath.tools.javap.JavapMain ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS -cp @toolslibdir@/kaffe-classpath-tools.jar gnu.classpath.tools.javap.JavapMain ${1+"$@"}
exit $?
Index: kaffe/kaffe/scripts/rmic.in
diff -u kaffe/kaffe/scripts/rmic.in:1.10 kaffe/kaffe/scripts/rmic.in:1.11
--- kaffe/kaffe/scripts/rmic.in:1.10 Tue Sep 13 21:37:44 2005
+++ kaffe/kaffe/scripts/rmic.in Sun Jul 23 03:16:33 2006
@@ -5,6 +5,6 @@
PATH=${PATH}:@bindir@
export PATH
-exec @bindir@/@kaffe_TRANSF@ -cp @toolslibdir@/tools.jar -Dclasspath.compiler=jikes $JAVA_OPTS gnu.classpath.tools.rmi.rmic.RMIC ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ -cp @toolslibdir@/kaffe-classpath-tools.jar -Dclasspath.compiler=jikes $JAVA_OPTS gnu.classpath.tools.rmi.rmic.RMIC ${1+"$@"}
exit $?
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.449 kaffe/libraries/javalib/Makefile.am:1.450
--- kaffe/libraries/javalib/Makefile.am:1.449 Sat Jul 22 14:09:21 2006
+++ kaffe/libraries/javalib/Makefile.am Sun Jul 23 03:16:33 2006
@@ -69,51 +69,6 @@
Makefile.am.in \
logging.properties \
vmspecific/META-INF/MANIFEST.MF \
- vmspecific/gnu/bytecodecvssnap/Access.java \
- vmspecific/gnu/bytecodecvssnap/ArrayClassLoader.java \
- vmspecific/gnu/bytecodecvssnap/ArrayType.java \
- vmspecific/gnu/bytecodecvssnap/AttrContainer.java \
- vmspecific/gnu/bytecodecvssnap/Attribute.java \
- vmspecific/gnu/bytecodecvssnap/ClassFileInput.java \
- vmspecific/gnu/bytecodecvssnap/ClassType.java \
- vmspecific/gnu/bytecodecvssnap/ClassTypeWriter.java \
- vmspecific/gnu/bytecodecvssnap/CodeAttr.java \
- vmspecific/gnu/bytecodecvssnap/ConstantPool.java \
- vmspecific/gnu/bytecodecvssnap/ConstantValueAttr.java \
- vmspecific/gnu/bytecodecvssnap/CpoolClass.java \
- vmspecific/gnu/bytecodecvssnap/CpoolEntry.java \
- vmspecific/gnu/bytecodecvssnap/CpoolFloat.java \
- vmspecific/gnu/bytecodecvssnap/CpoolNameAndType.java \
- vmspecific/gnu/bytecodecvssnap/CpoolRef.java \
- vmspecific/gnu/bytecodecvssnap/CpoolString.java \
- vmspecific/gnu/bytecodecvssnap/CpoolUtf8.java \
- vmspecific/gnu/bytecodecvssnap/CpoolValue1.java \
- vmspecific/gnu/bytecodecvssnap/CpoolValue2.java \
- vmspecific/gnu/bytecodecvssnap/ExceptionsAttr.java \
- vmspecific/gnu/bytecodecvssnap/Field.java \
- vmspecific/gnu/bytecodecvssnap/Filter.java \
- vmspecific/gnu/bytecodecvssnap/IfState.java \
- vmspecific/gnu/bytecodecvssnap/InnerClassesAttr.java \
- vmspecific/gnu/bytecodecvssnap/Label.java \
- vmspecific/gnu/bytecodecvssnap/LineNumbersAttr.java \
- vmspecific/gnu/bytecodecvssnap/LocalVarsAttr.java \
- vmspecific/gnu/bytecodecvssnap/Location.java \
- vmspecific/gnu/bytecodecvssnap/Method.java \
- vmspecific/gnu/bytecodecvssnap/MiscAttr.java \
- vmspecific/gnu/bytecodecvssnap/ObjectType.java \
- vmspecific/gnu/bytecodecvssnap/PrimType.java \
- vmspecific/gnu/bytecodecvssnap/Scope.java \
- vmspecific/gnu/bytecodecvssnap/SourceDebugExtAttr.java \
- vmspecific/gnu/bytecodecvssnap/SourceFileAttr.java \
- vmspecific/gnu/bytecodecvssnap/SwitchState.java \
- vmspecific/gnu/bytecodecvssnap/TryState.java \
- vmspecific/gnu/bytecodecvssnap/Type.java \
- vmspecific/gnu/bytecodecvssnap/VarEnumerator.java \
- vmspecific/gnu/bytecodecvssnap/Variable.java \
- vmspecific/gnu/bytecodecvssnap/ZipArchive.java \
- vmspecific/gnu/bytecodecvssnap/ZipLoader.java \
- vmspecific/gnu/bytecodecvssnap/dump.java \
- vmspecific/gnu/bytecodecvssnap/package.html \
vmspecific/gnu/classpath/Configuration.java.in \
vmspecific/gnu/classpath/VMStackWalker.java \
vmspecific/gnu/classpath/VMSystemProperties.java \
@@ -296,16 +251,4 @@
vmspecific/org/kaffe/util/Ptr.java \
vmspecific/org/kaffe/util/SupportDisabled.java \
vmspecific/org/kaffe/util/UTF8.java \
- vmspecific/org/kaffe/util/zip/SwitchInflater.java \
- vmspecific/org/objectweb/asm153/Attribute.java \
- vmspecific/org/objectweb/asm153/ByteVector.java \
- vmspecific/org/objectweb/asm153/ClassReader.java \
- vmspecific/org/objectweb/asm153/ClassVisitor.java \
- vmspecific/org/objectweb/asm153/ClassWriter.java \
- vmspecific/org/objectweb/asm153/CodeVisitor.java \
- vmspecific/org/objectweb/asm153/CodeWriter.java \
- vmspecific/org/objectweb/asm153/Constants.java \
- vmspecific/org/objectweb/asm153/Edge.java \
- vmspecific/org/objectweb/asm153/Item.java \
- vmspecific/org/objectweb/asm153/Label.java \
- vmspecific/org/objectweb/asm153/Type.java
+ vmspecific/org/kaffe/util/zip/SwitchInflater.java
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.563 kaffe/libraries/javalib/Makefile.in:1.564
--- kaffe/libraries/javalib/Makefile.in:1.563 Sat Jul 22 14:09:25 2006
+++ kaffe/libraries/javalib/Makefile.in Sun Jul 23 03:16:34 2006
@@ -382,51 +382,6 @@
Makefile.am.in \
logging.properties \
vmspecific/META-INF/MANIFEST.MF \
- vmspecific/gnu/bytecodecvssnap/Access.java \
- vmspecific/gnu/bytecodecvssnap/ArrayClassLoader.java \
- vmspecific/gnu/bytecodecvssnap/ArrayType.java \
- vmspecific/gnu/bytecodecvssnap/AttrContainer.java \
- vmspecific/gnu/bytecodecvssnap/Attribute.java \
- vmspecific/gnu/bytecodecvssnap/ClassFileInput.java \
- vmspecific/gnu/bytecodecvssnap/ClassType.java \
- vmspecific/gnu/bytecodecvssnap/ClassTypeWriter.java \
- vmspecific/gnu/bytecodecvssnap/CodeAttr.java \
- vmspecific/gnu/bytecodecvssnap/ConstantPool.java \
- vmspecific/gnu/bytecodecvssnap/ConstantValueAttr.java \
- vmspecific/gnu/bytecodecvssnap/CpoolClass.java \
- vmspecific/gnu/bytecodecvssnap/CpoolEntry.java \
- vmspecific/gnu/bytecodecvssnap/CpoolFloat.java \
- vmspecific/gnu/bytecodecvssnap/CpoolNameAndType.java \
- vmspecific/gnu/bytecodecvssnap/CpoolRef.java \
- vmspecific/gnu/bytecodecvssnap/CpoolString.java \
- vmspecific/gnu/bytecodecvssnap/CpoolUtf8.java \
- vmspecific/gnu/bytecodecvssnap/CpoolValue1.java \
- vmspecific/gnu/bytecodecvssnap/CpoolValue2.java \
- vmspecific/gnu/bytecodecvssnap/ExceptionsAttr.java \
- vmspecific/gnu/bytecodecvssnap/Field.java \
- vmspecific/gnu/bytecodecvssnap/Filter.java \
- vmspecific/gnu/bytecodecvssnap/IfState.java \
- vmspecific/gnu/bytecodecvssnap/InnerClassesAttr.java \
- vmspecific/gnu/bytecodecvssnap/Label.java \
- vmspecific/gnu/bytecodecvssnap/LineNumbersAttr.java \
- vmspecific/gnu/bytecodecvssnap/LocalVarsAttr.java \
- vmspecific/gnu/bytecodecvssnap/Location.java \
- vmspecific/gnu/bytecodecvssnap/Method.java \
- vmspecific/gnu/bytecodecvssnap/MiscAttr.java \
- vmspecific/gnu/bytecodecvssnap/ObjectType.java \
- vmspecific/gnu/bytecodecvssnap/PrimType.java \
- vmspecific/gnu/bytecodecvssnap/Scope.java \
- vmspecific/gnu/bytecodecvssnap/SourceDebugExtAttr.java \
- vmspecific/gnu/bytecodecvssnap/SourceFileAttr.java \
- vmspecific/gnu/bytecodecvssnap/SwitchState.java \
- vmspecific/gnu/bytecodecvssnap/TryState.java \
- vmspecific/gnu/bytecodecvssnap/Type.java \
- vmspecific/gnu/bytecodecvssnap/VarEnumerator.java \
- vmspecific/gnu/bytecodecvssnap/Variable.java \
- vmspecific/gnu/bytecodecvssnap/ZipArchive.java \
- vmspecific/gnu/bytecodecvssnap/ZipLoader.java \
- vmspecific/gnu/bytecodecvssnap/dump.java \
- vmspecific/gnu/bytecodecvssnap/package.html \
vmspecific/gnu/classpath/Configuration.java.in \
vmspecific/gnu/classpath/VMStackWalker.java \
vmspecific/gnu/classpath/VMSystemProperties.java \
@@ -609,19 +564,7 @@
vmspecific/org/kaffe/util/Ptr.java \
vmspecific/org/kaffe/util/SupportDisabled.java \
vmspecific/org/kaffe/util/UTF8.java \
- vmspecific/org/kaffe/util/zip/SwitchInflater.java \
- vmspecific/org/objectweb/asm153/Attribute.java \
- vmspecific/org/objectweb/asm153/ByteVector.java \
- vmspecific/org/objectweb/asm153/ClassReader.java \
- vmspecific/org/objectweb/asm153/ClassVisitor.java \
- vmspecific/org/objectweb/asm153/ClassWriter.java \
- vmspecific/org/objectweb/asm153/CodeVisitor.java \
- vmspecific/org/objectweb/asm153/CodeWriter.java \
- vmspecific/org/objectweb/asm153/Constants.java \
- vmspecific/org/objectweb/asm153/Edge.java \
- vmspecific/org/objectweb/asm153/Item.java \
- vmspecific/org/objectweb/asm153/Label.java \
- vmspecific/org/objectweb/asm153/Type.java
+ vmspecific/org/kaffe/util/zip/SwitchInflater.java
all: all-recursive
@@ -818,7 +761,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/vmspecific/META-INF $(distdir)/vmspecific/gnu/bytecodecvssnap $(distdir)/vmspecific/gnu/classpath $(distdir)/vmspecific/gnu/classpath/jdwp $(distdir)/vmspecific/gnu/getopt $(distdir)/vmspecific/gnu/inet/comsat $(distdir)/vmspecific/gnu/inet/finger $(distdir)/vmspecific/gnu/inet/gopher $(distdir)/vmspecific/gnu/inet/imap $(distdir)/vmspecific/gnu/inet/ldap $(distdir)/vmspecific/gnu/inet/nntp $(distdir)/vmspecific/gnu/inet/pop3 $(distdir)/vmspecific/gnu/inet/smtp $(distdir)/vmspecific/gnu/inet/util $(distdir)/vmspecific/gnu/java/lang $(distdir)/vmspecific/gnu/java/lang/management $(distdir)/vmspecific/gnu/java/net $(distdir)/vmspecific/gnu/java/nio $(distdir)/vmspecific/java/io $(distdir)/vmspecific/java/lang $(distdir)/vmspecific/java/lang/management $(distdir)/vmspecific/java/lang/ref $(distdir)/vmspecific/java/lang/reflect $(distdir)/vmspecific/java/net $(distdir)/vmspecific/java/nio $(distdir)/vmspecific/java/nio/channels $(distdir)/vmspecific/java/security $(distdir)/vmspecific/java/util $(distdir)/vmspecific/java/util/mime $(distdir)/vmspecific/java/util/zip $(distdir)/vmspecific/org/kaffe/jar $(distdir)/vmspecific/org/kaffe/management $(distdir)/vmspecific/org/kaffe/security $(distdir)/vmspecific/org/kaffe/security/provider $(distdir)/vmspecific/org/kaffe/util $(distdir)/vmspecific/org/kaffe/util/zip $(distdir)/vmspecific/org/objectweb/asm153
+ $(mkdir_p) $(distdir)/vmspecific/META-INF $(distdir)/vmspecific/gnu/classpath $(distdir)/vmspecific/gnu/classpath/jdwp $(distdir)/vmspecific/gnu/getopt $(distdir)/vmspecific/gnu/inet/comsat $(distdir)/vmspecific/gnu/inet/finger $(distdir)/vmspecific/gnu/inet/gopher $(distdir)/vmspecific/gnu/inet/imap $(distdir)/vmspecific/gnu/inet/ldap $(distdir)/vmspecific/gnu/inet/nntp $(distdir)/vmspecific/gnu/inet/pop3 $(distdir)/vmspecific/gnu/inet/smtp $(distdir)/vmspecific/gnu/inet/util $(distdir)/vmspecific/gnu/java/lang $(distdir)/vmspecific/gnu/java/lang/management $(distdir)/vmspecific/gnu/java/net $(distdir)/vmspecific/gnu/java/nio $(distdir)/vmspecific/java/io $(distdir)/vmspecific/java/lang $(distdir)/vmspecific/java/lang/management $(distdir)/vmspecific/java/lang/ref $(distdir)/vmspecific/java/lang/reflect $(distdir)/vmspecific/java/net $(distdir)/vmspecific/java/nio $(distdir)/vmspecific/java/nio/channels $(distdir)/vmspecific/java/security $(distdir)/vmspecific/java/util $(distdir)/vmspecific/java/util/mime $(distdir)/vmspecific/java/util/zip $(distdir)/vmspecific/org/kaffe/jar $(distdir)/vmspecific/org/kaffe/management $(distdir)/vmspecific/org/kaffe/security $(distdir)/vmspecific/org/kaffe/security/provider $(distdir)/vmspecific/org/kaffe/util $(distdir)/vmspecific/org/kaffe/util/zip
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
Index: kaffe/libraries/javalib/external/classpath/config.guess
diff -u kaffe/libraries/javalib/external/classpath/config.guess:1.27 kaffe/libraries/javalib/external/classpath/config.guess:1.28
--- kaffe/libraries/javalib/external/classpath/config.guess:1.27 Fri Jul 14 19:15:43 2006
+++ kaffe/libraries/javalib/external/classpath/config.guess Sun Jul 23 03:16:35 2006
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2005-08-03'
+timestamp='2005-04-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,15 +17,13 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-
# Originally written by Per Bothner <per at bothner.com>.
# Please send patches to <config-patches at gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
@@ -68,11 +66,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
+ echo "$timestamp" ; exit 0 ;;
--version | -v )
- echo "$version" ; exit ;;
+ echo "$version" ; exit 0 ;;
--help | --h* | -h )
- echo "$usage"; exit ;;
+ echo "$usage"; exit 0 ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -125,7 +123,7 @@
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+esac ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi at noc.rutgers.edu 1994-08-24)
@@ -198,20 +196,55 @@
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
- exit ;;
+ exit 0 ;;
+ amd64:OpenBSD:*:*)
+ echo x86_64-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ cats:OpenBSD:*:*)
+ echo arm-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ hp300:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ luna88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mac68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ macppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvmeppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sgi:OpenBSD:*:*)
+ echo mips64-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sun3:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
*:OpenBSD:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
- exit ;;
+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
macppc:MirBSD:*:*)
echo powerppc-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -264,43 +297,40 @@
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit ;;
+ exit 0 ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
# of the specific Alpha model?
echo alpha-pc-interix
- exit ;;
+ exit 0 ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
- exit ;;
+ exit 0 ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
- exit ;;
+ exit 0;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
- exit ;;
+ exit 0 ;;
*:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos
- exit ;;
+ exit 0 ;;
*:OS/390:*:*)
echo i370-ibm-openedition
- exit ;;
+ exit 0 ;;
*:z/VM:*:*)
echo s390-ibm-zvmoe
- exit ;;
+ exit 0 ;;
*:OS400:*:*)
echo powerpc-ibm-os400
- exit ;;
+ exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
- exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
- echo arm-unknown-riscos
- exit ;;
+ exit 0;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
- exit ;;
+ exit 0;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -308,32 +338,32 @@
else
echo pyramid-pyramid-bsd
fi
- exit ;;
+ exit 0 ;;
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
- exit ;;
+ exit 0 ;;
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
- exit ;;
+ exit 0 ;;
DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7; exit ;;
+ sparc) echo sparc-icl-nx7 && exit 0 ;;
esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
+ exit 0 ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
+ exit 0 ;;
i86pc:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
+ exit 0 ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
+ exit 0 ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
@@ -342,10 +372,10 @@
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit ;;
+ exit 0 ;;
sun3*:SunOS:*:*)
echo m68k-sun-sunos${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -357,10 +387,10 @@
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
- exit ;;
+ exit 0 ;;
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -371,40 +401,40 @@
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
- exit ;;
+ exit 0 ;;
RISC*:ULTRIX:*:*)
echo mips-dec-ultrix${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
VAX*:ULTRIX*:*:*)
echo vax-dec-ultrix${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
echo clipper-intergraph-clix${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -428,33 +458,32 @@
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c &&
- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
- SYSTEM_NAME=`$dummy $dummyarg` &&
- { echo "$SYSTEM_NAME"; exit; }
+ $CC_FOR_BUILD -o $dummy $dummy.c \
+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+ && exit 0
echo mips-mips-riscos${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
- exit ;;
+ exit 0 ;;
Motorola:*:4.3:PL8-*)
echo powerpc-harris-powermax
- exit ;;
+ exit 0 ;;
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
echo powerpc-harris-powermax
- exit ;;
+ exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
- exit ;;
+ exit 0 ;;
m88k:CX/UX:7*:*)
echo m88k-harris-cxux7
- exit ;;
+ exit 0 ;;
m88k:*:4*:R4*)
echo m88k-motorola-sysv4
- exit ;;
+ exit 0 ;;
m88k:*:3*:R3*)
echo m88k-motorola-sysv3
- exit ;;
+ exit 0 ;;
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -470,29 +499,29 @@
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit ;;
+ exit 0 ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
- exit ;;
+ exit 0 ;;
M88*:*:R3*:*)
# Delta 88k system running SVR3
echo m88k-motorola-sysv3
- exit ;;
+ exit 0 ;;
XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
echo m88k-tektronix-sysv3
- exit ;;
+ exit 0 ;;
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
echo m68k-tektronix-bsd
- exit ;;
+ exit 0 ;;
*:IRIX*:*:*)
echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit ;;
+ exit 0 ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
i*86:AIX:*:*)
echo i386-ibm-aix
- exit ;;
+ exit 0 ;;
ia64:AIX:*:*)
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
@@ -500,7 +529,7 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit ;;
+ exit 0 ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
@@ -515,18 +544,14 @@
exit(0);
}
EOF
- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
- then
- echo "$SYSTEM_NAME"
- else
- echo rs6000-ibm-aix3.2.5
- fi
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ echo rs6000-ibm-aix3.2.5
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
else
echo rs6000-ibm-aix3.2
fi
- exit ;;
+ exit 0 ;;
*:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -540,28 +565,28 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit ;;
+ exit 0 ;;
*:AIX:*:*)
echo rs6000-ibm-aix
- exit ;;
+ exit 0 ;;
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
- exit ;;
+ exit 0 ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit ;; # report: romp-ibm BSD 4.3
+ exit 0 ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
- exit ;;
+ exit 0 ;;
DPX/2?00:B.O.S.:*:*)
echo m68k-bull-sysv3
- exit ;;
+ exit 0 ;;
9000/[34]??:4.3bsd:1.*:*)
echo m68k-hp-bsd
- exit ;;
+ exit 0 ;;
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
echo m68k-hp-bsd4.4
- exit ;;
+ exit 0 ;;
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
@@ -623,19 +648,9 @@
esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
- eval $set_cc_for_build
-
- # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
- # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
- # generating 64-bit code. GNU and HP use different nomenclature:
- #
- # $ CC_FOR_BUILD=cc ./config.guess
- # => hppa2.0w-hp-hpux11.23
- # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
- grep __LP64__ >/dev/null
+ # avoid double evaluation of $set_cc_for_build
+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
then
HP_ARCH="hppa2.0w"
else
@@ -643,11 +658,11 @@
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit ;;
+ exit 0 ;;
ia64:HP-UX:*:*)
*** Patch too long, truncated ***
More information about the kaffe
mailing list