Merge GNU Classpath 0.99 into libjava.

From-SVN: r185741
2012-03-23 15:19:26 +00:00 · 2012-03-23 15:19:26 +00:00 · 0563022a20
parent 21669dfe20
commit 0563022a20
516 changed files with 64503 additions and 61116 deletions
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@ -1,3 +1,37 @@
+2012-03-16  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am: Add natVMConsole.cc.
+	* Makefile.in: Regenerated.
+	* gcj/Makefile.in: Likewise.
+	* gcj/javaprims.h: Classes updated.
+	* gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.h,
+	* gnu/javax/net/ssl/provider/CipherSuite.h,
+	* gnu/javax/net/ssl/provider/OutputSecurityParameters.h,
+	* include/Makefile.in:
+	Regenerated.
+	* java/io/Console.h,
+	* java/io/IOError.h,
+	* java/io/ObjectOutputStream$2.h:
+	Initial generation.
+	* java/io/ObjectOutputStream.h: Regenerated.
+	* java/io/VMConsole.h: Initial generation.
+	* java/io/VMConsole.java: Copied from classpath/vm/reference.
+	* java/io/natVMConsole.cc: Implemented readPassword.
+	* java/nio/channels/spi/SelectorProvider$1.h,
+	* java/security/KeyStore$1.h:
+	Initial generation.
+	* java/security/ProtectionDomain.h,
+	* java/text/DateFormatSymbols.h,
+	* java/util/HashMap.h,
+	* java/util/regex/Matcher.h,
+	* java/util/regex/Pattern.h:
+	Regenerated.
+	* javax/xml/stream/util/ReaderDelegate.h:
+	Removed.
+	* sources.am,
+	* testsuite/Makefile.in:
+	Regenerated.
+
 2012-03-14  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

 	* configure.ac (THREADLIBS): Remove *-*-solaris2.8 handling.
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@ -1360,6 +1360,7 @@ gnu/java/nio/natVMChannel.cc \
 gnu/java/nio/channels/natFileChannelImpl.cc \
 gnu/java/security/jce/prng/natVMSecureRandom.cc \
 java/io/natFile.cc \
+java/io/natVMConsole.cc \
 java/io/natVMObjectInputStream.cc \
 java/io/natVMObjectStreamClass.cc \
 java/lang/natCharacter.cc \
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@ -358,7 +358,8 @@ am__objects_5 = $(am__objects_3) gnu/classpath/natConfiguration.lo \
 	gnu/java/nio/natVMChannel.lo \
 	gnu/java/nio/channels/natFileChannelImpl.lo \
 	gnu/java/security/jce/prng/natVMSecureRandom.lo \
-	java/io/natFile.lo java/io/natVMObjectInputStream.lo \
+	java/io/natFile.lo java/io/natVMConsole.lo \
+	java/io/natVMObjectInputStream.lo \
 	java/io/natVMObjectStreamClass.lo java/lang/natCharacter.lo \
 	java/lang/natClass.lo java/lang/natClassLoader.lo \
 	java/lang/natConcreteProcess.lo java/lang/natVMDouble.lo \
@ -4275,6 +4276,7 @@ classpath/java/io/CharArrayReader.java \
 classpath/java/io/CharArrayWriter.java \
 classpath/java/io/CharConversionException.java \
 classpath/java/io/Closeable.java \
+classpath/java/io/Console.java \
 classpath/java/io/DataInput.java \
 classpath/java/io/DataInputStream.java \
 classpath/java/io/DataOutput.java \
@ -4297,6 +4299,7 @@ classpath/java/io/FilterOutputStream.java \
 classpath/java/io/FilterReader.java \
 classpath/java/io/FilterWriter.java \
 classpath/java/io/Flushable.java \
+classpath/java/io/IOError.java \
 classpath/java/io/IOException.java \
 classpath/java/io/InputStream.java \
 java/io/InputStreamReader.java \
@ -4340,6 +4343,7 @@ classpath/java/io/StringWriter.java \
 classpath/java/io/SyncFailedException.java \
 classpath/java/io/UTFDataFormatException.java \
 classpath/java/io/UnsupportedEncodingException.java \
+java/io/VMConsole.java \
 java/io/VMObjectInputStream.java \
 java/io/VMObjectStreamClass.java \
 classpath/java/io/WriteAbortedException.java \
@ -8352,8 +8356,8 @@ property_files = \
  classpath/resource/gnu/java/util/regex/MessagesBundle.properties \
  classpath/resource/gnu/java/util/regex/MessagesBundle_fr.properties \
  classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties \
-  classpath/resource/gnu/javax/print/PrinterDialog.properties \
-  classpath/resource/gnu/javax/print/PrinterDialog_de.properties \
+  classpath/resource/gnu/javax/print/MessagesBundle.properties \
+  classpath/resource/gnu/javax/print/MessagesBundle_de.properties \
  classpath/resource/gnu/javax/security/auth/callback/MessagesBundle.properties \
  classpath/resource/java/text/metazones.properties \
  classpath/resource/java/util/iso4217.properties \
@ -8605,6 +8609,7 @@ gnu/java/nio/natVMChannel.cc \
 gnu/java/nio/channels/natFileChannelImpl.cc \
 gnu/java/security/jce/prng/natVMSecureRandom.cc \
 java/io/natFile.cc \
+java/io/natVMConsole.cc \
 java/io/natVMObjectInputStream.cc \
 java/io/natVMObjectStreamClass.cc \
 java/lang/natCharacter.cc \
@ -9128,6 +9133,8 @@ java/io/$(DEPDIR)/$(am__dirstamp):
 	@: > java/io/$(DEPDIR)/$(am__dirstamp)
 java/io/natFile.lo: java/io/$(am__dirstamp) \
 	java/io/$(DEPDIR)/$(am__dirstamp)
+java/io/natVMConsole.lo: java/io/$(am__dirstamp) \
+	java/io/$(DEPDIR)/$(am__dirstamp)
 java/io/natVMObjectInputStream.lo: java/io/$(am__dirstamp) \
 	java/io/$(DEPDIR)/$(am__dirstamp)
 java/io/natVMObjectStreamClass.lo: java/io/$(am__dirstamp) \
@ -9636,6 +9643,8 @@ mostlyclean-compile:
 	-rm -f gnu/java/security/jce/prng/natVMSecureRandom.lo
 	-rm -f java/io/natFile.$(OBJEXT)
 	-rm -f java/io/natFile.lo
+	-rm -f java/io/natVMConsole.$(OBJEXT)
+	-rm -f java/io/natVMConsole.lo
 	-rm -f java/io/natVMObjectInputStream.$(OBJEXT)
 	-rm -f java/io/natVMObjectInputStream.lo
 	-rm -f java/io/natVMObjectStreamClass.$(OBJEXT)
@ -9810,6 +9819,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/channels/$(DEPDIR)/natFileChannelImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/security/jce/prng/$(DEPDIR)/natVMSecureRandom.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natFile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMConsole.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMObjectInputStream.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMObjectStreamClass.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/Object.Plo@am__quote@
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
--- a/libjava/classpath/INSTALL
+++ b/libjava/classpath/INSTALL
@ -1,8 +1,8 @@
 Installation Instructions
 *************************

-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.

   Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@ -226,6 +226,11 @@ order to use an ANSI C compiler:

 and if that doesn't work, install pre-built binaries of GCC for HP-UX.

+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
--- a/libjava/classpath/NEWS
+++ b/libjava/classpath/NEWS
@ -1,4 +1,52 @@
-New in release 0.99 (XXX XX, XXXX)
+New in release 0.99 (Mar 08, 2012)
+
+* Addition of java.util.regex.Pattern.quote.
+* Addition of java.io.IOError.
+* Addition of java.io.Console.
+* Bug fixes:
+  - PR39408: gjavah doesn't generate constants in header files where they occur in a superclass
+  - PR40590: namespace namespace broken in CNI
+  - PR40630: java.util.Scanner fails when used for charset generation by the OpenJDK build
+  - PR40653: Issue with XML stream writer and namespaces
+  - PR40663: Support Stax API 1.0.1
+  - PR39177: trunk revision 144128 - jar: internal error: java.lang.NullPointerException
+  - PR41696: java.util.zip.Inflater:finished () returns false when it should return true
+  - PR43536: CopyOnWriteArrayList bug in delete() when empty
+  - PR36560: java.util.zip: Error parsing zip file with larger files in it
+  - Restrict access to VM classes.
+  - Cleanup use of message resources.
+  - Throw exception when encrypted zip file entries are encountered.
+  - Fix infinite recursion in javax.print.attribute.standard.JobStateReasons.add.
+  - Native code cleanups in GtkToolkit.c and jcl.c.
+  - Only log when debugging is on.
+  - PR44411: System.nanoTime() is not independent of wall-clock time
+  - PR46775: Calling Policy.setPolicy with a new Policy object has no effect on the DefaultSecurityManager
+  - Use implementation of VMClass.getSimpleName from gcj.
+  - Simplify security determination in ProtectionDomain in situations where all permissions are available.
+  - PR42390: Missing Security Manager checks in classpath apis
+  - Throw NullPointerExceptions appropriately for compatibility with OpenJDK.
+  - Use Integer.parseInt in preference to Integer.decode in java.util.Formatter.
+  - Use same default capacity in java.util.HashMap as documented in OpenJDK.
+  - Check for hashcode equality before calling equals in java.util.HashMap.put
+  - Make sure match is within input data limits in java.util.regex.Matcher.find.
+  - Fix misuse of ArrayList.set in javax.swing.text.html.StyleSheet.resolveStyle.
+  - PR48131: java.util.zip.ZipException: incomplete dynamic bit lengths tree
+  - Check for negative capacity in VMDirectByteBuffer's native code.
+  - PR42823: tcp/ip sockets read/write operations causes memory leak 
+  - Generate META-INF/INDEX.LST for glibj.zip
+  - Fix issues when building with -Werror and gcc 4.6.
+  - PR40188: javah creates constants using name of superclass
+  - PR45527: gjavah encodes $ as used in inner classes as 00024 where Oracle's javah does not
+  - PR45526: gjavah does not implicitly produce header files for inner classes
+  - Fix NullPointerException for null keys in java.util.HashMap.put.
+  - Fix BEAST security issue in gnu.javax.net.ssl.provider.
+  - RH712013: pdftk crashes with java.lang.ArrayIndexOutOfBoundsException
+* Updated to libtool 2.x.
+* Lots of warning fixes / addition of generics.
+* Fix license headers in tools.
+* Normalise whitespace.
+* Maintenance work on javac detection.
+* Mark plugin as unmaintained and disable by default.

 New in release 0.98 (Feb 05, 2009)

--- a/libjava/classpath/config.guess
+++ b/libjava/classpath/config.guess
@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.

-timestamp='2008-12-18'
+timestamp='2011-06-03'

 # 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
@ -27,16 +27,16 @@ timestamp='2008-12-18'
 # the same distribution terms that you use for the rest of that program.


-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD

 me=`echo "$0" | sed -e 's,.*/,,'`

@ -56,8 +56,9 @@ version="\
 GNU config.guess ($timestamp)

 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -170,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@ -180,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@ -223,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@ -269,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# 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 ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
    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
@ -295,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
    *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@ -324,12 +328,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
    sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@ -388,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    # MiNT.  But MiNT is downward compatible to TOS, so this should
    # be no problem.
    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
    m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@ -474,8 +484,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@ -488,7 +498,7 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@ -545,7 +555,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	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
 		IBM_ARCH=rs6000
@ -588,52 +598,52 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c

-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>

-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);

-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@ -653,7 +663,7 @@ EOF
 	    # => hppa64-hp-hpux11.23

 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@ -724,22 +734,22 @@ EOF
 	exit ;;
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
    CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@ -763,14 +773,14 @@ EOF
 	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 ;;
+	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 ;;
    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}"
+	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 ;;
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@ -798,18 +808,18 @@ EOF
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
    i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@ -819,6 +829,9 @@ EOF
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	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
@ -848,6 +861,20 @@ EOF
    i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
    arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@ -855,7 +882,13 @@ EOF
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
    avr32*:Linux:*:*)
@ -868,7 +901,18 @@ EOF
 	echo crisv32-axis-linux-gnu
 	exit ;;
    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo frv-unknown-linux-gnu
+	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
    ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@ -879,78 +923,34 @@ EOF
    m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips
-	#undef mipsel
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	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
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	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 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	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 ;;
    padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
    parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@ -959,14 +959,17 @@ EOF
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
    s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
    sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@ -974,6 +977,9 @@ EOF
    sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
    vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
@ -981,68 +987,8 @@ EOF
 	echo x86_64-unknown-linux-gnu
 	exit ;;
    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	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
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
    i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@ -1050,11 +996,11 @@ EOF
 	echo i386-sequent-sysv4
 	exit ;;
    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
    i*86:OS/2:*:*)
