[kaffe] CVS kaffe (robilad): Removed jzlib

Kaffe CVS cvs-commits at kaffe.org
Tue Feb 7 18:18:00 PST 2006


PatchSet 7120 
Date: 2006/02/08 02:05:52
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Removed jzlib

2006-02-08  Dalibor Topic  <robilad at kaffe.org>

        * THIRPARTY: Removed jzlib and jessie. No longer needed since
        jessie was merged into GNU Classpath.

        libraries/javalib/vmspecific/com/jcraft/jzlib/Adler32.java,
        libraries/javalib/vmspecific/com/jcraft/jzlib/Deflate.java,
        libraries/javalib/vmspecific/com/jcraft/jzlib/InfBlocks.java,
        libraries/javalib/vmspecific/com/jcraft/jzlib/InfCodes.java,
        libraries/javalib/vmspecific/com/jcraft/jzlib/InfTree.java,
        libraries/javalib/vmspecific/com/jcraft/jzlib/Inflate.java,
        libraries/javalib/vmspecific/com/jcraft/jzlib/JZlib.java,
        libraries/javalib/vmspecific/com/jcraft/jzlib/StaticTree.java,
        libraries/javalib/vmspecific/com/jcraft/jzlib/Tree.java,
        libraries/javalib/vmspecific/com/jcraft/jzlib/ZInputStream.java,
        libraries/javalib/vmspecific/com/jcraft/jzlib/ZOutputStream.java,
        libraries/javalib/vmspecific/com/jcraft/jzlib/ZStream.java,
        libraries/javalib/vmspecific/com/jcraft/jzlib/ZStreamException.java:
        Removed.

Members: 
	ChangeLog:1.4638->1.4639 
	THIRDPARTY:1.42->1.43 
	libraries/javalib/Makefile.am:1.421->1.422 
	libraries/javalib/Makefile.in:1.527->1.528 
	libraries/javalib/external/classpath/config.guess:1.15->1.16 
	libraries/javalib/external/classpath/ltmain.sh:1.15->1.16 
	libraries/javalib/vmspecific/com/jcraft/jzlib/Adler32.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/com/jcraft/jzlib/Deflate.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/com/jcraft/jzlib/InfBlocks.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/com/jcraft/jzlib/InfCodes.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/com/jcraft/jzlib/InfTree.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/com/jcraft/jzlib/Inflate.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/com/jcraft/jzlib/JZlib.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/com/jcraft/jzlib/StaticTree.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/com/jcraft/jzlib/Tree.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/com/jcraft/jzlib/ZInputStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/com/jcraft/jzlib/ZOutputStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/com/jcraft/jzlib/ZStream.java:1.1->1.2(DEAD) 
	libraries/javalib/vmspecific/com/jcraft/jzlib/ZStreamException.java:1.1->1.2(DEAD) 
	scripts/ltmain.sh:1.21->1.22 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4638 kaffe/ChangeLog:1.4639
--- kaffe/ChangeLog:1.4638	Tue Feb  7 23:59:06 2006
+++ kaffe/ChangeLog	Wed Feb  8 02:05:52 2006
@@ -1,3 +1,23 @@
+2006-02-08  Dalibor Topic  <robilad at kaffe.org>
+
+	* THIRPARTY: Removed jzlib and jessie. No longer needed since 
+	jessie was merged into GNU Classpath.
+
+	libraries/javalib/vmspecific/com/jcraft/jzlib/Adler32.java,
+	libraries/javalib/vmspecific/com/jcraft/jzlib/Deflate.java,
+	libraries/javalib/vmspecific/com/jcraft/jzlib/InfBlocks.java,
+	libraries/javalib/vmspecific/com/jcraft/jzlib/InfCodes.java,
+	libraries/javalib/vmspecific/com/jcraft/jzlib/InfTree.java,
+	libraries/javalib/vmspecific/com/jcraft/jzlib/Inflate.java,
+	libraries/javalib/vmspecific/com/jcraft/jzlib/JZlib.java,
+	libraries/javalib/vmspecific/com/jcraft/jzlib/StaticTree.java,
+	libraries/javalib/vmspecific/com/jcraft/jzlib/Tree.java,
+	libraries/javalib/vmspecific/com/jcraft/jzlib/ZInputStream.java,
+	libraries/javalib/vmspecific/com/jcraft/jzlib/ZOutputStream.java,
+	libraries/javalib/vmspecific/com/jcraft/jzlib/ZStream.java,
+	libraries/javalib/vmspecific/com/jcraft/jzlib/ZStreamException.java:
+	Removed.
+
 2006-02-07  Holger Schurig  <hs4233 at mail.mn-solutions.de>
 
 	Fix for #8.