@ -1071,7 +1017,7 @@ EOF
    i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
    i*86:*DOS:*:*)
@ -1086,7 +1032,7 @@ EOF
 	fi
 	exit ;;
    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@ -1114,10 +1060,13 @@ EOF
 	exit ;;
    pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit ;;
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
    Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@ -1152,8 +1101,18 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@ -1166,7 +1125,7 @@ EOF
    rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
    SM[BE]S:UNIX_SV:*:*)
@ -1186,10 +1145,10 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
    *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@ -1215,11 +1174,11 @@ EOF
 	exit ;;
    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@ -1259,6 +1218,16 @@ EOF
    *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@ -1274,6 +1243,9 @@ EOF
    *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
    NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@ -1319,13 +1291,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
    *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@ -1340,6 +1312,9 @@ EOF
    i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
 esac

 #echo '(No uname command or uname output not recognized.)' 1>&2
@ -1362,11 +1337,11 @@ main ()
 #include <sys/param.h>
  printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif

--- a/libjava/classpath/config.sub
+++ b/libjava/classpath/config.sub
@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.

-timestamp='2008-12-11'
+timestamp='2011-10-29'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@ -32,13 +32,16 @@ timestamp='2008-12-11'


 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.

+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@ -72,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -120,8 +124,10 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@ -148,10 +154,13 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+	-bluegene*)
+		os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@ -166,10 +175,10 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@ -242,13 +251,17 @@ case $basic_machine in
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | mcore | mep | metag \
@ -271,28 +284,42 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@ -303,6 +330,18 @@ case $basic_machine in
 		basic_machine=mt-unknown
 		;;

+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@ -322,20 +361,23 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@ -357,24 +399,29 @@ case $basic_machine in
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
 	| tron-* \
-	| v850-* | v850e-* | vax-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@ -399,7 +446,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@ -445,6 +492,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@ -461,11 +512,24 @@ case $basic_machine in
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@ -497,7 +561,7 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@ -713,6 +777,9 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+	microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@ -753,6 +820,10 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@ -817,6 +888,12 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@ -899,9 +976,10 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@ -995,6 +1073,9 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@ -1051,20 +1132,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@ -1134,6 +1203,9 @@ case $basic_machine in
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@ -1231,9 +1303,12 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@ -1254,10 +1329,11 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@ -1268,7 +1344,8 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@ -1276,7 +1353,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@ -1315,7 +1392,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@ -1364,7 +1441,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@ -1409,6 +1486,8 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@ -1431,10 +1510,10 @@ else
 # system, and we'll never get to this point.

 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@ -1446,8 +1525,17 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@ -1474,7 +1562,7 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@ -1501,7 +1589,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
@ -1606,7 +1694,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
--- a/libjava/classpath/configure
+++ b/libjava/classpath/configure
@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for GNU Classpath 0.99-pre.
+# Generated by GNU Autoconf 2.64 for GNU Classpath 0.99.
 #
 # Report bugs to <classpath@gnu.org>.
 #
@ -559,8 +559,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GNU Classpath'
 PACKAGE_TARNAME='classpath'
-PACKAGE_VERSION='0.99-pre'
-PACKAGE_STRING='GNU Classpath 0.99-pre'
+PACKAGE_VERSION='0.99'
+PACKAGE_STRING='GNU Classpath 0.99'
 PACKAGE_BUGREPORT='classpath@gnu.org'
 PACKAGE_URL='http://www.gnu.org/software/classpath/'

@ -1490,7 +1490,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures GNU Classpath 0.99-pre to adapt to many kinds of systems.
+\`configure' configures GNU Classpath 0.99 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@ -1565,7 +1565,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Classpath 0.99-pre:";;
+     short | recursive ) echo "Configuration of GNU Classpath 0.99:";;
   esac
  cat <<\_ACEOF

@ -1757,7 +1757,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-GNU Classpath configure 0.99-pre
+GNU Classpath configure 0.99
 generated by GNU Autoconf 2.64

 Copyright (C) 2009 Free Software Foundation, Inc.
@ -2586,7 +2586,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by GNU Classpath $as_me 0.99-pre, which was
+It was created by GNU Classpath $as_me 0.99, which was
 generated by GNU Autoconf 2.64.  Invocation command line was

  $ $0 $@
@ -3621,7 +3621,7 @@ fi

 # Define the identity of the package.
 PACKAGE='classpath'
- VERSION='0.99-pre'
+ VERSION='0.99'


 cat >>confdefs.h <<_ACEOF
@ -17059,6 +17059,65 @@ fi
 rm -f conftest*


+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
+$as_echo_n "checking for library containing clock_gettime... " >&6; }
+if test "${ac_cv_search_clock_gettime+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char clock_gettime ();
+int
+main ()
+{
+return clock_gettime ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' rt; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if test x$gcc_no_link = xyes; then
+  as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
+fi
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_clock_gettime=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_clock_gettime+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_clock_gettime+set}" = set; then :
+
+else
+  ac_cv_search_clock_gettime=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
+$as_echo "$ac_cv_search_clock_gettime" >&6; }
+ac_res=$ac_cv_search_clock_gettime
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_pton" >&5
 $as_echo_n "checking for library containing inet_pton... " >&6; }
 if test "${ac_cv_search_inet_pton+set}" = set; then :
@ -17166,11 +17225,12 @@ _ACEOF

 fi

+
  for ac_func in ftruncate fsync select \
 		  gethostname socket strerror fork pipe execve open close \
 		  lseek fstat read readv write writev htonl memset htons connect \
 		  getsockname getpeername bind listen accept \
-		  recvfrom send sendto setsockopt getsockopt time mktime \
+		  recvfrom send sendto setsockopt getsockopt time mktime clock_gettime \
 		  gethostbyname_r localtime_r \
 		  strerror_r \
                  fcntl \
@ -17663,7 +17723,8 @@ ac_cv_func_which_gethostbyname_r=unknown
 #
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <netdb.h>
+
+    #include <netdb.h>
 int
 main ()
 {
@ -17689,7 +17750,8 @@ if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then

 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <netdb.h>
+
+    #include <netdb.h>
 int
 main ()
 {
@ -17721,7 +17783,8 @@ if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then

 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <netdb.h>
+
+    #include <netdb.h>
 int
 main ()
 {
@ -17753,7 +17816,8 @@ if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then

 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <netdb.h>
+
+    #include <netdb.h>
 int
 main ()
 {
@ -23814,7 +23878,7 @@ else
 JAVA_TEST=Object.java
 CLASS_TEST=Object.class
 cat << \EOF > $JAVA_TEST
-/* #line 23817 "configure" */
+/* #line 23881 "configure" */
 package java.lang;

 public class Object
@ -23907,7 +23971,7 @@ EOF
 if uudecode$EXEEXT Test.uue; then
        ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 23910: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 23974: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
        echo "configure: failed file was:" >&5
        cat Test.uue >&5
        ac_cv_prog_uudecode_base64=no
@ -23935,7 +23999,7 @@ JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 23938 "configure" */
+/* [#]line 24002 "configure" */
 public class Test {
 public static void main (String args[]) {
        System.exit (0);
@ -24143,7 +24207,7 @@ if test "x${use_glibj_zip}" = xfalse || \
  JAVA_TEST=Test.java
  CLASS_TEST=Test.class
  cat << \EOF > $JAVA_TEST
-  /* #line 24146 "configure" */
+  /* #line 24210 "configure" */
  public class Test
  {
    public static void main(String args)
@ -24988,7 +25052,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNU Classpath $as_me 0.99-pre, which was
+This file was extended by GNU Classpath $as_me 0.99, which was
 generated by GNU Autoconf 2.64.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@ -25058,7 +25122,7 @@ General help using GNU software: <http://www.gnu.org/gethelp/>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-GNU Classpath config.status 0.99-pre
+GNU Classpath config.status 0.99
 configured by $0, generated by GNU Autoconf 2.64,
  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

--- a/libjava/classpath/configure.ac
+++ b/libjava/classpath/configure.ac
@ -6,7 +6,7 @@ dnl -----------------------------------------------------------
 dnl define([AC_CACHE_LOAD], )dnl
 dnl define([AC_CACHE_SAVE], )dnl

-AC_INIT([GNU Classpath],[0.99-pre],[classpath@gnu.org],[classpath])
+AC_INIT([GNU Classpath],[0.99],[classpath@gnu.org],[classpath])
 AC_CONFIG_SRCDIR(java/lang/System.java)
 AC_CONFIG_MACRO_DIR([m4])

@ -489,13 +489,15 @@ if test "x${COMPILE_JNI}" = xyes; then
  AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
  AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))

+  AC_SEARCH_LIBS([clock_gettime], [rt])
  AC_SEARCH_LIBS([inet_pton],[nsl])
  AC_CHECK_LIB([socket], [gethostname]) 
+
  AC_CHECK_FUNCS([ftruncate fsync select \
 		  gethostname socket strerror fork pipe execve open close \
 		  lseek fstat read readv write writev htonl memset htons connect \
 		  getsockname getpeername bind listen accept \
-		  recvfrom send sendto setsockopt getsockopt time mktime \
+		  recvfrom send sendto setsockopt getsockopt time mktime clock_gettime \
 		  gethostbyname_r localtime_r \
 		  strerror_r \
                  fcntl \
--- a/libjava/classpath/depcomp
+++ b/libjava/classpath/depcomp
@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects

-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-12-04.11; # UTC

-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011 Free Software Foundation, Inc.

 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -44,7 +44,7 @@ Environment variables:
  object      Object file output by `PROGRAMS ARGS'.
  DEPDIR      directory where to store dependencies.
  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
  libtool     Whether libtool is used (yes/no).

 Report bugs to <bug-automake@gnu.org>.
@ -90,10 +90,18 @@ if test "$depmode" = msvcmsys; then
   # This is just like msvisualcpp but w/o cygpath translation.
   # Just convert the backslash-escaped backslashes to single forward
   # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
   depmode=msvisualcpp
 fi

+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@ -158,10 +166,12 @@ gcc)
 ' < "$tmpdepfile" |
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;

@ -405,6 +415,52 @@ tru64)
   rm -f "$tmpdepfile"
   ;;

+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test "$stat" = 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/	\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/	/
+  G
+  p
+}' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 #nosideeffect)
  # This comment above is used by automake to tell side-effect
  # dependency tracking mechanisms from slower ones.
@ -503,7 +559,9 @@ makedepend)
  touch "$tmpdepfile"
  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
  sed '1,2d' "$tmpdepfile" | tr ' ' '
 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
--- a/libjava/classpath/doc/cp-tools.texinfo
+++ b/libjava/classpath/doc/cp-tools.texinfo
@ -5,7 +5,20 @@
@settitle GNU Classpath Tools Guide
@c %**end of header

-@setchapternewpage on
+@copying
+This file documents the Tools included in a standard distribution of the GNU
+Classpath project deliverables.
+
+Copyright @copyright{} 2006, 2007 Free Software Foundation, Inc.
+
+@quotation
+Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are preserved on all copies.
+
+Permission is granted to copy and distribute modified versions of this document under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one.
+
+Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation.
+@end quotation
+@end copying

@c Common macros to support generating man pages:

@ -19,12 +32,9 @@
@end macro

@ifinfo
-This file documents the Tools included in a standard distribution of the GNU
-Classpath project deliverables.
-
-Copyright (C) 2006, 2007 Free Software Foundation, Inc.
-
@ifnotplaintext
+@setchapternewpage on
+
@dircategory GNU Libraries
@direntry
 * Classpath Tools: (cp-tools).  GNU Classpath Tools Guide
@ -38,14 +48,7 @@ Copyright (C) 2006, 2007 Free Software Foundation, Inc.

@page
@vskip 0pt plus 1filll
-Copyright @copyright{} 2006 Free Software Foundation, Inc.
-@sp 2
-Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this document under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation.
-
+@insertcopying
@end titlepage

@contents
@ -2435,14 +2438,14 @@ with the header @samp{CVS ID}, you would specify:
 Let's say that a class javadoc comment contains

@smallexample
-@@cvsid $Id: cp-tools.texinfo,v 1.7 2008/08/13 13:32:05 jsumali Exp $
+@@cvsid $Id: cp-tools.texinfo,v 1.9 2012/03/07 15:27:27 gnu_andrew Exp $
@end smallexample

 Then the HTML output will contain something like

@smallexample
 CVS ID:
-  $Id: cp-tools.texinfo,v 1.7 2008/08/13 13:32:05 jsumali Exp $
+  $Id: cp-tools.texinfo,v 1.9 2012/03/07 15:27:27 gnu_andrew Exp $
@end smallexample
@end table