Index: kaffe/THIRDPARTY
diff -u kaffe/THIRDPARTY:1.42 kaffe/THIRDPARTY:1.43
--- kaffe/THIRDPARTY:1.42	Tue Jan  3 15:26:43 2006
+++ kaffe/THIRDPARTY	Wed Feb  8 02:05:55 2006
@@ -149,74 +149,6 @@
 More information on GNU Crypto is available from 
 http://www.gnu.org/software/gnu-crypto/.
 
-* com.jcraft.jzlib
-
-This code has been merged in from Jessie. Kaffe tracks this
-projects' CVS HEAD.
-
-JZLib is licensed under a BSD-style license without an advertising 
-clause:
-
-Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in
-     the documentation and/or other materials provided with the distribution.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-More information on JZLib is available from
-http://www.jcraft.com/jzlib/.
-
-* javax.net, javax.net.ssl, javax.security.cert, org.metastatic
-
-This code has been merged in from Jessie. Kaffe tracks this
-projects' CVS HEAD.
-
-Jessie is distributed under the terms of the GNU General Public
-License. The implementations of javax.net, javax.net.ssl, and 
-javax.security.cert packages are additionally covered by the following
-exception:
-
-    "Linking this library statically or dynamically with other modules
-    is making a combined work based on this library. Thus, the terms 
-    and conditions of the GNU General Public License cover the whole 
-    combination.
-
-    As a special exception, the copyright holders of this library 
-    give you permission to link this library with independent modules 
-    to produce an executable, regardless of the license terms of 
-    these independent modules, and to copy and distribute the 
-    resulting executable under terms of your choice, provided that you 
-    also meet, for each linked independent module, the terms and 
-    conditions of the license of that module. An independent module 
-    is a module which is not derived from or based on this library. If
-    you modify this library, you may extend this exception to your 
-    version of the library, but you are not obligated to do so. If you 
-    do not wish to do so, delete this exception statement from your 
-    version."
-
-More information on Jessie is available from 
-http://www.nongnu.org/jessie/.
-
 * org.ietf.jgss
 
 The documentation of some of the files in org/ietf/jgss/ is derived from
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.421 kaffe/libraries/javalib/Makefile.am:1.422
--- kaffe/libraries/javalib/Makefile.am:1.421	Tue Feb  7 21:48:24 2006
+++ kaffe/libraries/javalib/Makefile.am	Wed Feb  8 02:05:55 2006
@@ -63,19 +63,6 @@
 	vmspecific/META-INF/services/javax.sound.sampled.spi.AudioFileWriter \
 	vmspecific/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider \
 	vmspecific/META-INF/services/javax.sound.sampled.spi.MixerProvider \
-	vmspecific/com/jcraft/jzlib/Adler32.java \
-	vmspecific/com/jcraft/jzlib/Deflate.java \
-	vmspecific/com/jcraft/jzlib/InfBlocks.java \
-	vmspecific/com/jcraft/jzlib/InfCodes.java \
-	vmspecific/com/jcraft/jzlib/InfTree.java \
-	vmspecific/com/jcraft/jzlib/Inflate.java \
-	vmspecific/com/jcraft/jzlib/JZlib.java \
-	vmspecific/com/jcraft/jzlib/StaticTree.java \
-	vmspecific/com/jcraft/jzlib/Tree.java \
-	vmspecific/com/jcraft/jzlib/ZInputStream.java \
-	vmspecific/com/jcraft/jzlib/ZOutputStream.java \
-	vmspecific/com/jcraft/jzlib/ZStream.java \
-	vmspecific/com/jcraft/jzlib/ZStreamException.java \
 	vmspecific/gnu/bytecodecvssnap/Access.java \
 	vmspecific/gnu/bytecodecvssnap/ArrayClassLoader.java \
 	vmspecific/gnu/bytecodecvssnap/ArrayType.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.527 kaffe/libraries/javalib/Makefile.in:1.528
--- kaffe/libraries/javalib/Makefile.in:1.527	Tue Feb  7 21:48:25 2006
+++ kaffe/libraries/javalib/Makefile.in	Wed Feb  8 02:05:56 2006
@@ -382,19 +382,6 @@
 	vmspecific/META-INF/services/javax.sound.sampled.spi.AudioFileWriter \
 	vmspecific/META-INF/services/javax.sound.sampled.spi.FormatConversionProvider \
 	vmspecific/META-INF/services/javax.sound.sampled.spi.MixerProvider \
-	vmspecific/com/jcraft/jzlib/Adler32.java \
-	vmspecific/com/jcraft/jzlib/Deflate.java \
-	vmspecific/com/jcraft/jzlib/InfBlocks.java \
-	vmspecific/com/jcraft/jzlib/InfCodes.java \
-	vmspecific/com/jcraft/jzlib/InfTree.java \
-	vmspecific/com/jcraft/jzlib/Inflate.java \
-	vmspecific/com/jcraft/jzlib/JZlib.java \
-	vmspecific/com/jcraft/jzlib/StaticTree.java \
-	vmspecific/com/jcraft/jzlib/Tree.java \
-	vmspecific/com/jcraft/jzlib/ZInputStream.java \
-	vmspecific/com/jcraft/jzlib/ZOutputStream.java \
-	vmspecific/com/jcraft/jzlib/ZStream.java \
-	vmspecific/com/jcraft/jzlib/ZStreamException.java \
 	vmspecific/gnu/bytecodecvssnap/Access.java \
 	vmspecific/gnu/bytecodecvssnap/ArrayClassLoader.java \
 	vmspecific/gnu/bytecodecvssnap/ArrayType.java \
@@ -1570,7 +1557,7 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/vmspecific/META-INF $(distdir)/vmspecific/META-INF/services $(distdir)/vmspecific/com/jcraft/jzlib $(distdir)/vmspecific/gnu/bytecodecvssnap $(distdir)/vmspecific/gnu/classpath $(distdir)/vmspecific/gnu/classpath/jdwp $(distdir)/vmspecific/gnu/crypto $(distdir)/vmspecific/gnu/crypto/assembly $(distdir)/vmspecific/gnu/crypto/auth $(distdir)/vmspecific/gnu/crypto/auth/callback $(distdir)/vmspecific/gnu/crypto/cipher $(distdir)/vmspecific/gnu/crypto/der $(distdir)/vmspecific/gnu/crypto/exp $(distdir)/vmspecific/gnu/crypto/exp/ust $(distdir)/vmspecific/gnu/crypto/hash $(distdir)/vmspecific/gnu/crypto/jce $(distdir)/vmspecific/gnu/crypto/jce/cipher $(distdir)/vmspecific/gnu/crypto/jce/hash $(distdir)/vmspecific/gnu/crypto/jce/key $(distdir)/vmspecific/gnu/crypto/jce/keyring $(distdir)/vmspecific/gnu/crypto/jce/mac $(distdir)/vmspecific/gnu/crypto/jce/params $(distdir)/vmspecific/gnu/crypto/jce/prng $(distdir)/vmspecific/gnu/crypto/jce/sig $(distdir)/vmspecific/gnu/crypto/jce/spec $(distdir)/vmspecific/gnu/crypto/key $(distdir)/vmspecific/gnu/crypto/key/dh $(distdir)/vmspecific/gnu/crypto/key/dss $(distdir)/vmspecific/gnu/crypto/key/rsa $(distdir)/vmspecific/gnu/crypto/key/srp6 $(distdir)/vmspecific/gnu/crypto/keyring $(distdir)/vmspecific/gnu/crypto/mac $(distdir)/vmspecific/gnu/crypto/mode $(distdir)/vmspecific/gnu/crypto/pad $(distdir)/vmspecific/gnu/crypto/pki $(distdir)/vmspecific/gnu/crypto/pki/ext $(distdir)/vmspecific/gnu/crypto/pki/io $(distdir)/vmspecific/gnu/crypto/pki/provider $(distdir)/vmspecific/gnu/crypto/prng $(distdir)/vmspecific/gnu/crypto/sasl $(distdir)/vmspecific/gnu/crypto/sasl/anonymous $(distdir)/vmspecific/gnu/crypto/sasl/crammd5 $(distdir)/vmspecific/gnu/crypto/sasl/plain $(distdir)/vmspecific/gnu/crypto/sasl/srp $(distdir)/vmspecific/gnu/crypto/sig $(distdir)/vmspecific/gnu/crypto/sig/dss $(distdir)/vmspecific/gnu/crypto/sig/rsa $(distdir)/vmspecific/gnu/crypto/tool $(distdir)/vmspecific/gnu/crypto/tool/keytool $(distdir)/vmspecific/gnu/crypto/util $(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/net $(distdir)/vmspecific/gnu/java/nio $(distdir)/vmspecific/java/io $(distdir)/vmspecific/java/lang $(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/beans/editors $(distdir)/vmspecific/org/kaffe/io $(distdir)/vmspecific/org/kaffe/jar $(distdir)/vmspecific/org/kaffe/lang $(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/locale $(distdir)/vmspecific/org/kaffe/util/log $(distdir)/vmspecific/org/kaffe/util/zip $(distdir)/vmspecific/org/objectweb/asm153 $(distdir)/vmspecific/org/tritonus/core $(distdir)/vmspecific/org/tritonus/lowlevel/alsa $(distdir)/vmspecific/org/tritonus/lowlevel/esd $(distdir)/vmspecific/org/tritonus/midi/device/alsa $(distdir)/vmspecific/org/tritonus/midi/file $(distdir)/vmspecific/org/tritonus/sampled/convert $(distdir)/vmspecific/org/tritonus/sampled/file $(distdir)/vmspecific/org/tritonus/sampled/mixer/alsa $(distdir)/vmspecific/org/tritonus/sampled/mixer/esd $(distdir)/vmspecific/org/tritonus/share $(distdir)/vmspecific/org/tritonus/share/midi $(distdir)/vmspecific/org/tritonus/share/sampled $(distdir)/vmspecific/org/tritonus/share/sampled/convert $(distdir)/vmspecific/org/tritonus/share/sampled/file $(distdir)/vmspecific/org/tritonus/share/sampled/mixer $(distdir)/vmspecific/org/xbill/DNS $(distdir)/vmspecific/org/xbill/DNS/security $(distdir)/vmspecific/org/xbill/DNS/utils
+	$(mkdir_p) $(distdir)/vmspecific/META-INF $(distdir)/vmspecific/META-INF/services $(distdir)/vmspecific/gnu/bytecodecvssnap $(distdir)/vmspecific/gnu/classpath $(distdir)/vmspecific/gnu/classpath/jdwp $(distdir)/vmspecific/gnu/crypto $(distdir)/vmspecific/gnu/crypto/assembly $(distdir)/vmspecific/gnu/crypto/auth $(distdir)/vmspecific/gnu/crypto/auth/callback $(distdir)/vmspecific/gnu/crypto/cipher $(distdir)/vmspecific/gnu/crypto/der $(distdir)/vmspecific/gnu/crypto/exp $(distdir)/vmspecific/gnu/crypto/exp/ust $(distdir)/vmspecific/gnu/crypto/hash $(distdir)/vmspecific/gnu/crypto/jce $(distdir)/vmspecific/gnu/crypto/jce/cipher $(distdir)/vmspecific/gnu/crypto/jce/hash $(distdir)/vmspecific/gnu/crypto/jce/key $(distdir)/vmspecific/gnu/crypto/jce/keyring $(distdir)/vmspecific/gnu/crypto/jce/mac $(distdir)/vmspecific/gnu/crypto/jce/params $(distdir)/vmspecific/gnu/crypto/jce/prng $(distdir)/vmspecific/gnu/crypto/jce/sig $(distdir)/vmspecific/gnu/crypto/jce/spec $(distdir)/vmspecific/gnu/crypto/key $(distdir)/vmspecific/gnu/crypto/key/dh $(distdir)/vmspecific/gnu/crypto/key/dss $(distdir)/vmspecific/gnu/crypto/key/rsa $(distdir)/vmspecific/gnu/crypto/key/srp6 $(distdir)/vmspecific/gnu/crypto/keyring $(distdir)/vmspecific/gnu/crypto/mac $(distdir)/vmspecific/gnu/crypto/mode $(distdir)/vmspecific/gnu/crypto/pad $(distdir)/vmspecific/gnu/crypto/pki $(distdir)/vmspecific/gnu/crypto/pki/ext $(distdir)/vmspecific/gnu/crypto/pki/io $(distdir)/vmspecific/gnu/crypto/pki/provider $(distdir)/vmspecific/gnu/crypto/prng $(distdir)/vmspecific/gnu/crypto/sasl $(distdir)/vmspecific/gnu/crypto/sasl/anonymous $(distdir)/vmspecific/gnu/crypto/sasl/crammd5 $(distdir)/vmspecific/gnu/crypto/sasl/plain $(distdir)/vmspecific/gnu/crypto/sasl/srp $(distdir)/vmspecific/gnu/crypto/sig $(distdir)/vmspecific/gnu/crypto/sig/dss $(distdir)/vmspecific/gnu/crypto/sig/rsa $(distdir)/vmspecific/gnu/crypto/tool $(distdir)/vmspecific/gnu/crypto/tool/keytool $(distdir)/vmspecific/gnu/crypto/util $(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/net $(distdir)/vmspecific/gnu/java/nio $(distdir)/vmspecific/java/io $(distdir)/vmspecific/java/lang $(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/beans/editors $(distdir)/vmspecific/org/kaffe/io $(distdir)/vmspecific/org/kaffe/jar $(distdir)/vmspecific/org/kaffe/lang $(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/locale $(distdir)/vmspecific/org/kaffe/util/log $(distdir)/vmspecific/org/kaffe/util/zip $(distdir)/vmspecific/org/objectweb/asm153 $(distdir)/vmspecific/org/tritonus/core $(distdir)/vmspecific/org/tritonus/lowlevel/alsa $(distdir)/vmspecific/org/tritonus/lowlevel/esd $(distdir)/vmspecific/org/tritonus/midi/device/alsa $(distdir)/vmspecific/org/tritonus/midi/file $(distdir)/vmspecific/org/tritonus/sampled/convert $(distdir)/vmspecific/org/tritonus/sampled/file $(distdir)/vmspecific/org/tritonus/sampled/mixer/alsa $(distdir)/vmspecific/org/tritonus/sampled/mixer/esd $(distdir)/vmspecific/org/tritonus/share $(distdir)/vmspecific/org/tritonus/share/midi $(distdir)/vmspecific/org/tritonus/share/sampled $(distdir)/vmspecific/org/tritonus/share/sampled/convert $(distdir)/vmspecific/org/tritonus/share/sampled/file $(distdir)/vmspecific/org/tritonus/share/sampled/mixer $(distdir)/vmspecific/org/xbill/DNS $(distdir)/vmspecific/org/xbill/DNS/security $(distdir)/vmspecific/org/xbill/DNS/utils
 	@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.15 kaffe/libraries/javalib/external/classpath/config.guess:1.16
--- kaffe/libraries/javalib/external/classpath/config.guess:1.15	Tue Feb  7 21:48:37 2006
+++ kaffe/libraries/javalib/external/classpath/config.guess	Wed Feb  8 02:06:01 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-04-22'
+timestamp='2005-12-13'
 
 # 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,13 +17,15 @@
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, 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.
@@ -66,11 +68,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -123,7 +125,7 @@
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi at noc.rutgers.edu 1994-08-24)
@@ -196,55 +198,20 @@
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	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 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -297,40 +264,43 @@
 	# 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 0 ;;
+	exit ;;
     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 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
     *:z/VM:*:*)
 	echo s390-ibm-zvmoe
-	exit 0 ;;
+	exit ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit 0 ;;
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
+	exit ;;
     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
@@ -338,32 +308,32 @@
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit 0 ;;
+	exit ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit 0 ;;
+	exit ;;
     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 0 ;;
+	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     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 0 ;;
+	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -372,10 +342,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 0 ;;
+	exit ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     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
@@ -387,10 +357,10 @@
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit 0 ;;
+	exit ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     # 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
@@ -401,40 +371,40 @@
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
+	exit ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -458,32 +428,33 @@
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	$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; }
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit 0 ;;
+	exit ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit 0 ;;
+	exit ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit 0 ;;
+	exit ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit 0 ;;
+	exit ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -499,29 +470,29 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit 0 ;;
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit 0 ;;
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit 0 ;;
+	exit ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
+	exit ;;
     ????????: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 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit 0 ;;
+	exit ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -529,7 +500,7 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -544,14 +515,18 @@
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
 	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 0 ;;
+	exit ;;
     *: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
@@ -565,28 +540,28 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit 0 ;;
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit 0 ;;
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit 0 ;;
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit 0 ;;
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit 0 ;;
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit 0 ;;
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -648,9 +623,19 @@
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    # 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
+	    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
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -658,11 +643,11 @@
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -690,161 +675,166 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit 0 ;;
+	exit ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit 0 ;;
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit 0 ;;
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit 0 ;;
+	exit ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit 0 ;;
+	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit 0 ;;
+	exit ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit 0 ;;
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     *:UNICOS/mp:*:*)
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+        exit ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
+	exit ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:[34]*)
+	exit ;;
+    x86:Interix*:[345]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
+	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit 0 ;;
+	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    amd64:CYGWIN*:*:*)
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     *:GNU:*:*)
 	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
+	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
+	exit ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
     crisv32:Linux:*:*)
 	echo crisv32-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -861,8 +851,8 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -880,15 +870,18 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -902,7 +895,7 @@
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -910,25 +903,28 @@
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit 0 ;;
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
+	exit ;;
     sh64*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -946,15 +942,15 @@
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
+		exit ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
+		exit ;;
 	  "")

*** Patch too long, truncated ***




More information about the kaffe mailing list