--- a/libjava/classpath/doc/texinfo.tex
+++ b/libjava/classpath/doc/texinfo.tex
--- a/libjava/classpath/examples/gnu/classpath/examples/swing/Demo.java
+++ b/libjava/classpath/examples/gnu/classpath/examples/swing/Demo.java
@ -1,5 +1,5 @@
 /* SwingDemo.java -- An example of using the javax.swing UI.
-   Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath examples.

@ -225,7 +225,7 @@ public class Demo
    Method m = null;
    try
      {
-        m = MetalLookAndFeel.class.getMethod("getCurrentTheme", null);
+        m = MetalLookAndFeel.class.getMethod("getCurrentTheme");
      }
    catch (NoSuchMethodException nsme)
      {
--- a/libjava/classpath/gnu/java/security/Properties.java
+++ b/libjava/classpath/gnu/java/security/Properties.java
@ -1,5 +1,5 @@
 /* Properties.java -- run-time configuration properties.
-   Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2006, 2010  Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -54,7 +54,8 @@ import java.util.logging.Logger;
 */
 public final class Properties
 {
-  private static final Logger log = Logger.getLogger(Properties.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(Properties.class.getName()) : null;

  public static final String VERSION = "gnu.crypto.version";

--- a/libjava/classpath/gnu/java/security/der/DERWriter.java
+++ b/libjava/classpath/gnu/java/security/der/DERWriter.java
@ -1,5 +1,5 @@
 /* DERWriter.java -- write Java types in DER format.
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@ -281,9 +281,9 @@ public class DERWriter implements DER

  private static byte[] toUtf8(String string)
  {
-    ByteArrayOutputStream buf =
-      new ByteArrayOutputStream((int)(string.length() * 1.5));
-    for (int i = 0; i < string.length(); i++)
+    int len = string.length();
+    ByteArrayOutputStream buf = new ByteArrayOutputStream(len + (len >> 1));
+    for (int i = 0; i < len; i++)
      {
        char c = string.charAt(i);
        if (c < 0x0080)
--- a/libjava/classpath/gnu/java/security/hash/Whirlpool.java
+++ b/libjava/classpath/gnu/java/security/hash/Whirlpool.java
@ -1,5 +1,5 @@
 /* Whirlpool.java --
-   Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -67,7 +67,9 @@ import java.util.logging.Logger;
 public final class Whirlpool
    extends BaseHash
 {
-  private static final Logger log = Logger.getLogger(Whirlpool.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(Whirlpool.class.getName()) : null;
+
  private static final int BLOCK_SIZE = 64; // inner block size in bytes

  /** The digest of the 0-bit long message. */
--- a/libjava/classpath/gnu/java/security/jce/sig/EncodedKeyFactory.java
+++ b/libjava/classpath/gnu/java/security/jce/sig/EncodedKeyFactory.java
@ -1,5 +1,5 @@
 /* EncodedKeyFactory.java -- JCE Encoded key factory Adapter
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@ -78,7 +78,8 @@ import javax.crypto.spec.DHPublicKeySpec;
 public class EncodedKeyFactory
    extends KeyFactorySpi
 {
-  private static final Logger log = Logger.getLogger(EncodedKeyFactory.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(EncodedKeyFactory.class.getName()) : null;

  private static Object invokeConstructor(String className, Object[] params)
      throws InvalidKeySpecException
--- a/libjava/classpath/gnu/java/security/jce/sig/SignatureAdapter.java
+++ b/libjava/classpath/gnu/java/security/jce/sig/SignatureAdapter.java
@ -1,5 +1,5 @@
 /* SignatureAdapter.java --
-   Copyright 2001, 2002, 2006 Free Software Foundation, Inc.
+   Copyright 2001, 2002, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -75,7 +75,8 @@ class SignatureAdapter
    extends SignatureSpi
    implements Cloneable
 {
-  private static final Logger log = Logger.getLogger(SignatureAdapter.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(SignatureAdapter.class.getName()) : null;

  /** Our underlying signature instance. */
  private ISignature adaptee;
--- a/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairGenerator.java
+++ b/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairGenerator.java
@ -1,5 +1,5 @@
 /* DSSKeyPairGenerator.java --
-   Copyright 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright 2001, 2002, 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -66,7 +66,8 @@ import java.util.logging.Logger;
 public class DSSKeyPairGenerator
    implements IKeyPairGenerator
 {
-  private static final Logger log = Logger.getLogger(DSSKeyPairGenerator.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(DSSKeyPairGenerator.class.getName()) : null;

  /** The BigInteger constant 2. */
  private static final BigInteger TWO = BigInteger.valueOf(2L);
--- a/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java
+++ b/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java
@ -1,5 +1,5 @@
 /* DSSKeyPairPKCS8Codec.java -- PKCS#8 Encoding/Decoding handler
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@ -67,7 +67,9 @@ import java.util.logging.Logger;
 public class DSSKeyPairPKCS8Codec
    implements IKeyPairCodec
 {
-  private static final Logger log = Logger.getLogger(DSSKeyPairPKCS8Codec.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(DSSKeyPairPKCS8Codec.class.getName()) : null;
+
  private static final OID DSA_ALG_OID = new OID(Registry.DSA_OID_STRING);

  // implicit 0-arguments constructor
--- a/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairGenerator.java
+++ b/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairGenerator.java
@ -1,5 +1,5 @@
 /* RSAKeyPairGenerator.java --
-   Copyright 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright 2001, 2002, 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -70,7 +70,8 @@ import java.util.logging.Logger;
 public class RSAKeyPairGenerator
    implements IKeyPairGenerator
 {
-  private static final Logger log = Logger.getLogger(RSAKeyPairGenerator.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(RSAKeyPairGenerator.class.getName()) : null;

  /** The BigInteger constant 1. */
  private static final BigInteger ONE = BigInteger.ONE;
--- a/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java
+++ b/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java
@ -1,5 +1,5 @@
 /* RSAKeyPairPKCS8Codec.java -- PKCS#8 Encoding/Decoding handler
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@ -64,7 +64,9 @@ import java.util.logging.Logger;
 public class RSAKeyPairPKCS8Codec
    implements IKeyPairCodec
 {
-  private static final Logger log = Logger.getLogger(RSAKeyPairPKCS8Codec.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(RSAKeyPairPKCS8Codec.class.getName()) : null;
+
  private static final OID RSA_ALG_OID = new OID(Registry.RSA_OID_STRING);

  // implicit 0-arguments constructor
--- a/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java
+++ b/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java
@ -1,5 +1,5 @@
 /* RSAKeyPairX509Codec.java -- X.509 Encoding/Decoding handler
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@ -65,7 +65,9 @@ import java.util.logging.Logger;
 public class RSAKeyPairX509Codec
    implements IKeyPairCodec
 {
-  private static final Logger log = Logger.getLogger(RSAKeyPairX509Codec.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(RSAKeyPairX509Codec.class.getName()) : null;
+
  private static final OID RSA_ALG_OID = new OID(Registry.RSA_OID_STRING);

  // implicit 0-arguments constructor
--- a/libjava/classpath/gnu/java/security/pkcs/PKCS7SignedData.java
+++ b/libjava/classpath/gnu/java/security/pkcs/PKCS7SignedData.java
@ -1,5 +1,5 @@
 /* PKCS7SignedData.java -- reader/writer for PKCS#7 signedData objects
-   Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@ -78,7 +78,8 @@ import java.util.logging.Logger;
 */
 public class PKCS7SignedData
 {
-  private static final Logger log = Logger.getLogger(PKCS7SignedData.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(PKCS7SignedData.class.getName()) : null;

  public static final OID PKCS7_SIGNED_DATA = new OID("1.2.840.113549.1.7.2");

--- a/libjava/classpath/gnu/java/security/pkcs/SignerInfo.java
+++ b/libjava/classpath/gnu/java/security/pkcs/SignerInfo.java
@ -1,5 +1,5 @@
 /* SignerInfo.java -- a SignerInfo object, from PKCS #7
-   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@ -59,7 +59,8 @@ import javax.security.auth.x500.X500Principal;

 public class SignerInfo
 {
-  private static final Logger log = Logger.getLogger(SignerInfo.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(SignerInfo.class.getName()) : null;

  private final BigInteger version;
  private final BigInteger serialNumber;
@ -111,7 +112,8 @@ public class SignerInfo
      throw new BEREncodingException("malformed Version");

    version = (BigInteger) val.getValue();
-    log.fine("  Version: " + version);
+    if (Configuration.DEBUG)
+      log.fine("  Version: " + version);

    val = ber.read();
    if (!val.isConstructed())
--- a/libjava/classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java
+++ b/libjava/classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java
@ -1,5 +1,5 @@
 /* PKIXCertPathValidatorImpl.java -- PKIX certificate path validator.
-   Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@ -97,7 +97,8 @@ import java.util.logging.Logger;
 public class PKIXCertPathValidatorImpl
    extends CertPathValidatorSpi
 {
-  private static final Logger log = Logger.getLogger(PKIXCertPathValidatorImpl.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+        Logger.getLogger(PKIXCertPathValidatorImpl.class.getName()) : null;

  public static final String ANY_POLICY = "2.5.29.32.0";

--- a/libjava/classpath/gnu/java/security/sig/rsa/EMSA_PSS.java
+++ b/libjava/classpath/gnu/java/security/sig/rsa/EMSA_PSS.java
@ -1,5 +1,5 @@
 /* EMSA_PSS.java --
-   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -73,7 +73,8 @@ import java.util.logging.Logger;
 public class EMSA_PSS
    implements Cloneable
 {
-  private static final Logger log = Logger.getLogger(EMSA_PSS.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(EMSA_PSS.class.getName()) : null;

  /** The underlying hash function to use with this instance. */
  private IMessageDigest hash;
--- a/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java
+++ b/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java
@ -1,5 +1,5 @@
 /* RSAPSSSignature.java --
-   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -75,7 +75,8 @@ import java.util.logging.Logger;
 public class RSAPSSSignature
    extends BaseSignature
 {
-  private static final Logger log = Logger.getLogger(RSAPSSSignature.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(RSAPSSSignature.class.getName()) : null;

  /** The underlying EMSA-PSS instance for this object. */
  private EMSA_PSS pss;
--- a/libjava/classpath/gnu/java/security/x509/X509CRL.java
+++ b/libjava/classpath/gnu/java/security/x509/X509CRL.java
@ -1,5 +1,5 @@
 /* X509CRL.java -- X.509 certificate revocation list.
-   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@ -77,7 +77,9 @@ import javax.security.auth.x500.X500Principal;
 public class X509CRL extends java.security.cert.X509CRL
  implements GnuPKIExtension
 {
-  private static final Logger log = Logger.getLogger(X509CRL.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(X509CRL.class.getName()) : null;
+
  private static final OID ID_DSA = new OID("1.2.840.10040.4.1");
  private static final OID ID_DSA_WITH_SHA1 = new OID("1.2.840.10040.4.3");
  private static final OID ID_RSA = new OID("1.2.840.113549.1.1.1");
--- a/libjava/classpath/gnu/java/security/x509/X509CRLEntry.java
+++ b/libjava/classpath/gnu/java/security/x509/X509CRLEntry.java
@ -1,5 +1,5 @@
 /* X509CRLEntry.java -- an entry in a X.509 CRL.
-   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@ -65,7 +65,9 @@ import java.util.logging.Logger;
 class X509CRLEntry extends java.security.cert.X509CRLEntry
  implements GnuPKIExtension
 {
-  private static final Logger log = Logger.getLogger(X509CRLEntry.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(X509CRLEntry.class.getName()) : null;
+
  /** The DER encoded form of this CRL entry. */
  private byte[] encoded;

--- a/libjava/classpath/gnu/java/security/x509/ext/Extension.java
+++ b/libjava/classpath/gnu/java/security/x509/ext/Extension.java
@ -1,5 +1,5 @@
 /* Extension.java -- an X.509 certificate or CRL extension.
-   Copyright (C) 2004, 2006  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@ -53,7 +53,8 @@ import java.util.logging.Logger;

 public class Extension
 {
-  private static final Logger log = Logger.getLogger(Extension.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(Extension.class.getName()) : null;
  /**
   * This extension's object identifier.
   */
--- a/libjava/classpath/gnu/javax/crypto/cipher/Anubis.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Anubis.java
@ -1,5 +1,5 @@
 /* Anubis.java --
-   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -67,7 +67,8 @@ import java.util.logging.Logger;
 public final class Anubis
    extends BaseCipher
 {
-  private static final Logger log = Logger.getLogger(Anubis.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(Anubis.class.getName()) : null;
  private static final int DEFAULT_BLOCK_SIZE = 16; // in bytes
  private static final int DEFAULT_KEY_SIZE = 16; // in bytes
  private static final String Sd = // p. 25 [ANUBIS]
--- a/libjava/classpath/gnu/javax/crypto/cipher/BaseCipher.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/BaseCipher.java
@ -1,5 +1,5 @@
 /* BaseCipher.java --
-   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -56,7 +56,8 @@ import java.util.logging.Logger;
 public abstract class BaseCipher
    implements IBlockCipher, IBlockCipherSpi
 {
-  private static final Logger log = Logger.getLogger(BaseCipher.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(BaseCipher.class.getName()) : null;
  /** The canonical name prefix of the cipher. */
  protected String name;
  /** The default block size, in bytes. */
--- a/libjava/classpath/gnu/javax/crypto/cipher/Khazad.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Khazad.java
@ -1,5 +1,5 @@
 /* Khazad.java --
-   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -67,7 +67,8 @@ import java.util.logging.Logger;
 public final class Khazad
    extends BaseCipher
 {
-  private static final Logger log = Logger.getLogger(Khazad.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(Khazad.class.getName()) : null;
  private static final int DEFAULT_BLOCK_SIZE = 8; // in bytes
  private static final int DEFAULT_KEY_SIZE = 16; // in bytes
  private static final int R = 8; // standard number of rounds; para. 3.7
--- a/libjava/classpath/gnu/javax/crypto/cipher/Rijndael.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Rijndael.java
@ -1,5 +1,5 @@
 /* Rijndael.java --
-   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -64,7 +64,8 @@ import java.util.logging.Logger;
 public final class Rijndael
    extends BaseCipher
 {
-  private static final Logger log = Logger.getLogger(Rijndael.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(Rijndael.class.getName()) : null;
  private static final int DEFAULT_BLOCK_SIZE = 16; // in bytes
  private static final int DEFAULT_KEY_SIZE = 16; // in bytes
  private static final String SS =
--- a/libjava/classpath/gnu/javax/crypto/cipher/Twofish.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Twofish.java
@ -1,5 +1,5 @@
 /* Twofish.java --
-   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -69,7 +69,8 @@ import java.util.logging.Logger;
 public final class Twofish
    extends BaseCipher
 {
-  private static final Logger log = Logger.getLogger(Twofish.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(Twofish.class.getName()) : null;
  private static final int DEFAULT_BLOCK_SIZE = 16; // in bytes
  private static final int DEFAULT_KEY_SIZE = 16; // in bytes
  private static final int MAX_ROUNDS = 16; // max # rounds (for allocating subkeys)
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java
@ -1,5 +1,5 @@
 /* KeyWrappingAlgorithmAdapter.java -- Base Adapter for Key Wrapping algorithms
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@ -76,7 +76,8 @@ import javax.crypto.spec.SecretKeySpec;
 abstract class KeyWrappingAlgorithmAdapter
    extends CipherSpi
 {
-  private static final Logger log = Logger.getLogger(KeyWrappingAlgorithmAdapter.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+        Logger.getLogger(KeyWrappingAlgorithmAdapter.class.getName()) : null;
  /** JCE canonical name of a null-padder. */
  private static final String NO_PADDING = "nopadding";
  /** Concrete Key Wrapping Algorithm SPI. */
--- a/libjava/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java
@ -1,5 +1,5 @@
 /* GnuKeyring.java -- KeyStore adapter for a pair of private and public Keyrings
-   Copyright (C) 2003, 2006  Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2010  Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -77,7 +77,8 @@ import javax.crypto.SecretKey;
 public class GnuKeyring
    extends KeyStoreSpi
 {
-  private static final Logger log = Logger.getLogger(GnuKeyring.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(GnuKeyring.class.getName()) : null;
  private static final String NOT_LOADED = "not loaded";

  /** TRUE if the keystore is loaded; FALSE otherwise. */
--- a/libjava/classpath/gnu/javax/crypto/jce/params/BlockCipherParameters.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/params/BlockCipherParameters.java
@ -1,5 +1,5 @@
 /* BlockCipherParameters.java --
-   Copyright (C) 2002, 2003, 2006  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2006, 2010  Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -59,7 +59,8 @@ import javax.crypto.spec.IvParameterSpec;
 public class BlockCipherParameters
    extends AlgorithmParametersSpi
 {
-  private static final Logger log = Logger.getLogger(BlockCipherParameters.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+            Logger.getLogger(BlockCipherParameters.class.getName()) : null;
  /** The underlying block cipher specification. */
  protected BlockCipherParameterSpec cipherSpec;
  private static final String DEFAULT_FORMAT = "ASN.1";
--- a/libjava/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java
@ -1,5 +1,5 @@
 /* ICMRandomSpi.java --
-   Copyright (C) 2001, 2002, 2006  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2006, 2010  Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -58,7 +58,8 @@ import java.util.logging.Logger;
 public class ICMRandomSpi
    extends SecureRandomSpi
 {
-  private static final Logger log = Logger.getLogger(ICMRandomSpi.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(ICMRandomSpi.class.getName()) : null;
  /** Class-wide prng to generate random material for the underlying prng. */
  private static final ICMGenerator prng; // blank final
  static
--- a/libjava/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java
@ -1,5 +1,5 @@
 /* UMacRandomSpi.java --
-   Copyright (C) 2001, 2002, 2006  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2006, 2010  Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -57,7 +57,8 @@ import java.util.logging.Logger;
 public class UMacRandomSpi
    extends SecureRandomSpi
 {
-  private static final Logger log = Logger.getLogger(UMacRandomSpi.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                    Logger.getLogger(UMacRandomSpi.class.getName()) : null;

  /** Class-wide prng to generate random material for the underlying prng. */
  private static final UMacGenerator prng; // blank final
--- a/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java
+++ b/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java
@ -1,5 +1,5 @@
 /* GnuDHKeyPairGenerator.java --
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -40,7 +40,6 @@ package gnu.javax.crypto.key.dh;

 import gnu.java.security.Configuration;
 import gnu.java.security.Registry;
-import gnu.java.security.hash.Sha160;
 import gnu.java.security.key.IKeyPairGenerator;
 import gnu.java.security.util.PRNG;

@ -68,7 +67,9 @@ import javax.crypto.spec.DHParameterSpec;
 public class GnuDHKeyPairGenerator
    implements IKeyPairGenerator
 {
-  private static final Logger log = Logger.getLogger(GnuDHKeyPairGenerator.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+            Logger.getLogger(GnuDHKeyPairGenerator.class.getName()) : null;
+
  /**
   * Property name of an optional {@link SecureRandom} instance to use. The
   * default is to use a classloader singleton from {@link PRNG}.
@ -95,10 +96,8 @@ public class GnuDHKeyPairGenerator
  public static final int DEFAULT_EXPONENT_SIZE = 160;
  /** Default encoding format to use when none was specified. */
  private static final int DEFAULT_ENCODING_FORMAT = Registry.RAW_ENCODING_ID;
-  /** The SHA instance to use. */
-  private Sha160 sha = new Sha160();
  /** The optional {@link SecureRandom} instance to use. */
-  private SecureRandom rnd = null;
+  private SecureRandom rnd;
  /** The desired size in bits of the public prime (p). */
  private int l;
  /** The desired size in bits of the private exponent (x). */
--- a/libjava/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java
+++ b/libjava/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java
@ -1,5 +1,5 @@
 /* SRPKeyPairGenerator.java --
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -59,7 +59,9 @@ import java.util.logging.Logger;
 public class SRPKeyPairGenerator
    implements IKeyPairGenerator
 {
-  private static final Logger log = Logger.getLogger(SRPKeyPairGenerator.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(SRPKeyPairGenerator.class.getName()) : null;
+
  private static final BigInteger ZERO = BigInteger.ZERO;
  private static final BigInteger ONE = BigInteger.ONE;
  private static final BigInteger TWO = BigInteger.valueOf(2L);
--- a/libjava/classpath/gnu/javax/crypto/keyring/Entry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/Entry.java
@ -1,5 +1,5 @@
 /* Entry.java --
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -50,7 +50,8 @@ import java.util.logging.Logger;
 */
 public abstract class Entry
 {
-  private static final Logger log = Logger.getLogger(Entry.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(Entry.class.getName()) : null;
  private static final String[] TYPES = new String[] {
      "Encrypted",
      "PasswordEncrypted",
--- a/libjava/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java
@ -1,5 +1,5 @@
 /* EnvelopeEntry.java --
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -58,7 +58,8 @@ import java.util.logging.Logger;
 public abstract class EnvelopeEntry
    extends Entry
 {
-  private static final Logger log = Logger.getLogger(EnvelopeEntry.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(EnvelopeEntry.class.getName()) : null;
  /** The envelope that contains this one (if any). */
  protected EnvelopeEntry containingEnvelope;
  /** The contained entries. */
--- a/libjava/classpath/gnu/javax/crypto/keyring/GnuPublicKeyring.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/GnuPublicKeyring.java
@ -1,5 +1,5 @@
 /* GnuPublicKeyring.java --
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -55,7 +55,8 @@ public class GnuPublicKeyring
    extends BaseKeyring
    implements IPublicKeyring
 {
-  private static final Logger log = Logger.getLogger(GnuPublicKeyring.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(GnuPublicKeyring.class.getName()) : null;
  public static final int USAGE = Registry.GKR_CERTIFICATES;

  public GnuPublicKeyring(String mac, int macLen)
--- a/libjava/classpath/gnu/javax/crypto/mac/OMAC.java
+++ b/libjava/classpath/gnu/javax/crypto/mac/OMAC.java
@ -1,5 +1,5 @@
 /* OMAC.java --
-   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -65,7 +65,8 @@ import java.util.logging.Logger;
 public class OMAC
    implements IMac
 {
-  private static final Logger log = Logger.getLogger(OMAC.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(OMAC.class.getName()) : null;
  private static final byte C1 = (byte) 0x87;
  private static final byte C2 = 0x1b;
  // Test key for OMAC-AES-128
--- a/libjava/classpath/gnu/javax/crypto/pad/BasePad.java
+++ b/libjava/classpath/gnu/javax/crypto/pad/BasePad.java
@ -1,5 +1,5 @@
 /* BasePad.java --
-   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -52,7 +52,8 @@ import java.util.logging.Logger;
 public abstract class BasePad
    implements IPad
 {
-  private static final Logger log = Logger.getLogger(BasePad.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(BasePad.class.getName()) : null;
  /** The canonical name prefix of the padding algorithm. */
  protected String name;
  /** The block size, in bytes, for this instance. */
--- a/libjava/classpath/gnu/javax/crypto/pad/PKCS1_V1_5.java
+++ b/libjava/classpath/gnu/javax/crypto/pad/PKCS1_V1_5.java
@ -1,5 +1,5 @@
 /* PKCS1_V1_5.java --
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -66,7 +66,8 @@ import java.util.logging.Logger;
 public class PKCS1_V1_5
    extends BasePad
 {
-  private static final Logger log = Logger.getLogger(PKCS1_V1_5.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(PKCS1_V1_5.class.getName()) : null;
  private EME_PKCS1_V1_5 codec;

  /**
--- a/libjava/classpath/gnu/javax/crypto/pad/PKCS7.java
+++ b/libjava/classpath/gnu/javax/crypto/pad/PKCS7.java
@ -1,5 +1,5 @@
 /* PKCS7.java --
- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -65,7 +65,8 @@ import java.util.logging.Logger;
 public final class PKCS7
    extends BasePad
 {
-  private static final Logger log = Logger.getLogger(PKCS7.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(PKCS7.class.getName()) : null;

  /**
   * Trivial package-private constructor for use by the <i>Factory</i> class.
--- a/libjava/classpath/gnu/javax/crypto/pad/TBC.java
+++ b/libjava/classpath/gnu/javax/crypto/pad/TBC.java
@ -1,5 +1,5 @@
 /* TBC.java --
-   Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -64,7 +64,8 @@ import java.util.logging.Logger;
 public final class TBC
    extends BasePad
 {
-  private static final Logger log = Logger.getLogger(TBC.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                                Logger.getLogger(TBC.class.getName()) : null;

  /**
   * Trivial package-private constructor for use by the <i>Factory</i> class.
--- a/libjava/classpath/gnu/javax/crypto/prng/CSPRNG.java
+++ b/libjava/classpath/gnu/javax/crypto/prng/CSPRNG.java
@ -1,5 +1,5 @@
 /* CSPRNG.java -- continuously-seeded pseudo-random number generator.
-   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006, 2010  Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -87,7 +87,9 @@ import java.util.logging.Logger;
 public class CSPRNG
    extends BasePRNG
 {
-  private static final Logger log = Logger.getLogger(CSPRNG.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                         Logger.getLogger(CSPRNG.class.getName()) : null;
+
  /**
   * Property name for the list of files to read for random values. The mapped
   * value is a list with the following values:
@ -325,20 +327,24 @@ public class CSPRNG
    attrib.put(PROGRAM_SOURCES, l);
    l = new LinkedList();
    for (int i = 0; (s = getProperty(OTHER + i)) != null; i++)
-      try
-        {
-          Class c = Class.forName(s.trim());
-          l.add(c.newInstance());
-        }
-      catch (ClassNotFoundException cnfe)
-        {
-        }
-      catch (InstantiationException ie)
-        {
-        }
-      catch (IllegalAccessException iae)
-        {
-        }
+      {
+        try
+          {
+            l.add((EntropySource)Class.forName(s.trim()).newInstance());
+          }
+        catch (ClassNotFoundException cnfe)
+          {
+            // ignore
+          }
+        catch (InstantiationException ie)
+          {
+            // ignore
+          }
+        catch (IllegalAccessException iae)
+          {
+            // ignore
+          }
+      }
    attrib.put(OTHER_SOURCES, l);
    instance.init(attrib);
    return instance;
--- a/libjava/classpath/gnu/javax/crypto/sasl/SaslInputStream.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/SaslInputStream.java
@ -1,5 +1,5 @@
 /* SaslInputStream.java --
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -57,7 +57,8 @@ import javax.security.sasl.SaslServer;
 public class SaslInputStream
    extends InputStream
 {
-  private static final Logger log = Logger.getLogger(SaslInputStream.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(SaslInputStream.class.getName()) : null;
  private SaslClient client;
  private SaslServer server;
  private int maxRawSendSize;
--- a/libjava/classpath/gnu/javax/crypto/sasl/SaslOutputStream.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/SaslOutputStream.java
@ -1,5 +1,5 @@
 /* SaslOutputStream.java --
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -56,7 +56,8 @@ import javax.security.sasl.SaslServer;
 public class SaslOutputStream
    extends OutputStream
 {
-  private static final Logger log = Logger.getLogger(SaslOutputStream.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(SaslOutputStream.class.getName()) : null;
  private SaslClient client;
  private SaslServer server;
  private int maxRawSendSize;
--- a/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPClient.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPClient.java
@ -1,5 +1,5 @@
 /* SRPClient.java --
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -87,7 +87,8 @@ public class SRPClient
    extends ClientMechanism
    implements SaslClient
 {
-  private static final Logger log = Logger.getLogger(SRPClient.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(SRPClient.class.getName()) : null;
  private String uid; // the unique key for this type of client
  private String U; // the authentication identity
  BigInteger N, g, A, B;
--- a/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPServer.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPServer.java
@ -1,5 +1,5 @@
 /* SRPServer.java --
-   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc.

 This file is a part of GNU Classpath.

@ -79,7 +79,8 @@ public class SRPServer
    extends ServerMechanism
    implements SaslServer
 {
-  private static final Logger log = Logger.getLogger(SRPServer.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                        Logger.getLogger(SRPServer.class.getName()) : null;
  private String U = null; // client's username
  private BigInteger N, g, A, B;
  private byte[] s; // salt
--- a/libjava/classpath/gnu/javax/net/ssl/provider/CipherSuite.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/CipherSuite.java
@ -73,127 +73,127 @@ public final class CipherSuite implements Constructed
                     KeyExchangeAlgorithm.NONE,
                     SignatureAlgorithm.ANONYMOUS,
                     MacAlgorithm.NULL, 0, 0x00, 0x00,
-                     "TLS_NULL_WITH_NULL_NULL");
+                     "TLS_NULL_WITH_NULL_NULL", false);
  public static final CipherSuite TLS_RSA_WITH_NULL_MD5 =
    new CipherSuite (CipherAlgorithm.NULL,
                     KeyExchangeAlgorithm.RSA,
                     SignatureAlgorithm.RSA,
                     MacAlgorithm.MD5, 0, 0x00, 0x01,
-                     "TLS_RSA_WITH_NULL_MD5");
+                     "TLS_RSA_WITH_NULL_MD5", false);
  public static final CipherSuite TLS_RSA_WITH_NULL_SHA =
    new CipherSuite (CipherAlgorithm.NULL,
                     KeyExchangeAlgorithm.RSA,
                     SignatureAlgorithm.RSA,
                     MacAlgorithm.SHA, 0, 0x00, 0x02,
-                     "TLS_RSA_WITH_NULL_SHA");
+                     "TLS_RSA_WITH_NULL_SHA", false);
  public static final CipherSuite TLS_RSA_EXPORT_WITH_RC4_40_MD5 =
    new CipherSuite (CipherAlgorithm.RC4,
                     KeyExchangeAlgorithm.RSA,
                     SignatureAlgorithm.RSA,
                     MacAlgorithm.MD5, 5, 0x00, 0x03,
-                     "TLS_RSA_EXPORT_WITH_RC4_40_MD5");
+                     "TLS_RSA_EXPORT_WITH_RC4_40_MD5", false);
  public static final CipherSuite TLS_RSA_WITH_RC4_128_MD5 =
    new CipherSuite (CipherAlgorithm.RC4,
                     KeyExchangeAlgorithm.RSA,
                     SignatureAlgorithm.RSA,
                     MacAlgorithm.MD5, 16, 0x00, 0x04,
-                     "TLS_RSA_WITH_RC4_128_MD5");
+                     "TLS_RSA_WITH_RC4_128_MD5", false);
  public static final CipherSuite TLS_RSA_WITH_RC4_128_SHA =
    new CipherSuite (CipherAlgorithm.RC4,
                     KeyExchangeAlgorithm.RSA,
                     SignatureAlgorithm.RSA,
                     MacAlgorithm.SHA, 16, 0x00, 0x05,
-                     "TLS_RSA_WITH_RC4_128_SHA");
+                     "TLS_RSA_WITH_RC4_128_SHA", false);
  public static final CipherSuite TLS_RSA_EXPORT_WITH_DES40_CBC_SHA =
    new CipherSuite (CipherAlgorithm.DES,
                     KeyExchangeAlgorithm.RSA,
                     SignatureAlgorithm.RSA,
                     MacAlgorithm.SHA, 5, 0x00, 0x08,
-                     "TLS_RSA_EXPORT_WITH_DES40_CBC_SHA");
+                     "TLS_RSA_EXPORT_WITH_DES40_CBC_SHA", true);
  public static final CipherSuite TLS_RSA_WITH_DES_CBC_SHA =
    new CipherSuite (CipherAlgorithm.DES,
                     KeyExchangeAlgorithm.RSA,
                     SignatureAlgorithm.RSA,
                     MacAlgorithm.SHA, 8, 0x00, 0x09,
-                     "TLS_RSA_WITH_DES_CBC_SHA");
+                     "TLS_RSA_WITH_DES_CBC_SHA", true);
  public static final CipherSuite TLS_RSA_WITH_3DES_EDE_CBC_SHA =
    new CipherSuite (CipherAlgorithm.DESede,
                     KeyExchangeAlgorithm.RSA,
                     SignatureAlgorithm.RSA,
                     MacAlgorithm.SHA, 24, 0x00, 0x0A,
-                     "TLS_RSA_WITH_3DES_EDE_CBC_SHA");
+                     "TLS_RSA_WITH_3DES_EDE_CBC_SHA", true);
  public static final CipherSuite TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA =
    new CipherSuite (CipherAlgorithm.DES,
                     KeyExchangeAlgorithm.DH_DSS,
                     SignatureAlgorithm.ANONYMOUS,
                     MacAlgorithm.SHA, 5, 0x00, 0x0B,
-                     "TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA");
+                     "TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA", true);
  public static final CipherSuite TLS_DH_DSS_WITH_DES_CBC_SHA =
    new CipherSuite (CipherAlgorithm.DES,
                     KeyExchangeAlgorithm.DH_DSS,
                     SignatureAlgorithm.ANONYMOUS,
                     MacAlgorithm.SHA, 8, 0x00, 0x0C,
-                     "TLS_DH_DSS_WITH_DES_CBC_SHA");
+                     "TLS_DH_DSS_WITH_DES_CBC_SHA", true);
  public static final CipherSuite TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA =
    new CipherSuite (CipherAlgorithm.DESede,
                     KeyExchangeAlgorithm.DH_DSS,
                     SignatureAlgorithm.ANONYMOUS,
                     MacAlgorithm.SHA, 24, 0x00, 0x0D,
-                     "TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA");
+                     "TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA", true);
  public static final CipherSuite TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA =
    new CipherSuite (CipherAlgorithm.DES,
                     KeyExchangeAlgorithm.DH_RSA,
                     SignatureAlgorithm.ANONYMOUS,
                     MacAlgorithm.SHA, 5, 0x00, 0x0E,
-                     "TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA");
+                     "TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA", true);
  public static final CipherSuite TLS_DH_RSA_WITH_DES_CBC_SHA =
    new CipherSuite (CipherAlgorithm.DES,
                     KeyExchangeAlgorithm.DH_RSA,
                     SignatureAlgorithm.ANONYMOUS,
                     MacAlgorithm.SHA, 8, 0x00, 0x0F,
-                     "TLS_DH_RSA_WITH_DES_CBC_SHA");
+                     "TLS_DH_RSA_WITH_DES_CBC_SHA", true);
  public static final CipherSuite TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA =
    new CipherSuite (CipherAlgorithm.DESede,
                     KeyExchangeAlgorithm.DH_RSA,
                     SignatureAlgorithm.ANONYMOUS,
                     MacAlgorithm.SHA, 24, 0x00, 0x10,
-                     "TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA");
+                     "TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA", true);
  public static final CipherSuite TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA =
    new CipherSuite (CipherAlgorithm.DES,
                     KeyExchangeAlgorithm.DHE_DSS, true,
                     SignatureAlgorithm.DSA,
                     MacAlgorithm.SHA, 5, 0x00, 0x11,
-                     "TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA");
+                     "TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA", true);
  public static final CipherSuite TLS_DHE_DSS_WITH_DES_CBC_SHA =
    new CipherSuite (CipherAlgorithm.DES,
                     KeyExchangeAlgorithm.DHE_DSS, true,
                     SignatureAlgorithm.DSA,
                     MacAlgorithm.SHA, 8, 0x00, 0x12,
-                     "TLS_DHE_DSS_WITH_DES_CBC_SHA");
+                     "TLS_DHE_DSS_WITH_DES_CBC_SHA", true);
  public static final CipherSuite TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA =
    new CipherSuite (CipherAlgorithm.DESede,
                     KeyExchangeAlgorithm.DHE_DSS, true,
                     SignatureAlgorithm.DSA,
                     MacAlgorithm.SHA, 24, 0x00, 0x13,
-                     "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA");
+                     "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA", true);
  public static final CipherSuite TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA =
    new CipherSuite (CipherAlgorithm.DES,
                     KeyExchangeAlgorithm.DHE_RSA, true,
                     SignatureAlgorithm.RSA,
                     MacAlgorithm.SHA, 5, 0x00, 0x14,
-                     "TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA");
+                     "TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA", true);
  public static final CipherSuite TLS_DHE_RSA_WITH_DES_CBC_SHA =
    new CipherSuite (CipherAlgorithm.DES,
                     KeyExchangeAlgorithm.DHE_RSA, true,
                     SignatureAlgorithm.RSA,
                     MacAlgorithm.SHA, 8, 0x00, 0x15,
-                     "TLS_DHE_RSA_WITH_DES_CBC_SHA");
+                     "TLS_DHE_RSA_WITH_DES_CBC_SHA", true);
  public static final CipherSuite TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA =
    new CipherSuite (CipherAlgorithm.DESede,
                     KeyExchangeAlgorithm.DHE_RSA, true,
                     SignatureAlgorithm.RSA,
                     MacAlgorithm.SHA, 24, 0x00, 0x16,
-                     "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA");
+                     "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA", true);

  // AES CipherSuites.
  public static final CipherSuite TLS_RSA_WITH_AES_128_CBC_SHA =
@ -201,61 +201,61 @@ public final class CipherSuite implements Constructed
                     KeyExchangeAlgorithm.RSA,
                     SignatureAlgorithm.RSA,
                     MacAlgorithm.SHA, 16, 0x00, 0x2F,
-                     "TLS_RSA_WITH_AES_128_CBC_SHA");
+                     "TLS_RSA_WITH_AES_128_CBC_SHA", true);
  public static final CipherSuite TLS_DH_DSS_WITH_AES_128_CBC_SHA =
    new CipherSuite (CipherAlgorithm.AES,
                     KeyExchangeAlgorithm.DH_DSS,
                     SignatureAlgorithm.ANONYMOUS,
                     MacAlgorithm.SHA, 16, 0x00, 0x30,
-                     "TLS_DH_DSS_WITH_AES_128_CBC_SHA");
+                     "TLS_DH_DSS_WITH_AES_128_CBC_SHA", true);
  public static final CipherSuite TLS_DH_RSA_WITH_AES_128_CBC_SHA =
    new CipherSuite (CipherAlgorithm.AES,
                     KeyExchangeAlgorithm.DH_RSA,
                     SignatureAlgorithm.ANONYMOUS,
                     MacAlgorithm.SHA, 16, 0x00, 0x31,
-                     "TLS_DH_RSA_WITH_AES_128_CBC_SHA");
+                     "TLS_DH_RSA_WITH_AES_128_CBC_SHA", true);
  public static final CipherSuite TLS_DHE_DSS_WITH_AES_128_CBC_SHA =
    new CipherSuite (CipherAlgorithm.AES,
                     KeyExchangeAlgorithm.DHE_DSS, true,
                     SignatureAlgorithm.DSA,
                     MacAlgorithm.SHA, 16, 0x00, 0x32,
-                     "TLS_DHE_DSS_WITH_AES_128_CBC_SHA");
+                     "TLS_DHE_DSS_WITH_AES_128_CBC_SHA", true);
  public static final CipherSuite TLS_DHE_RSA_WITH_AES_128_CBC_SHA =
    new CipherSuite (CipherAlgorithm.AES,
                     KeyExchangeAlgorithm.DHE_RSA, true,
                     SignatureAlgorithm.RSA,
                     MacAlgorithm.SHA, 16, 0x00, 0x33,
-                     "TLS_DHE_RSA_WITH_AES_128_CBC_SHA");
+                     "TLS_DHE_RSA_WITH_AES_128_CBC_SHA", true);
  public static final CipherSuite TLS_RSA_WITH_AES_256_CBC_SHA =
    new CipherSuite (CipherAlgorithm.AES,
                     KeyExchangeAlgorithm.RSA,
                     SignatureAlgorithm.ANONYMOUS,
                     MacAlgorithm.SHA, 32, 0x00, 0x35,
-                     "TLS_RSA_WITH_AES_256_CBC_SHA");
+                     "TLS_RSA_WITH_AES_256_CBC_SHA", true);
  public static final CipherSuite TLS_DH_DSS_WITH_AES_256_CBC_SHA =
    new CipherSuite (CipherAlgorithm.AES,
                     KeyExchangeAlgorithm.DH_DSS,
                     SignatureAlgorithm.ANONYMOUS,
                     MacAlgorithm.SHA, 32, 0x00, 0x36,
-                     "TLS_DH_DSS_WITH_AES_256_CBC_SHA");
+                     "TLS_DH_DSS_WITH_AES_256_CBC_SHA", true);
  public static final CipherSuite TLS_DH_RSA_WITH_AES_256_CBC_SHA =
    new CipherSuite (CipherAlgorithm.AES,
                     KeyExchangeAlgorithm.DH_RSA,
                     SignatureAlgorithm.ANONYMOUS,
                     MacAlgorithm.SHA, 32, 0x00, 0x37,
-                     "TLS_DH_RSA_WITH_AES_256_CBC_SHA");
+                     "TLS_DH_RSA_WITH_AES_256_CBC_SHA", true);
  public static final CipherSuite TLS_DHE_DSS_WITH_AES_256_CBC_SHA =
    new CipherSuite (CipherAlgorithm.AES,
                     KeyExchangeAlgorithm.DHE_DSS, true,
                     SignatureAlgorithm.DSA,
                     MacAlgorithm.SHA, 32, 0x00, 0x38,
-                     "TLS_DHE_DSS_WITH_AES_256_CBC_SHA");
+                     "TLS_DHE_DSS_WITH_AES_256_CBC_SHA", true);
  public static final CipherSuite TLS_DHE_RSA_WITH_AES_256_CBC_SHA =
    new CipherSuite (CipherAlgorithm.AES,
                     KeyExchangeAlgorithm.DHE_RSA, true,
                     SignatureAlgorithm.RSA,
                     MacAlgorithm.SHA, 32, 0x00, 0x39,
-                     "TLS_DHE_RSA_WITH_AES_256_CBC_SHA");
+                     "TLS_DHE_RSA_WITH_AES_256_CBC_SHA", true);

  // Secure remote password (SRP) ciphersuites
  // Actual ID values are TBD, so these are omitted until they are specified.
@ -320,75 +320,75 @@ public final class CipherSuite implements Constructed
                    KeyExchangeAlgorithm.PSK,
                    SignatureAlgorithm.ANONYMOUS,
                    MacAlgorithm.SHA, 16, 0x00, 0x8A,
-                    "TLS_PSK_WITH_RC4_128_SHA");
+                    "TLS_PSK_WITH_RC4_128_SHA", true);
  public static final CipherSuite TLS_PSK_WITH_3DES_EDE_CBC_SHA =
    new CipherSuite(CipherAlgorithm.DESede,
                    KeyExchangeAlgorithm.PSK,
                    SignatureAlgorithm.ANONYMOUS,
                    MacAlgorithm.SHA, 24, 0x00, 0x8B,
-                    "TLS_PSK_WITH_3DES_EDE_CBC_SHA");
+                    "TLS_PSK_WITH_3DES_EDE_CBC_SHA", true);
  public static final CipherSuite TLS_PSK_WITH_AES_128_CBC_SHA =
    new CipherSuite(CipherAlgorithm.AES,
                    KeyExchangeAlgorithm.PSK,
                    SignatureAlgorithm.ANONYMOUS,
                    MacAlgorithm.SHA, 16, 0x00, 0x8C,
-                    "TLS_PSK_WITH_AES_128_CBC_SHA");
+                    "TLS_PSK_WITH_AES_128_CBC_SHA", true);
  public static final CipherSuite TLS_PSK_WITH_AES_256_CBC_SHA =
    new CipherSuite(CipherAlgorithm.AES,
                    KeyExchangeAlgorithm.PSK,
                    SignatureAlgorithm.ANONYMOUS,
                    MacAlgorithm.SHA, 32, 0x00, 0x8D,
-                    "TLS_PSK_WITH_AES_256_CBC_SHA");
+                    "TLS_PSK_WITH_AES_256_CBC_SHA", true);

  public static final CipherSuite TLS_DHE_PSK_WITH_RC4_128_SHA =
    new CipherSuite(CipherAlgorithm.RC4,
                    KeyExchangeAlgorithm.DHE_PSK, true,
                    SignatureAlgorithm.ANONYMOUS,
                    MacAlgorithm.SHA, 16, 0x00, 0x8E,
-                    "TLS_DHE_PSK_WITH_RC4_128_SHA");
+                    "TLS_DHE_PSK_WITH_RC4_128_SHA", false);
  public static final CipherSuite TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA =
    new CipherSuite(CipherAlgorithm.DESede,
                    KeyExchangeAlgorithm.DHE_PSK, true,
                    SignatureAlgorithm.ANONYMOUS,
                    MacAlgorithm.SHA, 24, 0x00, 0x8F,
-                    "TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA");
+                    "TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA", true);
  public static final CipherSuite TLS_DHE_PSK_WITH_AES_128_CBC_SHA =
    new CipherSuite(CipherAlgorithm.AES,
                    KeyExchangeAlgorithm.DHE_PSK, true,
                    SignatureAlgorithm.ANONYMOUS,
                    MacAlgorithm.SHA, 16, 0x00, 0x90,
-                    "TLS_DHE_PSK_WITH_AES_128_CBC_SHA");
+                    "TLS_DHE_PSK_WITH_AES_128_CBC_SHA", true);
  public static final CipherSuite TLS_DHE_PSK_WITH_AES_256_CBC_SHA =
    new CipherSuite(CipherAlgorithm.AES,
                    KeyExchangeAlgorithm.DHE_PSK, true,
                    SignatureAlgorithm.ANONYMOUS,
                    MacAlgorithm.SHA, 32, 0x00, 0x91,
-                    "TLS_DHE_PSK_WITH_AES_256_CBC_SHA");
+                    "TLS_DHE_PSK_WITH_AES_256_CBC_SHA", true);

  public static final CipherSuite TLS_RSA_PSK_WITH_RC4_128_SHA =
    new CipherSuite(CipherAlgorithm.RC4,
                    KeyExchangeAlgorithm.RSA_PSK,
                    SignatureAlgorithm.ANONYMOUS,
                    MacAlgorithm.SHA, 16, 0x00, 0x92,
-                    "TLS_RSA_PSK_WITH_RC4_128_SHA");
+                    "TLS_RSA_PSK_WITH_RC4_128_SHA", false);
  public static final CipherSuite TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA =
    new CipherSuite(CipherAlgorithm.DESede,
                    KeyExchangeAlgorithm.RSA_PSK,
                    SignatureAlgorithm.ANONYMOUS,
                    MacAlgorithm.SHA, 24, 0x00, 0x93,
-                    "TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA");
+                    "TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA", true);
  public static final CipherSuite TLS_RSA_PSK_WITH_AES_128_CBC_SHA =
    new CipherSuite(CipherAlgorithm.AES,
                    KeyExchangeAlgorithm.RSA_PSK,
                    SignatureAlgorithm.ANONYMOUS,
                    MacAlgorithm.SHA, 16, 0x00, 0x94,
-                    "TLS_RSA_PSK_WITH_AES_128_CBC_SHA");
+                    "TLS_RSA_PSK_WITH_AES_128_CBC_SHA", true);
  public static final CipherSuite TLS_RSA_PSK_WITH_AES_256_CBC_SHA =
    new CipherSuite(CipherAlgorithm.AES,
                    KeyExchangeAlgorithm.RSA_PSK,
                    SignatureAlgorithm.ANONYMOUS,
                    MacAlgorithm.SHA, 32, 0x00, 0x95,
-                    "TLS_RSA_PSK_WITH_AES_256_CBC_SHA");
+                    "TLS_RSA_PSK_WITH_AES_256_CBC_SHA", true);

  // Ciphersuites from the OpenPGP extension draft.
  // These disappeared from a more recent draft.
@ -490,6 +490,7 @@ public final class CipherSuite implements Constructed
  private final boolean ephemeralDH;
  private final boolean exportable;
  private final boolean isStream;
+  private final boolean isCBCMode;
  private final int keyLength;
  private final byte[] id;
  private final String name;
@ -505,10 +506,11 @@ public final class CipherSuite implements Constructed
                       final int keyLength,
                       final int id1,
                       final int id2,
-                       final String name)
+                       final String name,
+                       final boolean isCBCMode)
  {
    this (cipherAlgorithm, keyExchangeAlgorithm, false, signatureAlgorithm,
-          macAlgorithm, keyLength, id1, id2, name);
+          macAlgorithm, keyLength, id1, id2, name, isCBCMode);
  }

  private CipherSuite (final CipherAlgorithm cipherAlgorithm,
@ -519,7 +521,8 @@ public final class CipherSuite implements Constructed
                       final int keyLength,
                       final int id1,
                       final int id2,
-                       final String name)
+                       final String name,
+                       final boolean isCBCMode)
  {
    this.cipherAlgorithm = cipherAlgorithm;
    this.keyExchangeAlgorithm = keyExchangeAlgorithm;
@ -529,6 +532,7 @@ public final class CipherSuite implements Constructed
    this.exportable = keyLength <= 5;
    this.isStream = (cipherAlgorithm == CipherAlgorithm.NULL
                     || cipherAlgorithm == CipherAlgorithm.RC4);
+    this.isCBCMode = isCBCMode;
    this.keyLength = keyLength;
    this.id = new byte[] { (byte) id1, (byte) id2 };
    this.name = name.intern();
@ -549,6 +553,7 @@ public final class CipherSuite implements Constructed
    ephemeralDH = false;
    exportable = false;
    isStream = false;
+    isCBCMode = false;
    keyLength = 0;
    this.id = id;
    name = null;
@ -598,10 +603,10 @@ public final class CipherSuite implements Constructed
      return new NullCipher ();

    String alg = null;
-    if (cipherAlgorithm == CipherAlgorithm.RC4)
-      alg = "RC4";
-    else
+    if (isCBCMode)
      alg = cipherAlgorithm + "/CBC/NoPadding";
+    else
+      alg = cipherAlgorithm.toString();
    GetSecurityPropertyAction gspa =
      new GetSecurityPropertyAction ("jessie.jce.provider");
    final String provider = (String) AccessController.doPrivileged (gspa);
@ -834,4 +839,10 @@ public final class CipherSuite implements Constructed
      }
    return name;
  }
+
+  public boolean isCBCMode()
+  {
+    return isCBCMode;
+  }
+
 }
--- a/libjava/classpath/gnu/javax/net/ssl/provider/OutputSecurityParameters.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/OutputSecurityParameters.java
@ -62,6 +62,17 @@ public class OutputSecurityParameters
  private final CipherSuite suite;
  private long sequence;

+  static final boolean enableCBCProtection;
+
+  static
+  {
+    String enabled = Util.getProperty("jsse.enableCBCProtection");
+    if (enabled == null)
+      enableCBCProtection = true;
+    else
+      enableCBCProtection = Boolean.valueOf(enabled);
+  }
+
  public OutputSecurityParameters (final Cipher cipher, final Mac mac,
                                   final Deflater deflater, SessionImpl session,
                                   CipherSuite suite)
@ -291,4 +302,11 @@ public class OutputSecurityParameters
  {
    return suite;
  }
+
+  boolean needToSplitPayload()
+  {
+    return (session.version.compareTo(ProtocolVersion.TLS_1_1) < 0 &&
+            suite.isCBCMode() && enableCBCProtection);
+  }
+
 }
--- a/libjava/classpath/gnu/javax/net/ssl/provider/SSLEngineImpl.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/SSLEngineImpl.java
@ -768,10 +768,27 @@ public final class SSLEngineImpl extends SSLEngine
          }
        else
          {
-            inout = outsec.encrypt(sources, offset, length,
-                                   ContentType.APPLICATION_DATA, sink);
-            consumed = inout[0];
-            produced = inout[1];
+            if (outsec.needToSplitPayload())
+              {
+                inout = outsec.encrypt(sources, offset, 1,
+                                       ContentType.APPLICATION_DATA, sink);
+                consumed = inout[0];
+                produced = inout[1];
+                if (length > 1)
+                  {
+                    inout = outsec.encrypt(sources, offset+1, length-1,
+                                           ContentType.APPLICATION_DATA, sink);
+                    consumed += inout[0];
+                    produced += inout[1];
+                  }
+              }
+            else
+              {
+                inout = outsec.encrypt(sources, offset, length,
+                                       ContentType.APPLICATION_DATA, sink);
+                consumed = inout[0];
+                produced = inout[1];
+              }
          }

        if (Debug.DEBUG)
--- a/libjava/classpath/gnu/javax/print/PrinterDialog.java
+++ b/libjava/classpath/gnu/javax/print/PrinterDialog.java
@ -1,5 +1,5 @@
 /* PrinterDialog.java --
-   Copyright (C)  2006  Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@ -1452,12 +1452,8 @@ public final class PrinterDialog extends JDialog implements ActionListener
  private boolean onlyPageDialog;
  private PrintRequestAttributeSet atts;

-  private final static ResourceBundle messages;
-
-  static
-  {
-    messages = ResourceBundle.getBundle("gnu/javax/print/PrinterDialog");
-  }
+  private final static ResourceBundle messages
+    = ResourceBundle.getBundle("gnu.javax.print.MessagesBundle");

  // TODO LowPriority: Include checks so that if a specific value formerly
  // selected is no more supported by the new service changes to the default.
--- a/libjava/classpath/gnu/javax/security/auth/login/ConfigFileParser.java
+++ b/libjava/classpath/gnu/javax/security/auth/login/ConfigFileParser.java
@ -1,5 +1,5 @@
 /* ConfigFileParser.java -- JAAS Login Configuration default syntax parser
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@ -91,9 +91,11 @@ import javax.security.auth.login.AppConfigurationEntry;
 */
 public final class ConfigFileParser
 {
-  private static final Logger log = Logger.getLogger(ConfigFileParser.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(ConfigFileParser.class.getName()) : null;
+
  private ConfigFileTokenizer cft;
-  private Map map = new HashMap();
+  private final Map map = new HashMap();

  // default 0-arguments constructor

--- a/libjava/classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java
+++ b/libjava/classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java
@ -1,5 +1,5 @@
 /* ConfigFileTokenizer.java -- JAAS Login Configuration default syntax tokenizer
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@ -81,7 +81,9 @@ import java.util.logging.Logger;
 */
 public class ConfigFileTokenizer
 {
-  private static final Logger log = Logger.getLogger(ConfigFileParser.class.getName());
+  private static final Logger log = Configuration.DEBUG ?
+                Logger.getLogger(ConfigFileParser.class.getName()) : null;
+
  /** A constant indicating that the end of the stream has been read. */
  public static final int TT_EOF = -1;
  /** A constant indicating that a word token has been read. */
@ -92,7 +94,7 @@ public class ConfigFileTokenizer
  public String sval;
  public int ttype;

-  private BufferedReader br;
+  private final BufferedReader br;
  boolean initialised;
  private CPStringBuilder sb;
  private int sbNdx;
@ -103,10 +105,7 @@ public class ConfigFileTokenizer
  /** Trivial constructor. */
  ConfigFileTokenizer(Reader r)
  {
-    super();
-
    br = r instanceof BufferedReader ? (BufferedReader) r : new BufferedReader(r);
-    initialised = false;
  }

  // Class methods
--- a/libjava/classpath/gnu/javax/security/auth/login/GnuConfiguration.java
+++ b/libjava/classpath/gnu/javax/security/auth/login/GnuConfiguration.java
@ -1,5 +1,5 @@
 /* GnuConfiguration.java -- GNU Classpath implementation of JAAS Configuration
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010  Free Software Foundation, Inc.

 This file is part of GNU Classpath.

@ -128,7 +128,9 @@ import javax.security.auth.login.Configuration;
 */
 public final class GnuConfiguration extends Configuration
 {
-  private static final Logger log = Logger.getLogger(GnuConfiguration.class.getName());
+  private static final Logger log = gnu.java.security.Configuration.DEBUG ?
+                Logger.getLogger(GnuConfiguration.class.getName()) : null;
+
  /**
   * The internal map of login modules keyed by application name. Each entry in
   * this map is a {@link List} of {@link AppConfigurationEntry}s for that
--- a/libjava/classpath/include/Makefile.am
+++ b/libjava/classpath/include/Makefile.am
@ -145,6 +145,7 @@ gnu_java_nio_VMSelector.h \
 gnu_java_nio_charset_iconv_IconvEncoder.h \
 gnu_java_nio_charset_iconv_IconvDecoder.h \
 gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h \
+java_io_VMConsole.h \
 java_io_VMFile.h \
 java_io_VMObjectInputStream.h \
 java_io_VMObjectStreamClass.h \
@ -385,6 +386,8 @@ gnu_java_nio_VMSelector.h: $(top_srcdir)/vm/reference/gnu/java/nio/VMSelector.ja
 	$(JAVAH) -o $@ gnu.java.nio.VMSelector
 gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h: $(top_srcdir)/vm/reference/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java
 	$(JAVAH) -o $@ gnu.java.lang.management.VMOperatingSystemMXBeanImpl
+java_io_VMConsole.h: $(top_srcdir)/vm/reference/java/io/VMConsole.java
+	$(JAVAH) -o $@ java.io.VMConsole
 java_io_VMFile.h: $(top_srcdir)/vm/reference/java/io/VMFile.java
 	$(JAVAH) -o $@ java.io.VMFile
 java_io_VMObjectInputStream.h: $(top_srcdir)/vm/reference/java/io/VMObjectInputStream.java
--- a/libjava/classpath/include/Makefile.in
+++ b/libjava/classpath/include/Makefile.in
@ -420,6 +420,7 @@ gnu_java_nio_VMSelector.h \
 gnu_java_nio_charset_iconv_IconvEncoder.h \
 gnu_java_nio_charset_iconv_IconvDecoder.h \
 gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h \
+java_io_VMConsole.h \
 java_io_VMFile.h \
 java_io_VMObjectInputStream.h \
 java_io_VMObjectStreamClass.h \
@ -863,6 +864,8 @@ uninstall-am:
@CREATE_JNI_HEADERS_TRUE@	$(JAVAH) -o $@ gnu.java.nio.VMSelector
@CREATE_JNI_HEADERS_TRUE@gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h: $(top_srcdir)/vm/reference/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java
@CREATE_JNI_HEADERS_TRUE@	$(JAVAH) -o $@ gnu.java.lang.management.VMOperatingSystemMXBeanImpl
+@CREATE_JNI_HEADERS_TRUE@java_io_VMConsole.h: $(top_srcdir)/vm/reference/java/io/VMConsole.java
+@CREATE_JNI_HEADERS_TRUE@	$(JAVAH) -o $@ java.io.VMConsole
@CREATE_JNI_HEADERS_TRUE@java_io_VMFile.h: $(top_srcdir)/vm/reference/java/io/VMFile.java
@CREATE_JNI_HEADERS_TRUE@	$(JAVAH) -o $@ java.io.VMFile
@CREATE_JNI_HEADERS_TRUE@java_io_VMObjectInputStream.h: $(top_srcdir)/vm/reference/java/io/VMObjectInputStream.java
--- a/libjava/classpath/include/config.h.in
+++ b/libjava/classpath/include/config.h.in
@ -24,6 +24,9 @@
 /* Define to 1 if you have BSD u_int32_t */
 #undef HAVE_BSD_INT32_DEFINED

+/* Define to 1 if you have the `clock_gettime' function. */
+#undef HAVE_CLOCK_GETTIME
+
 /* Define to 1 if you have the `close' function. */
 #undef HAVE_CLOSE

--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h
@ -19,6 +19,19 @@ JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_nativeGra
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_copyAreaNative (JNIEnv *env, jobject, jobject, jint, jint, jint, jint, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile (JNIEnv *env, jobject, jobject, jlong, jint, jint, jint, jint, jint, jint, jint, jint);

+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_NEAREST
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_NEAREST 0L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BILINEAR
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BILINEAR 1L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BICUBIC
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BICUBIC 5L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_SPEED
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_SPEED 2L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_QUALITY
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_QUALITY 3L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_DEFAULT
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_DEFAULT 4L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h
@ -13,6 +13,19 @@ extern "C"
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphicsCopy_getPixbuf (JNIEnv *env, jobject, jobject, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphicsCopy_copyPixbuf (JNIEnv *env, jobject, jobject, jobject, jint, jint, jint, jint);

+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_NEAREST
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_NEAREST 0L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BILINEAR
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BILINEAR 1L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BICUBIC
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_INTERPOLATION_BICUBIC 5L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_SPEED
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_SPEED 2L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_QUALITY
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_QUALITY 3L
+#undef gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_DEFAULT
+#define gnu_java_awt_peer_gtk_CairoGraphics2D_ALPHA_INTERPOLATION_DEFAULT 4L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h
@ -17,6 +17,17 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getKerning
 JNIEXPORT jdoubleArray JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getMetricsNative (JNIEnv *env, jobject, jint, jlong);
 JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphOutlineNative (JNIEnv *env, jobject, jint, jlong);

+#undef java_awt_font_GlyphVector_FLAG_COMPLEX_GLYPHS
+#define java_awt_font_GlyphVector_FLAG_COMPLEX_GLYPHS 8L
+#undef java_awt_font_GlyphVector_FLAG_HAS_POSITION_ADJUSTMENTS
+#define java_awt_font_GlyphVector_FLAG_HAS_POSITION_ADJUSTMENTS 2L
+#undef java_awt_font_GlyphVector_FLAG_HAS_TRANSFORMS
+#define java_awt_font_GlyphVector_FLAG_HAS_TRANSFORMS 1L
+#undef java_awt_font_GlyphVector_FLAG_MASK
+#define java_awt_font_GlyphVector_FLAG_MASK 15L
+#undef java_awt_font_GlyphVector_FLAG_RUN_RTL
+#define java_awt_font_GlyphVector_FLAG_RUN_RTL 4L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h
@ -19,6 +19,13 @@ JNIEXPORT jobjectArray JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevic
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeSetDisplayMode (JNIEnv *env, jobject, jobject, jint, jshort);
 JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice_nativeGetBounds (JNIEnv *env, jobject);

+#undef java_awt_GraphicsDevice_TYPE_RASTER_SCREEN
+#define java_awt_GraphicsDevice_TYPE_RASTER_SCREEN 0L
+#undef java_awt_GraphicsDevice_TYPE_PRINTER
+#define java_awt_GraphicsDevice_TYPE_PRINTER 1L
+#undef java_awt_GraphicsDevice_TYPE_IMAGE_BUFFER
+#define java_awt_GraphicsDevice_TYPE_IMAGE_BUFFER 2L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h
@ -13,6 +13,23 @@ extern "C"
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create (JNIEnv *env, jobject, jlong);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_construct (JNIEnv *env, jobject, jlong);

+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_NORMAL
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_NORMAL 0L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DIALOG
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DIALOG 1L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_MENU
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_MENU 2L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_TOOLBAR
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_TOOLBAR 3L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_SPLASHSCREEN
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_SPLASHSCREEN 4L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_UTILITY
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_UTILITY 5L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DOCK
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DOCK 6L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DESKTOP
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DESKTOP 7L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
@ -17,6 +17,23 @@ JNIEXPORT jstring JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeGet
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetDirectory (JNIEnv *env, jobject, jstring);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFilenameFilter (JNIEnv *env, jobject, jobject);

+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_NORMAL
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_NORMAL 0L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DIALOG
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DIALOG 1L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_MENU
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_MENU 2L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_TOOLBAR
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_TOOLBAR 3L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_SPLASHSCREEN
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_SPLASHSCREEN 4L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_UTILITY
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_UTILITY 5L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DOCK
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DOCK 6L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DESKTOP
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DESKTOP 7L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkFramePeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkFramePeer.h
@ -22,6 +22,23 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_iconify (JNIEnv *
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_deiconify (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_nativeSetIconImage (JNIEnv *env, jobject, jobject);

+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_NORMAL
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_NORMAL 0L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DIALOG
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DIALOG 1L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_MENU
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_MENU 2L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_TOOLBAR
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_TOOLBAR 3L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_SPLASHSCREEN
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_SPLASHSCREEN 4L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_UTILITY
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_UTILITY 5L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DOCK
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DOCK 6L
+#undef gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DESKTOP
+#define gnu_java_awt_peer_gtk_GtkWindowPeer_GDK_WINDOW_TYPE_HINT_DESKTOP 7L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkImage.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkImage.h
@ -20,6 +20,17 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkImage_freePixbuf (JNIEnv *e
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkImage_createScaledPixbuf (JNIEnv *env, jobject, jobject, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkImage_createFromPixbuf (JNIEnv *env, jobject);

+#undef java_awt_Image_SCALE_DEFAULT
+#define java_awt_Image_SCALE_DEFAULT 1L
+#undef java_awt_Image_SCALE_FAST
+#define java_awt_Image_SCALE_FAST 2L
+#undef java_awt_Image_SCALE_SMOOTH
+#define java_awt_Image_SCALE_SMOOTH 4L
+#undef java_awt_Image_SCALE_REPLICATE
+#define java_awt_Image_SCALE_REPLICATE 8L
+#undef java_awt_Image_SCALE_AREA_AVERAGING
+#define java_awt_Image_SCALE_AREA_AVERAGING 16L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
@ -16,6 +16,23 @@ JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGe
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea (JNIEnv *env, jobject, jlong, jint, jint, jint, jint, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile (JNIEnv *env, jobject, jlong, jlong, jint, jint, jint, jint);

+#undef java_awt_image_VolatileImage_IMAGE_OK
+#define java_awt_image_VolatileImage_IMAGE_OK 0L
+#undef java_awt_image_VolatileImage_IMAGE_RESTORED
+#define java_awt_image_VolatileImage_IMAGE_RESTORED 1L
+#undef java_awt_image_VolatileImage_IMAGE_INCOMPATIBLE
+#define java_awt_image_VolatileImage_IMAGE_INCOMPATIBLE 2L
+#undef java_awt_Image_SCALE_DEFAULT
+#define java_awt_Image_SCALE_DEFAULT 1L
+#undef java_awt_Image_SCALE_FAST
+#define java_awt_Image_SCALE_FAST 2L
+#undef java_awt_Image_SCALE_SMOOTH
+#define java_awt_Image_SCALE_SMOOTH 4L
+#undef java_awt_Image_SCALE_REPLICATE
+#define java_awt_Image_SCALE_REPLICATE 8L
+#undef java_awt_Image_SCALE_AREA_AVERAGING
+#define java_awt_Image_SCALE_AREA_AVERAGING 16L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_MainQtThread.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_MainQtThread.h
@ -13,6 +13,13 @@ extern "C"
 JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_qt_MainQtThread_init (JNIEnv *env, jobject, jstring, jboolean);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_MainQtThread_exec (JNIEnv *env, jobject, jlong);

+#undef java_lang_Thread_MIN_PRIORITY
+#define java_lang_Thread_MIN_PRIORITY 1L
+#undef java_lang_Thread_NORM_PRIORITY
+#define java_lang_Thread_NORM_PRIORITY 5L
+#undef java_lang_Thread_MAX_PRIORITY
+#define java_lang_Thread_MAX_PRIORITY 10L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtButtonPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtButtonPeer.h
@ -13,6 +13,9 @@ extern "C"
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtButtonPeer_init (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtButtonPeer_setLabel (JNIEnv *env, jobject, jstring);

+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtCanvasPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtCanvasPeer.h
@ -12,6 +12,9 @@ extern "C"

 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtCanvasPeer_init (JNIEnv *env, jobject);

+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtCheckboxPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtCheckboxPeer.h
@ -14,6 +14,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtCheckboxPeer_init (JNIEnv *en
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtCheckboxPeer_setLabel (JNIEnv *env, jobject, jstring);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtCheckboxPeer_setState (JNIEnv *env, jobject, jboolean);

+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtChoicePeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtChoicePeer.h
@ -15,6 +15,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtChoicePeer_add (JNIEnv *env,
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtChoicePeer_remove (JNIEnv *env, jobject, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtChoicePeer_select (JNIEnv *env, jobject, jint);

+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtDialogPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtDialogPeer.h
@ -15,6 +15,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtDialogPeer_setModal (JNIEnv *
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtDialogPeer_setBoundsNative (JNIEnv *env, jobject, jint, jint, jint, jint, jboolean);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtDialogPeer_setResizable (JNIEnv *env, jobject, jboolean);

+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h
@ -13,6 +13,9 @@ extern "C"
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtEmbeddedWindowPeer_init (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtEmbeddedWindowPeer_embed (JNIEnv *env, jobject, jlong);

+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtFileDialogPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtFileDialogPeer.h
@ -13,6 +13,9 @@ extern "C"
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtFileDialogPeer_init (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtFileDialogPeer_setMode (JNIEnv *env, jobject, jint);

+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtFontMetrics.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtFontMetrics.h
@ -23,6 +23,9 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtFontMetrics_getMaxAdvance (JN
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtFontMetrics_charWidth (JNIEnv *env, jobject, jchar);
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtFontMetrics_stringWidth (JNIEnv *env, jobject, jstring);

+#undef java_awt_FontMetrics_serialVersionUID
+#define java_awt_FontMetrics_serialVersionUID 1681126225205050147LL
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtFramePeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtFramePeer.h
@ -16,6 +16,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtFramePeer_setMaximizedBounds
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtFramePeer_setMenu (JNIEnv *env, jobject, jobject);
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtFramePeer_menuBarHeight (JNIEnv *env, jobject);

+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtImage.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtImage.h
@ -24,6 +24,17 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtImage_drawPixelsTransformed (
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtImage_drawPixelsScaledFlipped (JNIEnv *env, jobject, jobject, jint, jint, jint, jboolean, jboolean, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtImage_copyArea (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint);

+#undef java_awt_Image_SCALE_DEFAULT
+#define java_awt_Image_SCALE_DEFAULT 1L
+#undef java_awt_Image_SCALE_FAST
+#define java_awt_Image_SCALE_FAST 2L
+#undef java_awt_Image_SCALE_SMOOTH
+#define java_awt_Image_SCALE_SMOOTH 4L
+#undef java_awt_Image_SCALE_REPLICATE
+#define java_awt_Image_SCALE_REPLICATE 8L
+#undef java_awt_Image_SCALE_AREA_AVERAGING
+#define java_awt_Image_SCALE_AREA_AVERAGING 16L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtLabelPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtLabelPeer.h
@ -14,6 +14,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtLabelPeer_init (JNIEnv *env,
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtLabelPeer_setAlignment (JNIEnv *env, jobject, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtLabelPeer_setText (JNIEnv *env, jobject, jstring);

+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtListPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtListPeer.h
@ -18,6 +18,9 @@ JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_qt_QtListPeer_getSelectedInde
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtListPeer_makeVisible (JNIEnv *env, jobject, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtListPeer_setMultipleMode (JNIEnv *env, jobject, jboolean);

+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtPanelPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtPanelPeer.h
@ -12,6 +12,9 @@ extern "C"

 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtPanelPeer_init (JNIEnv *env, jobject);

+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtScreenDevice.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtScreenDevice.h
@ -17,6 +17,13 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtScreenDevice_getDpiX (JNIEnv
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtScreenDevice_getDpiY (JNIEnv *env, jobject);
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtScreenDevice_depth (JNIEnv *env, jobject);

+#undef java_awt_GraphicsDevice_TYPE_RASTER_SCREEN
+#define java_awt_GraphicsDevice_TYPE_RASTER_SCREEN 0L
+#undef java_awt_GraphicsDevice_TYPE_PRINTER
+#define java_awt_GraphicsDevice_TYPE_PRINTER 1L
+#undef java_awt_GraphicsDevice_TYPE_IMAGE_BUFFER
+#define java_awt_GraphicsDevice_TYPE_IMAGE_BUFFER 2L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtScrollPanePeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtScrollPanePeer.h
@ -17,6 +17,9 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtScrollPanePeer_getHScrollbarH
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtScrollPanePeer_getVScrollbarWidth (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtScrollPanePeer_setScrollPosition (JNIEnv *env, jobject, jint, jint);

+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtScrollbarPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtScrollbarPeer.h
@ -16,6 +16,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtScrollbarPeer_setLineIncremen
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtScrollbarPeer_setPageIncrement (JNIEnv *env, jobject, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtScrollbarPeer_setValues (JNIEnv *env, jobject, jint, jint, jint, jint);

+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtTextAreaPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtTextAreaPeer.h
@ -20,6 +20,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtTextAreaPeer_select (JNIEnv *
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtTextAreaPeer_setEditable (JNIEnv *env, jobject, jboolean);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtTextAreaPeer_setCaretPosition (JNIEnv *env, jobject, jint);

+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtTextFieldPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtTextFieldPeer.h
@ -22,6 +22,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtTextFieldPeer_setEchoChar (JN
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtTextFieldPeer_setEditable (JNIEnv *env, jobject, jboolean);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtTextFieldPeer_setText (JNIEnv *env, jobject, jstring);

+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtVolatileImage.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtVolatileImage.h
@ -23,6 +23,23 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtVolatileImage_drawPixelsTrans
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtVolatileImage_drawPixelsScaledFlipped (JNIEnv *env, jobject, jobject, jint, jint, jint, jboolean, jboolean, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtVolatileImage_copyArea (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint);

+#undef java_awt_image_VolatileImage_IMAGE_OK
+#define java_awt_image_VolatileImage_IMAGE_OK 0L
+#undef java_awt_image_VolatileImage_IMAGE_RESTORED
+#define java_awt_image_VolatileImage_IMAGE_RESTORED 1L
+#undef java_awt_image_VolatileImage_IMAGE_INCOMPATIBLE
+#define java_awt_image_VolatileImage_IMAGE_INCOMPATIBLE 2L
+#undef java_awt_Image_SCALE_DEFAULT
+#define java_awt_Image_SCALE_DEFAULT 1L
+#undef java_awt_Image_SCALE_FAST
+#define java_awt_Image_SCALE_FAST 2L
+#undef java_awt_Image_SCALE_SMOOTH
+#define java_awt_Image_SCALE_SMOOTH 4L
+#undef java_awt_Image_SCALE_REPLICATE
+#define java_awt_Image_SCALE_REPLICATE 8L
+#undef java_awt_Image_SCALE_AREA_AVERAGING
+#define java_awt_Image_SCALE_AREA_AVERAGING 16L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtWindowPeer.h
+++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtWindowPeer.h
@ -15,6 +15,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtWindowPeer_toBack (JNIEnv *en
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtWindowPeer_toFront (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtWindowPeer_setTitle (JNIEnv *env, jobject, jstring);

+#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER
+#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_nio_charset_iconv_IconvDecoder.h
+++ b/libjava/classpath/include/gnu_java_nio_charset_iconv_IconvDecoder.h
@ -14,6 +14,15 @@ JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_openIconv (J
 JNIEXPORT jint JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_decode (JNIEnv *env, jobject, jbyteArray, jcharArray, jint, jint, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_closeIconv (JNIEnv *env, jobject);

+#undef java_nio_charset_CharsetDecoder_STATE_RESET
+#define java_nio_charset_CharsetDecoder_STATE_RESET 0L
+#undef java_nio_charset_CharsetDecoder_STATE_CODING
+#define java_nio_charset_CharsetDecoder_STATE_CODING 1L
+#undef java_nio_charset_CharsetDecoder_STATE_END
+#define java_nio_charset_CharsetDecoder_STATE_END 2L
+#undef java_nio_charset_CharsetDecoder_STATE_FLUSHED
+#define java_nio_charset_CharsetDecoder_STATE_FLUSHED 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/gnu_java_nio_charset_iconv_IconvEncoder.h
+++ b/libjava/classpath/include/gnu_java_nio_charset_iconv_IconvEncoder.h
@ -14,6 +14,15 @@ JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_openIconv (J
 JNIEXPORT jint JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_encode (JNIEnv *env, jobject, jcharArray, jbyteArray, jint, jint, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_closeIconv (JNIEnv *env, jobject);

+#undef java_nio_charset_CharsetEncoder_STATE_RESET
+#define java_nio_charset_CharsetEncoder_STATE_RESET 0L
+#undef java_nio_charset_CharsetEncoder_STATE_CODING
+#define java_nio_charset_CharsetEncoder_STATE_CODING 1L
+#undef java_nio_charset_CharsetEncoder_STATE_END
+#define java_nio_charset_CharsetEncoder_STATE_END 2L
+#undef java_nio_charset_CharsetEncoder_STATE_FLUSHED
+#define java_nio_charset_CharsetEncoder_STATE_FLUSHED 3L
+
 #ifdef __cplusplus
 }
 #endif
--- a/libjava/classpath/include/java_io_VMConsole.h
+++ b/libjava/classpath/include/java_io_VMConsole.h
@ -0,0 +1,19 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#include <jni.h>
+
+#ifndef __java_io_VMConsole__
+#define __java_io_VMConsole__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+JNIEXPORT jstring JNICALL Java_java_io_VMConsole_readPassword (JNIEnv *env, jclass, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __java_io_VMConsole__ */
--- a/Show More
+++ b/Show More