Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorchegar
Wed, 08 May 2013 11:22:25 +0100
changeset 18249 aec7e8963c3e
parent 18248 108d0c7b60f9 (current diff)
parent 17212 9e6200796507 (diff)
child 18250 6a8b17cf0cd9
Merge
hotspot/make/bsd/makefiles/jvmg.make file | annotate | diff | comparison | revisions
hotspot/make/bsd/makefiles/profiled.make file | annotate | diff | comparison | revisions
hotspot/make/linux/makefiles/jvmg.make file | annotate | diff | comparison | revisions
hotspot/make/linux/makefiles/profiled.make file | annotate | diff | comparison | revisions
hotspot/make/solaris/makefiles/jvmg.make file | annotate | diff | comparison | revisions
hotspot/make/solaris/makefiles/profiled.make file | annotate | diff | comparison | revisions
hotspot/src/os/bsd/vm/chaitin_bsd.cpp file | annotate | diff | comparison | revisions
hotspot/src/os/linux/vm/chaitin_linux.cpp file | annotate | diff | comparison | revisions
hotspot/src/os/solaris/vm/chaitin_solaris.cpp file | annotate | diff | comparison | revisions
hotspot/src/os/windows/vm/chaitin_windows.cpp file | annotate | diff | comparison | revisions
jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java file | annotate | diff | comparison | revisions
jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/java/beans/ReflectionUtils.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/java/lang/reflect/Proxy.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/java/nio/file/Files.java file | annotate | diff | comparison | revisions
jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java file | annotate | diff | comparison | revisions
jdk/test/java/awt/Focus/OverrideRedirectWindowActivationTest/OverrideRedirectWindowActivationTest.java file | annotate | diff | comparison | revisions
jdk/test/java/io/Serializable/accessConstants/AccessConstants.java file | annotate | diff | comparison | revisions
jdk/test/java/nio/file/Files/walkFileTree/walk_file_tree.sh file | annotate | diff | comparison | revisions
jdk/test/sun/reflect/CallerSensitive/MethodFinder.java file | annotate | diff | comparison | revisions 
--- a/.hgtags	Wed May 01 12:25:43 2013 +0100
+++ b/.hgtags	Wed May 08 11:22:25 2013 +0100
@@ -208,3 +208,4 @@
 d7ad0dfaa41151bd3a9ae46725b0aec3730a9cd0 jdk8-b84
 1872c12529090e1c1dbf567f02ad7ae6231b8f0c jdk8-b85
 da9a4c9312816451884aa6db6f18be51a07bff13 jdk8-b86
+5ebf6c63714de2c9dcf831074086d31daec819df jdk8-b87
--- a/.hgtags-top-repo	Wed May 01 12:25:43 2013 +0100
+++ b/.hgtags-top-repo	Wed May 08 11:22:25 2013 +0100
@@ -208,3 +208,4 @@
 01f631f89fa392b4e484d0812c40ea8f9d2353aa jdk8-b84
 7fc358f5943676b82f1dccd3152b1ac07d92e38b jdk8-b85
 df9b5240f0a76c91cfe1a5b39da4d08df56e05be jdk8-b86
+b9415faa7066a4d3b16d466556d5428446918d95 jdk8-b87
--- a/common/autoconf/configure.ac	Wed May 01 12:25:43 2013 +0100
+++ b/common/autoconf/configure.ac	Wed May 08 11:22:25 2013 +0100
@@ -166,6 +166,7 @@
 TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_LIBS
 TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION
 TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_JDK
+TOOLCHAIN_SETUP_COMPILER_FLAGS_MISC
 
 # Setup debug symbols (need objcopy from the toolchain for that)
 JDKOPT_SETUP_DEBUG_SYMBOLS
--- a/common/autoconf/generated-configure.sh	Wed May 01 12:25:43 2013 +0100
+++ b/common/autoconf/generated-configure.sh	Wed May 08 11:22:25 2013 +0100
@@ -639,6 +639,8 @@
 CFLAGS_DEBUG_SYMBOLS
 ZIP_DEBUGINFO_FILES
 ENABLE_DEBUG_SYMBOLS
+COMPILER_SUPPORTS_TARGET_BITS_FLAG
+ZERO_ARCHFLAG
 LDFLAGS_CXX_JDK
 LDFLAGS_JDKEXE_SUFFIX
 LDFLAGS_JDKLIB_SUFFIX
@@ -679,6 +681,7 @@
 STATIC_LIBRARY
 SHARED_LIBRARY
 OBJ_SUFFIX
+COMPILER_NAME
 LIPO
 ac_ct_OBJDUMP
 OBJDUMP
@@ -835,7 +838,6 @@
 PATH_SEP
 SRC_ROOT
 ZERO_ARCHDEF
-ZERO_ARCHFLAG
 DEFINE_CROSS_COMPILE_ARCH
 LP64
 OPENJDK_TARGET_OS_API_DIR
@@ -3714,6 +3716,15 @@
 
 
 
+
+# TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
+#                                   [RUN-IF-FALSE])
+# ------------------------------------------------------------
+# Check that the c and c++ compilers support an argument
+
+
+
+
 #
 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -3764,7 +3775,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1365493306
+DATE_WHEN_GENERATED=1367502949
 
 ###############################################################################
 #
@@ -7099,17 +7110,6 @@
     fi
 
 
-    # Some Zero and Shark settings.
-    # ZERO_ARCHFLAG tells the compiler which mode to build for
-    case "${OPENJDK_TARGET_CPU}" in
-      s390)
-        ZERO_ARCHFLAG="-m31"
-        ;;
-      *)
-        ZERO_ARCHFLAG="-m${OPENJDK_TARGET_CPU_BITS}"
-    esac
-
-
     # ZERO_ARCHDEF is used to enable architecture-specific code
     case "${OPENJDK_TARGET_CPU}" in
       ppc*)    ZERO_ARCHDEF=PPC   ;;
@@ -28344,6 +28344,7 @@
 # (The JVM can use 32 or 64 bit Java pointers but that decision
 # is made at runtime.)
 #
+
 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
   # Always specify -m flags on Solaris
 
@@ -28805,6 +28806,7 @@
 
 
 
+
 # The (cross) compiler is now configured, we can now test capabilities
 # of the target platform.
 
@@ -29268,6 +29270,161 @@
 
 
 
+
+  # Some Zero and Shark settings.
+  # ZERO_ARCHFLAG tells the compiler which mode to build for
+  case "${OPENJDK_TARGET_CPU}" in
+    s390)
+      ZERO_ARCHFLAG="-m31"
+      ;;
+    *)
+      ZERO_ARCHFLAG="-m${OPENJDK_TARGET_CPU_BITS}"
+  esac
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports \"$ZERO_ARCHFLAG\"" >&5
+$as_echo_n "checking if compiler supports \"$ZERO_ARCHFLAG\"... " >&6; }
+  supports=yes
+
+  saved_cflags="$CFLAGS"
+  CFLAGS="$CFLAGS $ZERO_ARCHFLAG"
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+    int i;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  supports=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  CFLAGS="$saved_cflags"
+
+  saved_cxxflags="$CXXFLAGS"
+  CXXFLAGS="$CXXFLAG $ZERO_ARCHFLAG"
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+    int i;
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  supports=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  CXXFLAGS="$saved_cxxflags"
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
+$as_echo "$supports" >&6; }
+  if test "x$supports" = "xyes" ; then
+    :
+  else
+    ZERO_ARCHFLAG=""
+  fi
+
+
+
+  # Check that the compiler supports -mX flags
+  # Set COMPILER_SUPPORTS_TARGET_BITS_FLAG to 'true' if it does
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports \"-m${OPENJDK_TARGET_CPU_BITS}\"" >&5
+$as_echo_n "checking if compiler supports \"-m${OPENJDK_TARGET_CPU_BITS}\"... " >&6; }
+  supports=yes
+
+  saved_cflags="$CFLAGS"
+  CFLAGS="$CFLAGS -m${OPENJDK_TARGET_CPU_BITS}"
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+    int i;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  supports=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  CFLAGS="$saved_cflags"
+
+  saved_cxxflags="$CXXFLAGS"
+  CXXFLAGS="$CXXFLAG -m${OPENJDK_TARGET_CPU_BITS}"
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+    int i;
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  supports=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+  CXXFLAGS="$saved_cxxflags"
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5
+$as_echo "$supports" >&6; }
+  if test "x$supports" = "xyes" ; then
+    COMPILER_SUPPORTS_TARGET_BITS_FLAG=true
+  else
+    COMPILER_SUPPORTS_TARGET_BITS_FLAG=false
+  fi
+
+
+
+
 # Setup debug symbols (need objcopy from the toolchain for that)
 
 #
@@ -29446,7 +29603,6 @@
 
 
 
-
 ###############################################################################
 #
 # Check for X Windows
--- a/common/autoconf/platform.m4	Wed May 01 12:25:43 2013 +0100
+++ b/common/autoconf/platform.m4	Wed May 08 11:22:25 2013 +0100
@@ -333,17 +333,6 @@
     fi
     AC_SUBST(DEFINE_CROSS_COMPILE_ARCH)
 
-    # Some Zero and Shark settings.
-    # ZERO_ARCHFLAG tells the compiler which mode to build for
-    case "${OPENJDK_TARGET_CPU}" in
-      s390)
-        ZERO_ARCHFLAG="-m31"
-        ;;
-      *)
-        ZERO_ARCHFLAG="-m${OPENJDK_TARGET_CPU_BITS}"
-    esac
-    AC_SUBST(ZERO_ARCHFLAG)
-
     # ZERO_ARCHDEF is used to enable architecture-specific code
     case "${OPENJDK_TARGET_CPU}" in
       ppc*)    ZERO_ARCHDEF=PPC   ;;
@@ -444,6 +433,7 @@
 # (The JVM can use 32 or 64 bit Java pointers but that decision
 # is made at runtime.)
 #
+
 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
   # Always specify -m flags on Solaris
   PLATFORM_SET_COMPILER_TARGET_BITS_FLAGS
--- a/common/autoconf/spec.gmk.in	Wed May 01 12:25:43 2013 +0100
+++ b/common/autoconf/spec.gmk.in	Wed May 08 11:22:25 2013 +0100
@@ -300,6 +300,9 @@
 # CC is gcc and others behaving reasonably similar.
 # CL is cl.exe only.
 COMPILER_TYPE:=@COMPILER_TYPE@
+COMPILER_NAME:=@COMPILER_NAME@
+
+COMPILER_SUPPORTS_TARGET_BITS_FLAG=@COMPILER_SUPPORTS_TARGET_BITS_FLAG@
 
 CC_OUT_OPTION:=@CC_OUT_OPTION@
 EXE_OUT_OPTION:=@EXE_OUT_OPTION@
--- a/common/autoconf/toolchain.m4	Wed May 01 12:25:43 2013 +0100
+++ b/common/autoconf/toolchain.m4	Wed May 08 11:22:25 2013 +0100
@@ -573,6 +573,7 @@
     fi
 fi
 
+AC_SUBST(COMPILER_NAME)
 AC_SUBST(OBJ_SUFFIX)
 AC_SUBST(SHARED_LIBRARY)
 AC_SUBST(STATIC_LIBRARY)
@@ -1030,3 +1031,61 @@
 AC_SUBST(LDFLAGS_JDKEXE_SUFFIX)
 AC_SUBST(LDFLAGS_CXX_JDK)
 ])
+
+
+# TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
+#                                   [RUN-IF-FALSE])
+# ------------------------------------------------------------
+# Check that the c and c++ compilers support an argument
+AC_DEFUN([TOOLCHAIN_COMPILER_CHECK_ARGUMENTS],
+[
+  AC_MSG_CHECKING([if compiler supports "$1"])
+  supports=yes
+
+  saved_cflags="$CFLAGS"
+  CFLAGS="$CFLAGS $1"
+  AC_LANG_PUSH([C])
+  AC_COMPILE_IFELSE([
+    AC_LANG_SOURCE([[int i;]])
+  ], [], [supports=no])
+  AC_LANG_POP([C])
+  CFLAGS="$saved_cflags"
+
+  saved_cxxflags="$CXXFLAGS"
+  CXXFLAGS="$CXXFLAG $1"
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([
+    AC_LANG_SOURCE([[int i;]])
+  ], [], [supports=no])
+  AC_LANG_POP([C++])
+  CXXFLAGS="$saved_cxxflags"
+
+  AC_MSG_RESULT([$supports])
+  if test "x$supports" = "xyes" ; then
+    m4_ifval([$2], [$2], [:])
+  else
+    m4_ifval([$3], [$3], [:])
+  fi
+])
+
+AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_MISC],
+[
+  # Some Zero and Shark settings.
+  # ZERO_ARCHFLAG tells the compiler which mode to build for
+  case "${OPENJDK_TARGET_CPU}" in
+    s390)
+      ZERO_ARCHFLAG="-m31"
+      ;;
+    *)
+      ZERO_ARCHFLAG="-m${OPENJDK_TARGET_CPU_BITS}"
+  esac
+  TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$ZERO_ARCHFLAG], [], [ZERO_ARCHFLAG=""])
+  AC_SUBST(ZERO_ARCHFLAG)
+
+  # Check that the compiler supports -mX flags
+  # Set COMPILER_SUPPORTS_TARGET_BITS_FLAG to 'true' if it does
+  TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([-m${OPENJDK_TARGET_CPU_BITS}],
+    [COMPILER_SUPPORTS_TARGET_BITS_FLAG=true],
+    [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false])
+  AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG)
+])
--- a/common/makefiles/NativeCompilation.gmk	Wed May 01 12:25:43 2013 +0100
+++ b/common/makefiles/NativeCompilation.gmk	Wed May 08 11:22:25 2013 +0100
@@ -95,10 +95,28 @@
         $$($1_$2_OBJ) : $2
         ifeq ($(COMPILER_TYPE),CC)
 		$$(call COMPILING_MSG,$2,$$($1_TARGET))
+          # The Sun studio compiler doesn't output the full path to the object file in the
+          # generated deps files. Fixing it with sed. If compiling assembly, don't try this.
+          ifeq ($(COMPILER_NAME)$$(filter %.s,$2),ossc)
+		$$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP).tmp $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
+		$(SED) 's|^$$(@F):|$$@:|' $$($1_$2_DEP).tmp > $$($1_$2_DEP)
+          else
 		$$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
         endif
+        endif
+        # The Visual Studio compiler lacks a feature for generating make dependencies, but by
+        # setting -showIncludes, all included files are printed. These are filtered out and 
+        # parsed into make dependences.
         ifeq ($(COMPILER_TYPE),CL)
-		$$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEBUG_OUT_FLAGS) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
+		$$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2 | $(TEE) $$($1_$2_DEP).raw | $(GREP) -v "^Note: including file:"
+		($(ECHO) $$@: \\ \
+		 && $(SED) -e '/^Note: including file:/!d' \
+			-e 's|Note: including file: *||' \
+			-e 's|\\|/|g' \
+			-e 's|^\([a-zA-Z]\):|/cygdrive/\1|g' \
+			-e '/$(subst /,\/,$(TOPDIR))/!d' \
+			-e 's|$$$$| \\|g' \
+			$$($1_$2_DEP).raw) > $$($1_$2_DEP)
         endif
     endif
 endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/nb_native/nbproject/configurations.xml	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,41671 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configurationDescriptor version="88">
+  <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
+    <df root="../.." name="$SRC">
+      <df name="build">
+        <df name="linux-x86_64-normal-server-release">
+          <df name="hotspot">
+            <df name="linux_amd64_compiler2">
+              <df name="generated">
+                <df name="adfiles">
+                  <in>ad_x86_64.cpp</in>
+                  <in>ad_x86_64_clone.cpp</in>
+                  <in>ad_x86_64_expand.cpp</in>
+                  <in>ad_x86_64_format.cpp</in>
+                  <in>ad_x86_64_gen.cpp</in>
+                  <in>ad_x86_64_misc.cpp</in>
+                  <in>ad_x86_64_peephole.cpp</in>
+                  <in>ad_x86_64_pipeline.cpp</in>
+                  <in>dfa_x86_64.cpp</in>
+                </df>
+                <df name="jvmtifiles">
+                  <in>bytecodeInterpreterWithChecks.cpp</in>
+                  <in>jvmtiEnter.cpp</in>
+                  <in>jvmtiEnterTrace.cpp</in>
+                </df>
+              </df>
+            </df>
+          </df>
+          <df name="jdk">
+            <df name="gensrc_x11wrappers">
+              <in>sizer.64.c</in>
+            </df>
+          </df>
+        </df>
+        <df name="macosx-x86_64-normal-server-release">
+          <df name="hotspot">
+            <df name="bsd_amd64_compiler2">
+              <df name="generated">
+                <df name="adfiles">
+                  <in>ad_x86_64.cpp</in>
+                  <in>ad_x86_64_clone.cpp</in>
+                  <in>ad_x86_64_expand.cpp</in>
+                  <in>ad_x86_64_format.cpp</in>
+                  <in>ad_x86_64_gen.cpp</in>
+                  <in>ad_x86_64_misc.cpp</in>
+                  <in>ad_x86_64_peephole.cpp</in>
+                  <in>ad_x86_64_pipeline.cpp</in>
+                  <in>dfa_x86_64.cpp</in>
+                </df>
+                <df name="jvmtifiles">
+                  <in>bytecodeInterpreterWithChecks.cpp</in>
+                  <in>jvmtiEnter.cpp</in>
+                  <in>jvmtiEnterTrace.cpp</in>
+                </df>
+              </df>
+            </df>
+          </df>
+          <df name="jdk">
+            <df name="gensrc_x11wrappers">
+              <in>sizer.64.c</in>
+            </df>
+          </df>
+        </df>
+        <df name="solaris-x86_64-normal-server-release">
+          <df name="hotspot">
+            <df name="solaris_amd64_compiler2">
+              <df name="generated">
+                <df name="adfiles">
+                  <in>ad_x86_64.cpp</in>
+                  <in>ad_x86_64_clone.cpp</in>
+                  <in>ad_x86_64_expand.cpp</in>
+                  <in>ad_x86_64_format.cpp</in>
+                  <in>ad_x86_64_gen.cpp</in>
+                  <in>ad_x86_64_misc.cpp</in>
+                  <in>ad_x86_64_peephole.cpp</in>
+                  <in>ad_x86_64_pipeline.cpp</in>
+                  <in>dfa_x86_64.cpp</in>
+                </df>
+                <df name="jvmtifiles">
+                  <in>bytecodeInterpreterWithChecks.cpp</in>
+                  <in>jvmtiEnter.cpp</in>
+                  <in>jvmtiEnterTrace.cpp</in>
+                </df>
+              </df>
+              <df name="product">
+                <in>JvmOffsets.cpp</in>
+              </df>
+            </df>
+          </df>
+          <df name="jdk">
+            <df name="gensrc_x11wrappers">
+              <in>sizer.64.c</in>
+            </df>
+          </df>
+        </df>
+      </df>
+      <df name="hotspot">
+        <df name="agent">
+          <df name="src">
+            <df name="os">
+              <df name="linux">
+                <in>LinuxDebuggerLocal.c</in>
+                <in>libproc_impl.c</in>
+                <in>ps_core.c</in>
+                <in>ps_proc.c</in>
+                <in>salibelf.c</in>
+                <in>symtab.c</in>
+              </df>
+              <df name="solaris">
+                <df name="proc">
+                  <in>saproc.cpp</in>
+                </df>
+              </df>
+            </df>
+            <df name="share">
+              <df name="native">
+                <in>sadis.c</in>
+              </df>
+            </df>
+          </df>
+        </df>
+        <df name="src">
+          <df name="cpu">
+            <df name="x86">
+              <df name="vm">
+                <in>assembler_x86.cpp</in>
+                <in>bytecodeInterpreter_x86.cpp</in>
+                <in>bytecodes_x86.cpp</in>
+                <in>c1_CodeStubs_x86.cpp</in>
+                <in>c1_FpuStackSim_x86.cpp</in>
+                <in>c1_FrameMap_x86.cpp</in>
+                <in>c1_LIRAssembler_x86.cpp</in>
+                <in>c1_LIRGenerator_x86.cpp</in>
+                <in>c1_LinearScan_x86.cpp</in>
+                <in>c1_MacroAssembler_x86.cpp</in>
+                <in>c1_Runtime1_x86.cpp</in>
+                <in>c2_init_x86.cpp</in>
+                <in>cppInterpreter_x86.cpp</in>
+                <in>debug_x86.cpp</in>
+                <in>depChecker_x86.cpp</in>
+                <in>frame_x86.cpp</in>
+                <in>icBuffer_x86.cpp</in>
+                <in>icache_x86.cpp</in>
+                <in>interp_masm_x86_64.cpp</in>
+                <in>interpreterRT_x86_64.cpp</in>
+                <in>interpreter_x86_64.cpp</in>
+                <in>jniFastGetField_x86_64.cpp</in>
+                <in>macroAssembler_x86.cpp</in>
+                <in>metaspaceShared_x86_64.cpp</in>
+                <in>methodHandles_x86.cpp</in>
+                <in>nativeInst_x86.cpp</in>
+                <in>register_definitions_x86.cpp</in>
+                <in>register_x86.cpp</in>
+                <in>relocInfo_x86.cpp</in>
+                <in>runtime_x86_64.cpp</in>
+                <in>sharedRuntime_x86_64.cpp</in>
+                <in>stubGenerator_x86_64.cpp</in>
+                <in>stubRoutines_x86_64.cpp</in>
+                <in>templateInterpreter_x86_64.cpp</in>
+                <in>templateTable_x86_64.cpp</in>
+                <in>vm_version_x86.cpp</in>
+                <in>vmreg_x86.cpp</in>
+                <in>vtableStubs_x86_64.cpp</in>
+              </df>
+            </df>
+          </df>
+          <df name="os">
+            <df name="bsd">
+              <df name="vm">
+                <in>attachListener_bsd.cpp</in>
+                <in>chaitin_bsd.cpp</in>
+                <in>decoder_machO.cpp</in>
+                <in>dtraceJSDT_bsd.cpp</in>
+                <in>jvm_bsd.cpp</in>
+                <in>mutex_bsd.cpp</in>
+                <in>osThread_bsd.cpp</in>
+                <in>os_bsd.cpp</in>
+                <in>perfMemory_bsd.cpp</in>
+                <in>stubRoutines_bsd.cpp</in>
+                <in>threadCritical_bsd.cpp</in>
+                <in>vmError_bsd.cpp</in>
+              </df>
+            </df>
+            <df name="linux">
+              <df name="vm">
+                <in>attachListener_linux.cpp</in>
+                <in>chaitin_linux.cpp</in>
+                <in>decoder_linux.cpp</in>
+                <in>dtraceJSDT_linux.cpp</in>
+                <in>jsig.c</in>
+                <in>jvm_linux.cpp</in>
+                <in>mutex_linux.cpp</in>
+                <in>osThread_linux.cpp</in>
+                <in>os_linux.cpp</in>
+                <in>perfMemory_linux.cpp</in>
+                <in>stubRoutines_linux.cpp</in>
+                <in>threadCritical_linux.cpp</in>
+                <in>vmError_linux.cpp</in>
+              </df>
+            </df>
+            <df name="posix">
+              <df name="launcher">
+                <in>java_md.c</in>
+              </df>
+              <df name="vm">
+                <in>os_posix.cpp</in>
+              </df>
+            </df>
+            <df name="solaris">
+              <df name="add_gnu_debuglink">
+                <in>add_gnu_debuglink.c</in>
+              </df>
+              <df name="dtrace">
+                <in>generateJvmOffsets.cpp</in>
+                <in>generateJvmOffsetsMain.c</in>
+                <in>jvm_dtrace.c</in>
+                <in>libjvm_db.c</in>
+              </df>
+              <df name="fix_empty_sec_hdr_flags">
+                <in>fix_empty_sec_hdr_flags.c</in>
+              </df>
+              <df name="vm">
+                <in>attachListener_solaris.cpp</in>
+                <in>chaitin_solaris.cpp</in>
+                <in>decoder_solaris.cpp</in>
+                <in>dtraceJSDT_solaris.cpp</in>
+                <in>jsig.c</in>
+                <in>jvm_solaris.cpp</in>
+                <in>mutex_solaris.cpp</in>
+                <in>osThread_solaris.cpp</in>
+                <in>os_solaris.cpp</in>
+                <in>perfMemory_solaris.cpp</in>
+                <in>stubRoutines_solaris.cpp</in>
+                <in>threadCritical_solaris.cpp</in>
+                <in>vmError_solaris.cpp</in>
+              </df>
+            </df>
+          </df>
+          <df name="os_cpu">
+            <df name="bsd_x86">
+              <df name="vm">
+                <in>assembler_bsd_x86.cpp</in>
+                <in>os_bsd_x86.cpp</in>
+                <in>threadLS_bsd_x86.cpp</in>
+                <in>thread_bsd_x86.cpp</in>
+                <in>vm_version_bsd_x86.cpp</in>
+              </df>
+            </df>
+            <df name="linux_x86">
+              <df name="vm">
+                <in>assembler_linux_x86.cpp</in>
+                <in>os_linux_x86.cpp</in>
+                <in>threadLS_linux_x86.cpp</in>
+                <in>thread_linux_x86.cpp</in>
+                <in>vm_version_linux_x86.cpp</in>
+              </df>
+            </df>
+            <df name="solaris_x86">
+              <df name="vm">
+                <in>assembler_solaris_x86.cpp</in>
+                <in>os_solaris_x86.cpp</in>
+                <in>threadLS_solaris_x86.cpp</in>
+                <in>thread_solaris_x86.cpp</in>
+                <in>vm_version_solaris_x86.cpp</in>
+              </df>
+            </df>
+          </df>
+          <df name="share">
+            <df name="tools">
+              <df name="launcher">
+                <in>java.c</in>
+                <in>jli_util.c</in>
+                <in>wildcard.c</in>
+              </df>
+            </df>
+            <df name="vm">
+              <df name="adlc">
+                <in>adlparse.cpp</in>
+                <in>archDesc.cpp</in>
+                <in>arena.cpp</in>
+                <in>dfa.cpp</in>
+                <in>dict2.cpp</in>
+                <in>filebuff.cpp</in>
+                <in>forms.cpp</in>
+                <in>formsopt.cpp</in>
+                <in>formssel.cpp</in>
+                <in>main.cpp</in>
+                <in>output_c.cpp</in>
+                <in>output_h.cpp</in>
+              </df>
+              <df name="asm">
+                <in>assembler.cpp</in>
+                <in>codeBuffer.cpp</in>
+                <in>register.cpp</in>
+              </df>
+              <df name="c1">
+                <in>c1_CFGPrinter.cpp</in>
+                <in>c1_Canonicalizer.cpp</in>
+                <in>c1_Compilation.cpp</in>
+                <in>c1_Compiler.cpp</in>
+                <in>c1_Defs.cpp</in>
+                <in>c1_FrameMap.cpp</in>
+                <in>c1_GraphBuilder.cpp</in>
+                <in>c1_IR.cpp</in>
+                <in>c1_Instruction.cpp</in>
+                <in>c1_InstructionPrinter.cpp</in>
+                <in>c1_LIR.cpp</in>
+                <in>c1_LIRAssembler.cpp</in>
+                <in>c1_LIRGenerator.cpp</in>
+                <in>c1_LinearScan.cpp</in>
+                <in>c1_Optimizer.cpp</in>
+                <in>c1_RangeCheckElimination.cpp</in>
+                <in>c1_Runtime1.cpp</in>
+                <in>c1_ValueMap.cpp</in>
+                <in>c1_ValueSet.cpp</in>
+                <in>c1_ValueStack.cpp</in>
+                <in>c1_ValueType.cpp</in>
+                <in>c1_globals.cpp</in>
+              </df>
+              <df name="ci">
+                <in>bcEscapeAnalyzer.cpp</in>
+                <in>ciArray.cpp</in>
+                <in>ciArrayKlass.cpp</in>
+                <in>ciBaseObject.cpp</in>
+                <in>ciCallSite.cpp</in>
+                <in>ciConstant.cpp</in>
+                <in>ciConstantPoolCache.cpp</in>
+                <in>ciEnv.cpp</in>
+                <in>ciExceptionHandler.cpp</in>
+                <in>ciField.cpp</in>
+                <in>ciFlags.cpp</in>
+                <in>ciInstance.cpp</in>
+                <in>ciInstanceKlass.cpp</in>
+                <in>ciKlass.cpp</in>
+                <in>ciMemberName.cpp</in>
+                <in>ciMetadata.cpp</in>
+                <in>ciMethod.cpp</in>
+                <in>ciMethodBlocks.cpp</in>
+                <in>ciMethodData.cpp</in>
+                <in>ciMethodHandle.cpp</in>
+                <in>ciNullObject.cpp</in>
+                <in>ciObjArray.cpp</in>
+                <in>ciObjArrayKlass.cpp</in>
+                <in>ciObject.cpp</in>
+                <in>ciObjectFactory.cpp</in>
+                <in>ciReplay.cpp</in>
+                <in>ciSignature.cpp</in>
+                <in>ciStreams.cpp</in>
+                <in>ciSymbol.cpp</in>
+                <in>ciType.cpp</in>
+                <in>ciTypeArray.cpp</in>
+                <in>ciTypeArrayKlass.cpp</in>
+                <in>ciTypeFlow.cpp</in>
+                <in>ciUtilities.cpp</in>
+              </df>
+              <df name="classfile">
+                <in>altHashing.cpp</in>
+                <in>bytecodeAssembler.cpp</in>
+                <in>classFileError.cpp</in>
+                <in>classFileParser.cpp</in>
+                <in>classFileStream.cpp</in>
+                <in>classLoader.cpp</in>
+                <in>classLoaderData.cpp</in>
+                <in>defaultMethods.cpp</in>
+                <in>dictionary.cpp</in>
+                <in>genericSignatures.cpp</in>
+                <in>javaAssertions.cpp</in>
+                <in>javaClasses.cpp</in>
+                <in>loaderConstraints.cpp</in>
+                <in>metadataOnStackMark.cpp</in>
+                <in>placeholders.cpp</in>
+                <in>resolutionErrors.cpp</in>
+                <in>stackMapFrame.cpp</in>
+                <in>stackMapTable.cpp</in>
+                <in>symbolTable.cpp</in>
+                <in>systemDictionary.cpp</in>
+                <in>verificationType.cpp</in>
+                <in>verifier.cpp</in>
+                <in>vmSymbols.cpp</in>
+              </df>
+              <df name="code">
+                <in>codeBlob.cpp</in>
+                <in>codeCache.cpp</in>
+                <in>compiledIC.cpp</in>
+                <in>compressedStream.cpp</in>
+                <in>debugInfo.cpp</in>
+                <in>debugInfoRec.cpp</in>
+                <in>dependencies.cpp</in>
+                <in>exceptionHandlerTable.cpp</in>
+                <in>icBuffer.cpp</in>
+                <in>location.cpp</in>
+                <in>nmethod.cpp</in>
+                <in>oopRecorder.cpp</in>
+                <in>pcDesc.cpp</in>
+                <in>relocInfo.cpp</in>
+                <in>scopeDesc.cpp</in>
+                <in>stubs.cpp</in>
+                <in>vmreg.cpp</in>
+                <in>vtableStubs.cpp</in>
+              </df>
+              <df name="compiler">
+                <in>abstractCompiler.cpp</in>
+                <in>compileBroker.cpp</in>
+                <in>compileLog.cpp</in>
+                <in>compilerOracle.cpp</in>
+                <in>disassembler.cpp</in>
+                <in>methodLiveness.cpp</in>
+                <in>oopMap.cpp</in>
+              </df>
+              <df name="gc_implementation">
+                <df name="concurrentMarkSweep">
+                  <in>adaptiveFreeList.cpp</in>
+                  <in>cmsAdaptiveSizePolicy.cpp</in>
+                  <in>cmsCollectorPolicy.cpp</in>
+                  <in>cmsGCAdaptivePolicyCounters.cpp</in>
+                  <in>cmsLockVerifier.cpp</in>
+                  <in>compactibleFreeListSpace.cpp</in>
+                  <in>concurrentMarkSweepGeneration.cpp</in>
+                  <in>concurrentMarkSweepThread.cpp</in>
+                  <in>freeChunk.cpp</in>
+                  <in>promotionInfo.cpp</in>
+                  <in>vmCMSOperations.cpp</in>
+                </df>
+                <df name="g1">
+                  <in>collectionSetChooser.cpp</in>
+                  <in>concurrentG1Refine.cpp</in>
+                  <in>concurrentG1RefineThread.cpp</in>
+                  <in>concurrentMark.cpp</in>
+                  <in>concurrentMarkThread.cpp</in>
+                  <in>dirtyCardQueue.cpp</in>
+                  <in>g1AllocRegion.cpp</in>
+                  <in>g1BlockOffsetTable.cpp</in>
+                  <in>g1CollectedHeap.cpp</in>
+                  <in>g1CollectorPolicy.cpp</in>
+                  <in>g1ErgoVerbose.cpp</in>
+                  <in>g1GCPhaseTimes.cpp</in>
+                  <in>g1HRPrinter.cpp</in>
+                  <in>g1Log.cpp</in>
+                  <in>g1MMUTracker.cpp</in>
+                  <in>g1MarkSweep.cpp</in>
+                  <in>g1MonitoringSupport.cpp</in>
+                  <in>g1RemSet.cpp</in>
+                  <in>g1SATBCardTableModRefBS.cpp</in>
+                  <in>g1_globals.cpp</in>
+                  <in>heapRegion.cpp</in>
+                  <in>heapRegionRemSet.cpp</in>
+                  <in>heapRegionSeq.cpp</in>
+                  <in>heapRegionSet.cpp</in>
+                  <in>heapRegionSets.cpp</in>
+                  <in>ptrQueue.cpp</in>
+                  <in>satbQueue.cpp</in>
+                  <in>sparsePRT.cpp</in>
+                  <in>survRateGroup.cpp</in>
+                  <in>vm_operations_g1.cpp</in>
+                </df>
+                <df name="parallelScavenge">
+                  <in>adjoiningGenerations.cpp</in>
+                  <in>adjoiningVirtualSpaces.cpp</in>
+                  <in>asPSOldGen.cpp</in>
+                  <in>asPSYoungGen.cpp</in>
+                  <in>cardTableExtension.cpp</in>
+                  <in>gcTaskManager.cpp</in>
+                  <in>gcTaskThread.cpp</in>
+                  <in>objectStartArray.cpp</in>
+                  <in>parMarkBitMap.cpp</in>
+                  <in>parallelScavengeHeap.cpp</in>
+                  <in>pcTasks.cpp</in>
+                  <in>psAdaptiveSizePolicy.cpp</in>
+                  <in>psCompactionManager.cpp</in>
+                  <in>psGCAdaptivePolicyCounters.cpp</in>
+                  <in>psGenerationCounters.cpp</in>
+                  <in>psMarkSweep.cpp</in>
+                  <in>psMarkSweepDecorator.cpp</in>
+                  <in>psOldGen.cpp</in>
+                  <in>psParallelCompact.cpp</in>
+                  <in>psPromotionLAB.cpp</in>
+                  <in>psPromotionManager.cpp</in>
+                  <in>psScavenge.cpp</in>
+                  <in>psTasks.cpp</in>
+                  <in>psVirtualspace.cpp</in>
+                  <in>psYoungGen.cpp</in>
+                  <in>vmPSOperations.cpp</in>
+                </df>
+                <df name="parNew">
+                  <in>asParNewGeneration.cpp</in>
+                  <in>parCardTableModRefBS.cpp</in>
+                  <in>parNewGeneration.cpp</in>
+                </df>
+                <df name="shared">
+                  <in>adaptiveSizePolicy.cpp</in>
+                  <in>ageTable.cpp</in>
+                  <in>allocationStats.cpp</in>
+                  <in>cSpaceCounters.cpp</in>
+                  <in>collectorCounters.cpp</in>
+                  <in>concurrentGCThread.cpp</in>
+                  <in>gSpaceCounters.cpp</in>
+                  <in>gcAdaptivePolicyCounters.cpp</in>
+                  <in>gcPolicyCounters.cpp</in>
+                  <in>gcStats.cpp</in>
+                  <in>gcUtil.cpp</in>
+                  <in>generationCounters.cpp</in>
+                  <in>hSpaceCounters.cpp</in>
+                  <in>immutableSpace.cpp</in>
+                  <in>markSweep.cpp</in>
+                  <in>mutableNUMASpace.cpp</in>
+                  <in>mutableSpace.cpp</in>
+                  <in>parGCAllocBuffer.cpp</in>
+                  <in>spaceCounters.cpp</in>
+                  <in>spaceDecorator.cpp</in>
+                  <in>vmGCOperations.cpp</in>
+                </df>
+              </df>
+              <df name="gc_interface">
+                <in>collectedHeap.cpp</in>
+                <in>gcCause.cpp</in>
+              </df>
+              <df name="interpreter">
+                <in>bytecode.cpp</in>
+                <in>bytecodeHistogram.cpp</in>
+                <in>bytecodeInterpreter.cpp</in>
+                <in>bytecodeStream.cpp</in>
+                <in>bytecodeTracer.cpp</in>
+                <in>bytecodes.cpp</in>
+                <in>cppInterpreter.cpp</in>
+                <in>interpreter.cpp</in>
+                <in>interpreterRuntime.cpp</in>
+                <in>invocationCounter.cpp</in>
+                <in>linkResolver.cpp</in>
+                <in>oopMapCache.cpp</in>
+                <in>rewriter.cpp</in>
+                <in>templateInterpreter.cpp</in>
+                <in>templateTable.cpp</in>
+              </df>
+              <df name="libadt">
+                <in>dict.cpp</in>
+                <in>port.cpp</in>
+                <in>set.cpp</in>
+                <in>vectset.cpp</in>
+              </df>
+              <df name="memory">
+                <in>allocation.cpp</in>
+                <in>barrierSet.cpp</in>
+                <in>binaryTreeDictionary.cpp</in>
+                <in>blockOffsetTable.cpp</in>
+                <in>cardTableModRefBS.cpp</in>
+                <in>cardTableRS.cpp</in>
+                <in>collectorPolicy.cpp</in>
+                <in>defNewGeneration.cpp</in>
+                <in>filemap.cpp</in>
+                <in>freeBlockDictionary.cpp</in>
+                <in>freeList.cpp</in>
+                <in>gcLocker.cpp</in>
+                <in>genCollectedHeap.cpp</in>
+                <in>genMarkSweep.cpp</in>
+                <in>genRemSet.cpp</in>
+                <in>generation.cpp</in>
+                <in>generationSpec.cpp</in>
+                <in>heap.cpp</in>
+                <in>heapInspection.cpp</in>
+                <in>iterator.cpp</in>
+                <in>memRegion.cpp</in>
+                <in>metablock.cpp</in>
+                <in>metachunk.cpp</in>
+                <in>metaspace.cpp</in>
+                <in>metaspaceCounters.cpp</in>
+                <in>metaspaceShared.cpp</in>
+                <in>oopFactory.cpp</in>
+                <in>referencePolicy.cpp</in>
+                <in>referenceProcessor.cpp</in>
+                <in>resourceArea.cpp</in>
+                <in>sharedHeap.cpp</in>
+                <in>space.cpp</in>
+                <in>specialized_oop_closures.cpp</in>
+                <in>tenuredGeneration.cpp</in>
+                <in>threadLocalAllocBuffer.cpp</in>
+                <in>universe.cpp</in>
+              </df>
+              <df name="oops">
+                <in>annotations.cpp</in>
+                <in>arrayKlass.cpp</in>
+                <in>arrayOop.cpp</in>
+                <in>compiledICHolder.cpp</in>
+                <in>constMethod.cpp</in>
+                <in>constantPool.cpp</in>
+                <in>cpCache.cpp</in>
+                <in>generateOopMap.cpp</in>
+                <in>instanceClassLoaderKlass.cpp</in>
+                <in>instanceKlass.cpp</in>
+                <in>instanceMirrorKlass.cpp</in>
+                <in>instanceOop.cpp</in>
+                <in>instanceRefKlass.cpp</in>
+                <in>klass.cpp</in>
+                <in>klassVtable.cpp</in>
+                <in>markOop.cpp</in>
+                <in>metadata.cpp</in>
+                <in>method.cpp</in>
+                <in>methodData.cpp</in>
+                <in>objArrayKlass.cpp</in>
+                <in>objArrayOop.cpp</in>
+                <in>oop.cpp</in>
+                <in>oopsHierarchy.cpp</in>
+                <in>symbol.cpp</in>
+                <in>typeArrayKlass.cpp</in>
+                <in>typeArrayOop.cpp</in>
+              </df>
+              <df name="opto">
+                <in>addnode.cpp</in>
+                <in>block.cpp</in>
+                <in>buildOopMap.cpp</in>
+                <in>bytecodeInfo.cpp</in>
+                <in>c2_globals.cpp</in>
+                <in>c2compiler.cpp</in>
+                <in>callGenerator.cpp</in>
+                <in>callnode.cpp</in>
+                <in>cfgnode.cpp</in>
+                <in>chaitin.cpp</in>
+                <in>classes.cpp</in>
+                <in>coalesce.cpp</in>
+                <in>compile.cpp</in>
+                <in>connode.cpp</in>
+                <in>divnode.cpp</in>
+                <in>doCall.cpp</in>
+                <in>domgraph.cpp</in>
+                <in>escape.cpp</in>
+                <in>gcm.cpp</in>
+                <in>generateOptoStub.cpp</in>
+                <in>graphKit.cpp</in>
+                <in>idealGraphPrinter.cpp</in>
+                <in>idealKit.cpp</in>
+                <in>ifg.cpp</in>
+                <in>ifnode.cpp</in>
+                <in>indexSet.cpp</in>
+                <in>lcm.cpp</in>
+                <in>library_call.cpp</in>
+                <in>live.cpp</in>
+                <in>locknode.cpp</in>
+                <in>loopPredicate.cpp</in>
+                <in>loopTransform.cpp</in>
+                <in>loopUnswitch.cpp</in>
+                <in>loopnode.cpp</in>
+                <in>loopopts.cpp</in>
+                <in>machnode.cpp</in>
+                <in>macro.cpp</in>
+                <in>matcher.cpp</in>
+                <in>memnode.cpp</in>
+                <in>mulnode.cpp</in>
+                <in>multnode.cpp</in>
+                <in>node.cpp</in>
+                <in>opcodes.cpp</in>
+                <in>output.cpp</in>
+                <in>parse1.cpp</in>
+                <in>parse2.cpp</in>
+                <in>parse3.cpp</in>
+                <in>parseHelper.cpp</in>
+                <in>phase.cpp</in>
+                <in>phaseX.cpp</in>
+                <in>postaloc.cpp</in>
+                <in>reg_split.cpp</in>
+                <in>regalloc.cpp</in>
+                <in>regmask.cpp</in>
+                <in>rootnode.cpp</in>
+                <in>runtime.cpp</in>
+                <in>split_if.cpp</in>
+                <in>stringopts.cpp</in>
+                <in>subnode.cpp</in>
+                <in>superword.cpp</in>
+                <in>type.cpp</in>
+                <in>vectornode.cpp</in>
+              </df>
+              <df name="precompiled">
+                <in>precompiled.hpp</in>
+              </df>
+              <df name="prims">
+                <df name="wbtestmethods">
+                  <in>parserTests.cpp</in>
+                </df>
+                <in>evmCompat.cpp</in>
+                <in>forte.cpp</in>
+                <in>jni.cpp</in>
+                <in>jniCheck.cpp</in>
+                <in>jniFastGetField.cpp</in>
+                <in>jvm.cpp</in>
+                <in>jvmtiClassFileReconstituter.cpp</in>
+                <in>jvmtiCodeBlobEvents.cpp</in>
+                <in>jvmtiEnv.cpp</in>
+                <in>jvmtiEnvBase.cpp</in>
+                <in>jvmtiEnvThreadState.cpp</in>
+                <in>jvmtiEventController.cpp</in>
+                <in>jvmtiExport.cpp</in>
+                <in>jvmtiExtensions.cpp</in>
+                <in>jvmtiGetLoadedClasses.cpp</in>
+                <in>jvmtiImpl.cpp</in>
+                <in>jvmtiManageCapabilities.cpp</in>
+                <in>jvmtiRawMonitor.cpp</in>
+                <in>jvmtiRedefineClasses.cpp</in>
+                <in>jvmtiTagMap.cpp</in>
+                <in>jvmtiThreadState.cpp</in>
+                <in>jvmtiTrace.cpp</in>
+                <in>jvmtiUtil.cpp</in>
+                <in>methodComparator.cpp</in>
+                <in>methodHandles.cpp</in>
+                <in>nativeLookup.cpp</in>
+                <in>perf.cpp</in>
+                <in>privilegedStack.cpp</in>
+                <in>unsafe.cpp</in>
+                <in>whitebox.cpp</in>
+              </df>
+              <df name="runtime">
+                <in>advancedThresholdPolicy.cpp</in>
+                <in>aprofiler.cpp</in>
+                <in>arguments.cpp</in>
+                <in>atomic.cpp</in>
+                <in>basicLock.cpp</in>
+                <in>biasedLocking.cpp</in>
+                <in>compilationPolicy.cpp</in>
+                <in>deoptimization.cpp</in>
+                <in>dtraceJSDT.cpp</in>
+                <in>fieldDescriptor.cpp</in>
+                <in>fieldType.cpp</in>
+                <in>fprofiler.cpp</in>
+                <in>frame.cpp</in>
+                <in>globals.cpp</in>
+                <in>handles.cpp</in>
+                <in>icache.cpp</in>
+                <in>init.cpp</in>
+                <in>interfaceSupport.cpp</in>
+                <in>java.cpp</in>
+                <in>javaCalls.cpp</in>
+                <in>jniHandles.cpp</in>
+                <in>jniPeriodicChecker.cpp</in>
+                <in>memprofiler.cpp</in>
+                <in>monitorChunk.cpp</in>
+                <in>mutex.cpp</in>
+                <in>mutexLocker.cpp</in>
+                <in>objectMonitor.cpp</in>
+                <in>orderAccess.cpp</in>
+                <in>os.cpp</in>
+                <in>osThread.cpp</in>
+                <in>park.cpp</in>
+                <in>perfData.cpp</in>
+                <in>perfMemory.cpp</in>
+                <in>reflection.cpp</in>
+                <in>reflectionUtils.cpp</in>
+                <in>relocator.cpp</in>
+                <in>rframe.cpp</in>
+                <in>safepoint.cpp</in>
+                <in>serviceThread.cpp</in>
+                <in>sharedRuntime.cpp</in>
+                <in>sharedRuntimeTrans.cpp</in>
+                <in>sharedRuntimeTrig.cpp</in>
+                <in>signature.cpp</in>
+                <in>simpleThresholdPolicy.cpp</in>
+                <in>stackValue.cpp</in>
+                <in>stackValueCollection.cpp</in>
+                <in>statSampler.cpp</in>
+                <in>stubCodeGenerator.cpp</in>
+                <in>stubRoutines.cpp</in>
+                <in>sweeper.cpp</in>
+                <in>synchronizer.cpp</in>
+                <in>task.cpp</in>
+                <in>thread.cpp</in>
+                <in>threadLocalStorage.cpp</in>
+                <in>timer.cpp</in>
+                <in>unhandledOops.cpp</in>
+                <in>vframe.cpp</in>
+                <in>vframeArray.cpp</in>
+                <in>vframe_hp.cpp</in>
+                <in>virtualspace.cpp</in>
+                <in>vmStructs.cpp</in>
+                <in>vmThread.cpp</in>
+                <in>vm_operations.cpp</in>
+                <in>vm_version.cpp</in>
+              </df>
+              <df name="services">
+                <in>attachListener.cpp</in>
+                <in>classLoadingService.cpp</in>
+                <in>diagnosticArgument.cpp</in>
+                <in>diagnosticCommand.cpp</in>
+                <in>diagnosticFramework.cpp</in>
+                <in>dtraceAttacher.cpp</in>
+                <in>g1MemoryPool.cpp</in>
+                <in>gcNotifier.cpp</in>
+                <in>heapDumper.cpp</in>
+                <in>lowMemoryDetector.cpp</in>
+                <in>management.cpp</in>
+                <in>memBaseline.cpp</in>
+                <in>memPtr.cpp</in>
+                <in>memRecorder.cpp</in>
+                <in>memReporter.cpp</in>
+                <in>memSnapshot.cpp</in>
+                <in>memTrackWorker.cpp</in>
+                <in>memTracker.cpp</in>
+                <in>memoryManager.cpp</in>
+                <in>memoryPool.cpp</in>
+                <in>memoryService.cpp</in>
+                <in>nmtDCmd.cpp</in>
+                <in>psMemoryPool.cpp</in>
+                <in>runtimeService.cpp</in>
+                <in>threadService.cpp</in>
+              </df>
+              <df name="utilities">
+                <in>accessFlags.cpp</in>
+                <in>array.cpp</in>
+                <in>bitMap.cpp</in>
+                <in>constantTag.cpp</in>
+                <in>copy.cpp</in>
+                <in>debug.cpp</in>
+                <in>decoder.cpp</in>
+                <in>decoder_elf.cpp</in>
+                <in>elfFile.cpp</in>
+                <in>elfStringTable.cpp</in>
+                <in>elfSymbolTable.cpp</in>
+                <in>errorReporter.cpp</in>
+                <in>events.cpp</in>
+                <in>exceptions.cpp</in>
+                <in>globalDefinitions.cpp</in>
+                <in>growableArray.cpp</in>
+                <in>hashtable.cpp</in>
+                <in>histogram.cpp</in>
+                <in>intHisto.cpp</in>
+                <in>numberSeq.cpp</in>
+                <in>ostream.cpp</in>
+                <in>preserveException.cpp</in>
+                <in>quickSort.cpp</in>
+                <in>sizes.cpp</in>
+                <in>taskqueue.cpp</in>
+                <in>utf8.cpp</in>
+                <in>vmError.cpp</in>
+                <in>workgroup.cpp</in>
+                <in>xmlstream.cpp</in>
+                <in>yieldingWorkgroup.cpp</in>
+              </df>
+            </df>
+          </df>
+        </df>
+      </df>
+      <df name="jdk">
+        <df name="make">
+          <df name="tools">
+            <df name="add_gnu_debuglink">
+              <in>add_gnu_debuglink.c</in>
+            </df>
+            <df name="fix_empty_sec_hdr_flags">
+              <in>fix_empty_sec_hdr_flags.c</in>
+            </df>
+          </df>
+        </df>
+        <df name="src">
+          <df name="share">
+            <df name="back">
+              <in>ArrayReferenceImpl.c</in>
+              <in>ArrayTypeImpl.c</in>
+              <in>ClassLoaderReferenceImpl.c</in>
+              <in>ClassObjectReferenceImpl.c</in>
+              <in>ClassTypeImpl.c</in>
+              <in>EventRequestImpl.c</in>
+              <in>FieldImpl.c</in>
+              <in>FrameID.c</in>
+              <in>MethodImpl.c</in>
+              <in>ObjectReferenceImpl.c</in>
+              <in>ReferenceTypeImpl.c</in>
+              <in>SDE.c</in>
+              <in>StackFrameImpl.c</in>
+              <in>StringReferenceImpl.c</in>
+              <in>ThreadGroupReferenceImpl.c</in>
+              <in>ThreadReferenceImpl.c</in>
+              <in>VirtualMachineImpl.c</in>
+              <in>bag.c</in>
+              <in>classTrack.c</in>
+              <in>commonRef.c</in>
+              <in>debugDispatch.c</in>
+              <in>debugInit.c</in>
+              <in>debugLoop.c</in>
+              <in>error_messages.c</in>
+              <in>eventFilter.c</in>
+              <in>eventHandler.c</in>
+              <in>eventHelper.c</in>
+              <in>inStream.c</in>
+              <in>invoker.c</in>
+              <in>log_messages.c</in>
+              <in>outStream.c</in>
+              <in>standardHandlers.c</in>
+              <in>stepControl.c</in>
+              <in>stream.c</in>
+              <in>threadControl.c</in>
+              <in>transport.c</in>
+              <in>util.c</in>
+            </df>
+            <df name="bin">
+              <in>java.c</in>
+              <in>jli_util.c</in>
+              <in>main.c</in>
+              <in>parse_manifest.c</in>
+              <in>splashscreen_stubs.c</in>
+              <in>version_comp.c</in>
+              <in>wildcard.c</in>
+            </df>
+            <df name="demo">
+              <df name="jvmti">
+                <df name="agent_util">
+                  <in>agent_util.c</in>
+                </df>
+                <df name="compiledMethodLoad">
+                  <in>compiledMethodLoad.c</in>
+                </df>
+                <df name="gctest">
+                  <in>gctest.c</in>
+                </df>
+                <df name="heapTracker">
+                  <in>heapTracker.c</in>
+                </df>
+                <df name="heapViewer">
+                  <in>heapViewer.c</in>
+                </df>
+                <df name="hprof">
+                  <in>debug_malloc.c</in>
+                  <in>hprof_blocks.c</in>
+                  <in>hprof_check.c</in>
+                  <in>hprof_class.c</in>
+                  <in>hprof_cpu.c</in>
+                  <in>hprof_error.c</in>
+                  <in>hprof_event.c</in>
+                  <in>hprof_frame.c</in>
+                  <in>hprof_init.c</in>
+                  <in>hprof_io.c</in>
+                  <in>hprof_ioname.c</in>
+                  <in>hprof_listener.c</in>
+                  <in>hprof_loader.c</in>
+                  <in>hprof_monitor.c</in>
+                  <in>hprof_object.c</in>
+                  <in>hprof_reference.c</in>
+                  <in>hprof_site.c</in>
+                  <in>hprof_stack.c</in>
+                  <in>hprof_string.c</in>
+                  <in>hprof_table.c</in>
+                  <in>hprof_tag.c</in>
+                  <in>hprof_tls.c</in>
+                  <in>hprof_trace.c</in>
+                  <in>hprof_tracker.c</in>
+                  <in>hprof_util.c</in>
+                </df>
+                <df name="java_crw_demo">
+                  <in>java_crw_demo.c</in>
+                </df>
+                <df name="minst">
+                  <in>minst.c</in>
+                </df>
+                <df name="mtrace">
+                  <in>mtrace.c</in>
+                </df>
+                <df name="versionCheck">
+                  <in>versionCheck.c</in>
+                </df>
+                <df name="waiters">
+                  <in>Agent.cpp</in>
+                  <in>Monitor.cpp</in>
+                  <in>Thread.cpp</in>
+                  <in>waiters.cpp</in>
+                </df>
+              </df>
+            </df>
+            <df name="instrument">
+              <in>EncodingSupport.c</in>
+              <in>InstrumentationImplNativeMethods.c</in>
+              <in>InvocationAdapter.c</in>
+              <in>JPLISAgent.c</in>
+              <in>JPLISAssert.c</in>
+              <in>JarFacade.c</in>
+              <in>JavaExceptions.c</in>
+              <in>PathCharsValidator.c</in>
+              <in>Reentrancy.c</in>
+              <in>Utilities.c</in>
+            </df>
+            <df name="native">
+              <df name="com">
+                <df name="sun">
+                  <df name="java">
+                    <df name="util">
+                      <df name="jar">
+                        <df name="pack">
+                          <in>bands.cpp</in>
+                          <in>bytes.cpp</in>
+                          <in>coding.cpp</in>
+                          <in>jni.cpp</in>
+                          <in>main.cpp</in>
+                          <in>unpack.cpp</in>
+                          <in>utils.cpp</in>
+                          <in>zip.cpp</in>
+                        </df>
+                      </df>
+                    </df>
+                  </df>
+                  <df name="media">
+                    <df name="sound">
+                      <in>DirectAudioDevice.c</in>
+                      <in>DirectAudioDeviceProvider.c</in>
+                      <in>MidiInDevice.c</in>
+                      <in>MidiInDeviceProvider.c</in>
+                      <in>MidiOutDevice.c</in>
+                      <in>MidiOutDeviceProvider.c</in>
+                      <in>Platform.c</in>
+                      <in>PlatformMidi.c</in>
+                      <in>PortMixer.c</in>
+                      <in>PortMixerProvider.c</in>
+                      <in>Utilities.c</in>
+                    </df>
+                  </df>
+                </df>
+              </df>
+              <df name="common">
+                <in>check_code.c</in>
+                <in>check_format.c</in>
+                <in>check_version.c</in>
+                <in>jdk_util.c</in>
+                <in>jio.c</in>
+                <in>jni_util.c</in>
+                <in>verify_stub.c</in>
+              </df>
+              <df name="java">
+                <df name="io">
+                  <in>FileInputStream.c</in>
+                  <in>ObjectInputStream.c</in>
+                  <in>ObjectOutputStream.c</in>
+                  <in>ObjectStreamClass.c</in>
+                  <in>RandomAccessFile.c</in>
+                  <in>io_util.c</in>
+                </df>
+                <df name="lang">
+                  <df name="fdlibm">
+                    <df name="src">
+                      <in>e_acos.c</in>
+                      <in>e_asin.c</in>
+                      <in>e_atan2.c</in>
+                      <in>e_atanh.c</in>
+                      <in>e_cosh.c</in>
+                      <in>e_exp.c</in>
+                      <in>e_fmod.c</in>
+                      <in>e_hypot.c</in>
+                      <in>e_log.c</in>
+                      <in>e_log10.c</in>
+                      <in>e_pow.c</in>
+                      <in>e_rem_pio2.c</in>
+                      <in>e_remainder.c</in>
+                      <in>e_scalb.c</in>
+                      <in>e_sinh.c</in>
+                      <in>e_sqrt.c</in>
+                      <in>k_cos.c</in>
+                      <in>k_rem_pio2.c</in>
+                      <in>k_sin.c</in>
+                      <in>k_standard.c</in>
+                      <in>k_tan.c</in>
+                      <in>s_atan.c</in>
+                      <in>s_cbrt.c</in>
+                      <in>s_ceil.c</in>
+                      <in>s_copysign.c</in>
+                      <in>s_cos.c</in>
+                      <in>s_expm1.c</in>
+                      <in>s_fabs.c</in>
+                      <in>s_finite.c</in>
+                      <in>s_floor.c</in>
+                      <in>s_frexp.c</in>
+                      <in>s_ilogb.c</in>
+                      <in>s_isnan.c</in>
+                      <in>s_ldexp.c</in>
+                      <in>s_lib_version.c</in>
+                      <in>s_log1p.c</in>
+                      <in>s_logb.c</in>
+                      <in>s_matherr.c</in>
+                      <in>s_modf.c</in>
+                      <in>s_nextafter.c</in>
+                      <in>s_rint.c</in>
+                      <in>s_scalbn.c</in>
+                      <in>s_signgam.c</in>
+                      <in>s_significand.c</in>
+                      <in>s_sin.c</in>
+                      <in>s_tan.c</in>
+                      <in>s_tanh.c</in>
+                      <in>w_acos.c</in>
+                      <in>w_asin.c</in>
+                      <in>w_atan2.c</in>
+                      <in>w_atanh.c</in>
+                      <in>w_cosh.c</in>
+                      <in>w_exp.c</in>
+                      <in>w_fmod.c</in>
+                      <in>w_hypot.c</in>
+                      <in>w_log.c</in>
+                      <in>w_log10.c</in>
+                      <in>w_pow.c</in>
+                      <in>w_remainder.c</in>
+                      <in>w_scalb.c</in>
+                      <in>w_sinh.c</in>
+                      <in>w_sqrt.c</in>
+                    </df>
+                  </df>
+                  <df name="ref">
+                    <in>Finalizer.c</in>
+                  </df>
+                  <df name="reflect">
+                    <in>Array.c</in>
+                    <in>Executable.c</in>
+                    <in>Proxy.c</in>
+                  </df>
+                  <in>Class.c</in>
+                  <in>ClassLoader.c</in>
+                  <in>Compiler.c</in>
+                  <in>Double.c</in>
+                  <in>Float.c</in>
+                  <in>Object.c</in>
+                  <in>Package.c</in>
+                  <in>ResourceBundle.c</in>
+                  <in>Runtime.c</in>
+                  <in>SecurityManager.c</in>
+                  <in>Shutdown.c</in>
+                  <in>StrictMath.c</in>
+                  <in>String.c</in>
+                  <in>System.c</in>
+                  <in>Thread.c</in>
+                  <in>Throwable.c</in>
+                </df>
+                <df name="net">
+                  <in>DatagramPacket.c</in>
+                  <in>Inet4Address.c</in>
+                  <in>Inet6Address.c</in>
+                  <in>InetAddress.c</in>
+                  <in>net_util.c</in>
+                </df>
+                <df name="nio">
+                  <in>Bits.c</in>
+                </df>
+                <df name="security">
+                  <in>AccessController.c</in>
+                </df>
+                <df name="util">
+                  <df name="concurrent">
+                    <df name="atomic">
+                      <in>AtomicLong.c</in>
+                    </df>
+                  </df>
+                  <df name="zip">
+                    <df name="zlib-1.2.5">
+                      <in>compress.c</in>
+                      <in>deflate.c</in>
+                      <in>gzclose.c</in>
+                      <in>gzlib.c</in>
+                      <in>gzread.c</in>
+                      <in>gzwrite.c</in>
+                      <in>infback.c</in>
+                      <in>inffast.c</in>
+                      <in>inflate.c</in>
+                      <in>inftrees.c</in>
+                      <in>trees.c</in>
+                      <in>uncompr.c</in>
+                      <in>zadler32.c</in>
+                      <in>zcrc32.c</in>
+                      <in>zutil.c</in>
+                    </df>
+                    <in>Adler32.c</in>
+                    <in>CRC32.c</in>
+                    <in>Deflater.c</in>
+                    <in>Inflater.c</in>
+                    <in>ZipFile.c</in>
+                    <in>zip_util.c</in>
+                  </df>
+                  <in>TimeZone.c</in>
+                </df>
+              </df>
+              <df name="sun">
+                <df name="awt">
+                  <df name="debug">
+                    <in>debug_assert.c</in>
+                    <in>debug_mem.c</in>
+                    <in>debug_trace.c</in>
+                    <in>debug_util.c</in>
+                  </df>
+                  <df name="giflib">
+                    <in>dgif_lib.c</in>
+                    <in>gif_err.c</in>
+                    <in>gifalloc.c</in>
+                  </df>
+                  <df name="image">
+                    <df name="cvutils">
+                      <in>img_colors.c</in>
+                      <in>img_globals.c</in>
+                    </df>
+                    <df name="gif">
+                      <in>gifdecoder.c</in>
+                    </df>
+                    <df name="jpeg">
+                      <in>imageioJPEG.c</in>
+                      <in>jcapimin.c</in>
+                      <in>jcapistd.c</in>
+                      <in>jccoefct.c</in>
+                      <in>jccolor.c</in>
+                      <in>jcdctmgr.c</in>
+                      <in>jchuff.c</in>
+                      <in>jcinit.c</in>
+                      <in>jcmainct.c</in>
+                      <in>jcmarker.c</in>
+                      <in>jcmaster.c</in>
+                      <in>jcomapi.c</in>
+                      <in>jcparam.c</in>
+                      <in>jcphuff.c</in>
+                      <in>jcprepct.c</in>
+                      <in>jcsample.c</in>
+                      <in>jctrans.c</in>
+                      <in>jdapimin.c</in>
+                      <in>jdapistd.c</in>
+                      <in>jdcoefct.c</in>
+                      <in>jdcolor.c</in>
+                      <in>jddctmgr.c</in>
+                      <in>jdhuff.c</in>
+                      <in>jdinput.c</in>
+                      <in>jdmainct.c</in>
+                      <in>jdmarker.c</in>
+                      <in>jdmaster.c</in>
+                      <in>jdmerge.c</in>
+                      <in>jdphuff.c</in>
+                      <in>jdpostct.c</in>
+                      <in>jdsample.c</in>
+                      <in>jdtrans.c</in>
+                      <in>jerror.c</in>
+                      <in>jfdctflt.c</in>
+                      <in>jfdctfst.c</in>
+                      <in>jfdctint.c</in>
+                      <in>jidctflt.c</in>
+                      <in>jidctfst.c</in>
+                      <in>jidctint.c</in>
+                      <in>jidctred.c</in>
+                      <in>jmemmgr.c</in>
+                      <in>jmemnobs.c</in>
+                      <in>jpegdecoder.c</in>
+                      <in>jquant1.c</in>
+                      <in>jquant2.c</in>
+                      <in>jutils.c</in>
+                    </df>
+                    <in>BufImgSurfaceData.c</in>
+                    <in>DataBufferNative.c</in>
+                    <in>awt_ImageRep.c</in>
+                    <in>awt_parseImage.c</in>
+                    <in>dither.c</in>
+                    <in>imageInitIDs.c</in>
+                  </df>
+                  <df name="libpng">
+                    <in>png.c</in>
+                    <in>pngerror.c</in>
+                    <in>pngget.c</in>
+                    <in>pngmem.c</in>
+                    <in>pngpread.c</in>
+                    <in>pngread.c</in>
+                    <in>pngrio.c</in>
+                    <in>pngrtran.c</in>
+                    <in>pngrutil.c</in>
+                    <in>pngset.c</in>
+                    <in>pngtrans.c</in>
+                    <in>pngwio.c</in>
+                    <in>pngwrite.c</in>
+                    <in>pngwtran.c</in>
+                    <in>pngwutil.c</in>
+                  </df>
+                  <df name="medialib">
+                    <in>awt_ImagingLib.c</in>
+                    <in>mlib_ImageAffine.c</in>
+                    <in>mlib_ImageAffineEdge.c</in>
+                    <in>mlib_ImageAffine_BC_D64.c</in>
+                    <in>mlib_ImageAffine_BC_F32.c</in>
+                    <in>mlib_ImageAffine_BC_S32.c</in>
+                    <in>mlib_ImageAffine_BL_D64.c</in>
+                    <in>mlib_ImageAffine_BL_F32.c</in>
+                    <in>mlib_ImageAffine_BL_S32.c</in>
+                    <in>mlib_ImageAffine_NN.c</in>
+                    <in>mlib_ImageAffine_NN_Bit.c</in>
+                    <in>mlib_ImageClipping.c</in>
+                    <in>mlib_ImageColorTrue2Index.c</in>
+                    <in>mlib_ImageConv2x2_f.c</in>
+                    <in>mlib_ImageConvClearEdge_Bit.c</in>
+                    <in>mlib_ImageConvClearEdge_Fp.c</in>
+                    <in>mlib_ImageConvCopyEdge_Bit.c</in>
+                    <in>mlib_ImageConvKernelConvert.c</in>
+                    <in>mlib_ImageConvMxN.c</in>
+                    <in>mlib_ImageConvMxN_Fp.c</in>
+                    <in>mlib_ImageConvMxN_ext.c</in>
+                    <in>mlib_ImageConv_16ext.c</in>
+                    <in>mlib_ImageConv_16nw.c</in>
+                    <in>mlib_ImageConv_32nw.c</in>
+                    <in>mlib_ImageConv_8ext.c</in>
+                    <in>mlib_ImageConv_8nw.c</in>
+                    <in>mlib_ImageConv_D64nw.c</in>
+                    <in>mlib_ImageConv_F32nw.c</in>
+                    <in>mlib_ImageConv_u16ext.c</in>
+                    <in>mlib_ImageConv_u16nw.c</in>
+                    <in>mlib_ImageCopy_Bit.c</in>
+                    <in>mlib_ImageCreate.c</in>
+                    <in>mlib_ImageDivTables.c</in>
+                    <in>mlib_ImageFilters.c</in>
+                    <in>mlib_ImageLookUp_64.c</in>
+                    <in>mlib_ImageLookUp_Bit.c</in>
+                    <in>mlib_ImageScanPoly.c</in>
+                    <in>mlib_ImageUtils.c</in>
+                    <in>mlib_c_ImageAffineIndex_BC.c</in>
+                    <in>mlib_c_ImageAffineIndex_BL.c</in>
+                    <in>mlib_c_ImageAffine_BC.c</in>
+                    <in>mlib_c_ImageAffine_BC_S16.c</in>
+                    <in>mlib_c_ImageAffine_BC_U16.c</in>
+                    <in>mlib_c_ImageAffine_BL.c</in>
+                    <in>mlib_c_ImageAffine_BL_S16.c</in>
+                    <in>mlib_c_ImageAffine_BL_U16.c</in>
+                    <in>mlib_c_ImageAffine_NN.c</in>
+                    <in>mlib_c_ImageConvClearEdge.c</in>
+                    <in>mlib_c_ImageConvCopyEdge.c</in>
+                    <in>mlib_c_ImageConvVersion.c</in>
+                    <in>mlib_c_ImageConv_f.c</in>
+                    <in>mlib_c_ImageCopy.c</in>
+                    <in>mlib_c_ImageLookUp.c</in>
+                    <in>mlib_c_ImageLookUp_f.c</in>
+                    <in>mlib_c_ImageThresh1_U8.c</in>
+                    <in>mlib_sys.c</in>
+                  </df>
+                  <df name="splashscreen">
+                    <in>java_awt_SplashScreen.c</in>
+                    <in>splashscreen_gfx_impl.c</in>
+                    <in>splashscreen_gif.c</in>
+                    <in>splashscreen_impl.c</in>
+                    <in>splashscreen_jpeg.c</in>
+                    <in>splashscreen_png.c</in>
+                  </df>
+                  <df name="utility">
+                    <in>rect.c</in>
+                  </df>
+                </df>
+                <df name="font">
+                  <df name="layout">
+                    <in>AlternateSubstSubtables.cpp</in>
+                    <in>AnchorTables.cpp</in>
+                    <in>ArabicLayoutEngine.cpp</in>
+                    <in>ArabicShaping.cpp</in>
+                    <in>CanonData.cpp</in>
+                    <in>CanonShaping.cpp</in>
+                    <in>ClassDefinitionTables.cpp</in>
+                    <in>ContextualGlyphSubstProc.cpp</in>
+                    <in>ContextualSubstSubtables.cpp</in>
+                    <in>CoverageTables.cpp</in>
+                    <in>CursiveAttachmentSubtables.cpp</in>
+                    <in>DeviceTables.cpp</in>
+                    <in>ExtensionSubtables.cpp</in>
+                    <in>Features.cpp</in>
+                    <in>GDEFMarkFilter.cpp</in>
+                    <in>GXLayoutEngine.cpp</in>
+                    <in>GlyphDefinitionTables.cpp</in>
+                    <in>GlyphIterator.cpp</in>
+                    <in>GlyphLookupTables.cpp</in>
+                    <in>GlyphPositionAdjustments.cpp</in>
+                    <in>GlyphPositioningTables.cpp</in>
+                    <in>GlyphPosnLookupProc.cpp</in>
+                    <in>GlyphSubstLookupProc.cpp</in>
+                    <in>GlyphSubstitutionTables.cpp</in>
+                    <in>HanLayoutEngine.cpp</in>
+                    <in>HangulLayoutEngine.cpp</in>
+                    <in>IndicClassTables.cpp</in>
+                    <in>IndicLayoutEngine.cpp</in>
+                    <in>IndicRearrangementProcessor.cpp</in>
+                    <in>IndicReordering.cpp</in>
+                    <in>KernTable.cpp</in>
+                    <in>KhmerLayoutEngine.cpp</in>
+                    <in>KhmerReordering.cpp</in>
+                    <in>LEFontInstance.cpp</in>
+                    <in>LEGlyphStorage.cpp</in>
+                    <in>LEInsertionList.cpp</in>
+                    <in>LayoutEngine.cpp</in>
+                    <in>LigatureSubstProc.cpp</in>
+                    <in>LigatureSubstSubtables.cpp</in>
+                    <in>LookupProcessor.cpp</in>
+                    <in>LookupTables.cpp</in>
+                    <in>Lookups.cpp</in>
+                    <in>MPreFixups.cpp</in>
+                    <in>MarkArrays.cpp</in>
+                    <in>MarkToBasePosnSubtables.cpp</in>
+                    <in>MarkToLigaturePosnSubtables.cpp</in>
+                    <in>MarkToMarkPosnSubtables.cpp</in>
+                    <in>MirroredCharData.cpp</in>
+                    <in>MorphTables.cpp</in>
+                    <in>MultipleSubstSubtables.cpp</in>
+                    <in>NonContextualGlyphSubstProc.cpp</in>
+                    <in>OpenTypeLayoutEngine.cpp</in>
+                    <in>OpenTypeUtilities.cpp</in>
+                    <in>PairPositioningSubtables.cpp</in>
+                    <in>ScriptAndLanguage.cpp</in>
+                    <in>ScriptAndLanguageTags.cpp</in>
+                    <in>SegmentArrayProcessor.cpp</in>
+                    <in>SegmentSingleProcessor.cpp</in>
+                    <in>ShapingTypeData.cpp</in>
+                    <in>SimpleArrayProcessor.cpp</in>
+                    <in>SinglePositioningSubtables.cpp</in>
+                    <in>SingleSubstitutionSubtables.cpp</in>
+                    <in>SingleTableProcessor.cpp</in>
+                    <in>StateTableProcessor.cpp</in>
+                    <in>SubstitutionLookups.cpp</in>
+                    <in>SubtableProcessor.cpp</in>
+                    <in>SunLayoutEngine.cpp</in>
+                    <in>ThaiLayoutEngine.cpp</in>
+                    <in>ThaiShaping.cpp</in>
+                    <in>ThaiStateTables.cpp</in>
+                    <in>TibetanLayoutEngine.cpp</in>
+                    <in>TibetanReordering.cpp</in>
+                    <in>TrimmedArrayProcessor.cpp</in>
+                    <in>ValueRecords.cpp</in>
+                  </df>
+                  <in>AccelGlyphCache.c</in>
+                  <in>DrawGlyphList.c</in>
+                  <in>FontInstanceAdapter.cpp</in>
+                  <in>freetypeScaler.c</in>
+                  <in>sunFont.c</in>
+                </df>
+                <df name="java2d">
+                  <df name="cmm">
+                    <df name="lcms">
+                      <in>LCMS.c</in>
+                      <in>cmscam02.c</in>
+                      <in>cmscgats.c</in>
+                      <in>cmscnvrt.c</in>
+                      <in>cmserr.c</in>
+                      <in>cmsgamma.c</in>
+                      <in>cmsgmt.c</in>
+                      <in>cmshalf.c</in>
+                      <in>cmsintrp.c</in>
+                      <in>cmsio0.c</in>
+                      <in>cmsio1.c</in>
+                      <in>cmslut.c</in>
+                      <in>cmsmd5.c</in>
+                      <in>cmsmtrx.c</in>
+                      <in>cmsnamed.c</in>
+                      <in>cmsopt.c</in>
+                      <in>cmspack.c</in>
+                      <in>cmspcs.c</in>
+                      <in>cmsplugin.c</in>
+                      <in>cmsps2.c</in>
+                      <in>cmssamp.c</in>
+                      <in>cmssm.c</in>
+                      <in>cmstypes.c</in>
+                      <in>cmsvirt.c</in>
+                      <in>cmswtpnt.c</in>
+                      <in>cmsxform.c</in>
+                    </df>
+                  </df>
+                  <df name="loops">
+                    <in>AlphaMacros.c</in>
+                    <in>AlphaMath.c</in>
+                    <in>Any3Byte.c</in>
+                    <in>Any4Byte.c</in>
+                    <in>AnyByte.c</in>
+                    <in>AnyInt.c</in>
+                    <in>AnyShort.c</in>
+                    <in>Blit.c</in>
+                    <in>BlitBg.c</in>
+                    <in>ByteBinary1Bit.c</in>
+                    <in>ByteBinary2Bit.c</in>
+                    <in>ByteBinary4Bit.c</in>
+                    <in>ByteGray.c</in>
+                    <in>ByteIndexed.c</in>
+                    <in>DrawLine.c</in>
+                    <in>DrawParallelogram.c</in>
+                    <in>DrawPath.c</in>
+                    <in>DrawPolygons.c</in>
+                    <in>DrawRect.c</in>
+                    <in>FillParallelogram.c</in>
+                    <in>FillPath.c</in>
+                    <in>FillRect.c</in>
+                    <in>FillSpans.c</in>
+                    <in>FourByteAbgr.c</in>
+                    <in>FourByteAbgrPre.c</in>
+                    <in>GraphicsPrimitiveMgr.c</in>
+                    <in>Index12Gray.c</in>
+                    <in>Index8Gray.c</in>
+                    <in>IntArgb.c</in>
+                    <in>IntArgbBm.c</in>
+                    <in>IntArgbPre.c</in>
+                    <in>IntBgr.c</in>
+                    <in>IntRgb.c</in>
+                    <in>IntRgbx.c</in>
+                    <in>MapAccelFunc.c</in>
+                    <in>MaskBlit.c</in>
+                    <in>MaskFill.c</in>
+                    <in>ProcessPath.c</in>
+                    <in>ScaledBlit.c</in>
+                    <in>ThreeByteBgr.c</in>
+                    <in>TransformHelper.c</in>
+                    <in>Ushort4444Argb.c</in>
+                    <in>Ushort555Rgb.c</in>
+                    <in>Ushort555Rgbx.c</in>
+                    <in>Ushort565Rgb.c</in>
+                    <in>UshortGray.c</in>
+                    <in>UshortIndexed.c</in>
+                  </df>
+                  <df name="opengl">
+                    <in>OGLBlitLoops.c</in>
+                    <in>OGLBufImgOps.c</in>
+                    <in>OGLContext.c</in>
+                    <in>OGLFuncs.c</in>
+                    <in>OGLMaskBlit.c</in>
+                    <in>OGLMaskFill.c</in>
+                    <in>OGLPaints.c</in>
+                    <in>OGLRenderQueue.c</in>
+                    <in>OGLRenderer.c</in>
+                    <in>OGLSurfaceData.c</in>
+                    <in>OGLTextRenderer.c</in>
+                    <in>OGLVertexCache.c</in>
+                  </df>
+                  <df name="pipe">
+                    <in>BufferedMaskBlit.c</in>
+                    <in>BufferedRenderPipe.c</in>
+                    <in>Region.c</in>
+                    <in>ShapeSpanIterator.c</in>
+                    <in>SpanClipRenderer.c</in>
+                  </df>
+                  <in>Disposer.c</in>
+                  <in>SurfaceData.c</in>
+                  <in>Trace.c</in>
+                </df>
+                <df name="management">
+                  <in>ClassLoadingImpl.c</in>
+                  <in>Flag.c</in>
+                  <in>GarbageCollectorImpl.c</in>
+                  <in>GcInfoBuilder.c</in>
+                  <in>HotSpotDiagnostic.c</in>
+                  <in>HotspotThread.c</in>
+                  <in>MemoryImpl.c</in>
+                  <in>MemoryManagerImpl.c</in>
+                  <in>MemoryPoolImpl.c</in>
+                  <in>ThreadImpl.c</in>
+                  <in>VMManagementImpl.c</in>
+                  <in>management.c</in>
+                </df>
+                <df name="misc">
+                  <in>GC.c</in>
+                  <in>MessageUtils.c</in>
+                  <in>NativeSignalHandler.c</in>
+                  <in>Signal.c</in>
+                  <in>VM.c</in>
+                  <in>VMSupport.c</in>
+                  <in>Version.c</in>
+                </df>
+                <df name="nio">
+                  <df name="ch">
+                    <in>genSocketOptionRegistry.c</in>
+                  </df>
+                </df>
+                <df name="reflect">
+                  <in>ConstantPool.c</in>
+                  <in>NativeAccessors.c</in>
+                  <in>Reflection.c</in>
+                </df>
+                <df name="security">
+                  <df name="ec">
+                    <df name="impl">
+                      <in>ec.c</in>
+                      <in>ec2_163.c</in>
+                      <in>ec2_193.c</in>
+                      <in>ec2_233.c</in>
+                      <in>ec2_aff.c</in>
+                      <in>ec2_mont.c</in>
+                      <in>ec_naf.c</in>
+                      <in>ecdecode.c</in>
+                      <in>ecl.c</in>
+                      <in>ecl_curve.c</in>
+                      <in>ecl_gf.c</in>
+                      <in>ecl_mult.c</in>
+                      <in>ecp_192.c</in>
+                      <in>ecp_224.c</in>
+                      <in>ecp_256.c</in>
+                      <in>ecp_384.c</in>
+                      <in>ecp_521.c</in>
+                      <in>ecp_aff.c</in>
+                      <in>ecp_jac.c</in>
+                      <in>ecp_jm.c</in>
+                      <in>ecp_mont.c</in>
+                      <in>mp_gf2m.c</in>
+                      <in>mpi.c</in>
+                      <in>mplogic.c</in>
+                      <in>mpmontg.c</in>
+                      <in>oid.c</in>
+                      <in>secitem.c</in>
+                    </df>
+                    <in>ECC_JNI.cpp</in>
+                  </df>
+                  <df name="jgss">
+                    <df name="wrapper">
+                      <in>GSSLibStub.c</in>
+                      <in>NativeUtil.c</in>
+                    </df>
+                  </df>
+                  <df name="pkcs11">
+                    <df name="wrapper">
+                      <in>p11_convert.c</in>
+                      <in>p11_crypt.c</in>
+                      <in>p11_digest.c</in>
+                      <in>p11_dual.c</in>
+                      <in>p11_general.c</in>
+                      <in>p11_keymgmt.c</in>
+                      <in>p11_mutex.c</in>
+                      <in>p11_objmgmt.c</in>
+                      <in>p11_sessmgmt.c</in>
+                      <in>p11_sign.c</in>
+                      <in>p11_util.c</in>
+                    </df>
+                    <in>j2secmod.c</in>
+                  </df>
+                  <df name="smartcardio">
+                    <in>pcsc.c</in>
+                  </df>
+                </df>
+                <df name="tracing">
+                  <df name="dtrace">
+                    <in>JVM.c</in>
+                  </df>
+                </df>
+              </df>
+            </df>
+            <df name="npt">
+              <in>npt.c</in>
+              <in>utf.c</in>
+            </df>
+            <df name="transport">
+              <df name="socket">
+                <in>socketTransport.c</in>
+              </df>
+            </df>
+          </df>
+          <df name="solaris">
+            <df name="back">
+              <in>exec_md.c</in>
+              <in>linker_md.c</in>
+            </df>
+            <df name="bin">
+              <in>ergo.c</in>
+              <in>ergo_i586.c</in>
+              <in>java_md_common.c</in>
+              <in>java_md_solinux.c</in>
+              <in>jexec.c</in>
+            </df>
+            <df name="demo">
+              <df name="jni">
+                <df name="Poller">
+                  <in>Poller.c</in>
+                </df>
+              </df>
+              <df name="jvmti">
+                <df name="hprof">
+                  <in>hprof_md.c</in>
+                </df>
+              </df>
+            </df>
+            <df name="instrument">
+              <in>EncodingSupport_md.c</in>
+              <in>FileSystemSupport_md.c</in>
+            </df>
+            <df name="native">
+              <df name="com">
+                <df name="sun">
+                  <df name="management">
+                    <in>LinuxOperatingSystem.c</in>
+                    <in>SolarisOperatingSystem.c</in>
+                    <in>UnixOperatingSystem_md.c</in>
+                  </df>
+                  <df name="media">
+                    <df name="sound">
+                      <in>PLATFORM_API_LinuxOS_ALSA_CommonUtils.c</in>
+                      <in>PLATFORM_API_LinuxOS_ALSA_MidiIn.c</in>
+                      <in>PLATFORM_API_LinuxOS_ALSA_MidiOut.c</in>
+                      <in>PLATFORM_API_LinuxOS_ALSA_MidiUtils.c</in>
+                      <in>PLATFORM_API_LinuxOS_ALSA_PCM.c</in>
+                      <in>PLATFORM_API_LinuxOS_ALSA_PCMUtils.c</in>
+                      <in>PLATFORM_API_LinuxOS_ALSA_Ports.c</in>
+                      <in>PLATFORM_API_SolarisOS_PCM.c</in>
+                      <in>PLATFORM_API_SolarisOS_Ports.c</in>
+                      <in>PLATFORM_API_SolarisOS_Utils.c</in>
+                    </df>
+                  </df>
+                  <df name="security">
+                    <df name="auth">
+                      <df name="module">
+                        <in>Solaris.c</in>
+                        <in>Unix.c</in>
+                      </df>
+                    </df>
+                  </df>
+                </df>
+              </df>
+              <df name="common">
+                <in>jdk_util_md.c</in>
+                <in>jni_util_md.c</in>
+              </df>
+              <df name="java">
+                <df name="io">
+                  <in>Console_md.c</in>
+                  <in>FileDescriptor_md.c</in>
+                  <in>FileInputStream_md.c</in>
+                  <in>FileOutputStream_md.c</in>
+                  <in>RandomAccessFile_md.c</in>
+                  <in>UnixFileSystem_md.c</in>
+                  <in>canonicalize_md.c</in>
+                  <in>io_util_md.c</in>
+                </df>
+                <df name="lang">
+                  <in>ProcessEnvironment_md.c</in>
+                  <in>UNIXProcess_md.c</in>
+                  <in>java_props_md.c</in>
+                </df>
+                <df name="net">
+                  <in>Inet4AddressImpl.c</in>
+                  <in>Inet6AddressImpl.c</in>
+                  <in>InetAddressImplFactory.c</in>
+                  <in>NetworkInterface.c</in>
+                  <in>PlainDatagramSocketImpl.c</in>
+                  <in>PlainSocketImpl.c</in>
+                  <in>SocketInputStream.c</in>
+                  <in>SocketOutputStream.c</in>
+                  <in>linux_close.c</in>
+                  <in>net_util_md.c</in>
+                </df>
+                <df name="nio">
+                  <in>MappedByteBuffer.c</in>
+                </df>
+                <df name="util">
+                  <in>FileSystemPreferences.c</in>
+                  <in>TimeZone_md.c</in>
+                  <in>logging.c</in>
+                </df>
+              </df>
+              <df name="sun">
+                <df name="awt">
+                  <df name="splashscreen">
+                    <in>splashscreen_sys.c</in>
+                  </df>
+                  <in>CUPSfuncs.c</in>
+                  <in>HeadlessToolkit.c</in>
+                  <in>VDrawingArea.c</in>
+                  <in>X11Color.c</in>
+                  <in>awt_AWTEvent.c</in>
+                  <in>awt_DrawingSurface.c</in>
+                  <in>awt_Event.c</in>
+                  <in>awt_Font.c</in>
+                  <in>awt_GraphicsEnv.c</in>
+                  <in>awt_InputMethod.c</in>
+                  <in>awt_Insets.c</in>
+                  <in>awt_LoadLibrary.c</in>
+                  <in>awt_Mlib.c</in>
+                  <in>awt_Plugin.c</in>
+                  <in>awt_Robot.c</in>
+                  <in>awt_UNIXToolkit.c</in>
+                  <in>awt_util.c</in>
+                  <in>fontpath.c</in>
+                  <in>gtk2_interface.c</in>
+                  <in>initIDs.c</in>
+                  <in>jawt.c</in>
+                  <in>list.c</in>
+                  <in>multiVis.c</in>
+                  <in>multi_font.c</in>
+                  <in>robot_common.c</in>
+                  <in>sun_awt_X11_GtkFileDialogPeer.c</in>
+                  <in>swing_GTKEngine.c</in>
+                  <in>swing_GTKStyle.c</in>
+                </df>
+                <df name="font">
+                  <in>X11FontScaler.c</in>
+                  <in>X11TextRenderer.c</in>
+                </df>
+                <df name="java2d">
+                  <df name="opengl">
+                    <in>GLXGraphicsConfig.c</in>
+                    <in>GLXSurfaceData.c</in>
+                  </df>
+                  <df name="x11">
+                    <in>X11FontScaler_md.c</in>
+                    <in>X11PMBlitLoops.c</in>
+                    <in>X11Renderer.c</in>
+                    <in>X11SurfaceData.c</in>
+                    <in>X11TextRenderer_md.c</in>
+                    <in>XRBackendNative.c</in>
+                    <in>XRSurfaceData.c</in>
+                  </df>
+                </df>
+                <df name="management">
+                  <in>FileSystemImpl.c</in>
+                </df>
+                <df name="net">
+                  <df name="dns">
+                    <in>ResolverConfigurationImpl.c</in>
+                  </df>
+                  <df name="sdp">
+                    <in>SdpSupport.c</in>
+                  </df>
+                  <df name="spi">
+                    <in>DefaultProxySelector.c</in>
+                  </df>
+                </df>
+                <df name="nio">
+                  <df name="ch">
+                    <df name="sctp">
+                      <in>SctpChannelImpl.c</in>
+                      <in>SctpNet.c</in>
+                      <in>SctpServerChannelImpl.c</in>
+                    </df>
+                    <in>DatagramChannelImpl.c</in>
+                    <in>DatagramDispatcher.c</in>
+                    <in>DevPollArrayWrapper.c</in>
+                    <in>EPoll.c</in>
+                    <in>EPollArrayWrapper.c</in>
+                    <in>EPollPort.c</in>
+                    <in>FileChannelImpl.c</in>
+                    <in>FileDispatcherImpl.c</in>
+                    <in>FileKey.c</in>
+                    <in>IOUtil.c</in>
+                    <in>InheritedChannel.c</in>
+                    <in>NativeThread.c</in>
+                    <in>Net.c</in>
+                    <in>PollArrayWrapper.c</in>
+                    <in>ServerSocketChannelImpl.c</in>
+                    <in>SocketChannelImpl.c</in>
+                    <in>SocketDispatcher.c</in>
+                    <in>SolarisEventPort.c</in>
+                    <in>UnixAsynchronousServerSocketChannelImpl.c</in>
+                    <in>UnixAsynchronousSocketChannelImpl.c</in>
+                  </df>
+                  <df name="fs">
+                    <in>GnomeFileTypeDetector.c</in>
+                    <in>LinuxNativeDispatcher.c</in>
+                    <in>LinuxWatchService.c</in>
+                    <in>MagicFileTypeDetector.c</in>
+                    <in>SolarisNativeDispatcher.c</in>
+                    <in>SolarisWatchService.c</in>
+                    <in>UnixCopyFile.c</in>
+                    <in>UnixNativeDispatcher.c</in>
+                    <in>genSolarisConstants.c</in>
+                    <in>genUnixConstants.c</in>
+                  </df>
+                </df>
+                <df name="security">
+                  <df name="jgss">
+                    <df name="wrapper">
+                      <in>NativeFunc.c</in>
+                    </df>
+                  </df>
+                  <df name="pkcs11">
+                    <df name="wrapper">
+                      <in>p11_md.c</in>
+                    </df>
+                    <in>j2secmod_md.c</in>
+                  </df>
+                  <df name="smartcardio">
+                    <in>pcsc_md.c</in>
+                  </df>
+                </df>
+                <df name="tools">
+                  <df name="attach">
+                    <in>LinuxVirtualMachine.c</in>
+                    <in>SolarisVirtualMachine.c</in>
+                  </df>
+                </df>
+                <df name="tracing">
+                  <df name="dtrace">
+                    <in>jvm_symbols_md.c</in>
+                  </df>
+                </df>
+                <df name="util">
+                  <df name="locale">
+                    <df name="provider">
+                      <in>HostLocaleProviderAdapter_md.c</in>
+                    </df>
+                  </df>
+                </df>
+                <df name="xawt">
+                  <in>XToolkit.c</in>
+                  <in>XWindow.c</in>
+                  <in>XlibWrapper.c</in>
+                  <in>awt_Desktop.c</in>
+                  <in>gnome_interface.c</in>
+                </df>
+              </df>
+            </df>
+            <df name="npt">
+              <in>utf_md.c</in>
+            </df>
+            <df name="transport">
+              <df name="socket">
+                <in>socket_md.c</in>
+              </df>
+            </df>
+          </df>
+        </df>
+      </df>
+    </df>
+    <logicalFolder name="ExternalFiles"
+                   displayName="Important Files"
+                   projectFiles="false"
+                   kind="IMPORTANT_FILES_FOLDER">
+      <itemPath>../../Makefile</itemPath>
+    </logicalFolder>
+  </logicalFolder>
+  <sourceFolderFilter>^(nbproject)$</sourceFolderFilter>
+  <sourceRootList>
+    <Elem>../..</Elem>
+  </sourceRootList>
+  <projectmakefile>../../Makefile</projectmakefile>
+  <confs>
+    <conf name="Mac_64" type="0">
+      <toolsSet>
+        <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode>
+        <compilerSet>default</compilerSet>
+      </toolsSet>
+      <codeAssistance>
+        <envVariables>
+          <Elem>IDE_ALT_BOOTDIR</Elem>
+        </envVariables>
+        <transientMacros>
+          <Elem>FULL_VERSION="version"</Elem>
+          <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+          <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+          <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+          <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+          <Elem>JDK_MAJOR_VERSION="version"</Elem>
+          <Elem>JDK_MICRO_VERSION="version"</Elem>
+          <Elem>JDK_MINOR_VERSION="minor"</Elem>
+          <Elem>JRE_RELEASE_VERSION="version"</Elem>
+        </transientMacros>
+      </codeAssistance>
+      <makefileType>
+        <makeTool>
+          <buildCommandWorkingDir>../..</buildCommandWorkingDir>
+          <buildCommand>${MAKE} -f Makefile LOG=debug images</buildCommand>
+          <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
+          <executablePath></executablePath>
+          <ccTool>
+            <incDir>
+              <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/product</pElem>
+              <pElem>../../hotspot/src/share/vm/prims</pElem>
+              <pElem>../../hotspot/src/share/vm</pElem>
+              <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+              <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+              <pElem>../../hotspot/src/os_cpu/bsd_x86/vm</pElem>
+              <pElem>../../hotspot/src/os/bsd/vm</pElem>
+              <pElem>../../hotspot/src/os/posix/vm</pElem>
+              <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated</pElem>
+            </incDir>
+            <preprocessorList>
+              <Elem>AMD64</Elem>
+              <Elem>COMPILER1</Elem>
+              <Elem>COMPILER2</Elem>
+              <Elem>DTRACE_ENABLED</Elem>
+              <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+              <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+              <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+              <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+              <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+              <Elem>INCLUDE_TRACE</Elem>
+              <Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
+              <Elem>PRODUCT</Elem>
+              <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
+              <Elem>TARGET_ARCH_x86</Elem>
+              <Elem>TARGET_COMPILER_gcc</Elem>
+              <Elem>TARGET_OS_ARCH_MODEL_bsd_x86_64</Elem>
+              <Elem>TARGET_OS_ARCH_bsd_x86</Elem>
+              <Elem>TARGET_OS_FAMILY_bsd</Elem>
+              <Elem>VM_LITTLE_ENDIAN</Elem>
+              <Elem>_ALLBSD_SOURCE</Elem>
+              <Elem>_DARWIN_C_SOURCE</Elem>
+              <Elem>_GNU_SOURCE</Elem>
+              <Elem>_LP64=1</Elem>
+              <Elem>_XOPEN_SOURCE</Elem>
+            </preprocessorList>
+            <undefinedList>
+              <Elem>__EXCEPTIONS</Elem>
+              <Elem>__GXX_RTTI</Elem>
+            </undefinedList>
+          </ccTool>
+        </makeTool>
+      </makefileType>
+      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/ad_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/ad_x86_64_clone.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/ad_x86_64_expand.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/ad_x86_64_format.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/ad_x86_64_gen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/ad_x86_64_misc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/ad_x86_64_peephole.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/ad_x86_64_pipeline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/adfiles/dfa_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/jvmtifiles/bytecodeInterpreterWithChecks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/jvmtifiles/jvmtiEnter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated/jvmtifiles/jvmtiEnterTrace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/macosx-x86_64-normal-server-release/jdk/gensrc_x11wrappers/sizer.64.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/assembler_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/bytecodeInterpreter_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/bytecodes_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_FpuStackSim_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_FrameMap_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_LinearScan_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c2_init_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/debug_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/depChecker_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/frame_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/icBuffer_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/icache_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/interpreterRT_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/interpreter_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/jniFastGetField_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/metaspaceShared_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/methodHandles_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/nativeInst_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/register_definitions_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/register_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/relocInfo_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/runtime_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/vm_version_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/vmreg_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/vtableStubs_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/bsd/vm/attachListener_bsd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/bsd/vm/chaitin_bsd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/bsd/vm/decoder_machO.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/bsd/vm/dtraceJSDT_bsd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/bsd/vm/jvm_bsd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/bsd/vm/mutex_bsd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/bsd/vm/osThread_bsd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/bsd/vm/os_bsd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/bsd/vm/perfMemory_bsd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/bsd/vm/stubRoutines_bsd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/bsd/vm/threadCritical_bsd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/bsd/vm/vmError_bsd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/posix/launcher/java_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/posix/vm/os_posix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os_cpu/bsd_x86/vm/vm_version_bsd_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/tools/launcher/java.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/tools/launcher/jli_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/tools/launcher/wildcard.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/asm/assembler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/asm/codeBuffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/asm/register.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_CFGPrinter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Canonicalizer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Compilation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Compiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Defs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_FrameMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_GraphBuilder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_IR.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Instruction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_LIR.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_LIRAssembler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_LIRGenerator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_LinearScan.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Optimizer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_RangeCheckElimination.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Runtime1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_ValueMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_ValueSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_ValueStack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_ValueType.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_globals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciArrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciBaseObject.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciCallSite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciConstant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciConstantPoolCache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciEnv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciExceptionHandler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciField.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciFlags.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciInstance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciInstanceKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMemberName.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMetadata.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMethod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMethodBlocks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMethodData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMethodHandle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciNullObject.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciObjArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciObjArrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciObject.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciObjectFactory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciReplay.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciSignature.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciStreams.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciSymbol.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciType.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciTypeArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciTypeFlow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciUtilities.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/altHashing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/bytecodeAssembler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/classFileError.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/classFileParser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/classFileStream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/classLoader.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/classLoaderData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/defaultMethods.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/dictionary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/genericSignatures.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/javaAssertions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/javaClasses.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/loaderConstraints.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/metadataOnStackMark.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/placeholders.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/resolutionErrors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/stackMapFrame.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/stackMapTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/symbolTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/systemDictionary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/verificationType.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/verifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/vmSymbols.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/codeBlob.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/codeCache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/compiledIC.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/compressedStream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/debugInfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/debugInfoRec.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/dependencies.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/exceptionHandlerTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/icBuffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/location.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/nmethod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/oopRecorder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/pcDesc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/relocInfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/scopeDesc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/stubs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/vmreg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/vtableStubs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/abstractCompiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/compileBroker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/compileLog.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/compilerOracle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/disassembler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/methodLiveness.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/oopMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1Log.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1_globals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/sparsePRT.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/survRateGroup.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/allocationStats.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/hSpaceCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/spaceDecorator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_interface/collectedHeap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_interface/gcCause.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecodeHistogram.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecodeStream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecodeTracer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecodes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/cppInterpreter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/interpreter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/interpreterRuntime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/invocationCounter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/linkResolver.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/oopMapCache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/rewriter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/templateInterpreter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/templateTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/libadt/dict.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/libadt/port.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/libadt/set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/libadt/vectset.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/allocation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/barrierSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/binaryTreeDictionary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/blockOffsetTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/cardTableModRefBS.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/cardTableRS.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/collectorPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/defNewGeneration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/filemap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/freeBlockDictionary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/freeList.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/gcLocker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/genCollectedHeap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/genMarkSweep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/genRemSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/generation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/generationSpec.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/heap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/heapInspection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/memRegion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/metablock.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/metachunk.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/metaspace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/metaspaceCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/metaspaceShared.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/oopFactory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/referencePolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/referenceProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/resourceArea.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/sharedHeap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/space.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/specialized_oop_closures.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/tenuredGeneration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/universe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/annotations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/arrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/arrayOop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/compiledICHolder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/constMethod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/constantPool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/cpCache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/generateOopMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/instanceClassLoaderKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/instanceKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/instanceMirrorKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/instanceOop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/instanceRefKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/klass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/klassVtable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/markOop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/metadata.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/method.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/methodData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/objArrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/objArrayOop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/oop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/oopsHierarchy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/symbol.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/typeArrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/typeArrayOop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/addnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/block.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/buildOopMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/bytecodeInfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/c2_globals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/c2compiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/callGenerator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/callnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/cfgnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/chaitin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/classes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/coalesce.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/connode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/divnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/doCall.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/domgraph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/escape.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/gcm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/generateOptoStub.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/graphKit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/idealGraphPrinter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/idealKit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/ifg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/ifnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/indexSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/lcm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/library_call.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/live.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/locknode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/loopPredicate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/loopTransform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/loopUnswitch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/loopnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/loopopts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/machnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/matcher.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/memnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/mulnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/multnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/node.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/opcodes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/output.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/parse1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/parse2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/parse3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/parseHelper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/phase.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/phaseX.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/postaloc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/reg_split.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/regalloc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/regmask.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/rootnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/runtime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/split_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/stringopts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/subnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/superword.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/vectornode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/precompiled/precompiled.hpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/evmCompat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/forte.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jni.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jniCheck.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jniFastGetField.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiEnv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiEnvBase.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiEnvThreadState.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiEventController.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiExport.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiExtensions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiImpl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiRawMonitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiTagMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiThreadState.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiTrace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiUtil.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/methodComparator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/methodHandles.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/nativeLookup.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/perf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/privilegedStack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/unsafe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/wbtestmethods/parserTests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/whitebox.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/aprofiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/arguments.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/atomic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/basicLock.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/biasedLocking.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/compilationPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/deoptimization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/dtraceJSDT.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/fieldDescriptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/fieldType.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/fprofiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/frame.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/globals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/handles.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/icache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/init.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/interfaceSupport.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/java.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/javaCalls.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/jniHandles.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/jniPeriodicChecker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/memprofiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/monitorChunk.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/mutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/mutexLocker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/objectMonitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/orderAccess.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/os.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/osThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/park.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/perfData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/perfMemory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/reflection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/reflectionUtils.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/relocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/rframe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/safepoint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/serviceThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/sharedRuntime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/sharedRuntimeTrans.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/signature.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/stackValue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/stackValueCollection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/statSampler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/stubCodeGenerator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/stubRoutines.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/sweeper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/synchronizer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/task.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/threadLocalStorage.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/unhandledOops.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vframe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vframeArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vframe_hp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/virtualspace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vmStructs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vmThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vm_operations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vm_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>JRE_RELEASE_VERSION="version"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/services/attachListener.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/classLoadingService.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/diagnosticArgument.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/diagnosticCommand.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/diagnosticFramework.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/dtraceAttacher.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/g1MemoryPool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/gcNotifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/heapDumper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/lowMemoryDetector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/management.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memBaseline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memPtr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memRecorder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memReporter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memSnapshot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memTrackWorker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memTracker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memoryManager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memoryPool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memoryService.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/nmtDCmd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/psMemoryPool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/runtimeService.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/threadService.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/accessFlags.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/bitMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/constantTag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/debug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/decoder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/decoder_elf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/elfFile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/elfStringTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/elfSymbolTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/errorReporter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/events.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/exceptions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/globalDefinitions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/growableArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/hashtable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/histogram.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/intHisto.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/numberSeq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/ostream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/preserveException.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/quickSort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/sizes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/taskqueue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/utf8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/vmError.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/workgroup.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/xmlstream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <folder path="$SRC/build">
+        <cTool>
+          <incDir>
+            <pElem>/usr/X11/include</pElem>
+            <pElem>../../build/macosx-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/build/linux-x86_64-normal-server-release">
+        <ccTool>
+          <preprocessorList>
+            <Elem>LINUX</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_linux_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_linux_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_linux</Elem>
+            <Elem>_REENTRANT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot">
+        <cTool>
+          <incDir>
+            <pElem>../../hotspot/src/os/posix/launcher</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/tools/launcher</pElem>
+            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/bsd_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/bsd/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>AMD64</Elem>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>FULL_VERSION="version"</Elem>
+            <Elem>GAMMA</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>LAUNCHER_TYPE="gamma"</Elem>
+            <Elem>LINK_INTO_LIBJVM</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
+            <Elem>TARGET_ARCH_x86</Elem>
+            <Elem>TARGET_COMPILER_gcc</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_bsd_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_bsd_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_bsd</Elem>
+            <Elem>_ALLBSD_SOURCE</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/hotspot/agent">
+        <cTool>
+          <incDir>
+            <pElem>../../hotspot/agent/src/os/linux</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+            <pElem>${IDE_ALT_BOOTDIR}include</pElem>
+            <pElem>${IDE_ALT_BOOTDIR}include/linux</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>_FILE_OFFSET_BITS=64</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/os/linux">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>_REENTRANT</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_linux_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_linux_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_linux</Elem>
+            <Elem>_REENTRANT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/os_cpu/linux_x86">
+        <ccTool>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_linux_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_linux_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_linux</Elem>
+            <Elem>_REENTRANT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/adlc">
+        <ccTool>
+          <incDir>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/adlc</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ASSERT</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_linux_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_linux_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_linux</Elem>
+            <Elem>_REENTRANT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ArrayReferenceImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="Agent.cpp"</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/back">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/transport/export</pElem>
+            <pElem>../../jdk/src/share/back/export</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/src/share/back</pElem>
+            <pElem>../../jdk/src/solaris/back</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>JDWP_LOGGING</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/bin">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LIBARCHNAME="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="java.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="agent_util.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/agent_util">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/compiledMethodLoad">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/gctest">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="gctest.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/heapTracker">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="heapTracker.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/heapViewer">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="heapViewer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/hprof">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="debug_malloc.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/java_crw_demo">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
+            <pElem>../../jdk/src/solaris/demo/jvmti/hprof</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="java_crw_demo.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/minst">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="minst.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/mtrace">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="mtrace.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/versionCheck">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="versionCheck.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/instrument">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/instrument</pElem>
+            <pElem>../../jdk/src/solaris/instrument</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_JPLIS_LOGGING</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="EncodingSupport.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DirectAudioDevice.c"</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="bands.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/com">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
+            <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>X_ARCH=X_AMD64</Elem>
+            <Elem>X_PLATFORM=X_LINUX</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <preprocessorList>
+            <Elem>FULL</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/common">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="check_code.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java">
+        <cTool>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="FileInputStream.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/io">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/lang">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_acos.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/lang/fdlibm">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/lang/ref">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Finalizer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/lang/reflect">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Array.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/net">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="DatagramPacket.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/nio">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Bits.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/security">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="AccessController.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/util">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="AtomicLong.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/util/concurrent">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/util/zip">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="compress.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/util/zip/zlib-1.2.5">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="debug_assert.c"</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="AlternateSubstSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt">
+        <cTool>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/debug">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/giflib">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="dgif_lib.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/image">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="img_colors.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/image/cvutils">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/image/gif">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="gifdecoder.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/image/jpeg">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="imageioJPEG.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/libpng">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="png.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/medialib">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="awt_ImagingLib.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/splashscreen">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="java_awt_SplashScreen.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/utility">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="rect.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/font">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="AccelGlyphCache.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>/usr/include/freetype2</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HEADLESS</Elem>
+            <Elem>LE_STANDALONE</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/java2d">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="LCMS.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/java2d/cmm">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/java2d/loops">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="AlphaMacros.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/java2d/opengl">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="OGLBlitLoops.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/java2d/pipe">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="BufferedMaskBlit.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/management">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/management</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="ClassLoadingImpl.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/misc">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="GC.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/nio">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/reflect">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="ConstantPool.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/security">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="ec.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
+            <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/security/ec">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
+            <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MP_API_COMPATIBLE</Elem>
+            <Elem>NSS_ECC_MORE_THAN_SUITE_B</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/security/jgss">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="GSSLibStub.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/security/pkcs11">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/pkcs11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
+            <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_convert.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/security/smartcardio">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="pcsc.c"</Elem>
+            <Elem>__sun_jdk</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/tracing">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="JVM.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/npt">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="npt.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/transport">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/transport/socket</pElem>
+            <pElem>../../jdk/src/solaris/transport/socket</pElem>
+            <pElem>../../jdk/src/share/back/export</pElem>
+            <pElem>../../jdk/src/share/back</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="socketTransport.c"</Elem>
+            <Elem>USE_MMAP</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris">
+        <cTool>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="exec_md.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/back">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/transport/export</pElem>
+            <pElem>../../jdk/src/share/back/export</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/src/share/back</pElem>
+            <pElem>../../jdk/src/solaris/back</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>JDWP_LOGGING</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/bin">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="ergo.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/demo">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/instrument">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/instrument</pElem>
+            <pElem>../../jdk/src/solaris/instrument</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NO_JPLIS_LOGGING</Elem>
+            <Elem>THIS_FILE="EncodingSupport_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LinuxOperatingSystem.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/com">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/com/sun/management">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/management</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/com/sun/media">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
+            <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
+            <Elem>THIS_FILE="PLATFORM_API_LinuxOS_ALSA_CommonUtils.c"</Elem>
+            <Elem>USE_DAUDIO=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
+            <Elem>USE_PORTS=TRUE</Elem>
+            <Elem>X_ARCH=X_AMD64</Elem>
+            <Elem>X_PLATFORM=X_LINUX</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="Unix.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/common">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="jdk_util_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="Console_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java/io">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java/lang">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="ProcessEnvironment_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java/net">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java/nio">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java/util">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="FileSystemPreferences.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="splashscreen_sys.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/awt/splashscreen">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/font">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>/usr/include/freetype2</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HEADLESS</Elem>
+            <Elem>LE_STANDALONE</Elem>
+            <Elem>THIS_FILE="X11FontScaler.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/java2d">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="GLXGraphicsConfig.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/java2d/x11">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="X11FontScaler_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/management">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/management</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="FileSystemImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/net">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="ResolverConfigurationImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/net/sdp">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SdpSupport.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/net/spi">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DefaultProxySelector.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/nio">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SctpChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/nio/ch">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/nio/ch/sctp">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/nio/ch/sctp</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/nio/fs">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GnomeFileTypeDetector.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/security">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="NativeFunc.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/security/jgss">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/security/pkcs11">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/pkcs11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
+            <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/security/smartcardio">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="pcsc_md.c"</Elem>
+            <Elem>__sun_jdk</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/tools">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="LinuxVirtualMachine.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/tracing">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="jvm_symbols_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/util">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="HostLocaleProviderAdapter_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/xawt">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="XToolkit.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/npt">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="utf_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/transport">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/transport/socket</pElem>
+            <pElem>../../jdk/src/solaris/transport/socket</pElem>
+            <pElem>../../jdk/src/share/back/export</pElem>
+            <pElem>../../jdk/src/share/back</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="socket_md.c"</Elem>
+            <Elem>USE_MMAP</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+    </conf>
+    <conf name="Linux_64" type="0">
+      <toolsSet>
+        <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode>
+        <compilerSet>default</compilerSet>
+      </toolsSet>
+      <codeAssistance>
+        <envVariables>
+          <Elem>IDE_ALT_BOOTDIR</Elem>
+        </envVariables>
+        <transientMacros>
+          <Elem>FULL_VERSION="version"</Elem>
+          <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+          <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+          <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+          <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+          <Elem>JDK_MAJOR_VERSION="version"</Elem>
+          <Elem>JDK_MICRO_VERSION="version"</Elem>
+          <Elem>JDK_MINOR_VERSION="minor"</Elem>
+          <Elem>JRE_RELEASE_VERSION="version"</Elem>
+        </transientMacros>
+      </codeAssistance>
+      <makefileType>
+        <makeTool>
+          <buildCommandWorkingDir>../..</buildCommandWorkingDir>
+          <buildCommand>${MAKE} -f Makefile images</buildCommand>
+          <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
+          <executablePath></executablePath>
+          <ccTool>
+            <preprocessorList>
+              <Elem>LINUX</Elem>
+              <Elem>_GNU_SOURCE</Elem>
+              <Elem>_REENTRANT</Elem>
+            </preprocessorList>
+          </ccTool>
+        </makeTool>
+      </makefileType>
+      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/ad_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/ad_x86_64_clone.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/ad_x86_64_expand.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/ad_x86_64_format.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/ad_x86_64_gen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/ad_x86_64_misc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/ad_x86_64_peephole.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/ad_x86_64_pipeline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/adfiles/dfa_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/jvmtifiles/bytecodeInterpreterWithChecks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/jvmtifiles/jvmtiEnter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated/jvmtifiles/jvmtiEnterTrace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/linux-x86_64-normal-server-release/jdk/gensrc_x11wrappers/sizer.64.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/agent/src/os/linux/LinuxDebuggerLocal.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/agent/src/os/linux/libproc_impl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/agent/src/os/linux/ps_core.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/agent/src/os/linux/ps_proc.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/agent/src/os/linux/salibelf.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/agent/src/os/linux/symtab.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/agent/src/share/native/sadis.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/assembler_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/bytecodeInterpreter_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/bytecodes_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_FpuStackSim_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_FrameMap_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_LinearScan_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c2_init_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/debug_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/depChecker_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/frame_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/icBuffer_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/icache_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/interpreterRT_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/interpreter_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/jniFastGetField_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/metaspaceShared_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/methodHandles_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/nativeInst_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/register_definitions_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/register_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/relocInfo_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/runtime_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/vm_version_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/vmreg_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/vtableStubs_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/linux/vm/attachListener_linux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/linux/vm/chaitin_linux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/linux/vm/decoder_linux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/linux/vm/dtraceJSDT_linux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/linux/vm/jsig.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/linux/vm/jvm_linux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/linux/vm/mutex_linux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/linux/vm/osThread_linux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/linux/vm/os_linux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/linux/vm/perfMemory_linux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/linux/vm/stubRoutines_linux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/linux/vm/threadCritical_linux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/linux/vm/vmError_linux.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/posix/launcher/java_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/posix/vm/os_posix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os_cpu/linux_x86/vm/assembler_linux_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os_cpu/linux_x86/vm/thread_linux_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os_cpu/linux_x86/vm/vm_version_linux_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/tools/launcher/java.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/tools/launcher/jli_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/tools/launcher/wildcard.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/adlparse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/archDesc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/arena.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/dfa.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/dict2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/filebuff.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/forms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/formsopt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/formssel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/output_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/output_h.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/asm/assembler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/asm/codeBuffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/asm/register.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_CFGPrinter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Canonicalizer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Compilation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Compiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Defs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_FrameMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_GraphBuilder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_IR.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Instruction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_LIR.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_LIRAssembler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_LIRGenerator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_LinearScan.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Optimizer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_RangeCheckElimination.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Runtime1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_ValueMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_ValueSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_ValueStack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_ValueType.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_globals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciArrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciBaseObject.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciCallSite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciConstant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciConstantPoolCache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciEnv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciExceptionHandler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciField.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciFlags.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciInstance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciInstanceKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMemberName.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMetadata.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMethod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMethodBlocks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMethodData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMethodHandle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciNullObject.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciObjArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciObjArrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciObject.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciObjectFactory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciReplay.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciSignature.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciStreams.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciSymbol.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciType.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciTypeArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciTypeFlow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciUtilities.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/altHashing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/bytecodeAssembler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/classFileError.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/classFileParser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/classFileStream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/classLoader.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/classLoaderData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/defaultMethods.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/dictionary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/genericSignatures.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/javaAssertions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/javaClasses.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/loaderConstraints.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/metadataOnStackMark.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/placeholders.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/resolutionErrors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/stackMapFrame.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/stackMapTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/symbolTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/systemDictionary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/verificationType.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/verifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/vmSymbols.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/codeBlob.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/codeCache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/compiledIC.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/compressedStream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/debugInfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/debugInfoRec.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/dependencies.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/exceptionHandlerTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/icBuffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/location.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/nmethod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/oopRecorder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/pcDesc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/relocInfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/scopeDesc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/stubs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/vmreg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/vtableStubs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/abstractCompiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/compileBroker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/compileLog.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/compilerOracle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/disassembler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/methodLiveness.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/oopMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1Log.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1_globals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/sparsePRT.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/survRateGroup.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/allocationStats.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/hSpaceCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/spaceDecorator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_interface/collectedHeap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_interface/gcCause.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecodeHistogram.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecodeStream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecodeTracer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecodes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/cppInterpreter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/interpreter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/interpreterRuntime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/invocationCounter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/linkResolver.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/oopMapCache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/rewriter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/templateInterpreter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/templateTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/libadt/dict.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/libadt/port.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/libadt/set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/libadt/vectset.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/allocation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/barrierSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/binaryTreeDictionary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/blockOffsetTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/cardTableModRefBS.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/cardTableRS.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/collectorPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/defNewGeneration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/filemap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/freeBlockDictionary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/freeList.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/gcLocker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/genCollectedHeap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/genMarkSweep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/genRemSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/generation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/generationSpec.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/heap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/heapInspection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/memRegion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/metablock.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/metachunk.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/metaspace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/metaspaceCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/metaspaceShared.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/oopFactory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/referencePolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/referenceProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/resourceArea.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/sharedHeap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/space.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/specialized_oop_closures.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/tenuredGeneration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/universe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/annotations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/arrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/arrayOop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/compiledICHolder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/constMethod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/constantPool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/cpCache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/generateOopMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/instanceClassLoaderKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/instanceKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/instanceMirrorKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/instanceOop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/instanceRefKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/klass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/klassVtable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/markOop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/metadata.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/method.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/methodData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/objArrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/objArrayOop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/oop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/oopsHierarchy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/symbol.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/typeArrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/typeArrayOop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/addnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/block.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/buildOopMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/bytecodeInfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/c2_globals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/c2compiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/callGenerator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/callnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/cfgnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/chaitin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/classes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/coalesce.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/connode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/divnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/doCall.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/domgraph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/escape.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/gcm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/generateOptoStub.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/graphKit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/idealGraphPrinter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/idealKit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/ifg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/ifnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/indexSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/lcm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/library_call.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/live.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/locknode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/loopPredicate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/loopTransform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/loopUnswitch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/loopnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/loopopts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/machnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/matcher.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/memnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/mulnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/multnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/node.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/opcodes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/output.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/parse1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/parse2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/parse3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/parseHelper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/phase.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/phaseX.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/postaloc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/reg_split.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/regalloc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/regmask.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/rootnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/runtime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/split_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/stringopts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/subnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/superword.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/vectornode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/precompiled/precompiled.hpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/evmCompat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/forte.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jni.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jniCheck.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jniFastGetField.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiEnv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiEnvBase.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiEnvThreadState.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiEventController.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiExport.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiExtensions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiImpl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiRawMonitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiTagMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiThreadState.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiTrace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiUtil.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/methodComparator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/methodHandles.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/nativeLookup.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/perf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/privilegedStack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/unsafe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/wbtestmethods/parserTests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/whitebox.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/aprofiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/arguments.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/atomic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/basicLock.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/biasedLocking.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/compilationPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/deoptimization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/dtraceJSDT.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/fieldDescriptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/fieldType.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/fprofiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/frame.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/globals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/handles.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/icache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/init.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/interfaceSupport.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/java.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/javaCalls.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/jniHandles.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/jniPeriodicChecker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/memprofiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/monitorChunk.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/mutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/mutexLocker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/objectMonitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/orderAccess.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/os.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/osThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/park.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/perfData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/perfMemory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/reflection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/reflectionUtils.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/relocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/rframe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/safepoint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/serviceThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/sharedRuntime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/sharedRuntimeTrans.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/signature.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/stackValue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/stackValueCollection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/statSampler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/stubCodeGenerator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/stubRoutines.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/sweeper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/synchronizer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/task.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/threadLocalStorage.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/unhandledOops.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vframe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vframeArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vframe_hp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/virtualspace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vmStructs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vmThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vm_operations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vm_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>JRE_RELEASE_VERSION="version"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/services/attachListener.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/classLoadingService.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/diagnosticArgument.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/diagnosticCommand.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/diagnosticFramework.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/dtraceAttacher.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/g1MemoryPool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/gcNotifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/heapDumper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/lowMemoryDetector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/management.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memBaseline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memPtr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memRecorder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memReporter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memSnapshot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memTrackWorker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memTracker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memoryManager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memoryPool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memoryService.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/nmtDCmd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/psMemoryPool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/runtimeService.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/threadService.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/accessFlags.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/bitMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/constantTag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/debug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/decoder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/decoder_elf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/elfFile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/elfStringTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/elfSymbolTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/errorReporter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/events.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/exceptions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/globalDefinitions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/growableArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/hashtable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/histogram.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/intHisto.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/numberSeq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/ostream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/preserveException.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/quickSort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/sizes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/taskqueue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/utf8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/vmError.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/workgroup.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/xmlstream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/back/ArrayReferenceImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/back/ArrayTypeImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ArrayTypeImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/ClassLoaderReferenceImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ClassLoaderReferenceImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/ClassObjectReferenceImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ClassObjectReferenceImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/ClassTypeImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ClassTypeImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/EventRequestImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="EventRequestImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/FieldImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FieldImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/FrameID.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FrameID.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/MethodImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MethodImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/ObjectReferenceImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ObjectReferenceImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/ReferenceTypeImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ReferenceTypeImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/SDE.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SDE.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/StackFrameImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="StackFrameImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/StringReferenceImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="StringReferenceImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/ThreadGroupReferenceImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ThreadGroupReferenceImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/ThreadReferenceImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ThreadReferenceImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/VirtualMachineImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="VirtualMachineImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/bag.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="bag.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/classTrack.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="classTrack.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/commonRef.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="commonRef.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/debugDispatch.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="debugDispatch.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/debugInit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="debugInit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/debugLoop.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="debugLoop.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/error_messages.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="error_messages.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/eventFilter.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="eventFilter.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/eventHandler.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="eventHandler.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/eventHelper.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="eventHelper.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/inStream.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="inStream.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/invoker.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="invoker.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/log_messages.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="log_messages.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/outStream.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="outStream.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/standardHandlers.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="standardHandlers.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/stepControl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="stepControl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/stream.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="stream.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/threadControl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="threadControl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/transport.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="transport.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/util.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/bin/java.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/bin/jli_util.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="jli_util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/bin/main.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/linux/bin</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
+            <Elem>FULL_VERSION="version"</Elem>
+            <Elem>JAVA_ARGS={ "-J-ms8m", "com.sun.tools.javac.Main", }</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>LAUNCHER_NAME="openjdk"</Elem>
+            <Elem>NEVER_ACT_AS_SERVER_CLASS_MACHINE</Elem>
+            <Elem>PROGNAME="javac"</Elem>
+            <Elem>THIS_FILE="main.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/bin/parse_manifest.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="parse_manifest.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/bin/splashscreen_stubs.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="splashscreen_stubs.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/bin/version_comp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="version_comp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/bin/wildcard.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="wildcard.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/agent_util/agent_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/compiledMethodLoad/compiledMethodLoad.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/gctest/gctest.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/heapTracker/heapTracker.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/heapViewer/heapViewer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/debug_malloc.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_blocks.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_blocks.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_check.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_check.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_class.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_class.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_cpu.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_cpu.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_error.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_error.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_event.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_event.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_frame.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_frame.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_init.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_init.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_io.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_io.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_ioname.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_ioname.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_listener.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_listener.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_loader.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_loader.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_monitor.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_monitor.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_object.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_object.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_reference.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_reference.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_site.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_site.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_stack.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_stack.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_string.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_string.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_table.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_table.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_tag.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_tag.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_tls.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_tls.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_trace.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_trace.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_tracker.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_tracker.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/minst/minst.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/mtrace/mtrace.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/versionCheck/versionCheck.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/waiters/Agent.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/waiters/Monitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Monitor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/waiters/Thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Thread.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/waiters/waiters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="waiters.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/EncodingSupport.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/instrument/InstrumentationImplNativeMethods.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="InstrumentationImplNativeMethods.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/InvocationAdapter.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="InvocationAdapter.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/JPLISAgent.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="JPLISAgent.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/JPLISAssert.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="JPLISAssert.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/JarFacade.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="JarFacade.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/JavaExceptions.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="JavaExceptions.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/PathCharsValidator.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PathCharsValidator.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/Reentrancy.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Reentrancy.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/Utilities.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Utilities.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NO_ZLIB</Elem>
+            <Elem>UNPACK_JNI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NO_ZLIB</Elem>
+            <Elem>THIS_FILE="bytes.cpp"</Elem>
+            <Elem>UNPACK_JNI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NO_ZLIB</Elem>
+            <Elem>THIS_FILE="coding.cpp"</Elem>
+            <Elem>UNPACK_JNI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NO_ZLIB</Elem>
+            <Elem>THIS_FILE="jni.cpp"</Elem>
+            <Elem>UNPACK_JNI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="main.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NO_ZLIB</Elem>
+            <Elem>THIS_FILE="unpack.cpp"</Elem>
+            <Elem>UNPACK_JNI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NO_ZLIB</Elem>
+            <Elem>THIS_FILE="utils.cpp"</Elem>
+            <Elem>UNPACK_JNI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NO_ZLIB</Elem>
+            <Elem>THIS_FILE="zip.cpp"</Elem>
+            <Elem>UNPACK_JNI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>USE_DAUDIO=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
+            <Elem>USE_PORTS=TRUE</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/DirectAudioDeviceProvider.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DirectAudioDeviceProvider.c"</Elem>
+            <Elem>USE_DAUDIO=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
+            <Elem>USE_PORTS=TRUE</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/MidiInDevice.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MidiInDevice.c"</Elem>
+            <Elem>USE_DAUDIO=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
+            <Elem>USE_PORTS=TRUE</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/MidiInDeviceProvider.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MidiInDeviceProvider.c"</Elem>
+            <Elem>USE_DAUDIO=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
+            <Elem>USE_PORTS=TRUE</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/MidiOutDevice.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MidiOutDevice.c"</Elem>
+            <Elem>USE_DAUDIO=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
+            <Elem>USE_PORTS=TRUE</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/MidiOutDeviceProvider.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MidiOutDeviceProvider.c"</Elem>
+            <Elem>USE_DAUDIO=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
+            <Elem>USE_PORTS=TRUE</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/Platform.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Platform.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/PlatformMidi.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PlatformMidi.c"</Elem>
+            <Elem>USE_DAUDIO=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
+            <Elem>USE_PORTS=TRUE</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/PortMixer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PortMixer.c"</Elem>
+            <Elem>USE_DAUDIO=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
+            <Elem>USE_PORTS=TRUE</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/PortMixerProvider.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PortMixerProvider.c"</Elem>
+            <Elem>USE_DAUDIO=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
+            <Elem>USE_PORTS=TRUE</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/Utilities.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Utilities.c"</Elem>
+            <Elem>USE_DAUDIO=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
+            <Elem>USE_PORTS=TRUE</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/common/check_code.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/common/check_format.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="check_format.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/common/check_version.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="check_version.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/common/jdk_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="jdk_util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/common/jio.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="jio.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/common/jni_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="jni_util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/common/verify_stub.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="verify_stub.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/io/FileInputStream.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/io/ObjectInputStream.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ObjectInputStream.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/io/ObjectOutputStream.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ObjectOutputStream.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/io/ObjectStreamClass.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ObjectStreamClass.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/io/RandomAccessFile.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="RandomAccessFile.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/io/io_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="io_util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Class.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Class.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/ClassLoader.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="ClassLoader.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Compiler.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Compiler.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Double.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Double.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Float.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Float.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Object.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Object.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Package.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Package.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/ResourceBundle.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="ResourceBundle.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Runtime.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Runtime.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/SecurityManager.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="SecurityManager.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Shutdown.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Shutdown.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/StrictMath.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="StrictMath.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/String.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="String.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/System.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="System.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Thread.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Thread.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Throwable.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Throwable.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_acos.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_asin.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_asin.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_atan2.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_atan2.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_atanh.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_atanh.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_cosh.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_cosh.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_exp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_exp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_fmod.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_fmod.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_hypot.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_hypot.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_log.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_log.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_log10.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_log10.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_pow.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_pow.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_rem_pio2.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_rem_pio2.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_remainder.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_remainder.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_scalb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_scalb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_sinh.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_sinh.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_sqrt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_sqrt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_cos.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="k_cos.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_rem_pio2.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="k_rem_pio2.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_sin.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="k_sin.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_standard.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="k_standard.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_tan.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="k_tan.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_atan.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_atan.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_cbrt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_cbrt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_ceil.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_ceil.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_copysign.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_copysign.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_cos.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_cos.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_expm1.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_expm1.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_fabs.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_fabs.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_finite.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_finite.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_floor.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_floor.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_frexp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_frexp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_ilogb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_ilogb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_isnan.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_isnan.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_ldexp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_ldexp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_lib_version.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_lib_version.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_log1p.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_log1p.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_logb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_logb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_matherr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_matherr.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_modf.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_modf.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_nextafter.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_nextafter.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_rint.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_rint.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_scalbn.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_scalbn.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_signgam.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_signgam.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_significand.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_significand.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_sin.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_sin.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_tan.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_tan.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_tanh.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_tanh.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_acos.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_acos.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_asin.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_asin.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_atan2.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_atan2.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_atanh.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_atanh.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_cosh.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_cosh.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_exp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_exp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_fmod.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_fmod.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_hypot.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_hypot.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_log.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_log.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_log10.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_log10.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_pow.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_pow.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_remainder.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_remainder.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_scalb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_scalb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_sinh.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_sinh.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_sqrt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_sqrt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/ref/Finalizer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/reflect/Array.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/reflect/Executable.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Executable.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/reflect/Proxy.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Proxy.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/net/DatagramPacket.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/net/Inet4Address.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Inet4Address.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/net/Inet6Address.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Inet6Address.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/net/InetAddress.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="InetAddress.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/net/net_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="net_util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/nio/Bits.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/security/AccessController.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/util/TimeZone.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="TimeZone.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/concurrent/atomic/AtomicLong.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/Adler32.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="Adler32.c"</Elem>
+            <Elem>USE_MMAP</Elem>
+          </preprocessorList>
+          <undefinedList>
+            <Elem>DEBUG</Elem>
+          </undefinedList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/CRC32.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="CRC32.c"</Elem>
+            <Elem>USE_MMAP</Elem>
+          </preprocessorList>
+          <undefinedList>
+            <Elem>DEBUG</Elem>
+          </undefinedList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/Deflater.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="Deflater.c"</Elem>
+            <Elem>USE_MMAP</Elem>
+          </preprocessorList>
+          <undefinedList>
+            <Elem>DEBUG</Elem>
+          </undefinedList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/Inflater.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="Inflater.c"</Elem>
+            <Elem>USE_MMAP</Elem>
+          </preprocessorList>
+          <undefinedList>
+            <Elem>DEBUG</Elem>
+          </undefinedList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/ZipFile.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="ZipFile.c"</Elem>
+            <Elem>USE_MMAP</Elem>
+          </preprocessorList>
+          <undefinedList>
+            <Elem>DEBUG</Elem>
+          </undefinedList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zip_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="zip_util.c"</Elem>
+            <Elem>USE_MMAP</Elem>
+          </preprocessorList>
+          <undefinedList>
+            <Elem>DEBUG</Elem>
+          </undefinedList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/compress.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/deflate.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="deflate.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/gzclose.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="gzclose.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/gzlib.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="gzlib.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/gzread.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="gzread.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/gzwrite.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="gzwrite.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/infback.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="infback.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/inffast.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="inffast.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/inflate.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="inflate.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/inftrees.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="inftrees.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/trees.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="trees.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/uncompr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="uncompr.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/zadler32.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="zadler32.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/zcrc32.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="zcrc32.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/zutil.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="zutil.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/debug/debug_assert.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/debug/debug_mem.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="debug_mem.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/debug/debug_trace.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="debug_trace.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/debug/debug_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="debug_util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/giflib/dgif_lib.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/giflib/gif_err.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="gif_err.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/giflib/gifalloc.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="gifalloc.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="BufImgSurfaceData.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/DataBufferNative.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="DataBufferNative.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/awt_ImageRep.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="awt_ImageRep.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/awt_parseImage.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="awt_parseImage.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/cvutils/img_colors.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/cvutils/img_globals.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="img_globals.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/dither.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="dither.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/gif/gifdecoder.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/imageInitIDs.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="imageInitIDs.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcapimin.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcapistd.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jccoefct.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jccolor.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jccolor.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcdctmgr.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jchuff.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jchuff.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcinit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcinit.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcmainct.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcmarker.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcmaster.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcomapi.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcparam.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcparam.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcphuff.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcprepct.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcsample.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcsample.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jctrans.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jctrans.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdapimin.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdapistd.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdcoefct.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdcolor.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jddctmgr.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdhuff.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdinput.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdinput.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdmainct.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdmarker.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdmaster.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdmerge.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdphuff.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdpostct.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdsample.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdsample.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdtrans.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jerror.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jerror.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jfdctflt.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jfdctfst.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jfdctint.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jidctflt.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jidctfst.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jidctint.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jidctint.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jidctred.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jidctred.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jmemmgr.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jmemnobs.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="jpegdecoder.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jquant1.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jquant1.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jquant2.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jquant2.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jutils.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jutils.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/png.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngerror.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngerror.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngget.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngget.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngmem.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngmem.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngpread.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngpread.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngread.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngread.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngrio.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngrio.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngrtran.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngrtran.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngrutil.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngrutil.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngset.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngset.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngtrans.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngtrans.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngwio.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngwio.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngwrite.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngwrite.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngwtran.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngwtran.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngwutil.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngwutil.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffineEdge.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffineEdge.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_D64.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine_BC_D64.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_F32.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine_BC_F32.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_S32.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine_BC_S32.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_D64.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine_BL_D64.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_F32.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine_BL_F32.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_S32.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine_BL_S32.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine_NN.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN_Bit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine_NN_Bit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageClipping.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageClipping.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageColorTrue2Index.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageColorTrue2Index.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv2x2_f.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Bit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConvClearEdge_Bit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Fp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConvClearEdge_Fp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Bit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConvCopyEdge_Bit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvKernelConvert.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConvKernelConvert.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConvMxN.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_Fp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConvMxN_Fp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConvMxN_ext.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_16ext.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_16nw.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_32nw.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_8ext.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_8nw.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_D64nw.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_D64nw.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_F32nw.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_F32nw.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_u16ext.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_u16nw.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageCopy_Bit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageCreate.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageDivTables.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageDivTables.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageFilters.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageFilters.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageLookUp_64.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageLookUp_Bit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageScanPoly.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageScanPoly.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageUtils.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BC.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffineIndex_BC.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BL.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffineIndex_BL.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffine_BC.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_S16.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffine_BC_S16.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_U16.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffine_BC_U16.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffine_BL.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_S16.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffine_BL_S16.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_U16.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffine_BL_U16.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_NN.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffine_NN.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvClearEdge.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageConvClearEdge.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvCopyEdge.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageConvCopyEdge.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvVersion.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageConvVersion.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConv_f.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageConv_f.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageCopy.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageLookUp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageLookUp_f.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1_U8.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageThresh1_U8.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_sys.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_sys.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/splashscreen/java_awt_SplashScreen.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="splashscreen_gfx_impl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="splashscreen_gif.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="splashscreen_impl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="splashscreen_jpeg.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="splashscreen_png.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/utility/rect.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/AccelGlyphCache.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/DrawGlyphList.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>/usr/include/freetype2</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HEADLESS</Elem>
+            <Elem>LE_STANDALONE</Elem>
+            <Elem>THIS_FILE="DrawGlyphList.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/FontInstanceAdapter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FontInstanceAdapter.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/freetypeScaler.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>/usr/include/freetype2</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HEADLESS</Elem>
+            <Elem>LE_STANDALONE</Elem>
+            <Elem>THIS_FILE="freetypeScaler.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/AnchorTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="AnchorTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ArabicLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ArabicShaping.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ArabicShaping.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/CanonData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="CanonData.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/CanonShaping.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="CanonShaping.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ClassDefinitionTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ClassDefinitionTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ContextualGlyphSubstProc.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ContextualSubstSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/CoverageTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="CoverageTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="CursiveAttachmentSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/DeviceTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DeviceTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ExtensionSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ExtensionSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/Features.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Features.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GDEFMarkFilter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GDEFMarkFilter.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GXLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GXLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GlyphDefinitionTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GlyphDefinitionTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GlyphIterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GlyphIterator.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GlyphLookupTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GlyphLookupTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GlyphPositionAdjustments.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GlyphPositionAdjustments.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GlyphPositioningTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GlyphPositioningTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GlyphPosnLookupProc.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GlyphSubstLookupProc.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GlyphSubstitutionTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GlyphSubstitutionTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/HanLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="HanLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/HangulLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="HangulLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/IndicClassTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IndicClassTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/IndicLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IndicLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IndicRearrangementProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/IndicReordering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IndicReordering.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/KernTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="KernTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/KhmerLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="KhmerLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/KhmerReordering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="KhmerReordering.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/LEFontInstance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LEFontInstance.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/LEGlyphStorage.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LEGlyphStorage.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/LEInsertionList.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LEInsertionList.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/LayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/LigatureSubstProc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LigatureSubstProc.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LigatureSubstSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/LookupProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LookupProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/LookupTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LookupTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/Lookups.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Lookups.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/MPreFixups.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MPreFixups.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/MarkArrays.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MarkArrays.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MarkToBasePosnSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MarkToLigaturePosnSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MarkToMarkPosnSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/MirroredCharData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MirroredCharData.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/MorphTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MorphTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MultipleSubstSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/NonContextualGlyphSubstProc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="NonContextualGlyphSubstProc.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OpenTypeLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/OpenTypeUtilities.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OpenTypeUtilities.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/PairPositioningSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PairPositioningSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ScriptAndLanguage.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ScriptAndLanguage.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ScriptAndLanguageTags.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SegmentArrayProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SegmentArrayProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SegmentSingleProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SegmentSingleProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ShapingTypeData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ShapingTypeData.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SimpleArrayProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SimpleArrayProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SinglePositioningSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SingleSubstitutionSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SingleTableProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SingleTableProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/StateTableProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="StateTableProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SubstitutionLookups.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SubstitutionLookups.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SubtableProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SubtableProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SunLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ThaiLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ThaiLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ThaiShaping.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ThaiShaping.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ThaiStateTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ThaiStateTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/TibetanLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="TibetanLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/TibetanReordering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="TibetanReordering.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/TrimmedArrayProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="TrimmedArrayProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ValueRecords.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ValueRecords.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/sunFont.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>/usr/include/freetype2</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HEADLESS</Elem>
+            <Elem>LE_STANDALONE</Elem>
+            <Elem>THIS_FILE="sunFont.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/Disposer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="Disposer.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/SurfaceData.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="SurfaceData.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/Trace.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="Trace.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmscam02.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmscgats.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmscnvrt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmserr.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsgamma.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsgmt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmshalf.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmshalf.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsintrp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsio0.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsio1.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmslut.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsmd5.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsmtrx.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsnamed.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsopt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmspack.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmspcs.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsplugin.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsps2.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmssamp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmssm.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmssm.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmstypes.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsvirt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmswtpnt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsxform.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/AlphaMacros.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/AlphaMath.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="AlphaMath.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Any3Byte.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Any3Byte.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Any4Byte.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Any4Byte.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/AnyByte.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="AnyByte.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/AnyInt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="AnyInt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/AnyShort.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="AnyShort.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Blit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Blit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/BlitBg.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="BlitBg.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteBinary1Bit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ByteBinary1Bit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteBinary2Bit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ByteBinary2Bit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteBinary4Bit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ByteBinary4Bit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteGray.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ByteGray.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteIndexed.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ByteIndexed.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawLine.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DrawLine.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawParallelogram.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DrawParallelogram.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawPath.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DrawPath.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawPolygons.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DrawPolygons.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawRect.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DrawRect.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/FillParallelogram.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FillParallelogram.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/FillPath.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FillPath.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/FillRect.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FillRect.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/FillSpans.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FillSpans.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/FourByteAbgr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FourByteAbgr.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/FourByteAbgrPre.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FourByteAbgrPre.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GraphicsPrimitiveMgr.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Index12Gray.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Index12Gray.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Index8Gray.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Index8Gray.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/IntArgb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IntArgb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/IntArgbBm.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IntArgbBm.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/IntArgbPre.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IntArgbPre.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/IntBgr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IntBgr.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/IntRgb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IntRgb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/IntRgbx.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IntRgbx.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/MapAccelFunc.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MapAccelFunc.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/MaskBlit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MaskBlit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/MaskFill.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MaskFill.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/ProcessPath.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ProcessPath.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/ScaledBlit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ScaledBlit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/ThreeByteBgr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ThreeByteBgr.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/TransformHelper.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="TransformHelper.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Ushort4444Argb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Ushort555Rgb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Ushort555Rgb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Ushort555Rgbx.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Ushort555Rgbx.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Ushort565Rgb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Ushort565Rgb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/UshortGray.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="UshortGray.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/UshortIndexed.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="UshortIndexed.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLBufImgOps.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLBufImgOps.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLContext.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLContext.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLFuncs.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLFuncs.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLMaskBlit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLMaskBlit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLMaskFill.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLMaskFill.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLPaints.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLPaints.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLRenderQueue.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLRenderer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLRenderer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLSurfaceData.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLTextRenderer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLVertexCache.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLVertexCache.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/pipe/BufferedMaskBlit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/pipe/BufferedRenderPipe.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="BufferedRenderPipe.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/pipe/Region.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Region.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/pipe/ShapeSpanIterator.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ShapeSpanIterator.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SpanClipRenderer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/ClassLoadingImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/Flag.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Flag.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/GarbageCollectorImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GarbageCollectorImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/GcInfoBuilder.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GcInfoBuilder.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/HotSpotDiagnostic.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="HotSpotDiagnostic.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/HotspotThread.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="HotspotThread.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/MemoryImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MemoryImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/MemoryManagerImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MemoryManagerImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/MemoryPoolImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MemoryPoolImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/ThreadImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ThreadImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/VMManagementImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="VMManagementImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/management.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="management.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/misc/GC.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/misc/MessageUtils.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MessageUtils.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/misc/NativeSignalHandler.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="NativeSignalHandler.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/misc/Signal.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Signal.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/misc/VM.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="VM.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/misc/VMSupport.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="VMSupport.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/misc/Version.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Version.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/reflect/ConstantPool.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/reflect/NativeAccessors.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="NativeAccessors.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/reflect/Reflection.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Reflection.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/ECC_JNI.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_163.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ec2_163.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_193.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ec2_193.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_233.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ec2_233.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_aff.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ec2_aff.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_mont.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ec2_mont.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec_naf.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ec_naf.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecdecode.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecdecode.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecl_curve.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecl_curve.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecl_gf.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecl_gf.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecl_mult.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecl_mult.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_192.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_192.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_224.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_224.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_256.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_256.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_384.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_384.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_521.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_521.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_aff.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_aff.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_jac.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_jac.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_jm.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_jm.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_mont.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_mont.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/mp_gf2m.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="mp_gf2m.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/mpi.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="mpi.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/mplogic.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="mplogic.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/mpmontg.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="mpmontg.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/oid.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="oid.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/secitem.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="secitem.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/jgss/wrapper/NativeUtil.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="NativeUtil.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/j2secmod.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="j2secmod.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_crypt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_digest.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_dual.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_general.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_keymgmt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_mutex.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_objmgmt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_sessmgmt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_sign.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/smartcardio/pcsc.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/tracing/dtrace/JVM.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/npt/npt.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/npt/utf.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="utf.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/transport/socket/socketTransport.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/back/exec_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/back/linker_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="linker_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/bin/ergo.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>LIBARCHNAME="amd64"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/bin/ergo_i586.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>LIBARCHNAME="amd64"</Elem>
+            <Elem>THIS_FILE="ergo_i586.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/bin/java_md_common.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>LIBARCHNAME="amd64"</Elem>
+            <Elem>THIS_FILE="java_md_common.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/bin/java_md_solinux.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>LIBARCHNAME="amd64"</Elem>
+            <Elem>THIS_FILE="java_md_solinux.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/bin/jexec.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="jexec.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/demo/jvmti/hprof/hprof_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/instrument/EncodingSupport_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/instrument/FileSystemSupport_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FileSystemSupport_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/management/LinuxOperatingSystem.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="UnixOperatingSystem_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PLATFORM_API_LinuxOS_ALSA_MidiIn.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PLATFORM_API_LinuxOS_ALSA_MidiOut.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PLATFORM_API_LinuxOS_ALSA_MidiUtils.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PLATFORM_API_LinuxOS_ALSA_PCM.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PLATFORM_API_LinuxOS_ALSA_PCMUtils.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_Ports.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PLATFORM_API_LinuxOS_ALSA_Ports.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/security/auth/module/Unix.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/common/jdk_util_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/common/jni_util_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="jni_util_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/io/Console_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/java/io/FileDescriptor_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FileDescriptor_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/io/FileInputStream_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FileInputStream_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/io/FileOutputStream_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FileOutputStream_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/io/RandomAccessFile_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="RandomAccessFile_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/io/UnixFileSystem_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="UnixFileSystem_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/io/canonicalize_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="canonicalize_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/io/io_util_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="io_util_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/java/lang/UNIXProcess_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="UNIXProcess_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/lang/java_props_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="java_props_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/Inet4AddressImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/Inet6AddressImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Inet6AddressImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/InetAddressImplFactory.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="InetAddressImplFactory.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/NetworkInterface.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="NetworkInterface.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PlainDatagramSocketImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/PlainSocketImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PlainSocketImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/SocketInputStream.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SocketInputStream.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/SocketOutputStream.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SocketOutputStream.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/linux_close.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="linux_close.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/net_util_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="net_util_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/nio/MappedByteBuffer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/java/util/FileSystemPreferences.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/java/util/TimeZone_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="TimeZone_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/util/logging.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="logging.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/CUPSfuncs.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="CUPSfuncs.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/HeadlessToolkit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HEADLESS=true</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="HeadlessToolkit.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/VDrawingArea.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HEADLESS=true</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="VDrawingArea.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/X11Color.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="X11Color.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_AWTEvent.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_AWTEvent.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_DrawingSurface.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_Event.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_Event.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_Font.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_Font.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_GraphicsEnv.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_InputMethod.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_InputMethod.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_Insets.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_Insets.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="awt_LoadLibrary.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_Mlib.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="awt_Mlib.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_Plugin.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_Plugin.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_Robot.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_Robot.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_UNIXToolkit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_UNIXToolkit.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_util.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/fontpath.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="fontpath.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/gtk2_interface.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="gtk2_interface.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/initIDs.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="initIDs.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/jawt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="jawt.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/list.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="list.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/multiVis.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="multiVis.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/multi_font.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="multi_font.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/robot_common.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="robot_common.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="sun_awt_X11_GtkFileDialogPeer.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/swing_GTKEngine.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="swing_GTKEngine.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/swing_GTKStyle.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="swing_GTKStyle.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/font/X11FontScaler.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/font/X11TextRenderer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="X11TextRenderer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GLXSurfaceData.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11FontScaler_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="X11PMBlitLoops.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11Renderer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="X11Renderer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="X11SurfaceData.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="X11TextRenderer_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="XRBackendNative.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="XRSurfaceData.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/management/FileSystemImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/net/sdp/SdpSupport.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="DatagramChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="DatagramDispatcher.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/EPoll.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="EPoll.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/EPollArrayWrapper.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="EPollArrayWrapper.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/EPollPort.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="EPollPort.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="FileChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="FileDispatcherImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/FileKey.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="FileKey.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/IOUtil.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="IOUtil.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/InheritedChannel.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="InheritedChannel.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/NativeThread.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="NativeThread.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/Net.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="Net.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/PollArrayWrapper.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="PollArrayWrapper.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="ServerSocketChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/SocketChannelImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="SocketChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/SocketDispatcher.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="SocketDispatcher.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="UnixAsynchronousSocketChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SctpNet.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/sctp/SctpServerChannelImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SctpServerChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="LinuxNativeDispatcher.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="LinuxWatchService.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="MagicFileTypeDetector.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/fs/UnixCopyFile.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="UnixCopyFile.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="UnixNativeDispatcher.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="genUnixConstants.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="j2secmod_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/tools/attach/LinuxVirtualMachine.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/tracing/dtrace/jvm_symbols_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/util/locale/provider/HostLocaleProviderAdapter_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/xawt/XToolkit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/xawt/XWindow.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="XWindow.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/xawt/XlibWrapper.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="XlibWrapper.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/xawt/awt_Desktop.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="awt_Desktop.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/xawt/gnome_interface.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="gnome_interface.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/npt/utf_md.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/transport/socket/socket_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <folder path="$SRC/build">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+          </incDir>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>AMD64</Elem>
+            <Elem>COMPILER1</Elem>
+            <Elem>COMPILER2</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
+            <Elem>TARGET_ARCH_x86</Elem>
+            <Elem>TARGET_COMPILER_gcc</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_linux_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_linux_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_linux</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+          <undefinedList>
+            <Elem>__EXCEPTIONS</Elem>
+            <Elem>__GXX_RTTI</Elem>
+          </undefinedList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot">
+        <cTool>
+          <preprocessorList>
+            <Elem>_GNU_SOURCE</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <preprocessorList>
+            <Elem>AMD64</Elem>
+            <Elem>COMPILER1</Elem>
+            <Elem>COMPILER2</Elem>
+            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
+            <Elem>TARGET_ARCH_x86</Elem>
+            <Elem>TARGET_COMPILER_gcc</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_linux_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_linux_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_linux</Elem>
+          </preprocessorList>
+          <undefinedList>
+            <Elem>__EXCEPTIONS</Elem>
+            <Elem>__GXX_RTTI</Elem>
+          </undefinedList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/agent">
+        <cTool>
+          <incDir>
+            <pElem>../../hotspot/agent/src/os/linux</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+            <pElem>${IDE_ALT_BOOTDIR}/include</pElem>
+            <pElem>${IDE_ALT_BOOTDIR}/include/linux</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>_FILE_OFFSET_BITS=64</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/cpu">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/os">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/os/linux">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>_REENTRANT</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/os/posix">
+        <cTool>
+          <incDir>
+            <pElem>../../hotspot/src/os/posix/launcher</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/tools/launcher</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>AMD64</Elem>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>FULL_VERSION="version"</Elem>
+            <Elem>GAMMA</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>LAUNCHER_TYPE="gamma"</Elem>
+            <Elem>LINK_INTO_LIBJVM</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
+            <Elem>TARGET_ARCH_x86</Elem>
+            <Elem>TARGET_COMPILER_gcc</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_linux_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_linux_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_linux</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/os_cpu">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share">
+        <cTool>
+          <incDir>
+            <pElem>../../hotspot/src/os/posix/launcher</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/tools/launcher</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>AMD64</Elem>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>FULL_VERSION="version"</Elem>
+            <Elem>GAMMA</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>LAUNCHER_TYPE="gamma"</Elem>
+            <Elem>LINK_INTO_LIBJVM</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
+            <Elem>TARGET_ARCH_x86</Elem>
+            <Elem>TARGET_COMPILER_gcc</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_linux_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_linux_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_linux</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/adlc">
+        <ccTool>
+          <incDir>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/adlc</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ASSERT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/asm">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/c1">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/ci">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/classfile">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/code">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/compiler">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/gc_implementation">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/gc_interface">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/interpreter">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/libadt">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/memory">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/oops">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/opto">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/precompiled">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/prims">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/runtime">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/services">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/utilities">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ArrayReferenceImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="Agent.cpp"</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/back">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/transport/export</pElem>
+            <pElem>../../jdk/src/share/back/export</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/src/share/back</pElem>
+            <pElem>../../jdk/src/solaris/back</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>JDWP_LOGGING</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/bin">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LIBARCHNAME="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="java.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="agent_util.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/agent_util">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/compiledMethodLoad">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/gctest">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="gctest.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/heapTracker">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="heapTracker.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/heapViewer">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="heapViewer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/hprof">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="debug_malloc.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/java_crw_demo">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
+            <pElem>../../jdk/src/solaris/demo/jvmti/hprof</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="java_crw_demo.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/minst">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="minst.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/mtrace">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="mtrace.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/versionCheck">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="versionCheck.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/instrument">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/instrument</pElem>
+            <pElem>../../jdk/src/solaris/instrument</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_JPLIS_LOGGING</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="EncodingSupport.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DirectAudioDevice.c"</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="bands.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/com">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
+            <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>X_ARCH=X_AMD64</Elem>
+            <Elem>X_PLATFORM=X_LINUX</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <preprocessorList>
+            <Elem>FULL</Elem>
+            <Elem>PRODUCT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/common">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="check_code.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java">
+        <cTool>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="FileInputStream.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/io">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/lang">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_acos.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/lang/fdlibm">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/lang/ref">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Finalizer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/lang/reflect">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Array.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/net">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="DatagramPacket.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/nio">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Bits.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/security">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="AccessController.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/util">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="AtomicLong.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/util/concurrent">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/util/zip">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="compress.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/util/zip/zlib-1.2.5">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="debug_assert.c"</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="AlternateSubstSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt">
+        <cTool>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/debug">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/giflib">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="dgif_lib.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/image">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="img_colors.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/image/cvutils">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/image/gif">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="gifdecoder.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/image/jpeg">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="imageioJPEG.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/libpng">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="png.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/medialib">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="awt_ImagingLib.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/splashscreen">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="java_awt_SplashScreen.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/utility">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="rect.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/font">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="AccelGlyphCache.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>/usr/include/freetype2</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HEADLESS</Elem>
+            <Elem>LE_STANDALONE</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/java2d">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="LCMS.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/java2d/cmm">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/java2d/loops">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="AlphaMacros.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/java2d/opengl">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="OGLBlitLoops.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/java2d/pipe">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>THIS_FILE="BufferedMaskBlit.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/management">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/management</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="ClassLoadingImpl.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/misc">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="GC.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/nio">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/reflect">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="ConstantPool.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/security">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="ec.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
+            <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/security/ec">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
+            <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MP_API_COMPATIBLE</Elem>
+            <Elem>NSS_ECC_MORE_THAN_SUITE_B</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/security/jgss">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="GSSLibStub.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/security/pkcs11">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/pkcs11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
+            <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_convert.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/security/smartcardio">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="pcsc.c"</Elem>
+            <Elem>__sun_jdk</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/tracing">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="JVM.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/npt">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="npt.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/transport">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/transport/socket</pElem>
+            <pElem>../../jdk/src/solaris/transport/socket</pElem>
+            <pElem>../../jdk/src/share/back/export</pElem>
+            <pElem>../../jdk/src/share/back</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="socketTransport.c"</Elem>
+            <Elem>USE_MMAP</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris">
+        <cTool>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>THIS_FILE="exec_md.c"</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LARGEFILE64_SOURCE</Elem>
+            <Elem>_LITTLE_ENDIAN</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+            <Elem>amd64</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/back">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/transport/export</pElem>
+            <pElem>../../jdk/src/share/back/export</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/src/share/back</pElem>
+            <pElem>../../jdk/src/solaris/back</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>JDWP_LOGGING</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/bin">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="ergo.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/demo">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/instrument">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/instrument</pElem>
+            <pElem>../../jdk/src/solaris/instrument</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NO_JPLIS_LOGGING</Elem>
+            <Elem>THIS_FILE="EncodingSupport_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LinuxOperatingSystem.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/com">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/com/sun/management">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/management</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/com/sun/media">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
+            <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
+            <Elem>THIS_FILE="PLATFORM_API_LinuxOS_ALSA_CommonUtils.c"</Elem>
+            <Elem>USE_DAUDIO=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_IN=TRUE</Elem>
+            <Elem>USE_PLATFORM_MIDI_OUT=TRUE</Elem>
+            <Elem>USE_PORTS=TRUE</Elem>
+            <Elem>X_ARCH=X_AMD64</Elem>
+            <Elem>X_PLATFORM=X_LINUX</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="Unix.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/common">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="jdk_util_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="Console_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java/io">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java/lang">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="ProcessEnvironment_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java/net">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java/nio">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java/util">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="FileSystemPreferences.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="splashscreen_sys.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/awt/splashscreen">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/include</pElem>
+            <pElem>/usr/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/font">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>/usr/include/freetype2</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HEADLESS</Elem>
+            <Elem>LE_STANDALONE</Elem>
+            <Elem>THIS_FILE="X11FontScaler.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/java2d">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="GLXGraphicsConfig.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/java2d/x11">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="X11FontScaler_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/management">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/management</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="FileSystemImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/net">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="ResolverConfigurationImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/net/sdp">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SdpSupport.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/net/spi">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DefaultProxySelector.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/nio">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SctpChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/nio/ch">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/nio/ch/sctp">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/nio/ch/sctp</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/nio/fs">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GnomeFileTypeDetector.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/security">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="NativeFunc.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/security/jgss">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/security/pkcs11">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/pkcs11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
+            <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/security/smartcardio">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="pcsc_md.c"</Elem>
+            <Elem>__sun_jdk</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/tools">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="LinuxVirtualMachine.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/tracing">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="jvm_symbols_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/util">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="HostLocaleProviderAdapter_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/xawt">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="XToolkit.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/npt">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="utf_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/transport">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/include/linux</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/transport/socket</pElem>
+            <pElem>../../jdk/src/solaris/transport/socket</pElem>
+            <pElem>../../jdk/src/share/back/export</pElem>
+            <pElem>../../jdk/src/share/back</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="socket_md.c"</Elem>
+            <Elem>USE_MMAP</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+    </conf>
+    <conf name="Solaris_64" type="0">
+      <toolsSet>
+        <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode>
+        <compilerSet>default</compilerSet>
+      </toolsSet>
+      <codeAssistance>
+        <envVariables>
+          <Elem>IDE_ALT_BOOTDIR</Elem>
+        </envVariables>
+        <transientMacros>
+          <Elem>FULL_VERSION="version"</Elem>
+          <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+          <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+          <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+          <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+          <Elem>JDK_MAJOR_VERSION="version"</Elem>
+          <Elem>JDK_MICRO_VERSION="version"</Elem>
+          <Elem>JDK_MINOR_VERSION="minor"</Elem>
+          <Elem>JRE_RELEASE_VERSION="version"</Elem>
+        </transientMacros>
+      </codeAssistance>
+      <makefileType>
+        <makeTool>
+          <buildCommandWorkingDir>../..</buildCommandWorkingDir>
+          <buildCommand>gmake -f Makefile images</buildCommand>
+          <cleanCommand>gmake -f Makefile clean</cleanCommand>
+          <executablePath></executablePath>
+        </makeTool>
+      </makefileType>
+      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/ad_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/ad_x86_64_clone.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/ad_x86_64_expand.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/ad_x86_64_format.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/ad_x86_64_gen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/ad_x86_64_misc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/ad_x86_64_peephole.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/ad_x86_64_pipeline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/adfiles/dfa_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/jvmtifiles/bytecodeInterpreterWithChecks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/jvmtifiles/jvmtiEnter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated/jvmtifiles/jvmtiEnterTrace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product/JvmOffsets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../build/solaris-x86_64-normal-server-release/jdk/gensrc_x11wrappers/sizer.64.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/agent/src/os/solaris/proc/saproc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/agent/src/share/native/sadis.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/assembler_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/bytecodeInterpreter_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/bytecodes_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_FpuStackSim_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_FrameMap_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_LinearScan_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/c2_init_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/debug_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/depChecker_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/frame_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/icBuffer_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/icache_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/interpreterRT_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/interpreter_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/jniFastGetField_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/metaspaceShared_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/methodHandles_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/nativeInst_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/register_definitions_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/register_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/relocInfo_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/runtime_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/vm_version_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/vmreg_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/cpu/x86/vm/vtableStubs_x86_64.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/posix/launcher/java_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/posix/vm/os_posix.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/solaris/add_gnu_debuglink/add_gnu_debuglink.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/solaris/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>AMD64</Elem>
+            <Elem>COMPILER1</Elem>
+            <Elem>COMPILER2</Elem>
+            <Elem>DONT_USE_PRECOMPILED_HEADER</Elem>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>SPARC_WORKS</Elem>
+            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
+            <Elem>TARGET_ARCH_x86</Elem>
+            <Elem>TARGET_COMPILER_sparcWorks</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_solaris</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_Crun_inline_placement</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/os/solaris/dtrace/generateJvmOffsetsMain.c"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/os/solaris/dtrace/jvm_dtrace.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/solaris/dtrace/libjvm_db.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+          </incDir>
+        </cTool>
+      </item>
+      <item path="../../hotspot/src/os/solaris/fix_empty_sec_hdr_flags/fix_empty_sec_hdr_flags.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/solaris/vm/attachListener_solaris.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/solaris/vm/chaitin_solaris.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/solaris/vm/decoder_solaris.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/solaris/vm/dtraceJSDT_solaris.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/solaris/vm/jsig.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/solaris/vm/jvm_solaris.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/solaris/vm/mutex_solaris.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/solaris/vm/osThread_solaris.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/solaris/vm/os_solaris.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/solaris/vm/perfMemory_solaris.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/solaris/vm/stubRoutines_solaris.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/solaris/vm/threadCritical_solaris.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os/solaris/vm/vmError_solaris.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os_cpu/solaris_x86/vm/assembler_solaris_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os_cpu/solaris_x86/vm/thread_solaris_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/os_cpu/solaris_x86/vm/vm_version_solaris_x86.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/tools/launcher/java.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/tools/launcher/jli_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/tools/launcher/wildcard.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/adlparse.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/archDesc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/arena.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/dfa.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/dict2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/filebuff.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/forms.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/formsopt.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/formssel.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/output_c.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/adlc/output_h.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/asm/assembler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/asm/codeBuffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/asm/register.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_CFGPrinter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Canonicalizer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Compilation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Compiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Defs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_FrameMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_GraphBuilder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_IR.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Instruction.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_LIR.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_LIRAssembler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_LIRGenerator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_LinearScan.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Optimizer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_RangeCheckElimination.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_Runtime1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_ValueMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_ValueSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_ValueStack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_ValueType.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/c1/c1_globals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciArrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciBaseObject.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciCallSite.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciConstant.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciConstantPoolCache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciEnv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciExceptionHandler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciField.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciFlags.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciInstance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciInstanceKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMemberName.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMetadata.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMethod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMethodBlocks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMethodData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciMethodHandle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciNullObject.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciObjArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciObjArrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciObject.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciObjectFactory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciReplay.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciSignature.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciStreams.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciSymbol.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciType.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciTypeArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciTypeFlow.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/ci/ciUtilities.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/altHashing.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/bytecodeAssembler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/classFileError.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/classFileParser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/classFileStream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/classLoader.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/classLoaderData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/defaultMethods.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/dictionary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/genericSignatures.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/javaAssertions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/javaClasses.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/loaderConstraints.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/metadataOnStackMark.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/placeholders.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/resolutionErrors.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/stackMapFrame.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/stackMapTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/symbolTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/systemDictionary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/verificationType.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/verifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/classfile/vmSymbols.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/codeBlob.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/codeCache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/compiledIC.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/compressedStream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/debugInfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/debugInfoRec.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/dependencies.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/exceptionHandlerTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/icBuffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/location.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/nmethod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/oopRecorder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/pcDesc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/relocInfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/scopeDesc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/stubs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/vmreg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/code/vtableStubs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/abstractCompiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/compileBroker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/compileLog.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/compilerOracle.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/disassembler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/methodLiveness.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/compiler/oopMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1Log.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/g1_globals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/heapRegionSets.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/sparsePRT.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/survRateGroup.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/allocationStats.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/hSpaceCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/spaceDecorator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_interface/collectedHeap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/gc_interface/gcCause.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecodeHistogram.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecodeStream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecodeTracer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/bytecodes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/cppInterpreter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/interpreter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/interpreterRuntime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/invocationCounter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/linkResolver.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/oopMapCache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/rewriter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/templateInterpreter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/interpreter/templateTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/libadt/dict.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/libadt/port.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/libadt/set.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/libadt/vectset.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/allocation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/barrierSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/binaryTreeDictionary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/blockOffsetTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/cardTableModRefBS.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/cardTableRS.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/collectorPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/defNewGeneration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/filemap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/freeBlockDictionary.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/freeList.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/gcLocker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/genCollectedHeap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/genMarkSweep.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/genRemSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/generation.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/generationSpec.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/heap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/heapInspection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/iterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/memRegion.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/metablock.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/metachunk.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/metaspace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/metaspaceCounters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/metaspaceShared.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/oopFactory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/referencePolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/referenceProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/resourceArea.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/sharedHeap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/space.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/specialized_oop_closures.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/tenuredGeneration.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/memory/universe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/annotations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/arrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/arrayOop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/compiledICHolder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/constMethod.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/constantPool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/cpCache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/generateOopMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/instanceClassLoaderKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/instanceKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/instanceMirrorKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/instanceOop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/instanceRefKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/klass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/klassVtable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/markOop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/metadata.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/method.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/methodData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/objArrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/objArrayOop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/oop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/oopsHierarchy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/symbol.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/typeArrayKlass.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/oops/typeArrayOop.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/addnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/block.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/buildOopMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/bytecodeInfo.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/c2_globals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/c2compiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/callGenerator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/callnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/cfgnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/chaitin.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/classes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/coalesce.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/compile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/connode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/divnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/doCall.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/domgraph.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/escape.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/gcm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/generateOptoStub.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/graphKit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/idealGraphPrinter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/idealKit.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/ifg.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/ifnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/indexSet.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/lcm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/library_call.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/live.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/locknode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/loopPredicate.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/loopTransform.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/loopUnswitch.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/loopnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/loopopts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/machnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/macro.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/matcher.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/memnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/mulnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/multnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/node.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/opcodes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../hotspot/src/share/vm/adlc</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ASSERT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/output.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/parse1.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/parse2.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/parse3.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/parseHelper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/phase.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/phaseX.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/postaloc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/reg_split.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/regalloc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/regmask.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/rootnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/runtime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/split_if.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/stringopts.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/subnode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/superword.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/type.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/opto/vectornode.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/evmCompat.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/forte.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jni.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jniCheck.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jniFastGetField.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvm.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiEnv.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiEnvBase.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiEnvThreadState.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiEventController.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiExport.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiExtensions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiImpl.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiRawMonitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiTagMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiThreadState.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiTrace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/jvmtiUtil.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/methodComparator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/methodHandles.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/nativeLookup.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/perf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/privilegedStack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/unsafe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/wbtestmethods/parserTests.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/prims/whitebox.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/aprofiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/arguments.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/atomic.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/basicLock.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/biasedLocking.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/compilationPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/deoptimization.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/dtraceJSDT.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/fieldDescriptor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/fieldType.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/fprofiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/frame.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/globals.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/handles.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/icache.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/init.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/interfaceSupport.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/java.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/javaCalls.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/jniHandles.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/jniPeriodicChecker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/memprofiler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/monitorChunk.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/mutex.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/mutexLocker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/objectMonitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/orderAccess.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/os.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/osThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/park.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/perfData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/perfMemory.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/reflection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/reflectionUtils.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/relocator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/rframe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/safepoint.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/serviceThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/sharedRuntime.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/sharedRuntimeTrans.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/sharedRuntimeTrig.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/signature.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/stackValue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/stackValueCollection.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/statSampler.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/stubCodeGenerator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/stubRoutines.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/sweeper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/synchronizer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/task.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/threadLocalStorage.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/timer.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/unhandledOops.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vframe.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vframeArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vframe_hp.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/virtualspace.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vmStructs.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vmThread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vm_operations.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/runtime/vm_version.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>JRE_RELEASE_VERSION="version"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../hotspot/src/share/vm/services/attachListener.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/classLoadingService.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/diagnosticArgument.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/diagnosticCommand.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/diagnosticFramework.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/dtraceAttacher.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/g1MemoryPool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/gcNotifier.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/heapDumper.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/lowMemoryDetector.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/management.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memBaseline.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memPtr.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memRecorder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memReporter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memSnapshot.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memTrackWorker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memTracker.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memoryManager.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memoryPool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/memoryService.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/nmtDCmd.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/psMemoryPool.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/runtimeService.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/services/threadService.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/accessFlags.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/array.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/bitMap.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/constantTag.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/copy.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/debug.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/decoder.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/decoder_elf.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/elfFile.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/elfStringTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/elfSymbolTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/errorReporter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/events.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/exceptions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/globalDefinitions.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/growableArray.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/hashtable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/histogram.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/intHisto.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/numberSeq.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/ostream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/preserveException.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/quickSort.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/sizes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/taskqueue.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/utf8.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/vmError.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/workgroup.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/xmlstream.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../hotspot/src/share/vm/utilities/yieldingWorkgroup.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/make/tools/add_gnu_debuglink/add_gnu_debuglink.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/make/tools/fix_empty_sec_hdr_flags/fix_empty_sec_hdr_flags.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/back/ArrayReferenceImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/back/ArrayTypeImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ArrayTypeImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/ClassLoaderReferenceImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ClassLoaderReferenceImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/ClassObjectReferenceImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ClassObjectReferenceImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/ClassTypeImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ClassTypeImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/EventRequestImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="EventRequestImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/FieldImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FieldImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/FrameID.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FrameID.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/MethodImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MethodImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/ObjectReferenceImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ObjectReferenceImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/ReferenceTypeImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ReferenceTypeImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/SDE.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SDE.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/StackFrameImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="StackFrameImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/StringReferenceImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="StringReferenceImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/ThreadGroupReferenceImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ThreadGroupReferenceImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/ThreadReferenceImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ThreadReferenceImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/VirtualMachineImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="VirtualMachineImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/bag.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="bag.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/classTrack.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="classTrack.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/commonRef.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="commonRef.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/debugDispatch.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="debugDispatch.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/debugInit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="debugInit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/debugLoop.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="debugLoop.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/error_messages.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="error_messages.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/eventFilter.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="eventFilter.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/eventHandler.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="eventHandler.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/eventHelper.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="eventHelper.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/inStream.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="inStream.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/invoker.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="invoker.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/log_messages.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="log_messages.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/outStream.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="outStream.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/standardHandlers.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="standardHandlers.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/stepControl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="stepControl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/stream.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="stream.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/threadControl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="threadControl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/transport.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="transport.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/back/util.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/bin/java.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>LIBARCH32NAME="i386"</Elem>
+            <Elem>LIBARCH64NAME="amd64"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/bin/jli_util.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>LIBARCH32NAME="i386"</Elem>
+            <Elem>LIBARCH64NAME="amd64"</Elem>
+            <Elem>THIS_FILE="jli_util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/bin/main.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
+            <Elem>FULL_VERSION="version"</Elem>
+            <Elem>HAVE_GETHRTIME</Elem>
+            <Elem>JAVA_ARGS={ "-J-ms8m", "com.sun.tools.javac.Main", }</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>LAUNCHER_NAME="openjdk"</Elem>
+            <Elem>NEVER_ACT_AS_SERVER_CLASS_MACHINE</Elem>
+            <Elem>PROGNAME="javac"</Elem>
+            <Elem>THIS_FILE="main.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/bin/parse_manifest.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>LIBARCH32NAME="i386"</Elem>
+            <Elem>LIBARCH64NAME="amd64"</Elem>
+            <Elem>THIS_FILE="parse_manifest.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/bin/splashscreen_stubs.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>LIBARCH32NAME="i386"</Elem>
+            <Elem>LIBARCH64NAME="amd64"</Elem>
+            <Elem>THIS_FILE="splashscreen_stubs.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/bin/version_comp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>LIBARCH32NAME="i386"</Elem>
+            <Elem>LIBARCH64NAME="amd64"</Elem>
+            <Elem>THIS_FILE="version_comp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/bin/wildcard.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>LIBARCH32NAME="i386"</Elem>
+            <Elem>LIBARCH64NAME="amd64"</Elem>
+            <Elem>THIS_FILE="wildcard.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/agent_util/agent_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/compiledMethodLoad/compiledMethodLoad.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/gctest/gctest.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/heapTracker/heapTracker.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/heapViewer/heapViewer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/debug_malloc.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_blocks.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_blocks.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_check.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_check.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_class.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_class.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_cpu.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_cpu.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_error.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_error.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_event.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_event.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_frame.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_frame.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_init.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_init.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_io.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_io.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_ioname.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_ioname.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_listener.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_listener.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_loader.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_loader.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_monitor.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_monitor.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_object.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_object.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_reference.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_reference.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_site.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_site.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_stack.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_stack.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_string.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_string.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_table.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_table.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_tag.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_tag.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_tls.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_tls.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_trace.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_trace.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_tracker.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_tracker.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/hprof/hprof_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/minst/minst.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/mtrace/mtrace.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/versionCheck/versionCheck.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/waiters/Agent.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/waiters/Monitor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Monitor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/waiters/Thread.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Thread.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/demo/jvmti/waiters/waiters.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="waiters.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/EncodingSupport.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/instrument/InstrumentationImplNativeMethods.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="InstrumentationImplNativeMethods.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/InvocationAdapter.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="InvocationAdapter.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/JPLISAgent.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="JPLISAgent.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/JPLISAssert.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="JPLISAssert.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/JarFacade.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="JarFacade.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/JavaExceptions.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="JavaExceptions.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/PathCharsValidator.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PathCharsValidator.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/Reentrancy.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Reentrancy.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/instrument/Utilities.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Utilities.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NO_ZLIB</Elem>
+            <Elem>UNPACK_JNI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NO_ZLIB</Elem>
+            <Elem>THIS_FILE="bytes.cpp"</Elem>
+            <Elem>UNPACK_JNI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NO_ZLIB</Elem>
+            <Elem>THIS_FILE="coding.cpp"</Elem>
+            <Elem>UNPACK_JNI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NO_ZLIB</Elem>
+            <Elem>THIS_FILE="jni.cpp"</Elem>
+            <Elem>UNPACK_JNI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="main.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NO_ZLIB</Elem>
+            <Elem>THIS_FILE="unpack.cpp"</Elem>
+            <Elem>UNPACK_JNI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NO_ZLIB</Elem>
+            <Elem>THIS_FILE="utils.cpp"</Elem>
+            <Elem>UNPACK_JNI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>NO_ZLIB</Elem>
+            <Elem>THIS_FILE="zip.cpp"</Elem>
+            <Elem>UNPACK_JNI</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/DirectAudioDeviceProvider.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DirectAudioDeviceProvider.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/MidiInDevice.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MidiInDevice.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/MidiInDeviceProvider.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MidiInDeviceProvider.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/MidiOutDevice.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MidiOutDevice.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/MidiOutDeviceProvider.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MidiOutDeviceProvider.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/Platform.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Platform.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/PlatformMidi.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PlatformMidi.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/PortMixer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PortMixer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/PortMixerProvider.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PortMixerProvider.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/com/sun/media/sound/Utilities.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Utilities.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/common/check_code.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/common/check_format.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="check_format.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/common/check_version.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="check_version.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/common/jdk_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="jdk_util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/common/jio.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="jio.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/common/jni_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="jni_util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/common/verify_stub.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="verify_stub.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/io/FileInputStream.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/io/ObjectInputStream.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ObjectInputStream.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/io/ObjectOutputStream.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ObjectOutputStream.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/io/ObjectStreamClass.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ObjectStreamClass.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/io/RandomAccessFile.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="RandomAccessFile.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/io/io_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="io_util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Class.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Class.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/ClassLoader.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="ClassLoader.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Compiler.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Compiler.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Double.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Double.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Float.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Float.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Object.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Object.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Package.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Package.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/ResourceBundle.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="ResourceBundle.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Runtime.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Runtime.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/SecurityManager.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="SecurityManager.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Shutdown.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Shutdown.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/StrictMath.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="StrictMath.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/String.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="String.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/System.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="System.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Thread.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Thread.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/Throwable.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Throwable.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_acos.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_asin.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_asin.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_atan2.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_atan2.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_atanh.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_atanh.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_cosh.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_cosh.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_exp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_exp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_fmod.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_fmod.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_hypot.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_hypot.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_log.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_log.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_log10.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_log10.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_pow.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_pow.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_rem_pio2.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_rem_pio2.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_remainder.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_remainder.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_scalb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_scalb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_sinh.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_sinh.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_sqrt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_sqrt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_cos.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="k_cos.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_rem_pio2.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="k_rem_pio2.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_sin.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="k_sin.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_standard.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="k_standard.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/k_tan.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="k_tan.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_atan.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_atan.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_cbrt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_cbrt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_ceil.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_ceil.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_copysign.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_copysign.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_cos.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_cos.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_expm1.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_expm1.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_fabs.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_fabs.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_finite.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_finite.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_floor.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_floor.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_frexp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_frexp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_ilogb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_ilogb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_isnan.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_isnan.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_ldexp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_ldexp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_lib_version.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_lib_version.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_log1p.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_log1p.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_logb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_logb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_matherr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_matherr.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_modf.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_modf.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_nextafter.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_nextafter.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_rint.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_rint.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_scalbn.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_scalbn.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_signgam.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_signgam.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_significand.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_significand.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_sin.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_sin.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_tan.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_tan.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/s_tanh.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="s_tanh.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_acos.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_acos.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_asin.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_asin.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_atan2.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_atan2.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_atanh.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_atanh.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_cosh.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_cosh.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_exp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_exp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_fmod.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_fmod.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_hypot.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_hypot.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_log.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_log.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_log10.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_log10.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_pow.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_pow.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_remainder.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_remainder.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_scalb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_scalb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_sinh.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_sinh.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/fdlibm/src/w_sqrt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="w_sqrt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/ref/Finalizer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/reflect/Array.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/reflect/Executable.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Executable.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/lang/reflect/Proxy.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Proxy.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/net/DatagramPacket.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/net/Inet4Address.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Inet4Address.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/net/Inet6Address.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Inet6Address.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/net/InetAddress.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="InetAddress.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/net/net_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="net_util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/nio/Bits.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/security/AccessController.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/util/TimeZone.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="TimeZone.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/concurrent/atomic/AtomicLong.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/Adler32.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="Adler32.c"</Elem>
+            <Elem>USE_MMAP</Elem>
+          </preprocessorList>
+          <undefinedList>
+            <Elem>DEBUG</Elem>
+          </undefinedList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/CRC32.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="CRC32.c"</Elem>
+            <Elem>USE_MMAP</Elem>
+          </preprocessorList>
+          <undefinedList>
+            <Elem>DEBUG</Elem>
+          </undefinedList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/Deflater.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="Deflater.c"</Elem>
+            <Elem>USE_MMAP</Elem>
+          </preprocessorList>
+          <undefinedList>
+            <Elem>DEBUG</Elem>
+          </undefinedList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/Inflater.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="Inflater.c"</Elem>
+            <Elem>USE_MMAP</Elem>
+          </preprocessorList>
+          <undefinedList>
+            <Elem>DEBUG</Elem>
+          </undefinedList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/ZipFile.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="ZipFile.c"</Elem>
+            <Elem>USE_MMAP</Elem>
+          </preprocessorList>
+          <undefinedList>
+            <Elem>DEBUG</Elem>
+          </undefinedList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zip_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="zip_util.c"</Elem>
+            <Elem>USE_MMAP</Elem>
+          </preprocessorList>
+          <undefinedList>
+            <Elem>DEBUG</Elem>
+          </undefinedList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/compress.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/deflate.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="deflate.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/gzclose.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="gzclose.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/gzlib.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="gzlib.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/gzread.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="gzread.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/gzwrite.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="gzwrite.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/infback.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="infback.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/inffast.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="inffast.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/inflate.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="inflate.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/inftrees.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="inftrees.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/trees.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="trees.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/uncompr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="uncompr.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/zadler32.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="zadler32.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/zcrc32.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="zcrc32.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/java/util/zip/zlib-1.2.5/zutil.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="zutil.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/debug/debug_assert.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/debug/debug_mem.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="debug_mem.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/debug/debug_trace.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="debug_trace.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/debug/debug_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="debug_util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/giflib/dgif_lib.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/giflib/gif_err.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="gif_err.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/giflib/gifalloc.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="gifalloc.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>THIS_FILE="BufImgSurfaceData.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/DataBufferNative.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>THIS_FILE="DataBufferNative.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/awt_ImageRep.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>THIS_FILE="awt_ImageRep.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/awt_parseImage.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>THIS_FILE="awt_parseImage.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/cvutils/img_colors.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/cvutils/img_globals.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="img_globals.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/dither.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>THIS_FILE="dither.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/gif/gifdecoder.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/imageInitIDs.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>THIS_FILE="imageInitIDs.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcapimin.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcapistd.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcapistd.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jccoefct.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jccoefct.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jccolor.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jccolor.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcdctmgr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcdctmgr.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jchuff.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jchuff.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcinit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcinit.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcmainct.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcmainct.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcmarker.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcmarker.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcmaster.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcmaster.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcomapi.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcomapi.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcparam.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcparam.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcphuff.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcphuff.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcprepct.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcprepct.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jcsample.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jcsample.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jctrans.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jctrans.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdapimin.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdapimin.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdapistd.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdapistd.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdcoefct.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdcoefct.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdcolor.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdcolor.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jddctmgr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jddctmgr.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdhuff.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdhuff.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdinput.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdinput.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdmainct.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdmainct.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdmarker.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdmaster.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdmaster.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdmerge.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdmerge.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdphuff.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdphuff.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdpostct.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdpostct.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdsample.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdsample.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jdtrans.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jdtrans.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jerror.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jerror.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jfdctflt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jfdctflt.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jfdctfst.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jfdctfst.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jfdctint.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jfdctint.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jidctflt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jidctflt.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jidctfst.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jidctfst.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jidctint.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jidctint.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jidctred.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jidctred.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jmemmgr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jmemmgr.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jmemnobs.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jmemnobs.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="jpegdecoder.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jquant1.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jquant1.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jquant2.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jquant2.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/image/jpeg/jutils.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="jutils.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/png.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngerror.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngerror.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngget.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngget.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngmem.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngmem.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngpread.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngpread.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngread.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngread.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngrio.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngrio.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngrtran.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngrtran.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngrutil.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngrutil.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngset.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngset.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngtrans.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngtrans.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngwio.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngwio.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngwrite.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngwrite.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngwtran.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngwtran.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/libpng/pngwutil.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="pngwutil.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffineEdge.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffineEdge.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_D64.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine_BC_D64.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_F32.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine_BC_F32.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_S32.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine_BC_S32.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_D64.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine_BL_D64.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_F32.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine_BL_F32.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_S32.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine_BL_S32.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine_NN.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN_Bit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageAffine_NN_Bit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageClipping.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageClipping.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageColorTrue2Index.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageColorTrue2Index.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv2x2_f.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Bit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConvClearEdge_Bit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Fp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConvClearEdge_Fp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Bit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConvCopyEdge_Bit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvKernelConvert.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConvKernelConvert.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConvMxN.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_Fp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConvMxN_Fp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConvMxN_ext.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_16ext.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_16nw.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_32nw.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_8ext.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_8nw.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_D64nw.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_D64nw.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_F32nw.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_F32nw.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_u16ext.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageConv_u16nw.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageCopy_Bit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageCreate.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageDivTables.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageDivTables.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageFilters.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageFilters.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageLookUp_64.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageLookUp_Bit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageScanPoly.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageScanPoly.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_ImageUtils.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BC.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffineIndex_BC.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BL.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffineIndex_BL.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffine_BC.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_S16.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffine_BC_S16.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_U16.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffine_BC_U16.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffine_BL.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_S16.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffine_BL_S16.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_U16.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffine_BL_U16.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_NN.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageAffine_NN.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvClearEdge.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageConvClearEdge.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvCopyEdge.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageConvCopyEdge.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvVersion.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageConvVersion.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConv_f.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageConv_f.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageCopy.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageLookUp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageLookUp_f.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1_U8.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_c_ImageThresh1_U8.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/medialib/mlib_sys.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MLIB_NO_LIBSUNMATH</Elem>
+            <Elem>MLIB_OS64BIT</Elem>
+            <Elem>THIS_FILE="mlib_sys.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/splashscreen/java_awt_SplashScreen.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="splashscreen_gfx_impl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="splashscreen_gif.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="splashscreen_impl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="splashscreen_jpeg.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="splashscreen_png.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/awt/utility/rect.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/AccelGlyphCache.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/DrawGlyphList.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>/usr/include/freetype2</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HEADLESS</Elem>
+            <Elem>LE_STANDALONE</Elem>
+            <Elem>THIS_FILE="DrawGlyphList.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/FontInstanceAdapter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FontInstanceAdapter.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/freetypeScaler.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>/usr/include/freetype2</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HEADLESS</Elem>
+            <Elem>LE_STANDALONE</Elem>
+            <Elem>THIS_FILE="freetypeScaler.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/AnchorTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="AnchorTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ArabicLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ArabicShaping.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ArabicShaping.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/CanonData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="CanonData.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/CanonShaping.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="CanonShaping.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ClassDefinitionTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ClassDefinitionTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ContextualGlyphSubstProc.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ContextualSubstSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/CoverageTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="CoverageTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="CursiveAttachmentSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/DeviceTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DeviceTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ExtensionSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ExtensionSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/Features.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Features.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GDEFMarkFilter.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GDEFMarkFilter.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GXLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GXLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GlyphDefinitionTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GlyphDefinitionTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GlyphIterator.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GlyphIterator.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GlyphLookupTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GlyphLookupTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GlyphPositionAdjustments.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GlyphPositionAdjustments.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GlyphPositioningTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GlyphPositioningTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GlyphPosnLookupProc.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GlyphSubstLookupProc.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/GlyphSubstitutionTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GlyphSubstitutionTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/HanLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="HanLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/HangulLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="HangulLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/IndicClassTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IndicClassTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/IndicLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IndicLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IndicRearrangementProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/IndicReordering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IndicReordering.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/KernTable.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="KernTable.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/KhmerLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="KhmerLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/KhmerReordering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="KhmerReordering.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/LEFontInstance.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LEFontInstance.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/LEGlyphStorage.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LEGlyphStorage.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/LEInsertionList.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LEInsertionList.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/LayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/LigatureSubstProc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LigatureSubstProc.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LigatureSubstSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/LookupProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LookupProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/LookupTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="LookupTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/Lookups.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Lookups.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/MPreFixups.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MPreFixups.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/MarkArrays.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MarkArrays.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MarkToBasePosnSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MarkToLigaturePosnSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MarkToMarkPosnSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/MirroredCharData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MirroredCharData.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/MorphTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MorphTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MultipleSubstSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/NonContextualGlyphSubstProc.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="NonContextualGlyphSubstProc.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OpenTypeLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/OpenTypeUtilities.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OpenTypeUtilities.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/PairPositioningSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PairPositioningSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ScriptAndLanguage.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ScriptAndLanguage.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ScriptAndLanguageTags.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SegmentArrayProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SegmentArrayProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SegmentSingleProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SegmentSingleProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ShapingTypeData.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ShapingTypeData.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SimpleArrayProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SimpleArrayProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SinglePositioningSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SingleSubstitutionSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SingleTableProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SingleTableProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/StateTableProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="StateTableProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SubstitutionLookups.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SubstitutionLookups.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SubtableProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SubtableProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SunLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ThaiLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ThaiLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ThaiShaping.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ThaiShaping.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ThaiStateTables.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ThaiStateTables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/TibetanLayoutEngine.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="TibetanLayoutEngine.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/TibetanReordering.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="TibetanReordering.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/TrimmedArrayProcessor.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="TrimmedArrayProcessor.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/layout/ValueRecords.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ValueRecords.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/font/sunFont.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>/usr/include/freetype2</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HEADLESS</Elem>
+            <Elem>LE_STANDALONE</Elem>
+            <Elem>THIS_FILE="sunFont.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/Disposer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>THIS_FILE="Disposer.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/SurfaceData.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>THIS_FILE="SurfaceData.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/Trace.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>THIS_FILE="Trace.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmscam02.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmscgats.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmscnvrt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmserr.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsgamma.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsgmt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmshalf.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmshalf.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsintrp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsio0.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsio1.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmslut.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsmd5.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsmtrx.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsnamed.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsopt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmspack.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmspcs.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsplugin.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsps2.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmssamp.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmssm.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmssm.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmstypes.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsvirt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmswtpnt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="cmsxform.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/AlphaMacros.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/AlphaMath.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="AlphaMath.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Any3Byte.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Any3Byte.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Any4Byte.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Any4Byte.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/AnyByte.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="AnyByte.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/AnyInt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="AnyInt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/AnyShort.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="AnyShort.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Blit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Blit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/BlitBg.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="BlitBg.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteBinary1Bit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ByteBinary1Bit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteBinary2Bit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ByteBinary2Bit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteBinary4Bit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ByteBinary4Bit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteGray.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ByteGray.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/ByteIndexed.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ByteIndexed.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawLine.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DrawLine.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawParallelogram.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DrawParallelogram.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawPath.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DrawPath.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawPolygons.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DrawPolygons.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/DrawRect.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DrawRect.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/FillParallelogram.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FillParallelogram.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/FillPath.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FillPath.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/FillRect.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FillRect.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/FillSpans.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FillSpans.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/FourByteAbgr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FourByteAbgr.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/FourByteAbgrPre.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FourByteAbgrPre.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GraphicsPrimitiveMgr.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Index12Gray.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Index12Gray.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Index8Gray.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Index8Gray.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/IntArgb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IntArgb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/IntArgbBm.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IntArgbBm.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/IntArgbPre.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IntArgbPre.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/IntBgr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IntBgr.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/IntRgb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IntRgb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/IntRgbx.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="IntRgbx.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/MapAccelFunc.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MapAccelFunc.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/MaskBlit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MaskBlit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/MaskFill.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MaskFill.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/ProcessPath.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ProcessPath.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/ScaledBlit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ScaledBlit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/ThreeByteBgr.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ThreeByteBgr.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/TransformHelper.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="TransformHelper.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Ushort4444Argb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Ushort555Rgb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Ushort555Rgb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Ushort555Rgbx.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Ushort555Rgbx.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/Ushort565Rgb.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Ushort565Rgb.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/UshortGray.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="UshortGray.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/loops/UshortIndexed.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="UshortIndexed.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLBufImgOps.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLBufImgOps.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLContext.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLContext.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLFuncs.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLFuncs.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLMaskBlit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLMaskBlit.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLMaskFill.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLMaskFill.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLPaints.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLPaints.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLRenderQueue.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLRenderer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLRenderer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLSurfaceData.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLTextRenderer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/opengl/OGLVertexCache.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="OGLVertexCache.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/pipe/BufferedMaskBlit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/pipe/BufferedRenderPipe.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="BufferedRenderPipe.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/pipe/Region.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Region.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/pipe/ShapeSpanIterator.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ShapeSpanIterator.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SpanClipRenderer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/ClassLoadingImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/Flag.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Flag.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/GarbageCollectorImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GarbageCollectorImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/GcInfoBuilder.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GcInfoBuilder.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/HotSpotDiagnostic.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="HotSpotDiagnostic.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/HotspotThread.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="HotspotThread.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/MemoryImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MemoryImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/MemoryManagerImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MemoryManagerImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/MemoryPoolImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MemoryPoolImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/ThreadImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ThreadImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/VMManagementImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="VMManagementImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/management/management.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="management.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/misc/GC.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/misc/MessageUtils.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="MessageUtils.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/misc/NativeSignalHandler.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="NativeSignalHandler.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/misc/Signal.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Signal.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/misc/VM.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="VM.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/misc/VMSupport.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="VMSupport.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/misc/Version.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Version.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/reflect/ConstantPool.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/reflect/NativeAccessors.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="NativeAccessors.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/reflect/Reflection.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Reflection.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/ECC_JNI.cpp"
+            ex="false"
+            tool="1"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_163.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ec2_163.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_193.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ec2_193.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_233.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ec2_233.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_aff.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ec2_aff.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec2_mont.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ec2_mont.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ec_naf.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ec_naf.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecdecode.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecdecode.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecl_curve.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecl_curve.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecl_gf.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecl_gf.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecl_mult.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecl_mult.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_192.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_192.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_224.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_224.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_256.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_256.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_384.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_384.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_521.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_521.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_aff.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_aff.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_jac.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_jac.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_jm.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_jm.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/ecp_mont.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ecp_mont.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/mp_gf2m.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="mp_gf2m.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/mpi.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="mpi.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/mplogic.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="mplogic.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/mpmontg.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="mpmontg.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/oid.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="oid.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/ec/impl/secitem.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="secitem.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/jgss/wrapper/NativeUtil.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="NativeUtil.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/j2secmod.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="j2secmod.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_crypt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_digest.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_dual.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_general.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_keymgmt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_mutex.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_objmgmt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_sessmgmt.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_sign.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_util.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/native/sun/security/smartcardio/pcsc.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/native/sun/tracing/dtrace/JVM.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/npt/npt.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="../../jdk/src/share/npt/utf.c" ex="false" tool="0" flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="utf.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/share/transport/socket/socketTransport.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/back/exec_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/back/linker_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="linker_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/bin/ergo.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/bin/ergo_i586.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ergo_i586.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/bin/java_md_common.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="java_md_common.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/bin/java_md_solinux.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="java_md_solinux.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/demo/jni/Poller/Poller.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/demo/jvmti/hprof/hprof_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/instrument/EncodingSupport_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/instrument/FileSystemSupport_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FileSystemSupport_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/management/SolarisOperatingSystem.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="UnixOperatingSystem_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Ports.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PLATFORM_API_SolarisOS_Ports.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PLATFORM_API_SolarisOS_Utils.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/security/auth/module/Solaris.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/com/sun/security/auth/module/Unix.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Unix.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/common/jdk_util_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/common/jni_util_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="jni_util_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/io/Console_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/java/io/FileDescriptor_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FileDescriptor_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/io/FileInputStream_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FileInputStream_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/io/FileOutputStream_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="FileOutputStream_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/io/RandomAccessFile_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="RandomAccessFile_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/io/UnixFileSystem_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="UnixFileSystem_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/io/canonicalize_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="canonicalize_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/io/io_util_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="io_util_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/java/lang/UNIXProcess_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="UNIXProcess_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/lang/java_props_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="java_props_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/Inet4AddressImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/Inet6AddressImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="Inet6AddressImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/InetAddressImplFactory.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="InetAddressImplFactory.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/NetworkInterface.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="NetworkInterface.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PlainDatagramSocketImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/PlainSocketImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="PlainSocketImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/SocketInputStream.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SocketInputStream.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/SocketOutputStream.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SocketOutputStream.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/net/net_util_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="net_util_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/nio/MappedByteBuffer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/java/util/FileSystemPreferences.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/java/util/TimeZone_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="TimeZone_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/java/util/logging.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="logging.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/CUPSfuncs.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="CUPSfuncs.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/HeadlessToolkit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HEADLESS=true</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="HeadlessToolkit.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/VDrawingArea.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HEADLESS=true</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="VDrawingArea.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/X11Color.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="X11Color.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_AWTEvent.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_AWTEvent.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_DrawingSurface.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_Event.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_Event.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_Font.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_Font.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_GraphicsEnv.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_InputMethod.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_InputMethod.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_Insets.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_Insets.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>THIS_FILE="awt_LoadLibrary.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_Mlib.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>THIS_FILE="awt_Mlib.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_Plugin.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_Plugin.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_Robot.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_Robot.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_UNIXToolkit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_UNIXToolkit.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/awt_util.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="awt_util.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/fontpath.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="fontpath.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/gtk2_interface.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="gtk2_interface.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/initIDs.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="initIDs.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/jawt.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="jawt.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/list.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="list.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/multiVis.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="multiVis.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/multi_font.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="multi_font.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/robot_common.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="robot_common.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="sun_awt_X11_GtkFileDialogPeer.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/swing_GTKEngine.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="swing_GTKEngine.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/awt/swing_GTKStyle.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="swing_GTKStyle.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/font/X11FontScaler.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/font/X11TextRenderer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="X11TextRenderer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GLXSurfaceData.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11FontScaler_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="X11PMBlitLoops.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11Renderer.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="X11Renderer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="X11SurfaceData.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="X11TextRenderer_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="XRBackendNative.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="XRSurfaceData.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/management/FileSystemImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/net/sdp/SdpSupport.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="DatagramChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="DatagramDispatcher.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="DevPollArrayWrapper.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="FileChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="FileDispatcherImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/FileKey.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="FileKey.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/IOUtil.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="IOUtil.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/InheritedChannel.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="InheritedChannel.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/NativeThread.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="NativeThread.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/Net.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="Net.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/PollArrayWrapper.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="PollArrayWrapper.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="ServerSocketChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/SocketChannelImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="SocketChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/SocketDispatcher.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="SocketDispatcher.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/SolarisEventPort.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="SolarisEventPort.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="UnixAsynchronousSocketChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SctpNet.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/ch/sctp/SctpServerChannelImpl.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SctpServerChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/fs/SolarisNativeDispatcher.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="SolarisNativeDispatcher.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/fs/SolarisWatchService.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="SolarisWatchService.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/fs/UnixCopyFile.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="UnixCopyFile.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="UnixNativeDispatcher.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/fs/genSolarisConstants.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="genSolarisConstants.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="genUnixConstants.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="j2secmod_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/tools/attach/SolarisVirtualMachine.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/tracing/dtrace/jvm_symbols_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/util/locale/provider/HostLocaleProviderAdapter_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/xawt/XToolkit.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/xawt/XWindow.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="XWindow.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/xawt/XlibWrapper.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="XlibWrapper.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/xawt/awt_Desktop.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="awt_Desktop.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/native/sun/xawt/gnome_interface.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="gnome_interface.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </item>
+      <item path="../../jdk/src/solaris/npt/utf_md.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="../../jdk/src/solaris/transport/socket/socket_md.c"
+            ex="false"
+            tool="0"
+            flavor2="0">
+      </item>
+      <folder path="$SRC/build">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>__sparcv9</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <undefinedList>
+            <Elem>__EXCEPTIONS</Elem>
+            <Elem>__GXX_RTTI</Elem>
+          </undefinedList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated">
+        <ccTool>
+          <incDir>
+            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/solaris/vm</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>AMD64</Elem>
+            <Elem>COMPILER1</Elem>
+            <Elem>COMPILER2</Elem>
+            <Elem>DONT_USE_PRECOMPILED_HEADER</Elem>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>SPARC_WORKS</Elem>
+            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
+            <Elem>TARGET_ARCH_x86</Elem>
+            <Elem>TARGET_COMPILER_sparcWorks</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_solaris</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_Crun_inline_placement</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>TIERED</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot">
+        <cTool>
+          <preprocessorList>
+            <Elem>_GNU_SOURCE</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <undefinedList>
+            <Elem>__EXCEPTIONS</Elem>
+            <Elem>__GXX_RTTI</Elem>
+          </undefinedList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/agent">
+        <cTool>
+          <incDir>
+            <pElem>../../hotspot/agent/src/os/solaris/proc</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>${IDE_ALT_BOOTDIR}/include</pElem>
+            <pElem>${IDE_ALT_BOOTDIR}/include/solaris</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>SOLARIS_11_B159_OR_LATER</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>../../hotspot/agent/src/os/solaris/proc</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>${IDE_ALT_BOOTDIR}/include</pElem>
+            <pElem>${IDE_ALT_BOOTDIR}/include/solaris</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>SOLARIS_11_B159_OR_LATER</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/agent/src/os">
+        <cTool>
+          <incDir>
+            <pElem>${IDE_ALT_BOOTDIR}/include/linux</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/cpu">
+        <ccTool>
+          <incDir>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/solaris/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>AMD64</Elem>
+            <Elem>COMPILER1</Elem>
+            <Elem>COMPILER2</Elem>
+            <Elem>DONT_USE_PRECOMPILED_HEADER</Elem>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>SPARC_WORKS</Elem>
+            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
+            <Elem>TARGET_ARCH_x86</Elem>
+            <Elem>TARGET_COMPILER_sparcWorks</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_solaris</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_Crun_inline_placement</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/os">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/os/linux">
+        <cTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>_REENTRANT</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <preprocessorList>
+            <Elem>LINUX</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_REENTRANT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/os/posix">
+        <cTool>
+          <incDir>
+            <pElem>../../hotspot/src/os/posix/launcher</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/tools/launcher</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/solaris/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>AMD64</Elem>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>FULL_VERSION="version"</Elem>
+            <Elem>GAMMA</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>LAUNCHER_TYPE="gamma"</Elem>
+            <Elem>LINK_INTO_LIBJVM</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>SPARC_WORKS</Elem>
+            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
+            <Elem>TARGET_ARCH_x86</Elem>
+            <Elem>TARGET_COMPILER_sparcWorks</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_solaris</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/solaris/vm</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>AMD64</Elem>
+            <Elem>COMPILER1</Elem>
+            <Elem>COMPILER2</Elem>
+            <Elem>DONT_USE_PRECOMPILED_HEADER</Elem>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>SPARC_WORKS</Elem>
+            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
+            <Elem>TARGET_ARCH_x86</Elem>
+            <Elem>TARGET_COMPILER_sparcWorks</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_solaris</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_Crun_inline_placement</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/os/solaris">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/os/solaris/dtrace">
+        <cTool>
+          <preprocessorList>
+            <Elem>TIERED</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/os/solaris/vm">
+        <ccTool>
+          <incDir>
+            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/solaris/vm</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>AMD64</Elem>
+            <Elem>COMPILER1</Elem>
+            <Elem>COMPILER2</Elem>
+            <Elem>DONT_USE_PRECOMPILED_HEADER</Elem>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>SPARC_WORKS</Elem>
+            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
+            <Elem>TARGET_ARCH_x86</Elem>
+            <Elem>TARGET_COMPILER_sparcWorks</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_solaris</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_Crun_inline_placement</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/os_cpu">
+        <ccTool>
+          <incDir>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/solaris/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>AMD64</Elem>
+            <Elem>COMPILER1</Elem>
+            <Elem>COMPILER2</Elem>
+            <Elem>DONT_USE_PRECOMPILED_HEADER</Elem>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>SPARC_WORKS</Elem>
+            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
+            <Elem>TARGET_ARCH_x86</Elem>
+            <Elem>TARGET_COMPILER_sparcWorks</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_solaris</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_Crun_inline_placement</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/os_cpu/linux_x86">
+        <ccTool>
+          <preprocessorList>
+            <Elem>LINUX</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share">
+        <cTool>
+          <incDir>
+            <pElem>../../hotspot/src/os/posix/launcher</pElem>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/tools/launcher</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/solaris/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>AMD64</Elem>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>FULL_VERSION="version"</Elem>
+            <Elem>GAMMA</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>LAUNCHER_TYPE="gamma"</Elem>
+            <Elem>LINK_INTO_LIBJVM</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>SPARC_WORKS</Elem>
+            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
+            <Elem>TARGET_ARCH_x86</Elem>
+            <Elem>TARGET_COMPILER_sparcWorks</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_solaris</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>../../hotspot/src/share/vm/prims</pElem>
+            <pElem>../../hotspot/src/share/vm</pElem>
+            <pElem>../../hotspot/src/share/vm/precompiled</pElem>
+            <pElem>../../hotspot/src/cpu/x86/vm</pElem>
+            <pElem>../../hotspot/src/os_cpu/solaris_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/solaris/vm</pElem>
+            <pElem>../../hotspot/src/os/posix/vm</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>AMD64</Elem>
+            <Elem>COMPILER1</Elem>
+            <Elem>COMPILER2</Elem>
+            <Elem>DONT_USE_PRECOMPILED_HEADER</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>SPARC_WORKS</Elem>
+            <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
+            <Elem>TARGET_ARCH_x86</Elem>
+            <Elem>TARGET_COMPILER_sparcWorks</Elem>
+            <Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
+            <Elem>TARGET_OS_ARCH_solaris_x86</Elem>
+            <Elem>TARGET_OS_FAMILY_solaris</Elem>
+            <Elem>_Crun_inline_placement</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/adlc">
+        <ccTool>
+          <incDir>
+            <pElem>../../hotspot/src/share/vm/adlc</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ASSERT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/asm">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/c1">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/ci">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/classfile">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/code">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/compiler">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/gc_implementation">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/gc_interface">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/interpreter">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/libadt">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/memory">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/oops">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/precompiled">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/product</pElem>
+            <pElem>../../hotspot/src/os_cpu/linux_x86/vm</pElem>
+            <pElem>../../hotspot/src/os/linux/vm</pElem>
+            <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>LINUX</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+            <Elem>_GNU_SOURCE</Elem>
+            <Elem>_LP64=1</Elem>
+            <Elem>_REENTRANT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/prims">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/runtime">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/services">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/hotspot/src/share/vm/utilities">
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/generated</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>DTRACE_ENABLED</Elem>
+            <Elem>HAVE_DTRACE_H</Elem>
+            <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
+            <Elem>HOTSPOT_BUILD_USER="user"</Elem>
+            <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
+            <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
+            <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
+            <Elem>INCLUDE_TRACE</Elem>
+            <Elem>PRODUCT</Elem>
+            <Elem>VM_LITTLE_ENDIAN</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="add_gnu_debuglink.c"</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>CC_NOEX</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="Agent.cpp"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/make">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/make/tools/fix_empty_sec_hdr_flags">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="fix_empty_sec_hdr_flags.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="ArrayReferenceImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/back">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/transport/export</pElem>
+            <pElem>../../jdk/src/share/back/export</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/src/share/back</pElem>
+            <pElem>../../jdk/src/solaris/back</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>JDWP_LOGGING</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/bin">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>LIBARCHNAME="amd64"</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="java.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="agent_util.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/agent_util">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/compiledMethodLoad">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/gctest">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="gctest.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/heapTracker">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="heapTracker.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/heapViewer">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="heapViewer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/hprof">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="debug_malloc.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/java_crw_demo">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
+            <pElem>../../jdk/src/solaris/demo/jvmti/hprof</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="java_crw_demo.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/minst">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="minst.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/mtrace">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="mtrace.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/demo/jvmti/versionCheck">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="versionCheck.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/instrument">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/instrument</pElem>
+            <pElem>../../jdk/src/solaris/instrument</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_JPLIS_LOGGING</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="EncodingSupport.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DirectAudioDevice.c"</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="bands.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/com">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
+            <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>EXTRA_SOUND_JNI_LIBS=""</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>USE_DAUDIO=TRUE</Elem>
+            <Elem>USE_PORTS=TRUE</Elem>
+            <Elem>X_ARCH=X_AMD64</Elem>
+            <Elem>X_PLATFORM=X_SOLARIS</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <preprocessorList>
+            <Elem>FULL</Elem>
+            <Elem>PRODUCT</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/common">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="check_code.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java">
+        <cTool>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="FileInputStream.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/io">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/lang">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="e_acos.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/lang/fdlibm">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/lang/ref">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Finalizer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/lang/reflect">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Array.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/net">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="DatagramPacket.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/nio">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="Bits.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/security">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="AccessController.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/util">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="AtomicLong.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/util/concurrent">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/util/zip">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="compress.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/java/util/zip/zlib-1.2.5">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="debug_assert.c"</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="AlternateSubstSubtables.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt">
+        <cTool>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/debug">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/giflib">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="dgif_lib.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/image">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="img_colors.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/image/cvutils">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/image/gif">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>THIS_FILE="gifdecoder.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/image/jpeg">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="imageioJPEG.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/libpng">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="png.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/medialib">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="awt_ImagingLib.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/splashscreen">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>THIS_FILE="java_awt_SplashScreen.c"</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/awt/utility">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="rect.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/font">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="AccelGlyphCache.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>/usr/include/freetype2</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>HEADLESS</Elem>
+            <Elem>LE_STANDALONE</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/java2d">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="LCMS.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/java2d/cmm">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/java2d/loops">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>THIS_FILE="AlphaMacros.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/java2d/opengl">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>THIS_FILE="OGLBlitLoops.c"</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/java2d/pipe">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/gif</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>THIS_FILE="BufferedMaskBlit.c"</Elem>
+            <Elem>__MEDIALIB_OLD_NAMES</Elem>
+            <Elem>__USE_J2D_NAMES</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/management">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/management</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="ClassLoadingImpl.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/misc">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="GC.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/nio">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/reflect">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="ConstantPool.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/security">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="ec.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+        <ccTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
+            <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
+          </preprocessorList>
+        </ccTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/security/ec">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
+            <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>MP_API_COMPATIBLE</Elem>
+            <Elem>NSS_ECC_MORE_THAN_SUITE_B</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/security/jgss">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="GSSLibStub.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/security/pkcs11">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/pkcs11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
+            <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_convert.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/security/smartcardio">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="pcsc.c"</Elem>
+            <Elem>__sun_jdk</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/native/sun/tracing">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="JVM.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/npt">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="npt.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/share/transport">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/transport/socket</pElem>
+            <pElem>../../jdk/src/solaris/transport/socket</pElem>
+            <pElem>../../jdk/src/share/back/export</pElem>
+            <pElem>../../jdk/src/share/back</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="socketTransport.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>USE_MMAP</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="exec_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/back">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/transport/export</pElem>
+            <pElem>../../jdk/src/share/back/export</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/src/share/back</pElem>
+            <pElem>../../jdk/src/solaris/back</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>JDWP_LOGGING</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/bin">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/src/solaris/bin</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>LIBARCH32NAME="i386"</Elem>
+            <Elem>LIBARCH64NAME="amd64"</Elem>
+            <Elem>LIBARCHNAME="amd64"</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="ergo.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/demo">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="Poller.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/demo/jni">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/democlasses/jni/Poller</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/demo/jvmti">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/hprof</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="hprof_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/instrument">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/instrument</pElem>
+            <pElem>../../jdk/src/solaris/instrument</pElem>
+            <pElem>../../jdk/src/share/bin</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>NO_JPLIS_LOGGING</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="EncodingSupport_md.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SolarisOperatingSystem.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/com">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/com/sun/management">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/management</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/com/sun/media">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
+            <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>EXTRA_SOUND_JNI_LIBS=""</Elem>
+            <Elem>THIS_FILE="PLATFORM_API_SolarisOS_PCM.c"</Elem>
+            <Elem>USE_DAUDIO=TRUE</Elem>
+            <Elem>USE_PORTS=TRUE</Elem>
+            <Elem>X_ARCH=X_AMD64</Elem>
+            <Elem>X_PLATFORM=X_SOLARIS</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="Solaris.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/common">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="jdk_util_md.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="Console_md.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java/io">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java/lang">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="ProcessEnvironment_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java/net">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java/nio">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/java/util">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>THIS_FILE="FileSystemPreferences.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="splashscreen_sys.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/awt">
+        <cTool>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/awt/splashscreen">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/libpng</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/splashscreen</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/giflib</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt/splashscreen</pElem>
+            <pElem>/usr/openwin/include</pElem>
+            <pElem>/usr/openwin/include/X11/extensions</pElem>
+            <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>PNG_NO_MMX_CODE</Elem>
+            <Elem>SPLASHSCREEN</Elem>
+            <Elem>WITH_X11</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/font">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>/usr/include/freetype2</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/font/layout</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>HEADLESS</Elem>
+            <Elem>LE_STANDALONE</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="X11FontScaler.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/java2d">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="GLXGraphicsConfig.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/java2d/x11">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="X11FontScaler_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/management">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/management</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="FileSystemImpl.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/net">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="ResolverConfigurationImpl.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/net/sdp">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SdpSupport.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/net/spi">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="DefaultProxySelector.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/nio">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="SctpChannelImpl.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/nio/ch">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/nio/ch</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/nio/ch/sctp">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/nio/ch/sctp</pElem>
+            <pElem>../../jdk/src/share/native/java/net</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
+            <pElem>../../jdk/src/solaris/native/java/net</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/nio/fs">
+        <cTool>
+          <preprocessorList>
+            <Elem>THIS_FILE="GnomeFileTypeDetector.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/security">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="NativeFunc.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/security/jgss">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/security/pkcs11">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/pkcs11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
+            <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="p11_md.c"</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/security/smartcardio">
+        <cTool>
+          <incDir>
+            <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>THIS_FILE="pcsc_md.c"</Elem>
+            <Elem>__sun_jdk</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/tools">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="SolarisVirtualMachine.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/tracing">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="jvm_symbols_md.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/util">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/solaris/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/ref</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/io</pElem>
+            <pElem>../../jdk/src/solaris/native/java/io</pElem>
+            <pElem>../../jdk/src/share/native/java/nio</pElem>
+            <pElem>../../jdk/src/share/native/java/security</pElem>
+            <pElem>../../jdk/src/share/native/sun/misc</pElem>
+            <pElem>../../jdk/src/share/native/sun/reflect</pElem>
+            <pElem>../../jdk/src/share/native/java/util</pElem>
+            <pElem>../../jdk/src/share/native/java/util/concurrent/atomic</pElem>
+            <pElem>../../jdk/src/solaris/native/java/util</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
+            <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>ARCHPROPNAME="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
+            <Elem>JDK_MAJOR_VERSION="version"</Elem>
+            <Elem>JDK_MICRO_VERSION="version"</Elem>
+            <Elem>JDK_MINOR_VERSION="minor"</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="HostLocaleProviderAdapter_md.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/native/sun/xawt">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/utility</pElem>
+            <pElem>../../jdk/src/share/native/sun/font</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/font</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/xawt</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/loops</pElem>
+            <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
+            <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
+            <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>FUNCPROTO=15</Elem>
+            <Elem>INTERNAL_BUILD</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>PACKAGE_PATH="/opt/local"</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="XToolkit.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>X11_PATH="/usr/X11R6"</Elem>
+            <Elem>XAWT</Elem>
+            <Elem>XAWT_HACK</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/npt">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/npt</pElem>
+            <pElem>../../jdk/src/solaris/npt</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="utf_md.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="$SRC/jdk/src/solaris/transport">
+        <cTool>
+          <incDir>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/include/solaris</pElem>
+            <pElem>../../jdk/src/share/javavm/export</pElem>
+            <pElem>../../jdk/src/solaris/javavm/export</pElem>
+            <pElem>../../jdk/src/share/native/common</pElem>
+            <pElem>../../jdk/src/solaris/native/common</pElem>
+            <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
+            <pElem>../../jdk/src/share/transport/socket</pElem>
+            <pElem>../../jdk/src/solaris/transport/socket</pElem>
+            <pElem>../../jdk/src/share/back/export</pElem>
+            <pElem>../../jdk/src/share/back</pElem>
+            <pElem>../../jdk/makefiles</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>ARCH="amd64"</Elem>
+            <Elem>BREAKPTS</Elem>
+            <Elem>MACRO_MEMSYS_OPS</Elem>
+            <Elem>NDEBUG</Elem>
+            <Elem>RELEASE=""</Elem>
+            <Elem>SOLARIS</Elem>
+            <Elem>THIS_FILE="socket_md.c"</Elem>
+            <Elem>TRACING</Elem>
+            <Elem>TRIMMED</Elem>
+            <Elem>USE_MMAP</Elem>
+            <Elem>_LITTLE_ENDIAN=</Elem>
+            <Elem>__solaris__</Elem>
+            <Elem>amd64</Elem>
+            <Elem>cpuIntel</Elem>
+            <Elem>i586</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+    </conf>
+  </confs>
+</configurationDescriptor>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/nb_native/nbproject/project.xml	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.cnd.makeproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/make-project/1">
+            <name>OpenJDK (Native)</name>
+            <c-extensions>c,m</c-extensions>
+            <cpp-extensions>cc,cpp</cpp-extensions>
+            <header-extensions>ad,h,hpp,in_out</header-extensions>
+            <sourceEncoding>UTF-8</sourceEncoding>
+            <make-dep-projects/>
+            <sourceRootList>
+                <sourceRootElem>../..</sourceRootElem>
+            </sourceRootList>
+            <confList>
+                <confElem>
+                    <name>Mac_64</name>
+                    <type>0</type>
+                </confElem>
+                <confElem>
+                    <name>Linux_64</name>
+                    <type>0</type>
+                </confElem>
+                <confElem>
+                    <name>Solaris_64</name>
+                    <type>0</type>
+                </confElem>
+            </confList>
+        </data>
+    </configuration>
+</project>
--- a/corba/.hgtags	Wed May 01 12:25:43 2013 +0100
+++ b/corba/.hgtags	Wed May 08 11:22:25 2013 +0100
@@ -208,3 +208,4 @@
 928f8b888deb785cbd7bbd5f951cd6880f11f14e jdk8-b84
 9583a6431596bac1959d2d8828f5ea217843dd12 jdk8-b85
 44a8ce4a759f2668ff434661a93ff462ea472478 jdk8-b86
+f1709874d55a06bc3d5dfa02dbcdfbc59f4cba34 jdk8-b87
--- a/hotspot/.hgtags	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/.hgtags	Wed May 08 11:22:25 2013 +0100
@@ -334,3 +334,6 @@
 09b0d3e9ba6cdf7da07d4010d2d1df14596f6864 hs25-b27
 6d88a566d369f6a1f86912cad7d0912686b2fda1 hs25-b28
 86db4847f195c0ecceea646431f1ff22d56282e8 jdk8-b86
+d4c2667846607042370760e23f64c3ab9350e60d jdk8-b87
+01d5f04e64dc2d64625b2db2056f5ed4de918a45 hs25-b29
+c4af77d2045476c56fbf3f914b336bb1b7cd18af hs25-b30
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,19 +49,13 @@
     Type type                  = db.lookupType("Method");
     constMethod                = type.getAddressField("_constMethod");
     methodData                 = type.getAddressField("_method_data");
+    methodCounters             = type.getAddressField("_method_counters");
     methodSize                 = new CIntField(type.getCIntegerField("_method_size"), 0);
     accessFlags                = new CIntField(type.getCIntegerField("_access_flags"), 0);
     code                       = type.getAddressField("_code");
     vtableIndex                = new CIntField(type.getCIntegerField("_vtable_index"), 0);
-    if (!VM.getVM().isCore()) {
-      invocationCounter        = new CIntField(type.getCIntegerField("_invocation_counter"), 0);
-      backedgeCounter          = new CIntField(type.getCIntegerField("_backedge_counter"), 0);
-    }
     bytecodeOffset = type.getSize();
 
-    interpreterThrowoutCountField = new CIntField(type.getCIntegerField("_interpreter_throwout_count"), 0);
-    interpreterInvocationCountField = new CIntField(type.getCIntegerField("_interpreter_invocation_count"), 0);
-
     /*
     interpreterEntry           = type.getAddressField("_interpreter_entry");
     fromCompiledCodeEntryPoint = type.getAddressField("_from_compiled_code_entry_point");
@@ -80,18 +74,14 @@
   // Fields
   private static AddressField  constMethod;
   private static AddressField  methodData;
+  private static AddressField  methodCounters;
   private static CIntField methodSize;
   private static CIntField accessFlags;
   private static CIntField vtableIndex;
-  private static CIntField invocationCounter;
-  private static CIntField backedgeCounter;
   private static long      bytecodeOffset;
 
   private static AddressField       code;
 
-  private static CIntField interpreterThrowoutCountField;
-  private static CIntField interpreterInvocationCountField;
-
   // constant method names - <init>, <clinit>
   // Initialized lazily to avoid initialization ordering dependencies between Method and SymbolTable
   private static Symbol objectInitializerName;
@@ -127,6 +117,10 @@
     Address addr = methodData.getValue(getAddress());
     return (MethodData) VMObjectFactory.newObject(MethodData.class, addr);
   }
+  public MethodCounters getMethodCounters()           {
+    Address addr = methodCounters.getValue(getAddress());
+    return (MethodCounters) VMObjectFactory.newObject(MethodCounters.class, addr);
+  }
   /** WARNING: this is in words, not useful in this system; use getObjectSize() instead */
   public long         getMethodSize()                 { return                methodSize.getValue(this);        }
   public long         getMaxStack()                   { return                getConstMethod().getMaxStack();   }
@@ -139,16 +133,10 @@
   public long         getCodeSize()                   { return                getConstMethod().getCodeSize();   }
   public long         getVtableIndex()                { return                vtableIndex.getValue(this);       }
   public long         getInvocationCounter()          {
-    if (Assert.ASSERTS_ENABLED) {
-      Assert.that(!VM.getVM().isCore(), "must not be used in core build");
-    }
-    return invocationCounter.getValue(this);
+    return getMethodCounters().getInvocationCounter();
   }
   public long         getBackedgeCounter()          {
-    if (Assert.ASSERTS_ENABLED) {
-      Assert.that(!VM.getVM().isCore(), "must not be used in core build");
-    }
-    return backedgeCounter.getValue(this);
+    return getMethodCounters().getBackedgeCounter();
   }
 
   // get associated compiled native method, if available, else return null.
@@ -369,10 +357,10 @@
   }
 
   public int interpreterThrowoutCount() {
-    return (int) interpreterThrowoutCountField.getValue(this);
+    return getMethodCounters().interpreterThrowoutCount();
   }
 
   public int interpreterInvocationCount() {
-    return (int) interpreterInvocationCountField.getValue(this);
+    return getMethodCounters().interpreterInvocationCount();
   }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/MethodCounters.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2013, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.oops;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+
+public class MethodCounters extends Metadata {
+  public MethodCounters(Address addr) {
+    super(addr);
+  }
+
+  static {
+    VM.registerVMInitializedObserver(new Observer() {
+        public void update(Observable o, Object data) {
+          initialize(VM.getVM().getTypeDataBase());
+        }
+      });
+  }
+
+  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+    Type type      = db.lookupType("MethodCounters");
+
+    interpreterInvocationCountField = new CIntField(type.getCIntegerField("_interpreter_invocation_count"), 0);
+    interpreterThrowoutCountField = new CIntField(type.getCIntegerField("_interpreter_throwout_count"), 0);
+    if (!VM.getVM().isCore()) {
+      invocationCounter        = new CIntField(type.getCIntegerField("_invocation_counter"), 0);
+      backedgeCounter          = new CIntField(type.getCIntegerField("_backedge_counter"), 0);
+    }
+  }
+
+  private static CIntField interpreterInvocationCountField;
+  private static CIntField interpreterThrowoutCountField;
+  private static CIntField invocationCounter;
+  private static CIntField backedgeCounter;
+
+  public int interpreterInvocationCount() {
+    return (int) interpreterInvocationCountField.getValue(this);
+  }
+
+  public int interpreterThrowoutCount() {
+    return (int) interpreterThrowoutCountField.getValue(this);
+  }
+  public long getInvocationCounter() {
+    if (Assert.ASSERTS_ENABLED) {
+      Assert.that(!VM.getVM().isCore(), "must not be used in core build");
+    }
+    return invocationCounter.getValue(this);
+  }
+  public long getBackedgeCounter() {
+    if (Assert.ASSERTS_ENABLED) {
+      Assert.that(!VM.getVM().isCore(), "must not be used in core build");
+    }
+    return backedgeCounter.getValue(this);
+  }
+
+  public void printValueOn(PrintStream tty) {
+  }
+}
+
--- a/hotspot/make/Makefile	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/Makefile	Wed May 08 11:22:25 2013 +0100
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Top level gnumake file for hotspot builds
@@ -85,15 +85,15 @@
 endif
 
 # Typical C1/C2 targets made available with this Makefile
-C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1
-C2_VM_TARGETS=product  fastdebug  optimized  jvmg
-ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
-SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
-MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 jvmgminimal1
+C1_VM_TARGETS=product1 fastdebug1 optimized1 debug1
+C2_VM_TARGETS=product  fastdebug  optimized  debug
+ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero
+SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark debugshark
+MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 debugminimal1
 
 COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product
 COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 docs export_fastdebug
-COMMON_VM_DEBUG_TARGETS=jvmg jvmg1 docs export_debug
+COMMON_VM_DEBUG_TARGETS=debug debug1 docs export_debug
 
 # JDK directory list
 JDK_DIRS=bin include jre lib demo
@@ -103,13 +103,13 @@
 ifeq ($(JVM_VARIANT_MINIMAL1),true)
 all_product:	productminimal1
 all_fastdebug:	fastdebugminimal1
-all_debug:	jvmgminimal1
+all_debug:	debugminimal1
 endif
 
 ifdef BUILD_CLIENT_ONLY
 all_product:   product1 docs export_product
 all_fastdebug: fastdebug1 docs export_fastdebug
-all_debug:     jvmg1 docs export_debug
+all_debug:     debug1 docs export_debug
 else
 ifeq ($(MACOSX_UNIVERSAL),true)
 all_product:   universal_product
@@ -127,13 +127,13 @@
 allzero:           all_productzero all_fastdebugzero
 all_productzero:   productzero docs export_product
 all_fastdebugzero: fastdebugzero docs export_fastdebug
-all_debugzero:     jvmgzero docs export_debug
+all_debugzero:     debugzero docs export_debug
 all_optimizedzero: optimizedzero docs export_optimized
 
 allshark:           all_productshark all_fastdebugshark
 all_productshark:   productshark docs export_product
 all_fastdebugshark: fastdebugshark docs export_fastdebug
-all_debugshark:     jvmgshark docs export_debug
+all_debugshark:     debugshark docs export_debug
 all_optimizedshark: optimizedshark docs export_optimized
 
 # Do everything
@@ -227,7 +227,7 @@
 	$(MKDIR) -p $(OUTPUTDIR)
 	$(CD) $(OUTPUTDIR); \
 		$(MAKE) -f $(ABS_OS_MAKEFILE) \
-			$(MAKE_ARGS) $(VM_TARGET) 
+			$(MAKE_ARGS) $(VM_TARGET)
 
 generic_buildminimal1:
 ifeq ($(JVM_VARIANT_MINIMAL1),true)
@@ -260,7 +260,7 @@
 	  EXPORT_SUBDIR=/$(@:export_%=%) \
 	  generic_export
 export_debug:
-	$(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=${VM_DEBUG} \
+	$(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
 	  EXPORT_SUBDIR=/$(@:export_%=%) \
 	  generic_export
 export_optimized:
@@ -281,192 +281,197 @@
 	  ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
 	  generic_export
 export_debug_jdk::
-	$(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=${VM_DEBUG} \
+	$(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=$(@:export_%_jdk=%) \
 	  ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
 	  generic_export
 
 # Export file copy rules
 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
-DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
-C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
-C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
-ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
-SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark
-C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
-C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
-ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
-SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
-MINIMAL1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1
-MINIMAL1_DIR=$(MINIMAL1_BASE_DIR)/$(VM_SUBDIR)
-
-ifeq ($(JVM_VARIANT_SERVER), true)
-    MISC_DIR=$(C2_DIR)
-    GEN_DIR=$(C2_BASE_DIR)/generated
-endif
-ifeq ($(JVM_VARIANT_CLIENT), true)
-    MISC_DIR=$(C1_DIR)
-    GEN_DIR=$(C1_BASE_DIR)/generated
-endif
-ifeq ($(JVM_VARIANT_ZEROSHARK), true)
-    MISC_DIR=$(SHARK_DIR)
-    GEN_DIR=$(SHARK_BASE_DIR)/generated
-endif
-ifeq ($(JVM_VARIANT_ZERO), true)
-    MISC_DIR=$(ZERO_DIR)
-    GEN_DIR=$(ZERO_BASE_DIR)/generated
-endif
-ifeq ($(JVM_VARIANT_MINIMAL1), true)
-    MISC_DIR=$(MINIMAL1_DIR)
-    GEN_DIR=$(MINIMAL1_BASE_DIR)/generated
-endif
+DOCS_DIR    =$(OUTPUTDIR)/$(VM_PLATFORM)_docs
+C1_DIR      =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1/$(VM_SUBDIR)
+C2_DIR      =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2/$(VM_SUBDIR)
+MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1/$(VM_SUBDIR)
+ZERO_DIR    =$(OUTPUTDIR)/$(VM_PLATFORM)_zero/$(VM_SUBDIR)
+SHARK_DIR   =$(OUTPUTDIR)/$(VM_PLATFORM)_shark/$(VM_SUBDIR)
 
-# Bin files (windows)
-ifeq ($(OSNAME),windows)
-
-# Get jvm.lib 
-$(EXPORT_LIB_DIR)/%.lib:  $(MISC_DIR)/%.lib
+# Server (C2)
+ifeq ($(JVM_VARIANT_SERVER), true)
+# Common
+$(EXPORT_SERVER_DIR)/%.diz:       		$(C2_DIR)/%.diz
+	$(install-file)
+$(EXPORT_LIB_DIR)/%.jar:			$(C2_DIR)/../generated/%.jar
+	$(install-file)
+$(EXPORT_INCLUDE_DIR)/%:			$(C2_DIR)/../generated/jvmtifiles/%
 	$(install-file)
-
-# Other libraries (like SA)
-$(EXPORT_JRE_BIN_DIR)/%.diz: $(MISC_DIR)/%.diz
+# Windows
+$(EXPORT_SERVER_DIR)/%.dll:			$(C2_DIR)/%.dll
+	$(install-file)
+$(EXPORT_SERVER_DIR)/%.pdb:			$(C2_DIR)/%.pdb
 	$(install-file)
-$(EXPORT_JRE_BIN_DIR)/%.dll: $(MISC_DIR)/%.dll
+$(EXPORT_SERVER_DIR)/%.map:			$(C2_DIR)/%.map
 	$(install-file)
-$(EXPORT_JRE_BIN_DIR)/%.pdb: $(MISC_DIR)/%.pdb
+$(EXPORT_LIB_DIR)/%.lib:			$(C2_DIR)/%.lib
 	$(install-file)
-$(EXPORT_JRE_BIN_DIR)/%.map: $(MISC_DIR)/%.map
+$(EXPORT_JRE_BIN_DIR)/%.diz:			$(C2_DIR)/%.diz
 	$(install-file)
-
-# Client files always come from C1 area
-$(EXPORT_CLIENT_DIR)/%.diz:  $(C1_DIR)/%.diz
+$(EXPORT_JRE_BIN_DIR)/%.dll:			$(C2_DIR)/%.dll
+	$(install-file)
+$(EXPORT_JRE_BIN_DIR)/%.pdb:			$(C2_DIR)/%.pdb
 	$(install-file)
-$(EXPORT_CLIENT_DIR)/%.dll:  $(C1_DIR)/%.dll
+$(EXPORT_JRE_BIN_DIR)/%.map:			$(C2_DIR)/%.map
 	$(install-file)
-$(EXPORT_CLIENT_DIR)/%.pdb:  $(C1_DIR)/%.pdb
+# Unix
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
 	$(install-file)
-$(EXPORT_CLIENT_DIR)/%.map:  $(C1_DIR)/%.map
+$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(C2_DIR)/%.$(LIBRARY_SUFFIX)
 	$(install-file)
-
-# Server files always come from C2 area
-$(EXPORT_SERVER_DIR)/%.diz:  $(C2_DIR)/%.diz
+$(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C2_DIR)/%.$(LIBRARY_SUFFIX)
+	$(install-file)
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: 	$(C2_DIR)/%.debuginfo
+	$(install-file)
+$(EXPORT_SERVER_DIR)/%.debuginfo:       	$(C2_DIR)/%.debuginfo
 	$(install-file)
-$(EXPORT_SERVER_DIR)/%.dll:  $(C2_DIR)/%.dll
+$(EXPORT_SERVER_DIR)/64/%.debuginfo:    	$(C2_DIR)/%.debuginfo
 	$(install-file)
-$(EXPORT_SERVER_DIR)/%.pdb:  $(C2_DIR)/%.pdb
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: 		$(C2_DIR)/%.diz
 	$(install-file)
-$(EXPORT_SERVER_DIR)/%.map:  $(C2_DIR)/%.map
+$(EXPORT_SERVER_DIR)/64/%.diz:    		$(C2_DIR)/%.diz
 	$(install-file)
 endif
 
-# Minimal JVM files always come from minimal area
-$(EXPORT_MINIMAL_DIR)/%.diz:  $(MINIMAL1_DIR)/%.diz
+# Client (C1)
+ifeq ($(JVM_VARIANT_CLIENT), true)
+# Common
+$(EXPORT_CLIENT_DIR)/%.diz:       		$(C1_DIR)/%.diz
+	$(install-file)
+$(EXPORT_LIB_DIR)/%.jar:			$(C1_DIR)/../generated/%.jar
+	$(install-file)
+$(EXPORT_INCLUDE_DIR)/%:			$(C1_DIR)/../generated/jvmtifiles/%
 	$(install-file)
-$(EXPORT_MINIMAL_DIR)/%.dll:  $(MINIMAL1_DIR)/%.dll
+# Windows
+$(EXPORT_CLIENT_DIR)/%.dll:			$(C1_DIR)/%.dll
+	$(install-file)
+$(EXPORT_CLIENT_DIR)/%.pdb:			$(C1_DIR)/%.pdb
 	$(install-file)
-$(EXPORT_MINIMAL_DIR)/%.pdb:  $(MINIMAL1_DIR)/%.pdb
+$(EXPORT_CLIENT_DIR)/%.map:			$(C1_DIR)/%.map
+	$(install-file)
+$(EXPORT_LIB_DIR)/%.lib:			$(C1_DIR)/%.lib
 	$(install-file)
-$(EXPORT_MINIMAL_DIR)/%.map:  $(MINIMAL1_DIR)/%.map
+$(EXPORT_JRE_BIN_DIR)/%.diz:			$(C1_DIR)/%.diz
+	$(install-file)
+$(EXPORT_JRE_BIN_DIR)/%.dll:			$(C1_DIR)/%.dll
 	$(install-file)
-
-# Shared Library
-ifneq ($(OSNAME),windows)
-    ifeq ($(JVM_VARIANT_SERVER), true)
-        $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
-		$(install-file)
-        $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(C2_DIR)/%.$(LIBRARY_SUFFIX)
-		$(install-file)
-        $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C2_DIR)/%.$(LIBRARY_SUFFIX)
-		$(install-file)
-        $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: 		$(C2_DIR)/%.debuginfo
-		$(install-file)
-        $(EXPORT_SERVER_DIR)/%.debuginfo:       		$(C2_DIR)/%.debuginfo
-		$(install-file)
-        $(EXPORT_SERVER_DIR)/64/%.debuginfo:    		$(C2_DIR)/%.debuginfo
-		$(install-file)
-        $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: 			$(C2_DIR)/%.diz
-		$(install-file)
-        $(EXPORT_SERVER_DIR)/%.diz:       			$(C2_DIR)/%.diz
-		$(install-file)
-        $(EXPORT_SERVER_DIR)/64/%.diz:    			$(C2_DIR)/%.diz
-		$(install-file)
-    endif
-    ifeq ($(JVM_VARIANT_CLIENT), true)
-        $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
-		$(install-file)
-        $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX):       $(C1_DIR)/%.$(LIBRARY_SUFFIX)
-		$(install-file)
-        $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C1_DIR)/%.$(LIBRARY_SUFFIX)
-		$(install-file)
-        $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: 		$(C1_DIR)/%.debuginfo
-		$(install-file)
-        $(EXPORT_CLIENT_DIR)/%.debuginfo:       		$(C1_DIR)/%.debuginfo
-		$(install-file)
-        $(EXPORT_CLIENT_DIR)/64/%.debuginfo:    		$(C1_DIR)/%.debuginfo
-		$(install-file)
-        $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: 			$(C1_DIR)/%.diz
-		$(install-file)
-        $(EXPORT_CLIENT_DIR)/%.diz:       			$(C1_DIR)/%.diz
-		$(install-file)
-        $(EXPORT_CLIENT_DIR)/64/%.diz:    			$(C1_DIR)/%.diz
-		$(install-file)
-    endif
-    ifeq ($(JVM_VARIANT_ZEROSHARK), true)
-        $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
-		$(install-file)
-        $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo):	$(SHARK_DIR)/%.debuginfo
-		$(install-file)
-        $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz:		$(SHARK_DIR)/%.diz
-		$(install-file)
-        $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
-		$(install-file)
-        $(EXPORT_SERVER_DIR)/%.debuginfo:		$(SHARK_DIR)/%.debuginfo
-		$(install-file)
-        $(EXPORT_SERVER_DIR)/%.diz:			$(SHARK_DIR)/%.diz
-		$(install-file)
-    endif
-    ifeq ($(JVM_VARIANT_ZERO), true)
-        $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
-		$(install-file)
-        $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo:		$(ZERO_DIR)/%.debuginfo
-		$(install-file)
-        $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz:		$(ZERO_DIR)/%.diz
-		$(install-file)
-        $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
-		$(install-file)
-        $(EXPORT_SERVER_DIR)/%.debuginfo:		$(ZERO_DIR)/%.debuginfo
-		$(install-file)
-        $(EXPORT_SERVER_DIR)/%.diz:			$(ZERO_DIR)/%.diz
-		$(install-file)
-    endif
-    ifeq ($(JVM_VARIANT_MINIMAL1), true)
-        $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX):	$(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
-		$(install-file)
-        $(EXPORT_MINIMAL_DIR)/%.$(LIBRARY_SUFFIX):	$(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
-		$(install-file)
-        $(EXPORT_MINIMAL_DIR)/64/%.$(LIBRARY_SUFFIX):	$(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
-		$(install-file)
-        $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo:		$(MINIMAL1_DIR)/%.debuginfo
-		$(install-file)
-        $(EXPORT_MINIMAL_DIR)/%.debuginfo:		$(MINIMAL1_DIR)/%.debuginfo
-		$(install-file)
-        $(EXPORT_MINIMAL_DIR)/64/%.debuginfo:		$(MINIMAL1_DIR)/%.debuginfo
-		$(install-file)
-        $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz:		$(MINIMAL1_DIR)/%.diz
-		$(install-file)
-        $(EXPORT_MINIMAL_DIR)/%.diz:			$(MINIMAL1_DIR)/%.diz
-		$(install-file)
-        $(EXPORT_MINIMAL_DIR)/64/%.diz:			$(MINIMAL1_DIR)/%.diz
-		$(install-file)
-    endif
+$(EXPORT_JRE_BIN_DIR)/%.pdb:			$(C1_DIR)/%.pdb
+	$(install-file)
+$(EXPORT_JRE_BIN_DIR)/%.map:			$(C1_DIR)/%.map
+	$(install-file)
+# Unix
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
+	$(install-file)
+$(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX):       $(C1_DIR)/%.$(LIBRARY_SUFFIX)
+	$(install-file)
+$(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C1_DIR)/%.$(LIBRARY_SUFFIX)
+	$(install-file)
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: 	$(C1_DIR)/%.debuginfo
+	$(install-file)
+$(EXPORT_CLIENT_DIR)/%.debuginfo:       	$(C1_DIR)/%.debuginfo
+	$(install-file)
+$(EXPORT_CLIENT_DIR)/64/%.debuginfo:    	$(C1_DIR)/%.debuginfo
+	$(install-file)
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: 		$(C1_DIR)/%.diz
+	$(install-file)
+$(EXPORT_CLIENT_DIR)/64/%.diz:    		$(C1_DIR)/%.diz
+	$(install-file)
 endif
 
-# Jar file (sa-jdi.jar)
-$(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
+# Minimal1
+ifeq ($(JVM_VARIANT_MINIMAL1), true)
+# Common
+$(EXPORT_MINIMAL_DIR)/%.diz:			$(MINIMAL1_DIR)/%.diz
+	$(install-file)
+$(EXPORT_LIB_DIR)/%.jar:			$(MINIMAL1_DIR)/../generated/%.jar
+	$(install-file)
+$(EXPORT_INCLUDE_DIR)/%:			$(MINIMAL1_DIR)/../generated/jvmtifiles/%
+	$(install-file)
+# Windows
+$(EXPORT_MINIMAL_DIR)/%.dll:			$(MINIMAL1_DIR)/%.dll
+	$(install-file)
+$(EXPORT_MINIMAL_DIR)/%.pdb:			$(MINIMAL1_DIR)/%.pdb
+	$(install-file)
+$(EXPORT_MINIMAL_DIR)/%.map:			$(MINIMAL1_DIR)/%.map
+	$(install-file)
+$(EXPORT_LIB_DIR)/%.lib:			$(MINIMAL1_DIR)/%.lib
+	$(install-file)
+$(EXPORT_JRE_BIN_DIR)/%.diz:			$(MINIMAL1_DIR)/%.diz
+	$(install-file)
+$(EXPORT_JRE_BIN_DIR)/%.dll:			$(MINIMAL1_DIR)/%.dll
 	$(install-file)
+$(EXPORT_JRE_BIN_DIR)/%.pdb:			$(MINIMAL1_DIR)/%.pdb
+	$(install-file)
+$(EXPORT_JRE_BIN_DIR)/%.map:			$(MINIMAL1_DIR)/%.map
+	$(install-file)
+# Unix
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX):	$(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
+	$(install-file)
+$(EXPORT_MINIMAL_DIR)/%.$(LIBRARY_SUFFIX):	$(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
+	$(install-file)
+$(EXPORT_MINIMAL_DIR)/64/%.$(LIBRARY_SUFFIX):	$(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
+	$(install-file)
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo:		$(MINIMAL1_DIR)/%.debuginfo
+	$(install-file)
+$(EXPORT_MINIMAL_DIR)/%.debuginfo:		$(MINIMAL1_DIR)/%.debuginfo
+	$(install-file)
+$(EXPORT_MINIMAL_DIR)/64/%.debuginfo:		$(MINIMAL1_DIR)/%.debuginfo
+	$(install-file)
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz:		$(MINIMAL1_DIR)/%.diz
+	$(install-file)
+$(EXPORT_MINIMAL_DIR)/64/%.diz:			$(MINIMAL1_DIR)/%.diz
+	$(install-file)
+endif
 
-# Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h, jfr.h)
-$(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/%
+# Zero
+ifeq ($(JVM_VARIANT_ZERO), true)
+# Common
+$(EXPORT_LIB_DIR)/%.jar:			$(ZERO_DIR)/../generated/%.jar
+	$(install-file)
+$(EXPORT_INCLUDE_DIR)/%:			$(ZERO_DIR)/../generated/jvmtifiles/%
+	$(install-file)
+# Unix
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
+	$(install-file)
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo:		$(ZERO_DIR)/%.debuginfo
+	$(install-file)
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz:		$(ZERO_DIR)/%.diz
+	$(install-file)
+$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
+	$(install-file)
+$(EXPORT_SERVER_DIR)/%.debuginfo:		$(ZERO_DIR)/%.debuginfo
+	$(install-file)
+$(EXPORT_SERVER_DIR)/%.diz:			$(ZERO_DIR)/%.diz
 	$(install-file)
+endif
+
+# Shark
+ifeq ($(JVM_VARIANT_ZEROSHARK), true)
+# Common
+$(EXPORT_LIB_DIR)/%.jar:			$(SHARK_DIR)/../generated/%.jar
+	$(install-file)
+$(EXPORT_INCLUDE_DIR)/%:			$(SHARK_DIR)/../generated/jvmtifiles/%
+	$(install-file)
+# Unix
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
+	$(install-file)
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo):	$(SHARK_DIR)/%.debuginfo
+	$(install-file)
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz:		$(SHARK_DIR)/%.diz
+	$(install-file)
+$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
+	$(install-file)
+$(EXPORT_SERVER_DIR)/%.debuginfo:		$(SHARK_DIR)/%.debuginfo
+	$(install-file)
+$(EXPORT_SERVER_DIR)/%.diz:			$(SHARK_DIR)/%.diz
+	$(install-file)
+endif
 
 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/%
 	$(install-file)
@@ -541,11 +546,11 @@
 	@$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -showversion -help
 
 # C2 test targets
-test_product test_optimized test_fastdebug test_jvmg:
+test_product test_optimized test_fastdebug test_debug:
 	@$(MAKE) generic_test ALTJVM_DIR="$(C2_DIR)/$(@:test_%=%)"
 
 # C1 test targets
-test_product1 test_optimized1 test_fastdebug1 test_jvmg1:
+test_product1 test_optimized1 test_fastdebug1 test_debug1:
   ifeq ($(ARCH_DATA_MODEL), 32)
 	@$(MAKE) generic_test ALTJVM_DIR="$(C1_DIR)/$(@:test_%1=%)"
   else
@@ -553,15 +558,15 @@
   endif
 
 # Zero test targets
-test_productzero test_optimizedzero test_fastdebugzero test_jvmgzero:
+test_productzero test_optimizedzero test_fastdebugzero test_debugzero:
 	@$(MAKE) generic_test ALTJVM_DIR="$(ZERO_DIR)/$(@:test_%zero=%)"
 
 # Shark test targets
-test_productshark test_optimizedshark test_fastdebugshark test_jvmgshark:
+test_productshark test_optimizedshark test_fastdebugshark test_debugshark:
 	@$(MAKE) generic_test ALTJVM_DIR="$(SHARK_DIR)/$(@:test_%shark=%)"
 
 # Minimal1 test targets
-test_productminimal1 test_optimizedminimal1 test_fastdebugminimal1 test_jvmgminimal1:
+test_productminimal1 test_optimizedminimal1 test_fastdebugminimal1 test_debugminimal1:
 	@$(MAKE) generic_test ALTJVM_DIR="$(MINIMAL1_DIR)/$(@:test_%minimal1=%)"
 
 
@@ -626,7 +631,7 @@
 # Intro help message
 intro_help:
 	@$(ECHO) \
-"Makefile for the Hotspot workspace." 
+"Makefile for the Hotspot workspace."
 	@$(ECHO) \
 "Default behavior is to build and create an export area for the j2se builds."
 
@@ -637,7 +642,7 @@
 	@$(ECHO) "world:            Same as: all create_jdk"
 	@$(ECHO) "all_product:      Same as: product product1 export_product"
 	@$(ECHO) "all_fastdebug:    Same as: fastdebug fastdebug1 export_fastdebug"
-	@$(ECHO) "all_debug:        Same as: jvmg jvmg1 export_debug"
+	@$(ECHO) "all_debug:        Same as: debug debug1 export_debug"
 	@$(ECHO) "all_optimized:    Same as: optimized optimized1 export_optimized"
 	@$(ECHO) "clean:            Clean all areas"
 	@$(ECHO) "export_product:   Export product files to EXPORT_PATH"
@@ -730,7 +735,7 @@
 	@$(ECHO) \
 "  $(MAKE) world"
 	@$(ECHO) \
-"  $(MAKE) ALT_BOOTDIR=/opt/java/jdk$(PREVIOUS_JDK_VERSION)" 
+"  $(MAKE) ALT_BOOTDIR=/opt/java/jdk$(PREVIOUS_JDK_VERSION)"
 	@$(ECHO) \
 "  $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk$(JDK_VERSION)"
 
@@ -741,6 +746,23 @@
 endif
 endif
 
+# Compatibility for transition to new naming
+warn_jvmg_deprecated:
+	echo "Warning: The jvmg target has been replaced with debug"
+	echo "Warning: Please update your usage"
+
+jvmg: warn_jvmg_deprecated debug
+
+jvmg1: warn_jvmg_deprecated debug1
+
+jvmgminimal1: warn_jvmg_deprecated debugminimal1
+
+jvmgcore: warn_jvmg_deprecated debugcore
+
+jvmgzero: warn_jvmg_deprecated debugzero
+
+jvmgshark: warn_jvmg_deprecated debugshark
+
 # JPRT rule to build this workspace
 include $(GAMMADIR)/make/jprt.gmk
 
--- a/hotspot/make/bsd/Makefile	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/bsd/Makefile	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -142,55 +142,43 @@
 #
 #       debug           compiler2       <os>_<arch>_compiler2/debug
 #       fastdebug       compiler2       <os>_<arch>_compiler2/fastdebug
-#       jvmg            compiler2       <os>_<arch>_compiler2/jvmg
 #       optimized       compiler2       <os>_<arch>_compiler2/optimized
-#       profiled        compiler2       <os>_<arch>_compiler2/profiled
 #       product         compiler2       <os>_<arch>_compiler2/product
 #
 #       debug1          compiler1       <os>_<arch>_compiler1/debug
 #       fastdebug1      compiler1       <os>_<arch>_compiler1/fastdebug
-#       jvmg1           compiler1       <os>_<arch>_compiler1/jvmg
 #       optimized1      compiler1       <os>_<arch>_compiler1/optimized
-#       profiled1       compiler1       <os>_<arch>_compiler1/profiled
 #       product1        compiler1       <os>_<arch>_compiler1/product
 #
 #       debugcore       core            <os>_<arch>_core/debug
 #       fastdebugcore   core            <os>_<arch>_core/fastdebug
-#       jvmgcore        core            <os>_<arch>_core/jvmg
 #       optimizedcore   core            <os>_<arch>_core/optimized
-#       profiledcore    core            <os>_<arch>_core/profiled
 #       productcore     core            <os>_<arch>_core/product
 #
 #       debugzero       zero            <os>_<arch>_zero/debug
 #       fastdebugzero   zero            <os>_<arch>_zero/fastdebug
-#       jvmgzero        zero            <os>_<arch>_zero/jvmg
 #       optimizedzero   zero            <os>_<arch>_zero/optimized
-#       profiledzero    zero            <os>_<arch>_zero/profiled
 #       productzero     zero            <os>_<arch>_zero/product
 #
 #       debugshark      shark           <os>_<arch>_shark/debug
 #       fastdebugshark  shark           <os>_<arch>_shark/fastdebug
-#       jvmgshark       shark           <os>_<arch>_shark/jvmg
 #       optimizedshark  shark           <os>_<arch>_shark/optimized
-#       profiledshark   shark           <os>_<arch>_shark/profiled
 #       productshark    shark           <os>_<arch>_shark/product
 #
 #       fastdebugminimal1 minimal1      <os>_<arch>_minimal1/fastdebug
-#       jvmgminimal1      minimal1      <os>_<arch>_minimal1/jvmg
+#       debugminimal1     minimal1      <os>_<arch>_minimal1/debug
 #       productminimal1   minimal1      <os>_<arch>_minimal1/product
 #
 # What you get with each target:
 #
-# debug*     - "thin" libjvm - debug info linked into the gamma launcher
+# debug*     - debug compile with asserts enabled
 # fastdebug* - optimized compile, but with asserts enabled
-# jvmg*      - "fat" libjvm - debug info linked into libjvm.so
 # optimized* - optimized compile, no asserts
-# profiled*  - gprof
 # product*   - the shippable thing:  optimized compile, no asserts, -DPRODUCT
 
 # This target list needs to be coordinated with the usage message
 # in the build.sh script:
-TARGETS           = debug jvmg fastdebug optimized profiled product
+TARGETS           = debug fastdebug optimized product
 
 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
   SUBDIR_DOCS     = $(OSNAME)_$(VARIANTARCH)_docs
@@ -354,15 +342,29 @@
 	$(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) jvmtidocs
 
 # Synonyms for win32-like targets.
-compiler2:  jvmg product
+compiler2:  debug product
+
+compiler1:  debug1 product1
 
-compiler1:  jvmg1 product1
+core: debugcore productcore
+
+zero: debugzero productzero
+
+shark: debugshark productshark
 
-core: jvmgcore productcore
+warn_jvmg_deprecated:
+	echo "Warning: The jvmg target has been replaced with debug"
+	echo "Warning: Please update your usage"
+
+jvmg: warn_jvmg_deprecated debug
 
-zero: jvmgzero productzero
+jvmg1: warn_jvmg_deprecated debug1
+
+jvmgcore: warn_jvmg_deprecated debugcore
 
-shark: jvmgshark productshark
+jvmgzero: warn_jvmg_deprecated debugzero
+
+jvmgshark: warn_jvmg_deprecated debugshark
 
 clean_docs:
 	rm -rf $(SUBDIR_DOCS)
--- a/hotspot/make/bsd/makefiles/buildtree.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/bsd/makefiles/buildtree.make	Wed May 08 11:22:25 2013 +0100
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Usage:
@@ -46,11 +46,11 @@
 # Makefile	- for "make foo"
 # flags.make	- with macro settings
 # vm.make	- to support making "$(MAKE) -v vm.make" in makefiles
-# adlc.make	- 
+# adlc.make	-
 # jvmti.make	- generate JVMTI bindings from the spec (JSR-163)
 # sa.make	- generate SA jar file and natives
 # env.[ck]sh	- environment settings
-# 
+#
 # The makefiles are split this way so that "make foo" will run faster by not
 # having to read the dependency files for the vm.
 
@@ -122,7 +122,7 @@
 	$(PLATFORM_DIR)/generated/jvmtifiles \
 	$(PLATFORM_DIR)/generated/dtracefiles
 
-TARGETS      = debug fastdebug jvmg optimized product profiled
+TARGETS      = debug fastdebug optimized product
 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
 
 # For dependencies and recursive makes.
@@ -186,8 +186,8 @@
 	$(QUIETLY) mkdir -p $@
 
 # Convenience macro which takes a source relative path, applies $(1) to the
-# absolute path, and then replaces $(GAMMADIR) in the result with a 
-# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile.  
+# absolute path, and then replaces $(GAMMADIR) in the result with a
+# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile.
 gamma-path=$(subst $(GAMMADIR),\$$(GAMMADIR),$(call $(1),$(HS_COMMON_SRC)/$(2)))
 
 # This bit is needed to enable local rebuilds.
@@ -279,8 +279,6 @@
 	$(QUIETLY) ( \
 	$(BUILDTREE_COMMENT); \
 	echo; \
-	[ "$(TARGET)" = profiled ] && \
-	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/optimized.make"; \
 	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(TARGET).make"; \
 	) > $@
 
@@ -381,7 +379,7 @@
 	$(QUIETLY) ( \
 	$(BUILDTREE_COMMENT); \
 	echo "JDK=${JAVA_HOME}"; \
-	) > $@	   
+	) > $@
 
 FORCE:
 
--- a/hotspot/make/bsd/makefiles/debug.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/bsd/makefiles/debug.make	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Sets make macros for making debug version of VM
@@ -27,17 +27,16 @@
 # Compiler specific DEBUG_CFLAGS are passed in from gcc.make, sparcWorks.make
 DEBUG_CFLAGS/DEFAULT= $(DEBUG_CFLAGS)
 DEBUG_CFLAGS/BYFILE = $(DEBUG_CFLAGS/$@)$(DEBUG_CFLAGS/DEFAULT$(DEBUG_CFLAGS/$@))
-CFLAGS += $(DEBUG_CFLAGS/BYFILE)
+
+# _NMT_NOINLINE_ informs NMT that no inlining by Compiler
+CFLAGS += $(DEBUG_CFLAGS/BYFILE) -D_NMT_NOINLINE_
+
+# Set the environment variable HOTSPARC_GENERIC to "true"
+# to inhibit the effect of the previous line on CFLAGS.
 
 # Linker mapfile
 MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug
 
-_JUNK_ := $(shell echo -e >&2 ""\
- "----------------------------------------------------------------------\n" \
- "WARNING: 'make debug' is deprecated. It will be removed in the future.\n" \
- "Please use 'make jvmg' to build debug JVM.                            \n" \
- "----------------------------------------------------------------------\n")
-
 VERSION = debug
-SYSDEFS += -DASSERT -DDEBUG
+SYSDEFS += -DASSERT
 PICFLAGS = DEFAULT
--- a/hotspot/make/bsd/makefiles/defs.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/bsd/makefiles/defs.make	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # The common definitions for hotspot bsd builds.
@@ -86,7 +86,7 @@
     VM_PLATFORM     = bsd_i486
     HS_ARCH         = x86
     # We have to reset ARCH to i386 since SRCARCH relies on it
-    ARCH            = i386   
+    ARCH            = i386
   endif
 endif
 
@@ -146,9 +146,6 @@
   LIBRARY_SUFFIX=so
 endif
 
-# FIXUP: The subdirectory for a debug build is NOT the same on all platforms
-VM_DEBUG=jvmg
-
 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
 
 # client and server subdirectories have symbolic links to ../libjsig.so
@@ -177,7 +174,7 @@
     else
 	EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.debuginfo
     endif
-  endif 
+  endif
 endif
 
 # Serviceability Binaries
--- a/hotspot/make/bsd/makefiles/fastdebug.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/bsd/makefiles/fastdebug.make	Wed May 08 11:22:25 2013 +0100
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Sets make macros for making debug version of VM
@@ -59,5 +59,5 @@
 MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug
 
 VERSION = optimized
-SYSDEFS += -DASSERT -DFASTDEBUG
+SYSDEFS += -DASSERT
 PICFLAGS = DEFAULT
--- a/hotspot/make/bsd/makefiles/jvmg.make	Wed May 01 12:25:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#  
-#
-
-# Sets make macros for making debug version of VM
-
-# Compiler specific DEBUG_CFLAGS are passed in from gcc.make, sparcWorks.make
-DEBUG_CFLAGS/DEFAULT= $(DEBUG_CFLAGS)
-DEBUG_CFLAGS/BYFILE = $(DEBUG_CFLAGS/$@)$(DEBUG_CFLAGS/DEFAULT$(DEBUG_CFLAGS/$@))
-
-# _NMT_NOINLINE_ informs NMT that no inlining by Compiler
-CFLAGS += $(DEBUG_CFLAGS/BYFILE) -D_NMT_NOINLINE_
-
-# Set the environment variable HOTSPARC_GENERIC to "true"
-# to inhibit the effect of the previous line on CFLAGS.
-
-# Linker mapfile
-MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug
-
-VERSION = debug
-SYSDEFS += -DASSERT -DDEBUG
-PICFLAGS = DEFAULT
--- a/hotspot/make/bsd/makefiles/profiled.make	Wed May 01 12:25:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#  
-#
-
-# Sets make macros for making profiled version of Gamma VM
-# (It is also optimized.)
-
-CFLAGS += -pg
-AOUT_FLAGS += -pg
-LDNOMAP = true
--- a/hotspot/make/bsd/makefiles/vm.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/bsd/makefiles/vm.make	Wed May 08 11:22:25 2013 +0100
@@ -187,7 +187,7 @@
 Src_Dirs/SHARK     := $(CORE_PATHS) $(SHARK_PATHS)
 Src_Dirs := $(Src_Dirs/$(TYPE))
 
-COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
+COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp c2_\* runtime_\*
 COMPILER1_SPECIFIC_FILES := c1_\*
 SHARK_SPECIFIC_FILES     := shark
 ZERO_SPECIFIC_FILES      := zero
--- a/hotspot/make/hotspot_version	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/hotspot_version	Wed May 08 11:22:25 2013 +0100
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=28
+HS_BUILD_NUMBER=30
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8
--- a/hotspot/make/jprt.properties	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/jprt.properties	Wed May 08 11:22:25 2013 +0100
@@ -133,15 +133,15 @@
 # Standard list of jprt build targets for this source tree
 
 jprt.build.targets.standard= \
-    ${jprt.my.solaris.sparc}-{product|fastdebug|debug}, \
-    ${jprt.my.solaris.sparcv9}-{product|fastdebug|debug}, \
-    ${jprt.my.solaris.i586}-{product|fastdebug|debug}, \
-    ${jprt.my.solaris.x64}-{product|fastdebug|debug}, \
-    ${jprt.my.linux.i586}-{product|fastdebug|debug}, \
+    ${jprt.my.solaris.sparc}-{product|fastdebug}, \
+    ${jprt.my.solaris.sparcv9}-{product|fastdebug}, \
+    ${jprt.my.solaris.i586}-{product|fastdebug}, \
+    ${jprt.my.solaris.x64}-{product|fastdebug}, \
+    ${jprt.my.linux.i586}-{product|fastdebug}, \
     ${jprt.my.linux.x64}-{product|fastdebug}, \
-    ${jprt.my.macosx.x64}-{product|fastdebug|debug}, \
-    ${jprt.my.windows.i586}-{product|fastdebug|debug}, \
-    ${jprt.my.windows.x64}-{product|fastdebug|debug}, \
+    ${jprt.my.macosx.x64}-{product|fastdebug}, \
+    ${jprt.my.windows.i586}-{product|fastdebug}, \
+    ${jprt.my.windows.x64}-{product|fastdebug}, \
     ${jprt.my.linux.armvh}-{product|fastdebug}
 
 jprt.build.targets.open= \
@@ -150,7 +150,7 @@
     ${jprt.my.linux.x64}-{productOpen}
 
 jprt.build.targets.embedded= \
-    ${jprt.my.linux.i586}-{productEmb|fastdebugEmb|debugEmb}, \
+    ${jprt.my.linux.i586}-{productEmb|fastdebugEmb}, \
     ${jprt.my.linux.ppc}-{productEmb|fastdebugEmb}, \
     ${jprt.my.linux.ppcv2}-{productEmb|fastdebugEmb}, \
     ${jprt.my.linux.ppcsflt}-{productEmb|fastdebugEmb}, \
@@ -174,21 +174,18 @@
     ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-scimark, \
     ${jprt.my.solaris.sparc}-product-{c1|c2}-runThese, \
     ${jprt.my.solaris.sparc}-fastdebug-c1-runThese_Xshare, \
-    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_default, \
     ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
     ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
     ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
     ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
     ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
     ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \
-    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_default, \
     ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_SerialGC, \
     ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParallelGC, \
     ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParNewGC, \
     ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_CMS, \
     ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_G1, \
     ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParOldGC, \
-    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_default, \
     ${jprt.my.solaris.sparc}-{product|fastdebug}-c2-jbb_default_nontiered, \
     ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_SerialGC, \
     ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_ParallelGC, \
@@ -201,21 +198,18 @@
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jvm98_nontiered, \
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-scimark, \
     ${jprt.my.solaris.sparcv9}-product-c2-runThese, \
-    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_default, \
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_SerialGC, \
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_CMS, \
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_G1, \
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_ParOldGC, \
-    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_default, \
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_SerialGC, \
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_ParallelGC, \
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_ParNewGC, \
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_CMS, \
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_G1, \
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_ParOldGC, \
-    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_default, \
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_default_nontiered, \
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_SerialGC, \
     ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_ParallelGC, \
@@ -229,21 +223,18 @@
     ${jprt.my.solaris.x64}-{product|fastdebug}-c2-scimark, \
     ${jprt.my.solaris.x64}-product-c2-runThese, \
     ${jprt.my.solaris.x64}-product-c2-runThese_Xcomp, \
-    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_default, \
     ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \
     ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
     ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
     ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_CMS, \
     ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_G1, \
     ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_ParOldGC, \
-    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_default, \
     ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \
     ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \
     ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \
     ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_CMS, \
     ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_G1, \
     ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \
-    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_default, \
     ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_default_nontiered, \
     ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_SerialGC, \
     ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
@@ -258,28 +249,24 @@
     ${jprt.my.solaris.i586}-product-{c1|c2}-runThese_Xcomp, \
     ${jprt.my.solaris.i586}-fastdebug-c1-runThese_Xcomp, \
     ${jprt.my.solaris.i586}-fastdebug-c1-runThese_Xshare, \
-    ${jprt.my.solaris.i586}-product-c1-GCBasher_default, \
     ${jprt.my.solaris.i586}-product-c1-GCBasher_SerialGC, \
     ${jprt.my.solaris.i586}-product-c1-GCBasher_ParallelGC, \
     ${jprt.my.solaris.i586}-product-c1-GCBasher_ParNewGC, \
     ${jprt.my.solaris.i586}-product-c1-GCBasher_CMS, \
     ${jprt.my.solaris.i586}-product-c1-GCBasher_G1, \
     ${jprt.my.solaris.i586}-product-c1-GCBasher_ParOldGC, \
-    ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_default, \
     ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_SerialGC, \
     ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParallelGC, \
     ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParNewGC, \
     ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_CMS, \
     ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_G1, \
     ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParOldGC, \
-    ${jprt.my.solaris.i586}-product-c1-GCOld_default, \
     ${jprt.my.solaris.i586}-product-c1-GCOld_SerialGC, \
     ${jprt.my.solaris.i586}-product-c1-GCOld_ParallelGC, \
     ${jprt.my.solaris.i586}-product-c1-GCOld_ParNewGC, \
     ${jprt.my.solaris.i586}-product-c1-GCOld_CMS, \
     ${jprt.my.solaris.i586}-product-c1-GCOld_G1, \
     ${jprt.my.solaris.i586}-product-c1-GCOld_ParOldGC, \
-    ${jprt.my.solaris.i586}-fastdebug-c2-jbb_default, \
     ${jprt.my.solaris.i586}-fastdebug-c2-jbb_default_nontiered, \
     ${jprt.my.solaris.i586}-fastdebug-c2-jbb_ParallelGC, \
     ${jprt.my.solaris.i586}-fastdebug-c2-jbb_CMS, \
@@ -293,21 +280,19 @@
     ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \
     ${jprt.my.linux.i586}-fastdebug-c1-runThese_Xshare, \
     ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp, \
-    ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \
     ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
     ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
     ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
     ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
     ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
     ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \
-    ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_default, \
     ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_SerialGC, \
     ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParallelGC, \
     ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParNewGC, \
     ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_CMS, \
     ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_G1, \
     ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParOldGC, \
-    ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_default, \
+    ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_SerialGC, \
     ${jprt.my.linux.i586}-{product|fastdebug}-c2-jbb_default_nontiered, \
     ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParallelGC, \
     ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_CMS, \
@@ -318,21 +303,18 @@
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98_nontiered, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-scimark, \
-    ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_default, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_CMS, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_G1, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_ParOldGC, \
-    ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_default, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_CMS, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_G1, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \
-    ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_default, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_default_nontiered, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
     ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_G1, \
@@ -342,21 +324,18 @@
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jvm98, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jvm98_nontiered, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-scimark, \
-    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_default, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_CMS, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_G1, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_ParOldGC, \
-    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_default, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_CMS, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_G1, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \
-    ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default_nontiered, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
     ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_G1, \
@@ -369,14 +348,12 @@
     ${jprt.my.windows.i586}-product-{c1|c2}-runThese, \
     ${jprt.my.windows.i586}-product-{c1|c2}-runThese_Xcomp, \
     ${jprt.my.windows.i586}-fastdebug-c1-runThese_Xshare, \
-    ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \
     ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
     ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
     ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
     ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
     ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
     ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \
-    ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_default, \
     ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_SerialGC, \
     ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_ParallelGC, \
     ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_ParNewGC, \
@@ -396,14 +373,12 @@
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-scimark, \
     ${jprt.my.windows.x64}-product-c2-runThese, \
     ${jprt.my.windows.x64}-product-c2-runThese_Xcomp, \
-    ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_default, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_CMS, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_G1, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParOldGC, \
-    ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_default, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \
@@ -419,7 +394,7 @@
 
 # Some basic "smoke" tests for OpenJDK builds
 jprt.test.targets.open = \
-    ${jprt.my.solaris.x64}-{productOpen|debugOpen|fastdebugOpen}-c2-jvm98, \
+    ${jprt.my.solaris.x64}-{productOpen|fastdebugOpen}-c2-jvm98, \
     ${jprt.my.solaris.i586}-{productOpen|fastdebugOpen}-c2-jvm98, \
     ${jprt.my.linux.x64}-{productOpen|fastdebugOpen}-c2-jvm98
 
@@ -520,5 +495,5 @@
 jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}}
 
 # 7155453: Work-around to prevent popups on OSX from blocking test completion
-# but the work-around is added to all platforms to be consistent 
+# but the work-around is added to all platforms to be consistent
 jprt.jbb.options=-Djava.awt.headless=true
--- a/hotspot/make/linux/Makefile	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/linux/Makefile	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -142,55 +142,42 @@
 #
 #       debug           compiler2       <os>_<arch>_compiler2/debug
 #       fastdebug       compiler2       <os>_<arch>_compiler2/fastdebug
-#       jvmg            compiler2       <os>_<arch>_compiler2/jvmg
 #       optimized       compiler2       <os>_<arch>_compiler2/optimized
-#       profiled        compiler2       <os>_<arch>_compiler2/profiled
 #       product         compiler2       <os>_<arch>_compiler2/product
 #
 #       debug1          compiler1       <os>_<arch>_compiler1/debug
 #       fastdebug1      compiler1       <os>_<arch>_compiler1/fastdebug
-#       jvmg1           compiler1       <os>_<arch>_compiler1/jvmg
 #       optimized1      compiler1       <os>_<arch>_compiler1/optimized
-#       profiled1       compiler1       <os>_<arch>_compiler1/profiled
 #       product1        compiler1       <os>_<arch>_compiler1/product
 #
 #       debugcore       core            <os>_<arch>_core/debug
 #       fastdebugcore   core            <os>_<arch>_core/fastdebug
-#       jvmgcore        core            <os>_<arch>_core/jvmg
 #       optimizedcore   core            <os>_<arch>_core/optimized
-#       profiledcore    core            <os>_<arch>_core/profiled
 #       productcore     core            <os>_<arch>_core/product
 #
 #       debugzero       zero            <os>_<arch>_zero/debug
 #       fastdebugzero   zero            <os>_<arch>_zero/fastdebug
-#       jvmgzero        zero            <os>_<arch>_zero/jvmg
 #       optimizedzero   zero            <os>_<arch>_zero/optimized
-#       profiledzero    zero            <os>_<arch>_zero/profiled
 #       productzero     zero            <os>_<arch>_zero/product
 #
 #       debugshark      shark           <os>_<arch>_shark/debug
 #       fastdebugshark  shark           <os>_<arch>_shark/fastdebug
-#       jvmgshark       shark           <os>_<arch>_shark/jvmg
 #       optimizedshark  shark           <os>_<arch>_shark/optimized
-#       profiledshark   shark           <os>_<arch>_shark/profiled
 #       productshark    shark           <os>_<arch>_shark/product
 #
 #       fastdebugminimal1 minimal1      <os>_<arch>_minimal1/fastdebug
-#       jvmgminimal1      minimal1      <os>_<arch>_minimal1/jvmg
 #       productminimal1   minimal1      <os>_<arch>_minimal1/product
 #
 # What you get with each target:
 #
-# debug*     - "thin" libjvm - debug info linked into the gamma launcher
+# debug*     - debug compile with asserts enabled
 # fastdebug* - optimized compile, but with asserts enabled
-# jvmg*      - "fat" libjvm - debug info linked into libjvm.so
 # optimized* - optimized compile, no asserts
-# profiled*  - gprof
 # product*   - the shippable thing:  optimized compile, no asserts, -DPRODUCT
 
 # This target list needs to be coordinated with the usage message
 # in the build.sh script:
-TARGETS           = debug jvmg fastdebug optimized profiled product
+TARGETS           = debug fastdebug optimized product
 
 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
   SUBDIR_DOCS     = $(OSNAME)_$(VARIANTARCH)_docs
@@ -357,15 +344,29 @@
 	$(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) BUILD_FLAVOR=product jvmtidocs
 
 # Synonyms for win32-like targets.
-compiler2:  jvmg product
+compiler2:  debug product
+
+compiler1:  debug1 product1
 
-compiler1:  jvmg1 product1
+core: debugcore productcore
+
+zero: debugzero productzero
+
+shark: debugshark productshark
 
-core: jvmgcore productcore
+warn_jvmg_deprecated:
+	echo "Warning: The jvmg target has been replaced with debug"
+	echo "Warning: Please update your usage"
+
+jvmg: warn_jvmg_deprecated debug
 
-zero: jvmgzero productzero
+jvmg1: warn_jvmg_deprecated debug1
+
+jvmgcore: warn_jvmg_deprecated debugcore
 
-shark: jvmgshark productshark
+jvmgzero: warn_jvmg_deprecated debugzero
+
+jvmgshark: warn_jvmg_deprecated debugshark
 
 clean_docs:
 	rm -rf $(SUBDIR_DOCS)
--- a/hotspot/make/linux/makefiles/buildtree.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/linux/makefiles/buildtree.make	Wed May 08 11:22:25 2013 +0100
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Usage:
@@ -46,11 +46,11 @@
 # Makefile	- for "make foo"
 # flags.make	- with macro settings
 # vm.make	- to support making "$(MAKE) -v vm.make" in makefiles
-# adlc.make	- 
+# adlc.make	-
 # jvmti.make	- generate JVMTI bindings from the spec (JSR-163)
 # sa.make	- generate SA jar file and natives
 # env.[ck]sh	- environment settings
-# 
+#
 # The makefiles are split this way so that "make foo" will run faster by not
 # having to read the dependency files for the vm.
 
@@ -117,7 +117,7 @@
 	$(PLATFORM_DIR)/generated/adfiles \
 	$(PLATFORM_DIR)/generated/jvmtifiles
 
-TARGETS      = debug fastdebug jvmg optimized product profiled
+TARGETS      = debug fastdebug optimized product
 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
 
 # For dependencies and recursive makes.
@@ -179,8 +179,8 @@
 	$(QUIETLY) mkdir -p $@
 
 # Convenience macro which takes a source relative path, applies $(1) to the
-# absolute path, and then replaces $(GAMMADIR) in the result with a 
-# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile.  
+# absolute path, and then replaces $(GAMMADIR) in the result with a
+# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile.
 gamma-path=$(subst $(GAMMADIR),\$$(GAMMADIR),$(call $(1),$(HS_COMMON_SRC)/$(2)))
 
 # This bit is needed to enable local rebuilds.
@@ -284,8 +284,6 @@
 	$(QUIETLY) ( \
 	$(BUILDTREE_COMMENT); \
 	echo; \
-	[ "$(TARGET)" = profiled ] && \
-	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/optimized.make"; \
 	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(TARGET).make"; \
 	) > $@
 
@@ -376,7 +374,7 @@
 	$(QUIETLY) ( \
 	$(BUILDTREE_COMMENT); \
 	echo "JDK=${JAVA_HOME}"; \
-	) > $@	   
+	) > $@
 
 FORCE:
 
--- a/hotspot/make/linux/makefiles/debug.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/linux/makefiles/debug.make	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Sets make macros for making debug version of VM
@@ -27,17 +27,16 @@
 # Compiler specific DEBUG_CFLAGS are passed in from gcc.make, sparcWorks.make
 DEBUG_CFLAGS/DEFAULT= $(DEBUG_CFLAGS)
 DEBUG_CFLAGS/BYFILE = $(DEBUG_CFLAGS/$@)$(DEBUG_CFLAGS/DEFAULT$(DEBUG_CFLAGS/$@))
-CFLAGS += $(DEBUG_CFLAGS/BYFILE)
+
+# _NMT_NOINLINE_ informs NMT that no inlining by Compiler
+CFLAGS += $(DEBUG_CFLAGS/BYFILE) -D_NMT_NOINLINE_
+
+# Set the environment variable HOTSPARC_GENERIC to "true"
+# to inhibit the effect of the previous line on CFLAGS.
 
 # Linker mapfile
 MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-debug
 
-_JUNK_ := $(shell echo -e >&2 ""\
- "----------------------------------------------------------------------\n" \
- "WARNING: 'make debug' is deprecated. It will be removed in the future.\n" \
- "Please use 'make jvmg' to build debug JVM.                            \n" \
- "----------------------------------------------------------------------\n")
-
 VERSION = debug
-SYSDEFS += -DASSERT -DDEBUG
+SYSDEFS += -DASSERT
 PICFLAGS = DEFAULT
--- a/hotspot/make/linux/makefiles/defs.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/linux/makefiles/defs.make	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # The common definitions for hotspot linux builds.
@@ -92,7 +92,7 @@
     VM_PLATFORM     = linux_i486
     HS_ARCH         = x86
     # We have to reset ARCH to i686 since SRCARCH relies on it
-    ARCH            = i686   
+    ARCH            = i686
   endif
 endif
 
@@ -240,9 +240,6 @@
 # Library suffix
 LIBRARY_SUFFIX=so
 
-# FIXUP: The subdirectory for a debug build is NOT the same on all platforms
-VM_DEBUG=jvmg
-
 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
 
 # client and server subdirectories have symbolic links to ../libjsig.so
@@ -279,7 +276,7 @@
     else
       EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
     endif
-  endif 
+  endif
 endif
 
 ifeq ($(JVM_VARIANT_MINIMAL1),true)
@@ -292,15 +289,15 @@
     else
 	EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.debuginfo
     endif
-  endif 
+  endif
 endif
 
 # Serviceability Binaries
 # No SA Support for PPC, IA64, ARM or zero
 ADD_SA_BINARIES/x86   = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
-                        $(EXPORT_LIB_DIR)/sa-jdi.jar 
+                        $(EXPORT_LIB_DIR)/sa-jdi.jar
 ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
-                        $(EXPORT_LIB_DIR)/sa-jdi.jar 
+                        $(EXPORT_LIB_DIR)/sa-jdi.jar
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
   ifeq ($(ZIP_DEBUGINFO_FILES),1)
     ADD_SA_BINARIES/x86   += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
@@ -310,10 +307,10 @@
     ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
   endif
 endif
-ADD_SA_BINARIES/ppc   = 
-ADD_SA_BINARIES/ia64  = 
-ADD_SA_BINARIES/arm   = 
-ADD_SA_BINARIES/zero  = 
+ADD_SA_BINARIES/ppc   =
+ADD_SA_BINARIES/ia64  =
+ADD_SA_BINARIES/arm   =
+ADD_SA_BINARIES/zero  =
 
 -include $(HS_ALT_MAKE)/linux/makefiles/defs.make
 
--- a/hotspot/make/linux/makefiles/fastdebug.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/linux/makefiles/fastdebug.make	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Sets make macros for making debug version of VM
@@ -59,5 +59,5 @@
 MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-debug
 
 VERSION = optimized
-SYSDEFS += -DASSERT -DFASTDEBUG
+SYSDEFS += -DASSERT
 PICFLAGS = DEFAULT
--- a/hotspot/make/linux/makefiles/jvmg.make	Wed May 01 12:25:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#  
-#
-
-# Sets make macros for making debug version of VM
-
-# Compiler specific DEBUG_CFLAGS are passed in from gcc.make, sparcWorks.make
-DEBUG_CFLAGS/DEFAULT= $(DEBUG_CFLAGS)
-DEBUG_CFLAGS/BYFILE = $(DEBUG_CFLAGS/$@)$(DEBUG_CFLAGS/DEFAULT$(DEBUG_CFLAGS/$@))
-
-# _NMT_NOINLINE_ informs NMT that no inlining by Compiler
-CFLAGS += $(DEBUG_CFLAGS/BYFILE) -D_NMT_NOINLINE_
-
-# Set the environment variable HOTSPARC_GENERIC to "true"
-# to inhibit the effect of the previous line on CFLAGS.
-
-# Linker mapfile
-MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-debug
-
-VERSION = debug
-SYSDEFS += -DASSERT -DDEBUG
-PICFLAGS = DEFAULT
--- a/hotspot/make/linux/makefiles/profiled.make	Wed May 01 12:25:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#  
-#
-
-# Sets make macros for making profiled version of Gamma VM
-# (It is also optimized.)
-
-CFLAGS += -pg
-AOUT_FLAGS += -pg
-LDNOMAP = true
--- a/hotspot/make/linux/makefiles/vm.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/linux/makefiles/vm.make	Wed May 08 11:22:25 2013 +0100
@@ -189,7 +189,7 @@
 Src_Dirs/SHARK     := $(CORE_PATHS) $(SHARK_PATHS)
 Src_Dirs := $(Src_Dirs/$(TYPE))
 
-COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
+COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp c2_\* runtime_\*
 COMPILER1_SPECIFIC_FILES := c1_\*
 SHARK_SPECIFIC_FILES     := shark
 ZERO_SPECIFIC_FILES      := zero
--- a/hotspot/make/solaris/Makefile	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/solaris/Makefile	Wed May 08 11:22:25 2013 +0100
@@ -120,37 +120,29 @@
 #
 #       debug           compiler2       <os>_<arch>_compiler2/debug
 #       fastdebug       compiler2       <os>_<arch>_compiler2/fastdebug
-#       jvmg            compiler2       <os>_<arch>_compiler2/jvmg
 #       optimized       compiler2       <os>_<arch>_compiler2/optimized
-#       profiled        compiler2       <os>_<arch>_compiler2/profiled
 #       product         compiler2       <os>_<arch>_compiler2/product
 #
 #       debug1          compiler1       <os>_<arch>_compiler1/debug
 #       fastdebug1      compiler1       <os>_<arch>_compiler1/fastdebug
-#       jvmg1           compiler1       <os>_<arch>_compiler1/jvmg
 #       optimized1      compiler1       <os>_<arch>_compiler1/optimized
-#       profiled1       compiler1       <os>_<arch>_compiler1/profiled
 #       product1        compiler1       <os>_<arch>_compiler1/product
 #
 #       debugcore       core            <os>_<arch>_core/debug
 #       fastdebugcore   core            <os>_<arch>_core/fastdebug
-#       jvmgcore        core            <os>_<arch>_core/jvmg
 #       optimizedcore   core            <os>_<arch>_core/optimized
-#       profiledcore    core            <os>_<arch>_core/profiled
 #       productcore     core            <os>_<arch>_core/product
 #
 # What you get with each target:
 #
-# debug*     - "thin" libjvm - debug info linked into the gamma launcher
+# debug*     - debug compile with asserts enabled
 # fastdebug* - optimized compile, but with asserts enabled
-# jvmg*      - "fat" libjvm - debug info linked into libjvm.so
 # optimized* - optimized compile, no asserts
-# profiled*  - gprof
 # product*   - the shippable thing:  optimized compile, no asserts, -DPRODUCT
 
 # This target list needs to be coordinated with the usage message
 # in the build.sh script:
-TARGETS           = debug jvmg fastdebug optimized profiled product
+TARGETS           = debug fastdebug optimized product
 
 SUBDIR_DOCS       = $(OSNAME)_$(BUILDARCH)_docs
 SUBDIRS_C1        = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler1/,$(TARGETS))
@@ -267,11 +259,21 @@
 	$(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) BUILD_FLAVOR=product jvmtidocs
 
 # Synonyms for win32-like targets.
-compiler2:  jvmg product
+compiler2:  debug product
+
+compiler1:  debug1 product1
+
+core: debugcore productcore
 
-compiler1:  jvmg1 product1
+warn_jvmg_deprecated:
+	echo "Warning: The jvmg target has been replaced with debug"
+	echo "Warning: Please update your usage"
 
-core: jvmgcore productcore
+jvmg: warn_jvmg_deprecated debug
+
+jvmg1: warn_jvmg_deprecated debug1
+
+jvmgcore: warn_jvmg_deprecated debugcore
 
 clean_docs:
 	rm -rf $(SUBDIR_DOCS)
--- a/hotspot/make/solaris/makefiles/buildtree.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/solaris/makefiles/buildtree.make	Wed May 08 11:22:25 2013 +0100
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Usage:
@@ -46,11 +46,11 @@
 # Makefile	- for "make foo"
 # flags.make	- with macro settings
 # vm.make	- to support making "$(MAKE) -v vm.make" in makefiles
-# adlc.make	- 
+# adlc.make	-
 # jvmti.make	- generate JVMTI bindings from the spec (JSR-163)
 # sa.make	- generate SA jar file and natives
 # env.[ck]sh	- environment settings
-# 
+#
 # The makefiles are split this way so that "make foo" will run faster by not
 # having to read the dependency files for the vm.
 
@@ -69,7 +69,7 @@
 GCC_LIB         = /usr/local/lib
 else
 PLATFORM_FILE	= $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH)
-GCC_LIB         = 
+GCC_LIB         =
 endif
 
 ifdef FORCE_TIERED
@@ -110,7 +110,7 @@
 	$(PLATFORM_DIR)/generated/adfiles \
 	$(PLATFORM_DIR)/generated/jvmtifiles
 
-TARGETS      = debug fastdebug jvmg optimized product profiled
+TARGETS      = debug fastdebug optimized product
 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
 
 # For dependencies and recursive makes.
@@ -153,7 +153,7 @@
   endif
 endif
 
-BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 
+BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
 
 BUILDTREE	= \
 	$(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS)
@@ -172,8 +172,8 @@
 	$(QUIETLY) mkdir -p $@
 
 # Convenience macro which takes a source relative path, applies $(1) to the
-# absolute path, and then replaces $(GAMMADIR) in the result with a 
-# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile.  
+# absolute path, and then replaces $(GAMMADIR) in the result with a
+# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile.
 gamma-path=$(subst $(GAMMADIR),\$$(GAMMADIR),$(call $(1),$(HS_COMMON_SRC)/$(2)))
 
 # This bit is needed to enable local rebuilds.
@@ -274,8 +274,6 @@
 	$(QUIETLY) ( \
 	$(BUILDTREE_COMMENT); \
 	echo; \
-	[ "$(TARGET)" = profiled ] && \
-	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/optimized.make"; \
 	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(TARGET).make"; \
 	) > $@
 
@@ -366,7 +364,7 @@
 	$(QUIETLY) ( \
 	$(BUILDTREE_COMMENT); \
 	echo "JDK=${JAVA_HOME}"; \
-	) > $@	   
+	) > $@
 
 FORCE:
 
--- a/hotspot/make/solaris/makefiles/debug.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/solaris/makefiles/debug.make	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Sets make macros for making debug version of VM
@@ -37,22 +37,20 @@
 endif
 endif
 
-CFLAGS += $(DEBUG_CFLAGS/BYFILE)
+# _NMT_NOINLINE_ informs NMT that no inlining by Compiler
+CFLAGS += $(DEBUG_CFLAGS/BYFILE) -D_NMT_NOINLINE_
+
+# Set the environment variable HOTSPARC_GENERIC to "true"
+# to inhibit the effect of the previous line on CFLAGS.
 
 # Linker mapfiles
 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
           $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug
 
-# This mapfile is only needed when compiling with dtrace support, 
+# This mapfile is only needed when compiling with dtrace support,
 # and mustn't be otherwise.
 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
 
-_JUNK_ := $(shell echo >&2 ""\
- "-------------------------------------------------------------------------\n" \
- "WARNING: 'gnumake debug' is deprecated. It will be removed in the future.\n" \
- "Please use 'gnumake jvmg' to build debug JVM.                            \n" \
- "-------------------------------------------------------------------------\n")
-
 VERSION = debug
-SYSDEFS += -DASSERT -DDEBUG
+SYSDEFS += -DASSERT
 PICFLAGS = DEFAULT
--- a/hotspot/make/solaris/makefiles/defs.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/solaris/makefiles/defs.make	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # The common definitions for hotspot solaris builds.
@@ -172,9 +172,6 @@
 # Library suffix
 LIBRARY_SUFFIX=so
 
-# FIXUP: The subdirectory for a debug build is NOT the same on all platforms
-VM_DEBUG=jvmg
-
 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
 
 # client and server subdirectories have symbolic links to ../libjsig.$(LIBRARY_SUFFIX)
@@ -221,8 +218,8 @@
 endif
 ifeq ($(JVM_VARIANT_CLIENT),true)
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) 
-  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX) 
+  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
+  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
   ifeq ($(ARCH_DATA_MODEL),32)
     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
@@ -257,4 +254,4 @@
     EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
   endif
 endif
-EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 
+EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
--- a/hotspot/make/solaris/makefiles/fastdebug.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/solaris/makefiles/fastdebug.make	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Sets make macros for making debug version of VM
@@ -118,10 +118,10 @@
 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
 	  $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug
 
-# This mapfile is only needed when compiling with dtrace support, 
+# This mapfile is only needed when compiling with dtrace support,
 # and mustn't be otherwise.
 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
 
 VERSION = optimized
-SYSDEFS += -DASSERT -DFASTDEBUG -DCHECK_UNHANDLED_OOPS
+SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS
 PICFLAGS = DEFAULT
--- a/hotspot/make/solaris/makefiles/jvmg.make	Wed May 01 12:25:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#  
-#
-
-# Sets make macros for making debug version of VM
-
-# Compiler specific DEBUG_CFLAGS are passed in from gcc.make, sparcWorks.make
-DEBUG_CFLAGS/DEFAULT= $(DEBUG_CFLAGS)
-DEBUG_CFLAGS/BYFILE = $(DEBUG_CFLAGS/$@)$(DEBUG_CFLAGS/DEFAULT$(DEBUG_CFLAGS/$@))
-
-ifeq ("${Platform_compiler}", "sparcWorks")
-
-ifeq ($(COMPILER_REV_NUMERIC),508)
-  # SS11 SEGV when compiling with -g and -xarch=v8, using different backend
-  DEBUG_CFLAGS/compileBroker.o = $(DEBUG_CFLAGS) -xO0
-  DEBUG_CFLAGS/jvmtiTagMap.o   = $(DEBUG_CFLAGS) -xO0
-endif
-endif
-
-# _NMT_NOINLINE_ informs NMT that no inlining by Compiler
-CFLAGS += $(DEBUG_CFLAGS/BYFILE) -D_NMT_NOINLINE_
-
-# Set the environment variable HOTSPARC_GENERIC to "true"
-# to inhibit the effect of the previous line on CFLAGS.
-
-# Linker mapfiles
-MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
-          $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug
-
-# This mapfile is only needed when compiling with dtrace support,
-# and mustn't be otherwise.
-MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
-
-VERSION = debug
-SYSDEFS += -DASSERT -DDEBUG
-PICFLAGS = DEFAULT
--- a/hotspot/make/solaris/makefiles/profiled.make	Wed May 01 12:25:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#  
-#
-
-# Sets make macros for making profiled version of Gamma VM
-# (It is also optimized.)
-
-CFLAGS += -pg
-
-# On x86 Solaris 2.6, 7, and 8 if LD_LIBRARY_PATH has /usr/lib in it then
-# adlc linked with -pg puts out empty header files. To avoid linking adlc
-# with -pg the profile flag is split out separately and used in rules.make
-
-PROF_AOUT_FLAGS += -pg
-
-# To do a profiled build of the product, such as for generating the
-# reordering file, set PROFILE_PRODUCT.  Otherwise the reordering file will
-# contain references to functions which are not defined in the PRODUCT build.
-
-ifdef PROFILE_PRODUCT
-  SYSDEFS += -DPRODUCT
-endif
-
-LDNOMAP = true
--- a/hotspot/make/solaris/makefiles/vm.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/solaris/makefiles/vm.make	Wed May 08 11:22:25 2013 +0100
@@ -202,7 +202,7 @@
 Src_Dirs/SHARK     := $(CORE_PATHS)
 Src_Dirs := $(Src_Dirs/$(TYPE))
 
-COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
+COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp c2_\* runtime_\*
 COMPILER1_SPECIFIC_FILES := c1_\*
 SHARK_SPECIFIC_FILES     := shark
 ZERO_SPECIFIC_FILES      := zero
--- a/hotspot/make/windows/build.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/windows/build.make	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -235,18 +235,14 @@
 	cd $(variantDir)
 	nmake -nologo -f $(WorkSpace)\make\windows\makefiles\top.make BUILD_FLAVOR=product ARCH=$(ARCH)
 
-# The debug or jvmg (all the same thing) is an optional build
-debug jvmg: checks $(variantDir) $(variantDir)\local.make sanity
+# The debug build is an optional build
+debug: checks $(variantDir) $(variantDir)\local.make sanity
 	cd $(variantDir)
 	nmake -nologo -f $(WorkSpace)\make\windows\makefiles\top.make BUILD_FLAVOR=debug ARCH=$(ARCH)
 fastdebug: checks $(variantDir) $(variantDir)\local.make sanity
 	cd $(variantDir)
 	nmake -nologo -f $(WorkSpace)\make\windows\makefiles\top.make BUILD_FLAVOR=fastdebug ARCH=$(ARCH)
 
-develop: checks $(variantDir) $(variantDir)\local.make sanity
-	cd $(variantDir)
-	nmake -nologo -f $(WorkSpace)\make\windows\makefiles\top.make BUILD_FLAVOR=product DEVELOP=1 ARCH=$(ARCH)
-
 # target to create just the directory structure
 tree: checks $(variantDir) $(variantDir)\local.make sanity
 	mkdir $(variantDir)\product
--- a/hotspot/make/windows/create_obj_files.sh	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/windows/create_obj_files.sh	Wed May 08 11:22:25 2013 +0100
@@ -114,7 +114,7 @@
     "shark")     Src_Dirs="${CORE_PATHS}" ;;
 esac
 
-COMPILER2_SPECIFIC_FILES="opto libadt bcEscapeAnalyzer.cpp chaitin* c2_* runtime_*"
+COMPILER2_SPECIFIC_FILES="opto libadt bcEscapeAnalyzer.cpp c2_* runtime_*"
 COMPILER1_SPECIFIC_FILES="c1_*"
 SHARK_SPECIFIC_FILES="shark"
 ZERO_SPECIFIC_FILES="zero"
--- a/hotspot/make/windows/makefiles/defs.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/windows/makefiles/defs.make	Wed May 08 11:22:25 2013 +0100
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # The common definitions for hotspot windows builds.
@@ -209,8 +209,6 @@
 ifneq (,$(findstring MINGW,$(SYSTEM_UNAME)))
   USING_MINGW=true
 endif
-# FIXUP: The subdirectory for a debug build is NOT the same on all platforms
-VM_DEBUG=debug
 
 # Windows wants particular paths due to nmake (must be after macros defined)
 #   It is important that gnumake invokes nmake with C:\\...\\  formated
@@ -292,7 +290,7 @@
   MAKE_ARGS += BUILD_WIN_SA=1
 endif
 
-# Propagate compiler and tools paths from configure to nmake. 
+# Propagate compiler and tools paths from configure to nmake.
 # Need to make sure they contain \\ and not /.
 ifneq ($(SPEC),)
   ifeq ($(USING_CYGWIN), true)
--- a/hotspot/make/windows/makefiles/vm.make	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/windows/makefiles/vm.make	Wed May 08 11:22:25 2013 +0100
@@ -31,11 +31,7 @@
 ALTSRC=$(WorkSpace)\src\closed
 
 !ifdef RELEASE
-!ifdef DEVELOP
-CXX_FLAGS=$(CXX_FLAGS) /D "DEBUG"
-!else
 CXX_FLAGS=$(CXX_FLAGS) /D "PRODUCT"
-!endif
 !else
 CXX_FLAGS=$(CXX_FLAGS) /D "ASSERT"
 !endif
@@ -186,7 +182,7 @@
 
 # Special case files not using precompiled header files.
 
-c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp 
+c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
 	 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
 
 os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp
--- a/hotspot/make/windows/projectfiles/compiler2/ADLCompiler.dsp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/windows/projectfiles/compiler2/ADLCompiler.dsp	Wed May 08 11:22:25 2013 +0100
@@ -67,7 +67,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /ML /W3 /WX /Gm /GX /Zi /Od /I "." /I "$(HotSpotWorkSpace)\src\share\vm\opto" /I "$(HotSpotWorkSpace)\src\share\vm\prims" /I "$(HotSpotWorkSpace)\src\share\vm\lookup" /I "$(HotSpotWorkSpace)\src\share\vm\interpreter" /I "$(HotSpotWorkSpace)\src\share\vm\asm" /I "$(HotSpotWorkSpace)\src\share\vm\compiler" /I "$(HotSpotWorkSpace)\src\share\vm\utilities" /I "$(HotSpotWorkSpace)\src\share\vm\code" /I "$(HotSpotWorkSpace)\src\share\vm\oops" /I "$(HotSpotWorkSpace)\src\share\vm\runtime" /I "$(HotSpotWorkSpace)\src\share\vm\memory" /I "$(HotSpotWorkSpace)\src\share\vm\libadt" /I "$(HotSpotWorkSpace)\src\cpu\i486\vm" /I "$(HotSpotWorkSpace)\src\os\win32\vm" /D "WIN32" /D "DEBUG" /D "_WINDOWS" /D "ASSERT" /Fr /FD /c
+# ADD CPP /nologo /ML /W3 /WX /Gm /GX /Zi /Od /I "." /I "$(HotSpotWorkSpace)\src\share\vm\opto" /I "$(HotSpotWorkSpace)\src\share\vm\prims" /I "$(HotSpotWorkSpace)\src\share\vm\lookup" /I "$(HotSpotWorkSpace)\src\share\vm\interpreter" /I "$(HotSpotWorkSpace)\src\share\vm\asm" /I "$(HotSpotWorkSpace)\src\share\vm\compiler" /I "$(HotSpotWorkSpace)\src\share\vm\utilities" /I "$(HotSpotWorkSpace)\src\share\vm\code" /I "$(HotSpotWorkSpace)\src\share\vm\oops" /I "$(HotSpotWorkSpace)\src\share\vm\runtime" /I "$(HotSpotWorkSpace)\src\share\vm\memory" /I "$(HotSpotWorkSpace)\src\share\vm\libadt" /I "$(HotSpotWorkSpace)\src\cpu\i486\vm" /I "$(HotSpotWorkSpace)\src\os\win32\vm" /D "WIN32" /D "_WINDOWS" /D "ASSERT" /Fr /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
--- a/hotspot/make/windows/projectfiles/tiered/ADLCompiler.dsp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/make/windows/projectfiles/tiered/ADLCompiler.dsp	Wed May 08 11:22:25 2013 +0100
@@ -67,7 +67,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /ML /W3 /WX /Gm /GX /Zi /Od /I "." /I "$(HotSpotWorkSpace)\src\share\vm\opto" /I "$(HotSpotWorkSpace)\src\share\vm\prims" /I "$(HotSpotWorkSpace)\src\share\vm\lookup" /I "$(HotSpotWorkSpace)\src\share\vm\interpreter" /I "$(HotSpotWorkSpace)\src\share\vm\asm" /I "$(HotSpotWorkSpace)\src\share\vm\compiler" /I "$(HotSpotWorkSpace)\src\share\vm\utilities" /I "$(HotSpotWorkSpace)\src\share\vm\code" /I "$(HotSpotWorkSpace)\src\share\vm\oops" /I "$(HotSpotWorkSpace)\src\share\vm\runtime" /I "$(HotSpotWorkSpace)\src\share\vm\memory" /I "$(HotSpotWorkSpace)\src\share\vm\libadt" /I "$(HotSpotWorkSpace)\src\cpu\i486\vm" /I "$(HotSpotWorkSpace)\src\os\win32\vm" /D "WIN32" /D "DEBUG" /D "_WINDOWS" /D "ASSERT" /Fr /FD /c
+# ADD CPP /nologo /ML /W3 /WX /Gm /GX /Zi /Od /I "." /I "$(HotSpotWorkSpace)\src\share\vm\opto" /I "$(HotSpotWorkSpace)\src\share\vm\prims" /I "$(HotSpotWorkSpace)\src\share\vm\lookup" /I "$(HotSpotWorkSpace)\src\share\vm\interpreter" /I "$(HotSpotWorkSpace)\src\share\vm\asm" /I "$(HotSpotWorkSpace)\src\share\vm\compiler" /I "$(HotSpotWorkSpace)\src\share\vm\utilities" /I "$(HotSpotWorkSpace)\src\share\vm\code" /I "$(HotSpotWorkSpace)\src\share\vm\oops" /I "$(HotSpotWorkSpace)\src\share\vm\runtime" /I "$(HotSpotWorkSpace)\src\share\vm\memory" /I "$(HotSpotWorkSpace)\src\share\vm\libadt" /I "$(HotSpotWorkSpace)\src\cpu\i486\vm" /I "$(HotSpotWorkSpace)\src\os\win32\vm" /D "WIN32" /D "_WINDOWS" /D "ASSERT" /Fr /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
--- a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1000,9 +1000,10 @@
         DeoptimizationBlob* deopt_blob = SharedRuntime::deopt_blob();
         assert(deopt_blob != NULL, "deoptimization blob must have been created");
         restore_live_registers(sasm);
-        __ restore();
-        __ br(Assembler::always, false, Assembler::pt, deopt_blob->unpack_with_reexecution(), relocInfo::runtime_call_type);
-        __ delayed()->nop();
+
+        AddressLiteral dest(deopt_blob->unpack_with_reexecution());
+        __ jump_to(dest, O0);
+        __ delayed()->restore();
       }
       break;
 
--- a/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -404,14 +404,20 @@
 // ??: invocation counter
 //
 void InterpreterGenerator::generate_counter_incr(Label* overflow, Label* profile_method, Label* profile_method_continue) {
+  Label done;
+  const Register Rcounters = G3_scratch;
+
+  __ ld_ptr(STATE(_method), G5_method);
+  __ get_method_counters(G5_method, Rcounters, done);
+
   // Update standard invocation counters
-  __ increment_invocation_counter(O0, G3_scratch);
-  if (ProfileInterpreter) {  // %%% Merge this into MethodData*
-    __ ld_ptr(STATE(_method), G3_scratch);
-    Address interpreter_invocation_counter(G3_scratch, 0, in_bytes(Method::interpreter_invocation_counter_offset()));
-    __ ld(interpreter_invocation_counter, G3_scratch);
-    __ inc(G3_scratch);
-    __ st(G3_scratch, interpreter_invocation_counter);
+  __ increment_invocation_counter(Rcounters, O0, G4_scratch);
+  if (ProfileInterpreter) {
+    Address interpreter_invocation_counter(Rcounters, 0,
+            in_bytes(MethodCounters::interpreter_invocation_counter_offset()));
+    __ ld(interpreter_invocation_counter, G4_scratch);
+    __ inc(G4_scratch);
+    __ st(G4_scratch, interpreter_invocation_counter);
   }
 
   Address invocation_limit(G3_scratch, (address)&InvocationCounter::InterpreterInvocationLimit);
@@ -420,7 +426,7 @@
   __ cmp(O0, G3_scratch);
   __ br(Assembler::greaterEqualUnsigned, false, Assembler::pn, *overflow);
   __ delayed()->nop();
-
+  __ bind(done);
 }
 
 address InterpreterGenerator::generate_empty_entry(void) {
--- a/hotspot/src/cpu/sparc/vm/frame_sparc.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/sparc/vm/frame_sparc.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -304,7 +304,7 @@
 
     // The sender should positively be an nmethod or call_stub. On sparc we might in fact see something else.
     // The cause of this is because at a save instruction the O7 we get is a leftover from an earlier
-    // window use. So if a runtime stub creates two frames (common in fastdebug/jvmg) then we see the
+    // window use. So if a runtime stub creates two frames (common in fastdebug/debug) then we see the
     // stale pc. So if the sender blob is not something we'd expect we have little choice but to declare
     // the stack unwalkable. pd_get_top_frame_for_signal_handler tries to recover from this by unwinding
     // that initial frame and retrying.
--- a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 #include "oops/markOop.hpp"
 #include "oops/methodData.hpp"
 #include "oops/method.hpp"
+#include "oops/methodCounters.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "prims/jvmtiRedefineClassesTrace.hpp"
 #include "prims/jvmtiThreadState.hpp"
@@ -2086,19 +2087,29 @@
 
 #endif /* CC_INTERP */
 
-void InterpreterMacroAssembler::increment_invocation_counter( Register Rtmp, Register Rtmp2 ) {
+void InterpreterMacroAssembler::get_method_counters(Register method,
+                                                    Register Rcounters,
+                                                    Label& skip) {
+  Label has_counters;
+  Address method_counters(method, in_bytes(Method::method_counters_offset()));
+  ld_ptr(method_counters, Rcounters);
+  br_notnull_short(Rcounters, Assembler::pt, has_counters);
+  call_VM(noreg, CAST_FROM_FN_PTR(address,
+          InterpreterRuntime::build_method_counters), method);
+  ld_ptr(method_counters, Rcounters);
+  br_null(Rcounters, false, Assembler::pn, skip); // No MethodCounters, OutOfMemory
+  delayed()->nop();
+  bind(has_counters);
+}
+
+void InterpreterMacroAssembler::increment_invocation_counter( Register Rcounters, Register Rtmp, Register Rtmp2 ) {
   assert(UseCompiler, "incrementing must be useful");
-#ifdef CC_INTERP
-  Address inv_counter(G5_method, Method::invocation_counter_offset() +
-                                 InvocationCounter::counter_offset());
-  Address be_counter (G5_method, Method::backedge_counter_offset() +
+  assert_different_registers(Rcounters, Rtmp, Rtmp2);
+
+  Address inv_counter(Rcounters, MethodCounters::invocation_counter_offset() +
                                  InvocationCounter::counter_offset());
-#else
-  Address inv_counter(Lmethod, Method::invocation_counter_offset() +
-                               InvocationCounter::counter_offset());
-  Address be_counter (Lmethod, Method::backedge_counter_offset() +
-                               InvocationCounter::counter_offset());
-#endif /* CC_INTERP */
+  Address be_counter (Rcounters, MethodCounters::backedge_counter_offset() +
+                                 InvocationCounter::counter_offset());
   int delta = InvocationCounter::count_increment;
 
   // Load each counter in a register
@@ -2122,19 +2133,15 @@
   // Note that this macro must leave the backedge_count + invocation_count in Rtmp!
 }
 
-void InterpreterMacroAssembler::increment_backedge_counter( Register Rtmp, Register Rtmp2 ) {
+void InterpreterMacroAssembler::increment_backedge_counter( Register Rcounters, Register Rtmp, Register Rtmp2 ) {
   assert(UseCompiler, "incrementing must be useful");
-#ifdef CC_INTERP
-  Address be_counter (G5_method, Method::backedge_counter_offset() +
-                                 InvocationCounter::counter_offset());
-  Address inv_counter(G5_method, Method::invocation_counter_offset() +
+  assert_different_registers(Rcounters, Rtmp, Rtmp2);
+
+  Address be_counter (Rcounters, MethodCounters::backedge_counter_offset() +
                                  InvocationCounter::counter_offset());
-#else
-  Address be_counter (Lmethod, Method::backedge_counter_offset() +
-                               InvocationCounter::counter_offset());
-  Address inv_counter(Lmethod, Method::invocation_counter_offset() +
-                               InvocationCounter::counter_offset());
-#endif /* CC_INTERP */
+  Address inv_counter(Rcounters, MethodCounters::invocation_counter_offset() +
+                                 InvocationCounter::counter_offset());
+
   int delta = InvocationCounter::count_increment;
   // Load each counter in a register
   ld( be_counter, Rtmp );
--- a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.hpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -263,8 +263,9 @@
   void compute_stack_base( Register Rdest );
 
 #endif /* CC_INTERP */
-  void increment_invocation_counter( Register Rtmp, Register Rtmp2 );
-  void increment_backedge_counter( Register Rtmp, Register Rtmp2 );
+  void get_method_counters(Register method, Register Rcounters, Label& skip);
+  void increment_invocation_counter( Register Rcounters, Register Rtmp, Register Rtmp2 );
+  void increment_backedge_counter( Register Rcounters, Register Rtmp, Register Rtmp2 );
 #ifndef CC_INTERP
   void test_backedge_count_for_osr( Register backedge_count, Register branch_bcp, Register Rtmp );
 
--- a/hotspot/src/cpu/sparc/vm/sparc.ad	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/sparc/vm/sparc.ad	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -8223,10 +8223,25 @@
   format %{ "SUBcc  $p,$q,$p\t! p' = p-q\n\t"
             "ADD    $p,$y,$tmp\t! g3=p-q+y\n\t"
             "MOVlt  $tmp,$p\t! p' < 0 ? p'+y : p'" %}
-  ins_encode( enc_cadd_cmpLTMask(p, q, y, tmp) );
-  ins_pipe( cadd_cmpltmask );
-%}
-
+  ins_encode(enc_cadd_cmpLTMask(p, q, y, tmp));
+  ins_pipe(cadd_cmpltmask);
+%}
+
+instruct and_cmpLTMask(iRegI p, iRegI q, iRegI y, flagsReg ccr) %{
+  match(Set p (AndI (CmpLTMask p q) y));
+  effect(KILL ccr);
+  ins_cost(DEFAULT_COST*3);
+
+  format %{ "CMP  $p,$q\n\t"
+            "MOV  $y,$p\n\t"
+            "MOVge G0,$p" %}
+  ins_encode %{
+    __ cmp($p$$Register, $q$$Register);
+    __ mov($y$$Register, $p$$Register);
+    __ movcc(Assembler::greaterEqual, false, Assembler::icc, G0, $p$$Register);
+  %}
+  ins_pipe(ialu_reg_reg_ialu);
+%}
 
 //-----------------------------------------------------------------
 // Direct raw moves between float and general registers using VIS3.
--- a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -292,11 +292,15 @@
 // ??: invocation counter
 //
 void InterpreterGenerator::generate_counter_incr(Label* overflow, Label* profile_method, Label* profile_method_continue) {
-  // Note: In tiered we increment either counters in Method* or in MDO depending if we're profiling or not.
+  // Note: In tiered we increment either counters in MethodCounters* or in
+  // MDO depending if we're profiling or not.
+  const Register Rcounters = G3_scratch;
+  Label done;
+
   if (TieredCompilation) {
     const int increment = InvocationCounter::count_increment;
     const int mask = ((1 << Tier0InvokeNotifyFreqLog) - 1) << InvocationCounter::count_shift;
-    Label no_mdo, done;
+    Label no_mdo;
     if (ProfileInterpreter) {
       // If no method data exists, go to profile_continue.
       __ ld_ptr(Lmethod, Method::method_data_offset(), G4_scratch);
@@ -311,23 +315,26 @@
       __ ba_short(done);
     }
 
-    // Increment counter in Method*
+    // Increment counter in MethodCounters*
     __ bind(no_mdo);
-    Address invocation_counter(Lmethod,
-                               in_bytes(Method::invocation_counter_offset()) +
-                               in_bytes(InvocationCounter::counter_offset()));
+    Address invocation_counter(Rcounters,
+            in_bytes(MethodCounters::invocation_counter_offset()) +
+            in_bytes(InvocationCounter::counter_offset()));
+    __ get_method_counters(Lmethod, Rcounters, done);
     __ increment_mask_and_jump(invocation_counter, increment, mask,
-                               G3_scratch, Lscratch,
+                               G4_scratch, Lscratch,
                                Assembler::zero, overflow);
     __ bind(done);
   } else {
     // Update standard invocation counters
-    __ increment_invocation_counter(O0, G3_scratch);
-    if (ProfileInterpreter) {  // %%% Merge this into MethodData*
-      Address interpreter_invocation_counter(Lmethod,in_bytes(Method::interpreter_invocation_counter_offset()));
-      __ ld(interpreter_invocation_counter, G3_scratch);
-      __ inc(G3_scratch);
-      __ st(G3_scratch, interpreter_invocation_counter);
+    __ get_method_counters(Lmethod, Rcounters, done);
+    __ increment_invocation_counter(Rcounters, O0, G4_scratch);
+    if (ProfileInterpreter) {
+      Address interpreter_invocation_counter(Rcounters,
+            in_bytes(MethodCounters::interpreter_invocation_counter_offset()));
+      __ ld(interpreter_invocation_counter, G4_scratch);
+      __ inc(G4_scratch);
+      __ st(G4_scratch, interpreter_invocation_counter);
     }
 
     if (ProfileInterpreter && profile_method != NULL) {
@@ -345,6 +352,7 @@
     __ cmp(O0, G3_scratch);
     __ br(Assembler::greaterEqualUnsigned, false, Assembler::pn, *overflow); // Far distance
     __ delayed()->nop();
+    __ bind(done);
   }
 
 }
--- a/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp	Wed May 08 11:22:25 2013 +0100
@@ -63,6 +63,13 @@
                                 noreg /* pre_val */,
                                 tmp, true /*preserve_o_regs*/);
 
+        // G1 barrier needs uncompressed oop for region cross check.
+        Register new_val = val;
+        if (UseCompressedOops && val != G0) {
+          new_val = tmp;
+          __ mov(val, new_val);
+        }
+
         if (index == noreg ) {
           assert(Assembler::is_simm13(offset), "fix this code");
           __ store_heap_oop(val, base, offset);
@@ -79,7 +86,7 @@
               __ add(base, index, base);
             }
           }
-          __ g1_write_barrier_post(base, val, tmp);
+          __ g1_write_barrier_post(base, new_val, tmp);
         }
       }
       break;
@@ -1604,9 +1611,8 @@
   // Normal (non-jsr) branch handling
 
   // Save the current Lbcp
-  const Register O0_cur_bcp = O0;
-  __ mov( Lbcp, O0_cur_bcp );
-
+  const Register l_cur_bcp = Lscratch;
+  __ mov( Lbcp, l_cur_bcp );
 
   bool increment_invocation_counter_for_backward_branches = UseCompiler && UseLoopCounter;
   if ( increment_invocation_counter_for_backward_branches ) {
@@ -1616,6 +1622,9 @@
     // Bump bytecode pointer by displacement (take the branch)
     __ delayed()->add( O1_disp, Lbcp, Lbcp );     // add to bc addr
 
+    const Register Rcounters = G3_scratch;
+    __ get_method_counters(Lmethod, Rcounters, Lforward);
+
     if (TieredCompilation) {
       Label Lno_mdo, Loverflow;
       int increment = InvocationCounter::count_increment;
@@ -1628,21 +1637,22 @@
         // Increment backedge counter in the MDO
         Address mdo_backedge_counter(G4_scratch, in_bytes(MethodData::backedge_counter_offset()) +
                                                  in_bytes(InvocationCounter::counter_offset()));
-        __ increment_mask_and_jump(mdo_backedge_counter, increment, mask, G3_scratch, Lscratch,
+        __ increment_mask_and_jump(mdo_backedge_counter, increment, mask, G3_scratch, O0,
                                    Assembler::notZero, &Lforward);
         __ ba_short(Loverflow);
       }
 
-      // If there's no MDO, increment counter in Method*
+      // If there's no MDO, increment counter in MethodCounters*
       __ bind(Lno_mdo);
-      Address backedge_counter(Lmethod, in_bytes(Method::backedge_counter_offset()) +
-                                        in_bytes(InvocationCounter::counter_offset()));
-      __ increment_mask_and_jump(backedge_counter, increment, mask, G3_scratch, Lscratch,
+      Address backedge_counter(Rcounters,
+              in_bytes(MethodCounters::backedge_counter_offset()) +
+              in_bytes(InvocationCounter::counter_offset()));
+      __ increment_mask_and_jump(backedge_counter, increment, mask, G4_scratch, O0,
                                  Assembler::notZero, &Lforward);
       __ bind(Loverflow);
 
       // notify point for loop, pass branch bytecode
-      __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::frequency_counter_overflow), O0_cur_bcp);
+      __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::frequency_counter_overflow), l_cur_bcp);
 
       // Was an OSR adapter generated?
       // O0 = osr nmethod
@@ -1679,15 +1689,15 @@
     } else {
       // Update Backedge branch separately from invocations
       const Register G4_invoke_ctr = G4;
-      __ increment_backedge_counter(G4_invoke_ctr, G1_scratch);
+      __ increment_backedge_counter(Rcounters, G4_invoke_ctr, G1_scratch);
       if (ProfileInterpreter) {
         __ test_invocation_counter_for_mdp(G4_invoke_ctr, G3_scratch, Lforward);
         if (UseOnStackReplacement) {
-          __ test_backedge_count_for_osr(O2_bumped_count, O0_cur_bcp, G3_scratch);
+          __ test_backedge_count_for_osr(O2_bumped_count, l_cur_bcp, G3_scratch);
         }
       } else {
         if (UseOnStackReplacement) {
-          __ test_backedge_count_for_osr(G4_invoke_ctr, O0_cur_bcp, G3_scratch);
+          __ test_backedge_count_for_osr(G4_invoke_ctr, l_cur_bcp, G3_scratch);
         }
       }
     }
--- a/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -570,20 +570,28 @@
 // rcx: invocation counter
 //
 void InterpreterGenerator::generate_counter_incr(Label* overflow, Label* profile_method, Label* profile_method_continue) {
-
-  const Address invocation_counter(rbx, Method::invocation_counter_offset() + InvocationCounter::counter_offset());
-  const Address backedge_counter  (rbx, Method::backedge_counter_offset() + InvocationCounter::counter_offset());
-
-  if (ProfileInterpreter) { // %%% Merge this into MethodData*
-    __ incrementl(Address(rbx,Method::interpreter_invocation_counter_offset()));
+  Label done;
+  const Address invocation_counter(rax,
+                MethodCounters::invocation_counter_offset() +
+                InvocationCounter::counter_offset());
+  const Address backedge_counter  (rax,
+                MethodCounter::backedge_counter_offset() +
+                InvocationCounter::counter_offset());
+
+  __ get_method_counters(rbx, rax, done);
+
+  if (ProfileInterpreter) {
+    __ incrementl(Address(rax,
+            MethodCounters::interpreter_invocation_counter_offset()));
   }
   // Update standard invocation counters
-  __ movl(rax, backedge_counter);               // load backedge counter
-
+  __ movl(rcx, invocation_counter);
   __ increment(rcx, InvocationCounter::count_increment);
+  __ movl(invocation_counter, rcx);             // save invocation count
+
+  __ movl(rax, backedge_counter);               // load backedge counter
   __ andl(rax, InvocationCounter::count_mask_value);  // mask out the status bits
 
-  __ movl(invocation_counter, rcx);             // save invocation count
   __ addl(rcx, rax);                            // add both counters
 
   // profile_method is non-null only for interpreted method so
@@ -593,7 +601,7 @@
   __ cmp32(rcx,
            ExternalAddress((address)&InvocationCounter::InterpreterInvocationLimit));
   __ jcc(Assembler::aboveEqual, *overflow);
-
+  __ bind(done);
 }
 
 void InterpreterGenerator::generate_counter_overflow(Label* do_continue) {
@@ -977,7 +985,6 @@
   address entry_point = __ pc();
 
   const Address constMethod       (rbx, Method::const_offset());
-  const Address invocation_counter(rbx, Method::invocation_counter_offset() + InvocationCounter::counter_offset());
   const Address access_flags      (rbx, Method::access_flags_offset());
   const Address size_of_parameters(rcx, ConstMethod::size_of_parameters_offset());
 
@@ -1029,8 +1036,6 @@
   }
 #endif
 
-  if (inc_counter) __ movl(rcx, invocation_counter);  // (pre-)fetch invocation count
-
   const Register unlock_thread = LP64_ONLY(r15_thread) NOT_LP64(rax);
   NOT_LP64(__ movptr(unlock_thread, STATE(_thread));) // get thread
   // Since at this point in the method invocation the exception handler
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -266,6 +266,20 @@
   addptr(cache, tmp);            // construct pointer to cache entry
 }
 
+void InterpreterMacroAssembler::get_method_counters(Register method,
+                                                    Register mcs, Label& skip) {
+  Label has_counters;
+  movptr(mcs, Address(method, Method::method_counters_offset()));
+  testptr(mcs, mcs);
+  jcc(Assembler::notZero, has_counters);
+  call_VM(noreg, CAST_FROM_FN_PTR(address,
+          InterpreterRuntime::build_method_counters), method);
+  movptr(mcs, Address(method,Method::method_counters_offset()));
+  testptr(mcs, mcs);
+  jcc(Assembler::zero, skip); // No MethodCounters allocated, OutOfMemory
+  bind(has_counters);
+}
+
 // Load object from cpool->resolved_references(index)
 void InterpreterMacroAssembler::load_resolved_reference_at_index(
                                            Register result, Register index) {
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -89,6 +89,7 @@
   void get_cache_and_index_and_bytecode_at_bcp(Register cache, Register index, Register bytecode, int byte_no, int bcp_offset, size_t index_size = sizeof(u2));
   void get_cache_entry_pointer_at_bcp(Register cache, Register tmp, int bcp_offset, size_t index_size = sizeof(u2));
   void get_cache_index_at_bcp(Register index, int bcp_offset, size_t index_size = sizeof(u2));
+  void get_method_counters(Register method, Register mcs, Label& skip);
 
   // load cpool->resolved_references(index);
   void load_resolved_reference_at_index(Register result, Register index);
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -271,6 +271,20 @@
   addptr(cache, tmp);  // construct pointer to cache entry
 }
 
+void InterpreterMacroAssembler::get_method_counters(Register method,
+                                                    Register mcs, Label& skip) {
+  Label has_counters;
+  movptr(mcs, Address(method, Method::method_counters_offset()));
+  testptr(mcs, mcs);
+  jcc(Assembler::notZero, has_counters);
+  call_VM(noreg, CAST_FROM_FN_PTR(address,
+          InterpreterRuntime::build_method_counters), method);
+  movptr(mcs, Address(method,Method::method_counters_offset()));
+  testptr(mcs, mcs);
+  jcc(Assembler::zero, skip); // No MethodCounters allocated, OutOfMemory
+  bind(has_counters);
+}
+
 // Load object from cpool->resolved_references(index)
 void InterpreterMacroAssembler::load_resolved_reference_at_index(
                                            Register result, Register index) {
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -111,6 +111,7 @@
   void get_cache_and_index_and_bytecode_at_bcp(Register cache, Register index, Register bytecode, int byte_no, int bcp_offset, size_t index_size = sizeof(u2));
   void get_cache_entry_pointer_at_bcp(Register cache, Register tmp, int bcp_offset, size_t index_size = sizeof(u2));
   void get_cache_index_at_bcp(Register index, int bcp_offset, size_t index_size = sizeof(u2));
+  void get_method_counters(Register method, Register mcs, Label& skip);
 
   // load cpool->resolved_references(index);
   void load_resolved_reference_at_index(Register result, Register index);
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -344,13 +344,13 @@
 // rcx: invocation counter
 //
 void InterpreterGenerator::generate_counter_incr(Label* overflow, Label* profile_method, Label* profile_method_continue) {
-  const Address invocation_counter(rbx, in_bytes(Method::invocation_counter_offset()) +
-                                        in_bytes(InvocationCounter::counter_offset()));
-  // Note: In tiered we increment either counters in Method* or in MDO depending if we're profiling or not.
+  Label done;
+  // Note: In tiered we increment either counters in MethodCounters* or in MDO
+  // depending if we're profiling or not.
   if (TieredCompilation) {
     int increment = InvocationCounter::count_increment;
     int mask = ((1 << Tier0InvokeNotifyFreqLog)  - 1) << InvocationCounter::count_shift;
-    Label no_mdo, done;
+    Label no_mdo;
     if (ProfileInterpreter) {
       // Are we profiling?
       __ movptr(rax, Address(rbx, Method::method_data_offset()));
@@ -360,26 +360,41 @@
       const Address mdo_invocation_counter(rax, in_bytes(MethodData::invocation_counter_offset()) +
                                                 in_bytes(InvocationCounter::counter_offset()));
       __ increment_mask_and_jump(mdo_invocation_counter, increment, mask, rcx, false, Assembler::zero, overflow);
-      __ jmpb(done);
+      __ jmp(done);
     }
     __ bind(no_mdo);
-    // Increment counter in Method* (we don't need to load it, it's in rcx).
-    __ increment_mask_and_jump(invocation_counter, increment, mask, rcx, true, Assembler::zero, overflow);
+    // Increment counter in MethodCounters
+    const Address invocation_counter(rax,
+                  MethodCounters::invocation_counter_offset() +
+                  InvocationCounter::counter_offset());
+
+    __ get_method_counters(rbx, rax, done);
+    __ increment_mask_and_jump(invocation_counter, increment, mask,
+                               rcx, false, Assembler::zero, overflow);
     __ bind(done);
   } else {
-    const Address backedge_counter  (rbx, Method::backedge_counter_offset() +
-                                          InvocationCounter::counter_offset());
+    const Address backedge_counter  (rax,
+                  MethodCounters::backedge_counter_offset() +
+                  InvocationCounter::counter_offset());
+    const Address invocation_counter(rax,
+                  MethodCounters::invocation_counter_offset() +
+                  InvocationCounter::counter_offset());
+
+    __ get_method_counters(rbx, rax, done);
 
-    if (ProfileInterpreter) { // %%% Merge this into MethodData*
-      __ incrementl(Address(rbx,Method::interpreter_invocation_counter_offset()));
+    if (ProfileInterpreter) {
+      __ incrementl(Address(rax,
+              MethodCounters::interpreter_invocation_counter_offset()));
     }
+
     // Update standard invocation counters
-    __ movl(rax, backedge_counter);               // load backedge counter
+    __ movl(rcx, invocation_counter);
+    __ incrementl(rcx, InvocationCounter::count_increment);
+    __ movl(invocation_counter, rcx);             // save invocation count
 
-    __ incrementl(rcx, InvocationCounter::count_increment);
+    __ movl(rax, backedge_counter);               // load backedge counter
     __ andl(rax, InvocationCounter::count_mask_value);  // mask out the status bits
 
-    __ movl(invocation_counter, rcx);             // save invocation count
     __ addl(rcx, rax);                            // add both counters
 
     // profile_method is non-null only for interpreted method so
@@ -399,6 +414,7 @@
     __ cmp32(rcx,
              ExternalAddress((address)&InvocationCounter::InterpreterInvocationLimit));
     __ jcc(Assembler::aboveEqual, *overflow);
+    __ bind(done);
   }
 }
 
@@ -868,7 +884,6 @@
   address entry_point = __ pc();
 
   const Address constMethod       (rbx, Method::const_offset());
-  const Address invocation_counter(rbx, Method::invocation_counter_offset() + InvocationCounter::counter_offset());
   const Address access_flags      (rbx, Method::access_flags_offset());
   const Address size_of_parameters(rcx, ConstMethod::size_of_parameters_offset());
 
@@ -897,9 +912,7 @@
   // NULL oop temp (mirror or jni oop result)
   __ push((int32_t)NULL_WORD);
 
-  if (inc_counter) __ movl(rcx, invocation_counter);  // (pre-)fetch invocation count
   // initialize fixed part of activation frame
-
   generate_fixed_frame(true);
 
   // make sure method is native & not abstract
@@ -1286,7 +1299,6 @@
   address entry_point = __ pc();
 
   const Address constMethod       (rbx, Method::const_offset());
-  const Address invocation_counter(rbx, Method::invocation_counter_offset() + InvocationCounter::counter_offset());
   const Address access_flags      (rbx, Method::access_flags_offset());
   const Address size_of_parameters(rdx, ConstMethod::size_of_parameters_offset());
   const Address size_of_locals    (rdx, ConstMethod::size_of_locals_offset());
@@ -1326,7 +1338,6 @@
     __ bind(exit);
   }
 
-  if (inc_counter) __ movl(rcx, invocation_counter);  // (pre-)fetch invocation count
   // initialize fixed part of activation frame
   generate_fixed_frame(false);
 
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -300,13 +300,12 @@
         Label* overflow,
         Label* profile_method,
         Label* profile_method_continue) {
-  const Address invocation_counter(rbx, in_bytes(Method::invocation_counter_offset()) +
-                                        in_bytes(InvocationCounter::counter_offset()));
+  Label done;
   // Note: In tiered we increment either counters in Method* or in MDO depending if we're profiling or not.
   if (TieredCompilation) {
     int increment = InvocationCounter::count_increment;
     int mask = ((1 << Tier0InvokeNotifyFreqLog)  - 1) << InvocationCounter::count_shift;
-    Label no_mdo, done;
+    Label no_mdo;
     if (ProfileInterpreter) {
       // Are we profiling?
       __ movptr(rax, Address(rbx, Method::method_data_offset()));
@@ -316,28 +315,39 @@
       const Address mdo_invocation_counter(rax, in_bytes(MethodData::invocation_counter_offset()) +
                                                 in_bytes(InvocationCounter::counter_offset()));
       __ increment_mask_and_jump(mdo_invocation_counter, increment, mask, rcx, false, Assembler::zero, overflow);
-      __ jmpb(done);
+      __ jmp(done);
     }
     __ bind(no_mdo);
-    // Increment counter in Method* (we don't need to load it, it's in ecx).
-    __ increment_mask_and_jump(invocation_counter, increment, mask, rcx, true, Assembler::zero, overflow);
+    // Increment counter in MethodCounters
+    const Address invocation_counter(rax,
+                  MethodCounters::invocation_counter_offset() +
+                  InvocationCounter::counter_offset());
+    __ get_method_counters(rbx, rax, done);
+    __ increment_mask_and_jump(invocation_counter, increment, mask, rcx,
+                               false, Assembler::zero, overflow);
     __ bind(done);
   } else {
-    const Address backedge_counter(rbx,
-                                   Method::backedge_counter_offset() +
-                                   InvocationCounter::counter_offset());
+    const Address backedge_counter(rax,
+                  MethodCounters::backedge_counter_offset() +
+                  InvocationCounter::counter_offset());
+    const Address invocation_counter(rax,
+                  MethodCounters::invocation_counter_offset() +
+                  InvocationCounter::counter_offset());
 
-    if (ProfileInterpreter) { // %%% Merge this into MethodData*
-      __ incrementl(Address(rbx,
-                            Method::interpreter_invocation_counter_offset()));
+    __ get_method_counters(rbx, rax, done);
+
+    if (ProfileInterpreter) {
+      __ incrementl(Address(rax,
+              MethodCounters::interpreter_invocation_counter_offset()));
     }
     // Update standard invocation counters
-    __ movl(rax, backedge_counter);   // load backedge counter
+    __ movl(rcx, invocation_counter);
+    __ incrementl(rcx, InvocationCounter::count_increment);
+    __ movl(invocation_counter, rcx); // save invocation count
 
-    __ incrementl(rcx, InvocationCounter::count_increment);
+    __ movl(rax, backedge_counter);   // load backedge counter
     __ andl(rax, InvocationCounter::count_mask_value); // mask out the status bits
 
-    __ movl(invocation_counter, rcx); // save invocation count
     __ addl(rcx, rax);                // add both counters
 
     // profile_method is non-null only for interpreted method so
@@ -354,6 +364,7 @@
 
     __ cmp32(rcx, ExternalAddress((address)&InvocationCounter::InterpreterInvocationLimit));
     __ jcc(Assembler::aboveEqual, *overflow);
+    __ bind(done);
   }
 }
 
@@ -843,9 +854,6 @@
   address entry_point = __ pc();
 
   const Address constMethod       (rbx, Method::const_offset());
-  const Address invocation_counter(rbx, Method::
-                                        invocation_counter_offset() +
-                                        InvocationCounter::counter_offset());
   const Address access_flags      (rbx, Method::access_flags_offset());
   const Address size_of_parameters(rcx, ConstMethod::
                                         size_of_parameters_offset());
@@ -876,10 +884,6 @@
   // (static native method holder mirror/jni oop result)
   __ push((int) NULL_WORD);
 
-  if (inc_counter) {
-    __ movl(rcx, invocation_counter);  // (pre-)fetch invocation count
-  }
-
   // initialize fixed part of activation frame
   generate_fixed_frame(true);
 
@@ -1296,9 +1300,6 @@
   address entry_point = __ pc();
 
   const Address constMethod(rbx, Method::const_offset());
-  const Address invocation_counter(rbx,
-                                   Method::invocation_counter_offset() +
-                                   InvocationCounter::counter_offset());
   const Address access_flags(rbx, Method::access_flags_offset());
   const Address size_of_parameters(rdx,
                                    ConstMethod::size_of_parameters_offset());
@@ -1343,10 +1344,6 @@
     __ bind(exit);
   }
 
-  // (pre-)fetch invocation count
-  if (inc_counter) {
-    __ movl(rcx, invocation_counter);
-  }
   // initialize fixed part of activation frame
   generate_fixed_frame(false);
 
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1546,9 +1546,10 @@
   __ get_method(rcx);           // ECX holds method
   __ profile_taken_branch(rax,rbx); // EAX holds updated MDP, EBX holds bumped taken count
 
-  const ByteSize be_offset = Method::backedge_counter_offset() + InvocationCounter::counter_offset();
-  const ByteSize inv_offset = Method::invocation_counter_offset() + InvocationCounter::counter_offset();
-  const int method_offset = frame::interpreter_frame_method_offset * wordSize;
+  const ByteSize be_offset = MethodCounters::backedge_counter_offset() +
+                             InvocationCounter::counter_offset();
+  const ByteSize inv_offset = MethodCounters::invocation_counter_offset() +
+                              InvocationCounter::counter_offset();
 
   // Load up EDX with the branch displacement
   __ movl(rdx, at_bcp(1));
@@ -1596,6 +1597,22 @@
     __ testl(rdx, rdx);             // check if forward or backward branch
     __ jcc(Assembler::positive, dispatch); // count only if backward branch
 
+    // check if MethodCounters exists
+    Label has_counters;
+    __ movptr(rax, Address(rcx, Method::method_counters_offset()));
+    __ testptr(rax, rax);
+    __ jcc(Assembler::notZero, has_counters);
+    __ push(rdx);
+    __ push(rcx);
+    __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::build_method_counters),
+               rcx);
+    __ pop(rcx);
+    __ pop(rdx);
+    __ movptr(rax, Address(rcx, Method::method_counters_offset()));
+    __ testptr(rax, rax);
+    __ jcc(Assembler::zero, dispatch);
+    __ bind(has_counters);
+
     if (TieredCompilation) {
       Label no_mdo;
       int increment = InvocationCounter::count_increment;
@@ -1613,16 +1630,19 @@
         __ jmp(dispatch);
       }
       __ bind(no_mdo);
-      // Increment backedge counter in Method*
+      // Increment backedge counter in MethodCounters*
+      __ movptr(rcx, Address(rcx, Method::method_counters_offset()));
       __ increment_mask_and_jump(Address(rcx, be_offset), increment, mask,
                                  rax, false, Assembler::zero, &backedge_counter_overflow);
     } else {
       // increment counter
+      __ movptr(rcx, Address(rcx, Method::method_counters_offset()));
       __ movl(rax, Address(rcx, be_offset));        // load backedge counter
       __ incrementl(rax, InvocationCounter::count_increment); // increment counter
       __ movl(Address(rcx, be_offset), rax);        // store counter
 
       __ movl(rax, Address(rcx, inv_offset));    // load invocation counter
+
       __ andl(rax, InvocationCounter::count_mask_value);     // and the status bits
       __ addl(rax, Address(rcx, be_offset));        // add both counters
 
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -158,14 +158,19 @@
         if (val == noreg) {
           __ store_heap_oop_null(Address(rdx, 0));
         } else {
+          // G1 barrier needs uncompressed oop for region cross check.
+          Register new_val = val;
+          if (UseCompressedOops) {
+            new_val = rbx;
+            __ movptr(new_val, val);
+          }
           __ store_heap_oop(Address(rdx, 0), val);
           __ g1_write_barrier_post(rdx /* store_adr */,
-                                   val /* new_val */,
+                                   new_val /* new_val */,
                                    r15_thread /* thread */,
                                    r8 /* tmp */,
                                    rbx /* tmp2 */);
         }
-
       }
       break;
 #endif // INCLUDE_ALL_GCS
@@ -1564,11 +1569,10 @@
   __ profile_taken_branch(rax, rbx); // rax holds updated MDP, rbx
                                      // holds bumped taken count
 
-  const ByteSize be_offset = Method::backedge_counter_offset() +
+  const ByteSize be_offset = MethodCounters::backedge_counter_offset() +
                              InvocationCounter::counter_offset();
-  const ByteSize inv_offset = Method::invocation_counter_offset() +
+  const ByteSize inv_offset = MethodCounters::invocation_counter_offset() +
                               InvocationCounter::counter_offset();
-  const int method_offset = frame::interpreter_frame_method_offset * wordSize;
 
   // Load up edx with the branch displacement
   __ movl(rdx, at_bcp(1));
@@ -1618,6 +1622,22 @@
     // r14: locals pointer
     __ testl(rdx, rdx);             // check if forward or backward branch
     __ jcc(Assembler::positive, dispatch); // count only if backward branch
+
+    // check if MethodCounters exists
+    Label has_counters;
+    __ movptr(rax, Address(rcx, Method::method_counters_offset()));
+    __ testptr(rax, rax);
+    __ jcc(Assembler::notZero, has_counters);
+    __ push(rdx);
+    __ push(rcx);
+    __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::build_method_counters),
+               rcx);
+    __ pop(rcx);
+    __ pop(rdx);
+    __ movptr(rax, Address(rcx, Method::method_counters_offset()));
+    __ jcc(Assembler::zero, dispatch);
+    __ bind(has_counters);
+
     if (TieredCompilation) {
       Label no_mdo;
       int increment = InvocationCounter::count_increment;
@@ -1635,16 +1655,19 @@
         __ jmp(dispatch);
       }
       __ bind(no_mdo);
-      // Increment backedge counter in Method*
+      // Increment backedge counter in MethodCounters*
+      __ movptr(rcx, Address(rcx, Method::method_counters_offset()));
       __ increment_mask_and_jump(Address(rcx, be_offset), increment, mask,
                                  rax, false, Assembler::zero, &backedge_counter_overflow);
     } else {
       // increment counter
+      __ movptr(rcx, Address(rcx, Method::method_counters_offset()));
       __ movl(rax, Address(rcx, be_offset));        // load backedge counter
       __ incrementl(rax, InvocationCounter::count_increment); // increment counter
       __ movl(Address(rcx, be_offset), rax);        // store counter
 
       __ movl(rax, Address(rcx, inv_offset));    // load invocation counter
+
       __ andl(rax, InvocationCounter::count_mask_value); // and the status bits
       __ addl(rax, Address(rcx, be_offset));        // add both counters
 
--- a/hotspot/src/cpu/x86/vm/x86_32.ad	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/x86_32.ad	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -2317,30 +2317,6 @@
     emit_rm(cbuf, 0x3, $p$$reg, tmpReg);
   %}
 
-  enc_class enc_cmpLTP_mem(rRegI p, rRegI q, memory mem, eCXRegI tmp) %{    // cadd_cmpLT
-    int tmpReg = $tmp$$reg;
-
-    // SUB $p,$q
-    emit_opcode(cbuf,0x2B);
-    emit_rm(cbuf, 0x3, $p$$reg, $q$$reg);
-    // SBB $tmp,$tmp
-    emit_opcode(cbuf,0x1B);
-    emit_rm(cbuf, 0x3, tmpReg, tmpReg);
-    // AND $tmp,$y
-    cbuf.set_insts_mark();       // Mark start of opcode for reloc info in mem operand
-    emit_opcode(cbuf,0x23);
-    int reg_encoding = tmpReg;
-    int base  = $mem$$base;
-    int index = $mem$$index;
-    int scale = $mem$$scale;
-    int displace = $mem$$disp;
-    relocInfo::relocType disp_reloc = $mem->disp_reloc();
-    encode_RegMem(cbuf, reg_encoding, base, index, scale, displace, disp_reloc);
-    // ADD $p,$tmp
-    emit_opcode(cbuf,0x03);
-    emit_rm(cbuf, 0x3, $p$$reg, tmpReg);
-  %}
-
   enc_class shift_left_long( eRegL dst, eCXRegI shift ) %{
     // TEST shift,32
     emit_opcode(cbuf,0xF7);
@@ -8922,9 +8898,9 @@
   %}
 %}
 
-instruct cmpLTMask( eCXRegI dst, ncxRegI p, ncxRegI q, eFlagsReg cr ) %{
+instruct cmpLTMask(eCXRegI dst, ncxRegI p, ncxRegI q, eFlagsReg cr) %{
   match(Set dst (CmpLTMask p q));
-  effect( KILL cr );
+  effect(KILL cr);
   ins_cost(400);
 
   // SETlt can only use low byte of EAX,EBX, ECX, or EDX as destination
@@ -8932,50 +8908,83 @@
             "CMP    $p,$q\n\t"
             "SETlt  $dst\n\t"
             "NEG    $dst" %}
-  ins_encode( OpcRegReg(0x33,dst,dst),
-              OpcRegReg(0x3B,p,q),
-              setLT_reg(dst), neg_reg(dst) );
-  ins_pipe( pipe_slow );
-%}
-
-instruct cmpLTMask0( rRegI dst, immI0 zero, eFlagsReg cr ) %{
+  ins_encode %{
+    Register Rp = $p$$Register;
+    Register Rq = $q$$Register;
+    Register Rd = $dst$$Register;
+    Label done;
+    __ xorl(Rd, Rd);
+    __ cmpl(Rp, Rq);
+    __ setb(Assembler::less, Rd);
+    __ negl(Rd);
+  %}
+
+  ins_pipe(pipe_slow);
+%}
+
+instruct cmpLTMask0(rRegI dst, immI0 zero, eFlagsReg cr) %{
   match(Set dst (CmpLTMask dst zero));
-  effect( DEF dst, KILL cr );
+  effect(DEF dst, KILL cr);
   ins_cost(100);
 
-  format %{ "SAR    $dst,31" %}
-  opcode(0xC1, 0x7);  /* C1 /7 ib */
-  ins_encode( RegOpcImm( dst, 0x1F ) );
-  ins_pipe( ialu_reg );
-%}
-
-
-instruct cadd_cmpLTMask( ncxRegI p, ncxRegI q, ncxRegI y, eCXRegI tmp, eFlagsReg cr ) %{
+  format %{ "SAR    $dst,31\t# cmpLTMask0" %}
+  ins_encode %{
+  __ sarl($dst$$Register, 31);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+/* better to save a register than avoid a branch */
+instruct cadd_cmpLTMask(rRegI p, rRegI q, rRegI y, eFlagsReg cr) %{
   match(Set p (AddI (AndI (CmpLTMask p q) y) (SubI p q)));
-  effect( KILL tmp, KILL cr );
+  effect(KILL cr);
   ins_cost(400);
-  // annoyingly, $tmp has no edges so you cant ask for it in
-  // any format or encoding
-  format %{ "SUB    $p,$q\n\t"
-            "SBB    ECX,ECX\n\t"
-            "AND    ECX,$y\n\t"
-            "ADD    $p,ECX" %}
-  ins_encode( enc_cmpLTP(p,q,y,tmp) );
-  ins_pipe( pipe_cmplt );
+  format %{ "SUB    $p,$q\t# cadd_cmpLTMask\n\t"
+            "JGE    done\n\t"
+            "ADD    $p,$y\n"
+            "done:  " %}
+  ins_encode %{
+    Register Rp = $p$$Register;
+    Register Rq = $q$$Register;
+    Register Ry = $y$$Register;
+    Label done;
+    __ subl(Rp, Rq);
+    __ jccb(Assembler::greaterEqual, done);
+    __ addl(Rp, Ry);
+    __ bind(done);
+  %}
+
+  ins_pipe(pipe_cmplt);
+%}
+
+/* better to save a register than avoid a branch */
+instruct and_cmpLTMask(rRegI p, rRegI q, rRegI y, eFlagsReg cr) %{
+  match(Set y (AndI (CmpLTMask p q) y));
+  effect(KILL cr);
+
+  ins_cost(300);
+
+  format %{ "CMPL     $p, $q\t# and_cmpLTMask\n\t"
+            "JLT      done\n\t"
+            "XORL     $y, $y\n"
+            "done:  " %}
+  ins_encode %{
+    Register Rp = $p$$Register;
+    Register Rq = $q$$Register;
+    Register Ry = $y$$Register;
+    Label done;
+    __ cmpl(Rp, Rq);
+    __ jccb(Assembler::less, done);
+    __ xorl(Ry, Ry);
+    __ bind(done);
+  %}
+
+  ins_pipe(pipe_cmplt);
 %}
 
 /* If I enable this, I encourage spilling in the inner loop of compress.
-instruct cadd_cmpLTMask_mem( ncxRegI p, ncxRegI q, memory y, eCXRegI tmp, eFlagsReg cr ) %{
+instruct cadd_cmpLTMask_mem(ncxRegI p, ncxRegI q, memory y, eCXRegI tmp, eFlagsReg cr) %{
   match(Set p (AddI (AndI (CmpLTMask p q) (LoadI y)) (SubI p q)));
-  effect( USE_KILL tmp, KILL cr );
-  ins_cost(400);
-
-  format %{ "SUB    $p,$q\n\t"
-            "SBB    ECX,ECX\n\t"
-            "AND    ECX,$y\n\t"
-            "ADD    $p,ECX" %}
-  ins_encode( enc_cmpLTP_mem(p,q,y,tmp) );
-%}
 */
 
 //----------Long Instructions------------------------------------------------
--- a/hotspot/src/cpu/x86/vm/x86_64.ad	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/cpu/x86/vm/x86_64.ad	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -2222,12 +2222,6 @@
     $$$emit32$src$$constant;
   %}
 
-  enc_class Con64(immL src)
-  %{
-    // Output immediate
-    emit_d64($src$$constant);
-  %}
-
   enc_class Con32F_as_bits(immF src)
   %{
     // Output Float immediate bits
@@ -7608,7 +7602,7 @@
   ins_pipe( pipe_cmpxchg );
 %}
 
-instruct xaddL_no_res( memory mem, Universe dummy, immL add, rFlagsReg cr) %{
+instruct xaddL_no_res( memory mem, Universe dummy, immL32 add, rFlagsReg cr) %{
   predicate(n->as_LoadStore()->result_not_used());
   match(Set dummy (GetAndAddL mem add));
   effect(KILL cr);
@@ -9434,7 +9428,7 @@
   match(Set dst (CmpLTMask p q));
   effect(KILL cr);
 
-  ins_cost(400); // XXX
+  ins_cost(400);
   format %{ "cmpl    $p, $q\t# cmpLTMask\n\t"
             "setlt   $dst\n\t"
             "movzbl  $dst, $dst\n\t"
@@ -9452,37 +9446,63 @@
   match(Set dst (CmpLTMask dst zero));
   effect(KILL cr);
 
-  ins_cost(100); // XXX
+  ins_cost(100);
   format %{ "sarl    $dst, #31\t# cmpLTMask0" %}
-  opcode(0xC1, 0x7);  /* C1 /7 ib */
-  ins_encode(reg_opc_imm(dst, 0x1F));
+  ins_encode %{
+  __ sarl($dst$$Register, 31);
+  %}
   ins_pipe(ialu_reg);
 %}
 
-
-instruct cadd_cmpLTMask(rRegI p, rRegI q, rRegI y, rRegI tmp, rFlagsReg cr)
+/* Better to save a register than avoid a branch */
+instruct cadd_cmpLTMask(rRegI p, rRegI q, rRegI y, rFlagsReg cr)
 %{
   match(Set p (AddI (AndI (CmpLTMask p q) y) (SubI p q)));
-  effect(TEMP tmp, KILL cr);
-
-  ins_cost(400); // XXX
-  format %{ "subl    $p, $q\t# cadd_cmpLTMask1\n\t"
-            "sbbl    $tmp, $tmp\n\t"
-            "andl    $tmp, $y\n\t"
-            "addl    $p, $tmp" %}
+  effect(KILL cr);
+  ins_cost(300);
+  format %{ "subl   $p,$q\t# cadd_cmpLTMask\n\t"
+            "jge    done\n\t"
+            "addl   $p,$y\n"
+            "done:  " %}
   ins_encode %{
     Register Rp = $p$$Register;
     Register Rq = $q$$Register;
     Register Ry = $y$$Register;
-    Register Rt = $tmp$$Register;
+    Label done;
     __ subl(Rp, Rq);
-    __ sbbl(Rt, Rt);
-    __ andl(Rt, Ry);
-    __ addl(Rp, Rt);
+    __ jccb(Assembler::greaterEqual, done);
+    __ addl(Rp, Ry);
+    __ bind(done);
   %}
   ins_pipe(pipe_cmplt);
 %}
 
+/* Better to save a register than avoid a branch */
+instruct and_cmpLTMask(rRegI p, rRegI q, rRegI y, rFlagsReg cr)
+%{
+  match(Set y (AndI (CmpLTMask p q) y));
+  effect(KILL cr);
+
+  ins_cost(300);
+
+  format %{ "cmpl     $p, $q\t# and_cmpLTMask\n\t"
+            "jlt      done\n\t"
+            "xorl     $y, $y\n"
+            "done:  " %}
+  ins_encode %{
+    Register Rp = $p$$Register;
+    Register Rq = $q$$Register;
+    Register Ry = $y$$Register;
+    Label done;
+    __ cmpl(Rp, Rq);
+    __ jccb(Assembler::less, done);
+    __ xorl(Ry, Ry);
+    __ bind(done);
+  %}
+  ins_pipe(pipe_cmplt);
+%}
+
+
 //---------- FP Instructions------------------------------------------------
 
 instruct cmpF_cc_reg(rFlagsRegU cr, regF src1, regF src2)
--- a/hotspot/src/os/bsd/dtrace/generateJvmOffsets.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/os/bsd/dtrace/generateJvmOffsets.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,7 @@
 #define PR_MODEL_LP64  2
 
 #ifdef COMPILER1
-#if defined(DEBUG) || defined(FASTDEBUG)
+#ifdef ASSERT
 
 /*
  * To avoid the most part of potential link errors
@@ -84,7 +84,7 @@
 
 StubQueue* AbstractInterpreter::_code = NULL;
 
-#endif /* defined(DEBUG) || defined(FASTDEBUG) */
+#endif /* ASSERT */
 #endif /* COMPILER1 */
 
 #define GEN_OFFS(Type,Name)                             \
--- a/hotspot/src/os/bsd/vm/chaitin_bsd.cpp	Wed May 01 12:25:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "opto/chaitin.hpp"
-#include "opto/machnode.hpp"
-
-void PhaseRegAlloc::pd_preallocate_hook() {
-  // no action
-}
-
-#ifdef ASSERT
-void PhaseRegAlloc::pd_postallocate_verify_hook() {
-  // no action
-}
-#endif
-
-
-// Reconciliation History
-// chaitin_solaris.cpp  1.7 99/07/12 23:54:22
-// End
--- a/hotspot/src/os/linux/vm/chaitin_linux.cpp	Wed May 01 12:25:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "opto/chaitin.hpp"
-#include "opto/machnode.hpp"
-
-void PhaseRegAlloc::pd_preallocate_hook() {
-  // no action
-}
-
-#ifdef ASSERT
-void PhaseRegAlloc::pd_postallocate_verify_hook() {
-  // no action
-}
-#endif
-
-
-// Reconciliation History
-// chaitin_solaris.cpp  1.7 99/07/12 23:54:22
-// End
--- a/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,14 +55,14 @@
 #include "utilities/accessFlags.hpp"
 #include "utilities/globalDefinitions.hpp"
 #ifdef COMPILER1
-#if defined(DEBUG) || defined(FASTDEBUG)
+#ifdef ASSERT
 
 /*
  * To avoid the most part of potential link errors
  * we link this program with -z nodefs .
  *
  * But for 'debug1' and 'fastdebug1' we still have to provide
- * a particular workaround for the following symbols bellow.
+ * a particular workaround for the following symbols below.
  * It will be good to find out a generic way in the future.
  */
 
@@ -79,7 +79,7 @@
 
 StubQueue* AbstractInterpreter::_code = NULL;
 
-#endif /* defined(DEBUG) || defined(FASTDEBUG) */
+#endif /* ASSERT */
 #endif /* COMPILER1 */
 
 #define GEN_OFFS(Type,Name)                             \
--- a/hotspot/src/os/solaris/vm/chaitin_solaris.cpp	Wed May 01 12:25:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "opto/chaitin.hpp"
-#include "opto/machnode.hpp"
-
-void PhaseRegAlloc::pd_preallocate_hook() {
-  // no action
-}
-
-#ifdef ASSERT
-void PhaseRegAlloc::pd_postallocate_verify_hook() {
-  // no action
-}
-#endif
-
-
-//Reconciliation History
-// 1.1 99/02/12 15:35:26 chaitin_win32.cpp
-// 1.2 99/02/18 15:38:56 chaitin_win32.cpp
-// 1.4 99/03/09 10:37:48 chaitin_win32.cpp
-// 1.6 99/03/25 11:07:44 chaitin_win32.cpp
-// 1.8 99/06/22 16:38:58 chaitin_win32.cpp
-//End
--- a/hotspot/src/os/windows/vm/chaitin_windows.cpp	Wed May 01 12:25:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "opto/chaitin.hpp"
-#include "opto/machnode.hpp"
-
-// Disallow the use of the frame pointer (EBP) for implicit null exceptions
-// on win95/98.  If we do not do this, the OS gets confused and gives a stack
-// error.
-void PhaseRegAlloc::pd_preallocate_hook() {
-#ifndef _WIN64
-  if (ImplicitNullChecks && !os::win32::is_nt()) {
-    for (uint block_num=1; block_num<_cfg._num_blocks; block_num++) {
-      Block *block = _cfg._blocks[block_num];
-
-      Node *block_end = block->end();
-      if (block_end->is_MachNullCheck() &&
-          block_end->as_Mach()->ideal_Opcode() != Op_Con) {
-        // The last instruction in the block is an implicit null check.
-        // Fix its input so that it does not load into the frame pointer.
-        _matcher.pd_implicit_null_fixup(block_end->in(1)->as_Mach(),
-                                        block_end->as_MachNullCheck()->_vidx);
-      }
-    }
-  }
-#else
-  // WIN64==itanium on XP
-#endif
-}
-
-#ifdef ASSERT
-// Verify that no implicit null check uses the frame pointer (EBP) as
-// its register on win95/98.  Use of the frame pointer in an implicit
-// null check confuses the OS, yielding a stack error.
-void PhaseRegAlloc::pd_postallocate_verify_hook() {
-#ifndef _WIN64
-  if (ImplicitNullChecks && !os::win32::is_nt()) {
-    for (uint block_num=1; block_num<_cfg._num_blocks; block_num++) {
-      Block *block = _cfg._blocks[block_num];
-
-      Node *block_end = block->_nodes[block->_nodes.size()-1];
-      if (block_end->is_MachNullCheck() && block_end->as_Mach()->ideal_Opcode() != Op_Con) {
-        // The last instruction in the block is an implicit
-        // null check.  Verify that this instruction does not
-        // use the frame pointer.
-        int reg = get_reg_first(block_end->in(1)->in(block_end->as_MachNullCheck()->_vidx));
-        assert(reg != EBP_num,
-               "implicit null check using frame pointer on win95/98");
-      }
-    }
-  }
-#else
-  // WIN64==itanium on XP
-#endif
-}
-#endif
--- a/hotspot/src/os/windows/vm/os_windows.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Wed May 08 11:22:25 2013 +0100
@@ -4238,9 +4238,6 @@
           path[3] = '\0';
   }
 
-  #ifdef DEBUG
-    jio_fprintf(stderr, "sysNativePath: %s\n", path);
-  #endif DEBUG
   return path;
 }
 
--- a/hotspot/src/share/tools/hsdis/Makefile	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/tools/hsdis/Makefile	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Single gnu makefile for solaris, linux and windows (windows requires cygwin and mingw)
@@ -66,7 +66,7 @@
 endif
 CC 		= $(MINGW)-gcc
 CONFIGURE_ARGS= --host=$(MINGW) --target=$(MINGW)
-else   #linux 
+else   #linux
 CPU             = $(shell uname -m)
 ARCH1=$(CPU:x86_64=amd64)
 ARCH=$(ARCH1:i686=i386)
@@ -116,7 +116,6 @@
 else #Windows
 OS		= windows
 CC		= gcc
-#CPPFLAGS	+= /D"WIN32" /D"_WINDOWS" /D"DEBUG" /D"NDEBUG"
 CFLAGS		+=  /nologo /MD /W3 /WX /O2 /Fo$(@:.dll=.obj) /Gi-
 CFLAGS		+= LIBARCH=\"$(LIBARCH)\"
 DLDFLAGS	+= /dll /subsystem:windows /incremental:no \
--- a/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp	Wed May 08 11:22:25 2013 +0100
@@ -938,5 +938,7 @@
 void Canonicalizer::do_ProfileInvoke(ProfileInvoke* x) {}
 void Canonicalizer::do_RuntimeCall(RuntimeCall* x) {}
 void Canonicalizer::do_RangeCheckPredicate(RangeCheckPredicate* x) {}
+#ifdef ASSERT
 void Canonicalizer::do_Assert(Assert* x) {}
+#endif
 void Canonicalizer::do_MemBar(MemBar* x) {}
--- a/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp	Wed May 08 11:22:25 2013 +0100
@@ -108,7 +108,9 @@
   virtual void do_RuntimeCall    (RuntimeCall*     x);
   virtual void do_MemBar         (MemBar*          x);
   virtual void do_RangeCheckPredicate(RangeCheckPredicate* x);
+#ifdef ASSERT
   virtual void do_Assert         (Assert*          x);
+#endif
 };
 
 #endif // SHARE_VM_C1_C1_CANONICALIZER_HPP
--- a/hotspot/src/share/vm/c1/c1_Instruction.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_Instruction.hpp	Wed May 08 11:22:25 2013 +0100
@@ -111,7 +111,9 @@
 class   RuntimeCall;
 class   MemBar;
 class   RangeCheckPredicate;
+#ifdef ASSERT
 class   Assert;
+#endif
 
 // A Value is a reference to the instruction creating the value
 typedef Instruction* Value;
--- a/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp	Wed May 08 11:22:25 2013 +0100
@@ -871,12 +871,14 @@
   }
 }
 
+#ifdef ASSERT
 void InstructionPrinter::do_Assert(Assert* x) {
   output()->print("assert ");
   print_value(x->x());
   output()->print(" %s ", cond_name(x->cond()));
   print_value(x->y());
 }
+#endif
 
 void InstructionPrinter::do_UnsafePrefetchWrite(UnsafePrefetchWrite* x) {
   print_unsafe_object_op(x, "UnsafePrefetchWrite");
--- a/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp	Wed May 08 11:22:25 2013 +0100
@@ -136,7 +136,9 @@
   virtual void do_RuntimeCall    (RuntimeCall*     x);
   virtual void do_MemBar         (MemBar*          x);
   virtual void do_RangeCheckPredicate(RangeCheckPredicate* x);
+#ifdef ASSERT
   virtual void do_Assert         (Assert*          x);
+#endif
 };
 #endif // PRODUCT
 
--- a/hotspot/src/share/vm/c1/c1_LIR.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_LIR.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1778,7 +1778,9 @@
      // LIR_OpProfileCall
      case lir_profile_call:          s = "profile_call";  break;
      // LIR_OpAssert
+#ifdef ASSERT
      case lir_assert:                s = "assert";        break;
+#endif
      case lir_none:                  ShouldNotReachHere();break;
     default:                         s = "illegal_op";    break;
   }
@@ -2025,12 +2027,14 @@
   out->print("[lbl:0x%x]", stub()->entry());
 }
 
+#ifdef ASSERT
 void LIR_OpAssert::print_instr(outputStream* out) const {
   print_condition(out, condition()); out->print(" ");
   in_opr1()->print(out);             out->print(" ");
   in_opr2()->print(out);             out->print(", \"");
   out->print(msg());                 out->print("\"");
 }
+#endif
 
 
 void LIR_OpDelay::print_instr(outputStream* out) const {
--- a/hotspot/src/share/vm/c1/c1_LIR.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_LIR.hpp	Wed May 08 11:22:25 2013 +0100
@@ -881,8 +881,9 @@
 class    LIR_OpTypeCheck;
 class    LIR_OpCompareAndSwap;
 class    LIR_OpProfileCall;
+#ifdef ASSERT
 class    LIR_OpAssert;
-
+#endif
 
 // LIR operation codes
 enum LIR_Code {
@@ -1139,7 +1140,9 @@
   virtual LIR_OpTypeCheck* as_OpTypeCheck() { return NULL; }
   virtual LIR_OpCompareAndSwap* as_OpCompareAndSwap() { return NULL; }
   virtual LIR_OpProfileCall* as_OpProfileCall() { return NULL; }
+#ifdef ASSERT
   virtual LIR_OpAssert* as_OpAssert() { return NULL; }
+#endif
 
   virtual void verify() const {}
 };
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3044,21 +3044,20 @@
   assert(level > CompLevel_simple, "Shouldn't be here");
 
   int offset = -1;
-  LIR_Opr counter_holder = new_register(T_METADATA);
-  LIR_Opr meth;
+  LIR_Opr counter_holder;
   if (level == CompLevel_limited_profile) {
-    offset = in_bytes(backedge ? Method::backedge_counter_offset() :
-                                 Method::invocation_counter_offset());
-    __ metadata2reg(method->constant_encoding(), counter_holder);
-    meth = counter_holder;
+    address counters_adr = method->ensure_method_counters();
+    counter_holder = new_pointer_register();
+    __ move(LIR_OprFact::intptrConst(counters_adr), counter_holder);
+    offset = in_bytes(backedge ? MethodCounters::backedge_counter_offset() :
+                                 MethodCounters::invocation_counter_offset());
   } else if (level == CompLevel_full_profile) {
+    counter_holder = new_register(T_METADATA);
     offset = in_bytes(backedge ? MethodData::backedge_counter_offset() :
                                  MethodData::invocation_counter_offset());
     ciMethodData* md = method->method_data_or_null();
     assert(md != NULL, "Sanity");
     __ metadata2reg(md->constant_encoding(), counter_holder);
-    meth = new_register(T_METADATA);
-    __ metadata2reg(method->constant_encoding(), meth);
   } else {
     ShouldNotReachHere();
   }
@@ -3069,6 +3068,8 @@
   __ store(result, counter);
   if (notify) {
     LIR_Opr mask = load_immediate(frequency << InvocationCounter::count_shift, T_INT);
+    LIR_Opr meth = new_register(T_METADATA);
+    __ metadata2reg(method->constant_encoding(), meth);
     __ logical_and(result, mask, result);
     __ cmp(lir_cond_equal, result, LIR_OprFact::intConst(0));
     // The bci for info can point to cmp for if's we want the if bci
@@ -3103,8 +3104,8 @@
   }
 }
 
+#ifdef ASSERT
 void LIRGenerator::do_Assert(Assert *x) {
-#ifdef ASSERT
   ValueTag tag = x->x()->type()->tag();
   If::Condition cond = x->cond();
 
@@ -3124,9 +3125,8 @@
   LIR_Opr right = yin->result();
 
   __ lir_assert(lir_cond(x->cond()), left, right, x->message(), true);
+}
 #endif
-}
-
 
 void LIRGenerator::do_RangeCheckPredicate(RangeCheckPredicate *x) {
 
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp	Wed May 08 11:22:25 2013 +0100
@@ -537,7 +537,9 @@
   virtual void do_RuntimeCall    (RuntimeCall*     x);
   virtual void do_MemBar         (MemBar*          x);
   virtual void do_RangeCheckPredicate(RangeCheckPredicate* x);
+#ifdef ASSERT
   virtual void do_Assert         (Assert*          x);
+#endif
 };
 
 
--- a/hotspot/src/share/vm/c1/c1_Optimizer.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_Optimizer.cpp	Wed May 08 11:22:25 2013 +0100
@@ -535,7 +535,9 @@
   void do_RuntimeCall    (RuntimeCall*     x);
   void do_MemBar         (MemBar*          x);
   void do_RangeCheckPredicate(RangeCheckPredicate* x);
+#ifdef ASSERT
   void do_Assert         (Assert*          x);
+#endif
 };
 
 
@@ -718,8 +720,9 @@
 void NullCheckVisitor::do_RuntimeCall    (RuntimeCall*     x) {}
 void NullCheckVisitor::do_MemBar         (MemBar*          x) {}
 void NullCheckVisitor::do_RangeCheckPredicate(RangeCheckPredicate* x) {}
+#ifdef ASSERT
 void NullCheckVisitor::do_Assert         (Assert*          x) {}
-
+#endif
 
 void NullCheckEliminator::visit(Value* p) {
   assert(*p != NULL, "should not find NULL instructions");
--- a/hotspot/src/share/vm/c1/c1_RangeCheckElimination.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_RangeCheckElimination.cpp	Wed May 08 11:22:25 2013 +0100
@@ -459,7 +459,7 @@
 
     // Iterate over all different indices
     if (_optimistic) {
-      for (int i=0; i<indices.length(); i++) {
+      for (int i = 0; i < indices.length(); i++) {
         Instruction *index_instruction = indices.at(i);
         AccessIndexedInfo *info = _access_indexed_info[index_instruction->id()];
         assert(info != NULL, "Info must not be null");
@@ -531,9 +531,7 @@
             remove_range_check(ai);
           }
         }
-        _access_indexed_info[index_instruction->id()] = NULL;
       }
-      indices.clear();
 
       if (list_constant.length() > 1) {
         AccessIndexed *first = list_constant.at(0);
@@ -560,6 +558,13 @@
         }
       }
     }
+
+    // Clear data structures for next array
+    for (int i = 0; i < indices.length(); i++) {
+      Instruction *index_instruction = indices.at(i);
+      _access_indexed_info[index_instruction->id()] = NULL;
+    }
+    indices.clear();
   }
 }
 
--- a/hotspot/src/share/vm/c1/c1_RangeCheckElimination.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_RangeCheckElimination.hpp	Wed May 08 11:22:25 2013 +0100
@@ -166,7 +166,9 @@
     void do_RuntimeCall    (RuntimeCall*     x) { /* nothing to do */ };
     void do_MemBar         (MemBar*          x) { /* nothing to do */ };
     void do_RangeCheckPredicate(RangeCheckPredicate* x) { /* nothing to do */ };
+#ifdef ASSERT
     void do_Assert         (Assert*          x) { /* nothing to do */ };
+#endif
   };
 
 #ifdef ASSERT
--- a/hotspot/src/share/vm/c1/c1_ValueMap.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/c1/c1_ValueMap.hpp	Wed May 08 11:22:25 2013 +0100
@@ -207,7 +207,9 @@
   void do_RuntimeCall    (RuntimeCall*     x) { /* nothing to do */ };
   void do_MemBar         (MemBar*          x) { /* nothing to do */ };
   void do_RangeCheckPredicate(RangeCheckPredicate* x) { /* nothing to do */ };
+#ifdef ASSERT
   void do_Assert         (Assert*          x) { /* nothing to do */ };
+#endif
 };
 
 
--- a/hotspot/src/share/vm/ci/ciMethod.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/ci/ciMethod.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -905,6 +905,20 @@
 }
 
 // ------------------------------------------------------------------
+// ciMethod::ensure_method_counters
+//
+address ciMethod::ensure_method_counters() {
+  check_is_loaded();
+  VM_ENTRY_MARK;
+  methodHandle mh(THREAD, get_Method());
+  MethodCounters *counter = mh->method_counters();
+  if (counter == NULL) {
+    counter = Method::build_method_counters(mh(), CHECK_AND_CLEAR_NULL);
+  }
+  return (address)counter;
+}
+
+// ------------------------------------------------------------------
 // ciMethod::should_exclude
 //
 // Should this method be excluded from compilation?
@@ -1191,13 +1205,14 @@
   ASSERT_IN_VM;
   ResourceMark rm;
   Method* method = get_Method();
+  MethodCounters* mcs = method->method_counters();
   Klass*  holder = method->method_holder();
   st->print_cr("ciMethod %s %s %s %d %d %d %d %d",
                holder->name()->as_quoted_ascii(),
                method->name()->as_quoted_ascii(),
                method->signature()->as_quoted_ascii(),
-               method->invocation_counter()->raw_counter(),
-               method->backedge_counter()->raw_counter(),
+               mcs == NULL ? 0 : mcs->invocation_counter()->raw_counter(),
+               mcs == NULL ? 0 : mcs->backedge_counter()->raw_counter(),
                interpreter_invocation_count(),
                interpreter_throwout_count(),
                _instructions_size);
--- a/hotspot/src/share/vm/ci/ciMethod.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/ci/ciMethod.hpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -262,6 +262,7 @@
   bool is_klass_loaded(int refinfo_index, bool must_be_resolved) const;
   bool check_call(int refinfo_index, bool is_static) const;
   bool ensure_method_data();  // make sure it exists in the VM also
+  address ensure_method_counters();
   int instructions_size();
   int scale_count(int count, float prof_factor = 1.);  // make MDO count commensurate with IIC
 
--- a/hotspot/src/share/vm/ci/ciReplay.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/ci/ciReplay.cpp	Wed May 08 11:22:25 2013 +0100
@@ -920,12 +920,17 @@
     method->print_name(tty);
     tty->cr();
   } else {
+    EXCEPTION_CONTEXT;
+    MethodCounters* mcs = method->method_counters();
     // m->_instructions_size = rec->instructions_size;
     m->_instructions_size = -1;
     m->_interpreter_invocation_count = rec->interpreter_invocation_count;
     m->_interpreter_throwout_count = rec->interpreter_throwout_count;
-    method->invocation_counter()->_counter = rec->invocation_counter;
-    method->backedge_counter()->_counter = rec->backedge_counter;
+    if (mcs == NULL) {
+      mcs = Method::build_method_counters(method, CHECK_AND_CLEAR);
+    }
+    mcs->invocation_counter()->_counter = rec->invocation_counter;
+    mcs->backedge_counter()->_counter = rec->backedge_counter;
   }
 }
 
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp	Wed May 08 11:22:25 2013 +0100
@@ -436,14 +436,19 @@
               ref_index, CHECK_(nullHandle));
             break;
           case JVM_REF_invokeVirtual:
-          case JVM_REF_invokeStatic:
-          case JVM_REF_invokeSpecial:
           case JVM_REF_newInvokeSpecial:
             check_property(
               tag.is_method(),
               "Invalid constant pool index %u in class file %s (not a method)",
               ref_index, CHECK_(nullHandle));
             break;
+          case JVM_REF_invokeStatic:
+          case JVM_REF_invokeSpecial:
+            check_property(
+               tag.is_method() || tag.is_interface_method(),
+               "Invalid constant pool index %u in class file %s (not a method)",
+               ref_index, CHECK_(nullHandle));
+             break;
           case JVM_REF_invokeInterface:
             check_property(
               tag.is_interface_method(),
@@ -3837,7 +3842,7 @@
     }
 
     if (TraceClassLoadingPreorder) {
-      tty->print("[Loading %s", name->as_klass_external_name());
+      tty->print("[Loading %s", (name != NULL) ? name->as_klass_external_name() : "NoName");
       if (cfs->source() != NULL) tty->print(" from %s", cfs->source());
       tty->print_cr("]");
     }
--- a/hotspot/src/share/vm/classfile/classLoader.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/classfile/classLoader.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1274,13 +1274,16 @@
   Handle system_class_loader (THREAD, SystemDictionary::java_system_loader());
   // Iterate over all bootstrap class path entries
   ClassPathEntry* e = _first_entry;
+  jlong start = os::javaTimeMillis();
   while (e != NULL) {
     // We stop at rt.jar, unless it is the first bootstrap path entry
     if (e->is_rt_jar() && e != _first_entry) break;
     e->compile_the_world(system_class_loader, CATCH);
     e = e->next();
   }
-  tty->print_cr("CompileTheWorld : Done");
+  jlong end = os::javaTimeMillis();
+  tty->print_cr("CompileTheWorld : Done (%d classes, %d methods, %d ms)",
+                _compile_the_world_class_counter, _compile_the_world_method_counter, (end - start));
   {
     // Print statistics as if before normal exit:
     extern void print_statistics();
@@ -1289,7 +1292,8 @@
   vm_exit(0);
 }
 
-int ClassLoader::_compile_the_world_counter = 0;
+int ClassLoader::_compile_the_world_class_counter = 0;
+int ClassLoader::_compile_the_world_method_counter = 0;
 static int _codecache_sweep_counter = 0;
 
 // Filter out all exceptions except OOMs
@@ -1311,8 +1315,8 @@
     // If the file has a period after removing .class, it's not really a
     // valid class file.  The class loader will check everything else.
     if (strchr(buffer, '.') == NULL) {
-      _compile_the_world_counter++;
-      if (_compile_the_world_counter > CompileTheWorldStopAt) return;
+      _compile_the_world_class_counter++;
+      if (_compile_the_world_class_counter > CompileTheWorldStopAt) return;
 
       // Construct name without extension
       TempNewSymbol sym = SymbolTable::new_symbol(buffer, CHECK);
@@ -1329,16 +1333,16 @@
         if (HAS_PENDING_EXCEPTION) {
           // If something went wrong in preloading we just ignore it
           clear_pending_exception_if_not_oom(CHECK);
-          tty->print_cr("Preloading failed for (%d) %s", _compile_the_world_counter, buffer);
+          tty->print_cr("Preloading failed for (%d) %s", _compile_the_world_class_counter, buffer);
         }
       }
 
-      if (_compile_the_world_counter >= CompileTheWorldStartAt) {
+      if (_compile_the_world_class_counter >= CompileTheWorldStartAt) {
         if (k.is_null() || exception_occurred) {
           // If something went wrong (e.g. ExceptionInInitializerError) we skip this class
-          tty->print_cr("CompileTheWorld (%d) : Skipping %s", _compile_the_world_counter, buffer);
+          tty->print_cr("CompileTheWorld (%d) : Skipping %s", _compile_the_world_class_counter, buffer);
         } else {
-          tty->print_cr("CompileTheWorld (%d) : %s", _compile_the_world_counter, buffer);
+          tty->print_cr("CompileTheWorld (%d) : %s", _compile_the_world_class_counter, buffer);
           // Preload all classes to get around uncommon traps
           // Iterate over all methods in class
           for (int n = 0; n < k->methods()->length(); n++) {
@@ -1356,7 +1360,9 @@
                                             methodHandle(), 0, "CTW", THREAD);
               if (HAS_PENDING_EXCEPTION) {
                 clear_pending_exception_if_not_oom(CHECK);
-                tty->print_cr("CompileTheWorld (%d) : Skipping method: %s", _compile_the_world_counter, m->name()->as_C_string());
+                tty->print_cr("CompileTheWorld (%d) : Skipping method: %s", _compile_the_world_class_counter, m->name()->as_C_string());
+              } else {
+                _compile_the_world_method_counter++;
               }
               if (TieredCompilation && TieredStopAtLevel >= CompLevel_full_optimization) {
                 // Clobber the first compile and force second tier compilation
@@ -1370,7 +1376,9 @@
                                               methodHandle(), 0, "CTW", THREAD);
                 if (HAS_PENDING_EXCEPTION) {
                   clear_pending_exception_if_not_oom(CHECK);
-                  tty->print_cr("CompileTheWorld (%d) : Skipping method: %s", _compile_the_world_counter, m->name()->as_C_string());
+                  tty->print_cr("CompileTheWorld (%d) : Skipping method: %s", _compile_the_world_class_counter, m->name()->as_C_string());
+                } else {
+                  _compile_the_world_method_counter++;
                 }
               }
             }
--- a/hotspot/src/share/vm/classfile/classLoader.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/classfile/classLoader.hpp	Wed May 08 11:22:25 2013 +0100
@@ -340,11 +340,12 @@
   // Force compilation of all methods in all classes in bootstrap class path (stress test)
 #ifndef PRODUCT
  private:
-  static int _compile_the_world_counter;
+  static int _compile_the_world_class_counter;
+  static int _compile_the_world_method_counter;
  public:
   static void compile_the_world();
   static void compile_the_world_in(char* name, Handle loader, TRAPS);
-  static int  compile_the_world_counter() { return _compile_the_world_counter; }
+  static int  compile_the_world_counter() { return _compile_the_world_class_counter; }
 #endif //PRODUCT
 };
 
--- a/hotspot/src/share/vm/classfile/genericSignatures.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/classfile/genericSignatures.cpp	Wed May 08 11:22:25 2013 +0100
@@ -268,8 +268,15 @@
     Klass* outer = SystemDictionary::find(
         outer_name, class_loader, protection_domain, CHECK_NULL);
     if (outer == NULL && !THREAD->is_Compiler_thread()) {
-      outer = SystemDictionary::resolve_super_or_fail(original_name,
-          outer_name, class_loader, protection_domain, false, CHECK_NULL);
+      if (outer_name == ik->super()->name()) {
+        outer = SystemDictionary::resolve_super_or_fail(original_name, outer_name,
+                                                        class_loader, protection_domain,
+                                                        false, CHECK_NULL);
+      }
+      else {
+        outer = SystemDictionary::resolve_or_fail(outer_name, class_loader,
+                                                  protection_domain, false, CHECK_NULL);
+      }
     }
 
     InstanceKlass* outer_ik;
--- a/hotspot/src/share/vm/classfile/javaClasses.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/classfile/javaClasses.cpp	Wed May 08 11:22:25 2013 +0100
@@ -2625,6 +2625,15 @@
   return (Metadata*)mname->address_field(_vmtarget_offset);
 }
 
+#if INCLUDE_JVMTI
+// Can be executed on VM thread only
+void java_lang_invoke_MemberName::adjust_vmtarget(oop mname, Metadata* ref) {
+  assert((is_instance(mname) && (flags(mname) & (MN_IS_METHOD | MN_IS_CONSTRUCTOR)) > 0), "wrong type");
+  assert(Thread::current()->is_VM_thread(), "not VM thread");
+  mname->address_field_put(_vmtarget_offset, (address)ref);
+}
+#endif // INCLUDE_JVMTI
+
 void java_lang_invoke_MemberName::set_vmtarget(oop mname, Metadata* ref) {
   assert(is_instance(mname), "wrong type");
   // check the type of the vmtarget
--- a/hotspot/src/share/vm/classfile/javaClasses.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/classfile/javaClasses.hpp	Wed May 08 11:22:25 2013 +0100
@@ -1036,6 +1036,9 @@
 
   static Metadata*      vmtarget(oop mname);
   static void       set_vmtarget(oop mname, Metadata* target);
+#if INCLUDE_JVMTI
+  static void       adjust_vmtarget(oop mname, Metadata* target);
+#endif // INCLUDE_JVMTI
 
   static intptr_t       vmindex(oop mname);
   static void       set_vmindex(oop mname, intptr_t index);
--- a/hotspot/src/share/vm/classfile/stackMapFrame.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/classfile/stackMapFrame.hpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -175,14 +175,14 @@
       ErrorContext* ctx, TRAPS) const;
 
   inline void set_mark() {
-#ifdef DEBUG
+#ifdef ASSERT
     // Put bogus type to indicate it's no longer valid.
     if (_stack_mark != -1) {
       for (int i = _stack_mark - 1; i >= _stack_size; --i) {
         _stack[i] = VerificationType::bogus_type();
       }
     }
-#endif // def DEBUG
+#endif // def ASSERT
     _stack_mark = _stack_size;
   }
 
--- a/hotspot/src/share/vm/code/codeBlob.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/code/codeBlob.cpp	Wed May 08 11:22:25 2013 +0100
@@ -348,14 +348,14 @@
 
 
 void* RuntimeStub::operator new(size_t s, unsigned size) {
-  void* p = CodeCache::allocate(size);
+  void* p = CodeCache::allocate(size, true);
   if (!p) fatal("Initial size of CodeCache is too small");
   return p;
 }
 
 // operator new shared by all singletons:
 void* SingletonBlob::operator new(size_t s, unsigned size) {
-  void* p = CodeCache::allocate(size);
+  void* p = CodeCache::allocate(size, true);
   if (!p) fatal("Initial size of CodeCache is too small");
   return p;
 }
--- a/hotspot/src/share/vm/code/codeCache.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/code/codeCache.cpp	Wed May 08 11:22:25 2013 +0100
@@ -172,7 +172,7 @@
 
 static size_t maxCodeCacheUsed = 0;
 
-CodeBlob* CodeCache::allocate(int size) {
+CodeBlob* CodeCache::allocate(int size, bool is_critical) {
   // Do not seize the CodeCache lock here--if the caller has not
   // already done so, we are going to lose bigtime, since the code
   // cache will contain a garbage CodeBlob until the caller can
@@ -183,7 +183,7 @@
   CodeBlob* cb = NULL;
   _number_of_blobs++;
   while (true) {
-    cb = (CodeBlob*)_heap->allocate(size);
+    cb = (CodeBlob*)_heap->allocate(size, is_critical);
     if (cb != NULL) break;
     if (!_heap->expand_by(CodeCacheExpansionSize)) {
       // Expansion failed
@@ -192,8 +192,8 @@
     if (PrintCodeCacheExtension) {
       ResourceMark rm;
       tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (%d bytes)",
-                    (intptr_t)_heap->begin(), (intptr_t)_heap->end(),
-                    (address)_heap->end() - (address)_heap->begin());
+                    (intptr_t)_heap->low_boundary(), (intptr_t)_heap->high(),
+                    (address)_heap->high() - (address)_heap->low_boundary());
     }
   }
   maxCodeCacheUsed = MAX2(maxCodeCacheUsed, ((address)_heap->high_boundary() -
@@ -608,13 +608,13 @@
 
 address CodeCache::first_address() {
   assert_locked_or_safepoint(CodeCache_lock);
-  return (address)_heap->begin();
+  return (address)_heap->low_boundary();
 }
 
 
 address CodeCache::last_address() {
   assert_locked_or_safepoint(CodeCache_lock);
-  return (address)_heap->end();
+  return (address)_heap->high();
 }
 
 
@@ -996,10 +996,9 @@
 void CodeCache::print_summary(outputStream* st, bool detailed) {
   size_t total = (_heap->high_boundary() - _heap->low_boundary());
   st->print_cr("CodeCache: size=" SIZE_FORMAT "Kb used=" SIZE_FORMAT
-               "Kb max_used=" SIZE_FORMAT "Kb free=" SIZE_FORMAT
-               "Kb max_free_chunk=" SIZE_FORMAT "Kb",
+               "Kb max_used=" SIZE_FORMAT "Kb free=" SIZE_FORMAT "Kb",
                total/K, (total - unallocated_capacity())/K,
-               maxCodeCacheUsed/K, unallocated_capacity()/K, largest_free_block()/K);
+               maxCodeCacheUsed/K, unallocated_capacity()/K);
 
   if (detailed) {
     st->print_cr(" bounds [" INTPTR_FORMAT ", " INTPTR_FORMAT ", " INTPTR_FORMAT "]",
@@ -1018,19 +1017,8 @@
 
 void CodeCache::log_state(outputStream* st) {
   st->print(" total_blobs='" UINT32_FORMAT "' nmethods='" UINT32_FORMAT "'"
-            " adapters='" UINT32_FORMAT "' free_code_cache='" SIZE_FORMAT "'"
-            " largest_free_block='" SIZE_FORMAT "'",
+            " adapters='" UINT32_FORMAT "' free_code_cache='" SIZE_FORMAT "'",
             nof_blobs(), nof_nmethods(), nof_adapters(),
-            unallocated_capacity(), largest_free_block());
+            unallocated_capacity());
 }
 
-size_t CodeCache::largest_free_block() {
-  // This is called both with and without CodeCache_lock held so
-  // handle both cases.
-  if (CodeCache_lock->owned_by_self()) {
-    return _heap->largest_free_block();
-  } else {
-    MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
-    return _heap->largest_free_block();
-  }
-}
--- a/hotspot/src/share/vm/code/codeCache.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/code/codeCache.hpp	Wed May 08 11:22:25 2013 +0100
@@ -70,7 +70,7 @@
   static void initialize();
 
   // Allocation/administration
-  static CodeBlob* allocate(int size);              // allocates a new CodeBlob
+  static CodeBlob* allocate(int size, bool is_critical = false); // allocates a new CodeBlob
   static void commit(CodeBlob* cb);                 // called when the allocated CodeBlob has been filled
   static int alignment_unit();                      // guaranteed alignment of all CodeBlobs
   static int alignment_offset();                    // guaranteed offset of first CodeBlob byte within alignment unit (i.e., allocation header)
@@ -156,19 +156,13 @@
   static address  low_bound()                    { return (address) _heap->low_boundary(); }
   static address  high_bound()                   { return (address) _heap->high_boundary(); }
 
-  static bool has_space(int size) {
-    // Always leave some room in the CodeCache for I2C/C2I adapters
-    return largest_free_block() > (CodeCacheMinimumFreeSpace + size);
-  }
-
   // Profiling
   static address first_address();                // first address used for CodeBlobs
   static address last_address();                 // last  address used for CodeBlobs
   static size_t  capacity()                      { return _heap->capacity(); }
   static size_t  max_capacity()                  { return _heap->max_capacity(); }
   static size_t  unallocated_capacity()          { return _heap->unallocated_capacity(); }
-  static size_t  largest_free_block();
-  static bool    needs_flushing()                { return largest_free_block() < CodeCacheFlushingMinimumFreeSpace; }
+  static bool    needs_flushing()                { return unallocated_capacity() < CodeCacheFlushingMinimumFreeSpace; }
 
   static bool needs_cache_clean()                { return _needs_cache_clean; }
   static void set_needs_cache_clean(bool v)      { _needs_cache_clean = v;    }
--- a/hotspot/src/share/vm/code/nmethod.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/code/nmethod.cpp	Wed May 08 11:22:25 2013 +0100
@@ -501,18 +501,17 @@
   {
     MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
     int native_nmethod_size = allocation_size(code_buffer, sizeof(nmethod));
-    if (CodeCache::has_space(native_nmethod_size)) {
-      CodeOffsets offsets;
-      offsets.set_value(CodeOffsets::Verified_Entry, vep_offset);
-      offsets.set_value(CodeOffsets::Frame_Complete, frame_complete);
-      nm = new (native_nmethod_size) nmethod(method(), native_nmethod_size,
-                                             compile_id, &offsets,
-                                             code_buffer, frame_size,
-                                             basic_lock_owner_sp_offset,
-                                             basic_lock_sp_offset, oop_maps);
-      NOT_PRODUCT(if (nm != NULL)  nmethod_stats.note_native_nmethod(nm));
-      if (PrintAssembly && nm != NULL)
-        Disassembler::decode(nm);
+    CodeOffsets offsets;
+    offsets.set_value(CodeOffsets::Verified_Entry, vep_offset);
+    offsets.set_value(CodeOffsets::Frame_Complete, frame_complete);
+    nm = new (native_nmethod_size) nmethod(method(), native_nmethod_size,
+                                            compile_id, &offsets,
+                                            code_buffer, frame_size,
+                                            basic_lock_owner_sp_offset,
+                                            basic_lock_sp_offset, oop_maps);
+    NOT_PRODUCT(if (nm != NULL)  nmethod_stats.note_native_nmethod(nm));
+    if (PrintAssembly && nm != NULL) {
+      Disassembler::decode(nm);
     }
   }
   // verify nmethod
@@ -538,18 +537,17 @@
   {
     MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
     int nmethod_size = allocation_size(code_buffer, sizeof(nmethod));
-    if (CodeCache::has_space(nmethod_size)) {
-      CodeOffsets offsets;
-      offsets.set_value(CodeOffsets::Verified_Entry, vep_offset);
-      offsets.set_value(CodeOffsets::Dtrace_trap, trap_offset);
-      offsets.set_value(CodeOffsets::Frame_Complete, frame_complete);
+    CodeOffsets offsets;
+    offsets.set_value(CodeOffsets::Verified_Entry, vep_offset);
+    offsets.set_value(CodeOffsets::Dtrace_trap, trap_offset);
+    offsets.set_value(CodeOffsets::Frame_Complete, frame_complete);
 
-      nm = new (nmethod_size) nmethod(method(), nmethod_size,
-                                      &offsets, code_buffer, frame_size);
+    nm = new (nmethod_size) nmethod(method(), nmethod_size,
+                                    &offsets, code_buffer, frame_size);
 
-      NOT_PRODUCT(if (nm != NULL)  nmethod_stats.note_nmethod(nm));
-      if (PrintAssembly && nm != NULL)
-        Disassembler::decode(nm);
+    NOT_PRODUCT(if (nm != NULL)  nmethod_stats.note_nmethod(nm));
+    if (PrintAssembly && nm != NULL) {
+      Disassembler::decode(nm);
     }
   }
   // verify nmethod
@@ -591,16 +589,16 @@
       + round_to(handler_table->size_in_bytes(), oopSize)
       + round_to(nul_chk_table->size_in_bytes(), oopSize)
       + round_to(debug_info->data_size()       , oopSize);
-    if (CodeCache::has_space(nmethod_size)) {
-      nm = new (nmethod_size)
-      nmethod(method(), nmethod_size, compile_id, entry_bci, offsets,
-              orig_pc_offset, debug_info, dependencies, code_buffer, frame_size,
-              oop_maps,
-              handler_table,
-              nul_chk_table,
-              compiler,
-              comp_level);
-    }
+
+    nm = new (nmethod_size)
+    nmethod(method(), nmethod_size, compile_id, entry_bci, offsets,
+            orig_pc_offset, debug_info, dependencies, code_buffer, frame_size,
+            oop_maps,
+            handler_table,
+            nul_chk_table,
+            compiler,
+            comp_level);
+
     if (nm != NULL) {
       // To make dependency checking during class loading fast, record
       // the nmethod dependencies in the classes it is dependent on.
@@ -612,15 +610,18 @@
       // classes the slow way is too slow.
       for (Dependencies::DepStream deps(nm); deps.next(); ) {
         Klass* klass = deps.context_type();
-        if (klass == NULL)  continue;  // ignore things like evol_method
+        if (klass == NULL) {
+          continue;  // ignore things like evol_method
+        }
 
         // record this nmethod as dependent on this klass
         InstanceKlass::cast(klass)->add_dependent_nmethod(nm);
       }
     }
     NOT_PRODUCT(if (nm != NULL)  nmethod_stats.note_nmethod(nm));
-    if (PrintAssembly && nm != NULL)
+    if (PrintAssembly && nm != NULL) {
       Disassembler::decode(nm);
+    }
   }
 
   // verify nmethod
@@ -798,13 +799,11 @@
 }
 #endif // def HAVE_DTRACE_H
 
-void* nmethod::operator new(size_t size, int nmethod_size) {
-  void*  alloc = CodeCache::allocate(nmethod_size);
-  guarantee(alloc != NULL, "CodeCache should have enough space");
-  return alloc;
+void* nmethod::operator new(size_t size, int nmethod_size) throw () {
+  // Not critical, may return null if there is too little continuous memory
+  return CodeCache::allocate(nmethod_size);
 }
 
-
 nmethod::nmethod(
   Method* method,
   int nmethod_size,
--- a/hotspot/src/share/vm/compiler/compileBroker.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/compiler/compileBroker.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1581,7 +1581,7 @@
       // We need this HandleMark to avoid leaking VM handles.
       HandleMark hm(thread);
 
-      if (CodeCache::largest_free_block() < CodeCacheMinimumFreeSpace) {
+      if (CodeCache::unallocated_capacity() < CodeCacheMinimumFreeSpace) {
         // the code cache is really full
         handle_full_code_cache();
       } else if (UseCodeCacheFlushing && CodeCache::needs_flushing()) {
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Wed May 08 11:22:25 2013 +0100
@@ -6921,7 +6921,7 @@
           size = CompactibleFreeListSpace::adjustObjectSize(
                    p->oop_iterate(_scanningClosure));
         }
-        #ifdef DEBUG
+        #ifdef ASSERT
           size_t direct_size =
             CompactibleFreeListSpace::adjustObjectSize(p->size());
           assert(size == direct_size, "Inconsistency in size");
@@ -6933,7 +6933,7 @@
             assert(_bitMap->isMarked(addr+size-1),
                    "inconsistent Printezis mark");
           }
-        #endif // DEBUG
+        #endif // ASSERT
     } else {
       // an unitialized object
       assert(_bitMap->isMarked(addr+1), "missing Printezis mark?");
@@ -7075,14 +7075,14 @@
   HeapWord* addr = (HeapWord*)p;
   assert(_span.contains(addr), "we are scanning the CMS generation");
   bool is_obj_array = false;
-  #ifdef DEBUG
+  #ifdef ASSERT
     if (!_parallel) {
       assert(_mark_stack->isEmpty(), "pre-condition (eager drainage)");
       assert(_collector->overflow_list_is_empty(),
              "overflow list should be empty");
 
     }
-  #endif // DEBUG
+  #endif // ASSERT
   if (_bit_map->isMarked(addr)) {
     // Obj arrays are precisely marked, non-arrays are not;
     // so we scan objArrays precisely and non-arrays in their
@@ -7102,14 +7102,14 @@
       }
     }
   }
-  #ifdef DEBUG
+  #ifdef ASSERT
     if (!_parallel) {
       assert(_mark_stack->isEmpty(), "post-condition (eager drainage)");
       assert(_collector->overflow_list_is_empty(),
              "overflow list should be empty");
 
     }
-  #endif // DEBUG
+  #endif // ASSERT
   return is_obj_array;
 }
 
@@ -8320,7 +8320,7 @@
     assert(size == CompactibleFreeListSpace::adjustObjectSize(size),
            "alignment problem");
 
-#ifdef DEBUG
+#ifdef ASSERT
       if (oop(addr)->klass_or_null() != NULL) {
         // Ignore mark word because we are running concurrent with mutators
         assert(oop(addr)->is_oop(true), "live block should be an oop");
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1322,233 +1322,239 @@
     gclog_or_tty->date_stamp(G1Log::fine() && PrintGCDateStamps);
     TraceCPUTime tcpu(G1Log::finer(), true, gclog_or_tty);
 
-    TraceTime t(GCCauseString("Full GC", gc_cause()), G1Log::fine(), true, gclog_or_tty);
-    TraceCollectorStats tcs(g1mm()->full_collection_counters());
-    TraceMemoryManagerStats tms(true /* fullGC */, gc_cause());
-
-    double start = os::elapsedTime();
-    g1_policy()->record_full_collection_start();
-
-    // Note: When we have a more flexible GC logging framework that
-    // allows us to add optional attributes to a GC log record we
-    // could consider timing and reporting how long we wait in the
-    // following two methods.
-    wait_while_free_regions_coming();
-    // If we start the compaction before the CM threads finish
-    // scanning the root regions we might trip them over as we'll
-    // be moving objects / updating references. So let's wait until
-    // they are done. By telling them to abort, they should complete
-    // early.
-    _cm->root_regions()->abort();
-    _cm->root_regions()->wait_until_scan_finished();
-    append_secondary_free_list_if_not_empty_with_lock();
-
-    gc_prologue(true);
-    increment_total_collections(true /* full gc */);
-    increment_old_marking_cycles_started();
-
-    size_t g1h_prev_used = used();
-    assert(used() == recalculate_used(), "Should be equal");
-
-    verify_before_gc();
-
-    pre_full_gc_dump();
-
-    COMPILER2_PRESENT(DerivedPointerTable::clear());
-
-    // Disable discovery and empty the discovered lists
-    // for the CM ref processor.
-    ref_processor_cm()->disable_discovery();
-    ref_processor_cm()->abandon_partial_discovery();
-    ref_processor_cm()->verify_no_references_recorded();
-
-    // Abandon current iterations of concurrent marking and concurrent
-    // refinement, if any are in progress. We have to do this before
-    // wait_until_scan_finished() below.
-    concurrent_mark()->abort();
-
-    // Make sure we'll choose a new allocation region afterwards.
-    release_mutator_alloc_region();
-    abandon_gc_alloc_regions();
-    g1_rem_set()->cleanupHRRS();
-
-    // We should call this after we retire any currently active alloc
-    // regions so that all the ALLOC / RETIRE events are generated
-    // before the start GC event.
-    _hr_printer.start_gc(true /* full */, (size_t) total_collections());
-
-    // We may have added regions to the current incremental collection
-    // set between the last GC or pause and now. We need to clear the
-    // incremental collection set and then start rebuilding it afresh
-    // after this full GC.
-    abandon_collection_set(g1_policy()->inc_cset_head());
-    g1_policy()->clear_incremental_cset();
-    g1_policy()->stop_incremental_cset_building();
-
-    tear_down_region_sets(false /* free_list_only */);
-    g1_policy()->set_gcs_are_young(true);
-
-    // See the comments in g1CollectedHeap.hpp and
-    // G1CollectedHeap::ref_processing_init() about
-    // how reference processing currently works in G1.
-
-    // Temporarily make discovery by the STW ref processor single threaded (non-MT).
-    ReferenceProcessorMTDiscoveryMutator stw_rp_disc_ser(ref_processor_stw(), false);
-
-    // Temporarily clear the STW ref processor's _is_alive_non_header field.
-    ReferenceProcessorIsAliveMutator stw_rp_is_alive_null(ref_processor_stw(), NULL);
-
-    ref_processor_stw()->enable_discovery(true /*verify_disabled*/, true /*verify_no_refs*/);
-    ref_processor_stw()->setup_policy(do_clear_all_soft_refs);
-
-    // Do collection work
     {
-      HandleMark hm;  // Discard invalid handles created during gc
-      G1MarkSweep::invoke_at_safepoint(ref_processor_stw(), do_clear_all_soft_refs);
-    }
-
-    assert(free_regions() == 0, "we should not have added any free regions");
-    rebuild_region_sets(false /* free_list_only */);
-
-    // Enqueue any discovered reference objects that have
-    // not been removed from the discovered lists.
-    ref_processor_stw()->enqueue_discovered_references();
-
-    COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
-
-    MemoryService::track_memory_usage();
-
-    verify_after_gc();
-
-    assert(!ref_processor_stw()->discovery_enabled(), "Postcondition");
-    ref_processor_stw()->verify_no_references_recorded();
-
-    // Delete metaspaces for unloaded class loaders and clean up loader_data graph
-    ClassLoaderDataGraph::purge();
-
-    // Note: since we've just done a full GC, concurrent
-    // marking is no longer active. Therefore we need not
-    // re-enable reference discovery for the CM ref processor.
-    // That will be done at the start of the next marking cycle.
-    assert(!ref_processor_cm()->discovery_enabled(), "Postcondition");
-    ref_processor_cm()->verify_no_references_recorded();
-
-    reset_gc_time_stamp();
-    // Since everything potentially moved, we will clear all remembered
-    // sets, and clear all cards.  Later we will rebuild remebered
-    // sets. We will also reset the GC time stamps of the regions.
-    clear_rsets_post_compaction();
-    check_gc_time_stamps();
-
-    // Resize the heap if necessary.
-    resize_if_necessary_after_full_collection(explicit_gc ? 0 : word_size);
-
-    if (_hr_printer.is_active()) {
-      // We should do this after we potentially resize the heap so
-      // that all the COMMIT / UNCOMMIT events are generated before
-      // the end GC event.
-
-      print_hrs_post_compaction();
-      _hr_printer.end_gc(true /* full */, (size_t) total_collections());
-    }
-
-    if (_cg1r->use_cache()) {
-      _cg1r->clear_and_record_card_counts();
-      _cg1r->clear_hot_cache();
-    }
-
-    // Rebuild remembered sets of all regions.
-    if (G1CollectedHeap::use_parallel_gc_threads()) {
-      uint n_workers =
-        AdaptiveSizePolicy::calc_active_workers(workers()->total_workers(),
-                                       workers()->active_workers(),
-                                       Threads::number_of_non_daemon_threads());
-      assert(UseDynamicNumberOfGCThreads ||
-             n_workers == workers()->total_workers(),
-             "If not dynamic should be using all the  workers");
-      workers()->set_active_workers(n_workers);
-      // Set parallel threads in the heap (_n_par_threads) only
-      // before a parallel phase and always reset it to 0 after
-      // the phase so that the number of parallel threads does
-      // no get carried forward to a serial phase where there
-      // may be code that is "possibly_parallel".
-      set_par_threads(n_workers);
-
-      ParRebuildRSTask rebuild_rs_task(this);
-      assert(check_heap_region_claim_values(
-             HeapRegion::InitialClaimValue), "sanity check");
-      assert(UseDynamicNumberOfGCThreads ||
-             workers()->active_workers() == workers()->total_workers(),
-        "Unless dynamic should use total workers");
-      // Use the most recent number of  active workers
-      assert(workers()->active_workers() > 0,
-        "Active workers not properly set");
-      set_par_threads(workers()->active_workers());
-      workers()->run_task(&rebuild_rs_task);
-      set_par_threads(0);
-      assert(check_heap_region_claim_values(
-             HeapRegion::RebuildRSClaimValue), "sanity check");
-      reset_heap_region_claim_values();
-    } else {
-      RebuildRSOutOfRegionClosure rebuild_rs(this);
-      heap_region_iterate(&rebuild_rs);
-    }
-
-    if (G1Log::fine()) {
-      print_size_transition(gclog_or_tty, g1h_prev_used, used(), capacity());
-    }
-
-    if (true) { // FIXME
-      MetaspaceGC::compute_new_size();
-    }
-
-    // Start a new incremental collection set for the next pause
-    assert(g1_policy()->collection_set() == NULL, "must be");
-    g1_policy()->start_incremental_cset_building();
-
-    // Clear the _cset_fast_test bitmap in anticipation of adding
-    // regions to the incremental collection set for the next
-    // evacuation pause.
-    clear_cset_fast_test();
-
-    init_mutator_alloc_region();
-
-    double end = os::elapsedTime();
-    g1_policy()->record_full_collection_end();
+      TraceTime t(GCCauseString("Full GC", gc_cause()), G1Log::fine(), true, gclog_or_tty);
+      TraceCollectorStats tcs(g1mm()->full_collection_counters());
+      TraceMemoryManagerStats tms(true /* fullGC */, gc_cause());
+
+      double start = os::elapsedTime();
+      g1_policy()->record_full_collection_start();
+
+      // Note: When we have a more flexible GC logging framework that
+      // allows us to add optional attributes to a GC log record we
+      // could consider timing and reporting how long we wait in the
+      // following two methods.
+      wait_while_free_regions_coming();
+      // If we start the compaction before the CM threads finish
+      // scanning the root regions we might trip them over as we'll
+      // be moving objects / updating references. So let's wait until
+      // they are done. By telling them to abort, they should complete
+      // early.
+      _cm->root_regions()->abort();
+      _cm->root_regions()->wait_until_scan_finished();
+      append_secondary_free_list_if_not_empty_with_lock();
+
+      gc_prologue(true);
+      increment_total_collections(true /* full gc */);
+      increment_old_marking_cycles_started();
+
+      assert(used() == recalculate_used(), "Should be equal");
+
+      verify_before_gc();
+
+      pre_full_gc_dump();
+
+      COMPILER2_PRESENT(DerivedPointerTable::clear());
+
+      // Disable discovery and empty the discovered lists
+      // for the CM ref processor.
+      ref_processor_cm()->disable_discovery();
+      ref_processor_cm()->abandon_partial_discovery();
+      ref_processor_cm()->verify_no_references_recorded();
+
+      // Abandon current iterations of concurrent marking and concurrent
+      // refinement, if any are in progress. We have to do this before
+      // wait_until_scan_finished() below.
+      concurrent_mark()->abort();
+
+      // Make sure we'll choose a new allocation region afterwards.
+      release_mutator_alloc_region();
+      abandon_gc_alloc_regions();
+      g1_rem_set()->cleanupHRRS();
+
+      // We should call this after we retire any currently active alloc
+      // regions so that all the ALLOC / RETIRE events are generated
+      // before the start GC event.
+      _hr_printer.start_gc(true /* full */, (size_t) total_collections());
+
+      // We may have added regions to the current incremental collection
+      // set between the last GC or pause and now. We need to clear the
+      // incremental collection set and then start rebuilding it afresh
+      // after this full GC.
+      abandon_collection_set(g1_policy()->inc_cset_head());
+      g1_policy()->clear_incremental_cset();
+      g1_policy()->stop_incremental_cset_building();
+
+      tear_down_region_sets(false /* free_list_only */);
+      g1_policy()->set_gcs_are_young(true);
+
+      // See the comments in g1CollectedHeap.hpp and
+      // G1CollectedHeap::ref_processing_init() about
+      // how reference processing currently works in G1.
+
+      // Temporarily make discovery by the STW ref processor single threaded (non-MT).
+      ReferenceProcessorMTDiscoveryMutator stw_rp_disc_ser(ref_processor_stw(), false);
+
+      // Temporarily clear the STW ref processor's _is_alive_non_header field.
+      ReferenceProcessorIsAliveMutator stw_rp_is_alive_null(ref_processor_stw(), NULL);
+
+      ref_processor_stw()->enable_discovery(true /*verify_disabled*/, true /*verify_no_refs*/);
+      ref_processor_stw()->setup_policy(do_clear_all_soft_refs);
+
+      // Do collection work
+      {
+        HandleMark hm;  // Discard invalid handles created during gc
+        G1MarkSweep::invoke_at_safepoint(ref_processor_stw(), do_clear_all_soft_refs);
+      }
+
+      assert(free_regions() == 0, "we should not have added any free regions");
+      rebuild_region_sets(false /* free_list_only */);
+
+      // Enqueue any discovered reference objects that have
+      // not been removed from the discovered lists.
+      ref_processor_stw()->enqueue_discovered_references();
+
+      COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
+
+      MemoryService::track_memory_usage();
+
+      verify_after_gc();
+
+      assert(!ref_processor_stw()->discovery_enabled(), "Postcondition");
+      ref_processor_stw()->verify_no_references_recorded();
+
+      // Delete metaspaces for unloaded class loaders and clean up loader_data graph
+      ClassLoaderDataGraph::purge();
+
+      // Note: since we've just done a full GC, concurrent
+      // marking is no longer active. Therefore we need not
+      // re-enable reference discovery for the CM ref processor.
+      // That will be done at the start of the next marking cycle.
+      assert(!ref_processor_cm()->discovery_enabled(), "Postcondition");
+      ref_processor_cm()->verify_no_references_recorded();
+
+      reset_gc_time_stamp();
+      // Since everything potentially moved, we will clear all remembered
+      // sets, and clear all cards.  Later we will rebuild remebered
+      // sets. We will also reset the GC time stamps of the regions.
+      clear_rsets_post_compaction();
+      check_gc_time_stamps();
+
+      // Resize the heap if necessary.
+      resize_if_necessary_after_full_collection(explicit_gc ? 0 : word_size);
+
+      if (_hr_printer.is_active()) {
+        // We should do this after we potentially resize the heap so
+        // that all the COMMIT / UNCOMMIT events are generated before
+        // the end GC event.
+
+        print_hrs_post_compaction();
+        _hr_printer.end_gc(true /* full */, (size_t) total_collections());
+      }
+
+      if (_cg1r->use_cache()) {
+        _cg1r->clear_and_record_card_counts();
+        _cg1r->clear_hot_cache();
+      }
+
+      // Rebuild remembered sets of all regions.
+      if (G1CollectedHeap::use_parallel_gc_threads()) {
+        uint n_workers =
+          AdaptiveSizePolicy::calc_active_workers(workers()->total_workers(),
+                                                  workers()->active_workers(),
+                                                  Threads::number_of_non_daemon_threads());
+        assert(UseDynamicNumberOfGCThreads ||
+               n_workers == workers()->total_workers(),
+               "If not dynamic should be using all the  workers");
+        workers()->set_active_workers(n_workers);
+        // Set parallel threads in the heap (_n_par_threads) only
+        // before a parallel phase and always reset it to 0 after
+        // the phase so that the number of parallel threads does
+        // no get carried forward to a serial phase where there
+        // may be code that is "possibly_parallel".
+        set_par_threads(n_workers);
+
+        ParRebuildRSTask rebuild_rs_task(this);
+        assert(check_heap_region_claim_values(
+               HeapRegion::InitialClaimValue), "sanity check");
+        assert(UseDynamicNumberOfGCThreads ||
+               workers()->active_workers() == workers()->total_workers(),
+               "Unless dynamic should use total workers");
+        // Use the most recent number of  active workers
+        assert(workers()->active_workers() > 0,
+               "Active workers not properly set");
+        set_par_threads(workers()->active_workers());
+        workers()->run_task(&rebuild_rs_task);
+        set_par_threads(0);
+        assert(check_heap_region_claim_values(
+               HeapRegion::RebuildRSClaimValue), "sanity check");
+        reset_heap_region_claim_values();
+      } else {
+        RebuildRSOutOfRegionClosure rebuild_rs(this);
+        heap_region_iterate(&rebuild_rs);
+      }
+
+      if (true) { // FIXME
+        MetaspaceGC::compute_new_size();
+      }
 
 #ifdef TRACESPINNING
-    ParallelTaskTerminator::print_termination_counts();
+      ParallelTaskTerminator::print_termination_counts();
 #endif
 
-    gc_epilogue(true);
-
-    // Discard all rset updates
-    JavaThread::dirty_card_queue_set().abandon_logs();
-    assert(!G1DeferredRSUpdate
-           || (G1DeferredRSUpdate && (dirty_card_queue_set().completed_buffers_num() == 0)), "Should not be any");
-
-    _young_list->reset_sampled_info();
-    // At this point there should be no regions in the
-    // entire heap tagged as young.
-    assert( check_young_list_empty(true /* check_heap */),
-      "young list should be empty at this point");
-
-    // Update the number of full collections that have been completed.
-    increment_old_marking_cycles_completed(false /* concurrent */);
-
-    _hrs.verify_optional();
-    verify_region_sets_optional();
+      // Discard all rset updates
+      JavaThread::dirty_card_queue_set().abandon_logs();
+      assert(!G1DeferredRSUpdate
+             || (G1DeferredRSUpdate &&
+                (dirty_card_queue_set().completed_buffers_num() == 0)), "Should not be any");
+
+      _young_list->reset_sampled_info();
+      // At this point there should be no regions in the
+      // entire heap tagged as young.
+      assert(check_young_list_empty(true /* check_heap */),
+             "young list should be empty at this point");
+
+      // Update the number of full collections that have been completed.
+      increment_old_marking_cycles_completed(false /* concurrent */);
+
+      _hrs.verify_optional();
+      verify_region_sets_optional();
+
+      // Start a new incremental collection set for the next pause
+      assert(g1_policy()->collection_set() == NULL, "must be");
+      g1_policy()->start_incremental_cset_building();
+
+      // Clear the _cset_fast_test bitmap in anticipation of adding
+      // regions to the incremental collection set for the next
+      // evacuation pause.
+      clear_cset_fast_test();
+
+      init_mutator_alloc_region();
+
+      double end = os::elapsedTime();
+      g1_policy()->record_full_collection_end();
+
+      if (G1Log::fine()) {
+        g1_policy()->print_heap_transition();
+      }
+
+      // We must call G1MonitoringSupport::update_sizes() in the same scoping level
+      // as an active TraceMemoryManagerStats object (i.e. before the destructor for the
+      // TraceMemoryManagerStats is called) so that the G1 memory pools are updated
+      // before any GC notifications are raised.
+      g1mm()->update_sizes();
+
+      gc_epilogue(true);
+    }
+
+    if (G1Log::finer()) {
+      g1_policy()->print_detailed_heap_transition();
+    }
 
     print_heap_after_gc();
 
-    // We must call G1MonitoringSupport::update_sizes() in the same scoping level
-    // as an active TraceMemoryManagerStats object (i.e. before the destructor for the
-    // TraceMemoryManagerStats is called) so that the G1 memory pools are updated
-    // before any GC notifications are raised.
-    g1mm()->update_sizes();
-  }
-
-  post_full_gc_dump();
+    post_full_gc_dump();
+  }
 
   return true;
 }
@@ -3838,7 +3844,6 @@
         // The elapsed time induced by the start time below deliberately elides
         // the possible verification above.
         double sample_start_time_sec = os::elapsedTime();
-        size_t start_used_bytes = used();
 
 #if YOUNG_LIST_VERBOSE
         gclog_or_tty->print_cr("\nBefore recording pause start.\nYoung_list:");
@@ -3846,8 +3851,7 @@
         g1_policy()->print_collection_set(g1_policy()->inc_cset_head(), gclog_or_tty);
 #endif // YOUNG_LIST_VERBOSE
 
-        g1_policy()->record_collection_pause_start(sample_start_time_sec,
-                                                   start_used_bytes);
+        g1_policy()->record_collection_pause_start(sample_start_time_sec);
 
         double scan_wait_start = os::elapsedTime();
         // We have to wait until the CM threads finish scanning the
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -406,7 +406,6 @@
   }
   _free_regions_at_end_of_collection = _g1->free_regions();
   update_young_list_target_length();
-  _prev_eden_capacity = _young_list_target_length * HeapRegion::GrainBytes;
 
   // We may immediately start allocating regions and placing them on the
   // collection set list. Initialize the per-collection set info
@@ -746,6 +745,7 @@
 
 void G1CollectorPolicy::record_full_collection_start() {
   _full_collection_start_sec = os::elapsedTime();
+  record_heap_size_info_at_start();
   // Release the future to-space so that it is available for compaction into.
   _g1->set_full_collection();
 }
@@ -788,8 +788,7 @@
   _stop_world_start = os::elapsedTime();
 }
 
-void G1CollectorPolicy::record_collection_pause_start(double start_time_sec,
-                                                      size_t start_used) {
+void G1CollectorPolicy::record_collection_pause_start(double start_time_sec) {
   // We only need to do this here as the policy will only be applied
   // to the GC we're about to start. so, no point is calculating this
   // every time we calculate / recalculate the target young length.
@@ -803,19 +802,14 @@
   _trace_gen0_time_data.record_start_collection(s_w_t_ms);
   _stop_world_start = 0.0;
 
+  record_heap_size_info_at_start();
+
   phase_times()->record_cur_collection_start_sec(start_time_sec);
-  _cur_collection_pause_used_at_start_bytes = start_used;
-  _cur_collection_pause_used_regions_at_start = _g1->used_regions();
   _pending_cards = _g1->pending_card_num();
 
   _collection_set_bytes_used_before = 0;
   _bytes_copied_during_gc = 0;
 
-  YoungList* young_list = _g1->young_list();
-  _eden_bytes_before_gc = young_list->eden_used_bytes();
-  _survivor_bytes_before_gc = young_list->survivor_used_bytes();
-  _capacity_before_gc = _g1->capacity();
-
   _last_gc_was_young = false;
 
   // do that for any other surv rate groups
@@ -1153,6 +1147,21 @@
   byte_size_in_proper_unit((double)(bytes)),                    \
   proper_unit_for_byte_size((bytes))
 
+void G1CollectorPolicy::record_heap_size_info_at_start() {
+  YoungList* young_list = _g1->young_list();
+  _eden_bytes_before_gc = young_list->eden_used_bytes();
+  _survivor_bytes_before_gc = young_list->survivor_used_bytes();
+  _capacity_before_gc = _g1->capacity();
+
+  _cur_collection_pause_used_at_start_bytes = _g1->used();
+  _cur_collection_pause_used_regions_at_start = _g1->used_regions();
+
+  size_t eden_capacity_before_gc =
+         (_young_list_target_length * HeapRegion::GrainBytes) - _survivor_bytes_before_gc;
+
+  _prev_eden_capacity = eden_capacity_before_gc;
+}
+
 void G1CollectorPolicy::print_heap_transition() {
   _g1->print_size_transition(gclog_or_tty,
     _cur_collection_pause_used_at_start_bytes, _g1->used(), _g1->capacity());
@@ -1183,8 +1192,6 @@
       EXT_SIZE_PARAMS(_capacity_before_gc),
       EXT_SIZE_PARAMS(used),
       EXT_SIZE_PARAMS(capacity));
-
-    _prev_eden_capacity = eden_capacity;
 }
 
 void G1CollectorPolicy::adjust_concurrent_refinement(double update_rs_time,
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -671,34 +671,36 @@
 
   bool need_to_start_conc_mark(const char* source, size_t alloc_word_size = 0);
 
-  // Update the heuristic info to record a collection pause of the given
-  // start time, where the given number of bytes were used at the start.
-  // This may involve changing the desired size of a collection set.
+  // Record the start and end of an evacuation pause.
+  void record_collection_pause_start(double start_time_sec);
+  void record_collection_pause_end(double pause_time_ms);
 
-  void record_stop_world_start();
-
-  void record_collection_pause_start(double start_time_sec, size_t start_used);
+  // Record the start and end of a full collection.
+  void record_full_collection_start();
+  void record_full_collection_end();
 
   // Must currently be called while the world is stopped.
-  void record_concurrent_mark_init_end(double
-                                           mark_init_elapsed_time_ms);
+  void record_concurrent_mark_init_end(double mark_init_elapsed_time_ms);
 
+  // Record start and end of remark.
   void record_concurrent_mark_remark_start();
   void record_concurrent_mark_remark_end();
 
+  // Record start, end, and completion of cleanup.
   void record_concurrent_mark_cleanup_start();
   void record_concurrent_mark_cleanup_end(int no_of_gc_threads);
   void record_concurrent_mark_cleanup_completed();
 
-  void record_concurrent_pause();
+  // Records the information about the heap size for reporting in
+  // print_detailed_heap_transition
+  void record_heap_size_info_at_start();
 
-  void record_collection_pause_end(double pause_time);
+  // Print heap sizing transition (with less and more detail).
   void print_heap_transition();
   void print_detailed_heap_transition();
 
-  // Record the fact that a full collection occurred.
-  void record_full_collection_start();
-  void record_full_collection_end();
+  void record_stop_world_start();
+  void record_concurrent_pause();
 
   // Record how much space we copied during a GC. This is typically
   // called when a GC alloc region is being retired.
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -454,7 +454,7 @@
     continuation = Interpreter::remove_activation_entry();
 #endif
     // Count this for compilation purposes
-    h_method->interpreter_throwout_increment();
+    h_method->interpreter_throwout_increment(THREAD);
   } else {
     // handler in this method => change bci/bcp to handler bci/bcp and continue there
     handler_pc = h_method->code_base() + handler_bci;
@@ -903,6 +903,15 @@
   fr.interpreter_frame_set_mdp(new_mdp);
 IRT_END
 
+IRT_ENTRY(MethodCounters*, InterpreterRuntime::build_method_counters(JavaThread* thread, Method* m))
+  MethodCounters* mcs = Method::build_method_counters(m, thread);
+  if (HAS_PENDING_EXCEPTION) {
+    assert((PENDING_EXCEPTION->is_a(SystemDictionary::OutOfMemoryError_klass())), "we expect only an OOM error here");
+    CLEAR_PENDING_EXCEPTION;
+  }
+  return mcs;
+IRT_END
+
 
 IRT_ENTRY(void, InterpreterRuntime::at_safepoint(JavaThread* thread))
   // We used to need an explict preserve_arguments here for invoke bytecodes. However,
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -169,6 +169,7 @@
 #ifdef ASSERT
   static void    verify_mdp(Method* method, address bcp, address mdp);
 #endif // ASSERT
+  static MethodCounters* build_method_counters(JavaThread* thread, Method* m);
 };
 
 
--- a/hotspot/src/share/vm/interpreter/invocationCounter.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/interpreter/invocationCounter.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -104,15 +104,19 @@
 
 static address do_nothing(methodHandle method, TRAPS) {
   // dummy action for inactive invocation counters
-  method->invocation_counter()->set_carry();
-  method->invocation_counter()->set_state(InvocationCounter::wait_for_nothing);
+  MethodCounters* mcs = method->method_counters();
+  assert(mcs != NULL, "");
+  mcs->invocation_counter()->set_carry();
+  mcs->invocation_counter()->set_state(InvocationCounter::wait_for_nothing);
   return NULL;
 }
 
 
 static address do_decay(methodHandle method, TRAPS) {
   // decay invocation counters so compilation gets delayed
-  method->invocation_counter()->decay();
+  MethodCounters* mcs = method->method_counters();
+  assert(mcs != NULL, "");
+  mcs->invocation_counter()->decay();
   return NULL;
 }
 
--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1014,13 +1014,28 @@
                                                       resolved_method->name(),
                                                       resolved_method->signature()));
   }
-  // check if public
-  if (!sel_method->is_public()) {
-    ResourceMark rm(THREAD);
-    THROW_MSG(vmSymbols::java_lang_IllegalAccessError(),
-              Method::name_and_sig_as_C_string(recv_klass(),
-                                                      sel_method->name(),
-                                                      sel_method->signature()));
+  // check access
+  if (sel_method->method_holder()->is_interface()) {
+    // Method holder is an interface. Throw Illegal Access Error if sel_method
+    // is neither public nor private.
+    if (!(sel_method->is_public() || sel_method->is_private())) {
+      ResourceMark rm(THREAD);
+      THROW_MSG(vmSymbols::java_lang_IllegalAccessError(),
+                Method::name_and_sig_as_C_string(recv_klass(),
+                                                 sel_method->name(),
+                                                 sel_method->signature()));
+    }
+  }
+  else {
+    // Method holder is a class. Throw Illegal Access Error if sel_method
+    // is not public.
+    if (!sel_method->is_public()) {
+      ResourceMark rm(THREAD);
+      THROW_MSG(vmSymbols::java_lang_IllegalAccessError(),
+                Method::name_and_sig_as_C_string(recv_klass(),
+                                                 sel_method->name(),
+                                                 sel_method->signature()));
+    }
   }
   // check if abstract
   if (check_null_and_abstract && sel_method->is_abstract()) {
--- a/hotspot/src/share/vm/memory/allocation.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/memory/allocation.hpp	Wed May 08 11:22:25 2013 +0100
@@ -178,7 +178,7 @@
 #endif // INCLUDE_NMT
 
 // debug build does not inline
-#if defined(_DEBUG_)
+#if defined(_NMT_NOINLINE_)
   #define CURRENT_PC       (NMT_track_callsite ? os::get_caller_pc(1) : 0)
   #define CALLER_PC        (NMT_track_callsite ? os::get_caller_pc(2) : 0)
   #define CALLER_CALLER_PC (NMT_track_callsite ? os::get_caller_pc(3) : 0)
--- a/hotspot/src/share/vm/memory/heap.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/memory/heap.cpp	Wed May 08 11:22:25 2013 +0100
@@ -42,7 +42,7 @@
   _log2_segment_size            = 0;
   _next_segment                 = 0;
   _freelist                     = NULL;
-  _free_segments                = 0;
+  _freelist_segments            = 0;
 }
 
 
@@ -115,8 +115,8 @@
   }
 
   on_code_mapping(_memory.low(), _memory.committed_size());
-  _number_of_committed_segments = number_of_segments(_memory.committed_size());
-  _number_of_reserved_segments  = number_of_segments(_memory.reserved_size());
+  _number_of_committed_segments = size_to_segments(_memory.committed_size());
+  _number_of_reserved_segments  = size_to_segments(_memory.reserved_size());
   assert(_number_of_reserved_segments >= _number_of_committed_segments, "just checking");
 
   // reserve space for _segmap
@@ -149,8 +149,8 @@
     if (!_memory.expand_by(dm)) return false;
     on_code_mapping(base, dm);
     size_t i = _number_of_committed_segments;
-    _number_of_committed_segments = number_of_segments(_memory.committed_size());
-    assert(_number_of_reserved_segments == number_of_segments(_memory.reserved_size()), "number of reserved segments should not change");
+    _number_of_committed_segments = size_to_segments(_memory.committed_size());
+    assert(_number_of_reserved_segments == size_to_segments(_memory.reserved_size()), "number of reserved segments should not change");
     assert(_number_of_reserved_segments >= _number_of_committed_segments, "just checking");
     // expand _segmap space
     size_t ds = align_to_page_size(_number_of_committed_segments) - _segmap.committed_size();
@@ -176,33 +176,44 @@
 }
 
 
-void* CodeHeap::allocate(size_t size) {
-  size_t length = number_of_segments(size + sizeof(HeapBlock));
-  assert(length *_segment_size >= sizeof(FreeBlock), "not enough room for FreeList");
+void* CodeHeap::allocate(size_t instance_size, bool is_critical) {
+  size_t number_of_segments = size_to_segments(instance_size + sizeof(HeapBlock));
+  assert(segments_to_size(number_of_segments) >= sizeof(FreeBlock), "not enough room for FreeList");
 
   // First check if we can satify request from freelist
   debug_only(verify());
-  HeapBlock* block = search_freelist(length);
+  HeapBlock* block = search_freelist(number_of_segments, is_critical);
   debug_only(if (VerifyCodeCacheOften) verify());
   if (block != NULL) {
-    assert(block->length() >= length && block->length() < length + CodeCacheMinBlockLength, "sanity check");
+    assert(block->length() >= number_of_segments && block->length() < number_of_segments + CodeCacheMinBlockLength, "sanity check");
     assert(!block->free(), "must be marked free");
 #ifdef ASSERT
-    memset((void *)block->allocated_space(), badCodeHeapNewVal, size);
+    memset((void *)block->allocated_space(), badCodeHeapNewVal, instance_size);
 #endif
     return block->allocated_space();
   }
 
-  if (length < CodeCacheMinBlockLength) {
-    length = CodeCacheMinBlockLength;
+  // Ensure minimum size for allocation to the heap.
+  if (number_of_segments < CodeCacheMinBlockLength) {
+    number_of_segments = CodeCacheMinBlockLength;
   }
-  if (_next_segment + length <= _number_of_committed_segments) {
-    mark_segmap_as_used(_next_segment, _next_segment + length);
+
+  if (!is_critical) {
+    // Make sure the allocation fits in the unallocated heap without using
+    // the CodeCacheMimimumFreeSpace that is reserved for critical allocations.
+    if (segments_to_size(number_of_segments) > (heap_unallocated_capacity() - CodeCacheMinimumFreeSpace)) {
+      // Fail allocation
+      return NULL;
+    }
+  }
+
+  if (_next_segment + number_of_segments <= _number_of_committed_segments) {
+    mark_segmap_as_used(_next_segment, _next_segment + number_of_segments);
     HeapBlock* b =  block_at(_next_segment);
-    b->initialize(length);
-    _next_segment += length;
+    b->initialize(number_of_segments);
+    _next_segment += number_of_segments;
 #ifdef ASSERT
-    memset((void *)b->allocated_space(), badCodeHeapNewVal, size);
+    memset((void *)b->allocated_space(), badCodeHeapNewVal, instance_size);
 #endif
     return b->allocated_space();
   } else {
@@ -219,7 +230,7 @@
 #ifdef ASSERT
   memset((void *)b->allocated_space(),
          badCodeHeapFreeVal,
-         size(b->length()) - sizeof(HeapBlock));
+         segments_to_size(b->length()) - sizeof(HeapBlock));
 #endif
   add_to_freelist(b);
 
@@ -299,32 +310,14 @@
 }
 
 size_t CodeHeap::allocated_capacity() const {
-  // Start with the committed size in _memory;
-  size_t l = _memory.committed_size();
-
-  // Subtract the committed, but unused, segments
-  l -= size(_number_of_committed_segments - _next_segment);
-
-  // Subtract the size of the freelist
-  l -= size(_free_segments);
-
-  return l;
+  // size of used heap - size on freelist
+  return segments_to_size(_next_segment - _freelist_segments);
 }
 
-size_t CodeHeap::largest_free_block() const {
-  // First check unused space excluding free blocks.
-  size_t free_sz = size(_free_segments);
-  size_t unused  = max_capacity() - allocated_capacity() - free_sz;
-  if (unused >= free_sz)
-    return unused;
-
-  // Now check largest free block.
-  size_t len = 0;
-  for (FreeBlock* b = _freelist; b != NULL; b = b->link()) {
-    if (b->length() > len)
-      len = b->length();
-  }
-  return MAX2(unused, size(len));
+// Returns size of the unallocated heap block
+size_t CodeHeap::heap_unallocated_capacity() const {
+  // Total number of segments - number currently used
+  return segments_to_size(_number_of_reserved_segments - _next_segment);
 }
 
 // Free list management
@@ -365,7 +358,7 @@
   assert(b != _freelist, "cannot be removed twice");
 
   // Mark as free and update free space count
-  _free_segments += b->length();
+  _freelist_segments += b->length();
   b->set_free();
 
   // First element in list?
@@ -400,7 +393,7 @@
 
 // Search freelist for an entry on the list with the best fit
 // Return NULL if no one was found
-FreeBlock* CodeHeap::search_freelist(size_t length) {
+FreeBlock* CodeHeap::search_freelist(size_t length, bool is_critical) {
   FreeBlock *best_block = NULL;
   FreeBlock *best_prev  = NULL;
   size_t best_length = 0;
@@ -411,6 +404,16 @@
   while(cur != NULL) {
     size_t l = cur->length();
     if (l >= length && (best_block == NULL || best_length > l)) {
+
+      // Non critical allocations are not allowed to use the last part of the code heap.
+      if (!is_critical) {
+        // Make sure the end of the allocation doesn't cross into the last part of the code heap
+        if (((size_t)cur + length) > ((size_t)high_boundary() - CodeCacheMinimumFreeSpace)) {
+          // the freelist is sorted by address - if one fails, all consecutive will also fail.
+          break;
+        }
+      }
+
       // Remember best block, its previous element, and its length
       best_block = cur;
       best_prev  = prev;
@@ -452,7 +455,7 @@
   }
 
   best_block->set_used();
-  _free_segments -= length;
+  _freelist_segments -= length;
   return best_block;
 }
 
@@ -478,7 +481,7 @@
   }
 
   // Verify that freelist contains the right amount of free space
-  //  guarantee(len == _free_segments, "wrong freelist");
+  //  guarantee(len == _freelist_segments, "wrong freelist");
 
   // Verify that the number of free blocks is not out of hand.
   static int free_block_threshold = 10000;
--- a/hotspot/src/share/vm/memory/heap.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/memory/heap.hpp	Wed May 08 11:22:25 2013 +0100
@@ -91,11 +91,11 @@
   size_t       _next_segment;
 
   FreeBlock*   _freelist;
-  size_t       _free_segments;                   // No. of segments in freelist
+  size_t       _freelist_segments;               // No. of segments in freelist
 
   // Helper functions
-  size_t   number_of_segments(size_t size) const { return (size + _segment_size - 1) >> _log2_segment_size; }
-  size_t   size(size_t number_of_segments) const { return number_of_segments << _log2_segment_size; }
+  size_t   size_to_segments(size_t size) const { return (size + _segment_size - 1) >> _log2_segment_size; }
+  size_t   segments_to_size(size_t number_of_segments) const { return number_of_segments << _log2_segment_size; }
 
   size_t   segment_for(void* p) const            { return ((char*)p - _memory.low()) >> _log2_segment_size; }
   HeapBlock* block_at(size_t i) const            { return (HeapBlock*)(_memory.low() + (i << _log2_segment_size)); }
@@ -110,7 +110,7 @@
 
   // Toplevel freelist management
   void add_to_freelist(HeapBlock *b);
-  FreeBlock* search_freelist(size_t length);
+  FreeBlock* search_freelist(size_t length, bool is_critical);
 
   // Iteration helpers
   void*      next_free(HeapBlock* b) const;
@@ -132,22 +132,19 @@
   void  clear();                                 // clears all heap contents
 
   // Memory allocation
-  void* allocate  (size_t size);                 // allocates a block of size or returns NULL
+  void* allocate  (size_t size, bool is_critical);  // allocates a block of size or returns NULL
   void  deallocate(void* p);                     // deallocates a block
 
   // Attributes
-  void*  begin() const                           { return _memory.low (); }
-  void*  end() const                             { return _memory.high(); }
-  bool   contains(void* p) const                 { return begin() <= p && p < end(); }
-  void*  find_start(void* p) const;              // returns the block containing p or NULL
-  size_t alignment_unit() const;                 // alignment of any block
-  size_t alignment_offset() const;               // offset of first byte of any block, within the enclosing alignment unit
-  static size_t header_size();                   // returns the header size for each heap block
+  char* low_boundary() const                     { return _memory.low_boundary (); }
+  char* high() const                             { return _memory.high(); }
+  char* high_boundary() const                    { return _memory.high_boundary(); }
 
-  // Returns reserved area high and low addresses
-  char *low_boundary() const                     { return _memory.low_boundary (); }
-  char *high() const                             { return _memory.high(); }
-  char *high_boundary() const                    { return _memory.high_boundary(); }
+  bool  contains(const void* p) const            { return low_boundary() <= p && p < high(); }
+  void* find_start(void* p) const;              // returns the block containing p or NULL
+  size_t alignment_unit() const;                // alignment of any block
+  size_t alignment_offset() const;              // offset of first byte of any block, within the enclosing alignment unit
+  static size_t header_size();                  // returns the header size for each heap block
 
   // Iteration
 
@@ -161,8 +158,11 @@
   size_t max_capacity() const;
   size_t allocated_capacity() const;
   size_t unallocated_capacity() const            { return max_capacity() - allocated_capacity(); }
-  size_t largest_free_block() const;
 
+private:
+  size_t heap_unallocated_capacity() const;
+
+public:
   // Debugging
   void verify();
   void print()  PRODUCT_RETURN;
--- a/hotspot/src/share/vm/memory/metaspace.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/memory/metaspace.cpp	Wed May 08 11:22:25 2013 +0100
@@ -103,27 +103,7 @@
 // a chunk is placed on the free list of blocks (BlockFreelist) and
 // reused from there.
 
-// Pointer to list of Metachunks.
-class ChunkList VALUE_OBJ_CLASS_SPEC {
-  // List of free chunks
-  Metachunk* _head;
-
- public:
-  // Constructor
-  ChunkList() : _head(NULL) {}
-
-  // Accessors
-  Metachunk* head() { return _head; }
-  void set_head(Metachunk* v) { _head = v; }
-
-  // Link at head of the list
-  void add_at_head(Metachunk* head, Metachunk* tail);
-  void add_at_head(Metachunk* head);
-
-  size_t sum_list_size();
-  size_t sum_list_count();
-  size_t sum_list_capacity();
-};
+typedef class FreeList<Metachunk> ChunkList;
 
 // Manages the global free lists of chunks.
 // Has three lists of free chunks, and a total size and
@@ -185,6 +165,10 @@
   // for special, small, medium, and humongous chunks.
   static ChunkIndex list_index(size_t size);
 
+  // Add the simple linked list of chunks to the freelist of chunks
+  // of type index.
+  void return_chunks(ChunkIndex index, Metachunk* chunks);
+
   // Total of the space in the free chunks list
   size_t free_chunks_total();
   size_t free_chunks_total_in_bytes();
@@ -899,6 +883,9 @@
                    Mutex::_no_safepoint_check_flag);
   bool initialization_succeeded = grow_vs(word_size);
 
+  _chunk_manager.free_chunks(SpecializedIndex)->set_size(SpecializedChunk);
+  _chunk_manager.free_chunks(SmallIndex)->set_size(SmallChunk);
+  _chunk_manager.free_chunks(MediumIndex)->set_size(MediumChunk);
   assert(initialization_succeeded,
     " VirtualSpaceList initialization should not fail");
 }
@@ -913,6 +900,9 @@
                    Mutex::_no_safepoint_check_flag);
   VirtualSpaceNode* class_entry = new VirtualSpaceNode(rs);
   bool succeeded = class_entry->initialize();
+  _chunk_manager.free_chunks(SpecializedIndex)->set_size(SpecializedChunk);
+  _chunk_manager.free_chunks(SmallIndex)->set_size(ClassSmallChunk);
+  _chunk_manager.free_chunks(MediumIndex)->set_size(ClassMediumChunk);
   assert(succeeded, " VirtualSpaceList initialization should not fail");
   link_vs(class_entry, rs.size()/BytesPerWord);
 }
@@ -1380,76 +1370,6 @@
 }
 #endif
 
-// ChunkList methods
-
-size_t ChunkList::sum_list_size() {
-  size_t result = 0;
-  Metachunk* cur = head();
-  while (cur != NULL) {
-    result += cur->word_size();
-    cur = cur->next();
-  }
-  return result;
-}
-
-size_t ChunkList::sum_list_count() {
-  size_t result = 0;
-  Metachunk* cur = head();
-  while (cur != NULL) {
-    result++;
-    cur = cur->next();
-  }
-  return result;
-}
-
-size_t ChunkList::sum_list_capacity() {
-  size_t result = 0;
-  Metachunk* cur = head();
-  while (cur != NULL) {
-    result += cur->capacity_word_size();
-    cur = cur->next();
-  }
-  return result;
-}
-
-void ChunkList::add_at_head(Metachunk* head, Metachunk* tail) {
-  assert_lock_strong(SpaceManager::expand_lock());
-  assert(head == tail || tail->next() == NULL,
-         "Not the tail or the head has already been added to a list");
-
-  if (TraceMetadataChunkAllocation && Verbose) {
-    gclog_or_tty->print("ChunkList::add_at_head(head, tail): ");
-    Metachunk* cur = head;
-    while (cur != NULL) {
-      gclog_or_tty->print(PTR_FORMAT " (" SIZE_FORMAT ") ", cur, cur->word_size());
-      cur = cur->next();
-    }
-    gclog_or_tty->print_cr("");
-  }
-
-  if (tail != NULL) {
-    tail->set_next(_head);
-  }
-  set_head(head);
-}
-
-void ChunkList::add_at_head(Metachunk* list) {
-  if (list == NULL) {
-    // Nothing to add
-    return;
-  }
-  assert_lock_strong(SpaceManager::expand_lock());
-  Metachunk* head = list;
-  Metachunk* tail = list;
-  Metachunk* cur = head->next();
-  // Search for the tail since it is not passed.
-  while (cur != NULL) {
-    tail = cur;
-    cur = cur->next();
-  }
-  add_at_head(head, tail);
-}
-
 // ChunkManager methods
 
 // Verification of _free_chunks_total and _free_chunks_count does not
@@ -1553,7 +1473,7 @@
       continue;
     }
 
-    result = result + list->sum_list_capacity();
+    result = result + list->count() * list->size();
   }
   result = result + humongous_dictionary()->total_size();
   return result;
@@ -1567,7 +1487,7 @@
     if (list == NULL) {
       continue;
     }
-    count = count + list->sum_list_count();
+    count = count + list->count();
   }
   count = count + humongous_dictionary()->total_free_blocks();
   return count;
@@ -1622,7 +1542,7 @@
     }
 
     // Remove the chunk as the head of the list.
-    free_list->set_head(chunk->next());
+    free_list->remove_chunk(chunk);
 
     // Chunk is being removed from the chunks free list.
     dec_free_chunks_total(chunk->capacity_word_size());
@@ -1679,7 +1599,7 @@
     size_t list_count;
     if (list_index(word_size) < HumongousIndex) {
       ChunkList* list = find_free_chunks_list(word_size);
-      list_count = list->sum_list_count();
+      list_count = list->count();
     } else {
       list_count = humongous_dictionary()->total_count();
     }
@@ -1958,6 +1878,29 @@
   }
 }
 
+void ChunkManager::return_chunks(ChunkIndex index, Metachunk* chunks) {
+  if (chunks == NULL) {
+    return;
+  }
+  ChunkList* list = free_chunks(index);
+  assert(list->size() == chunks->word_size(), "Mismatch in chunk sizes");
+  assert_lock_strong(SpaceManager::expand_lock());
+  Metachunk* cur = chunks;
+
+  // This return chunks one at a time.  If a new
+  // class List can be created that is a base class
+  // of FreeList then something like FreeList::prepend()
+  // can be used in place of this loop
+  while (cur != NULL) {
+    // Capture the next link before it is changed
+    // by the call to return_chunk_at_head();
+    Metachunk* next = cur->next();
+    cur->set_is_free(true);
+    list->return_chunk_at_head(cur);
+    cur = next;
+  }
+}
+
 SpaceManager::~SpaceManager() {
   // This call this->_lock which can't be done while holding expand_lock()
   const size_t in_use_before = sum_capacity_in_chunks_in_use();
@@ -1995,11 +1938,11 @@
                              chunk_size_name(i));
     }
     Metachunk* chunks = chunks_in_use(i);
-    chunk_manager->free_chunks(i)->add_at_head(chunks);
+    chunk_manager->return_chunks(i, chunks);
     set_chunks_in_use(i, NULL);
     if (TraceMetadataChunkAllocation && Verbose) {
       gclog_or_tty->print_cr("updated freelist count %d %s",
-                             chunk_manager->free_chunks(i)->sum_list_count(),
+                             chunk_manager->free_chunks(i)->count(),
                              chunk_size_name(i));
     }
     assert(i != HumongousIndex, "Humongous chunks are handled explicitly later");
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp	Wed May 08 11:22:25 2013 +0100
@@ -2329,6 +2329,12 @@
     FreeHeap(jmeths);
   }
 
+  MemberNameTable* mnt = member_names();
+  if (mnt != NULL) {
+    delete mnt;
+    set_member_names(NULL);
+  }
+
   int* indices = methods_cached_itable_indices_acquire();
   if (indices != (int*)NULL) {
     release_set_methods_cached_itable_indices(NULL);
@@ -2757,6 +2763,17 @@
   return NULL;
 }
 
+void InstanceKlass::add_member_name(Handle mem_name) {
+  jweak mem_name_wref = JNIHandles::make_weak_global(mem_name);
+  MutexLocker ml(MemberNameTable_lock);
+  DEBUG_ONLY(No_Safepoint_Verifier nsv);
+
+  if (_member_names == NULL) {
+    _member_names = new (ResourceObj::C_HEAP, mtClass) MemberNameTable();
+  }
+  _member_names->add_member_name(mem_name_wref);
+}
+
 // -----------------------------------------------------------------------------------------------------
 // Printing
 
--- a/hotspot/src/share/vm/oops/instanceKlass.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/oops/instanceKlass.hpp	Wed May 08 11:22:25 2013 +0100
@@ -90,6 +90,7 @@
 class nmethodBucket;
 class PreviousVersionNode;
 class JvmtiCachedClassFieldMap;
+class MemberNameTable;
 
 // This is used in iterators below.
 class FieldClosure: public StackObj {
@@ -246,6 +247,7 @@
   int             _vtable_len;           // length of Java vtable (in words)
   int             _itable_len;           // length of Java itable (in words)
   OopMapCache*    volatile _oop_map_cache;   // OopMapCache for all methods in the klass (allocated lazily)
+  MemberNameTable* _member_names;        // Member names
   JNIid*          _jni_ids;              // First JNI identifier for static fields in this class
   jmethodID*      _methods_jmethod_ids;  // jmethodIDs corresponding to method_idnum, or NULL if none
   int*            _methods_cached_itable_indices;  // itable_index cache for JNI invoke corresponding to methods idnum, or NULL
@@ -1028,6 +1030,11 @@
   // jvm support
   jint compute_modifier_flags(TRAPS) const;
 
+  // JSR-292 support
+  MemberNameTable* member_names() { return _member_names; }
+  void set_member_names(MemberNameTable* member_names) { _member_names = member_names; }
+  void add_member_name(Handle member_name);
+
 public:
   // JVMTI support
   jint jvmti_class_status() const;
--- a/hotspot/src/share/vm/oops/method.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/oops/method.cpp	Wed May 08 11:22:25 2013 +0100
@@ -91,7 +91,7 @@
   set_hidden(false);
   set_dont_inline(false);
   set_method_data(NULL);
-  set_interpreter_throwout_count(0);
+  set_method_counters(NULL);
   set_vtable_index(Method::garbage_vtable_index);
 
   // Fix and bury in Method*
@@ -105,16 +105,6 @@
   }
 
   NOT_PRODUCT(set_compiled_invocation_count(0);)
-  set_interpreter_invocation_count(0);
-  invocation_counter()->init();
-  backedge_counter()->init();
-  clear_number_of_breakpoints();
-
-#ifdef TIERED
-  set_rate(0);
-  set_prev_event_count(0);
-  set_prev_time(0);
-#endif
 }
 
 // Release Method*.  The nmethod will be gone when we get here because
@@ -124,6 +114,8 @@
   set_constMethod(NULL);
   MetadataFactory::free_metadata(loader_data, method_data());
   set_method_data(NULL);
+  MetadataFactory::free_metadata(loader_data, method_counters());
+  set_method_counters(NULL);
   // The nmethod will be gone when we get here.
   if (code() != NULL) _code = NULL;
 }
@@ -323,7 +315,10 @@
     // compiler does not bump invocation counter of compiled methods
     return true;
   }
-  else if (_invocation_counter.carry() || (method_data() != NULL && method_data()->invocation_counter()->carry())) {
+  else if ((method_counters() != NULL &&
+            method_counters()->invocation_counter()->carry()) ||
+           (method_data() != NULL &&
+            method_data()->invocation_counter()->carry())) {
     // The carry bit is set when the counter overflows and causes
     // a compilation to occur.  We don't know how many times
     // the counter has been reset, so we simply assume it has
@@ -387,6 +382,18 @@
   }
 }
 
+MethodCounters* Method::build_method_counters(Method* m, TRAPS) {
+  methodHandle mh(m);
+  ClassLoaderData* loader_data = mh->method_holder()->class_loader_data();
+  MethodCounters* counters = MethodCounters::allocate(loader_data, CHECK_NULL);
+  if (mh->method_counters() == NULL) {
+    mh->set_method_counters(counters);
+  } else {
+    MetadataFactory::free_metadata(loader_data, counters);
+  }
+  return mh->method_counters();
+}
+
 void Method::cleanup_inline_caches() {
   // The current system doesn't use inline caches in the interpreter
   // => nothing to do (keep this method around for future use)
@@ -794,8 +801,6 @@
     set_signature_handler(NULL);
   }
   NOT_PRODUCT(set_compiled_invocation_count(0);)
-  invocation_counter()->reset();
-  backedge_counter()->reset();
   _adapter = NULL;
   _from_compiled_entry = NULL;
 
@@ -808,8 +813,7 @@
   assert(!DumpSharedSpaces || _method_data == NULL, "unexpected method data?");
 
   set_method_data(NULL);
-  set_interpreter_throwout_count(0);
-  set_interpreter_invocation_count(0);
+  set_method_counters(NULL);
 }
 
 // Called when the method_holder is getting linked. Setup entrypoints so the method
@@ -1545,28 +1549,34 @@
 
 
 int Method::invocation_count() {
+  MethodCounters *mcs = method_counters();
   if (TieredCompilation) {
     MethodData* const mdo = method_data();
-    if (invocation_counter()->carry() || ((mdo != NULL) ? mdo->invocation_counter()->carry() : false)) {
+    if (((mcs != NULL) ? mcs->invocation_counter()->carry() : false) ||
+        ((mdo != NULL) ? mdo->invocation_counter()->carry() : false)) {
       return InvocationCounter::count_limit;
     } else {
-      return invocation_counter()->count() + ((mdo != NULL) ? mdo->invocation_counter()->count() : 0);
+      return ((mcs != NULL) ? mcs->invocation_counter()->count() : 0) +
+             ((mdo != NULL) ? mdo->invocation_counter()->count() : 0);
     }
   } else {
-    return invocation_counter()->count();
+    return (mcs == NULL) ? 0 : mcs->invocation_counter()->count();
   }
 }
 
 int Method::backedge_count() {
+  MethodCounters *mcs = method_counters();
   if (TieredCompilation) {
     MethodData* const mdo = method_data();
-    if (backedge_counter()->carry() || ((mdo != NULL) ? mdo->backedge_counter()->carry() : false)) {
+    if (((mcs != NULL) ? mcs->backedge_counter()->carry() : false) ||
+        ((mdo != NULL) ? mdo->backedge_counter()->carry() : false)) {
       return InvocationCounter::count_limit;
     } else {
-      return backedge_counter()->count() + ((mdo != NULL) ? mdo->backedge_counter()->count() : 0);
+      return ((mcs != NULL) ? mcs->backedge_counter()->count() : 0) +
+             ((mdo != NULL) ? mdo->backedge_counter()->count() : 0);
     }
   } else {
-    return backedge_counter()->count();
+    return (mcs == NULL) ? 0 : mcs->backedge_counter()->count();
   }
 }
 
@@ -1621,12 +1631,12 @@
     assert(orig_bytecode() == code, "original bytecode must be the same");
   }
 #endif
+  Thread *thread = Thread::current();
   *method->bcp_from(_bci) = Bytecodes::_breakpoint;
-  method->incr_number_of_breakpoints();
+  method->incr_number_of_breakpoints(thread);
   SystemDictionary::notice_modification();
   {
     // Deoptimize all dependents on this method
-    Thread *thread = Thread::current();
     HandleMark hm(thread);
     methodHandle mh(thread, method);
     Universe::flush_dependents_on_method(mh);
@@ -1636,7 +1646,7 @@
 void BreakpointInfo::clear(Method* method) {
   *method->bcp_from(_bci) = orig_bytecode();
   assert(method->number_of_breakpoints() > 0, "must not go negative");
-  method->decr_number_of_breakpoints();
+  method->decr_number_of_breakpoints(Thread::current());
 }
 
 // jmethodID handling
--- a/hotspot/src/share/vm/oops/method.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/oops/method.hpp	Wed May 08 11:22:25 2013 +0100
@@ -31,6 +31,7 @@
 #include "interpreter/invocationCounter.hpp"
 #include "oops/annotations.hpp"
 #include "oops/constantPool.hpp"
+#include "oops/methodCounters.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/oop.hpp"
 #include "oops/typeArrayOop.hpp"
@@ -100,6 +101,7 @@
 class LocalVariableTableElement;
 class AdapterHandlerEntry;
 class MethodData;
+class MethodCounters;
 class ConstMethod;
 class InlineTableSizes;
 class KlassSizeStats;
@@ -109,7 +111,7 @@
  private:
   ConstMethod*      _constMethod;                // Method read-only data.
   MethodData*       _method_data;
-  int               _interpreter_invocation_count; // Count of times invoked (reused as prev_event_count in tiered)
+  MethodCounters*   _method_counters;
   AccessFlags       _access_flags;               // Access flags
   int               _vtable_index;               // vtable index of this method (see VtableIndexFlag)
                                                  // note: can have vtables with >2**16 elements (because of inheritance)
@@ -124,15 +126,6 @@
                     _hidden           : 1,
                     _dont_inline      : 1,
                                       : 3;
-  u2                _interpreter_throwout_count; // Count of times method was exited via exception while interpreting
-  u2                _number_of_breakpoints;      // fullspeed debugging support
-  InvocationCounter _invocation_counter;         // Incremented before each activation of the method - used to trigger frequency-based optimizations
-  InvocationCounter _backedge_counter;           // Incremented before each backedge taken - used to trigger frequencey-based optimizations
-
-#ifdef TIERED
-  float             _rate;                        // Events (invocation and backedge counter increments) per millisecond
-  jlong             _prev_time;                   // Previous time the rate was acquired
-#endif
 
 #ifndef PRODUCT
   int               _compiled_invocation_count;  // Number of nmethod invocations so far (for perf. debugging)
@@ -247,11 +240,31 @@
   void clear_all_breakpoints();
   // Tracking number of breakpoints, for fullspeed debugging.
   // Only mutated by VM thread.
-  u2   number_of_breakpoints() const             { return _number_of_breakpoints; }
-  void incr_number_of_breakpoints()              { ++_number_of_breakpoints; }
-  void decr_number_of_breakpoints()              { --_number_of_breakpoints; }
+  u2   number_of_breakpoints()             const {
+    if (method_counters() == NULL) {
+      return 0;
+    } else {
+      return method_counters()->number_of_breakpoints();
+    }
+  }
+  void incr_number_of_breakpoints(TRAPS)         {
+    MethodCounters* mcs = get_method_counters(CHECK);
+    if (mcs != NULL) {
+      mcs->incr_number_of_breakpoints();
+    }
+  }
+  void decr_number_of_breakpoints(TRAPS)         {
+    MethodCounters* mcs = get_method_counters(CHECK);
+    if (mcs != NULL) {
+      mcs->decr_number_of_breakpoints();
+    }
+  }
   // Initialization only
-  void clear_number_of_breakpoints()             { _number_of_breakpoints = 0; }
+  void clear_number_of_breakpoints()             {
+    if (method_counters() != NULL) {
+      method_counters()->clear_number_of_breakpoints();
+    }
+  }
 
   // index into InstanceKlass methods() array
   // note: also used by jfr
@@ -288,14 +301,20 @@
   void set_highest_osr_comp_level(int level);
 
   // Count of times method was exited via exception while interpreting
-  void interpreter_throwout_increment() {
-    if (_interpreter_throwout_count < 65534) {
-      _interpreter_throwout_count++;
+  void interpreter_throwout_increment(TRAPS) {
+    MethodCounters* mcs = get_method_counters(CHECK);
+    if (mcs != NULL) {
+      mcs->interpreter_throwout_increment();
     }
   }
 
-  int  interpreter_throwout_count() const        { return _interpreter_throwout_count; }
-  void set_interpreter_throwout_count(int count) { _interpreter_throwout_count = count; }
+  int  interpreter_throwout_count() const        {
+    if (method_counters() == NULL) {
+      return 0;
+    } else {
+      return method_counters()->interpreter_throwout_count();
+    }
+  }
 
   // size of parameters
   int  size_of_parameters() const                { return constMethod()->size_of_parameters(); }
@@ -339,23 +358,54 @@
   MethodData* method_data() const              {
     return _method_data;
   }
+
   void set_method_data(MethodData* data)       {
     _method_data = data;
   }
 
-  // invocation counter
-  InvocationCounter* invocation_counter() { return &_invocation_counter; }
-  InvocationCounter* backedge_counter()   { return &_backedge_counter; }
+  MethodCounters* method_counters() const {
+    return _method_counters;
+  }
+
+
+  void set_method_counters(MethodCounters* counters) {
+    _method_counters = counters;
+  }
 
 #ifdef TIERED
   // We are reusing interpreter_invocation_count as a holder for the previous event count!
   // We can do that since interpreter_invocation_count is not used in tiered.
-  int prev_event_count() const                   { return _interpreter_invocation_count;  }
-  void set_prev_event_count(int count)           { _interpreter_invocation_count = count; }
-  jlong prev_time() const                        { return _prev_time; }
-  void set_prev_time(jlong time)                 { _prev_time = time; }
-  float rate() const                             { return _rate; }
-  void set_rate(float rate)                      { _rate = rate; }
+  int prev_event_count() const                   {
+    if (method_counters() == NULL) {
+      return 0;
+    } else {
+      return method_counters()->interpreter_invocation_count();
+    }
+  }
+  void set_prev_event_count(int count, TRAPS)    {
+    MethodCounters* mcs = get_method_counters(CHECK);
+    if (mcs != NULL) {
+      mcs->set_interpreter_invocation_count(count);
+    }
+  }
+  jlong prev_time() const                        {
+    return method_counters() == NULL ? 0 : method_counters()->prev_time();
+  }
+  void set_prev_time(jlong time, TRAPS)          {
+    MethodCounters* mcs = get_method_counters(CHECK);
+    if (mcs != NULL) {
+      mcs->set_prev_time(time);
+    }
+  }
+  float rate() const                             {
+    return method_counters() == NULL ? 0 : method_counters()->rate();
+  }
+  void set_rate(float rate, TRAPS) {
+    MethodCounters* mcs = get_method_counters(CHECK);
+    if (mcs != NULL) {
+      mcs->set_rate(rate);
+    }
+  }
 #endif
 
   int invocation_count();
@@ -366,14 +416,17 @@
 
   static void build_interpreter_method_data(methodHandle method, TRAPS);
 
+  static MethodCounters* build_method_counters(Method* m, TRAPS);
+
   int interpreter_invocation_count() {
     if (TieredCompilation) return invocation_count();
-    else return _interpreter_invocation_count;
+    else return (method_counters() == NULL) ? 0 :
+                 method_counters()->interpreter_invocation_count();
   }
-  void set_interpreter_invocation_count(int count) { _interpreter_invocation_count = count; }
-  int increment_interpreter_invocation_count() {
+  int increment_interpreter_invocation_count(TRAPS) {
     if (TieredCompilation) ShouldNotReachHere();
-    return ++_interpreter_invocation_count;
+    MethodCounters* mcs = get_method_counters(CHECK_0);
+    return (mcs == NULL) ? 0 : mcs->increment_interpreter_invocation_count();
   }
 
 #ifndef PRODUCT
@@ -582,12 +635,12 @@
 #endif /* CC_INTERP */
   static ByteSize from_compiled_offset()         { return byte_offset_of(Method, _from_compiled_entry); }
   static ByteSize code_offset()                  { return byte_offset_of(Method, _code); }
-  static ByteSize invocation_counter_offset()    { return byte_offset_of(Method, _invocation_counter); }
-  static ByteSize backedge_counter_offset()      { return byte_offset_of(Method, _backedge_counter); }
   static ByteSize method_data_offset()           {
     return byte_offset_of(Method, _method_data);
   }
-  static ByteSize interpreter_invocation_counter_offset() { return byte_offset_of(Method, _interpreter_invocation_count); }
+  static ByteSize method_counters_offset()       {
+    return byte_offset_of(Method, _method_counters);
+  }
 #ifndef PRODUCT
   static ByteSize compiled_invocation_counter_offset() { return byte_offset_of(Method, _compiled_invocation_count); }
 #endif // not PRODUCT
@@ -598,8 +651,6 @@
 
   // for code generation
   static int method_data_offset_in_bytes()       { return offset_of(Method, _method_data); }
-  static int interpreter_invocation_counter_offset_in_bytes()
-                                                 { return offset_of(Method, _interpreter_invocation_count); }
   static int intrinsic_id_offset_in_bytes()      { return offset_of(Method, _intrinsic_id); }
   static int intrinsic_id_size_in_bytes()        { return sizeof(u1); }
 
@@ -757,6 +808,13 @@
  private:
   void print_made_not_compilable(int comp_level, bool is_osr, bool report, const char* reason);
 
+  MethodCounters* get_method_counters(TRAPS) {
+    if (_method_counters == NULL) {
+      build_method_counters(this, CHECK_AND_CLEAR_NULL);
+    }
+    return _method_counters;
+  }
+
  public:
   bool   is_not_c1_compilable() const         { return access_flags().is_not_c1_compilable();  }
   void  set_not_c1_compilable()               {       _access_flags.set_not_c1_compilable();   }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/share/vm/oops/methodCounters.cpp	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+#include "precompiled.hpp"
+#include "oops/methodCounters.hpp"
+#include "runtime/thread.inline.hpp"
+
+MethodCounters* MethodCounters::allocate(ClassLoaderData* loader_data, TRAPS) {
+  return new(loader_data, size(), false, THREAD) MethodCounters();
+}
+
+void MethodCounters::clear_counters() {
+  invocation_counter()->reset();
+  backedge_counter()->reset();
+  set_interpreter_throwout_count(0);
+  set_interpreter_invocation_count(0);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/share/vm/oops/methodCounters.hpp	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_OOPS_METHODCOUNTERS_HPP
+#define SHARE_VM_OOPS_METHODCOUNTERS_HPP
+
+#include "oops/metadata.hpp"
+#include "interpreter/invocationCounter.hpp"
+
+class MethodCounters: public MetaspaceObj {
+ friend class VMStructs;
+ private:
+  int               _interpreter_invocation_count; // Count of times invoked (reused as prev_event_count in tiered)
+  u2                _interpreter_throwout_count; // Count of times method was exited via exception while interpreting
+  u2                _number_of_breakpoints;      // fullspeed debugging support
+  InvocationCounter _invocation_counter;         // Incremented before each activation of the method - used to trigger frequency-based optimizations
+  InvocationCounter _backedge_counter;           // Incremented before each backedge taken - used to trigger frequencey-based optimizations
+
+#ifdef TIERED
+  float             _rate;                        // Events (invocation and backedge counter increments) per millisecond
+  jlong             _prev_time;                   // Previous time the rate was acquired
+#endif
+
+  MethodCounters() : _interpreter_invocation_count(0),
+                     _interpreter_throwout_count(0),
+                     _number_of_breakpoints(0)
+#ifdef TIERED
+                   , _rate(0),
+                     _prev_time(0)
+#endif
+  {
+    invocation_counter()->init();
+    backedge_counter()->init();
+  }
+
+ public:
+  static MethodCounters* allocate(ClassLoaderData* loader_data, TRAPS);
+
+  void deallocate_contents(ClassLoaderData* loader_data) {}
+  DEBUG_ONLY(bool on_stack() { return false; })  // for template
+
+  static int size() { return sizeof(MethodCounters) / wordSize; }
+
+  bool is_klass() const { return false; }
+
+  void clear_counters();
+
+  int interpreter_invocation_count() {
+    return _interpreter_invocation_count;
+  }
+  void set_interpreter_invocation_count(int count) {
+    _interpreter_invocation_count = count;
+  }
+  int increment_interpreter_invocation_count() {
+    return ++_interpreter_invocation_count;
+  }
+
+  void interpreter_throwout_increment() {
+    if (_interpreter_throwout_count < 65534) {
+      _interpreter_throwout_count++;
+    }
+  }
+  int  interpreter_throwout_count() const {
+    return _interpreter_throwout_count;
+  }
+  void set_interpreter_throwout_count(int count) {
+    _interpreter_throwout_count = count;
+  }
+
+  u2   number_of_breakpoints() const   { return _number_of_breakpoints; }
+  void incr_number_of_breakpoints()    { ++_number_of_breakpoints; }
+  void decr_number_of_breakpoints()    { --_number_of_breakpoints; }
+  void clear_number_of_breakpoints()   { _number_of_breakpoints = 0; }
+
+#ifdef TIERED
+  jlong prev_time() const                        { return _prev_time; }
+  void set_prev_time(jlong time)                 { _prev_time = time; }
+  float rate() const                             { return _rate; }
+  void set_rate(float rate)                      { _rate = rate; }
+#endif
+
+  // invocation counter
+  InvocationCounter* invocation_counter() { return &_invocation_counter; }
+  InvocationCounter* backedge_counter()   { return &_backedge_counter; }
+
+  static ByteSize interpreter_invocation_counter_offset() {
+    return byte_offset_of(MethodCounters, _interpreter_invocation_count);
+  }
+
+  static ByteSize invocation_counter_offset()    {
+    return byte_offset_of(MethodCounters, _invocation_counter);
+  }
+
+  static ByteSize backedge_counter_offset()      {
+    return byte_offset_of(MethodCounters, _backedge_counter);
+  }
+
+  static int interpreter_invocation_counter_offset_in_bytes() {
+    return offset_of(MethodCounters, _interpreter_invocation_count);
+  }
+
+};
+#endif //SHARE_VM_OOPS_METHODCOUNTERS_HPP
--- a/hotspot/src/share/vm/oops/methodData.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/oops/methodData.cpp	Wed May 08 11:22:25 2013 +0100
@@ -732,14 +732,17 @@
   } else {
     int iic = method->interpreter_invocation_count();
     if (mileage < iic)  mileage = iic;
-    InvocationCounter* ic = method->invocation_counter();
-    InvocationCounter* bc = method->backedge_counter();
-    int icval = ic->count();
-    if (ic->carry()) icval += CompileThreshold;
-    if (mileage < icval)  mileage = icval;
-    int bcval = bc->count();
-    if (bc->carry()) bcval += CompileThreshold;
-    if (mileage < bcval)  mileage = bcval;
+    MethodCounters* mcs = method->method_counters();
+    if (mcs != NULL) {
+      InvocationCounter* ic = mcs->invocation_counter();
+      InvocationCounter* bc = mcs->backedge_counter();
+      int icval = ic->count();
+      if (ic->carry()) icval += CompileThreshold;
+      if (mileage < icval)  mileage = icval;
+      int bcval = bc->count();
+      if (bc->carry()) bcval += CompileThreshold;
+      if (mileage < bcval)  mileage = bcval;
+    }
   }
   return mileage;
 }
--- a/hotspot/src/share/vm/opto/cfgnode.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/opto/cfgnode.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1306,10 +1306,11 @@
     return NULL;
 
   Node *x = n2;
-  Node *y = n1->in(1);
-  if( n2 == n1->in(1) ) {
+  Node *y = NULL;
+  if( x == n1->in(1) ) {
     y = n1->in(2);
-  } else if( n2 == n1->in(1) ) {
+  } else if( x == n1->in(2) ) {
+    y = n1->in(1);
   } else return NULL;
 
   // Not so profitable if compare and add are constants
--- a/hotspot/src/share/vm/opto/chaitin.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/opto/chaitin.cpp	Wed May 08 11:22:25 2013 +0100
@@ -145,6 +145,72 @@
 
 #define NUMBUCKS 3
 
+// Straight out of Tarjan's union-find algorithm
+uint LiveRangeMap::find_compress(uint lrg) {
+  uint cur = lrg;
+  uint next = _uf_map[cur];
+  while (next != cur) { // Scan chain of equivalences
+    assert( next < cur, "always union smaller");
+    cur = next; // until find a fixed-point
+    next = _uf_map[cur];
+  }
+
+  // Core of union-find algorithm: update chain of
+  // equivalences to be equal to the root.
+  while (lrg != next) {
+    uint tmp = _uf_map[lrg];
+    _uf_map.map(lrg, next);
+    lrg = tmp;
+  }
+  return lrg;
+}
+
+// Reset the Union-Find map to identity
+void LiveRangeMap::reset_uf_map(uint max_lrg_id) {
+  _max_lrg_id= max_lrg_id;
+  // Force the Union-Find mapping to be at least this large
+  _uf_map.extend(_max_lrg_id, 0);
+  // Initialize it to be the ID mapping.
+  for (uint i = 0; i < _max_lrg_id; ++i) {
+    _uf_map.map(i, i);
+  }
+}
+
+// Make all Nodes map directly to their final live range; no need for
+// the Union-Find mapping after this call.
+void LiveRangeMap::compress_uf_map_for_nodes() {
+  // For all Nodes, compress mapping
+  uint unique = _names.Size();
+  for (uint i = 0; i < unique; ++i) {
+    uint lrg = _names[i];
+    uint compressed_lrg = find(lrg);
+    if (lrg != compressed_lrg) {
+      _names.map(i, compressed_lrg);
+    }
+  }
+}
+
+// Like Find above, but no path compress, so bad asymptotic behavior
+uint LiveRangeMap::find_const(uint lrg) const {
+  if (!lrg) {
+    return lrg; // Ignore the zero LRG
+  }
+
+  // Off the end?  This happens during debugging dumps when you got
+  // brand new live ranges but have not told the allocator yet.
+  if (lrg >= _max_lrg_id) {
+    return lrg;
+  }
+
+  uint next = _uf_map[lrg];
+  while (next != lrg) { // Scan chain of equivalences
+    assert(next < lrg, "always union smaller");
+    lrg = next; // until find a fixed-point
+    next = _uf_map[lrg];
+  }
+  return next;
+}
+
 //------------------------------Chaitin----------------------------------------
 PhaseChaitin::PhaseChaitin(uint unique, PhaseCFG &cfg, Matcher &matcher)
   : PhaseRegAlloc(unique, cfg, matcher,
@@ -153,13 +219,13 @@
 #else
        NULL
 #endif
-       ),
-    _names(unique), _uf_map(unique),
-    _maxlrg(0), _live(0),
-    _spilled_once(Thread::current()->resource_area()),
-    _spilled_twice(Thread::current()->resource_area()),
-    _lo_degree(0), _lo_stk_degree(0), _hi_degree(0), _simplified(0),
-    _oldphi(unique)
+       )
+  , _lrg_map(unique)
+  , _live(0)
+  , _spilled_once(Thread::current()->resource_area())
+  , _spilled_twice(Thread::current()->resource_area())
+  , _lo_degree(0), _lo_stk_degree(0), _hi_degree(0), _simplified(0)
+  , _oldphi(unique)
 #ifndef PRODUCT
   , _trace_spilling(TraceSpilling || C->method_has_option("TraceSpilling"))
 #endif
@@ -168,7 +234,6 @@
 
   _high_frequency_lrg = MIN2(float(OPTO_LRG_HIGH_FREQ), _cfg._outer_loop_freq);
 
-  uint i,j;
   // Build a list of basic blocks, sorted by frequency
   _blks = NEW_RESOURCE_ARRAY( Block *, _cfg._num_blocks );
   // Experiment with sorting strategies to speed compilation
@@ -176,30 +241,30 @@
   Block **buckets[NUMBUCKS];             // Array of buckets
   uint    buckcnt[NUMBUCKS];             // Array of bucket counters
   double  buckval[NUMBUCKS];             // Array of bucket value cutoffs
-  for( i = 0; i < NUMBUCKS; i++ ) {
-    buckets[i] = NEW_RESOURCE_ARRAY( Block *, _cfg._num_blocks );
+  for (uint i = 0; i < NUMBUCKS; i++) {
+    buckets[i] = NEW_RESOURCE_ARRAY(Block *, _cfg._num_blocks);
     buckcnt[i] = 0;
     // Bump by three orders of magnitude each time
     cutoff *= 0.001;
     buckval[i] = cutoff;
-    for( j = 0; j < _cfg._num_blocks; j++ ) {
+    for (uint j = 0; j < _cfg._num_blocks; j++) {
       buckets[i][j] = NULL;
     }
   }
   // Sort blocks into buckets
-  for( i = 0; i < _cfg._num_blocks; i++ ) {
-    for( j = 0; j < NUMBUCKS; j++ ) {
-      if( (j == NUMBUCKS-1) || (_cfg._blocks[i]->_freq > buckval[j]) ) {
+  for (uint i = 0; i < _cfg._num_blocks; i++) {
+    for (uint j = 0; j < NUMBUCKS; j++) {
+      if ((j == NUMBUCKS - 1) || (_cfg._blocks[i]->_freq > buckval[j])) {
         // Assign block to end of list for appropriate bucket
         buckets[j][buckcnt[j]++] = _cfg._blocks[i];
-        break;                      // kick out of inner loop
+        break; // kick out of inner loop
       }
     }
   }
   // Dump buckets into final block array
   uint blkcnt = 0;
-  for( i = 0; i < NUMBUCKS; i++ ) {
-    for( j = 0; j < buckcnt[i]; j++ ) {
+  for (uint i = 0; i < NUMBUCKS; i++) {
+    for (uint j = 0; j < buckcnt[i]; j++) {
       _blks[blkcnt++] = buckets[i][j];
     }
   }
@@ -207,6 +272,77 @@
   assert(blkcnt == _cfg._num_blocks, "Block array not totally filled");
 }
 
+//------------------------------Union------------------------------------------
+// union 2 sets together.
+void PhaseChaitin::Union( const Node *src_n, const Node *dst_n ) {
+  uint src = _lrg_map.find(src_n);
+  uint dst = _lrg_map.find(dst_n);
+  assert(src, "");
+  assert(dst, "");
+  assert(src < _lrg_map.max_lrg_id(), "oob");
+  assert(dst < _lrg_map.max_lrg_id(), "oob");
+  assert(src < dst, "always union smaller");
+  _lrg_map.uf_map(dst, src);
+}
+
+//------------------------------new_lrg----------------------------------------
+void PhaseChaitin::new_lrg(const Node *x, uint lrg) {
+  // Make the Node->LRG mapping
+  _lrg_map.extend(x->_idx,lrg);
+  // Make the Union-Find mapping an identity function
+  _lrg_map.uf_extend(lrg, lrg);
+}
+
+
+bool PhaseChaitin::clone_projs_shared(Block *b, uint idx, Node *con, Node *copy, uint max_lrg_id) {
+  Block *bcon = _cfg._bbs[con->_idx];
+  uint cindex = bcon->find_node(con);
+  Node *con_next = bcon->_nodes[cindex+1];
+  if (con_next->in(0) != con || !con_next->is_MachProj()) {
+    return false;               // No MachProj's follow
+  }
+
+  // Copy kills after the cloned constant
+  Node *kills = con_next->clone();
+  kills->set_req(0, copy);
+  b->_nodes.insert(idx, kills);
+  _cfg._bbs.map(kills->_idx, b);
+  new_lrg(kills, max_lrg_id);
+  return true;
+}
+
+//------------------------------compact----------------------------------------
+// Renumber the live ranges to compact them.  Makes the IFG smaller.
+void PhaseChaitin::compact() {
+  // Current the _uf_map contains a series of short chains which are headed
+  // by a self-cycle.  All the chains run from big numbers to little numbers.
+  // The Find() call chases the chains & shortens them for the next Find call.
+  // We are going to change this structure slightly.  Numbers above a moving
+  // wave 'i' are unchanged.  Numbers below 'j' point directly to their
+  // compacted live range with no further chaining.  There are no chains or
+  // cycles below 'i', so the Find call no longer works.
+  uint j=1;
+  uint i;
+  for (i = 1; i < _lrg_map.max_lrg_id(); i++) {
+    uint lr = _lrg_map.uf_live_range_id(i);
+    // Ignore unallocated live ranges
+    if (!lr) {
+      continue;
+    }
+    assert(lr <= i, "");
+    _lrg_map.uf_map(i, ( lr == i ) ? j++ : _lrg_map.uf_live_range_id(lr));
+  }
+  // Now change the Node->LR mapping to reflect the compacted names
+  uint unique = _lrg_map.size();
+  for (i = 0; i < unique; i++) {
+    uint lrg_id = _lrg_map.live_range_id(i);
+    _lrg_map.map(i, _lrg_map.uf_live_range_id(lrg_id));
+  }
+
+  // Reset the Union-Find mapping
+  _lrg_map.reset_uf_map(j);
+}
+
 void PhaseChaitin::Register_Allocate() {
 
   // Above the OLD FP (and in registers) are the incoming arguments.  Stack
@@ -231,14 +367,12 @@
   // all copy-related live ranges low and then using the max copy-related
   // live range as a cut-off for LIVE and the IFG.  In other words, I can
   // build a subset of LIVE and IFG just for copies.
-  PhaseLive live(_cfg,_names,&live_arena);
+  PhaseLive live(_cfg, _lrg_map.names(), &live_arena);
 
   // Need IFG for coalescing and coloring
-  PhaseIFG ifg( &live_arena );
+  PhaseIFG ifg(&live_arena);
   _ifg = &ifg;
 
-  if (C->unique() > _names.Size())  _names.extend(C->unique()-1, 0);
-
   // Come out of SSA world to the Named world.  Assign (virtual) registers to
   // Nodes.  Use the same register for all inputs and the output of PhiNodes
   // - effectively ending SSA form.  This requires either coalescing live
@@ -258,9 +392,9 @@
     _live = NULL;                 // Mark live as being not available
     rm.reset_to_mark();           // Reclaim working storage
     IndexSet::reset_memory(C, &live_arena);
-    ifg.init(_maxlrg);            // Empty IFG
+    ifg.init(_lrg_map.max_lrg_id()); // Empty IFG
     gather_lrg_masks( false );    // Collect LRG masks
-    live.compute( _maxlrg );      // Compute liveness
+    live.compute(_lrg_map.max_lrg_id()); // Compute liveness
     _live = &live;                // Mark LIVE as being available
   }
 
@@ -270,19 +404,19 @@
   // across any GC point where the derived value is live.  So this code looks
   // at all the GC points, and "stretches" the live range of any base pointer
   // to the GC point.
-  if( stretch_base_pointer_live_ranges(&live_arena) ) {
-    NOT_PRODUCT( Compile::TracePhase t3("computeLive (sbplr)", &_t_computeLive, TimeCompiler); )
+  if (stretch_base_pointer_live_ranges(&live_arena)) {
+    NOT_PRODUCT(Compile::TracePhase t3("computeLive (sbplr)", &_t_computeLive, TimeCompiler);)
     // Since some live range stretched, I need to recompute live
     _live = NULL;
     rm.reset_to_mark();         // Reclaim working storage
     IndexSet::reset_memory(C, &live_arena);
-    ifg.init(_maxlrg);
-    gather_lrg_masks( false );
-    live.compute( _maxlrg );
+    ifg.init(_lrg_map.max_lrg_id());
+    gather_lrg_masks(false);
+    live.compute(_lrg_map.max_lrg_id());
     _live = &live;
   }
   // Create the interference graph using virtual copies
-  build_ifg_virtual( );  // Include stack slots this time
+  build_ifg_virtual();  // Include stack slots this time
 
   // Aggressive (but pessimistic) copy coalescing.
   // This pass works on virtual copies.  Any virtual copies which are not
@@ -296,8 +430,8 @@
     // given Node and search them for an instance, i.e., time O(#MaxLRG)).
     _ifg->SquareUp();
 
-    PhaseAggressiveCoalesce coalesce( *this );
-    coalesce.coalesce_driver( );
+    PhaseAggressiveCoalesce coalesce(*this);
+    coalesce.coalesce_driver();
     // Insert un-coalesced copies.  Visit all Phis.  Where inputs to a Phi do
     // not match the Phi itself, insert a copy.
     coalesce.insert_copies(_matcher);
@@ -310,28 +444,36 @@
     _live = NULL;
     rm.reset_to_mark();           // Reclaim working storage
     IndexSet::reset_memory(C, &live_arena);
-    ifg.init(_maxlrg);
+    ifg.init(_lrg_map.max_lrg_id());
     gather_lrg_masks( true );
-    live.compute( _maxlrg );
+    live.compute(_lrg_map.max_lrg_id());
     _live = &live;
   }
 
   // Build physical interference graph
   uint must_spill = 0;
-  must_spill = build_ifg_physical( &live_arena );
+  must_spill = build_ifg_physical(&live_arena);
   // If we have a guaranteed spill, might as well spill now
-  if( must_spill ) {
-    if( !_maxlrg ) return;
+  if (must_spill) {
+    if(!_lrg_map.max_lrg_id()) {
+      return;
+    }
     // Bail out if unique gets too large (ie - unique > MaxNodeLimit)
     C->check_node_count(10*must_spill, "out of nodes before split");
-    if (C->failing())  return;
-    _maxlrg = Split(_maxlrg, &split_arena);  // Split spilling LRG everywhere
+    if (C->failing()) {
+      return;
+    }
+
+    uint new_max_lrg_id = Split(_lrg_map.max_lrg_id(), &split_arena);  // Split spilling LRG everywhere
+    _lrg_map.set_max_lrg_id(new_max_lrg_id);
     // Bail out if unique gets too large (ie - unique > MaxNodeLimit - 2*NodeLimitFudgeFactor)
     // or we failed to split
     C->check_node_count(2*NodeLimitFudgeFactor, "out of nodes after physical split");
-    if (C->failing())  return;
+    if (C->failing()) {
+      return;
+    }
 
-    NOT_PRODUCT( C->verify_graph_edges(); )
+    NOT_PRODUCT(C->verify_graph_edges();)
 
     compact();                  // Compact LRGs; return new lower max lrg
 
@@ -340,23 +482,23 @@
       _live = NULL;
       rm.reset_to_mark();         // Reclaim working storage
       IndexSet::reset_memory(C, &live_arena);
-      ifg.init(_maxlrg);          // Build a new interference graph
+      ifg.init(_lrg_map.max_lrg_id()); // Build a new interference graph
       gather_lrg_masks( true );   // Collect intersect mask
-      live.compute( _maxlrg );    // Compute LIVE
+      live.compute(_lrg_map.max_lrg_id()); // Compute LIVE
       _live = &live;
     }
-    build_ifg_physical( &live_arena );
+    build_ifg_physical(&live_arena);
     _ifg->SquareUp();
     _ifg->Compute_Effective_Degree();
     // Only do conservative coalescing if requested
-    if( OptoCoalesce ) {
+    if (OptoCoalesce) {
       // Conservative (and pessimistic) copy coalescing of those spills
-      PhaseConservativeCoalesce coalesce( *this );
+      PhaseConservativeCoalesce coalesce(*this);
       // If max live ranges greater than cutoff, don't color the stack.
       // This cutoff can be larger than below since it is only done once.
-      coalesce.coalesce_driver( );
+      coalesce.coalesce_driver();
     }
-    compress_uf_map_for_nodes();
+    _lrg_map.compress_uf_map_for_nodes();
 
 #ifdef ASSERT
     verify(&live_arena, true);
@@ -390,13 +532,18 @@
       }
     }
 
-    if( !_maxlrg ) return;
-    _maxlrg = Split(_maxlrg, &split_arena);  // Split spilling LRG everywhere
+    if (!_lrg_map.max_lrg_id()) {
+      return;
+    }
+    uint new_max_lrg_id = Split(_lrg_map.max_lrg_id(), &split_arena);  // Split spilling LRG everywhere
+    _lrg_map.set_max_lrg_id(new_max_lrg_id);
     // Bail out if unique gets too large (ie - unique > MaxNodeLimit - 2*NodeLimitFudgeFactor)
-    C->check_node_count(2*NodeLimitFudgeFactor, "out of nodes after split");
-    if (C->failing())  return;
+    C->check_node_count(2 * NodeLimitFudgeFactor, "out of nodes after split");
+    if (C->failing()) {
+      return;
+    }
 
-    compact();                  // Compact LRGs; return new lower max lrg
+    compact(); // Compact LRGs; return new lower max lrg
 
     // Nuke the live-ness and interference graph and LiveRanGe info
     {
@@ -404,26 +551,26 @@
       _live = NULL;
       rm.reset_to_mark();         // Reclaim working storage
       IndexSet::reset_memory(C, &live_arena);
-      ifg.init(_maxlrg);
+      ifg.init(_lrg_map.max_lrg_id());
 
       // Create LiveRanGe array.
       // Intersect register masks for all USEs and DEFs
-      gather_lrg_masks( true );
-      live.compute( _maxlrg );
+      gather_lrg_masks(true);
+      live.compute(_lrg_map.max_lrg_id());
       _live = &live;
     }
-    must_spill = build_ifg_physical( &live_arena );
+    must_spill = build_ifg_physical(&live_arena);
     _ifg->SquareUp();
     _ifg->Compute_Effective_Degree();
 
     // Only do conservative coalescing if requested
-    if( OptoCoalesce ) {
+    if (OptoCoalesce) {
       // Conservative (and pessimistic) copy coalescing
-      PhaseConservativeCoalesce coalesce( *this );
+      PhaseConservativeCoalesce coalesce(*this);
       // Check for few live ranges determines how aggressive coalesce is.
-      coalesce.coalesce_driver( );
+      coalesce.coalesce_driver();
     }
-    compress_uf_map_for_nodes();
+    _lrg_map.compress_uf_map_for_nodes();
 #ifdef ASSERT
     verify(&live_arena, true);
 #endif
@@ -435,7 +582,7 @@
 
     // Select colors by re-inserting LRGs back into the IFG in reverse order.
     // Return whether or not something spills.
-    spills = Select( );
+    spills = Select();
   }
 
   // Count number of Simplify-Select trips per coloring success.
@@ -452,9 +599,12 @@
 
   // max_reg is past the largest *register* used.
   // Convert that to a frame_slot number.
-  if( _max_reg <= _matcher._new_SP )
+  if (_max_reg <= _matcher._new_SP) {
     _framesize = C->out_preserve_stack_slots();
-  else _framesize = _max_reg -_matcher._new_SP;
+  }
+  else {
+    _framesize = _max_reg -_matcher._new_SP;
+  }
   assert((int)(_matcher._new_SP+_framesize) >= (int)_matcher._out_arg_limit, "framesize must be large enough");
 
   // This frame must preserve the required fp alignment
@@ -462,8 +612,9 @@
   assert( _framesize >= 0 && _framesize <= 1000000, "sanity check" );
 #ifndef PRODUCT
   _total_framesize += _framesize;
-  if( (int)_framesize > _max_framesize )
+  if ((int)_framesize > _max_framesize) {
     _max_framesize = _framesize;
+  }
 #endif
 
   // Convert CISC spills
@@ -475,15 +626,17 @@
     log->elem("regalloc attempts='%d' success='%d'", _trip_cnt, !C->failing());
   }
 
-  if (C->failing())  return;
+  if (C->failing()) {
+    return;
+  }
 
-  NOT_PRODUCT( C->verify_graph_edges(); )
+  NOT_PRODUCT(C->verify_graph_edges();)
 
   // Move important info out of the live_arena to longer lasting storage.
-  alloc_node_regs(_names.Size());
-  for (uint i=0; i < _names.Size(); i++) {
-    if (_names[i]) {           // Live range associated with Node?
-      LRG &lrg = lrgs(_names[i]);
+  alloc_node_regs(_lrg_map.size());
+  for (uint i=0; i < _lrg_map.size(); i++) {
+    if (_lrg_map.live_range_id(i)) { // Live range associated with Node?
+      LRG &lrg = lrgs(_lrg_map.live_range_id(i));
       if (!lrg.alive()) {
         set_bad(i);
       } else if (lrg.num_regs() == 1) {
@@ -537,11 +690,11 @@
       Node *n = b->_nodes[j];
       // Pre-color to the zero live range, or pick virtual register
       const RegMask &rm = n->out_RegMask();
-      _names.map( n->_idx, rm.is_NotEmpty() ? lr_counter++ : 0 );
+      _lrg_map.map(n->_idx, rm.is_NotEmpty() ? lr_counter++ : 0);
     }
   }
   // Reset the Union-Find mapping to be identity
-  reset_uf_map(lr_counter);
+  _lrg_map.reset_uf_map(lr_counter);
 }
 
 
@@ -551,7 +704,7 @@
 void PhaseChaitin::gather_lrg_masks( bool after_aggressive ) {
 
   // Nail down the frame pointer live range
-  uint fp_lrg = n2lidx(_cfg._root->in(1)->in(TypeFunc::FramePtr));
+  uint fp_lrg = _lrg_map.live_range_id(_cfg._root->in(1)->in(TypeFunc::FramePtr));
   lrgs(fp_lrg)._cost += 1e12;   // Cost is infinite
 
   // For all blocks
@@ -566,14 +719,14 @@
       uint idx = n->is_Copy();
 
       // Get virtual register number, same as LiveRanGe index
-      uint vreg = n2lidx(n);
+      uint vreg = _lrg_map.live_range_id(n);
       LRG &lrg = lrgs(vreg);
       if( vreg ) {              // No vreg means un-allocable (e.g. memory)
 
         // Collect has-copy bit
         if( idx ) {
           lrg._has_copy = 1;
-          uint clidx = n2lidx(n->in(idx));
+          uint clidx = _lrg_map.live_range_id(n->in(idx));
           LRG &copy_src = lrgs(clidx);
           copy_src._has_copy = 1;
         }
@@ -773,8 +926,10 @@
       }
       // Prepare register mask for each input
       for( uint k = input_edge_start; k < cnt; k++ ) {
-        uint vreg = n2lidx(n->in(k));
-        if( !vreg ) continue;
+        uint vreg = _lrg_map.live_range_id(n->in(k));
+        if (!vreg) {
+          continue;
+        }
 
         // If this instruction is CISC Spillable, add the flags
         // bit to its appropriate input
@@ -857,7 +1012,7 @@
   } // end for all blocks
 
   // Final per-liverange setup
-  for (uint i2=0; i2<_maxlrg; i2++) {
+  for (uint i2 = 0; i2 < _lrg_map.max_lrg_id(); i2++) {
     LRG &lrg = lrgs(i2);
     assert(!lrg._is_vector || !lrg._fat_proj, "sanity");
     if (lrg.num_regs() > 1 && !lrg._fat_proj) {
@@ -879,7 +1034,7 @@
 // The bit is checked in Simplify.
 void PhaseChaitin::set_was_low() {
 #ifdef ASSERT
-  for( uint i = 1; i < _maxlrg; i++ ) {
+  for (uint i = 1; i < _lrg_map.max_lrg_id(); i++) {
     int size = lrgs(i).num_regs();
     uint old_was_lo = lrgs(i)._was_lo;
     lrgs(i)._was_lo = 0;
@@ -913,7 +1068,7 @@
 // Compute cost/area ratio, in case we spill.  Build the lo-degree list.
 void PhaseChaitin::cache_lrg_info( ) {
 
-  for( uint i = 1; i < _maxlrg; i++ ) {
+  for (uint i = 1; i < _lrg_map.max_lrg_id(); i++) {
     LRG &lrg = lrgs(i);
 
     // Check for being of low degree: means we can be trivially colored.
@@ -949,10 +1104,10 @@
 
   // Warm up the lo-degree no-copy list
   int lo_no_copy = 0;
-  for( uint i = 1; i < _maxlrg; i++ ) {
-    if( (lrgs(i).lo_degree() && !lrgs(i)._has_copy) ||
+  for (uint i = 1; i < _lrg_map.max_lrg_id(); i++) {
+    if ((lrgs(i).lo_degree() && !lrgs(i)._has_copy) ||
         !lrgs(i).alive() ||
-        lrgs(i)._must_spill ) {
+        lrgs(i)._must_spill) {
       lrgs(i)._next = lo_no_copy;
       lo_no_copy = i;
     }
@@ -1163,7 +1318,7 @@
 OptoReg::Name PhaseChaitin::bias_color( LRG &lrg, int chunk ) {
 
   // Check for "at_risk" LRG's
-  uint risk_lrg = Find(lrg._risk_bias);
+  uint risk_lrg = _lrg_map.find(lrg._risk_bias);
   if( risk_lrg != 0 ) {
     // Walk the colored neighbors of the "at_risk" candidate
     // Choose a color which is both legal and already taken by a neighbor
@@ -1179,7 +1334,7 @@
     }
   }
 
-  uint copy_lrg = Find(lrg._copy_bias);
+  uint copy_lrg = _lrg_map.find(lrg._copy_bias);
   if( copy_lrg != 0 ) {
     // If he has a color,
     if( !(*(_ifg->_yanked))[copy_lrg] ) {
@@ -1423,10 +1578,10 @@
 void PhaseChaitin::copy_was_spilled( Node *src, Node *dst ) {
   if( _spilled_once.test(src->_idx) ) {
     _spilled_once.set(dst->_idx);
-    lrgs(Find(dst))._was_spilled1 = 1;
+    lrgs(_lrg_map.find(dst))._was_spilled1 = 1;
     if( _spilled_twice.test(src->_idx) ) {
       _spilled_twice.set(dst->_idx);
-      lrgs(Find(dst))._was_spilled2 = 1;
+      lrgs(_lrg_map.find(dst))._was_spilled2 = 1;
     }
   }
 }
@@ -1471,7 +1626,7 @@
         MachNode *mach = n->as_Mach();
         inp = mach->operand_index(inp);
         Node *src = n->in(inp);   // Value to load or store
-        LRG &lrg_cisc = lrgs( Find_const(src) );
+        LRG &lrg_cisc = lrgs(_lrg_map.find_const(src));
         OptoReg::Name src_reg = lrg_cisc.reg();
         // Doubles record the HIGH register of an adjacent pair.
         src_reg = OptoReg::add(src_reg,1-lrg_cisc.num_regs());
@@ -1554,9 +1709,9 @@
       Block *startb = _cfg._bbs[C->top()->_idx];
       startb->_nodes.insert(startb->find_node(C->top()), base );
       _cfg._bbs.map( base->_idx, startb );
-      assert (n2lidx(base) == 0, "should not have LRG yet");
+      assert(_lrg_map.live_range_id(base) == 0, "should not have LRG yet");
     }
-    if (n2lidx(base) == 0) {
+    if (_lrg_map.live_range_id(base) == 0) {
       new_lrg(base, maxlrg++);
     }
     assert(base->in(0) == _cfg._root &&
@@ -1566,7 +1721,7 @@
   }
 
   // Check for AddP-related opcodes
-  if( !derived->is_Phi() ) {
+  if (!derived->is_Phi()) {
     assert(derived->as_Mach()->ideal_Opcode() == Op_AddP, err_msg_res("but is: %s", derived->Name()));
     Node *base = derived->in(AddPNode::Base);
     derived_base_map[derived->_idx] = base;
@@ -1629,9 +1784,9 @@
 // base pointer that is live across the Safepoint for oopmap building.  The
 // edge pairs get added in after sfpt->jvmtail()->oopoff(), but are in the
 // required edge set.
-bool PhaseChaitin::stretch_base_pointer_live_ranges( ResourceArea *a ) {
+bool PhaseChaitin::stretch_base_pointer_live_ranges(ResourceArea *a) {
   int must_recompute_live = false;
-  uint maxlrg = _maxlrg;
+  uint maxlrg = _lrg_map.max_lrg_id();
   Node **derived_base_map = (Node**)a->Amalloc(sizeof(Node*)*C->unique());
   memset( derived_base_map, 0, sizeof(Node*)*C->unique() );
 
@@ -1669,15 +1824,18 @@
       }
 
       // Get value being defined
-      uint lidx = n2lidx(n);
-      if( lidx && lidx < _maxlrg /* Ignore the occasional brand-new live range */) {
+      uint lidx = _lrg_map.live_range_id(n);
+      // Ignore the occasional brand-new live range
+      if (lidx && lidx < _lrg_map.max_lrg_id()) {
         // Remove from live-out set
         liveout.remove(lidx);
 
         // Copies do not define a new value and so do not interfere.
         // Remove the copies source from the liveout set before interfering.
         uint idx = n->is_Copy();
-        if( idx ) liveout.remove( n2lidx(n->in(idx)) );
+        if (idx) {
+          liveout.remove(_lrg_map.live_range_id(n->in(idx)));
+        }
       }
 
       // Found a safepoint?
@@ -1695,21 +1853,21 @@
                   derived->bottom_type()->make_ptr()->is_ptr()->_offset == 0, "sanity");
           // If its an OOP with a non-zero offset, then it is derived.
           if( tj && tj->_offset != 0 && tj->isa_oop_ptr() ) {
-            Node *base = find_base_for_derived( derived_base_map, derived, maxlrg );
-            assert( base->_idx < _names.Size(), "" );
+            Node *base = find_base_for_derived(derived_base_map, derived, maxlrg);
+            assert(base->_idx < _lrg_map.size(), "");
             // Add reaching DEFs of derived pointer and base pointer as a
             // pair of inputs
-            n->add_req( derived );
-            n->add_req( base );
+            n->add_req(derived);
+            n->add_req(base);
 
             // See if the base pointer is already live to this point.
             // Since I'm working on the SSA form, live-ness amounts to
             // reaching def's.  So if I find the base's live range then
             // I know the base's def reaches here.
-            if( (n2lidx(base) >= _maxlrg ||// (Brand new base (hence not live) or
-                 !liveout.member( n2lidx(base) ) ) && // not live) AND
-                 (n2lidx(base) > 0)                && // not a constant
-                 _cfg._bbs[base->_idx] != b ) {     //  base not def'd in blk)
+            if ((_lrg_map.live_range_id(base) >= _lrg_map.max_lrg_id() || // (Brand new base (hence not live) or
+                 !liveout.member(_lrg_map.live_range_id(base))) && // not live) AND
+                 (_lrg_map.live_range_id(base) > 0) && // not a constant
+                 _cfg._bbs[base->_idx] != b) { // base not def'd in blk)
               // Base pointer is not currently live.  Since I stretched
               // the base pointer to here and it crosses basic-block
               // boundaries, the global live info is now incorrect.
@@ -1721,11 +1879,12 @@
       } // End of if found a GC point
 
       // Make all inputs live
-      if( !n->is_Phi() ) {      // Phi function uses come from prior block
-        for( uint k = 1; k < n->req(); k++ ) {
-          uint lidx = n2lidx(n->in(k));
-          if( lidx < _maxlrg )
-            liveout.insert( lidx );
+      if (!n->is_Phi()) {      // Phi function uses come from prior block
+        for (uint k = 1; k < n->req(); k++) {
+          uint lidx = _lrg_map.live_range_id(n->in(k));
+          if (lidx < _lrg_map.max_lrg_id()) {
+            liveout.insert(lidx);
+          }
         }
       }
 
@@ -1733,11 +1892,12 @@
     liveout.clear();  // Free the memory used by liveout.
 
   } // End of forall blocks
-  _maxlrg = maxlrg;
+  _lrg_map.set_max_lrg_id(maxlrg);
 
   // If I created a new live range I need to recompute live
-  if( maxlrg != _ifg->_maxlrg )
+  if (maxlrg != _ifg->_maxlrg) {
     must_recompute_live = true;
+  }
 
   return must_recompute_live != 0;
 }
@@ -1745,16 +1905,17 @@
 
 //------------------------------add_reference----------------------------------
 // Extend the node to LRG mapping
-void PhaseChaitin::add_reference( const Node *node, const Node *old_node ) {
-  _names.extend( node->_idx, n2lidx(old_node) );
+
+void PhaseChaitin::add_reference(const Node *node, const Node *old_node) {
+  _lrg_map.extend(node->_idx, _lrg_map.live_range_id(old_node));
 }
 
 //------------------------------dump-------------------------------------------
 #ifndef PRODUCT
-void PhaseChaitin::dump( const Node *n ) const {
-  uint r = (n->_idx < _names.Size() ) ? Find_const(n) : 0;
+void PhaseChaitin::dump(const Node *n) const {
+  uint r = (n->_idx < _lrg_map.size()) ? _lrg_map.find_const(n) : 0;
   tty->print("L%d",r);
-  if( r && n->Opcode() != Op_Phi ) {
+  if (r && n->Opcode() != Op_Phi) {
     if( _node_regs ) {          // Got a post-allocation copy of allocation?
       tty->print("[");
       OptoReg::Name second = get_reg_second(n);
@@ -1775,11 +1936,13 @@
   tty->print("/N%d\t",n->_idx);
   tty->print("%s === ", n->Name());
   uint k;
-  for( k = 0; k < n->req(); k++) {
+  for (k = 0; k < n->req(); k++) {
     Node *m = n->in(k);
-    if( !m ) tty->print("_ ");
+    if (!m) {
+      tty->print("_ ");
+    }
     else {
-      uint r = (m->_idx < _names.Size() ) ? Find_const(m) : 0;
+      uint r = (m->_idx < _lrg_map.size()) ? _lrg_map.find_const(m) : 0;
       tty->print("L%d",r);
       // Data MultiNode's can have projections with no real registers.
       // Don't die while dumping them.
@@ -1810,8 +1973,10 @@
   if( k < n->len() && n->in(k) ) tty->print("| ");
   for( ; k < n->len(); k++ ) {
     Node *m = n->in(k);
-    if( !m ) break;
-    uint r = (m->_idx < _names.Size() ) ? Find_const(m) : 0;
+    if(!m) {
+      break;
+    }
+    uint r = (m->_idx < _lrg_map.size()) ? _lrg_map.find_const(m) : 0;
     tty->print("L%d",r);
     tty->print("/N%d ",m->_idx);
   }
@@ -1839,7 +2004,7 @@
     tty->print("{");
     uint i;
     while ((i = elements.next()) != 0) {
-      tty->print("L%d ", Find_const(i));
+      tty->print("L%d ", _lrg_map.find_const(i));
     }
     tty->print_cr("}");
   }
@@ -1863,10 +2028,14 @@
 
   // Dump LRG array
   tty->print("--- Live RanGe Array ---\n");
-  for(uint i2 = 1; i2 < _maxlrg; i2++ ) {
+  for (uint i2 = 1; i2 < _lrg_map.max_lrg_id(); i2++) {
     tty->print("L%d: ",i2);
-    if( i2 < _ifg->_maxlrg ) lrgs(i2).dump( );
-    else tty->print_cr("new LRG");
+    if (i2 < _ifg->_maxlrg) {
+      lrgs(i2).dump();
+    }
+    else {
+      tty->print_cr("new LRG");
+    }
   }
   tty->print_cr("");
 
@@ -1939,7 +2108,7 @@
     // Post allocation, use direct mappings, no LRG info available
     print_reg( get_reg_first(n), this, buf );
   } else {
-    uint lidx = Find_const(n); // Grab LRG number
+    uint lidx = _lrg_map.find_const(n); // Grab LRG number
     if( !_ifg ) {
       sprintf(buf,"L%d",lidx);  // No register binding yet
     } else if( !lidx ) {        // Special, not allocated value
@@ -1968,7 +2137,7 @@
   if( WizardMode && (PrintCompilation || PrintOpto) ) {
     // Display which live ranges need to be split and the allocator's state
     tty->print_cr("Graph-Coloring Iteration %d will split the following live ranges", _trip_cnt);
-    for( uint bidx = 1; bidx < _maxlrg; bidx++ ) {
+    for (uint bidx = 1; bidx < _lrg_map.max_lrg_id(); bidx++) {
       if( lrgs(bidx).alive() && lrgs(bidx).reg() >= LRG::SPILL_REG ) {
         tty->print("L%d: ", bidx);
         lrgs(bidx).dump();
@@ -2099,14 +2268,17 @@
 void PhaseChaitin::dump_lrg( uint lidx, bool defs_only ) const {
   tty->print_cr("---dump of L%d---",lidx);
 
-  if( _ifg ) {
-    if( lidx >= _maxlrg ) {
+  if (_ifg) {
+    if (lidx >= _lrg_map.max_lrg_id()) {
       tty->print("Attempt to print live range index beyond max live range.\n");
       return;
     }
     tty->print("L%d: ",lidx);
-    if( lidx < _ifg->_maxlrg ) lrgs(lidx).dump( );
-    else tty->print_cr("new LRG");
+    if (lidx < _ifg->_maxlrg) {
+      lrgs(lidx).dump();
+    } else {
+      tty->print_cr("new LRG");
+    }
   }
   if( _ifg && lidx < _ifg->_maxlrg) {
     tty->print("Neighbors: %d - ", _ifg->neighbor_cnt(lidx));
@@ -2121,8 +2293,8 @@
     // For all instructions
     for( uint j = 0; j < b->_nodes.size(); j++ ) {
       Node *n = b->_nodes[j];
-      if( Find_const(n) == lidx ) {
-        if( !dump_once++ ) {
+      if (_lrg_map.find_const(n) == lidx) {
+        if (!dump_once++) {
           tty->cr();
           b->dump_head( &_cfg._bbs );
         }
@@ -2133,11 +2305,13 @@
         uint cnt = n->req();
         for( uint k = 1; k < cnt; k++ ) {
           Node *m = n->in(k);
-          if (!m)  continue;  // be robust in the dumper
-          if( Find_const(m) == lidx ) {
-            if( !dump_once++ ) {
+          if (!m)  {
+            continue;  // be robust in the dumper
+          }
+          if (_lrg_map.find_const(m) == lidx) {
+            if (!dump_once++) {
               tty->cr();
-              b->dump_head( &_cfg._bbs );
+              b->dump_head(&_cfg._bbs);
             }
             dump(n);
           }
--- a/hotspot/src/share/vm/opto/chaitin.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/opto/chaitin.hpp	Wed May 08 11:22:25 2013 +0100
@@ -265,18 +265,118 @@
   int effective_degree( uint lidx ) const;
 };
 
-// TEMPORARILY REPLACED WITH COMMAND LINE FLAG
+// The LiveRangeMap class is responsible for storing node to live range id mapping.
+// Each node is mapped to a live range id (a virtual register). Nodes that are
+// not considered for register allocation are given live range id 0.
+class LiveRangeMap VALUE_OBJ_CLASS_SPEC {
+
+private:
+
+  uint _max_lrg_id;
+
+  // Union-find map.  Declared as a short for speed.
+  // Indexed by live-range number, it returns the compacted live-range number
+  LRG_List _uf_map;
+
+  // Map from Nodes to live ranges
+  LRG_List _names;
+
+  // Straight out of Tarjan's union-find algorithm
+  uint find_compress(const Node *node) {
+    uint lrg_id = find_compress(_names[node->_idx]);
+    _names.map(node->_idx, lrg_id);
+    return lrg_id;
+  }
+
+  uint find_compress(uint lrg);
+
+public:
+
+  const LRG_List& names() {
+    return _names;
+  }
+
+  uint max_lrg_id() const {
+    return _max_lrg_id;
+  }
+
+  void set_max_lrg_id(uint max_lrg_id) {
+    _max_lrg_id = max_lrg_id;
+  }
+
+  uint size() const {
+    return _names.Size();
+  }
+
+  uint live_range_id(uint idx) const {
+    return _names[idx];
+  }
+
+  uint live_range_id(const Node *node) const {
+    return _names[node->_idx];
+  }
+
+  uint uf_live_range_id(uint lrg_id) const {
+    return _uf_map[lrg_id];
+  }
 
-//// !!!!! Magic Constants need to move into ad file
-#ifdef SPARC
-//#define FLOAT_PRESSURE 30  /*     SFLT_REG_mask.Size() - 1 */
-//#define INT_PRESSURE   23  /* NOTEMP_I_REG_mask.Size() - 1 */
-#define FLOAT_INCREMENT(regs) regs
-#else
-//#define FLOAT_PRESSURE 6
-//#define INT_PRESSURE   6
-#define FLOAT_INCREMENT(regs) 1
-#endif
+  void map(uint idx, uint lrg_id) {
+    _names.map(idx, lrg_id);
+  }
+
+  void uf_map(uint dst_lrg_id, uint src_lrg_id) {
+    _uf_map.map(dst_lrg_id, src_lrg_id);
+  }
+
+  void extend(uint idx, uint lrg_id) {
+    _names.extend(idx, lrg_id);
+  }
+
+  void uf_extend(uint dst_lrg_id, uint src_lrg_id) {
+    _uf_map.extend(dst_lrg_id, src_lrg_id);
+  }
+
+  LiveRangeMap(uint unique)
+  : _names(unique)
+  , _uf_map(unique)
+  , _max_lrg_id(0) {}
+
+  uint find_id( const Node *n ) {
+    uint retval = live_range_id(n);
+    assert(retval == find(n),"Invalid node to lidx mapping");
+    return retval;
+  }
+
+  // Reset the Union-Find map to identity
+  void reset_uf_map(uint max_lrg_id);
+
+  // Make all Nodes map directly to their final live range; no need for
+  // the Union-Find mapping after this call.
+  void compress_uf_map_for_nodes();
+
+  uint find(uint lidx) {
+    uint uf_lidx = _uf_map[lidx];
+    return (uf_lidx == lidx) ? uf_lidx : find_compress(lidx);
+  }
+
+  // Convert a Node into a Live Range Index - a lidx
+  uint find(const Node *node) {
+    uint lidx = live_range_id(node);
+    uint uf_lidx = _uf_map[lidx];
+    return (uf_lidx == lidx) ? uf_lidx : find_compress(node);
+  }
+
+  // Like Find above, but no path compress, so bad asymptotic behavior
+  uint find_const(uint lrg) const;
+
+  // Like Find above, but no path compress, so bad asymptotic behavior
+  uint find_const(const Node *node) const {
+    if(node->_idx >= _names.Size()) {
+      return 0; // not mapped, usual for debug dump
+    }
+    return find_const(_names[node->_idx]);
+  }
+};
 
 //------------------------------Chaitin----------------------------------------
 // Briggs-Chaitin style allocation, mostly.
@@ -286,7 +386,6 @@
   int _trip_cnt;
   int _alternate;
 
-  uint _maxlrg;                 // Max live range number
   LRG &lrgs(uint idx) const { return _ifg->lrgs(idx); }
   PhaseLive *_live;             // Liveness, used in the interference graph
   PhaseIFG *_ifg;               // Interference graph (for original chunk)
@@ -294,16 +393,6 @@
   VectorSet _spilled_once;      // Nodes that have been spilled
   VectorSet _spilled_twice;     // Nodes that have been spilled twice
 
-  LRG_List _names;              // Map from Nodes to Live RanGes
-
-  // Union-find map.  Declared as a short for speed.
-  // Indexed by live-range number, it returns the compacted live-range number
-  LRG_List _uf_map;
-  // Reset the Union-Find map to identity
-  void reset_uf_map( uint maxlrg );
-  // Remove the need for the Union-Find mapping
-  void compress_uf_map_for_nodes( );
-
   // Combine the Live Range Indices for these 2 Nodes into a single live
   // range.  Future requests for any Node in either live range will
   // return the live range index for the combined live range.
@@ -322,7 +411,34 @@
   // Helper functions for Split()
   uint split_DEF( Node *def, Block *b, int loc, uint max, Node **Reachblock, Node **debug_defs, GrowableArray<uint> splits, int slidx );
   uint split_USE( Node *def, Block *b, Node *use, uint useidx, uint max, bool def_down, bool cisc_sp, GrowableArray<uint> splits, int slidx );
-  int clone_projs( Block *b, uint idx, Node *con, Node *copy, uint &maxlrg );
+
+  bool clone_projs(Block *b, uint idx, Node *con, Node *copy, LiveRangeMap &lrg_map) {
+    bool found_projs = clone_projs_shared(b, idx, con, copy, lrg_map.max_lrg_id());
+
+    if(found_projs) {
+      uint max_lrg_id = lrg_map.max_lrg_id();
+      lrg_map.set_max_lrg_id(max_lrg_id + 1);
+    }
+
+    return found_projs;
+  }
+
+  //------------------------------clone_projs------------------------------------
+  // After cloning some rematerialized instruction, clone any MachProj's that
+  // follow it.  Example: Intel zero is XOR, kills flags.  Sparc FP constants
+  // use G3 as an address temp.
+  bool clone_projs(Block *b, uint idx, Node *con, Node *copy, uint &max_lrg_id) {
+    bool found_projs = clone_projs_shared(b, idx, con, copy, max_lrg_id);
+
+    if(found_projs) {
+      max_lrg_id++;
+    }
+
+    return found_projs;
+  }
+
+  bool clone_projs_shared(Block *b, uint idx, Node *con, Node *copy, uint max_lrg_id);
+
   Node *split_Rematerialize(Node *def, Block *b, uint insidx, uint &maxlrg, GrowableArray<uint> splits,
                             int slidx, uint *lrg2reach, Node **Reachblock, bool walkThru);
   // True if lidx is used before any real register is def'd in the block
@@ -349,20 +465,11 @@
   PhaseChaitin( uint unique, PhaseCFG &cfg, Matcher &matcher );
   ~PhaseChaitin() {}
 
-  // Convert a Node into a Live Range Index - a lidx
-  uint Find( const Node *n ) {
-    uint lidx = n2lidx(n);
-    uint uf_lidx = _uf_map[lidx];
-    return (uf_lidx == lidx) ? uf_lidx : Find_compress(n);
-  }
-  uint Find_const( uint lrg ) const;
-  uint Find_const( const Node *n ) const;
+  LiveRangeMap _lrg_map;
 
   // Do all the real work of allocate
   void Register_Allocate();
 
-  uint n2lidx( const Node *n ) const { return _names[n->_idx]; }
-
   float high_frequency_lrg() const { return _high_frequency_lrg; }
 
 #ifndef PRODUCT
@@ -374,18 +481,6 @@
   // all inputs to a PhiNode, effectively coalescing live ranges.  Insert
   // copies as needed.
   void de_ssa();
-  uint Find_compress( const Node *n );
-  uint Find( uint lidx ) {
-    uint uf_lidx = _uf_map[lidx];
-    return (uf_lidx == lidx) ? uf_lidx : Find_compress(lidx);
-  }
-  uint Find_compress( uint lidx );
-
-  uint Find_id( const Node *n ) {
-    uint retval = n2lidx(n);
-    assert(retval == Find(n),"Invalid node to lidx mapping");
-    return retval;
-  }
 
   // Add edge between reg and everything in the vector.
   // Same as _ifg->add_vector(reg,live) EXCEPT use the RegMask
--- a/hotspot/src/share/vm/opto/coalesce.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/opto/coalesce.cpp	Wed May 08 11:22:25 2013 +0100
@@ -35,159 +35,11 @@
 #include "opto/regmask.hpp"
 
 //=============================================================================
-//------------------------------reset_uf_map-----------------------------------
-void PhaseChaitin::reset_uf_map( uint maxlrg ) {
-  _maxlrg = maxlrg;
-  // Force the Union-Find mapping to be at least this large
-  _uf_map.extend(_maxlrg,0);
-  // Initialize it to be the ID mapping.
-  for( uint i=0; i<_maxlrg; i++ )
-    _uf_map.map(i,i);
-}
-
-//------------------------------compress_uf_map--------------------------------
-// Make all Nodes map directly to their final live range; no need for
-// the Union-Find mapping after this call.
-void PhaseChaitin::compress_uf_map_for_nodes( ) {
-  // For all Nodes, compress mapping
-  uint unique = _names.Size();
-  for( uint i=0; i<unique; i++ ) {
-    uint lrg = _names[i];
-    uint compressed_lrg = Find(lrg);
-    if( lrg != compressed_lrg )
-      _names.map(i,compressed_lrg);
-  }
-}
-
-//------------------------------Find-------------------------------------------
-// Straight out of Tarjan's union-find algorithm
-uint PhaseChaitin::Find_compress( uint lrg ) {
-  uint cur = lrg;
-  uint next = _uf_map[cur];
-  while( next != cur ) {        // Scan chain of equivalences
-    assert( next < cur, "always union smaller" );
-    cur = next;                 // until find a fixed-point
-    next = _uf_map[cur];
-  }
-  // Core of union-find algorithm: update chain of
-  // equivalences to be equal to the root.
-  while( lrg != next ) {
-    uint tmp = _uf_map[lrg];
-    _uf_map.map(lrg, next);
-    lrg = tmp;
-  }
-  return lrg;
-}
-
-//------------------------------Find-------------------------------------------
-// Straight out of Tarjan's union-find algorithm
-uint PhaseChaitin::Find_compress( const Node *n ) {
-  uint lrg = Find_compress(_names[n->_idx]);
-  _names.map(n->_idx,lrg);
-  return lrg;
-}
-
-//------------------------------Find_const-------------------------------------
-// Like Find above, but no path compress, so bad asymptotic behavior
-uint PhaseChaitin::Find_const( uint lrg ) const {
-  if( !lrg ) return lrg;        // Ignore the zero LRG
-  // Off the end?  This happens during debugging dumps when you got
-  // brand new live ranges but have not told the allocator yet.
-  if( lrg >= _maxlrg ) return lrg;
-  uint next = _uf_map[lrg];
-  while( next != lrg ) {        // Scan chain of equivalences
-    assert( next < lrg, "always union smaller" );
-    lrg = next;                 // until find a fixed-point
-    next = _uf_map[lrg];
-  }
-  return next;
-}
-
-//------------------------------Find-------------------------------------------
-// Like Find above, but no path compress, so bad asymptotic behavior
-uint PhaseChaitin::Find_const( const Node *n ) const {
-  if( n->_idx >= _names.Size() ) return 0; // not mapped, usual for debug dump
-  return Find_const( _names[n->_idx] );
-}
-
-//------------------------------Union------------------------------------------
-// union 2 sets together.
-void PhaseChaitin::Union( const Node *src_n, const Node *dst_n ) {
-  uint src = Find(src_n);
-  uint dst = Find(dst_n);
-  assert( src, "" );
-  assert( dst, "" );
-  assert( src < _maxlrg, "oob" );
-  assert( dst < _maxlrg, "oob" );
-  assert( src < dst, "always union smaller" );
-  _uf_map.map(dst,src);
-}
-
-//------------------------------new_lrg----------------------------------------
-void PhaseChaitin::new_lrg( const Node *x, uint lrg ) {
-  // Make the Node->LRG mapping
-  _names.extend(x->_idx,lrg);
-  // Make the Union-Find mapping an identity function
-  _uf_map.extend(lrg,lrg);
-}
-
-//------------------------------clone_projs------------------------------------
-// After cloning some rematerialized instruction, clone any MachProj's that
-// follow it.  Example: Intel zero is XOR, kills flags.  Sparc FP constants
-// use G3 as an address temp.
-int PhaseChaitin::clone_projs( Block *b, uint idx, Node *con, Node *copy, uint &maxlrg ) {
-  Block *bcon = _cfg._bbs[con->_idx];
-  uint cindex = bcon->find_node(con);
-  Node *con_next = bcon->_nodes[cindex+1];
-  if( con_next->in(0) != con || !con_next->is_MachProj() )
-    return false;               // No MachProj's follow
-
-  // Copy kills after the cloned constant
-  Node *kills = con_next->clone();
-  kills->set_req( 0, copy );
-  b->_nodes.insert( idx, kills );
-  _cfg._bbs.map( kills->_idx, b );
-  new_lrg( kills, maxlrg++ );
-  return true;
-}
-
-//------------------------------compact----------------------------------------
-// Renumber the live ranges to compact them.  Makes the IFG smaller.
-void PhaseChaitin::compact() {
-  // Current the _uf_map contains a series of short chains which are headed
-  // by a self-cycle.  All the chains run from big numbers to little numbers.
-  // The Find() call chases the chains & shortens them for the next Find call.
-  // We are going to change this structure slightly.  Numbers above a moving
-  // wave 'i' are unchanged.  Numbers below 'j' point directly to their
-  // compacted live range with no further chaining.  There are no chains or
-  // cycles below 'i', so the Find call no longer works.
-  uint j=1;
-  uint i;
-  for( i=1; i < _maxlrg; i++ ) {
-    uint lr = _uf_map[i];
-    // Ignore unallocated live ranges
-    if( !lr ) continue;
-    assert( lr <= i, "" );
-    _uf_map.map(i, ( lr == i ) ? j++ : _uf_map[lr]);
-  }
-  if( false )                  // PrintOptoCompactLiveRanges
-    printf("Compacted %d LRs from %d\n",i-j,i);
-  // Now change the Node->LR mapping to reflect the compacted names
-  uint unique = _names.Size();
-  for( i=0; i<unique; i++ )
-    _names.map(i,_uf_map[_names[i]]);
-
-  // Reset the Union-Find mapping
-  reset_uf_map(j);
-
-}
-
-//=============================================================================
 //------------------------------Dump-------------------------------------------
 #ifndef PRODUCT
-void PhaseCoalesce::dump( Node *n ) const {
+void PhaseCoalesce::dump(Node *n) const {
   // Being a const function means I cannot use 'Find'
-  uint r = _phc.Find(n);
+  uint r = _phc._lrg_map.find(n);
   tty->print("L%d/N%d ",r,n->_idx);
 }
 
@@ -235,9 +87,9 @@
 
 //------------------------------combine_these_two------------------------------
 // Combine the live ranges def'd by these 2 Nodes.  N2 is an input to N1.
-void PhaseCoalesce::combine_these_two( Node *n1, Node *n2 ) {
-  uint lr1 = _phc.Find(n1);
-  uint lr2 = _phc.Find(n2);
+void PhaseCoalesce::combine_these_two(Node *n1, Node *n2) {
+  uint lr1 = _phc._lrg_map.find(n1);
+  uint lr2 = _phc._lrg_map.find(n2);
   if( lr1 != lr2 &&             // Different live ranges already AND
       !_phc._ifg->test_edge_sq( lr1, lr2 ) ) {  // Do not interfere
     LRG *lrg1 = &_phc.lrgs(lr1);
@@ -306,14 +158,18 @@
   // I am about to clobber the dst_name, so the copy must be inserted
   // after the last use.  Last use is really first-use on a backwards scan.
   uint i = b->end_idx()-1;
-  while( 1 ) {
+  while(1) {
     Node *n = b->_nodes[i];
     // Check for end of virtual copies; this is also the end of the
     // parallel renaming effort.
-    if( n->_idx < _unique ) break;
+    if (n->_idx < _unique) {
+      break;
+    }
     uint idx = n->is_Copy();
     assert( idx || n->is_Con() || n->is_MachProj(), "Only copies during parallel renaming" );
-    if( idx && _phc.Find(n->in(idx)) == dst_name ) break;
+    if (idx && _phc._lrg_map.find(n->in(idx)) == dst_name) {
+      break;
+    }
     i--;
   }
   uint last_use_idx = i;
@@ -324,24 +180,29 @@
   // There can be only 1 kill that exits any block and that is
   // the last kill.  Thus it is the first kill on a backwards scan.
   i = b->end_idx()-1;
-  while( 1 ) {
+  while (1) {
     Node *n = b->_nodes[i];
     // Check for end of virtual copies; this is also the end of the
     // parallel renaming effort.
-    if( n->_idx < _unique ) break;
+    if (n->_idx < _unique) {
+      break;
+    }
     assert( n->is_Copy() || n->is_Con() || n->is_MachProj(), "Only copies during parallel renaming" );
-    if( _phc.Find(n) == src_name ) {
+    if (_phc._lrg_map.find(n) == src_name) {
       kill_src_idx = i;
       break;
     }
     i--;
   }
   // Need a temp?  Last use of dst comes after the kill of src?
-  if( last_use_idx >= kill_src_idx ) {
+  if (last_use_idx >= kill_src_idx) {
     // Need to break a cycle with a temp
     uint idx = copy->is_Copy();
     Node *tmp = copy->clone();
-    _phc.new_lrg(tmp,_phc._maxlrg++);
+    uint max_lrg_id = _phc._lrg_map.max_lrg_id();
+    _phc.new_lrg(tmp, max_lrg_id);
+    _phc._lrg_map.set_max_lrg_id(max_lrg_id + 1);
+
     // Insert new temp between copy and source
     tmp ->set_req(idx,copy->in(idx));
     copy->set_req(idx,tmp);
@@ -359,14 +220,14 @@
 void PhaseAggressiveCoalesce::insert_copies( Matcher &matcher ) {
   // We do LRGs compressing and fix a liveout data only here since the other
   // place in Split() is guarded by the assert which we never hit.
-  _phc.compress_uf_map_for_nodes();
+  _phc._lrg_map.compress_uf_map_for_nodes();
   // Fix block's liveout data for compressed live ranges.
-  for(uint lrg = 1; lrg < _phc._maxlrg; lrg++ ) {
-    uint compressed_lrg = _phc.Find(lrg);
-    if( lrg != compressed_lrg ) {
-      for( uint bidx = 0; bidx < _phc._cfg._num_blocks; bidx++ ) {
+  for (uint lrg = 1; lrg < _phc._lrg_map.max_lrg_id(); lrg++) {
+    uint compressed_lrg = _phc._lrg_map.find(lrg);
+    if (lrg != compressed_lrg) {
+      for (uint bidx = 0; bidx < _phc._cfg._num_blocks; bidx++) {
         IndexSet *liveout = _phc._live->live(_phc._cfg._blocks[bidx]);
-        if( liveout->member(lrg) ) {
+        if (liveout->member(lrg)) {
           liveout->remove(lrg);
           liveout->insert(compressed_lrg);
         }
@@ -392,8 +253,9 @@
         uint cidx = copy->is_Copy();
         if( cidx ) {
           Node *def = copy->in(cidx);
-          if( _phc.Find(copy) == _phc.Find(def) )
-            n->set_req(k,def);
+          if (_phc._lrg_map.find(copy) == _phc._lrg_map.find(def)) {
+            n->set_req(k, def);
+          }
         }
       }
 
@@ -401,7 +263,7 @@
       uint cidx = n->is_Copy();
       if( cidx ) {
         Node *def = n->in(cidx);
-        if( _phc.Find(n) == _phc.Find(def) ) {
+        if (_phc._lrg_map.find(n) == _phc._lrg_map.find(def)) {
           n->replace_by(def);
           n->set_req(cidx,NULL);
           b->_nodes.remove(l);
@@ -410,16 +272,18 @@
         }
       }
 
-      if( n->is_Phi() ) {
+      if (n->is_Phi()) {
         // Get the chosen name for the Phi
-        uint phi_name = _phc.Find( n );
+        uint phi_name = _phc._lrg_map.find(n);
         // Ignore the pre-allocated specials
-        if( !phi_name ) continue;
+        if (!phi_name) {
+          continue;
+        }
         // Check for mismatch inputs to Phi
-        for( uint j = 1; j<cnt; j++ ) {
+        for (uint j = 1; j < cnt; j++) {
           Node *m = n->in(j);
-          uint src_name = _phc.Find(m);
-          if( src_name != phi_name ) {
+          uint src_name = _phc._lrg_map.find(m);
+          if (src_name != phi_name) {
             Block *pred = _phc._cfg._bbs[b->pred(j)->_idx];
             Node *copy;
             assert(!m->is_Con() || m->is_Mach(), "all Con must be Mach");
@@ -430,18 +294,18 @@
               // Insert the copy in the predecessor basic block
               pred->add_inst(copy);
               // Copy any flags as well
-              _phc.clone_projs( pred, pred->end_idx(), m, copy, _phc._maxlrg );
+              _phc.clone_projs(pred, pred->end_idx(), m, copy, _phc._lrg_map);
             } else {
               const RegMask *rm = C->matcher()->idealreg2spillmask[m->ideal_reg()];
-              copy = new (C) MachSpillCopyNode(m,*rm,*rm);
+              copy = new (C) MachSpillCopyNode(m, *rm, *rm);
               // Find a good place to insert.  Kinda tricky, use a subroutine
               insert_copy_with_overlap(pred,copy,phi_name,src_name);
             }
             // Insert the copy in the use-def chain
-            n->set_req( j, copy );
+            n->set_req(j, copy);
             _phc._cfg._bbs.map( copy->_idx, pred );
             // Extend ("register allocate") the names array for the copy.
-            _phc._names.extend( copy->_idx, phi_name );
+            _phc._lrg_map.extend(copy->_idx, phi_name);
           } // End of if Phi names do not match
         } // End of for all inputs to Phi
       } else { // End of if Phi
@@ -450,39 +314,40 @@
         uint idx;
         if( n->is_Mach() && (idx=n->as_Mach()->two_adr()) ) {
           // Get the chosen name for the Node
-          uint name = _phc.Find( n );
-          assert( name, "no 2-address specials" );
+          uint name = _phc._lrg_map.find(n);
+          assert (name, "no 2-address specials");
           // Check for name mis-match on the 2-address input
           Node *m = n->in(idx);
-          if( _phc.Find(m) != name ) {
+          if (_phc._lrg_map.find(m) != name) {
             Node *copy;
             assert(!m->is_Con() || m->is_Mach(), "all Con must be Mach");
             // At this point it is unsafe to extend live ranges (6550579).
             // Rematerialize only constants as we do for Phi above.
-            if( m->is_Mach() && m->as_Mach()->is_Con() &&
-                m->as_Mach()->rematerialize() ) {
+            if(m->is_Mach() && m->as_Mach()->is_Con() &&
+               m->as_Mach()->rematerialize()) {
               copy = m->clone();
               // Insert the copy in the basic block, just before us
-              b->_nodes.insert( l++, copy );
-              if( _phc.clone_projs( b, l, m, copy, _phc._maxlrg ) )
+              b->_nodes.insert(l++, copy);
+              if(_phc.clone_projs(b, l, m, copy, _phc._lrg_map)) {
                 l++;
+              }
             } else {
               const RegMask *rm = C->matcher()->idealreg2spillmask[m->ideal_reg()];
-              copy = new (C) MachSpillCopyNode( m, *rm, *rm );
+              copy = new (C) MachSpillCopyNode(m, *rm, *rm);
               // Insert the copy in the basic block, just before us
-              b->_nodes.insert( l++, copy );
+              b->_nodes.insert(l++, copy);
             }
             // Insert the copy in the use-def chain
-            n->set_req(idx, copy );
+            n->set_req(idx, copy);
             // Extend ("register allocate") the names array for the copy.
-            _phc._names.extend( copy->_idx, name );
+            _phc._lrg_map.extend(copy->_idx, name);
             _phc._cfg._bbs.map( copy->_idx, b );
           }
 
         } // End of is two-adr
 
         // Insert a copy at a debug use for a lrg which has high frequency
-        if( b->_freq < OPTO_DEBUG_SPLIT_FREQ || b->is_uncommon(_phc._cfg._bbs) ) {
+        if (b->_freq < OPTO_DEBUG_SPLIT_FREQ || b->is_uncommon(_phc._cfg._bbs)) {
           // Walk the debug inputs to the node and check for lrg freq
           JVMState* jvms = n->jvms();
           uint debug_start = jvms ? jvms->debug_start() : 999999;
@@ -490,9 +355,11 @@
           for(uint inpidx = debug_start; inpidx < debug_end; inpidx++) {
             // Do not split monitors; they are only needed for debug table
             // entries and need no code.
-            if( jvms->is_monitor_use(inpidx) ) continue;
+            if (jvms->is_monitor_use(inpidx)) {
+              continue;
+            }
             Node *inp = n->in(inpidx);
-            uint nidx = _phc.n2lidx(inp);
+            uint nidx = _phc._lrg_map.live_range_id(inp);
             LRG &lrg = lrgs(nidx);
 
             // If this lrg has a high frequency use/def
@@ -519,8 +386,10 @@
               // Insert the copy in the basic block, just before us
               b->_nodes.insert( l++, copy );
               // Extend ("register allocate") the names array for the copy.
-              _phc.new_lrg( copy, _phc._maxlrg++ );
-              _phc._cfg._bbs.map( copy->_idx, b );
+              uint max_lrg_id = _phc._lrg_map.max_lrg_id();
+              _phc.new_lrg(copy, max_lrg_id);
+              _phc._lrg_map.set_max_lrg_id(max_lrg_id + 1);
+              _phc._cfg._bbs.map(copy->_idx, b);
               //tty->print_cr("Split a debug use in Aggressive Coalesce");
             }  // End of if high frequency use/def
           }  // End of for all debug inputs
@@ -583,17 +452,17 @@
     uint idx;
     // 2-address instructions have a virtual Copy matching their input
     // to their output
-    if( n->is_Mach() && (idx = n->as_Mach()->two_adr()) ) {
+    if (n->is_Mach() && (idx = n->as_Mach()->two_adr())) {
       MachNode *mach = n->as_Mach();
-      combine_these_two( mach, mach->in(idx) );
+      combine_these_two(mach, mach->in(idx));
     }
   } // End of for all instructions in block
 }
 
 //=============================================================================
 //------------------------------PhaseConservativeCoalesce----------------------
-PhaseConservativeCoalesce::PhaseConservativeCoalesce( PhaseChaitin &chaitin ) : PhaseCoalesce(chaitin) {
-  _ulr.initialize(_phc._maxlrg);
+PhaseConservativeCoalesce::PhaseConservativeCoalesce(PhaseChaitin &chaitin) : PhaseCoalesce(chaitin) {
+  _ulr.initialize(_phc._lrg_map.max_lrg_id());
 }
 
 //------------------------------verify-----------------------------------------
@@ -673,10 +542,14 @@
       // Else work back one in copy chain
       prev_copy = prev_copy->in(prev_copy->is_Copy());
     } else {                    // Else collect interferences
-      uint lidx = _phc.Find(x);
+      uint lidx = _phc._lrg_map.find(x);
       // Found another def of live-range being stretched?
-      if( lidx == lr1 ) return max_juint;
-      if( lidx == lr2 ) return max_juint;
+      if(lidx == lr1) {
+        return max_juint;
+      }
+      if(lidx == lr2) {
+        return max_juint;
+      }
 
       // If we attempt to coalesce across a bound def
       if( lrgs(lidx).is_bound() ) {
@@ -751,33 +624,43 @@
 // See if I can coalesce a series of multiple copies together.  I need the
 // final dest copy and the original src copy.  They can be the same Node.
 // Compute the compatible register masks.
-bool PhaseConservativeCoalesce::copy_copy( Node *dst_copy, Node *src_copy, Block *b, uint bindex ) {
+bool PhaseConservativeCoalesce::copy_copy(Node *dst_copy, Node *src_copy, Block *b, uint bindex) {
 
-  if( !dst_copy->is_SpillCopy() ) return false;
-  if( !src_copy->is_SpillCopy() ) return false;
+  if (!dst_copy->is_SpillCopy()) {
+    return false;
+  }
+  if (!src_copy->is_SpillCopy()) {
+    return false;
+  }
   Node *src_def = src_copy->in(src_copy->is_Copy());
-  uint lr1 = _phc.Find(dst_copy);
-  uint lr2 = _phc.Find(src_def );
+  uint lr1 = _phc._lrg_map.find(dst_copy);
+  uint lr2 = _phc._lrg_map.find(src_def);
 
   // Same live ranges already?
-  if( lr1 == lr2 ) return false;
+  if (lr1 == lr2) {
+    return false;
+  }
 
   // Interfere?
-  if( _phc._ifg->test_edge_sq( lr1, lr2 ) ) return false;
+  if (_phc._ifg->test_edge_sq(lr1, lr2)) {
+    return false;
+  }
 
   // Not an oop->int cast; oop->oop, int->int, AND int->oop are OK.
-  if( !lrgs(lr1)._is_oop && lrgs(lr2)._is_oop ) // not an oop->int cast
+  if (!lrgs(lr1)._is_oop && lrgs(lr2)._is_oop) { // not an oop->int cast
     return false;
+  }
 
   // Coalescing between an aligned live range and a mis-aligned live range?
   // No, no!  Alignment changes how we count degree.
-  if( lrgs(lr1)._fat_proj != lrgs(lr2)._fat_proj )
+  if (lrgs(lr1)._fat_proj != lrgs(lr2)._fat_proj) {
     return false;
+  }
 
   // Sort; use smaller live-range number
   Node *lr1_node = dst_copy;
   Node *lr2_node = src_def;
-  if( lr1 > lr2 ) {
+  if (lr1 > lr2) {
     uint tmp = lr1; lr1 = lr2; lr2 = tmp;
     lr1_node = src_def;  lr2_node = dst_copy;
   }
@@ -916,17 +799,5 @@
       PhaseChaitin::_conserv_coalesce++;  // Collect stats on success
       continue;
     }
-
-    /* do not attempt pairs.  About 1/2 of all pairs can be removed by
-       post-alloc.  The other set are too few to bother.
-    Node *copy2 = copy1->in(idx1);
-    uint idx2 = copy2->is_Copy();
-    if( !idx2 ) continue;
-    if( copy_copy(copy1,copy2,b,i) ) {
-      i--;                      // Retry, same location in block
-      PhaseChaitin::_conserv_coalesce_pair++; // Collect stats on success
-      continue;
-    }
-    */
   }
 }
--- a/hotspot/src/share/vm/opto/coalesce.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/opto/coalesce.hpp	Wed May 08 11:22:25 2013 +0100
@@ -41,23 +41,25 @@
 
 public:
   // Coalesce copies
-  PhaseCoalesce( PhaseChaitin &chaitin ) : Phase(Coalesce), _phc(chaitin) { }
+  PhaseCoalesce(PhaseChaitin &phc)
+  : Phase(Coalesce)
+  , _phc(phc) {}
 
   virtual void verify() = 0;
 
   // Coalesce copies
-  void coalesce_driver( );
+  void coalesce_driver();
 
   // Coalesce copies in this block
-  virtual void coalesce( Block *b ) = 0;
+  virtual void coalesce(Block *b) = 0;
 
   // Attempt to coalesce live ranges defined by these 2
-  void combine_these_two( Node *n1, Node *n2 );
+  void combine_these_two(Node *n1, Node *n2);
 
-  LRG &lrgs( uint lidx ) { return _phc.lrgs(lidx); }
+  LRG &lrgs(uint lidx) { return _phc.lrgs(lidx); }
 #ifndef PRODUCT
   // Dump internally name
-  void dump( Node *n ) const;
+  void dump(Node *n) const;
   // Dump whole shebang
   void dump() const;
 #endif
--- a/hotspot/src/share/vm/opto/compile.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/opto/compile.cpp	Wed May 08 11:22:25 2013 +0100
@@ -2127,22 +2127,19 @@
   }
   NOT_PRODUCT( verify_graph_edges(); )
 
-  PhaseChaitin regalloc(unique(),cfg,m);
+  PhaseChaitin regalloc(unique(), cfg, m);
   _regalloc = &regalloc;
   {
     TracePhase t2("regalloc", &_t_registerAllocation, true);
-    // Perform any platform dependent preallocation actions.  This is used,
-    // for example, to avoid taking an implicit null pointer exception
-    // using the frame pointer on win95.
-    _regalloc->pd_preallocate_hook();
-
     // Perform register allocation.  After Chaitin, use-def chains are
     // no longer accurate (at spill code) and so must be ignored.
     // Node->LRG->reg mappings are still accurate.
     _regalloc->Register_Allocate();
 
     // Bail out if the allocator builds too many nodes
-    if (failing())  return;
+    if (failing()) {
+      return;
+    }
   }
 
   // Prior to register allocation we kept empty basic blocks in case the
@@ -2160,9 +2157,6 @@
     cfg.fixup_flow();
   }
 
-  // Perform any platform dependent postallocation verifications.
-  debug_only( _regalloc->pd_postallocate_verify_hook(); )
-
   // Apply peephole optimizations
   if( OptoPeephole ) {
     NOT_PRODUCT( TracePhase t2("peephole", &_t_peephole, TimeCompiler); )
--- a/hotspot/src/share/vm/opto/idealGraphPrinter.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/opto/idealGraphPrinter.cpp	Wed May 08 11:22:25 2013 +0100
@@ -616,7 +616,7 @@
       buffer[0] = 0;
       _chaitin->dump_register(node, buffer);
       print_prop("reg", buffer);
-      print_prop("lrg", _chaitin->n2lidx(node));
+      print_prop("lrg", _chaitin->_lrg_map.live_range_id(node));
     }
 
     node->_in_dump_cnt--;
--- a/hotspot/src/share/vm/opto/ifg.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/opto/ifg.cpp	Wed May 08 11:22:25 2013 +0100
@@ -286,15 +286,14 @@
     uint idx;
     uint last = 0;
     while ((idx = elements.next()) != 0) {
-      assert( idx != i, "Must have empty diagonal");
-      assert( pc->Find_const(idx) == idx, "Must not need Find" );
-      assert( _adjs[idx].member(i), "IFG not square" );
-      assert( !(*_yanked)[idx], "No yanked neighbors" );
-      assert( last < idx, "not sorted increasing");
+      assert(idx != i, "Must have empty diagonal");
+      assert(pc->_lrg_map.find_const(idx) == idx, "Must not need Find");
+      assert(_adjs[idx].member(i), "IFG not square");
+      assert(!(*_yanked)[idx], "No yanked neighbors");
+      assert(last < idx, "not sorted increasing");
       last = idx;
     }
-    assert( !lrgs(i)._degree_valid ||
-            effective_degree(i) == lrgs(i).degree(), "degree is valid but wrong" );
+    assert(!lrgs(i)._degree_valid || effective_degree(i) == lrgs(i).degree(), "degree is valid but wrong");
   }
 }
 #endif
@@ -342,10 +341,10 @@
       Node *n = b->_nodes[j-1];
 
       // Get value being defined
-      uint r = n2lidx(n);
+      uint r = _lrg_map.live_range_id(n);
 
       // Some special values do not allocate
-      if( r ) {
+      if (r) {
 
         // Remove from live-out set
         liveout->remove(r);
@@ -353,16 +352,19 @@
         // Copies do not define a new value and so do not interfere.
         // Remove the copies source from the liveout set before interfering.
         uint idx = n->is_Copy();
-        if( idx ) liveout->remove( n2lidx(n->in(idx)) );
+        if (idx) {
+          liveout->remove(_lrg_map.live_range_id(n->in(idx)));
+        }
 
         // Interfere with everything live
-        interfere_with_live( r, liveout );
+        interfere_with_live(r, liveout);
       }
 
       // Make all inputs live
-      if( !n->is_Phi() ) {      // Phi function uses come from prior block
-        for( uint k = 1; k < n->req(); k++ )
-          liveout->insert( n2lidx(n->in(k)) );
+      if (!n->is_Phi()) {      // Phi function uses come from prior block
+        for(uint k = 1; k < n->req(); k++) {
+          liveout->insert(_lrg_map.live_range_id(n->in(k)));
+        }
       }
 
       // 2-address instructions always have the defined value live
@@ -394,11 +396,12 @@
           n->set_req( 2, tmp );
         }
         // Defined value interferes with all inputs
-        uint lidx = n2lidx(n->in(idx));
-        for( uint k = 1; k < n->req(); k++ ) {
-          uint kidx = n2lidx(n->in(k));
-          if( kidx != lidx )
-            _ifg->add_edge( r, kidx );
+        uint lidx = _lrg_map.live_range_id(n->in(idx));
+        for (uint k = 1; k < n->req(); k++) {
+          uint kidx = _lrg_map.live_range_id(n->in(k));
+          if (kidx != lidx) {
+            _ifg->add_edge(r, kidx);
+          }
         }
       }
     } // End of forall instructions in block
@@ -542,10 +545,10 @@
       Node *n = b->_nodes[j - 1];
 
       // Get value being defined
-      uint r = n2lidx(n);
+      uint r = _lrg_map.live_range_id(n);
 
       // Some special values do not allocate
-      if( r ) {
+      if(r) {
         // A DEF normally costs block frequency; rematerialized values are
         // removed from the DEF sight, so LOWER costs here.
         lrgs(r)._cost += n->rematerialize() ? 0 : b->_freq;
@@ -556,9 +559,11 @@
           Node *def = n->in(0);
           if( !n->is_Proj() ||
               // Could also be a flags-projection of a dead ADD or such.
-              (n2lidx(def) && !liveout.member(n2lidx(def)) ) ) {
+              (_lrg_map.live_range_id(def) && !liveout.member(_lrg_map.live_range_id(def)))) {
             b->_nodes.remove(j - 1);
-            if( lrgs(r)._def == n ) lrgs(r)._def = 0;
+            if (lrgs(r)._def == n) {
+              lrgs(r)._def = 0;
+            }
             n->disconnect_inputs(NULL, C);
             _cfg._bbs.map(n->_idx,NULL);
             n->replace_by(C->top());
@@ -570,7 +575,7 @@
 
           // Fat-projections kill many registers which cannot be used to
           // hold live ranges.
-          if( lrgs(r)._fat_proj ) {
+          if (lrgs(r)._fat_proj) {
             // Count the int-only registers
             RegMask itmp = lrgs(r).mask();
             itmp.AND(*Matcher::idealreg2regmask[Op_RegI]);
@@ -636,12 +641,12 @@
           // Copies do not define a new value and so do not interfere.
           // Remove the copies source from the liveout set before interfering.
           uint idx = n->is_Copy();
-          if( idx ) {
-            uint x = n2lidx(n->in(idx));
-            if( liveout.remove( x ) ) {
+          if (idx) {
+            uint x = _lrg_map.live_range_id(n->in(idx));
+            if (liveout.remove(x)) {
               lrgs(x)._area -= cost;
               // Adjust register pressure.
-              lower_pressure( &lrgs(x), j-1, b, pressure, hrp_index );
+              lower_pressure(&lrgs(x), j-1, b, pressure, hrp_index);
               assert( pressure[0] == count_int_pressure  (&liveout), "" );
               assert( pressure[1] == count_float_pressure(&liveout), "" );
             }
@@ -727,18 +732,21 @@
         // the flags and assumes it's dead.  This keeps the (useless)
         // flag-setting behavior alive while also keeping the (useful)
         // memory update effect.
-        for( uint k = ((n->Opcode() == Op_SCMemProj) ? 0:1); k < n->req(); k++ ) {
+        for (uint k = ((n->Opcode() == Op_SCMemProj) ? 0:1); k < n->req(); k++) {
           Node *def = n->in(k);
-          uint x = n2lidx(def);
-          if( !x ) continue;
+          uint x = _lrg_map.live_range_id(def);
+          if (!x) {
+            continue;
+          }
           LRG &lrg = lrgs(x);
           // No use-side cost for spilling debug info
-          if( k < debug_start )
+          if (k < debug_start) {
             // A USE costs twice block frequency (once for the Load, once
             // for a Load-delay).  Rematerialized uses only cost once.
             lrg._cost += (def->rematerialize() ? b->_freq : (b->_freq + b->_freq));
+          }
           // It is live now
-          if( liveout.insert( x ) ) {
+          if (liveout.insert(x)) {
             // Newly live things assumed live from here to top of block
             lrg._area += cost;
             // Adjust register pressure
--- a/hotspot/src/share/vm/opto/live.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/opto/live.cpp	Wed May 08 11:22:25 2013 +0100
@@ -44,7 +44,7 @@
 // block is put on the worklist.
 //   The locally live-in stuff is computed once and added to predecessor
 // live-out sets.  This separate compilation is done in the outer loop below.
-PhaseLive::PhaseLive( const PhaseCFG &cfg, LRG_List &names, Arena *arena ) : Phase(LIVE), _cfg(cfg), _names(names), _arena(arena), _live(0) {
+PhaseLive::PhaseLive( const PhaseCFG &cfg, const LRG_List &names, Arena *arena ) : Phase(LIVE), _cfg(cfg), _names(names), _arena(arena), _live(0) {
 }
 
 void PhaseLive::compute(uint maxlrg) {
--- a/hotspot/src/share/vm/opto/live.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/opto/live.hpp	Wed May 08 11:22:25 2013 +0100
@@ -80,7 +80,7 @@
   Block_List *_worklist;        // Worklist for iterative solution
 
   const PhaseCFG &_cfg;         // Basic blocks
-  LRG_List &_names;             // Mapping from Nodes to live ranges
+  const LRG_List &_names;       // Mapping from Nodes to live ranges
   uint _maxlrg;                 // Largest live-range number
   Arena *_arena;
 
@@ -91,7 +91,7 @@
   void add_liveout( Block *p, IndexSet *lo, VectorSet &first_pass );
 
 public:
-  PhaseLive( const PhaseCFG &cfg, LRG_List &names, Arena *arena );
+  PhaseLive(const PhaseCFG &cfg, const LRG_List &names, Arena *arena);
   ~PhaseLive() {}
   // Compute liveness info
   void compute(uint maxlrg);
--- a/hotspot/src/share/vm/opto/output.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/opto/output.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1044,21 +1044,6 @@
   debug_info->end_non_safepoint(pc_offset);
 }
 
-
-
-// helper for fill_buffer bailout logic
-static void turn_off_compiler(Compile* C) {
-  if (CodeCache::largest_free_block() >= CodeCacheMinimumFreeSpace*10) {
-    // Do not turn off compilation if a single giant method has
-    // blown the code cache size.
-    C->record_failure("excessive request to CodeCache");
-  } else {
-    // Let CompilerBroker disable further compilations.
-    C->record_failure("CodeCache is full");
-  }
-}
-
-
 //------------------------------init_buffer------------------------------------
 CodeBuffer* Compile::init_buffer(uint* blk_starts) {
 
@@ -1158,7 +1143,7 @@
 
   // Have we run out of code space?
   if ((cb->blob() == NULL) || (!CompileBroker::should_compile_new_jobs())) {
-    turn_off_compiler(this);
+    C->record_failure("CodeCache is full");
     return NULL;
   }
   // Configure the code buffer.
@@ -1476,7 +1461,7 @@
       // Verify that there is sufficient space remaining
       cb->insts()->maybe_expand_to_ensure_remaining(MAX_inst_size);
       if ((cb->blob() == NULL) || (!CompileBroker::should_compile_new_jobs())) {
-        turn_off_compiler(this);
+        C->record_failure("CodeCache is full");
         return;
       }
 
@@ -1633,7 +1618,7 @@
 
   // One last check for failed CodeBuffer::expand:
   if ((cb->blob() == NULL) || (!CompileBroker::should_compile_new_jobs())) {
-    turn_off_compiler(this);
+    C->record_failure("CodeCache is full");
     return;
   }
 
--- a/hotspot/src/share/vm/opto/parseHelper.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/opto/parseHelper.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -337,19 +337,21 @@
   if (!count_invocations()) return;
 
   // Get the Method* node.
-  const TypePtr* adr_type = TypeMetadataPtr::make(method());
-  Node *method_node = makecon(adr_type);
+  ciMethod* m = method();
+  address counters_adr = m->ensure_method_counters();
 
-  // Load the interpreter_invocation_counter from the Method*.
-  int offset = Method::interpreter_invocation_counter_offset_in_bytes();
-  Node* adr_node = basic_plus_adr(method_node, method_node, offset);
-  Node* cnt = make_load(NULL, adr_node, TypeInt::INT, T_INT, adr_type);
+  Node* ctrl = control();
+  const TypePtr* adr_type = TypeRawPtr::make(counters_adr);
+  Node *counters_node = makecon(adr_type);
+  Node* adr_iic_node = basic_plus_adr(counters_node, counters_node,
+    MethodCounters::interpreter_invocation_counter_offset_in_bytes());
+  Node* cnt = make_load(ctrl, adr_iic_node, TypeInt::INT, T_INT, adr_type);
 
   test_counter_against_threshold(cnt, limit);
 
   // Add one to the counter and store
   Node* incr = _gvn.transform(new (C) AddINode(cnt, _gvn.intcon(1)));
-  store_to_memory( NULL, adr_node, incr, T_INT, adr_type );
+  store_to_memory( ctrl, adr_iic_node, incr, T_INT, adr_type );
 }
 
 //----------------------------method_data_addressing---------------------------
--- a/hotspot/src/share/vm/opto/postaloc.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/opto/postaloc.cpp	Wed May 08 11:22:25 2013 +0100
@@ -56,7 +56,7 @@
   int i;
   for( i=0; i < limit; i++ ) {
     if( def->is_Proj() && def->in(0)->is_Start() &&
-        _matcher.is_save_on_entry(lrgs(n2lidx(def)).reg()) )
+        _matcher.is_save_on_entry(lrgs(_lrg_map.live_range_id(def)).reg()))
       return true;              // Direct use of callee-save proj
     if( def->is_Copy() )        // Copies carry value through
       def = def->in(def->is_Copy());
@@ -83,7 +83,7 @@
   // Count 1 if deleting an instruction from the current block
   if( oldb == current_block ) blk_adjust++;
   _cfg._bbs.map(old->_idx,NULL);
-  OptoReg::Name old_reg = lrgs(n2lidx(old)).reg();
+  OptoReg::Name old_reg = lrgs(_lrg_map.live_range_id(old)).reg();
   if( regnd && (*regnd)[old_reg]==old ) { // Instruction is currently available?
     value->map(old_reg,NULL);  // Yank from value/regnd maps
     regnd->map(old_reg,NULL);  // This register's value is now unknown
@@ -164,7 +164,7 @@
   // Not every pair of physical registers are assignment compatible,
   // e.g. on sparc floating point registers are not assignable to integer
   // registers.
-  const LRG &def_lrg = lrgs(n2lidx(def));
+  const LRG &def_lrg = lrgs(_lrg_map.live_range_id(def));
   OptoReg::Name def_reg = def_lrg.reg();
   const RegMask &use_mask = n->in_RegMask(idx);
   bool can_use = ( RegMask::can_represent(def_reg) ? (use_mask.Member(def_reg) != 0)
@@ -209,11 +209,12 @@
 // Skip through any number of copies (that don't mod oop-i-ness)
 Node *PhaseChaitin::skip_copies( Node *c ) {
   int idx = c->is_Copy();
-  uint is_oop = lrgs(n2lidx(c))._is_oop;
+  uint is_oop = lrgs(_lrg_map.live_range_id(c))._is_oop;
   while (idx != 0) {
     guarantee(c->in(idx) != NULL, "must not resurrect dead copy");
-    if (lrgs(n2lidx(c->in(idx)))._is_oop != is_oop)
+    if (lrgs(_lrg_map.live_range_id(c->in(idx)))._is_oop != is_oop) {
       break;  // casting copy, not the same value
+    }
     c = c->in(idx);
     idx = c->is_Copy();
   }
@@ -225,8 +226,8 @@
 int PhaseChaitin::elide_copy( Node *n, int k, Block *current_block, Node_List &value, Node_List &regnd, bool can_change_regs ) {
   int blk_adjust = 0;
 
-  uint nk_idx = n2lidx(n->in(k));
-  OptoReg::Name nk_reg = lrgs(nk_idx ).reg();
+  uint nk_idx = _lrg_map.live_range_id(n->in(k));
+  OptoReg::Name nk_reg = lrgs(nk_idx).reg();
 
   // Remove obvious same-register copies
   Node *x = n->in(k);
@@ -234,9 +235,13 @@
   while( (idx=x->is_Copy()) != 0 ) {
     Node *copy = x->in(idx);
     guarantee(copy != NULL, "must not resurrect dead copy");
-    if( lrgs(n2lidx(copy)).reg() != nk_reg ) break;
+    if(lrgs(_lrg_map.live_range_id(copy)).reg() != nk_reg) {
+      break;
+    }
     blk_adjust += use_prior_register(n,k,copy,current_block,value,regnd);
-    if( n->in(k) != copy ) break; // Failed for some cutout?
+    if (n->in(k) != copy) {
+      break; // Failed for some cutout?
+    }
     x = copy;                   // Progress, try again
   }
 
@@ -256,7 +261,7 @@
 
   if (val == x && nk_idx != 0 &&
       regnd[nk_reg] != NULL && regnd[nk_reg] != x &&
-      n2lidx(x) == n2lidx(regnd[nk_reg])) {
+      _lrg_map.live_range_id(x) == _lrg_map.live_range_id(regnd[nk_reg])) {
     // When rematerialzing nodes and stretching lifetimes, the
     // allocator will reuse the original def for multidef LRG instead
     // of the current reaching def because it can't know it's safe to
@@ -270,7 +275,7 @@
   if (val == x) return blk_adjust; // No progress?
 
   int n_regs = RegMask::num_registers(val->ideal_reg());
-  uint val_idx = n2lidx(val);
+  uint val_idx = _lrg_map.live_range_id(val);
   OptoReg::Name val_reg = lrgs(val_idx).reg();
 
   // See if it happens to already be in the correct register!
@@ -499,12 +504,12 @@
     for( j = 1; j < phi_dex; j++ ) {
       uint k;
       Node *phi = b->_nodes[j];
-      uint pidx = n2lidx(phi);
-      OptoReg::Name preg = lrgs(n2lidx(phi)).reg();
+      uint pidx = _lrg_map.live_range_id(phi);
+      OptoReg::Name preg = lrgs(_lrg_map.live_range_id(phi)).reg();
 
       // Remove copies remaining on edges.  Check for junk phi.
       Node *u = NULL;
-      for( k=1; k<phi->req(); k++ ) {
+      for (k = 1; k < phi->req(); k++) {
         Node *x = phi->in(k);
         if( phi != x && u != x ) // Found a different input
           u = u ? NodeSentinel : x; // Capture unique input, or NodeSentinel for 2nd input
@@ -555,10 +560,10 @@
       // alive and well at the use (or else the allocator fubar'd).  Take
       // advantage of this info to set a reaching def for the use-reg.
       uint k;
-      for( k = 1; k < n->req(); k++ ) {
+      for (k = 1; k < n->req(); k++) {
         Node *def = n->in(k);   // n->in(k) is a USE; def is the DEF for this USE
         guarantee(def != NULL, "no disconnected nodes at this point");
-        uint useidx = n2lidx(def); // useidx is the live range index for this USE
+        uint useidx = _lrg_map.live_range_id(def); // useidx is the live range index for this USE
 
         if( useidx ) {
           OptoReg::Name ureg = lrgs(useidx).reg();
@@ -566,7 +571,7 @@
             int idx;            // Skip occasional useless copy
             while( (idx=def->is_Copy()) != 0 &&
                    def->in(idx) != NULL &&  // NULL should not happen
-                   ureg == lrgs(n2lidx(def->in(idx))).reg() )
+                   ureg == lrgs(_lrg_map.live_range_id(def->in(idx))).reg())
               def = def->in(idx);
             Node *valdef = skip_copies(def); // tighten up val through non-useless copies
             value.map(ureg,valdef); // record improved reaching-def info
@@ -594,8 +599,10 @@
         j -= elide_copy( n, k, b, value, regnd, two_adr!=k );
 
       // Unallocated Nodes define no registers
-      uint lidx = n2lidx(n);
-      if( !lidx ) continue;
+      uint lidx = _lrg_map.live_range_id(n);
+      if (!lidx) {
+        continue;
+      }
 
       // Update the register defined by this instruction
       OptoReg::Name nreg = lrgs(lidx).reg();
--- a/hotspot/src/share/vm/opto/reg_split.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/opto/reg_split.cpp	Wed May 08 11:22:25 2013 +0100
@@ -318,9 +318,13 @@
     for( uint i = 1; i < def->req(); i++ ) {
       Node *in = def->in(i);
       // Check for single-def (LRG cannot redefined)
-      uint lidx = n2lidx(in);
-      if( lidx >= _maxlrg ) continue; // Value is a recent spill-copy
-      if (lrgs(lidx).is_singledef()) continue;
+      uint lidx = _lrg_map.live_range_id(in);
+      if (lidx >= _lrg_map.max_lrg_id()) {
+        continue; // Value is a recent spill-copy
+      }
+      if (lrgs(lidx).is_singledef()) {
+        continue;
+      }
 
       Block *b_def = _cfg._bbs[def->_idx];
       int idx_def = b_def->find_node(def);
@@ -344,26 +348,28 @@
   if( spill->req() > 1 ) {
     for( uint i = 1; i < spill->req(); i++ ) {
       Node *in = spill->in(i);
-      uint lidx = Find_id(in);
+      uint lidx = _lrg_map.find_id(in);
 
       // Walk backwards thru spill copy node intermediates
       if (walkThru) {
-        while ( in->is_SpillCopy() && lidx >= _maxlrg ) {
+        while (in->is_SpillCopy() && lidx >= _lrg_map.max_lrg_id()) {
           in = in->in(1);
-          lidx = Find_id(in);
+          lidx = _lrg_map.find_id(in);
         }
 
-        if (lidx < _maxlrg && lrgs(lidx).is_multidef()) {
+        if (lidx < _lrg_map.max_lrg_id() && lrgs(lidx).is_multidef()) {
           // walkThru found a multidef LRG, which is unsafe to use, so
           // just keep the original def used in the clone.
           in = spill->in(i);
-          lidx = Find_id(in);
+          lidx = _lrg_map.find_id(in);
         }
       }
 
-      if( lidx < _maxlrg && lrgs(lidx).reg() >= LRG::SPILL_REG ) {
+      if (lidx < _lrg_map.max_lrg_id() && lrgs(lidx).reg() >= LRG::SPILL_REG) {
         Node *rdef = Reachblock[lrg2reach[lidx]];
-        if( rdef ) spill->set_req(i,rdef);
+        if (rdef) {
+          spill->set_req(i, rdef);
+        }
       }
     }
   }
@@ -382,7 +388,7 @@
 #endif
   // See if the cloned def kills any flags, and copy those kills as well
   uint i = insidx+1;
-  if( clone_projs( b, i, def, spill, maxlrg ) ) {
+  if( clone_projs( b, i, def, spill, maxlrg) ) {
     // Adjust the point where we go hi-pressure
     if( i <= b->_ihrp_index ) b->_ihrp_index++;
     if( i <= b->_fhrp_index ) b->_fhrp_index++;
@@ -424,17 +430,25 @@
 //------------------------------prompt_use---------------------------------
 // True if lidx is used before any real register is def'd in the block
 bool PhaseChaitin::prompt_use( Block *b, uint lidx ) {
-  if( lrgs(lidx)._was_spilled2 ) return false;
+  if (lrgs(lidx)._was_spilled2) {
+    return false;
+  }
 
   // Scan block for 1st use.
   for( uint i = 1; i <= b->end_idx(); i++ ) {
     Node *n = b->_nodes[i];
     // Ignore PHI use, these can be up or down
-    if( n->is_Phi() ) continue;
-    for( uint j = 1; j < n->req(); j++ )
-      if( Find_id(n->in(j)) == lidx )
+    if (n->is_Phi()) {
+      continue;
+    }
+    for (uint j = 1; j < n->req(); j++) {
+      if (_lrg_map.find_id(n->in(j)) == lidx) {
         return true;          // Found 1st use!
-    if( n->out_RegMask().is_NotEmpty() ) return false;
+      }
+    }
+    if (n->out_RegMask().is_NotEmpty()) {
+      return false;
+    }
   }
   return false;
 }
@@ -464,23 +478,23 @@
   bool                 u1, u2, u3;
   Block               *b, *pred;
   PhiNode             *phi;
-  GrowableArray<uint>  lidxs(split_arena, _maxlrg, 0, 0);
+  GrowableArray<uint>  lidxs(split_arena, maxlrg, 0, 0);
 
   // Array of counters to count splits per live range
-  GrowableArray<uint>  splits(split_arena, _maxlrg, 0, 0);
+  GrowableArray<uint>  splits(split_arena, maxlrg, 0, 0);
 
 #define NEW_SPLIT_ARRAY(type, size)\
   (type*) split_arena->allocate_bytes((size) * sizeof(type))
 
   //----------Setup Code----------
   // Create a convenient mapping from lrg numbers to reaches/leaves indices
-  uint *lrg2reach = NEW_SPLIT_ARRAY( uint, _maxlrg );
+  uint *lrg2reach = NEW_SPLIT_ARRAY(uint, maxlrg);
   // Keep track of DEFS & Phis for later passes
   defs = new Node_List();
   phis = new Node_List();
   // Gather info on which LRG's are spilling, and build maps
-  for( bidx = 1; bidx < _maxlrg; bidx++ ) {
-    if( lrgs(bidx).alive() && lrgs(bidx).reg() >= LRG::SPILL_REG ) {
+  for (bidx = 1; bidx < maxlrg; bidx++) {
+    if (lrgs(bidx).alive() && lrgs(bidx).reg() >= LRG::SPILL_REG) {
       assert(!lrgs(bidx).mask().is_AllStack(),"AllStack should color");
       lrg2reach[bidx] = spill_cnt;
       spill_cnt++;
@@ -629,7 +643,7 @@
           break;
         }
         // must be looking at a phi
-        if( Find_id(n1) == lidxs.at(slidx) ) {
+        if (_lrg_map.find_id(n1) == lidxs.at(slidx)) {
           // found the necessary phi
           needs_phi = false;
           has_phi = true;
@@ -651,11 +665,11 @@
           Reachblock[slidx] = phi;
 
           // add node to block & node_to_block mapping
-          insert_proj( b, insidx++, phi, maxlrg++ );
+          insert_proj(b, insidx++, phi, maxlrg++);
           non_phi++;
           // Reset new phi's mapping to be the spilling live range
-          _names.map(phi->_idx, lidx);
-          assert(Find_id(phi) == lidx,"Bad update on Union-Find mapping");
+          _lrg_map.map(phi->_idx, lidx);
+          assert(_lrg_map.find_id(phi) == lidx, "Bad update on Union-Find mapping");
         }  // end if not found correct phi
         // Here you have either found or created the Phi, so record it
         assert(phi != NULL,"Must have a Phi Node here");
@@ -721,12 +735,12 @@
     for( insidx = 1; insidx <= b->end_idx(); insidx++ ) {
       Node *n = b->_nodes[insidx];
       // Find the defining Node's live range index
-      uint defidx = Find_id(n);
+      uint defidx = _lrg_map.find_id(n);
       uint cnt = n->req();
 
-      if( n->is_Phi() ) {
+      if (n->is_Phi()) {
         // Skip phi nodes after removing dead copies.
-        if( defidx < _maxlrg ) {
+        if (defidx < _lrg_map.max_lrg_id()) {
           // Check for useless Phis.  These appear if we spill, then
           // coalesce away copies.  Dont touch Phis in spilling live
           // ranges; they are busy getting modifed in this pass.
@@ -744,8 +758,8 @@
               }
             }
             assert( u, "at least 1 valid input expected" );
-            if( i >= cnt ) {    // Found one unique input
-              assert(Find_id(n) == Find_id(u), "should be the same lrg");
+            if (i >= cnt) {    // Found one unique input
+              assert(_lrg_map.find_id(n) == _lrg_map.find_id(u), "should be the same lrg");
               n->replace_by(u); // Then replace with unique input
               n->disconnect_inputs(NULL, C);
               b->_nodes.remove(insidx);
@@ -793,16 +807,24 @@
                 while( insert_point > 0 ) {
                   Node *n = b->_nodes[insert_point];
                   // Hit top of block?  Quit going backwards
-                  if( n->is_Phi() ) break;
+                  if (n->is_Phi()) {
+                    break;
+                  }
                   // Found a def?  Better split after it.
-                  if( n2lidx(n) == lidx ) break;
+                  if (_lrg_map.live_range_id(n) == lidx) {
+                    break;
+                  }
                   // Look for a use
                   uint i;
-                  for( i = 1; i < n->req(); i++ )
-                    if( n2lidx(n->in(i)) == lidx )
+                  for( i = 1; i < n->req(); i++ ) {
+                    if (_lrg_map.live_range_id(n->in(i)) == lidx) {
                       break;
+                    }
+                  }
                   // Found a use?  Better split after it.
-                  if( i < n->req() ) break;
+                  if (i < n->req()) {
+                    break;
+                  }
                   insert_point--;
                 }
                 uint orig_eidx = b->end_idx();
@@ -812,8 +834,9 @@
                   return 0;
                 }
                 // Spill of NULL check mem op goes into the following block.
-                if (b->end_idx() > orig_eidx)
+                if (b->end_idx() > orig_eidx) {
                   insidx++;
+                }
               }
               // This is a new DEF, so update UP
               UPblock[slidx] = false;
@@ -832,13 +855,13 @@
       }  // end if crossing HRP Boundry
 
       // If the LRG index is oob, then this is a new spillcopy, skip it.
-      if( defidx >= _maxlrg ) {
+      if (defidx >= _lrg_map.max_lrg_id()) {
         continue;
       }
       LRG &deflrg = lrgs(defidx);
       uint copyidx = n->is_Copy();
       // Remove coalesced copy from CFG
-      if( copyidx && defidx == n2lidx(n->in(copyidx)) ) {
+      if (copyidx && defidx == _lrg_map.live_range_id(n->in(copyidx))) {
         n->replace_by( n->in(copyidx) );
         n->set_req( copyidx, NULL );
         b->_nodes.remove(insidx--);
@@ -864,13 +887,13 @@
           // If inpidx > old_last, then one of these new inputs is being
           // handled. Skip the derived part of the pair, but process
           // the base like any other input.
-          if( inpidx > old_last && ((inpidx - oopoff) & 1) == DERIVED ) {
+          if (inpidx > old_last && ((inpidx - oopoff) & 1) == DERIVED) {
             continue;  // skip derived_debug added below
           }
           // Get lidx of input
-          uint useidx = Find_id(n->in(inpidx));
+          uint useidx = _lrg_map.find_id(n->in(inpidx));
           // Not a brand-new split, and it is a spill use
-          if( useidx < _maxlrg && lrgs(useidx).reg() >= LRG::SPILL_REG ) {
+          if (useidx < _lrg_map.max_lrg_id() && lrgs(useidx).reg() >= LRG::SPILL_REG) {
             // Check for valid reaching DEF
             slidx = lrg2reach[useidx];
             Node *def = Reachblock[slidx];
@@ -886,7 +909,7 @@
               if (def == NULL || C->check_node_count(NodeLimitFudgeFactor, out_of_nodes)) {
                 return 0;
               }
-              _names.extend(def->_idx,0);
+              _lrg_map.extend(def->_idx, 0);
               _cfg._bbs.map(def->_idx,b);
               n->set_req(inpidx, def);
               continue;
@@ -1186,10 +1209,10 @@
       // ********** Split Left Over Mem-Mem Moves **********
       // Check for mem-mem copies and split them now.  Do not do this
       // to copies about to be spilled; they will be Split shortly.
-      if( copyidx ) {
+      if (copyidx) {
         Node *use = n->in(copyidx);
-        uint useidx = Find_id(use);
-        if( useidx < _maxlrg &&       // This is not a new split
+        uint useidx = _lrg_map.find_id(use);
+        if (useidx < _lrg_map.max_lrg_id() &&       // This is not a new split
             OptoReg::is_stack(deflrg.reg()) &&
             deflrg.reg() < LRG::SPILL_REG ) { // And DEF is from stack
           LRG &uselrg = lrgs(useidx);
@@ -1228,7 +1251,7 @@
         uint member;
         IndexSetIterator isi(liveout);
         while ((member = isi.next()) != 0) {
-          assert(defidx != Find_const(member), "Live out member has not been compressed");
+          assert(defidx != _lrg_map.find_const(member), "Live out member has not been compressed");
         }
 #endif
         Reachblock[slidx] = NULL;
@@ -1261,7 +1284,7 @@
     assert(phi->is_Phi(),"This list must only contain Phi Nodes");
     Block *b = _cfg._bbs[phi->_idx];
     // Grab the live range number
-    uint lidx = Find_id(phi);
+    uint lidx = _lrg_map.find_id(phi);
     uint slidx = lrg2reach[lidx];
     // Update node to lidx map
     new_lrg(phi, maxlrg++);
@@ -1296,11 +1319,13 @@
         int insert = pred->end_idx();
         while (insert >= 1 &&
                pred->_nodes[insert - 1]->is_SpillCopy() &&
-               Find(pred->_nodes[insert - 1]) >= lrgs_before_phi_split) {
+               _lrg_map.find(pred->_nodes[insert - 1]) >= lrgs_before_phi_split) {
           insert--;
         }
-        def = split_Rematerialize( def, pred, insert, maxlrg, splits, slidx, lrg2reach, Reachblock, false );
-        if( !def ) return 0;    // Bail out
+        def = split_Rematerialize(def, pred, insert, maxlrg, splits, slidx, lrg2reach, Reachblock, false);
+        if (!def) {
+          return 0;    // Bail out
+        }
       }
       // Update the Phi's input edge array
       phi->set_req(i,def);
@@ -1316,7 +1341,7 @@
     }  // End for all inputs to the Phi
   }  // End for all Phi Nodes
   // Update _maxlrg to save Union asserts
-  _maxlrg = maxlrg;
+  _lrg_map.set_max_lrg_id(maxlrg);
 
 
   //----------PASS 3----------
@@ -1328,47 +1353,51 @@
     for( uint i = 1; i < phi->req(); i++ ) {
       // Grab the input node
       Node *n = phi->in(i);
-      assert( n, "" );
-      uint lidx = Find(n);
-      uint pidx = Find(phi);
-      if( lidx < pidx )
+      assert(n, "node should exist");
+      uint lidx = _lrg_map.find(n);
+      uint pidx = _lrg_map.find(phi);
+      if (lidx < pidx) {
         Union(n, phi);
-      else if( lidx > pidx )
+      }
+      else if(lidx > pidx) {
         Union(phi, n);
+      }
     }  // End for all inputs to the Phi Node
   }  // End for all Phi Nodes
   // Now union all two address instructions
-  for( insidx = 0; insidx < defs->size(); insidx++ ) {
+  for (insidx = 0; insidx < defs->size(); insidx++) {
     // Grab the def
     n1 = defs->at(insidx);
     // Set new lidx for DEF & handle 2-addr instructions
-    if( n1->is_Mach() && ((twoidx = n1->as_Mach()->two_adr()) != 0) ) {
-      assert( Find(n1->in(twoidx)) < maxlrg,"Assigning bad live range index");
+    if (n1->is_Mach() && ((twoidx = n1->as_Mach()->two_adr()) != 0)) {
+      assert(_lrg_map.find(n1->in(twoidx)) < maxlrg,"Assigning bad live range index");
       // Union the input and output live ranges
-      uint lr1 = Find(n1);
-      uint lr2 = Find(n1->in(twoidx));
-      if( lr1 < lr2 )
+      uint lr1 = _lrg_map.find(n1);
+      uint lr2 = _lrg_map.find(n1->in(twoidx));
+      if (lr1 < lr2) {
         Union(n1, n1->in(twoidx));
-      else if( lr1 > lr2 )
+      }
+      else if (lr1 > lr2) {
         Union(n1->in(twoidx), n1);
+      }
     }  // End if two address
   }  // End for all defs
   // DEBUG
 #ifdef ASSERT
   // Validate all live range index assignments
-  for( bidx = 0; bidx < _cfg._num_blocks; bidx++ ) {
+  for (bidx = 0; bidx < _cfg._num_blocks; bidx++) {
     b  = _cfg._blocks[bidx];
-    for( insidx = 0; insidx <= b->end_idx(); insidx++ ) {
+    for (insidx = 0; insidx <= b->end_idx(); insidx++) {
       Node *n = b->_nodes[insidx];
-      uint defidx = Find(n);
-      assert(defidx < _maxlrg,"Bad live range index in Split");
+      uint defidx = _lrg_map.find(n);
+      assert(defidx < _lrg_map.max_lrg_id(), "Bad live range index in Split");
       assert(defidx < maxlrg,"Bad live range index in Split");
     }
   }
   // Issue a warning if splitting made no progress
   int noprogress = 0;
-  for( slidx = 0; slidx < spill_cnt; slidx++ ) {
-    if( PrintOpto && WizardMode && splits.at(slidx) == 0 ) {
+  for (slidx = 0; slidx < spill_cnt; slidx++) {
+    if (PrintOpto && WizardMode && splits.at(slidx) == 0) {
       tty->print_cr("Failed to split live range %d", lidxs.at(slidx));
       //BREAKPOINT;
     }
--- a/hotspot/src/share/vm/opto/regalloc.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/opto/regalloc.hpp	Wed May 08 11:22:25 2013 +0100
@@ -113,7 +113,7 @@
   OptoReg::Name offset2reg( int stk_offset ) const;
 
   // Get the register encoding associated with the Node
-  int get_encode( const Node *n ) const {
+  int get_encode(const Node *n) const {
     assert( n->_idx < _node_regs_max_index, "Exceeded _node_regs array");
     OptoReg::Name first = _node_regs[n->_idx].first();
     OptoReg::Name second = _node_regs[n->_idx].second();
@@ -122,15 +122,6 @@
     return Matcher::_regEncode[first];
   }
 
-  // Platform dependent hook for actions prior to allocation
-  void  pd_preallocate_hook();
-
-#ifdef ASSERT
-  // Platform dependent hook for verification after allocation.  Will
-  // only get called when compiling with asserts.
-  void  pd_postallocate_verify_hook();
-#endif
-
 #ifndef PRODUCT
   static int _total_framesize;
   static int _max_framesize;
--- a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp	Wed May 08 11:22:25 2013 +0100
@@ -3284,6 +3284,16 @@
   // that reference methods of the evolved class.
   SystemDictionary::classes_do(adjust_cpool_cache_and_vtable, THREAD);
 
+  // JSR-292 support
+  MemberNameTable* mnt = the_class->member_names();
+  if (mnt != NULL) {
+    bool trace_name_printed = false;
+    mnt->adjust_method_entries(_matching_old_methods,
+                               _matching_new_methods,
+                               _matching_methods_length,
+                               &trace_name_printed);
+  }
+
   // Fix Resolution Error table also to remove old constant pools
   SystemDictionary::delete_resolution_error(old_constants);
 
--- a/hotspot/src/share/vm/prims/methodHandles.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/prims/methodHandles.cpp	Wed May 08 11:22:25 2013 +0100
@@ -29,6 +29,7 @@
 #include "interpreter/oopMapCache.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/oopFactory.hpp"
+#include "prims/jvmtiRedefineClassesTrace.hpp"
 #include "prims/methodHandles.hpp"
 #include "runtime/compilationPolicy.hpp"
 #include "runtime/javaCalls.hpp"
@@ -124,7 +125,9 @@
   return Handle(THREAD, k->allocate_instance(THREAD));
 }
 
-oop MethodHandles::init_MemberName(oop mname_oop, oop target_oop) {
+oop MethodHandles::init_MemberName(Handle mname, Handle target) {
+  Thread* thread = Thread::current();
+  oop target_oop = target();
   Klass* target_klass = target_oop->klass();
   if (target_klass == SystemDictionary::reflect_Field_klass()) {
     oop clazz = java_lang_reflect_Field::clazz(target_oop); // fd.field_holder()
@@ -132,24 +135,24 @@
     int mods  = java_lang_reflect_Field::modifiers(target_oop);
     oop type  = java_lang_reflect_Field::type(target_oop);
     oop name  = java_lang_reflect_Field::name(target_oop);
-    Klass* k = java_lang_Class::as_Klass(clazz);
-    intptr_t offset = InstanceKlass::cast(k)->field_offset(slot);
-    return init_field_MemberName(mname_oop, k, accessFlags_from(mods), type, name, offset);
+    KlassHandle k(thread, java_lang_Class::as_Klass(clazz));
+    intptr_t offset = InstanceKlass::cast(k())->field_offset(slot);
+    return init_field_MemberName(mname, k, accessFlags_from(mods), type, name, offset);
   } else if (target_klass == SystemDictionary::reflect_Method_klass()) {
     oop clazz  = java_lang_reflect_Method::clazz(target_oop);
     int slot   = java_lang_reflect_Method::slot(target_oop);
-    Klass* k = java_lang_Class::as_Klass(clazz);
-    if (k != NULL && k->oop_is_instance()) {
-      Method* m = InstanceKlass::cast(k)->method_with_idnum(slot);
-      return init_method_MemberName(mname_oop, m, true, k);
+    KlassHandle k(thread, java_lang_Class::as_Klass(clazz));
+    if (!k.is_null() && k->oop_is_instance()) {
+      Method* m = InstanceKlass::cast(k())->method_with_idnum(slot);
+      return init_method_MemberName(mname, m, true, k);
     }
   } else if (target_klass == SystemDictionary::reflect_Constructor_klass()) {
     oop clazz  = java_lang_reflect_Constructor::clazz(target_oop);
     int slot   = java_lang_reflect_Constructor::slot(target_oop);
-    Klass* k = java_lang_Class::as_Klass(clazz);
-    if (k != NULL && k->oop_is_instance()) {
-      Method* m = InstanceKlass::cast(k)->method_with_idnum(slot);
-      return init_method_MemberName(mname_oop, m, false, k);
+    KlassHandle k(thread, java_lang_Class::as_Klass(clazz));
+    if (!k.is_null() && k->oop_is_instance()) {
+      Method* m = InstanceKlass::cast(k())->method_with_idnum(slot);
+      return init_method_MemberName(mname, m, false, k);
     }
   } else if (target_klass == SystemDictionary::MemberName_klass()) {
     // Note: This only works if the MemberName has already been resolved.
@@ -157,17 +160,18 @@
     int flags        = java_lang_invoke_MemberName::flags(target_oop);
     Metadata* vmtarget=java_lang_invoke_MemberName::vmtarget(target_oop);
     intptr_t vmindex = java_lang_invoke_MemberName::vmindex(target_oop);
-    Klass* k         = java_lang_Class::as_Klass(clazz);
+    KlassHandle k(thread, java_lang_Class::as_Klass(clazz));
     int ref_kind     = (flags >> REFERENCE_KIND_SHIFT) & REFERENCE_KIND_MASK;
     if (vmtarget == NULL)  return NULL;  // not resolved
     if ((flags & IS_FIELD) != 0) {
       assert(vmtarget->is_klass(), "field vmtarget is Klass*");
       int basic_mods = (ref_kind_is_static(ref_kind) ? JVM_ACC_STATIC : 0);
       // FIXME:  how does k (receiver_limit) contribute?
-      return init_field_MemberName(mname_oop, (Klass*)vmtarget, accessFlags_from(basic_mods), NULL, NULL, vmindex);
+      KlassHandle k_vmtarget(thread, (Klass*)vmtarget);
+      return init_field_MemberName(mname, k_vmtarget, accessFlags_from(basic_mods), NULL, NULL, vmindex);
     } else if ((flags & (IS_METHOD | IS_CONSTRUCTOR)) != 0) {
       assert(vmtarget->is_method(), "method or constructor vmtarget is Method*");
-      return init_method_MemberName(mname_oop, (Method*)vmtarget, ref_kind_does_dispatch(ref_kind), k);
+      return init_method_MemberName(mname, (Method*)vmtarget, ref_kind_does_dispatch(ref_kind), k);
     } else {
       return NULL;
     }
@@ -175,8 +179,9 @@
   return NULL;
 }
 
-oop MethodHandles::init_method_MemberName(oop mname_oop, Method* m, bool do_dispatch,
-                                          Klass* receiver_limit) {
+oop MethodHandles::init_method_MemberName(Handle mname, Method* m, bool do_dispatch,
+                                          KlassHandle receiver_limit_h) {
+  Klass* receiver_limit = receiver_limit_h();
   AccessFlags mods = m->access_flags();
   int flags = (jushort)( mods.as_short() & JVM_RECOGNIZED_METHOD_MODIFIERS );
   int vmindex = Method::nonvirtual_vtable_index; // implies never any dispatch
@@ -187,6 +192,10 @@
     flags |= IS_CONSTRUCTOR | (JVM_REF_invokeSpecial << REFERENCE_KIND_SHIFT);
   } else if (mods.is_static()) {
     flags |= IS_METHOD | (JVM_REF_invokeStatic << REFERENCE_KIND_SHIFT);
+     // Get vindex from itable if method holder is an interface.
+     if (m->method_holder()->is_interface()) {
+       vmindex = klassItable::compute_itable_index(m);
+     }
   } else if (receiver_limit != mklass &&
              !receiver_limit->is_subtype_of(mklass)) {
     return NULL;  // bad receiver limit
@@ -213,6 +222,7 @@
     flags |= CALLER_SENSITIVE;
   }
 
+  oop mname_oop = mname();
   java_lang_invoke_MemberName::set_flags(   mname_oop, flags);
   java_lang_invoke_MemberName::set_vmtarget(mname_oop, m);
   java_lang_invoke_MemberName::set_vmindex( mname_oop, vmindex);   // vtable/itable index
@@ -225,10 +235,11 @@
   // This is done eagerly, since it is readily available without
   // constructing any new objects.
   // TO DO: maybe intern mname_oop
-  return mname_oop;
+  m->method_holder()->add_member_name(mname);
+  return mname();
 }
 
-Handle MethodHandles::init_method_MemberName(oop mname_oop, CallInfo& info, TRAPS) {
+Handle MethodHandles::init_method_MemberName(Handle mname, CallInfo& info, TRAPS) {
   Handle empty;
   if (info.resolved_appendix().not_null()) {
     // The resolved MemberName must not be accompanied by an appendix argument,
@@ -248,19 +259,20 @@
   } else {
     vmindex = info.vtable_index();
   }
-  oop res = init_method_MemberName(mname_oop, m(), (vmindex >= 0), defc());
+  oop res = init_method_MemberName(mname, m(), (vmindex >= 0), defc());
   assert(res == NULL || (java_lang_invoke_MemberName::vmindex(res) == vmindex), "");
   return Handle(THREAD, res);
 }
 
-oop MethodHandles::init_field_MemberName(oop mname_oop, Klass* field_holder,
+oop MethodHandles::init_field_MemberName(Handle mname, KlassHandle field_holder,
                                          AccessFlags mods, oop type, oop name,
                                          intptr_t offset, bool is_setter) {
   int flags = (jushort)( mods.as_short() & JVM_RECOGNIZED_FIELD_MODIFIERS );
   flags |= IS_FIELD | ((mods.is_static() ? JVM_REF_getStatic : JVM_REF_getField) << REFERENCE_KIND_SHIFT);
   if (is_setter)  flags += ((JVM_REF_putField - JVM_REF_getField) << REFERENCE_KIND_SHIFT);
-  Metadata* vmtarget = field_holder;
+  Metadata* vmtarget = field_holder();
   int vmindex  = offset;  // determines the field uniquely when combined with static bit
+  oop mname_oop = mname();
   java_lang_invoke_MemberName::set_flags(mname_oop,    flags);
   java_lang_invoke_MemberName::set_vmtarget(mname_oop, vmtarget);
   java_lang_invoke_MemberName::set_vmindex(mname_oop,  vmindex);
@@ -277,10 +289,11 @@
   // Although the fieldDescriptor::_index would also identify the field,
   // we do not use it, because it is harder to decode.
   // TO DO: maybe intern mname_oop
-  return mname_oop;
+  InstanceKlass::cast(field_holder())->add_member_name(mname);
+  return mname();
 }
 
-Handle MethodHandles::init_field_MemberName(oop mname_oop, FieldAccessInfo& info, TRAPS) {
+Handle MethodHandles::init_field_MemberName(Handle mname, FieldAccessInfo& info, TRAPS) {
   return Handle();
 #if 0 // FIXME
   KlassHandle field_holder = info.klass();
@@ -679,7 +692,7 @@
           return empty;
         }
       }
-      return init_method_MemberName(mname(), result, THREAD);
+      return init_method_MemberName(mname, result, THREAD);
     }
   case IS_CONSTRUCTOR:
     {
@@ -697,7 +710,7 @@
         }
       }
       assert(result.is_statically_bound(), "");
-      return init_method_MemberName(mname(), result, THREAD);
+      return init_method_MemberName(mname, result, THREAD);
     }
   case IS_FIELD:
     {
@@ -710,7 +723,7 @@
       oop name = field_name_or_null(fd.name());
       bool is_setter = (ref_kind_is_valid(ref_kind) && ref_kind_is_setter(ref_kind));
       mname = Handle(THREAD,
-                     init_field_MemberName(mname(), sel_klass(),
+                     init_field_MemberName(mname, sel_klass,
                                            fd.access_flags(), type, name, fd.offset(), is_setter));
       return mname;
     }
@@ -802,16 +815,15 @@
   THROW_MSG(vmSymbols::java_lang_InternalError(), "unrecognized MemberName format");
 }
 
-int MethodHandles::find_MemberNames(Klass* k,
+int MethodHandles::find_MemberNames(KlassHandle k,
                                     Symbol* name, Symbol* sig,
-                                    int mflags, Klass* caller,
-                                    int skip, objArrayOop results) {
-  DEBUG_ONLY(No_Safepoint_Verifier nsv);
-  // this code contains no safepoints!
-
+                                    int mflags, KlassHandle caller,
+                                    int skip, objArrayHandle results) {
   // %%% take caller into account!
 
-  if (k == NULL || !k->oop_is_instance())  return -1;
+  Thread* thread = Thread::current();
+
+  if (k.is_null() || !k->oop_is_instance())  return -1;
 
   int rfill = 0, rlimit = results->length(), rskip = skip;
   // overflow measurement:
@@ -839,7 +851,7 @@
   }
 
   if ((match_flags & IS_FIELD) != 0) {
-    for (FieldStream st(k, local_only, !search_intfc); !st.eos(); st.next()) {
+    for (FieldStream st(k(), local_only, !search_intfc); !st.eos(); st.next()) {
       if (name != NULL && st.name() != name)
           continue;
       if (sig != NULL && st.signature() != sig)
@@ -848,15 +860,15 @@
       if (rskip > 0) {
         --rskip;
       } else if (rfill < rlimit) {
-        oop result = results->obj_at(rfill++);
-        if (!java_lang_invoke_MemberName::is_instance(result))
+        Handle result(thread, results->obj_at(rfill++));
+        if (!java_lang_invoke_MemberName::is_instance(result()))
           return -99;  // caller bug!
         oop type = field_signature_type_or_null(st.signature());
         oop name = field_name_or_null(st.name());
-        oop saved = MethodHandles::init_field_MemberName(result, st.klass()(),
+        oop saved = MethodHandles::init_field_MemberName(result, st.klass(),
                                                          st.access_flags(), type, name,
                                                          st.offset());
-        if (saved != result)
+        if (saved != result())
           results->obj_at_put(rfill-1, saved);  // show saved instance to user
       } else if (++overflow >= overflow_limit) {
         match_flags = 0; break; // got tired of looking at overflow
@@ -889,7 +901,7 @@
     } else {
       // caller will accept either sort; no need to adjust name
     }
-    for (MethodStream st(k, local_only, !search_intfc); !st.eos(); st.next()) {
+    for (MethodStream st(k(), local_only, !search_intfc); !st.eos(); st.next()) {
       Method* m = st.method();
       Symbol* m_name = m->name();
       if (m_name == clinit_name)
@@ -902,11 +914,11 @@
       if (rskip > 0) {
         --rskip;
       } else if (rfill < rlimit) {
-        oop result = results->obj_at(rfill++);
-        if (!java_lang_invoke_MemberName::is_instance(result))
+        Handle result(thread, results->obj_at(rfill++));
+        if (!java_lang_invoke_MemberName::is_instance(result()))
           return -99;  // caller bug!
         oop saved = MethodHandles::init_method_MemberName(result, m, true, NULL);
-        if (saved != result)
+        if (saved != result())
           results->obj_at_put(rfill-1, saved);  // show saved instance to user
       } else if (++overflow >= overflow_limit) {
         match_flags = 0; break; // got tired of looking at overflow
@@ -917,6 +929,99 @@
   // return number of elements we at leasted wanted to initialize
   return rfill + overflow;
 }
+
+//------------------------------------------------------------------------------
+// MemberNameTable
+//
+
+MemberNameTable::MemberNameTable() : GrowableArray<jweak>(10, true) {
+  assert_locked_or_safepoint(MemberNameTable_lock);
+}
+
+MemberNameTable::~MemberNameTable() {
+  assert_locked_or_safepoint(MemberNameTable_lock);
+  int len = this->length();
+
+  for (int idx = 0; idx < len; idx++) {
+    jweak ref = this->at(idx);
+    JNIHandles::destroy_weak_global(ref);
+  }
+}
+
+// Return entry index if found, return -1 otherwise.
+int MemberNameTable::find_member_name(oop mem_name) {
+  assert_locked_or_safepoint(MemberNameTable_lock);
+  int len = this->length();
+
+  for (int idx = 0; idx < len; idx++) {
+    jweak ref = this->at(idx);
+    oop entry = JNIHandles::resolve(ref);
+    if (entry == mem_name) {
+      return idx;
+    }
+  }
+  return -1;
+}
+
+void MemberNameTable::add_member_name(jweak mem_name_wref) {
+  assert_locked_or_safepoint(MemberNameTable_lock);
+  oop mem_name = JNIHandles::resolve(mem_name_wref);
+
+  // Each member name may appear just once: add only if not found
+  if (find_member_name(mem_name) == -1) {
+    this->append(mem_name_wref);
+  }
+}
+
+#if INCLUDE_JVMTI
+oop MemberNameTable::find_member_name_by_method(Method* old_method) {
+  assert_locked_or_safepoint(MemberNameTable_lock);
+  oop found = NULL;
+  int len = this->length();
+
+  for (int idx = 0; idx < len; idx++) {
+    oop mem_name = JNIHandles::resolve(this->at(idx));
+    if (mem_name == NULL) {
+      continue;
+    }
+    Method* method = (Method*)java_lang_invoke_MemberName::vmtarget(mem_name);
+    if (method == old_method) {
+      found = mem_name;
+      break;
+    }
+  }
+  return found;
+}
+
+// It is called at safepoint only
+void MemberNameTable::adjust_method_entries(Method** old_methods, Method** new_methods,
+                                            int methods_length, bool *trace_name_printed) {
+  assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
+  // search the MemberNameTable for uses of either obsolete or EMCP methods
+  for (int j = 0; j < methods_length; j++) {
+    Method* old_method = old_methods[j];
+    Method* new_method = new_methods[j];
+    oop mem_name = find_member_name_by_method(old_method);
+    if (mem_name != NULL) {
+      java_lang_invoke_MemberName::adjust_vmtarget(mem_name, new_method);
+
+      if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) {
+        if (!(*trace_name_printed)) {
+          // RC_TRACE_MESG macro has an embedded ResourceMark
+          RC_TRACE_MESG(("adjust: name=%s",
+                         old_method->method_holder()->external_name()));
+          *trace_name_printed = true;
+        }
+        // RC_TRACE macro has an embedded ResourceMark
+        RC_TRACE(0x00400000, ("MemberName method update: %s(%s)",
+                              new_method->name()->as_C_string(),
+                              new_method->signature()->as_C_string()));
+      }
+    }
+  }
+}
+#endif // INCLUDE_JVMTI
+
 //
 // Here are the native methods in java.lang.invoke.MethodHandleNatives
 // They are the private interface between this JVM and the HotSpot-specific
@@ -1010,8 +1115,8 @@
   if (mname_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "mname is null"); }
   if (target_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "target is null"); }
   Handle mname(THREAD, JNIHandles::resolve_non_null(mname_jh));
-  oop target_oop = JNIHandles::resolve_non_null(target_jh);
-  MethodHandles::init_MemberName(mname(), target_oop);
+  Handle target(THREAD, JNIHandles::resolve_non_null(target_jh));
+  MethodHandles::init_MemberName(mname, target);
 }
 JVM_END
 
@@ -1118,7 +1223,7 @@
     x = ((Klass*) vmtarget)->java_mirror();
   } else if (vmtarget->is_method()) {
     Handle mname2 = MethodHandles::new_MemberName(CHECK_NULL);
-    x = MethodHandles::init_method_MemberName(mname2(), (Method*)vmtarget, false, NULL);
+    x = MethodHandles::init_method_MemberName(mname2, (Method*)vmtarget, false, NULL);
   }
   result->obj_at_put(1, x);
   return JNIHandles::make_local(env, result());
@@ -1161,8 +1266,8 @@
     // %%% TO DO
   }
 
-  int res = MethodHandles::find_MemberNames(k(), name, sig, mflags,
-                                            caller(), skip, results());
+  int res = MethodHandles::find_MemberNames(k, name, sig, mflags,
+                                            caller, skip, results);
   // TO DO: expand at least some of the MemberNames, to avoid massive callbacks
   return res;
 }
--- a/hotspot/src/share/vm/prims/methodHandles.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/prims/methodHandles.hpp	Wed May 08 11:22:25 2013 +0100
@@ -54,23 +54,23 @@
   static Handle resolve_MemberName(Handle mname, TRAPS); // compute vmtarget/vmindex from name/type
   static void expand_MemberName(Handle mname, int suppress, TRAPS);  // expand defc/name/type if missing
   static Handle new_MemberName(TRAPS);  // must be followed by init_MemberName
-  static oop init_MemberName(oop mname_oop, oop target_oop); // compute vmtarget/vmindex from target
-  static oop init_method_MemberName(oop mname_oop, Method* m, bool do_dispatch,
-                                    Klass* receiver_limit);
-  static oop init_field_MemberName(oop mname_oop, Klass* field_holder,
+  static oop init_MemberName(Handle mname_h, Handle target_h); // compute vmtarget/vmindex from target
+  static oop init_method_MemberName(Handle mname_h, Method* m, bool do_dispatch,
+                                    KlassHandle receiver_limit_h);
+  static oop init_field_MemberName(Handle mname_h, KlassHandle field_holder_h,
                                    AccessFlags mods, oop type, oop name,
                                    intptr_t offset, bool is_setter = false);
-  static Handle init_method_MemberName(oop mname_oop, CallInfo& info, TRAPS);
-  static Handle init_field_MemberName(oop mname_oop, FieldAccessInfo& info, TRAPS);
+  static Handle init_method_MemberName(Handle mname_h, CallInfo& info, TRAPS);
+  static Handle init_field_MemberName(Handle mname_h, FieldAccessInfo& info, TRAPS);
   static int method_ref_kind(Method* m, bool do_dispatch_if_possible = true);
-  static int find_MemberNames(Klass* k, Symbol* name, Symbol* sig,
-                              int mflags, Klass* caller,
-                              int skip, objArrayOop results);
+  static int find_MemberNames(KlassHandle k, Symbol* name, Symbol* sig,
+                              int mflags, KlassHandle caller,
+                              int skip, objArrayHandle results);
   // bit values for suppress argument to expand_MemberName:
   enum { _suppress_defc = 1, _suppress_name = 2, _suppress_type = 4 };
 
   // Generate MethodHandles adapters.
-  static void generate_adapters();
+                              static void generate_adapters();
 
   // Called from MethodHandlesAdapterGenerator.
   static address generate_method_handle_interpreter_entry(MacroAssembler* _masm, vmIntrinsics::ID iid);
@@ -230,4 +230,27 @@
   void generate();
 };
 
+//------------------------------------------------------------------------------
+// MemberNameTable
+//
+class MemberNameTable : public GrowableArray<jweak> {
+ public:
+  MemberNameTable();
+  ~MemberNameTable();
+  void add_member_name(jweak mem_name_ref);
+ private:
+  int find_member_name(oop mem_name);
+
+#if INCLUDE_JVMTI
+ public:
+  // RedefineClasses() API support:
+  // If a MemberName refers to old_method then update it
+  // to refer to new_method.
+  void adjust_method_entries(Method** old_methods, Method** new_methods,
+                             int methods_length, bool *trace_name_printed);
+ private:
+  oop find_member_name_by_method(Method* old_method);
+#endif // INCLUDE_JVMTI
+};
+
 #endif // SHARE_VM_PRIMS_METHODHANDLES_HPP
--- a/hotspot/src/share/vm/prims/whitebox.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/prims/whitebox.cpp	Wed May 08 11:22:25 2013 +0100
@@ -237,10 +237,10 @@
 WB_END
 
 
-WB_ENTRY(void, WB_MakeMethodNotCompilable(JNIEnv* env, jobject o, jobject method))
+WB_ENTRY(void, WB_MakeMethodNotCompilable(JNIEnv* env, jobject o, jobject method, jint comp_level))
   jmethodID jmid = reflected_method_to_jmid(thread, env, method);
   methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
-  mh->set_not_compilable();
+  mh->set_not_compilable(comp_level, true /* report */, "WhiteBox");
 WB_END
 
 WB_ENTRY(jboolean, WB_TestSetDontInlineMethod(JNIEnv* env, jobject o, jobject method, jboolean value))
@@ -278,6 +278,7 @@
   methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
   MutexLockerEx mu(Compile_lock);
   MethodData* mdo = mh->method_data();
+  MethodCounters* mcs = mh->method_counters();
 
   if (mdo != NULL) {
     mdo->init();
@@ -288,20 +289,22 @@
     }
   }
 
-  mh->backedge_counter()->init();
-  mh->invocation_counter()->init();
-  mh->set_interpreter_invocation_count(0);
-  mh->set_interpreter_throwout_count(0);
   mh->clear_not_c1_compilable();
   mh->clear_not_c2_compilable();
   mh->clear_not_c2_osr_compilable();
   NOT_PRODUCT(mh->set_compiled_invocation_count(0));
+  if (mcs != NULL) {
+    mcs->backedge_counter()->init();
+    mcs->invocation_counter()->init();
+    mcs->set_interpreter_invocation_count(0);
+    mcs->set_interpreter_throwout_count(0);
 
 #ifdef TIERED
-  mh->set_rate(0.0F);
-  mh->set_prev_event_count(0);
-  mh->set_prev_time(0);
+    mcs->set_rate(0.0F);
+    mh->set_prev_event_count(0, THREAD);
+    mh->set_prev_time(0, THREAD);
 #endif
+  }
 WB_END
 
 WB_ENTRY(jboolean, WB_IsInStringTable(JNIEnv* env, jobject o, jstring javaString))
@@ -398,28 +401,28 @@
   {CC"NMTWaitForDataMerge", CC"()Z",                  (void*)&WB_NMTWaitForDataMerge},
 #endif // INCLUDE_NMT
   {CC"deoptimizeAll",      CC"()V",                   (void*)&WB_DeoptimizeAll     },
-  {CC"deoptimizeMethod",   CC"(Ljava/lang/reflect/Method;)I",
+  {CC"deoptimizeMethod",   CC"(Ljava/lang/reflect/Executable;)I",
                                                       (void*)&WB_DeoptimizeMethod  },
-  {CC"isMethodCompiled",   CC"(Ljava/lang/reflect/Method;)Z",
+  {CC"isMethodCompiled",   CC"(Ljava/lang/reflect/Executable;)Z",
                                                       (void*)&WB_IsMethodCompiled  },
-  {CC"isMethodCompilable", CC"(Ljava/lang/reflect/Method;I)Z",
+  {CC"isMethodCompilable", CC"(Ljava/lang/reflect/Executable;I)Z",
                                                       (void*)&WB_IsMethodCompilable},
   {CC"isMethodQueuedForCompilation",
-      CC"(Ljava/lang/reflect/Method;)Z",              (void*)&WB_IsMethodQueuedForCompilation},
+      CC"(Ljava/lang/reflect/Executable;)Z",          (void*)&WB_IsMethodQueuedForCompilation},
   {CC"makeMethodNotCompilable",
-      CC"(Ljava/lang/reflect/Method;)V",              (void*)&WB_MakeMethodNotCompilable},
+      CC"(Ljava/lang/reflect/Executable;I)V",         (void*)&WB_MakeMethodNotCompilable},
   {CC"testSetDontInlineMethod",
-      CC"(Ljava/lang/reflect/Method;Z)Z",             (void*)&WB_TestSetDontInlineMethod},
+      CC"(Ljava/lang/reflect/Executable;Z)Z",         (void*)&WB_TestSetDontInlineMethod},
   {CC"getMethodCompilationLevel",
-      CC"(Ljava/lang/reflect/Method;)I",              (void*)&WB_GetMethodCompilationLevel},
+      CC"(Ljava/lang/reflect/Executable;)I",          (void*)&WB_GetMethodCompilationLevel},
   {CC"getCompileQueuesSize",
       CC"()I",                                        (void*)&WB_GetCompileQueuesSize},
   {CC"testSetForceInlineMethod",
-      CC"(Ljava/lang/reflect/Method;Z)Z",             (void*)&WB_TestSetForceInlineMethod},
+      CC"(Ljava/lang/reflect/Executable;Z)Z",         (void*)&WB_TestSetForceInlineMethod},
   {CC"enqueueMethodForCompilation",
-      CC"(Ljava/lang/reflect/Method;I)Z",             (void*)&WB_EnqueueMethodForCompilation},
+      CC"(Ljava/lang/reflect/Executable;I)Z",         (void*)&WB_EnqueueMethodForCompilation},
   {CC"clearMethodState",
-      CC"(Ljava/lang/reflect/Method;)V",              (void*)&WB_ClearMethodState},
+      CC"(Ljava/lang/reflect/Executable;)V",          (void*)&WB_ClearMethodState},
   {CC"isInStringTable",   CC"(Ljava/lang/String;)Z",  (void*)&WB_IsInStringTable  },
   {CC"fullGC",   CC"()V",                             (void*)&WB_FullGC },
 };
--- a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,10 +74,11 @@
 
 // update_rate() is called from select_task() while holding a compile queue lock.
 void AdvancedThresholdPolicy::update_rate(jlong t, Method* m) {
+  JavaThread* THREAD = JavaThread::current();
   if (is_old(m)) {
     // We don't remove old methods from the queue,
     // so we can just zero the rate.
-    m->set_rate(0);
+    m->set_rate(0, THREAD);
     return;
   }
 
@@ -93,13 +94,13 @@
   if (delta_s >= TieredRateUpdateMinTime) {
     // And we must've taken the previous point at least 1ms before.
     if (delta_t >= TieredRateUpdateMinTime && delta_e > 0) {
-      m->set_prev_time(t);
-      m->set_prev_event_count(event_count);
-      m->set_rate((float)delta_e / (float)delta_t); // Rate is events per millisecond
+      m->set_prev_time(t, THREAD);
+      m->set_prev_event_count(event_count, THREAD);
+      m->set_rate((float)delta_e / (float)delta_t, THREAD); // Rate is events per millisecond
     } else
       if (delta_t > TieredRateUpdateMaxTime && delta_e == 0) {
         // If nothing happened for 25ms, zero the rate. Don't modify prev values.
-        m->set_rate(0);
+        m->set_rate(0, THREAD);
       }
   }
 }
--- a/hotspot/src/share/vm/runtime/arguments.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1901,7 +1901,7 @@
 
   // Divide by bucket size to prevent a large size from causing rollover when
   // calculating amount of memory needed to be allocated for the String table.
-  status = status && verify_interval(StringTableSize, defaultStringTableSize,
+  status = status && verify_interval(StringTableSize, minimumStringTableSize,
     (max_uintx / StringTable::bucket_size()), "StringTable size");
 
   if (MinHeapFreeRatio > MaxHeapFreeRatio) {
--- a/hotspot/src/share/vm/runtime/compilationPolicy.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/runtime/compilationPolicy.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -198,8 +198,10 @@
 
   // BUT also make sure the method doesn't look like it was never executed.
   // Set carry bit and reduce counter's value to min(count, CompileThreshold/2).
-  m->invocation_counter()->set_carry();
-  m->backedge_counter()->set_carry();
+  MethodCounters* mcs = m->method_counters();
+  assert(mcs != NULL, "MethodCounters cannot be NULL for profiling");
+  mcs->invocation_counter()->set_carry();
+  mcs->backedge_counter()->set_carry();
 
   assert(!m->was_never_executed(), "don't reset to 0 -- could be mistaken for never-executed");
 }
@@ -207,8 +209,10 @@
 void NonTieredCompPolicy::reset_counter_for_back_branch_event(methodHandle m) {
   // Delay next back-branch event but pump up invocation counter to triger
   // whole method compilation.
-  InvocationCounter* i = m->invocation_counter();
-  InvocationCounter* b = m->backedge_counter();
+  MethodCounters* mcs = m->method_counters();
+  assert(mcs != NULL, "MethodCounters cannot be NULL for profiling");
+  InvocationCounter* i = mcs->invocation_counter();
+  InvocationCounter* b = mcs->backedge_counter();
 
   // Don't set invocation_counter's value too low otherwise the method will
   // look like immature (ic < ~5300) which prevents the inlining based on
@@ -227,7 +231,10 @@
 class CounterDecay : public AllStatic {
   static jlong _last_timestamp;
   static void do_method(Method* m) {
-    m->invocation_counter()->decay();
+    MethodCounters* mcs = m->method_counters();
+    if (mcs != NULL) {
+      mcs->invocation_counter()->decay();
+    }
   }
 public:
   static void decay();
@@ -265,30 +272,44 @@
 
 void NonTieredCompPolicy::reprofile(ScopeDesc* trap_scope, bool is_osr) {
   ScopeDesc* sd = trap_scope;
+  MethodCounters* mcs;
+  InvocationCounter* c;
   for (; !sd->is_top(); sd = sd->sender()) {
-    // Reset ICs of inlined methods, since they can trigger compilations also.
-    sd->method()->invocation_counter()->reset();
+    mcs = sd->method()->method_counters();
+    if (mcs != NULL) {
+      // Reset ICs of inlined methods, since they can trigger compilations also.
+      mcs->invocation_counter()->reset();
+    }
   }
-  InvocationCounter* c = sd->method()->invocation_counter();
-  if (is_osr) {
-    // It was an OSR method, so bump the count higher.
-    c->set(c->state(), CompileThreshold);
-  } else {
-    c->reset();
+  mcs = sd->method()->method_counters();
+  if (mcs != NULL) {
+    c = mcs->invocation_counter();
+    if (is_osr) {
+      // It was an OSR method, so bump the count higher.
+      c->set(c->state(), CompileThreshold);
+    } else {
+      c->reset();
+    }
+    mcs->backedge_counter()->reset();
   }
-  sd->method()->backedge_counter()->reset();
 }
 
 // This method can be called by any component of the runtime to notify the policy
 // that it's recommended to delay the complation of this method.
 void NonTieredCompPolicy::delay_compilation(Method* method) {
-  method->invocation_counter()->decay();
-  method->backedge_counter()->decay();
+  MethodCounters* mcs = method->method_counters();
+  if (mcs != NULL) {
+    mcs->invocation_counter()->decay();
+    mcs->backedge_counter()->decay();
+  }
 }
 
 void NonTieredCompPolicy::disable_compilation(Method* method) {
-  method->invocation_counter()->set_state(InvocationCounter::wait_for_nothing);
-  method->backedge_counter()->set_state(InvocationCounter::wait_for_nothing);
+  MethodCounters* mcs = method->method_counters();
+  if (mcs != NULL) {
+    mcs->invocation_counter()->set_state(InvocationCounter::wait_for_nothing);
+    mcs->backedge_counter()->set_state(InvocationCounter::wait_for_nothing);
+  }
 }
 
 CompileTask* NonTieredCompPolicy::select_task(CompileQueue* compile_queue) {
@@ -371,8 +392,10 @@
 #ifndef PRODUCT
 void NonTieredCompPolicy::trace_frequency_counter_overflow(methodHandle m, int branch_bci, int bci) {
   if (TraceInvocationCounterOverflow) {
-    InvocationCounter* ic = m->invocation_counter();
-    InvocationCounter* bc = m->backedge_counter();
+    MethodCounters* mcs = m->method_counters();
+    assert(mcs != NULL, "MethodCounters cannot be NULL for profiling");
+    InvocationCounter* ic = mcs->invocation_counter();
+    InvocationCounter* bc = mcs->backedge_counter();
     ResourceMark rm;
     const char* msg =
       bci == InvocationEntryBci
--- a/hotspot/src/share/vm/runtime/fprofiler.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/runtime/fprofiler.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -421,7 +421,8 @@
 
    void print_method_on(outputStream* st) {
      ProfilerNode::print_method_on(st);
-     if (Verbose) method()->invocation_counter()->print_short();
+     MethodCounters* mcs = method()->method_counters();
+     if (Verbose && mcs != NULL) mcs->invocation_counter()->print_short();
    }
 };
 
--- a/hotspot/src/share/vm/runtime/mutexLocker.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/runtime/mutexLocker.cpp	Wed May 08 11:22:25 2013 +0100
@@ -46,6 +46,7 @@
 Mutex*   JNIGlobalHandle_lock         = NULL;
 Mutex*   JNIHandleBlockFreeList_lock  = NULL;
 Mutex*   JNICachedItableIndex_lock    = NULL;
+Mutex*   MemberNameTable_lock         = NULL;
 Mutex*   JmethodIdCreation_lock       = NULL;
 Mutex*   JfieldIdCreation_lock        = NULL;
 Monitor* JNICritical_lock             = NULL;
@@ -252,6 +253,7 @@
   def(Heap_lock                    , Monitor, nonleaf+1,   false);
   def(JfieldIdCreation_lock        , Mutex  , nonleaf+1,   true ); // jfieldID, Used in VM_Operation
   def(JNICachedItableIndex_lock    , Mutex  , nonleaf+1,   false); // Used to cache an itable index during JNI invoke
+  def(MemberNameTable_lock         , Mutex  , nonleaf+1,   false); // Used to protect MemberNameTable
 
   def(CompiledIC_lock              , Mutex  , nonleaf+2,   false); // locks VtableStubs_lock, InlineCacheBuffer_lock
   def(CompileTaskAlloc_lock        , Mutex  , nonleaf+2,   true );
--- a/hotspot/src/share/vm/runtime/mutexLocker.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/runtime/mutexLocker.hpp	Wed May 08 11:22:25 2013 +0100
@@ -51,6 +51,7 @@
 extern Mutex*   JNIGlobalHandle_lock;            // a lock on creating JNI global handles
 extern Mutex*   JNIHandleBlockFreeList_lock;     // a lock on the JNI handle block free list
 extern Mutex*   JNICachedItableIndex_lock;       // a lock on caching an itable index during JNI invoke
+extern Mutex*   MemberNameTable_lock;            // a lock on the MemberNameTable updates
 extern Mutex*   JmethodIdCreation_lock;          // a lock on creating JNI method identifiers
 extern Mutex*   JfieldIdCreation_lock;           // a lock on creating JNI static field identifiers
 extern Monitor* JNICritical_lock;                // a lock used while entering and exiting JNI critical regions, allows GC to sometimes get in
--- a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -153,8 +153,10 @@
 
 // Set carry flags on the counters if necessary
 void SimpleThresholdPolicy::handle_counter_overflow(Method* method) {
-  set_carry_if_necessary(method->invocation_counter());
-  set_carry_if_necessary(method->backedge_counter());
+  MethodCounters *mcs = method->method_counters();
+  assert(mcs != NULL, "");
+  set_carry_if_necessary(mcs->invocation_counter());
+  set_carry_if_necessary(mcs->backedge_counter());
   MethodData* mdo = method->method_data();
   if (mdo != NULL) {
     set_carry_if_necessary(mdo->invocation_counter());
--- a/hotspot/src/share/vm/runtime/thread.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/runtime/thread.hpp	Wed May 08 11:22:25 2013 +0100
@@ -1056,11 +1056,11 @@
 #if INCLUDE_NMT
   // native memory tracking
   inline MemRecorder* get_recorder() const          { return (MemRecorder*)_recorder; }
-  inline void         set_recorder(MemRecorder* rc) { _recorder = (volatile MemRecorder*)rc; }
+  inline void         set_recorder(MemRecorder* rc) { _recorder = rc; }
 
  private:
   // per-thread memory recorder
-  volatile MemRecorder* _recorder;
+  MemRecorder* volatile _recorder;
 #endif // INCLUDE_NMT
 
   // Suspend/resume support for JavaThread
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp	Wed May 08 11:22:25 2013 +0100
@@ -77,6 +77,7 @@
 #include "oops/klass.hpp"
 #include "oops/markOop.hpp"
 #include "oops/methodData.hpp"
+#include "oops/methodCounters.hpp"
 #include "oops/method.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/objArrayOop.hpp"
@@ -348,16 +349,17 @@
   nonstatic_field(MethodData,           _arg_local,                                    intx)                                  \
   nonstatic_field(MethodData,           _arg_stack,                                    intx)                                  \
   nonstatic_field(MethodData,           _arg_returned,                                 intx)                                  \
-  nonstatic_field(Method,               _constMethod,                                  ConstMethod*)                   \
-  nonstatic_field(Method,               _method_data,                                  MethodData*)                    \
-  nonstatic_field(Method,               _interpreter_invocation_count,                 int)                                   \
+  nonstatic_field(MethodCounters,       _interpreter_invocation_count,                 int)                                   \
+  nonstatic_field(MethodCounters,       _interpreter_throwout_count,                   u2)                                    \
+  nonstatic_field(MethodCounters,       _number_of_breakpoints,                        u2)                                    \
+  nonstatic_field(MethodCounters,       _invocation_counter,                           InvocationCounter)                     \
+  nonstatic_field(MethodCounters,       _backedge_counter,                             InvocationCounter)                     \
+  nonstatic_field(Method,               _constMethod,                                  ConstMethod*)                          \
+  nonstatic_field(Method,               _method_data,                                  MethodData*)                           \
+  nonstatic_field(Method,               _method_counters,                              MethodCounters*)                       \
   nonstatic_field(Method,               _access_flags,                                 AccessFlags)                           \
   nonstatic_field(Method,               _vtable_index,                                 int)                                   \
   nonstatic_field(Method,               _method_size,                                  u2)                                    \
-  nonstatic_field(Method,               _interpreter_throwout_count,                   u2)                                    \
-  nonstatic_field(Method,               _number_of_breakpoints,                        u2)                                    \
-  nonstatic_field(Method,               _invocation_counter,                           InvocationCounter)                     \
-  nonstatic_field(Method,               _backedge_counter,                             InvocationCounter)                     \
   nonproduct_nonstatic_field(Method,    _compiled_invocation_count,                    int)                                   \
   volatile_nonstatic_field(Method,      _code,                                         nmethod*)                              \
   nonstatic_field(Method,               _i2i_entry,                                    address)                               \
@@ -1115,7 +1117,6 @@
   c2_nonstatic_field(PhaseChaitin,       _lo_stk_degree,           uint)                                                             \
   c2_nonstatic_field(PhaseChaitin,       _hi_degree,               uint)                                                             \
   c2_nonstatic_field(PhaseChaitin,       _simplified,              uint)                                                             \
-  c2_nonstatic_field(PhaseChaitin,       _maxlrg,                  uint)                                                             \
                                                                                                                                      \
   c2_nonstatic_field(Block,              _nodes,                   Node_List)                                                        \
   c2_nonstatic_field(Block,              _succs,                   Block_Array)                                                      \
@@ -1382,6 +1383,7 @@
     declare_type(ConstantPoolCache, MetaspaceObj)                  \
     declare_type(MethodData, Metadata)                             \
     declare_type(Method, Metadata)                                 \
+    declare_type(MethodCounters, MetaspaceObj)                     \
     declare_type(ConstMethod, MetaspaceObj)                        \
                                                                           \
            declare_toplevel_type(Symbol)                                  \
--- a/hotspot/src/share/vm/runtime/vmThread.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/runtime/vmThread.cpp	Wed May 08 11:22:25 2013 +0100
@@ -123,7 +123,7 @@
   _queue[prio]->set_next(_queue[prio]);
   _queue[prio]->set_prev(_queue[prio]);
   assert(queue_empty(prio), "drain corrupted queue");
-#ifdef DEBUG
+#ifdef ASSERT
   int len = 0;
   VM_Operation* cur;
   for(cur = r; cur != NULL; cur=cur->next()) len++;
--- a/hotspot/src/share/vm/services/management.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/services/management.cpp	Wed May 08 11:22:25 2013 +0100
@@ -2126,7 +2126,7 @@
     THROW_MSG_(vmSymbols::java_lang_NullPointerException(),
                "Output file name cannot be null.", -1);
   }
-  char* name = java_lang_String::as_utf8_string(on);
+  char* name = java_lang_String::as_platform_dependent_str(on, CHECK_(-1));
   if (name == NULL) {
     THROW_MSG_(vmSymbols::java_lang_NullPointerException(),
                "Output file name cannot be null.", -1);
--- a/hotspot/src/share/vm/services/memBaseline.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/services/memBaseline.hpp	Wed May 08 11:22:25 2013 +0100
@@ -133,7 +133,7 @@
 
 
 // This class aggregates malloc'd records by memory type
-class MallocMem : public _ValueObj {
+class MallocMem VALUE_OBJ_CLASS_SPEC {
  private:
   MEMFLAGS       _type;
 
@@ -211,7 +211,7 @@
 };
 
 // This class aggregates virtual memory by its memory type
-class VMMem : public _ValueObj {
+class VMMem VALUE_OBJ_CLASS_SPEC {
  private:
   MEMFLAGS       _type;
 
@@ -296,7 +296,7 @@
  * aggregates memory usage by callsites when detail tracking
  * is on.
  */
-class MemBaseline : public _ValueObj {
+class MemBaseline VALUE_OBJ_CLASS_SPEC {
   friend class BaselineReporter;
   friend class BaselineComparisonReporter;
 
--- a/hotspot/src/share/vm/services/memPtr.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/services/memPtr.hpp	Wed May 08 11:22:25 2013 +0100
@@ -89,7 +89,7 @@
  * the memory pointer either points to a malloc'd
  * memory block, or a mmap'd memory block
  */
-class MemPointer : public _ValueObj {
+class MemPointer VALUE_OBJ_CLASS_SPEC {
  public:
   MemPointer(): _addr(0) { }
   MemPointer(address addr): _addr(addr) { }
--- a/hotspot/src/share/vm/services/memSnapshot.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/services/memSnapshot.hpp	Wed May 08 11:22:25 2013 +0100
@@ -308,7 +308,7 @@
   }
 };
 
-class StagingArea : public _ValueObj {
+class StagingArea VALUE_OBJ_CLASS_SPEC {
  private:
   MemPointerArray*   _malloc_data;
   MemPointerArray*   _vm_data;
--- a/hotspot/src/share/vm/services/memTrackWorker.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/services/memTrackWorker.cpp	Wed May 08 11:22:25 2013 +0100
@@ -39,7 +39,7 @@
   }
 }
 
-MemTrackWorker::MemTrackWorker() {
+MemTrackWorker::MemTrackWorker(MemSnapshot* snapshot): _snapshot(snapshot) {
   // create thread uses cgc thread type for now. We should revisit
   // the option, or create new thread type.
   _has_error = !os::create_thread(this, os::cgc_thread);
@@ -88,8 +88,7 @@
   assert(MemTracker::is_on(), "native memory tracking is off");
   this->initialize_thread_local_storage();
   this->record_stack_base_and_size();
-  MemSnapshot* snapshot = MemTracker::get_snapshot();
-  assert(snapshot != NULL, "Worker should not be started");
+  assert(_snapshot != NULL, "Worker should not be started");
   MemRecorder* rec;
   unsigned long processing_generation = 0;
   bool          worker_idle = false;
@@ -109,7 +108,7 @@
       }
 
       // merge the recorder into staging area
-      if (!snapshot->merge(rec)) {
+      if (!_snapshot->merge(rec)) {
         MemTracker::shutdown(MemTracker::NMT_out_of_memory);
       } else {
         NOT_PRODUCT(_merge_count ++;)
@@ -132,7 +131,7 @@
           _head = (_head + 1) % MAX_GENERATIONS;
         }
         // promote this generation data to snapshot
-        if (!snapshot->promote(number_of_classes)) {
+        if (!_snapshot->promote(number_of_classes)) {
           // failed to promote, means out of memory
           MemTracker::shutdown(MemTracker::NMT_out_of_memory);
         }
@@ -140,7 +139,7 @@
         // worker thread is idle
         worker_idle = true;
         MemTracker::report_worker_idle();
-        snapshot->wait(1000);
+        _snapshot->wait(1000);
         ThreadCritical tc;
         // check if more data arrived
         if (!_gen[_head].has_more_recorder()) {
--- a/hotspot/src/share/vm/services/memTrackWorker.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/services/memTrackWorker.hpp	Wed May 08 11:22:25 2013 +0100
@@ -32,7 +32,7 @@
 // Maximum MAX_GENERATIONS generation data can be tracked.
 #define MAX_GENERATIONS  512
 
-class GenerationData : public _ValueObj {
+class GenerationData VALUE_OBJ_CLASS_SPEC {
  private:
   int           _number_of_classes;
   MemRecorder*  _recorder_list;
@@ -85,8 +85,10 @@
 
   bool            _has_error;
 
+  MemSnapshot*    _snapshot;
+
  public:
-  MemTrackWorker();
+  MemTrackWorker(MemSnapshot* snapshot);
   ~MemTrackWorker();
   _NOINLINE_ void* operator new(size_t size);
   _NOINLINE_ void* operator new(size_t size, const std::nothrow_t& nothrow_constant);
--- a/hotspot/src/share/vm/services/memTracker.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/services/memTracker.cpp	Wed May 08 11:22:25 2013 +0100
@@ -53,12 +53,12 @@
 }
 
 
-MemRecorder*                    MemTracker::_global_recorder = NULL;
+MemRecorder* volatile           MemTracker::_global_recorder = NULL;
 MemSnapshot*                    MemTracker::_snapshot = NULL;
 MemBaseline                     MemTracker::_baseline;
 Mutex*                          MemTracker::_query_lock = NULL;
-volatile MemRecorder*           MemTracker::_merge_pending_queue = NULL;
-volatile MemRecorder*           MemTracker::_pooled_recorders = NULL;
+MemRecorder* volatile           MemTracker::_merge_pending_queue = NULL;
+MemRecorder* volatile           MemTracker::_pooled_recorders = NULL;
 MemTrackWorker*                 MemTracker::_worker_thread = NULL;
 int                             MemTracker::_sync_point_skip_count = 0;
 MemTracker::NMTLevel            MemTracker::_tracking_level = MemTracker::NMT_off;
@@ -128,7 +128,7 @@
 
   _snapshot = new (std::nothrow)MemSnapshot();
   if (_snapshot != NULL) {
-    if (!_snapshot->out_of_memory() && start_worker()) {
+    if (!_snapshot->out_of_memory() && start_worker(_snapshot)) {
       _state = NMT_started;
       NMT_track_callsite = (_tracking_level == NMT_detail && can_walk_stack());
       return;
@@ -209,7 +209,7 @@
 // delete all pooled recorders
 void MemTracker::delete_all_pooled_recorders() {
   // free all pooled recorders
-  volatile MemRecorder* cur_head = _pooled_recorders;
+  MemRecorder* volatile cur_head = _pooled_recorders;
   if (cur_head != NULL) {
     MemRecorder* null_ptr = NULL;
     while (cur_head != NULL && (void*)cur_head != Atomic::cmpxchg_ptr((void*)null_ptr,
@@ -543,14 +543,14 @@
 /*
  * Start worker thread.
  */
-bool MemTracker::start_worker() {
-  assert(_worker_thread == NULL, "Just Check");
-  _worker_thread = new (std::nothrow) MemTrackWorker();
-  if (_worker_thread == NULL || _worker_thread->has_error()) {
-    if (_worker_thread != NULL) {
-      delete _worker_thread;
-      _worker_thread = NULL;
-    }
+bool MemTracker::start_worker(MemSnapshot* snapshot) {
+  assert(_worker_thread == NULL && _snapshot != NULL, "Just Check");
+  _worker_thread = new (std::nothrow) MemTrackWorker(snapshot);
+  if (_worker_thread == NULL) {
+    return false;
+  } else if (_worker_thread->has_error()) {
+    delete _worker_thread;
+    _worker_thread = NULL;
     return false;
   }
   _worker_thread->start();
--- a/hotspot/src/share/vm/services/memTracker.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/services/memTracker.hpp	Wed May 08 11:22:25 2013 +0100
@@ -421,7 +421,7 @@
 
  private:
   // start native memory tracking worker thread
-  static bool start_worker();
+  static bool start_worker(MemSnapshot* snapshot);
 
   // called by worker thread to complete shutdown process
   static void final_shutdown();
@@ -475,18 +475,18 @@
   // a thread can start to allocate memory before it is attached
   // to VM 'Thread', those memory activities are recorded here.
   // ThreadCritical is required to guard this global recorder.
-  static MemRecorder*     _global_recorder;
+  static MemRecorder* volatile _global_recorder;
 
   // main thread id
   debug_only(static intx   _main_thread_tid;)
 
   // pending recorders to be merged
-  static volatile MemRecorder*      _merge_pending_queue;
+  static MemRecorder* volatile     _merge_pending_queue;
 
   NOT_PRODUCT(static volatile jint   _pending_recorder_count;)
 
   // pooled memory recorders
-  static volatile MemRecorder*      _pooled_recorders;
+  static MemRecorder* volatile     _pooled_recorders;
 
   // memory recorder pool management, uses following
   // counter to determine if a released memory recorder
--- a/hotspot/src/share/vm/services/runtimeService.cpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/services/runtimeService.cpp	Wed May 08 11:22:25 2013 +0100
@@ -120,6 +120,8 @@
 
   // Print the time interval in which the app was executing
   if (PrintGCApplicationConcurrentTime) {
+    gclog_or_tty->date_stamp(PrintGCDateStamps);
+    gclog_or_tty->stamp(PrintGCTimeStamps);
     gclog_or_tty->print_cr("Application time: %3.7f seconds",
                                 last_application_time_sec());
   }
@@ -150,6 +152,8 @@
   // Print the time interval for which the app was stopped
   // during the current safepoint operation.
   if (PrintGCApplicationStoppedTime) {
+    gclog_or_tty->date_stamp(PrintGCDateStamps);
+    gclog_or_tty->stamp(PrintGCTimeStamps);
     gclog_or_tty->print_cr("Total time for which application threads "
                            "were stopped: %3.7f seconds",
                            last_safepoint_time_sec());
--- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp	Wed May 08 11:22:25 2013 +0100
@@ -328,9 +328,10 @@
 
 
 //----------------------------------------------------------------------------------------------------
-// Minimum StringTableSize value
+// Default and minimum StringTableSize values
 
-const int defaultStringTableSize=1009;
+const int defaultStringTableSize = NOT_LP64(1009) LP64_ONLY(60013);
+const int minimumStringTableSize=1009;
 
 
 //----------------------------------------------------------------------------------------------------
--- a/hotspot/test/Makefile	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/test/Makefile	Wed May 08 11:22:25 2013 +0100
@@ -162,7 +162,9 @@
 # jtreg tests
 
 # Expect JT_HOME to be set for jtreg tests. (home for jtreg)
-JT_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
+ifndef JT_HOME
+  JT_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
+endif
 ifdef JPRT_JTREG_HOME
   JT_HOME = $(JPRT_JTREG_HOME)
 endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/6443505/Test6443505.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6443505
+ * @summary Some cases for CmpLTMask missed; also wrong code.
+ *
+ * @run main/othervm -Xcomp -XX:CompileOnly="Test6443505.compiled" Test6443505
+ */
+
+public class Test6443505 {
+
+    public static void main(String[] args) throws InterruptedException {
+        test(Integer.MIN_VALUE, 0);
+        test(0, Integer.MIN_VALUE);
+        test(Integer.MIN_VALUE, -1);
+        test(-1, Integer.MIN_VALUE);
+        test(Integer.MIN_VALUE, 1);
+        test(1, Integer.MIN_VALUE);
+
+        test(Integer.MAX_VALUE, 0);
+        test(0, Integer.MAX_VALUE);
+        test(Integer.MAX_VALUE, -1);
+        test(-1, Integer.MAX_VALUE);
+        test(Integer.MAX_VALUE, 1);
+        test(1, Integer.MAX_VALUE);
+
+        test(Integer.MIN_VALUE, Integer.MAX_VALUE);
+        test(Integer.MAX_VALUE, Integer.MIN_VALUE);
+
+        test(1, -1);
+        test(1, 0);
+        test(1, 1);
+        test(-1, -1);
+        test(-1, 0);
+        test(-1, 1);
+        test(0, -1);
+        test(0, 0);
+        test(0, 1);
+    }
+
+    public static void test(int a, int b) throws InterruptedException {
+        int C = compiled(4, a, b);
+        int I = interpreted(4, a, b);
+        if (C != I) {
+            System.err.println("#1 C = " + C + ", I = " + I);
+            System.err.println("#1 C != I, FAIL");
+            System.exit(97);
+        }
+
+        C = compiled(a, b, q, 4);
+        I = interpreted(a, b, q, 4);
+        if (C != I) {
+            System.err.println("#2 C = " + C + ", I = " + I);
+            System.err.println("#2 C != I, FAIL");
+            System.exit(97);
+        }
+
+    }
+
+    static int q = 4;
+
+    // If improperly compiled, uses carry/borrow bit, which is wrong.
+    // with -XX:+PrintOptoAssembly, look for cadd_cmpLTMask
+    static int compiled(int p, int x, int y) {
+        return (x < y) ? q + (x - y) : (x - y);
+    }
+
+    // interpreted reference
+    static int interpreted(int p, int x, int y) {
+        return (x < y) ? q + (x - y) : (x - y);
+    }
+
+    // Test new code with a range of cases
+    // with -XX:+PrintOptoAssembly, look for and_cmpLTMask
+    static int compiled(int x, int y, int q, int p) {
+        return (x < y) ? p + q : q;
+    }
+
+    // interpreted reference
+    static int interpreted(int x, int y, int q, int p) {
+        return (x < y) ? p + q : q;
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/8011901/Test8011901.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8011901
+ * @summary instruct xaddL_no_res shouldn't allow 64 bit constants.
+ * @run main/othervm -XX:-BackgroundCompilation Test8011901
+ *
+ */
+
+import java.lang.reflect.*;
+import sun.misc.*;
+
+public class Test8011901 {
+
+    private long ctl;
+
+    private static final sun.misc.Unsafe U;
+    private static final long CTL;
+
+    static {
+        try {
+            Field unsafe = sun.misc.Unsafe.class.getDeclaredField("theUnsafe");
+            unsafe.setAccessible(true);
+            U = (sun.misc.Unsafe) unsafe.get(null);
+            CTL = U.objectFieldOffset(Test8011901.class.getDeclaredField("ctl"));
+        } catch (Exception e) {
+            throw new Error(e);
+        }
+    }
+
+    public static void main(String[] args) {
+        for(int c = 0; c < 20000; c++) {
+            new Test8011901().makeTest();
+        }
+        System.out.println("Test Passed");
+    }
+
+    public static final long EXPECTED = 1L << 42;
+
+    public void makeTest() {
+        U.getAndAddLong(this, CTL, EXPECTED);
+        if (ctl != EXPECTED) {
+            throw new RuntimeException("Test failed. Expected: " + EXPECTED + ", but got = " + ctl);
+        }
+    }
+}
--- a/hotspot/test/compiler/whitebox/ClearMethodStateTest.java	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/test/compiler/whitebox/ClearMethodStateTest.java	Wed May 08 11:22:25 2013 +0100
@@ -27,42 +27,61 @@
  * @build ClearMethodStateTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ClearMethodStateTest
+ * @summary testing of WB::clearMethodState()
  * @author igor.ignatyev@oracle.com
  */
 public class ClearMethodStateTest extends CompilerWhiteBoxTest {
+
     public static void main(String[] args) throws Exception {
-        // to prevent inlining #method into #compile() and #test()
-        WHITE_BOX.testSetDontInlineMethod(METHOD, true);
-        new ClearMethodStateTest().runTest();
+        for (TestCase test : TestCase.values()) {
+            new ClearMethodStateTest(test).runTest();
+        }
+    }
+
+    public ClearMethodStateTest(TestCase testCase) {
+        super(testCase);
+        // to prevent inlining of #method
+        WHITE_BOX.testSetDontInlineMethod(method, true);
     }
 
+
+    /**
+     * Tests {@code WB::clearMethodState()} by calling it before/after
+     * compilation. For non-tiered, checks that counters will be rested after
+     * clearing of method state.
+     *
+     * @throws Exception if one of the checks fails.
+     */
+    @Override
     protected void test() throws Exception {
-        checkNotCompiled(METHOD);
+        checkNotCompiled();
         compile();
-        checkCompiled(METHOD);
-        WHITE_BOX.clearMethodState(METHOD);
-        WHITE_BOX.deoptimizeMethod(METHOD);
-        checkNotCompiled(METHOD);
+        WHITE_BOX.clearMethodState(method);
+        checkCompiled();
+        WHITE_BOX.clearMethodState(method);
+        WHITE_BOX.deoptimizeMethod(method);
+        checkNotCompiled();
 
 
         if (!TIERED_COMPILATION) {
-            WHITE_BOX.clearMethodState(METHOD);
+            WHITE_BOX.clearMethodState(method);
             compile(COMPILE_THRESHOLD);
-            checkCompiled(METHOD);
+            checkCompiled();
 
-            WHITE_BOX.deoptimizeMethod(METHOD);
-            checkNotCompiled(METHOD);
-            WHITE_BOX.clearMethodState(METHOD);
+            WHITE_BOX.deoptimizeMethod(method);
+            checkNotCompiled();
+            WHITE_BOX.clearMethodState(method);
 
+            // invoke method one less time than needed to compile
             if (COMPILE_THRESHOLD > 1) {
                 compile(COMPILE_THRESHOLD - 1);
-                checkNotCompiled(METHOD);
+                checkNotCompiled();
             } else {
-               System.err.println("Warning: 'CompileThreshold' <= 1");
+                System.err.println("Warning: 'CompileThreshold' <= 1");
             }
 
-            method();
-            checkCompiled(METHOD);
+            compile(1);
+            checkCompiled();
         } else {
             System.err.println(
                     "Warning: part of test is not applicable in Tiered");
--- a/hotspot/test/compiler/whitebox/CompilerWhiteBoxTest.java	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/test/compiler/whitebox/CompilerWhiteBoxTest.java	Wed May 08 11:22:25 2013 +0100
@@ -21,68 +21,132 @@
  * questions.
  */
 
+import com.sun.management.HotSpotDiagnosticMXBean;
+import com.sun.management.VMOption;
 import sun.hotspot.WhiteBox;
 import sun.management.ManagementFactoryHelper;
-import com.sun.management.HotSpotDiagnosticMXBean;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
 import java.lang.reflect.Method;
+import java.util.Objects;
+import java.util.concurrent.Callable;
 
-/*
+/**
+ * Abstract class for WhiteBox testing of JIT.
+ *
  * @author igor.ignatyev@oracle.com
  */
 public abstract class CompilerWhiteBoxTest {
+    /** {@code CompLevel::CompLevel_none} -- Interpreter */
+    protected static int COMP_LEVEL_NONE = 0;
+    /** {@code CompLevel::CompLevel_any}, {@code CompLevel::CompLevel_all} */
+    protected static int COMP_LEVEL_ANY = -1;
+    /** Instance of WhiteBox */
     protected static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
-    protected static final Method METHOD = getMethod("method");
+    /** Value of {@code -XX:CompileThreshold} */
     protected static final int COMPILE_THRESHOLD
             = Integer.parseInt(getVMOption("CompileThreshold", "10000"));
+    /** Value of {@code -XX:BackgroundCompilation} */
     protected static final boolean BACKGROUND_COMPILATION
             = Boolean.valueOf(getVMOption("BackgroundCompilation", "true"));
+    /** Value of {@code -XX:TieredCompilation} */
     protected static final boolean TIERED_COMPILATION
             = Boolean.valueOf(getVMOption("TieredCompilation", "false"));
+    /** Value of {@code -XX:TieredStopAtLevel} */
+    protected static final int TIERED_STOP_AT_LEVEL
+            = Integer.parseInt(getVMOption("TieredStopAtLevel", "0"));
 
-    protected static Method getMethod(String name) {
+    /**
+     * Returns value of VM option.
+     *
+     * @param name option's name
+     * @return value of option or {@code null}, if option doesn't exist
+     * @throws NullPointerException if name is null
+     */
+    protected static String getVMOption(String name) {
+        Objects.requireNonNull(name);
+        HotSpotDiagnosticMXBean diagnostic
+                = ManagementFactoryHelper.getDiagnosticMXBean();
+        VMOption tmp;
         try {
-            return CompilerWhiteBoxTest.class.getDeclaredMethod(name);
-        } catch (NoSuchMethodException | SecurityException e) {
-            throw new RuntimeException(
-                    "exception on getting method " + name, e);
+            tmp = diagnostic.getVMOption(name);
+        } catch (IllegalArgumentException e) {
+            tmp = null;
         }
+        return (tmp == null ? null : tmp.getValue());
     }
 
-    protected static String getVMOption(String name) {
-        String result;
-        HotSpotDiagnosticMXBean diagnostic
-                = ManagementFactoryHelper.getDiagnosticMXBean();
-        result = diagnostic.getVMOption(name).getValue();
-        return result;
-    }
-
+    /**
+     * Returns value of VM option or default value.
+     *
+     * @param name         option's name
+     * @param defaultValue default value
+     * @return value of option or {@code defaultValue}, if option doesn't exist
+     * @throws NullPointerException if name is null
+     * @see #getVMOption(String)
+     */
     protected static String getVMOption(String name, String defaultValue) {
         String result = getVMOption(name);
         return result == null ? defaultValue : result;
     }
 
-    protected final void runTest() throws RuntimeException {
+    /** tested method */
+    protected final Executable method;
+    private final Callable<Integer> callable;
+
+    /**
+     * Constructor.
+     *
+     * @param testCase object, that contains tested method and way to invoke it.
+     */
+    protected CompilerWhiteBoxTest(TestCase testCase) {
+        Objects.requireNonNull(testCase);
+        System.out.println("TEST CASE:" + testCase.name());
+        method = testCase.executable;
+        callable = testCase.callable;
+    }
+
+    /**
+     * Template method for testing. Prints tested method's info before
+     * {@linkplain #test()} and after {@linkplain #test()} or on thrown
+     * exception.
+     *
+     * @throws RuntimeException if method {@linkplain #test()} throws any
+     *                          exception
+     * @see #test()
+     */
+    protected final void runTest() {
         if (ManagementFactoryHelper.getCompilationMXBean() == null) {
             System.err.println(
                     "Warning: test is not applicable in interpreted mode");
             return;
         }
         System.out.println("at test's start:");
-        printInfo(METHOD);
+        printInfo();
         try {
             test();
         } catch (Exception e) {
             System.out.printf("on exception '%s':", e.getMessage());
-            printInfo(METHOD);
+            printInfo();
             e.printStackTrace();
+            if (e instanceof RuntimeException) {
+                throw (RuntimeException) e;
+            }
             throw new RuntimeException(e);
         }
         System.out.println("at test's end:");
-        printInfo(METHOD);
+        printInfo();
     }
 
-    protected static void checkNotCompiled(Method method) {
+    /**
+     * Checks, that {@linkplain #method} is not compiled.
+     *
+     * @throws RuntimeException if {@linkplain #method} is in compiler queue or
+     *                          is compiled, or if {@linkplain #method} has zero
+     *                          compilation level.
+     */
+    protected final void checkNotCompiled() {
         if (WHITE_BOX.isMethodQueuedForCompilation(method)) {
             throw new RuntimeException(method + " must not be in queue");
         }
@@ -94,10 +158,16 @@
         }
     }
 
-    protected static void checkCompiled(Method method)
-            throws InterruptedException {
+    /**
+     * Checks, that {@linkplain #method} is compiled.
+     *
+     * @throws RuntimeException if {@linkplain #method} isn't in compiler queue
+     *                          and isn't compiled, or if {@linkplain #method}
+     *                          has nonzero compilation level
+     */
+    protected final void checkCompiled() {
         final long start = System.currentTimeMillis();
-        waitBackgroundCompilation(method);
+        waitBackgroundCompilation();
         if (WHITE_BOX.isMethodQueuedForCompilation(method)) {
             System.err.printf("Warning: %s is still in queue after %dms%n",
                     method, System.currentTimeMillis() - start);
@@ -111,23 +181,30 @@
         }
     }
 
-    protected static void waitBackgroundCompilation(Method method)
-            throws InterruptedException {
+    /**
+     * Waits for completion of background compilation of {@linkplain #method}.
+     */
+    protected final void waitBackgroundCompilation() {
         if (!BACKGROUND_COMPILATION) {
             return;
         }
         final Object obj = new Object();
-        synchronized (obj) {
-            for (int i = 0; i < 10; ++i) {
-                if (!WHITE_BOX.isMethodQueuedForCompilation(method)) {
-                    break;
+        for (int i = 0; i < 10
+                && WHITE_BOX.isMethodQueuedForCompilation(method); ++i) {
+            synchronized (obj) {
+                try {
+                    obj.wait(1000);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
                 }
-                obj.wait(1000);
             }
         }
     }
 
-    protected static void printInfo(Method method) {
+    /**
+     * Prints information about {@linkplain #method}.
+     */
+    protected final void printInfo() {
         System.out.printf("%n%s:%n", method);
         System.out.printf("\tcompilable:\t%b%n",
                 WHITE_BOX.isMethodCompilable(method));
@@ -141,22 +218,139 @@
                 WHITE_BOX.getCompileQueuesSize());
     }
 
+    /**
+     * Executes testing.
+     */
     protected abstract void test() throws Exception;
 
+    /**
+     * Tries to trigger compilation of {@linkplain #method} by call
+     * {@linkplain #callable} enough times.
+     *
+     * @return accumulated result
+     * @see #compile(int)
+     */
     protected final int compile() {
         return compile(Math.max(COMPILE_THRESHOLD, 150000));
     }
 
+    /**
+     * Tries to trigger compilation of {@linkplain #method} by call
+     * {@linkplain #callable} specified times.
+     *
+     * @param count invocation count
+     * @return accumulated result
+     */
     protected final int compile(int count) {
         int result = 0;
+        Integer tmp;
         for (int i = 0; i < count; ++i) {
-            result += method();
+            try {
+                tmp = callable.call();
+            } catch (Exception e) {
+                tmp = null;
+            }
+            result += tmp == null ? 0 : tmp;
         }
         System.out.println("method was invoked " + count + " times");
         return result;
     }
+}
 
-    protected int method() {
-        return 42;
+/**
+ * Utility structure containing tested method and object to invoke it.
+ */
+enum TestCase {
+    /** constructor test case */
+    CONSTRUCTOR_TEST(Helper.CONSTRUCTOR, Helper.CONSTRUCTOR_CALLABLE),
+    /** method test case */
+    METOD_TEST(Helper.METHOD, Helper.METHOD_CALLABLE),
+    /** static method test case */
+    STATIC_TEST(Helper.STATIC, Helper.STATIC_CALLABLE);
+
+    /** tested method */
+    final Executable executable;
+    /** object to invoke {@linkplain #executable} */
+    final Callable<Integer> callable;
+
+    private TestCase(Executable executable, Callable<Integer> callable) {
+        this.executable = executable;
+        this.callable = callable;
+    }
+
+    private static class Helper {
+        private static final Callable<Integer> CONSTRUCTOR_CALLABLE
+                = new Callable<Integer>() {
+            @Override
+            public Integer call() throws Exception {
+                return new Helper(1337).hashCode();
+            }
+        };
+
+        private static final Callable<Integer> METHOD_CALLABLE
+                = new Callable<Integer>() {
+            private final Helper helper = new Helper();
+
+            @Override
+            public Integer call() throws Exception {
+                return helper.method();
+            }
+        };
+
+        private static final Callable<Integer> STATIC_CALLABLE
+                = new Callable<Integer>() {
+            @Override
+            public Integer call() throws Exception {
+                return staticMethod();
+            }
+        };
+
+        private static final Constructor CONSTRUCTOR;
+        private static final Method METHOD;
+        private static final Method STATIC;
+
+        static {
+            try {
+                CONSTRUCTOR = Helper.class.getDeclaredConstructor(int.class);
+            } catch (NoSuchMethodException | SecurityException e) {
+                throw new RuntimeException(
+                        "exception on getting method Helper.<init>(int)", e);
+            }
+            try {
+                METHOD = Helper.class.getDeclaredMethod("method");
+            } catch (NoSuchMethodException | SecurityException e) {
+                throw new RuntimeException(
+                        "exception on getting method Helper.method()", e);
+            }
+            try {
+                STATIC = Helper.class.getDeclaredMethod("staticMethod");
+            } catch (NoSuchMethodException | SecurityException e) {
+                throw new RuntimeException(
+                        "exception on getting method Helper.staticMethod()", e);
+            }
+        }
+
+        private static int staticMethod() {
+            return 1138;
+        }
+
+        private int method() {
+            return 42;
+        }
+
+        private final int x;
+
+        public Helper() {
+            x = 0;
+        }
+
+        private Helper(int x) {
+            this.x = x;
+        }
+
+        @Override
+        public int hashCode() {
+            return x;
+        }
     }
 }
--- a/hotspot/test/compiler/whitebox/DeoptimizeAllTest.java	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/test/compiler/whitebox/DeoptimizeAllTest.java	Wed May 08 11:22:25 2013 +0100
@@ -27,20 +27,34 @@
  * @build DeoptimizeAllTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI DeoptimizeAllTest
+ * @summary testing of WB::deoptimizeAll()
  * @author igor.ignatyev@oracle.com
  */
 public class DeoptimizeAllTest extends CompilerWhiteBoxTest {
 
     public static void main(String[] args) throws Exception {
-        // to prevent inlining #method into #compile()
-        WHITE_BOX.testSetDontInlineMethod(METHOD, true);
-        new DeoptimizeAllTest().runTest();
+        for (TestCase test : TestCase.values()) {
+            new DeoptimizeAllTest(test).runTest();
+        }
+    }
+
+    public DeoptimizeAllTest(TestCase testCase) {
+        super(testCase);
+        // to prevent inlining of #method
+        WHITE_BOX.testSetDontInlineMethod(method, true);
     }
 
+    /**
+     * Tests {@code WB::deoptimizeAll()} by calling it after
+     * compilation and checking that method isn't compiled.
+     *
+     * @throws Exception if one of the checks fails.
+     */
+    @Override
     protected void test() throws Exception {
         compile();
-        checkCompiled(METHOD);
+        checkCompiled();
         WHITE_BOX.deoptimizeAll();
-        checkNotCompiled(METHOD);
+        checkNotCompiled();
     }
 }
--- a/hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java	Wed May 08 11:22:25 2013 +0100
@@ -27,20 +27,34 @@
  * @build DeoptimizeMethodTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI DeoptimizeMethodTest
+ * @summary testing of WB::deoptimizeMethod()
  * @author igor.ignatyev@oracle.com
  */
 public class DeoptimizeMethodTest extends CompilerWhiteBoxTest {
 
     public static void main(String[] args) throws Exception {
-        // to prevent inlining #method into #compile()
-        WHITE_BOX.testSetDontInlineMethod(METHOD, true);
-        new DeoptimizeMethodTest().runTest();
+        for (TestCase test : TestCase.values()) {
+            new DeoptimizeMethodTest(test).runTest();
+        }
+    }
+
+    public DeoptimizeMethodTest(TestCase testCase) {
+        super(testCase);
+        // to prevent inlining of #method
+        WHITE_BOX.testSetDontInlineMethod(method, true);
     }
 
+    /**
+     * Tests {@code WB::deoptimizeMethod()} by calling it after
+     * compilation and checking that method isn't compiled.
+     *
+     * @throws Exception if one of the checks fails.
+     */
+    @Override
     protected void test() throws Exception {
         compile();
-        checkCompiled(METHOD);
-        WHITE_BOX.deoptimizeMethod(METHOD);
-        checkNotCompiled(METHOD);
+        checkCompiled();
+        WHITE_BOX.deoptimizeMethod(method);
+        checkNotCompiled();
     }
 }
--- a/hotspot/test/compiler/whitebox/EnqueueMethodForCompilationTest.java	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/test/compiler/whitebox/EnqueueMethodForCompilationTest.java	Wed May 08 11:22:25 2013 +0100
@@ -27,48 +27,60 @@
  * @build EnqueueMethodForCompilationTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI EnqueueMethodForCompilationTest
+ * @summary testing of WB::enqueueMethodForCompilation()
  * @author igor.ignatyev@oracle.com
  */
 public class EnqueueMethodForCompilationTest extends CompilerWhiteBoxTest {
+
     public static void main(String[] args) throws Exception {
-        // to prevent inlining #method into #compile()
-        WHITE_BOX.testSetDontInlineMethod(METHOD, true);
-        new EnqueueMethodForCompilationTest().runTest();
+        for (TestCase test : TestCase.values()) {
+            new EnqueueMethodForCompilationTest(test).runTest();
+        }
+    }
+
+    public EnqueueMethodForCompilationTest(TestCase testCase) {
+        super(testCase);
+        // to prevent inlining of #method
+        WHITE_BOX.testSetDontInlineMethod(method, true);
     }
 
+    @Override
     protected void test() throws Exception {
-        checkNotCompiled(METHOD);
+        checkNotCompiled();
 
-        WHITE_BOX.enqueueMethodForCompilation(METHOD, 0);
-        if (WHITE_BOX.isMethodCompilable(METHOD, 0)) {
-          throw new RuntimeException(METHOD + " is compilable at level 0");
+        // method can not be compiled on level 'none'
+        WHITE_BOX.enqueueMethodForCompilation(method, COMP_LEVEL_NONE);
+        if (WHITE_BOX.isMethodCompilable(method, COMP_LEVEL_NONE)) {
+            throw new RuntimeException(method
+                    + " is compilable at level COMP_LEVEL_NONE");
         }
-        checkNotCompiled(METHOD);
+        checkNotCompiled();
 
-        WHITE_BOX.enqueueMethodForCompilation(METHOD, -1);
-        checkNotCompiled(METHOD);
+        // COMP_LEVEL_ANY is inapplicable as level for compilation
+        WHITE_BOX.enqueueMethodForCompilation(method, COMP_LEVEL_ANY);
+        checkNotCompiled();
 
-        WHITE_BOX.enqueueMethodForCompilation(METHOD, 5);
-        if (!WHITE_BOX.isMethodCompilable(METHOD, 5)) {
-          checkNotCompiled(METHOD);
-          compile();
-          checkCompiled(METHOD);
+        WHITE_BOX.enqueueMethodForCompilation(method, 5);
+        if (!WHITE_BOX.isMethodCompilable(method, 5)) {
+            checkNotCompiled();
+            compile();
+            checkCompiled();
         } else {
-          checkCompiled(METHOD);
+            checkCompiled();
         }
 
-        int compLevel = WHITE_BOX.getMethodCompilationLevel(METHOD);
-        WHITE_BOX.deoptimizeMethod(METHOD);
-        checkNotCompiled(METHOD);
+        int compLevel = WHITE_BOX.getMethodCompilationLevel(method);
+        WHITE_BOX.deoptimizeMethod(method);
+        checkNotCompiled();
 
-        WHITE_BOX.enqueueMethodForCompilation(METHOD, compLevel);
-        checkCompiled(METHOD);
-        WHITE_BOX.deoptimizeMethod(METHOD);
-        checkNotCompiled(METHOD);
+        WHITE_BOX.enqueueMethodForCompilation(method, compLevel);
+        checkCompiled();
+        WHITE_BOX.deoptimizeMethod(method);
+        checkNotCompiled();
 
         compile();
-        checkCompiled(METHOD);
-        WHITE_BOX.deoptimizeMethod(METHOD);
-        checkNotCompiled(METHOD);
+        checkCompiled();
+        WHITE_BOX.deoptimizeMethod(method);
+        checkNotCompiled();
     }
 }
--- a/hotspot/test/compiler/whitebox/IsMethodCompilableTest.java	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/test/compiler/whitebox/IsMethodCompilableTest.java	Wed May 08 11:22:25 2013 +0100
@@ -28,9 +28,13 @@
  * @build IsMethodCompilableTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI IsMethodCompilableTest
+ * @summary testing of WB::isMethodCompilable()
  * @author igor.ignatyev@oracle.com
  */
 public class IsMethodCompilableTest extends CompilerWhiteBoxTest {
+    /**
+     * Value of {@code -XX:PerMethodRecompilationCutoff}
+     */
     protected static final long PER_METHOD_RECOMPILATION_CUTOFF;
 
     static {
@@ -44,14 +48,28 @@
     }
 
     public static void main(String[] args) throws Exception {
-        // to prevent inlining #method into #compile()
-        WHITE_BOX.testSetDontInlineMethod(METHOD, true);
-        new IsMethodCompilableTest().runTest();
+        for (TestCase test : TestCase.values()) {
+            new IsMethodCompilableTest(test).runTest();
+        }
+    }
+
+    public IsMethodCompilableTest(TestCase testCase) {
+        super(testCase);
+        // to prevent inlining of #method
+        WHITE_BOX.testSetDontInlineMethod(method, true);
     }
 
+    /**
+     * Tests {@code WB::isMethodCompilable()} by recompilation of tested method
+     * 'PerMethodRecompilationCutoff' times and checks compilation status. Also
+     * checks that WB::clearMethodState() clears no-compilable flags.
+     *
+     * @throws Exception if one of the checks fails.
+     */
+    @Override
     protected void test() throws Exception {
-        if (!WHITE_BOX.isMethodCompilable(METHOD)) {
-            throw new RuntimeException(METHOD + " must be compilable");
+        if (!WHITE_BOX.isMethodCompilable(method)) {
+            throw new RuntimeException(method + " must be compilable");
         }
         System.out.println("PerMethodRecompilationCutoff = "
                 + PER_METHOD_RECOMPILATION_CUTOFF);
@@ -61,46 +79,47 @@
             return;
         }
 
-        // deoptimze 'PerMethodRecompilationCutoff' times and clear state
+        // deoptimize 'PerMethodRecompilationCutoff' times and clear state
         for (long i = 0L, n = PER_METHOD_RECOMPILATION_CUTOFF - 1; i < n; ++i) {
-            compileAndDeoptimaze();
+            compileAndDeoptimize();
         }
-        if (!WHITE_BOX.isMethodCompilable(METHOD)) {
-            throw new RuntimeException(METHOD + " is not compilable after "
+        if (!WHITE_BOX.isMethodCompilable(method)) {
+            throw new RuntimeException(method + " is not compilable after "
                     + (PER_METHOD_RECOMPILATION_CUTOFF - 1) + " iterations");
         }
-        WHITE_BOX.clearMethodState(METHOD);
+        WHITE_BOX.clearMethodState(method);
 
-        // deoptimze 'PerMethodRecompilationCutoff' + 1 times
+        // deoptimize 'PerMethodRecompilationCutoff' + 1 times
         long i;
         for (i = 0L; i < PER_METHOD_RECOMPILATION_CUTOFF
-                && WHITE_BOX.isMethodCompilable(METHOD); ++i) {
-            compileAndDeoptimaze();
+                && WHITE_BOX.isMethodCompilable(method); ++i) {
+            compileAndDeoptimize();
         }
         if (i != PER_METHOD_RECOMPILATION_CUTOFF) {
-           throw new RuntimeException(METHOD + " is not compilable after "
-                   + i + " iterations, but must only after "
-                   + PER_METHOD_RECOMPILATION_CUTOFF);
+            throw new RuntimeException(method + " is not compilable after "
+                    + i + " iterations, but must only after "
+                    + PER_METHOD_RECOMPILATION_CUTOFF);
         }
-        if (WHITE_BOX.isMethodCompilable(METHOD)) {
-            throw new RuntimeException(METHOD + " is still compilable after "
+        if (WHITE_BOX.isMethodCompilable(method)) {
+            throw new RuntimeException(method + " is still compilable after "
                     + PER_METHOD_RECOMPILATION_CUTOFF + " iterations");
         }
         compile();
-        checkNotCompiled(METHOD);
+        checkNotCompiled();
 
-        WHITE_BOX.clearMethodState(METHOD);
-        if (!WHITE_BOX.isMethodCompilable(METHOD)) {
-            throw new RuntimeException(METHOD
-                    + " is compilable after clearMethodState()");
+        // WB.clearMethodState() must reset no-compilable flags
+        WHITE_BOX.clearMethodState(method);
+        if (!WHITE_BOX.isMethodCompilable(method)) {
+            throw new RuntimeException(method
+                    + " is not compilable after clearMethodState()");
         }
         compile();
-        checkCompiled(METHOD);
+        checkCompiled();
     }
 
-    private void compileAndDeoptimaze() throws Exception {
+    private void compileAndDeoptimize() throws Exception {
         compile();
-        waitBackgroundCompilation(METHOD);
-        WHITE_BOX.deoptimizeMethod(METHOD);
+        waitBackgroundCompilation();
+        WHITE_BOX.deoptimizeMethod(method);
     }
 }
--- a/hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java	Wed May 08 11:22:25 2013 +0100
@@ -27,28 +27,85 @@
  * @build MakeMethodNotCompilableTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI MakeMethodNotCompilableTest
+ * @summary testing of WB::makeMethodNotCompilable()
  * @author igor.ignatyev@oracle.com
  */
 public class MakeMethodNotCompilableTest extends CompilerWhiteBoxTest {
 
     public static void main(String[] args) throws Exception {
-        // to prevent inlining #method into #compile()
-        WHITE_BOX.testSetDontInlineMethod(METHOD, true);
-        new MakeMethodNotCompilableTest().runTest();
+        if (args.length == 0) {
+            for (TestCase test : TestCase.values()) {
+                new MakeMethodNotCompilableTest(test).runTest();
+            }
+        } else {
+            for (String name : args) {
+                new MakeMethodNotCompilableTest(
+                        TestCase.valueOf(name)).runTest();
+            }
+        }
+    }
+
+    public MakeMethodNotCompilableTest(TestCase testCase) {
+        super(testCase);
+        // to prevent inlining of #method
+        WHITE_BOX.testSetDontInlineMethod(method, true);
     }
 
-    protected void test() throws Exception  {
-        if (!WHITE_BOX.isMethodCompilable(METHOD)) {
-            throw new RuntimeException(METHOD + " must be compilable");
+    /**
+     * Tests {@code WB::makeMethodNotCompilable()} by calling it before
+     * compilation and checking that method isn't compiled. Also
+     * checks that WB::clearMethodState() clears no-compilable flags. For
+     * tiered, additional checks for all available levels are conducted.
+     *
+     * @throws Exception if one of the checks fails.
+     */
+    @Override
+    protected void test() throws Exception {
+        checkNotCompiled();
+        if (!WHITE_BOX.isMethodCompilable(method)) {
+            throw new RuntimeException(method + " must be compilable");
         }
-        WHITE_BOX.makeMethodNotCompilable(METHOD);
-        if (WHITE_BOX.isMethodCompilable(METHOD)) {
-            throw new RuntimeException(METHOD + " must be not compilable");
+
+        if (TIERED_COMPILATION) {
+            for (int i = 1, n = TIERED_STOP_AT_LEVEL + 1; i < n; ++i) {
+                WHITE_BOX.makeMethodNotCompilable(method, i);
+                if (WHITE_BOX.isMethodCompilable(method, i)) {
+                    throw new RuntimeException(method
+                            + " must be not compilable at level" + i);
+                }
+                WHITE_BOX.enqueueMethodForCompilation(method, i);
+                checkNotCompiled();
+
+                if (!WHITE_BOX.isMethodCompilable(method)) {
+                    System.out.println(method
+                            + " is not compilable after level " + i);
+                }
+            }
+
+            // WB.clearMethodState() must reset no-compilable flags
+            WHITE_BOX.clearMethodState(method);
+            if (!WHITE_BOX.isMethodCompilable(method)) {
+                throw new RuntimeException(method
+                        + " is not compilable after clearMethodState()");
+            }
+        }
+        WHITE_BOX.makeMethodNotCompilable(method);
+        if (WHITE_BOX.isMethodCompilable(method)) {
+            throw new RuntimeException(method + " must be not compilable");
+        }
+
+        compile();
+        checkNotCompiled();
+        if (WHITE_BOX.isMethodCompilable(method)) {
+            throw new RuntimeException(method + " must be not compilable");
+        }
+        // WB.clearMethodState() must reset no-compilable flags
+        WHITE_BOX.clearMethodState(method);
+        if (!WHITE_BOX.isMethodCompilable(method)) {
+            throw new RuntimeException(method
+                    + " is not compilable after clearMethodState()");
         }
         compile();
-        checkNotCompiled(METHOD);
-        if (WHITE_BOX.isMethodCompilable(METHOD)) {
-            throw new RuntimeException(METHOD + " must be not compilable");
-        }
+        checkCompiled();
     }
 }
--- a/hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java	Wed May 08 11:22:25 2013 +0100
@@ -27,33 +27,47 @@
  * @build SetDontInlineMethodTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI SetDontInlineMethodTest
+ * @summary testing of WB::testSetDontInlineMethod()
  * @author igor.ignatyev@oracle.com
  */
 public class SetDontInlineMethodTest extends CompilerWhiteBoxTest {
 
     public static void main(String[] args) throws Exception {
-        new SetDontInlineMethodTest().runTest();
+        for (TestCase test : TestCase.values()) {
+            new SetDontInlineMethodTest(test).runTest();
+        }
+    }
+
+    public SetDontInlineMethodTest(TestCase testCase) {
+        super(testCase);
     }
 
+    /**
+     * Tests {@code WB::testSetDontInlineMethod()} by sequential calling it and
+     * checking of return value.
+     *
+     * @throws Exception if one of the checks fails.
+     */
+    @Override
     protected void test() throws Exception {
-        if (WHITE_BOX.testSetDontInlineMethod(METHOD, true)) {
-            throw new RuntimeException("on start " + METHOD
+        if (WHITE_BOX.testSetDontInlineMethod(method, true)) {
+            throw new RuntimeException("on start " + method
                     + " must be inlineable");
         }
-        if (!WHITE_BOX.testSetDontInlineMethod(METHOD, true)) {
-            throw new RuntimeException("after first change to true " + METHOD
+        if (!WHITE_BOX.testSetDontInlineMethod(method, true)) {
+            throw new RuntimeException("after first change to true " + method
                     + " must be not inlineable");
         }
-        if (!WHITE_BOX.testSetDontInlineMethod(METHOD, false)) {
-            throw new RuntimeException("after second change to true " + METHOD
+        if (!WHITE_BOX.testSetDontInlineMethod(method, false)) {
+            throw new RuntimeException("after second change to true " + method
                     + " must be still not inlineable");
         }
-        if (WHITE_BOX.testSetDontInlineMethod(METHOD, false)) {
-            throw new RuntimeException("after first change to false" + METHOD
+        if (WHITE_BOX.testSetDontInlineMethod(method, false)) {
+            throw new RuntimeException("after first change to false" + method
                     + " must be inlineable");
         }
-        if (WHITE_BOX.testSetDontInlineMethod(METHOD, false)) {
-            throw new RuntimeException("after second change to false " + METHOD
+        if (WHITE_BOX.testSetDontInlineMethod(method, false)) {
+            throw new RuntimeException("after second change to false " + method
                     + " must be inlineable");
         }
     }
--- a/hotspot/test/compiler/whitebox/SetForceInlineMethodTest.java	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/test/compiler/whitebox/SetForceInlineMethodTest.java	Wed May 08 11:22:25 2013 +0100
@@ -27,33 +27,47 @@
  * @build SetForceInlineMethodTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI SetForceInlineMethodTest
+ * @summary testing of WB::testSetForceInlineMethod()
  * @author igor.ignatyev@oracle.com
  */
 public class SetForceInlineMethodTest extends CompilerWhiteBoxTest {
 
     public static void main(String[] args) throws Exception {
-        new SetForceInlineMethodTest().runTest();
+        for (TestCase test : TestCase.values()) {
+            new SetForceInlineMethodTest(test).runTest();
+        }
+    }
+
+    public SetForceInlineMethodTest(TestCase testCase) {
+        super(testCase);
     }
 
+    /**
+     * Tests {@code WB::testSetForceInlineMethod()} by sequential calling it and
+     * checking of return value.
+     *
+     * @throws Exception if one of the checks fails.
+     */
+    @Override
     protected void test() throws Exception {
-        if (WHITE_BOX.testSetForceInlineMethod(METHOD, true)) {
-            throw new RuntimeException("on start " + METHOD
+        if (WHITE_BOX.testSetForceInlineMethod(method, true)) {
+            throw new RuntimeException("on start " + method
                     + " must be not force inlineable");
         }
-        if (!WHITE_BOX.testSetForceInlineMethod(METHOD, true)) {
-            throw new RuntimeException("after first change to true " + METHOD
+        if (!WHITE_BOX.testSetForceInlineMethod(method, true)) {
+            throw new RuntimeException("after first change to true " + method
                     + " must be force inlineable");
         }
-        if (!WHITE_BOX.testSetForceInlineMethod(METHOD, false)) {
-            throw new RuntimeException("after second change to true " + METHOD
+        if (!WHITE_BOX.testSetForceInlineMethod(method, false)) {
+            throw new RuntimeException("after second change to true " + method
                     + " must be still force inlineable");
         }
-        if (WHITE_BOX.testSetForceInlineMethod(METHOD, false)) {
-            throw new RuntimeException("after first change to false" + METHOD
+        if (WHITE_BOX.testSetForceInlineMethod(method, false)) {
+            throw new RuntimeException("after first change to false" + method
                     + " must be not force inlineable");
         }
-        if (WHITE_BOX.testSetForceInlineMethod(METHOD, false)) {
-            throw new RuntimeException("after second change to false " + METHOD
+        if (WHITE_BOX.testSetForceInlineMethod(method, false)) {
+            throw new RuntimeException("after second change to false " + method
                     + " must be not force inlineable");
         }
     }
--- a/hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java	Wed May 01 12:25:43 2013 +0100
+++ b/hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java	Wed May 08 11:22:25 2013 +0100
@@ -24,7 +24,7 @@
 
 package sun.hotspot;
 
-import java.lang.reflect.Method;
+import java.lang.reflect.Executable;
 import java.security.BasicPermission;
 import sun.hotspot.parser.DiagnosticCommand;
 
@@ -90,22 +90,25 @@
 
   // Compiler
   public native void    deoptimizeAll();
-  public native boolean isMethodCompiled(Method method);
-  public boolean isMethodCompilable(Method method) {
+  public native boolean isMethodCompiled(Executable method);
+  public boolean isMethodCompilable(Executable method) {
       return isMethodCompilable(method, -1 /*any*/);
   }
-  public native boolean isMethodCompilable(Method method, int compLevel);
-  public native boolean isMethodQueuedForCompilation(Method method);
-  public native int     deoptimizeMethod(Method method);
-  public native void    makeMethodNotCompilable(Method method);
-  public native int     getMethodCompilationLevel(Method method);
-  public native boolean testSetDontInlineMethod(Method method, boolean value);
+  public native boolean isMethodCompilable(Executable method, int compLevel);
+  public native boolean isMethodQueuedForCompilation(Executable method);
+  public native int     deoptimizeMethod(Executable method);
+  public void makeMethodNotCompilable(Executable method) {
+      makeMethodNotCompilable(method, -1 /*any*/);
+  }
+  public native void    makeMethodNotCompilable(Executable method, int compLevel);
+  public native int     getMethodCompilationLevel(Executable method);
+  public native boolean testSetDontInlineMethod(Executable method, boolean value);
   public native int     getCompileQueuesSize();
-  public native boolean testSetForceInlineMethod(Method method, boolean value);
-  public native boolean enqueueMethodForCompilation(Method method, int compLevel);
-  public native void    clearMethodState(Method method);
+  public native boolean testSetForceInlineMethod(Executable method, boolean value);
+  public native boolean enqueueMethodForCompilation(Executable method, int compLevel);
+  public native void    clearMethodState(Executable method);
 
-  //Intered strings
+  // Intered strings
   public native boolean isInStringTable(String str);
 
   // force Full GC
--- a/jaxp/.hgtags	Wed May 01 12:25:43 2013 +0100
+++ b/jaxp/.hgtags	Wed May 08 11:22:25 2013 +0100
@@ -208,3 +208,4 @@
 f5f40094ffcc1230e2a5f76ea4c968645369be6c jdk8-b84
 41b50e2c5ea3f4aa1af729e1deb1678cb3e1ef9c jdk8-b85
 ca71ec37b2efc9c3f0971ebabb3a6eb1213d76de jdk8-b86
+eddbc8ad2435a89f64729512337c9f2669e4dd85 jdk8-b87
--- a/jaxws/.hgtags	Wed May 01 12:25:43 2013 +0100
+++ b/jaxws/.hgtags	Wed May 08 11:22:25 2013 +0100
@@ -208,3 +208,4 @@
 5773e3fc83803f392234ba54c3a437ba176f1ead jdk8-b84
 8c0b6bccfe474576d6b30d1582c4329029330150 jdk8-b85
 a5e7c2f093c9996ab3419db1565094a07b059e9c jdk8-b86
+72e03566f0a61282cc48ebc869803b256cccd66c jdk8-b87
--- a/jdk/.hgtags	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/.hgtags	Wed May 08 11:22:25 2013 +0100
@@ -209,3 +209,4 @@
 296676d534c52888c36e305a2bf7f345c4ca70f8 jdk8-b85
 7989cd0cc3a9149864589438ee2c949015d8aa9a jdk8-b86
 d5228e624826a10ccc5b05f30ad8d839b58fe48d jdk8-b87
+8dbb4b159e04de3c447c9242c70505e71f8624c7 jdk8-b88
--- a/jdk/make/docs/CORE_PKGS.gmk	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/make/docs/CORE_PKGS.gmk	Wed May 08 11:22:25 2013 +0100
@@ -142,6 +142,7 @@
   java.util.prefs                                \
   java.util.regex                                \
   java.util.spi                                  \
+  java.util.stream                               \
   java.util.zip                                  \
   javax.accessibility                            \
   javax.activation                               \
--- a/jdk/make/java/java/FILES_java.gmk	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/make/java/java/FILES_java.gmk	Wed May 08 11:22:25 2013 +0100
@@ -252,6 +252,7 @@
     java/util/Scanner.java \
     java/util/InputMismatchException.java \
     java/util/Stack.java \
+    java/util/StringJoiner.java \
     java/util/StringTokenizer.java \
     java/util/TimeZone.java \
         java/util/SimpleTimeZone.java \
--- a/jdk/make/netbeans/common/closed-share-sources.ent	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/make/netbeans/common/closed-share-sources.ent	Wed May 08 11:22:25 2013 +0100
@@ -37,6 +37,7 @@
     <location>${root}/src/closed/share/classes</location>
     <includes>${includes}</includes>
     <excludes>${excludes}</excludes>
+    <encoding>US-ASCII</encoding>
 </source-folder>
 <source-folder>
     <label>Closed-Source Packages</label>
--- a/jdk/make/netbeans/common/demo-view.ent	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/make/netbeans/common/demo-view.ent	Wed May 08 11:22:25 2013 +0100
@@ -31,7 +31,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<source-folder style="tree">
+<source-folder style="tree"> <!-- hierarchy in demo/ dir isn't packages -->
     <label>Demos</label>
     <location>${root}/src/share/demo</location>
     <includes>${demos}</includes>
--- a/jdk/make/netbeans/common/java-data-native.ent	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/make/netbeans/common/java-data-native.ent	Wed May 08 11:22:25 2013 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -34,8 +34,9 @@
 <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
     <compilation-unit>
         <package-root>${root}/src/share/classes</package-root>
+        <package-root>${root}/src/macosx/classes</package-root>
+        <package-root>${root}/src/solaris/classes</package-root>
         <package-root>${root}/src/windows/classes</package-root>
-        <package-root>${root}/src/solaris/classes</package-root>
         <classpath mode="boot">${bootstrap.jdk}/jre/lib/rt.jar</classpath>
         <built-to>${root}/build/${platform}-${arch}/classes</built-to>
         <javadoc-built-to>${root}/build/${platform}-${arch}/docs/api</javadoc-built-to>
@@ -44,6 +45,7 @@
     <compilation-unit>
         <package-root>${root}/test</package-root>
         <unit-tests/>
+        <classpath mode="compile">${jtreg.home}/lib/testng.jar</classpath>
         <source-level>1.8</source-level>
     </compilation-unit>
 </java-data>
--- a/jdk/make/netbeans/common/java-data-no-native.ent	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/make/netbeans/common/java-data-no-native.ent	Wed May 08 11:22:25 2013 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -42,6 +42,7 @@
     <compilation-unit>
         <package-root>${root}/test</package-root>
         <unit-tests/>
+        <classpath mode="compile">${jtreg.home}/lib/testng.jar</classpath>
         <source-level>1.8</source-level>
     </compilation-unit>
 </java-data>
--- a/jdk/make/netbeans/common/jtreg-view.ent	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/make/netbeans/common/jtreg-view.ent	Wed May 08 11:22:25 2013 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<source-folder style="tree">
+<source-folder style="tree"> <!-- hierarchy in test/ dir isn't packages -->
     <label>Tests</label>
     <location>${root}/test</location>
     <includes>${jtreg.tests}</includes>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/netbeans/common/macosx-sources.ent	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+   - Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+
+   - Neither the name of Oracle nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!--
+  OS X is a trademark in the United States and other countries,
+  exclusively licensed through Apple Inc.
+-->
+<source-folder>
+    <label>Sources for OS X™ Platform</label>
+    <type>java</type>
+    <location>${root}/src/macosx/classes</location>
+    <includes>${includes}</includes>
+    <excludes>${excludes}</excludes>
+    <encoding>US-ASCII</encoding>
+</source-folder>
+<source-folder>
+    <label>Sources for OS X™ Platform</label>
+    <location>${root}/src/macosx/classes</location>
+</source-folder>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/netbeans/common/macosx-view.ent	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+   - Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+
+   - Neither the name of Oracle nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!--
+  OS X is a trademark in the United States and other countries,
+  exclusively licensed through Apple Inc.
+-->
+<source-folder style="tree">
+    <label>Sources for OS X™ Platform</label>
+    <location>${root}/src/macosx/classes</location>
+    <includes>${includes}</includes>
+    <excludes>${excludes}</excludes>
+</source-folder>
--- a/jdk/make/netbeans/common/properties.ent	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/make/netbeans/common/properties.ent	Wed May 08 11:22:25 2013 +0100
@@ -41,3 +41,5 @@
 <property-file>${user.home}/.openjdk/build.properties</property-file>
 <property-file>build.properties</property-file>
 <property name="bootstrap.jdk">${java.home}/..</property>
+<property name="jtreg.home">${env.JT_HOME}</property>
+<property name="jtreg.tests">**</property>
--- a/jdk/make/netbeans/common/sample-view.ent	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/make/netbeans/common/sample-view.ent	Wed May 08 11:22:25 2013 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<source-folder style="tree">
+<source-folder style="tree"> <!-- hierarchy in sample/ dir isn't packages -->
     <label>Samples</label>
     <location>${root}/src/share/sample</location>
     <includes>${samples}</includes>
--- a/jdk/make/netbeans/common/share-sources.ent	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/make/netbeans/common/share-sources.ent	Wed May 08 11:22:25 2013 +0100
@@ -37,6 +37,7 @@
     <location>${root}/src/share/classes</location>
     <includes>${includes}</includes>
     <excludes>${excludes}</excludes>
+    <encoding>US-ASCII</encoding>
 </source-folder>
 <source-folder>
     <label>Sources for All Platforms</label>
--- a/jdk/make/netbeans/common/shared.xml	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/make/netbeans/common/shared.xml	Wed May 08 11:22:25 2013 +0100
@@ -276,7 +276,7 @@
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target name="-jtreg" depends="-init,-pre-jtreg,-taskdef-jtreg,-check-tests-defined,-jtreg-setup,-jtreg-make,-jtreg-ant,-post-jtreg">
-        <property name="jtreg.report" location="${jtreg.dir}/JTreport/report.html"/>
+        <property name="jtreg.report" location="${jtreg.dir}/JTreport/html/report.html"/>
         <condition property="jtreg.passed">
             <equals arg1="${jtreg.result}" arg2="0"/>
         </condition>
@@ -338,7 +338,7 @@
         <!-- Note: even with this default value, includes/excludes
          from share.src.dir get javadoc'd; see packageset below -->
         <property name="javadoc.packagenames" value="none"/> <!-- default, can be overridden per user or per project -->
-        <javadoc destdir="${javadoc.dir}" source="1.5"
+        <javadoc destdir="${javadoc.dir}" source="1.8"
             windowtitle="UNOFFICIAL" failonerror="true" use="true"
             author="false" version="false"
             packagenames="${javadoc.packagenames}">
--- a/jdk/make/netbeans/common/unix-sources.ent	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/make/netbeans/common/unix-sources.ent	Wed May 08 11:22:25 2013 +0100
@@ -41,6 +41,7 @@
     <location>${root}/src/solaris/classes</location>
     <includes>${includes}</includes>
     <excludes>${excludes}</excludes>
+    <encoding>US-ASCII</encoding>
 </source-folder>
 <source-folder>
     <label>Sources for Unix® Platform</label>
--- a/jdk/make/netbeans/common/windows-sources.ent	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/make/netbeans/common/windows-sources.ent	Wed May 08 11:22:25 2013 +0100
@@ -37,6 +37,7 @@
     <location>${root}/src/windows/classes</location>
     <includes>${includes}</includes>
     <excludes>${excludes}</excludes>
+    <encoding>US-ASCII</encoding>
 </source-folder>
 <source-folder>
     <label>Sources for Windows Platform</label>
--- a/jdk/make/netbeans/j2se/nbproject/project.xml	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/make/netbeans/j2se/nbproject/project.xml	Wed May 08 11:22:25 2013 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -34,12 +34,14 @@
 <!DOCTYPE project [
     <!ENTITY properties SYSTEM "../../common/properties.ent">
     <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
+    <!ENTITY macosx-sources SYSTEM "../../common/macosx-sources.ent">
     <!ENTITY unix-sources SYSTEM "../../common/unix-sources.ent">
     <!ENTITY windows-sources SYSTEM "../../common/windows-sources.ent">
     <!ENTITY jtreg-sources SYSTEM "../../common/jtreg-sources.ent">
     <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
     <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
     <!ENTITY share-view SYSTEM "../../common/share-view.ent">
+    <!ENTITY macosx-view SYSTEM "../../common/macosx-view.ent">
     <!ENTITY unix-view SYSTEM "../../common/unix-view.ent">
     <!ENTITY windows-view SYSTEM "../../common/windows-view.ent">
     <!ENTITY jtreg-view SYSTEM "../../common/jtreg-view.ent">
@@ -58,6 +60,7 @@
             </properties>
             <folders>
                 &share-sources;
+                &macosx-sources;
                 &unix-sources;
                 &windows-sources;
                 &build-folder;
@@ -83,6 +86,7 @@
             <view>
                 <items>
                     &share-view;
+                    &macosx-view;
                     &unix-view;
                     &windows-view;
                     &jtreg-view;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/netbeans/jdbc/README	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,64 @@
+Working on JDBC Using the NetBeans IDE
+
+This JDBC NetBeans project allows a developer interested in making changes
+to and/or fixing bugs in the JDBC source to modify, build, run and test
+as well as generating the javadoc.
+
+README FIRST
+
+  make/netbeans/README to get started with NetBeans IDE and OpenJDK, and
+  working with the OpenJDK NetBeans projects.
+
+WORKING WITH JDBC
+
+JDBC doesn't contain native code. You don't need to
+have all the Java SE sources to work on JDBC but just the following subset:
+
+            make/netbeans/ 
+            src/share/classes/com/sun/rowset/
+            src/share/classes/java/sql/
+            src/share/classes/javax/sql/
+            test/TEST.ROOT
+            test/java/sql/
+            test/javax/sql/
+
+The set of actions supported by this project are:
+
+* Build Project:
+
+  - Compiles JDBC source files and puts the class files under
+    build/${platform}-${arch}/classes.
+
+  - Generates JDBC's jar file under dist/lib/jdbc.jar
+
+    This new jar file could be used to patch an existing JDK installation
+    by using -Xbootclasspath/p:$MYSRC/dist/lib/jdbc.jar
+
+* Generate Javadoc for Project
+
+  - Generates the javadoc for the JDBC source files,
+
+  - The javadoc is generated under build/${platform}-${arch}/javadoc/jdbc.
+
+* Test Project
+
+  - Runs the JDBC jtreg unit tests located under test/java/sql or test/javax/sql.
+
+  - The test results are written under
+
+        build/${platform}-${arch}/jtreg/jdbc
+
+    and the HTML test report can be found at
+
+        build/${platform}-${arch}/jtreg/jdbc/JTreport/html/report.html
+
+
+
+* Clean Project
+
+  - Cleans the files created by this projet under build and dist.
+
+IMPORTANT NOTE
+
+  Please make sure to follow carefully the governance rules documented at
+  http://openjdk.dev.java.net/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/netbeans/jdbc/build.properties	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,46 @@
+#
+# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#   - Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+#   - Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+#   - Neither the name of Oracle nor the names of its
+#     contributors may be used to endorse or promote products derived
+#     from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+includes=\
+    java/sql/ \
+    javax/sql/ \
+    com/sun/rowset/
+excludes= 
+jtreg.tests=\
+    java/sql/ \
+    javax/sql/
+
+build.jdk.version = 1.8.0
+build.release = ${build.jdk.version}-opensource
+build.number = b00
+jdbc.version = ${build.release}-${user.name}-${build.number}
+jdbc.args = -debug
+javadoc.options=-J-Xmx256m -Xdoclint:none -keywords  -quiet
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/netbeans/jdbc/build.xml	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,52 @@
+<!--
+ Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+   - Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+
+   - Neither the name of Oracle nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<project name="jdbc" default="build" basedir=".">
+
+    <import file="../common/shared.xml"/>
+
+    <target name="-post-compile">
+        <mkdir dir="${dist.dir}/lib"/>
+        <jar destfile="${dist.dir}/lib/jdbc.jar">
+            <fileset dir="${classes.dir}">
+                <include name="java/sql/**/*.class"/>
+                <include name="javax/sql/**/*.class"/>
+                <include name="com/sun/rowset/**/*.class"/>
+            </fileset>
+        </jar>
+    </target>
+
+    
+    <target name="clean" depends="-init,shared.clean">
+        <delete file="${dist.dir}/lib/jdbc.jar"/>
+    </target>
+
+</project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/netbeans/jdbc/nbproject/project.xml	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+   - Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+
+   - Neither the name of Oracle nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<!DOCTYPE project [
+    <!ENTITY properties SYSTEM "../../common/properties.ent">
+    <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
+    <!ENTITY jtreg-sources SYSTEM "../../common/jtreg-sources.ent">
+    <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
+    <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
+    <!ENTITY share-view SYSTEM "../../common/share-view.ent">
+    <!ENTITY jtreg-view SYSTEM "../../common/jtreg-view.ent">
+    <!ENTITY file-view SYSTEM "../../common/file-view.ent">
+    <!ENTITY standard-actions SYSTEM "../../common/standard-actions.ent">
+    <!ENTITY java-data-no-native SYSTEM "../../common/java-data-no-native.ent">
+]>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.ant.freeform</type>
+    <configuration>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
+            <name>JDBC</name> <!-- Customized -->
+            <properties>
+                <property name="name">jdbc</property> <!-- Customized -->
+                &properties;
+            </properties>
+            <folders>
+                &share-sources;
+                &jtreg-sources;
+                &build-folder;
+            </folders>
+            <ide-actions>
+                &standard-bindings;
+                <action name="run">
+                    <target>run</target>
+                </action>
+                <action name="debug">
+                    <target>debug</target>
+                </action>
+               <action name="rowsetjavadoc">
+                    <target>debug</target>
+                </action>
+            </ide-actions>
+            <view>
+                <items>
+                    &share-view;
+                    &jtreg-view;
+                    &file-view;
+                </items>
+                <context-menu>
+                    &standard-actions;
+                    <ide-action name="run"/>
+                    <ide-action name="debug"/>
+                    <ide-action name="rowsetjavadoc"/>
+                </context-menu>
+            </view>
+        </general-data>
+        &java-data-no-native;
+    </configuration>
+</project>
--- a/jdk/make/netbeans/world/nbproject/project.xml	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/make/netbeans/world/nbproject/project.xml	Wed May 08 11:22:25 2013 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -34,11 +34,13 @@
 <!DOCTYPE project [
     <!ENTITY properties SYSTEM "../../common/properties.ent">
     <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
+    <!ENTITY macosx-sources SYSTEM "../../common/macosx-sources.ent">
     <!ENTITY unix-sources SYSTEM "../../common/unix-sources.ent">
     <!ENTITY windows-sources SYSTEM "../../common/windows-sources.ent">
     <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
     <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
     <!ENTITY share-view SYSTEM "../../common/share-view.ent">
+    <!ENTITY macosx-view SYSTEM "../../common/macosx-view.ent">
     <!ENTITY unix-view SYSTEM "../../common/unix-view.ent">
     <!ENTITY windows-view SYSTEM "../../common/windows-view.ent">
     <!ENTITY file-view SYSTEM "../../common/file-view.ent">
@@ -56,6 +58,7 @@
             </properties>
             <folders>
                 &share-sources;
+                &macosx-sources;
                 &unix-sources;
                 &windows-sources;
                 &build-folder;
@@ -66,6 +69,7 @@
             <view>
                 <items>
                     &share-view;
+                    &macosx-view;
                     &unix-view;
                     &windows-view;
                     &file-view;
--- a/jdk/make/tools/src/build/tools/deps/refs.allowed	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/make/tools/src/build/tools/deps/refs.allowed	Wed May 08 11:22:25 2013 +0100
@@ -13,10 +13,11 @@
 javax.security.auth.kerberos.KerberosKey=sun.security.ssl.krb5.KerberosClientKeyExchangeImpl,sun.security.ssl.krb5.Krb5ProxyImpl,compact1,compact2
 javax.security.auth.kerberos.KerberosPrincipal=sun.security.ssl.krb5.KerberosClientKeyExchangeImpl,sun.security.ssl.krb5.Krb5ProxyImpl,compact1,compact2
 javax.security.auth.kerberos.KerberosTicket=sun.security.ssl.krb5.KerberosClientKeyExchangeImpl,sun.security.ssl.krb5.KerberosClientKeyExchangeImpl,compact1,compact2
+javax.security.auth.kerberos.KeyTab=sun.security.ssl.krb5.Krb5ProxyImpl,compact1,compact2
 javax.security.auth.kerberos.ServicePermission=sun.security.ssl.krb5.KerberosClientKeyExchangeImpl,sun.security.ssl.krb5.Krb5ProxyImpl,compact1,compact2
 sun.security.jgss.GSSCaller=sun.security.ssl.krb5.KerberosClientKeyExchangeImpl,sun.security.ssl.krb5.Krb5ProxyImpl,compact1,compact2
 sun.security.jgss.krb5.Krb5Util=sun.security.ssl.krb5.KerberosClientKeyExchangeImpl,sun.security.ssl.krb5.Krb5ProxyImpl,compact1,compact2
-sun.security.jgss.krb5.ServiceCreds=sun.security.ssl.krb5.Krb5ProxyImpl,compact1,compact2
+sun.security.jgss.krb5.ServiceCreds=sun.security.ssl.krb5.Krb5ProxyImpl,sun.security.ssl.krb5.KerberosClientKeyExchangeImpl,compact1,compact2
 sun.security.krb5.EncryptedData= sun.security.ssl.krb5.KerberosPreMasterSecret,sun.security.ssl.krb5.KerberosClientKeyExchangeImpl,compact1,compact2
 sun.security.krb5.EncryptionKey=sun.security.ssl.krb5.KerberosPreMasterSecret,sun.security.ssl.krb5.KerberosClientKeyExchangeImpl,compact1,compact2
 sun.security.krb5.internal.crypto.KeyUsage=sun.security.ssl.krb5.KerberosPreMasterSecret,sun.security.ssl.krb5.KerberosClientKeyExchangeImpl,compact1,compact2
--- a/jdk/makefiles/CopyFiles.gmk	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/makefiles/CopyFiles.gmk	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -294,45 +294,56 @@
 
 
 ifeq ($(OPENJDK_TARGET_CPU_BITS),32)
-    # On 32 bit machines, we can have client and/or server libjvms installed.
-    # Since the currently committed jvm.cfg expects clientANDserver, we need 
-    # to patch the jvm.cfg when we have built only a client or only a server.
-    # This should also support -kernel, -zero and -zeroshark.
-    ifeq ($(JVM_VARIANTS),$(COMMA)client$(COMMA))
-        # Create a patched jvm.cfg to use -client by default and alias -server to -client.
-        $(JVMCFG):
-		$(MKDIR) -p $(@D)
-		$(RM) $(JVMCFG)
-		$(PRINTF) "-client KNOWN\n">$(JVMCFG)
-		$(PRINTF) "-server ALIASED_TO -client\n">>$(JVMCFG)
-		$(PRINTF) "-hotspot ALIASED_TO -client\n">>$(JVMCFG)
-		$(PRINTF) "-classic WARN\n">>$(JVMCFG)
-		$(PRINTF) "-native ERROR\n">>$(JVMCFG)
-		$(PRINTF) "-green ERROR\n">>$(JVMCFG)
+  # On 32-bit machines we have three potential VMs: client, server and minimal.
+  # Historically we usually have both client and server and so that is what the
+  # committed jvm.cfg expects (including platform specific ergonomics switches
+  # to decide whether to use client or server by default). So when we have anything
+  # other than client and server we need to define a new jvm.cfg file.
+  # The main problem is deciding whether to use aliases for the VMs that are not
+  # present and the current position is that we add aliases for client and server, but
+  # not for minimal.
+  # To do: should this also support, -zero and -zeroshark?
+
+  CLIENT_AND_SERVER := $(and $(findstring true,$(JVM_VARIANT_SERVER)),$(findstring true,$(JVM_VARIANT_CLIENT)))
 
+  ifeq ($(CLIENT_AND_SERVER), true)
+    # Use the committed jvm.cfg for this 32 bit setup (the minimal
+    # VM is already KNOWN on platforms that potentially support it)
+    $(JVMCFG): $(JVMCFG_SRC)
+	$(call install-file)
+  else
+    $(JVMCFG):
+	$(MKDIR) -p $(@D)
+	$(RM) $(@)
+
+    # Now check for other permutations
+    ifeq ($(JVM_VARIANT_SERVER), true)
+	$(PRINTF) "-server KNOWN\n">>$(@)
+	$(PRINTF) "-client ALIASED_TO -server\n">>$(@)
+        ifeq ($(JVM_VARIANT_MINIMAL1), true)
+	    $(PRINTF) "-minimal KNOWN\n">>$(@)
+        endif
     else
-        ifeq ($(JVM_VARIANTS),$(COMMA)server$(COMMA))
-            # Create a patched jvm.cfg to use -server by default and alias -client to -server.
-
-            $(JVMCFG):
-		$(MKDIR) -p $(@D)
-		$(RM) $(JVMCFG)
-		$(PRINTF) "-server KNOWN\n">$(JVMCFG)
-		$(PRINTF) "-client IGNORE\n">>$(JVMCFG)
-		$(PRINTF) "-hotspot IGNORE\n">>$(JVMCFG)
-		$(PRINTF) "-classic WARN\n">>$(JVMCFG)
-		$(PRINTF) "-native ERROR\n">>$(JVMCFG)
-		$(PRINTF) "-green ERROR\n">>$(JVMCFG)
+        ifeq ($(JVM_VARIANT_CLIENT), true)
+	    $(PRINTF) "-client KNOWN\n">>$(@)
+	    $(PRINTF) "-server ALIASED_TO -client\n">>$(@)
+            ifeq ($(JVM_VARIANT_MINIMAL1), true)
+	        $(PRINTF) "-minimal KNOWN\n">>$(@)
+            endif
         else
-            # Use the default jvm.cfg for this 32 bit setup. 
-            $(JVMCFG): $(JVMCFG_SRC)
-	    	$(call install-file)
+            ifeq ($(JVM_VARIANT_MINIMAL1), true)
+	        $(PRINTF) "-minimal KNOWN\n">>$(@)
+	        $(PRINTF) "-server ALIASED_TO -minimal\n">>$(@)
+	        $(PRINTF) "-client ALIASED_TO -minimal\n">>$(@)
+            endif
         endif
     endif
+  endif
+
 else
     # Use the default jvm.cfg for this 64 bit setup.
     $(JVMCFG): $(JVMCFG_SRC)
-		$(call install-file)
+	$(call install-file)
 endif
 
 COPY_FILES += $(JVMCFG)
--- a/jdk/makefiles/GensrcX11Wrappers.gmk	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/makefiles/GensrcX11Wrappers.gmk	Wed May 08 11:22:25 2013 +0100
@@ -86,10 +86,15 @@
 	$(MKDIR) -p $(@D)
 	$(TOOL_WRAPPERGENERATOR) $(@D) $(GENSRC_SIZER_DIR)/xlibtypes.txt "sizer" $*
 
+    # use -m32/-m64 only if the compiler supports it
+    ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG),true)
+    MEMORY_MODEL_FLAG="-m$*"
+    endif
+
     # Compile the C code into an executable.
     $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c
 	$(MKDIR) -p $(@D)
-	(cd $(@D) && $(CC) -m$* -o $@ $< \
+	(cd $(@D) && $(CC) $(MEMORY_MODEL_FLAG) -o $@ $< \
               $(X_CFLAGS) \
               $(X_LIBS) \
               -I$(JDK_OUTPUTDIR)/include \
--- a/jdk/makefiles/Images.gmk	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/makefiles/Images.gmk	Wed May 08 11:22:25 2013 +0100
@@ -352,16 +352,22 @@
         JDK_MAN_PAGES += jvisualvm.1
     endif
 
+    ifndef OPENJDK
+        MAN_SRC_BASEDIR:=$(JDK_TOPDIR)/src/closed
+    else
+        MAN_SRC_BASEDIR:=$(JDK_TOPDIR)/src
+    endif
+
     ifeq ($(OPENJDK_TARGET_OS), linux)
-        MAN_SRC_DIR:=$(JDK_TOPDIR)/src/linux/doc
+        MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/linux/doc
         MAN1_SUBDIR:=man
     endif
     ifeq ($(OPENJDK_TARGET_OS), solaris)
-        MAN_SRC_DIR:=$(JDK_TOPDIR)/src/solaris/doc
+        MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/solaris/doc
         MAN1_SUBDIR:=sun/man/man1
     endif
     ifeq ($(OPENJDK_TARGET_OS), macosx)
-        MAN_SRC_DIR:=$(JDK_TOPDIR)/src/bsd/doc
+        MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/bsd/doc
         MAN1_SUBDIR:=man
         JDK_MAN_PAGES := $(filter-out jcmd.1, $(JDK_MAN_PAGES))
         JDK_MAN_PAGES := $(filter-out jvisualvm.1, $(JDK_MAN_PAGES))
--- a/jdk/makefiles/profile-includes.txt	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/makefiles/profile-includes.txt	Wed May 08 11:22:25 2013 +0100
@@ -36,7 +36,6 @@
     $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)npt$(SHARED_LIBRARY_SUFFIX) \
     $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)npt.diz \
     $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)sunec$(SHARED_LIBRARY_SUFFIX) \
-    $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX) \
     $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)verify$(SHARED_LIBRARY_SUFFIX) \
     $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)verify.diz \
     $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)zip$(SHARED_LIBRARY_SUFFIX) \
@@ -172,6 +171,7 @@
     $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)mlib_image$(SHARED_LIBRARY_SUFFIX) \
     $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)splashscreen$(SHARED_LIBRARY_SUFFIX) \
     $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)t2k$(SHARED_LIBRARY_SUFFIX) \
+    $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX) \
     alt-rt.jar \
     charsets.jar \
     cmm/CIEXYZ.pf \
--- a/jdk/src/macosx/bin/x86_64/jvm.cfg	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/macosx/bin/x86_64/jvm.cfg	Wed May 08 11:22:25 2013 +0100
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,3 @@
 #
 -server KNOWN
 -client IGNORE
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_de.properties	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,183 @@
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, it contains the additional strings needed for the Aqua versions of these components:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=Allgemeine Datei
+FileChooser.directoryDescription.textAndMnemonic=Verzeichnis
+FileChooser.newFolderError.textAndMnemonic=Bei der Erstellung des Ordners ist ein Fehler aufgetreten
+FileChooser.newFolderErrorSeparator= :
+FileChooser.acceptAllFileFilter.textAndMnemonic=Alle Dateien
+FileChooser.cancelButton.textAndMnemonic=Abbrechen
+FileChooser.saveButton.textAndMnemonic=Speichern
+FileChooser.openButton.textAndMnemonic=\u00D6ffnen
+FileChooser.saveDialogTitle.textAndMnemonic=Speichern
+FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
+FileChooser.updateButton.textAndMnemonic=Updaten
+FileChooser.helpButton.textAndMnemonic=Hilfe
+FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ffnen
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Speichern
+FileChooser.openTitle.textAndMnemonic=\u00D6ffnen
+FileChooser.newFolderExistsError.textAndMnemonic=Dieser Name ist bereits vergeben
+FileChooser.chooseButton.textAndMnemonic=W\u00E4hlen
+
+FileChooser.newFolderButton.textAndMnemonic=Neuer Ordner
+FileChooser.newFolderTitle.textAndMnemonic=Neuer Ordner
+FileChooser.fileNameLabel.textAndMnemonic=Datei:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Speichern unter:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Dateiformat:
+
+FileChooser.desktopName=Desktop
+FileChooser.newFolderPrompt.textAndMnemonic=Name des neuen Ordners:
+FileChooser.untitledFolderName=unbenannter Ordner
+FileChooser.untitledFileName=unbenannt
+FileChooser.createButton.textAndMnemonic=Erstellen
+
+FileChooser.byDate.textAndMnemonic=\u00C4nderungsdatum
+FileChooser.by.textAndMnemonic=Name
+FileChooser.newFolderAccessibleName=Neuer Ordner
+
+FileChooser.mac.newFolder=unbenannter Ordner
+FileChooser.mac.newFolder.subsequent=unbenannter Ordner {0}
+
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=Vorschau
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Abbrechen
+ColorChooser.reset.textAndMnemonic=&Zur\u00FCcksetzen
+ColorChooser.sample.textAndMnemonic=Beispieltext  Beispieltext
+ColorChooser.swatches.textAndMnemonic=&Muster
+ColorChooser.swatchesRecent.textAndMnemonic=Aktuell:
+ColorChooser.hsb.textAndMnemonic=&HSB
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=Ro&t
+ColorChooser.rgbGreen.textAndMnemonic=Gr\u00FC&n
+ColorChooser.rgbBlue.textAndMnemonic=&Blau
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=&Ja
+OptionPane.noButton.textAndMnemonic=&Nein
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=Abbrechen
+OptionPane.title.textAndMnemonic=Option ausw\u00E4hlen
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=Eingabe
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=Meldung
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=Drucken
+PrintingDialog.titleAborting.textAndMnemonic=Drucken (wird abgebrochen)
+
+PrintingDialog.contentInitial.textAndMnemonic=Druckvorgang l\u00E4uft...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=Seite {0} wurde gedruckt ...
+
+PrintingDialog.contentAborting.textAndMnemonic=Druckvorgang wird abgebrochen ...
+
+PrintingDialog.abortButton.textAndMnemonic=&Abbruch
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Druckvorgang abbrechen
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=Minimieren
+InternalFrame.maxButtonToolTip=Maximieren
+InternalFrame.restoreButtonToolTip=Wiederherstellen
+InternalFrame.closeButtonToolTip=Schlie\u00DFen
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Wiederherstellen
+InternalFrameTitlePane.moveButton.textAndMnemonic=Verschieben
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Gr\u00F6\u00DFe
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimieren
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximieren
+InternalFrameTitlePane.closeButton.textAndMnemonic=Schlie\u00DFen
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=Abfrage weiterleiten
+FormView.resetButton.textAndMnemonic=Zur\u00FCcksetzen
+FormView.browseFileButton.textAndMnemonic=Durchsuchen ...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=Formatvorlagen\u00E4nderung
+AbstractDocument.addition.textAndMnemonic=Hinzuf\u00FCgen
+AbstractDocument.deletion.textAndMnemonic=L\u00F6schen
+AbstractDocument.undo.textAndMnemonic=R\u00FCckg\u00E4ngig
+AbstractDocument.redo.textAndMnemonic=Wiederherstellen
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=Klicken
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=R\u00FCckg\u00E4ngig
+AbstractUndoableEdit.redo.textAndMnemonic=Wiederherstellen
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=togglePopup
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=Fortschritt ...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=linke Schaltfl\u00E4che
+SplitPane.rightButton.textAndMnemonic=rechte Schaltfl\u00E4che
+# Used for Isindex
+IsindexView.prompt=Dieser Index kann durchsucht werden. Geben Sie Schl\u00FCsselw\u00F6rter f\u00FCr die Suche ein:
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=Als Symbol darstellen
+InternalFrameTitlePane.maximizeButtonAccessibleName=Maximieren
+InternalFrameTitlePane.closeButtonAccessibleName=Schlie\u00DFen
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_es.properties	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,183 @@
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, it contains the additional strings needed for the Aqua versions of these components:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=Archivo Gen\u00E9rico
+FileChooser.directoryDescription.textAndMnemonic=Directorio
+FileChooser.newFolderError.textAndMnemonic=Se ha producido un error durante la creaci\u00F3n de carpetas
+FileChooser.newFolderErrorSeparator= :
+FileChooser.acceptAllFileFilter.textAndMnemonic=Todos los Archivos
+FileChooser.cancelButton.textAndMnemonic=Cancelar
+FileChooser.saveButton.textAndMnemonic=Guardar
+FileChooser.openButton.textAndMnemonic=Abrir
+FileChooser.saveDialogTitle.textAndMnemonic=Guardar
+FileChooser.openDialogTitle.textAndMnemonic=Abrir
+FileChooser.updateButton.textAndMnemonic=Actualizar
+FileChooser.helpButton.textAndMnemonic=Ayuda
+FileChooser.directoryOpenButton.textAndMnemonic=Abrir
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Guardar
+FileChooser.openTitle.textAndMnemonic=Abrir
+FileChooser.newFolderExistsError.textAndMnemonic=Ya existe ese nombre
+FileChooser.chooseButton.textAndMnemonic=Seleccionar
+
+FileChooser.newFolderButton.textAndMnemonic=Nueva Carpeta
+FileChooser.newFolderTitle.textAndMnemonic=Nueva Carpeta
+FileChooser.fileNameLabel.textAndMnemonic=Archivo:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Guardar como:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Formato de Archivo:
+
+FileChooser.desktopName=Escritorio
+FileChooser.newFolderPrompt.textAndMnemonic=Nombre de la Nueva Carpeta:
+FileChooser.untitledFolderName=carpeta sin t\u00EDtulo
+FileChooser.untitledFileName=sin t\u00EDtulo
+FileChooser.createButton.textAndMnemonic=Crear
+
+FileChooser.byDate.textAndMnemonic=Fecha de Modificaci\u00F3n
+FileChooser.by.textAndMnemonic=Nombre
+FileChooser.newFolderAccessibleName=Nueva Carpeta
+
+FileChooser.mac.newFolder=carpeta sin t\u00EDtulo
+FileChooser.mac.newFolder.subsequent=carpeta sin t\u00EDtulo {0}
+
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=Vista Previa
+ColorChooser.ok.textAndMnemonic=Aceptar
+ColorChooser.cancel.textAndMnemonic=Cancelar
+ColorChooser.reset.textAndMnemonic=&Restablecer
+ColorChooser.sample.textAndMnemonic=Texto de Ejemplo  Texto de Ejemplo
+ColorChooser.swatches.textAndMnemonic=M&uestras
+ColorChooser.swatchesRecent.textAndMnemonic=Reciente:
+ColorChooser.hsb.textAndMnemonic=&HSB
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=Ro&jo
+ColorChooser.rgbGreen.textAndMnemonic=&Verde
+ColorChooser.rgbBlue.textAndMnemonic=A&zul
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=&S\u00ED
+OptionPane.noButton.textAndMnemonic=&No
+OptionPane.okButton.textAndMnemonic=Aceptar
+OptionPane.cancelButton.textAndMnemonic=Cancelar
+OptionPane.title.textAndMnemonic=Seleccionar una Opci\u00F3n
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=Entrada
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=Mensaje
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=Impresi\u00F3n
+PrintingDialog.titleAborting.textAndMnemonic=Impresi\u00F3n (Abortando)
+
+PrintingDialog.contentInitial.textAndMnemonic=Impresi\u00F3n en curso...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina {0} impresa...
+
+PrintingDialog.contentAborting.textAndMnemonic=Abortando la impresi\u00F3n...
+
+PrintingDialog.abortButton.textAndMnemonic=&Abortar
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impresi\u00F3n
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=Minimizar
+InternalFrame.maxButtonToolTip=Maximizar
+InternalFrame.restoreButtonToolTip=Restaurar
+InternalFrame.closeButtonToolTip=Cerrar
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurar
+InternalFrameTitlePane.moveButton.textAndMnemonic=Mover
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Tama\u00F1o
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimizar
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximizar
+InternalFrameTitlePane.closeButton.textAndMnemonic=Cerrar
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=Enviar Consulta
+FormView.resetButton.textAndMnemonic=Restablecer
+FormView.browseFileButton.textAndMnemonic=Examinar...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=cambio de estilo
+AbstractDocument.addition.textAndMnemonic=adici\u00F3n
+AbstractDocument.deletion.textAndMnemonic=supresi\u00F3n
+AbstractDocument.undo.textAndMnemonic=Deshacer
+AbstractDocument.redo.textAndMnemonic=Rehacer
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=hacer clic
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=Deshacer
+AbstractUndoableEdit.redo.textAndMnemonic=Rehacer
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=togglePopup
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=Progreso...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=bot\u00F3n: izquierda
+SplitPane.rightButton.textAndMnemonic=bot\u00F3n: derecha
+# Used for Isindex
+IsindexView.prompt=En este \u00EDndice se pueden efectuar b\u00FAsquedas. Escriba las palabras clave de b\u00FAsqueda:
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=Convertir en Icono
+InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar
+InternalFrameTitlePane.closeButtonAccessibleName=Cerrar
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_fr.properties	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,183 @@
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, it contains the additional strings needed for the Aqua versions of these components:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=Fichier g\u00E9n\u00E9rique
+FileChooser.directoryDescription.textAndMnemonic=R\u00E9pertoire
+FileChooser.newFolderError.textAndMnemonic=Erreur lors de la cr\u00E9ation du dossier
+FileChooser.newFolderErrorSeparator= :
+FileChooser.acceptAllFileFilter.textAndMnemonic=Tous les fichiers
+FileChooser.cancelButton.textAndMnemonic=Annuler
+FileChooser.saveButton.textAndMnemonic=Enregistrer
+FileChooser.openButton.textAndMnemonic=Ouvrir
+FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer
+FileChooser.openDialogTitle.textAndMnemonic=Ouvrir
+FileChooser.updateButton.textAndMnemonic=Mettre \u00E0 jour
+FileChooser.helpButton.textAndMnemonic=Aide
+FileChooser.directoryOpenButton.textAndMnemonic=Ouvrir
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Enregistrer
+FileChooser.openTitle.textAndMnemonic=Ouvrir
+FileChooser.newFolderExistsError.textAndMnemonic=Ce nom est d\u00E9j\u00E0 utilis\u00E9
+FileChooser.chooseButton.textAndMnemonic=Choisir
+
+FileChooser.newFolderButton.textAndMnemonic=Nouveau dossier
+FileChooser.newFolderTitle.textAndMnemonic=Nouveau dossier
+FileChooser.fileNameLabel.textAndMnemonic=Fichier :
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Enregistrer sous :
+FileChooser.filesOfTypeLabel.textAndMnemonic=Format de fichier :
+
+FileChooser.desktopName=Bureau
+FileChooser.newFolderPrompt.textAndMnemonic=Nom du nouveau dossier :
+FileChooser.untitledFolderName=dossier sans titre
+FileChooser.untitledFileName=sans titre
+FileChooser.createButton.textAndMnemonic=Cr\u00E9er
+
+FileChooser.byDate.textAndMnemonic=Date de modification
+FileChooser.by.textAndMnemonic=Nom
+FileChooser.newFolderAccessibleName=Nouveau dossier
+
+FileChooser.mac.newFolder=dossier sans titre
+FileChooser.mac.newFolder.subsequent=dossier {0} sans titre
+
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=Aper\u00E7u
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Annuler
+ColorChooser.reset.textAndMnemonic=&R\u00E9initialiser
+ColorChooser.sample.textAndMnemonic=Echantillon de texte  Echantillon de texte
+ColorChooser.swatches.textAndMnemonic=&Echantillons
+ColorChooser.swatchesRecent.textAndMnemonic=Dernier :
+ColorChooser.hsb.textAndMnemonic=&TSL
+ColorChooser.hsbHue.textAndMnemonic=T
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=V
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&VB
+ColorChooser.rgbRed.textAndMnemonic=R&ouge
+ColorChooser.rgbGreen.textAndMnemonic=&Vert
+ColorChooser.rgbBlue.textAndMnemonic=&Bleu
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=&Oui
+OptionPane.noButton.textAndMnemonic=&Non
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=Annuler
+OptionPane.title.textAndMnemonic=S\u00E9lectionner une option
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=Entr\u00E9e
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=Message
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=Impression
+PrintingDialog.titleAborting.textAndMnemonic=Impression (abandon)
+
+PrintingDialog.contentInitial.textAndMnemonic=Impression en cours...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=Page {0} imprim\u00E9e...
+
+PrintingDialog.contentAborting.textAndMnemonic=Abandon de l'impression...
+
+PrintingDialog.abortButton.textAndMnemonic=&Abandonner
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abandonner l'impression
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=R\u00E9duire
+InternalFrame.maxButtonToolTip=Agrandir
+InternalFrame.restoreButtonToolTip=Restaurer
+InternalFrame.closeButtonToolTip=Fermer
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurer
+InternalFrameTitlePane.moveButton.textAndMnemonic=D\u00E9placer
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Taille
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=R\u00E9duire
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Agrandir
+InternalFrameTitlePane.closeButton.textAndMnemonic=Fermer
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=Soumettre la requ\u00EAte
+FormView.resetButton.textAndMnemonic=R\u00E9initialiser
+FormView.browseFileButton.textAndMnemonic=Parcourir...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=modification de style
+AbstractDocument.addition.textAndMnemonic=ajout
+AbstractDocument.deletion.textAndMnemonic=suppression
+AbstractDocument.undo.textAndMnemonic=Annuler
+AbstractDocument.redo.textAndMnemonic=R\u00E9tablir
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=cliquer
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=Annuler
+AbstractUndoableEdit.redo.textAndMnemonic=R\u00E9tablir
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=togglePopup
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=Progression...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=bouton gauche
+SplitPane.rightButton.textAndMnemonic=bouton droit
+# Used for Isindex
+IsindexView.prompt=Ceci est un index de recherche. Tapez des mots-cl\u00E9s pour la recherche :
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=R\u00E9duire
+InternalFrameTitlePane.maximizeButtonAccessibleName=Agrandir
+InternalFrameTitlePane.closeButtonAccessibleName=Fermer
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_it.properties	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,183 @@
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, it contains the additional strings needed for the Aqua versions of these components:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=File generico
+FileChooser.directoryDescription.textAndMnemonic=Directory
+FileChooser.newFolderError.textAndMnemonic=Si \u00E8 verificato un errore durante la creazione della cartella
+FileChooser.newFolderErrorSeparator= :
+FileChooser.acceptAllFileFilter.textAndMnemonic=Tutti i file
+FileChooser.cancelButton.textAndMnemonic=Annulla
+FileChooser.saveButton.textAndMnemonic=Salva
+FileChooser.openButton.textAndMnemonic=Apri
+FileChooser.saveDialogTitle.textAndMnemonic=Salva
+FileChooser.openDialogTitle.textAndMnemonic=Apri
+FileChooser.updateButton.textAndMnemonic=Aggiorna
+FileChooser.helpButton.textAndMnemonic=?
+FileChooser.directoryOpenButton.textAndMnemonic=Apri
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Salva
+FileChooser.openTitle.textAndMnemonic=Apri
+FileChooser.newFolderExistsError.textAndMnemonic=Il nome \u00E8 gi\u00E0 stato assegnato
+FileChooser.chooseButton.textAndMnemonic=Scegli
+
+FileChooser.newFolderButton.textAndMnemonic=Nuova cartella
+FileChooser.newFolderTitle.textAndMnemonic=Nuova cartella
+FileChooser.fileNameLabel.textAndMnemonic=File:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Salva con nome:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Formato file:
+
+FileChooser.desktopName=Desktop
+FileChooser.newFolderPrompt.textAndMnemonic=Nome nuova cartella:
+FileChooser.untitledFolderName=cartella senza titolo
+FileChooser.untitledFileName=senza titolo
+FileChooser.createButton.textAndMnemonic=Crea
+
+FileChooser.byDate.textAndMnemonic=Data modifica
+FileChooser.by.textAndMnemonic=Nome
+FileChooser.newFolderAccessibleName=Nuova cartella
+
+FileChooser.mac.newFolder=cartella senza titolo
+FileChooser.mac.newFolder.subsequent=cartella senza titolo {0}
+
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=Anteprima
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Annulla
+ColorChooser.reset.textAndMnemonic=R&eimposta
+ColorChooser.sample.textAndMnemonic=Testo di prova          Testo di prova
+ColorChooser.swatches.textAndMnemonic=Colori ca&mpione
+ColorChooser.swatchesRecent.textAndMnemonic=Recenti:
+ColorChooser.hsb.textAndMnemonic=&HSB
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=&Rosso
+ColorChooser.rgbGreen.textAndMnemonic=Ver&de
+ColorChooser.rgbBlue.textAndMnemonic=&Blu
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=&S\u00EC
+OptionPane.noButton.textAndMnemonic=&No
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=Annulla
+OptionPane.title.textAndMnemonic=Selezionare una opzione
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=Input
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=Messaggio
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=Stampa in corso
+PrintingDialog.titleAborting.textAndMnemonic=Stampa in corso (operazione interrotta)
+
+PrintingDialog.contentInitial.textAndMnemonic=Stampa in corso...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=Pagina stampata {0}...
+
+PrintingDialog.contentAborting.textAndMnemonic=Interruzione della stampa in corso...
+
+PrintingDialog.abortButton.textAndMnemonic=&Interrompi
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Interrompe la stampa
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=Riduce a icona
+InternalFrame.maxButtonToolTip=Ingrandisce
+InternalFrame.restoreButtonToolTip=Ripristina
+InternalFrame.closeButtonToolTip=Chiude
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Ripristina
+InternalFrameTitlePane.moveButton.textAndMnemonic=Sposta
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Dimensiona
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Riduci a icona
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Ingrandisci
+InternalFrameTitlePane.closeButton.textAndMnemonic=Chiudi
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=Sottometti query
+FormView.resetButton.textAndMnemonic=Reimposta
+FormView.browseFileButton.textAndMnemonic=Sfoglia...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=modifica di stile
+AbstractDocument.addition.textAndMnemonic=aggiunta
+AbstractDocument.deletion.textAndMnemonic=eliminazione
+AbstractDocument.undo.textAndMnemonic=Annulla
+AbstractDocument.redo.textAndMnemonic=Ripeti
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=fare clic
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=Annulla
+AbstractUndoableEdit.redo.textAndMnemonic=Ripeti
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=togglePopup
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=In corso...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=pulsante sinistro
+SplitPane.rightButton.textAndMnemonic=pulsante destro
+# Used for Isindex
+IsindexView.prompt=Questo \u00E8 un indice di ricerca. Immettere le parole chiave:
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=Riduci a icona
+InternalFrameTitlePane.maximizeButtonAccessibleName=Ingrandisci
+InternalFrameTitlePane.closeButtonAccessibleName=Chiudi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_ja.properties	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,183 @@
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, it contains the additional strings needed for the Aqua versions of these components:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=\u6C4E\u7528\u30D5\u30A1\u30A4\u30EB
+FileChooser.directoryDescription.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA
+FileChooser.newFolderError.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+FileChooser.newFolderErrorSeparator= :
+FileChooser.acceptAllFileFilter.textAndMnemonic=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
+FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openButton.textAndMnemonic=\u958B\u304F
+FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F
+FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0
+FileChooser.helpButton.textAndMnemonic=\u30D8\u30EB\u30D7
+FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u304F
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openTitle.textAndMnemonic=\u958B\u304F
+FileChooser.newFolderExistsError.textAndMnemonic=\u305D\u306E\u540D\u524D\u306F\u3059\u3067\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
+FileChooser.chooseButton.textAndMnemonic=\u9078\u629E
+
+FileChooser.newFolderButton.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.newFolderTitle.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=\u5225\u540D\u4FDD\u5B58:
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F:
+
+FileChooser.desktopName=\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7
+FileChooser.newFolderPrompt.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u540D\u524D:
+FileChooser.untitledFolderName=\u7121\u984C\u306E\u30D5\u30A9\u30EB\u30C0
+FileChooser.untitledFileName=\u7121\u984C
+FileChooser.createButton.textAndMnemonic=\u4F5C\u6210
+
+FileChooser.byDate.textAndMnemonic=\u5909\u66F4\u65E5
+FileChooser.by.textAndMnemonic=\u540D\u524D
+FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+
+FileChooser.mac.newFolder=\u7121\u984C\u306E\u30D5\u30A9\u30EB\u30C0
+FileChooser.mac.newFolder.subsequent=\u7121\u984C\u306E\u30D5\u30A9\u30EB\u30C0{0}
+
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=\u30D7\u30EC\u30D3\u30E5\u30FC
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
+ColorChooser.reset.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8(&R)
+ColorChooser.sample.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8  \u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8
+ColorChooser.swatches.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0:
+ColorChooser.hsb.textAndMnemonic=HSB(&H)
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
+ColorChooser.rgbRed.textAndMnemonic=\u8D64(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\u7DD1(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\u9752(&B)
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=\u306F\u3044(&Y)
+OptionPane.noButton.textAndMnemonic=\u3044\u3044\u3048(&N)
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+OptionPane.title.textAndMnemonic=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=\u5165\u529B
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=\u30E1\u30C3\u30BB\u30FC\u30B8
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=\u5370\u5237\u3057\u3066\u3044\u307E\u3059
+PrintingDialog.titleAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059
+
+PrintingDialog.contentInitial.textAndMnemonic=\u5370\u5237\u4E2D...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=\u30DA\u30FC\u30B8{0}\u3092\u5370\u5237\u3057\u307E\u3057\u305F...
+
+PrintingDialog.contentAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059...
+
+PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\u5370\u5237\u306E\u4E2D\u6B62
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
+InternalFrame.maxButtonToolTip=\u6700\u5927\u5316
+InternalFrame.restoreButtonToolTip=\u5FA9\u5143
+InternalFrame.closeButtonToolTip=\u9589\u3058\u308B
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u5FA9\u5143
+InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\u30B5\u30A4\u30BA
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButton.textAndMnemonic=\u9589\u3058\u308B
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=\u554F\u5408\u305B\u306E\u5B9F\u884C
+FormView.resetButton.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8
+FormView.browseFileButton.textAndMnemonic=\u53C2\u7167...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=\u30B9\u30BF\u30A4\u30EB\u5909\u66F4
+AbstractDocument.addition.textAndMnemonic=\u8FFD\u52A0
+AbstractDocument.deletion.textAndMnemonic=\u524A\u9664
+AbstractDocument.undo.textAndMnemonic=\u5143\u306B\u623B\u3059
+AbstractDocument.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=\u30AF\u30EA\u30C3\u30AF
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=\u5143\u306B\u623B\u3059
+AbstractUndoableEdit.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=\u30C8\u30B0\u30EB\u30FB\u30DD\u30C3\u30D7\u30A2\u30C3\u30D7
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=\u9032\u884C\u4E2D...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=\u5DE6\u30DC\u30BF\u30F3
+SplitPane.rightButton.textAndMnemonic=\u53F3\u30DC\u30BF\u30F3
+# Used for Isindex
+IsindexView.prompt=\u691C\u7D22\u7528\u306E\u7D22\u5F15\u3067\u3059\u3002\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044:
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=\u30A2\u30A4\u30B3\u30F3\u5316
+InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButtonAccessibleName=\u9589\u3058\u308B
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_ko.properties	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,183 @@
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, it contains the additional strings needed for the Aqua versions of these components:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=\uC77C\uBC18 \uD30C\uC77C
+FileChooser.directoryDescription.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC
+FileChooser.newFolderError.textAndMnemonic=\uD3F4\uB354 \uC0DD\uC131 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
+FileChooser.newFolderErrorSeparator= :
+FileChooser.acceptAllFileFilter.textAndMnemonic=\uBAA8\uB4E0 \uD30C\uC77C
+FileChooser.cancelButton.textAndMnemonic=\uCDE8\uC18C
+FileChooser.saveButton.textAndMnemonic=\uC800\uC7A5
+FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30
+FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
+FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
+FileChooser.updateButton.textAndMnemonic=\uAC31\uC2E0
+FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0
+FileChooser.directoryOpenButton.textAndMnemonic=\uC5F4\uAE30
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=\uC800\uC7A5
+FileChooser.openTitle.textAndMnemonic=\uC5F4\uAE30
+FileChooser.newFolderExistsError.textAndMnemonic=\uD574\uB2F9 \uC774\uB984\uC740 \uC774\uBBF8 \uC0AC\uC6A9 \uC911\uC785\uB2C8\uB2E4.
+FileChooser.chooseButton.textAndMnemonic=\uC120\uD0DD
+
+FileChooser.newFolderButton.textAndMnemonic=\uC0C8 \uD3F4\uB354
+FileChooser.newFolderTitle.textAndMnemonic=\uC0C8 \uD3F4\uB354
+FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=\uB2E4\uB978 \uC774\uB984\uC73C\uB85C \uC800\uC7A5:
+FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uD615\uC2DD:
+
+FileChooser.desktopName=\uB370\uC2A4\uD06C\uD1B1
+FileChooser.newFolderPrompt.textAndMnemonic=\uC0C8 \uD3F4\uB354\uC758 \uC774\uB984:
+FileChooser.untitledFolderName=\uC81C\uBAA9 \uC5C6\uB294 \uD3F4\uB354
+FileChooser.untitledFileName=\uC81C\uBAA9 \uC5C6\uC74C
+FileChooser.createButton.textAndMnemonic=\uC0DD\uC131
+
+FileChooser.byDate.textAndMnemonic=\uC218\uC815\uB41C \uB0A0\uC9DC
+FileChooser.by.textAndMnemonic=\uC774\uB984
+FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354
+
+FileChooser.mac.newFolder=\uC81C\uBAA9 \uC5C6\uB294 \uD3F4\uB354
+FileChooser.mac.newFolder.subsequent=\uC81C\uBAA9 \uC5C6\uB294 \uD3F4\uB354 {0}
+
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=\uBBF8\uB9AC\uBCF4\uAE30
+ColorChooser.ok.textAndMnemonic=\uD655\uC778
+ColorChooser.cancel.textAndMnemonic=\uCDE8\uC18C
+ColorChooser.reset.textAndMnemonic=\uC7AC\uC124\uC815(&R)
+ColorChooser.sample.textAndMnemonic=\uC0D8\uD50C \uD14D\uC2A4\uD2B8  \uC0D8\uD50C \uD14D\uC2A4\uD2B8
+ColorChooser.swatches.textAndMnemonic=\uACAC\uBCF8(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\uCD5C\uADFC \uBAA9\uB85D:
+ColorChooser.hsb.textAndMnemonic=HSB(&H)
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
+ColorChooser.rgbRed.textAndMnemonic=\uBE68\uAC04\uC0C9(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\uB179\uC0C9(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\uD30C\uB780\uC0C9(&B)
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=\uC608(&Y)
+OptionPane.noButton.textAndMnemonic=\uC544\uB2C8\uC624(&N)
+OptionPane.okButton.textAndMnemonic=\uD655\uC778
+OptionPane.cancelButton.textAndMnemonic=\uCDE8\uC18C
+OptionPane.title.textAndMnemonic=\uC635\uC158 \uC120\uD0DD
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=\uC785\uB825
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=\uBA54\uC2DC\uC9C0
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=\uC778\uC1C4
+PrintingDialog.titleAborting.textAndMnemonic=\uC778\uC1C4(\uC911\uB2E8 \uC911)
+
+PrintingDialog.contentInitial.textAndMnemonic=\uC778\uC1C4 \uC9C4\uD589 \uC911...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=\uC778\uC1C4\uB41C \uD398\uC774\uC9C0 {0}...
+
+PrintingDialog.contentAborting.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8 \uC911...
+
+PrintingDialog.abortButton.textAndMnemonic=\uC911\uB2E8(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=\uCD5C\uC18C\uD654
+InternalFrame.maxButtonToolTip=\uCD5C\uB300\uD654
+InternalFrame.restoreButtonToolTip=\uBCF5\uC6D0
+InternalFrame.closeButtonToolTip=\uB2EB\uAE30
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\uBCF5\uC6D0
+InternalFrameTitlePane.moveButton.textAndMnemonic=\uC774\uB3D9
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\uD06C\uAE30
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\uCD5C\uC18C\uD654
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\uCD5C\uB300\uD654
+InternalFrameTitlePane.closeButton.textAndMnemonic=\uB2EB\uAE30
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=\uC9C8\uC758 \uC81C\uCD9C
+FormView.resetButton.textAndMnemonic=\uC7AC\uC124\uC815
+FormView.browseFileButton.textAndMnemonic=\uCC3E\uC544\uBCF4\uAE30...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=\uC2A4\uD0C0\uC77C \uBCC0\uACBD
+AbstractDocument.addition.textAndMnemonic=\uCD94\uAC00
+AbstractDocument.deletion.textAndMnemonic=\uC0AD\uC81C
+AbstractDocument.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C
+AbstractDocument.redo.textAndMnemonic=\uC7AC\uC2E4\uD589
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=\uB204\uB974\uAE30
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C
+AbstractUndoableEdit.redo.textAndMnemonic=\uC7AC\uC2E4\uD589
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=togglePopup
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=\uC9C4\uD589...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=\uC67C\uCABD \uB2E8\uCD94
+SplitPane.rightButton.textAndMnemonic=\uC624\uB978\uCABD \uB2E8\uCD94
+# Used for Isindex
+IsindexView.prompt=\uB2E4\uC74C\uC740 \uAC80\uC0C9 \uAC00\uB2A5\uD55C \uC778\uB371\uC2A4\uC785\uB2C8\uB2E4. \uAC80\uC0C9 \uD0A4\uC6CC\uB4DC \uC785\uB825:
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=\uC544\uC774\uCF58\uD654
+InternalFrameTitlePane.maximizeButtonAccessibleName=\uCD5C\uB300\uD654
+InternalFrameTitlePane.closeButtonAccessibleName=\uB2EB\uAE30
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_pt_BR.properties	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,183 @@
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, it contains the additional strings needed for the Aqua versions of these components:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=Arquivo Gen\u00E9rico
+FileChooser.directoryDescription.textAndMnemonic=Diret\u00F3rio
+FileChooser.newFolderError.textAndMnemonic=Ocorreu um erro durante a cria\u00E7\u00E3o da pasta
+FileChooser.newFolderErrorSeparator= :
+FileChooser.acceptAllFileFilter.textAndMnemonic=Todos os Arquivos
+FileChooser.cancelButton.textAndMnemonic=Cancelar
+FileChooser.saveButton.textAndMnemonic=Salvar
+FileChooser.openButton.textAndMnemonic=Abrir
+FileChooser.saveDialogTitle.textAndMnemonic=Salvar
+FileChooser.openDialogTitle.textAndMnemonic=Abrir
+FileChooser.updateButton.textAndMnemonic=Atualizar
+FileChooser.helpButton.textAndMnemonic=Ajuda
+FileChooser.directoryOpenButton.textAndMnemonic=Abrir
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Salvar
+FileChooser.openTitle.textAndMnemonic=Abrir
+FileChooser.newFolderExistsError.textAndMnemonic=Este nome j\u00E1 foi utilizado
+FileChooser.chooseButton.textAndMnemonic=Escolher
+
+FileChooser.newFolderButton.textAndMnemonic=Nova Pasta
+FileChooser.newFolderTitle.textAndMnemonic=Nova Pasta
+FileChooser.fileNameLabel.textAndMnemonic=Arquivo:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Salvar como:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Formato do Arquivo:
+
+FileChooser.desktopName=\u00C1rea de Trabalho
+FileChooser.newFolderPrompt.textAndMnemonic=Nome da nova pasta:
+FileChooser.untitledFolderName=pasta sem t\u00EDtulo
+FileChooser.untitledFileName=sem t\u00EDtulo
+FileChooser.createButton.textAndMnemonic=Criar
+
+FileChooser.byDate.textAndMnemonic=Data da Modifica\u00E7\u00E3o
+FileChooser.by.textAndMnemonic=Nome
+FileChooser.newFolderAccessibleName=Nova Pasta
+
+FileChooser.mac.newFolder=pasta sem t\u00EDtulo
+FileChooser.mac.newFolder.subsequent=pasta sem t\u00EDtulo {0}
+
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=Visualizar
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Cancelar
+ColorChooser.reset.textAndMnemonic=&Redefinir
+ColorChooser.sample.textAndMnemonic=Texto de Amostra Texto de Amostra
+ColorChooser.swatches.textAndMnemonic=Amo&stras
+ColorChooser.swatchesRecent.textAndMnemonic=Recente:
+ColorChooser.hsb.textAndMnemonic=&HSB
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=&Vermelho
+ColorChooser.rgbGreen.textAndMnemonic=&Verde
+ColorChooser.rgbBlue.textAndMnemonic=&Azul
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=&Sim
+OptionPane.noButton.textAndMnemonic=&N\u00E3o
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=Cancelar
+OptionPane.title.textAndMnemonic=Selecionar uma Op\u00E7\u00E3o
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=Entrada
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=Mensagem
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=Impress\u00E3o
+PrintingDialog.titleAborting.textAndMnemonic=Impress\u00E3o (Abortando)
+
+PrintingDialog.contentInitial.textAndMnemonic=Impress\u00E3o em andamento...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina impressa {0}...
+
+PrintingDialog.contentAborting.textAndMnemonic=Abortando impress\u00E3o...
+
+PrintingDialog.abortButton.textAndMnemonic=&Abortar
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impress\u00E3o
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=Minimizar
+InternalFrame.maxButtonToolTip=Maximizar
+InternalFrame.restoreButtonToolTip=Restaurar
+InternalFrame.closeButtonToolTip=Fechar
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurar
+InternalFrameTitlePane.moveButton.textAndMnemonic=Mover
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Tamanho
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimizar
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximizar
+InternalFrameTitlePane.closeButton.textAndMnemonic=Fechar
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=Submeter Consulta
+FormView.resetButton.textAndMnemonic=Redefinir
+FormView.browseFileButton.textAndMnemonic=Procurar...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=altera\u00E7\u00E3o de estilo
+AbstractDocument.addition.textAndMnemonic=adi\u00E7\u00E3o
+AbstractDocument.deletion.textAndMnemonic=dele\u00E7\u00E3o
+AbstractDocument.undo.textAndMnemonic=Desfazer
+AbstractDocument.redo.textAndMnemonic=Refazer
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=clicar
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=Desfazer
+AbstractUndoableEdit.redo.textAndMnemonic=Refazer
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=togglePopup
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=Andamento...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=bot\u00E3o esquerdo
+SplitPane.rightButton.textAndMnemonic=bot\u00E3o direito
+# Used for Isindex
+IsindexView.prompt=Trata-se de um \u00EDndice pesquis\u00E1vel. Informe as palavras-chave de pesquisa:
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=Iconizar
+InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar
+InternalFrameTitlePane.closeButtonAccessibleName=Fechar
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_sv.properties	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,183 @@
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, it contains the additional strings needed for the Aqua versions of these components:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=Generisk fil
+FileChooser.directoryDescription.textAndMnemonic=Katalog
+FileChooser.newFolderError.textAndMnemonic=Ett fel intr\u00E4ffade n\u00E4r en mapp skulle skapas
+FileChooser.newFolderErrorSeparator= :
+FileChooser.acceptAllFileFilter.textAndMnemonic=Alla filer
+FileChooser.cancelButton.textAndMnemonic=Avbryt
+FileChooser.saveButton.textAndMnemonic=Spara
+FileChooser.openButton.textAndMnemonic=\u00D6ppna
+FileChooser.saveDialogTitle.textAndMnemonic=Spara
+FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna
+FileChooser.updateButton.textAndMnemonic=Uppdatera
+FileChooser.helpButton.textAndMnemonic=Hj\u00E4lp
+FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ppna
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=Spara
+FileChooser.openTitle.textAndMnemonic=\u00D6ppna
+FileChooser.newFolderExistsError.textAndMnemonic=Namnet finns redan
+FileChooser.chooseButton.textAndMnemonic=V\u00E4lj
+
+FileChooser.newFolderButton.textAndMnemonic=Ny mapp
+FileChooser.newFolderTitle.textAndMnemonic=Ny mapp
+FileChooser.fileNameLabel.textAndMnemonic=Fil:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=Spara som:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Filformat:
+
+FileChooser.desktopName=Klientdator
+FileChooser.newFolderPrompt.textAndMnemonic=Namn p\u00E5 ny mapp:
+FileChooser.untitledFolderName=namnl\u00F6s mapp
+FileChooser.untitledFileName=namnl\u00F6s
+FileChooser.createButton.textAndMnemonic=Skapa
+
+FileChooser.byDate.textAndMnemonic=\u00C4ndringsdatum
+FileChooser.by.textAndMnemonic=Namn
+FileChooser.newFolderAccessibleName=Ny mapp
+
+FileChooser.mac.newFolder=namnl\u00F6s mapp
+FileChooser.mac.newFolder.subsequent=namnl\u00F6s mapp {0}
+
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=F\u00F6rhandsgranska
+ColorChooser.ok.textAndMnemonic=OK
+ColorChooser.cancel.textAndMnemonic=Avbryt
+ColorChooser.reset.textAndMnemonic=&\u00C5terst\u00E4ll
+ColorChooser.sample.textAndMnemonic=Exempeltext  Exempeltext
+ColorChooser.swatches.textAndMnemonic=&Prov
+ColorChooser.swatchesRecent.textAndMnemonic=Senaste:
+ColorChooser.hsb.textAndMnemonic=&HSB
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgbRed.textAndMnemonic=R\u00F6&d
+ColorChooser.rgbGreen.textAndMnemonic=Gr\u00F6&n
+ColorChooser.rgbBlue.textAndMnemonic=&Bl\u00E5
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=&Ja
+OptionPane.noButton.textAndMnemonic=&Nej
+OptionPane.okButton.textAndMnemonic=OK
+OptionPane.cancelButton.textAndMnemonic=Avbryt
+OptionPane.title.textAndMnemonic=V\u00E4lj ett alternativ
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=Indata
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=Meddelande
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=Skriver ut
+PrintingDialog.titleAborting.textAndMnemonic=Skriver ut (avbryter)
+
+PrintingDialog.contentInitial.textAndMnemonic=Utskrift p\u00E5g\u00E5r...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=Utskriven sida {0}...
+
+PrintingDialog.contentAborting.textAndMnemonic=Utskriften avbryts...
+
+PrintingDialog.abortButton.textAndMnemonic=&Avbryt
+PrintingDialog.abortButtonToolTip.textAndMnemonic=Avbryt utskrift
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=Minimera
+InternalFrame.maxButtonToolTip=Maximera
+InternalFrame.restoreButtonToolTip=\u00C5terst\u00E4ll
+InternalFrame.closeButtonToolTip=St\u00E4ng
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u00C5terst\u00E4ll
+InternalFrameTitlePane.moveButton.textAndMnemonic=Flytta
+InternalFrameTitlePane.sizeButton.textAndMnemonic=Storlek
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimera
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximera
+InternalFrameTitlePane.closeButton.textAndMnemonic=St\u00E4ng
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=Skicka fr\u00E5ga
+FormView.resetButton.textAndMnemonic=\u00C5terst\u00E4ll
+FormView.browseFileButton.textAndMnemonic=Bl\u00E4ddra...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=format\u00E4ndring
+AbstractDocument.addition.textAndMnemonic=till\u00E4gg
+AbstractDocument.deletion.textAndMnemonic=borttagning
+AbstractDocument.undo.textAndMnemonic=\u00C5ngra
+AbstractDocument.redo.textAndMnemonic=G\u00F6r om
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=klicka
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=\u00C5ngra
+AbstractUndoableEdit.redo.textAndMnemonic=G\u00F6r om
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=v\u00E4xlaPopup
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=P\u00E5g\u00E5r...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=v\u00E4nster knapp
+SplitPane.rightButton.textAndMnemonic=h\u00F6ger knapp
+# Used for Isindex
+IsindexView.prompt=Detta \u00E4r ett s\u00F6kbart index. Ange s\u00F6kord:
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=Minimera
+InternalFrameTitlePane.maximizeButtonAccessibleName=Maximera
+InternalFrameTitlePane.closeButtonAccessibleName=St\u00E4ng
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,183 @@
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, it contains the additional strings needed for the Aqua versions of these components:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=\u901A\u7528\u6587\u4EF6
+FileChooser.directoryDescription.textAndMnemonic=\u76EE\u5F55
+FileChooser.newFolderError.textAndMnemonic=\u521B\u5EFA\u6587\u4EF6\u5939\u65F6\u51FA\u9519
+FileChooser.newFolderErrorSeparator= :
+FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6587\u4EF6
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
+FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openButton.textAndMnemonic=\u6253\u5F00
+FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00
+FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0
+FileChooser.helpButton.textAndMnemonic=\u5E2E\u52A9
+FileChooser.directoryOpenButton.textAndMnemonic=\u6253\u5F00
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openTitle.textAndMnemonic=\u6253\u5F00
+FileChooser.newFolderExistsError.textAndMnemonic=\u8BE5\u540D\u79F0\u5DF2\u88AB\u4F7F\u7528
+FileChooser.chooseButton.textAndMnemonic=\u9009\u62E9
+
+FileChooser.newFolderButton.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
+FileChooser.newFolderTitle.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
+FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=\u53E6\u5B58\u4E3A: 
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u683C\u5F0F:
+
+FileChooser.desktopName=\u684C\u9762
+FileChooser.newFolderPrompt.textAndMnemonic=\u65B0\u6587\u4EF6\u5939\u7684\u540D\u79F0:
+FileChooser.untitledFolderName=\u65E0\u6807\u9898\u7684\u6587\u4EF6\u5939
+FileChooser.untitledFileName=\u65E0\u6807\u9898
+FileChooser.createButton.textAndMnemonic=\u521B\u5EFA
+
+FileChooser.byDate.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
+FileChooser.by.textAndMnemonic=\u540D\u79F0
+FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939
+
+FileChooser.mac.newFolder=\u65E0\u6807\u9898\u7684\u6587\u4EF6\u5939
+FileChooser.mac.newFolder.subsequent=\u65E0\u6807\u9898\u7684\u6587\u4EF6\u5939 {0}
+
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=\u9884\u89C8
+ColorChooser.ok.textAndMnemonic=\u786E\u5B9A
+ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
+ColorChooser.reset.textAndMnemonic=\u91CD\u7F6E(&R)
+ColorChooser.sample.textAndMnemonic=\u793A\u4F8B\u6587\u672C  \u793A\u4F8B\u6587\u672C
+ColorChooser.swatches.textAndMnemonic=\u6837\u672C(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u8FD1:
+ColorChooser.hsb.textAndMnemonic=HSB(&H)
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
+ColorChooser.rgbRed.textAndMnemonic=\u7EA2\u8272(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\u7EFF\u8272(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\u84DD\u8272(&B)
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=\u662F(&Y)
+OptionPane.noButton.textAndMnemonic=\u5426(&N)
+OptionPane.okButton.textAndMnemonic=\u786E\u5B9A
+OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+OptionPane.title.textAndMnemonic=\u9009\u62E9\u4E00\u4E2A\u9009\u9879
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=\u8F93\u5165
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=\u6D88\u606F
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=\u6253\u5370
+PrintingDialog.titleAborting.textAndMnemonic=\u6253\u5370 (\u6B63\u5728\u4E2D\u6B62)
+
+PrintingDialog.contentInitial.textAndMnemonic=\u6B63\u5728\u8FDB\u884C\u6253\u5370...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=\u5DF2\u6253\u5370\u9875 {0}...
+
+PrintingDialog.contentAborting.textAndMnemonic=\u6B63\u5728\u4E2D\u6B62\u6253\u5370...
+
+PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6253\u5370
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
+InternalFrame.maxButtonToolTip=\u6700\u5927\u5316
+InternalFrame.restoreButtonToolTip=\u8FD8\u539F
+InternalFrame.closeButtonToolTip=\u5173\u95ED
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u8FD8\u539F
+InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52A8
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\u5927\u5C0F
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButton.textAndMnemonic=\u5173\u95ED
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=\u63D0\u4EA4\u67E5\u8BE2
+FormView.resetButton.textAndMnemonic=\u91CD\u7F6E
+FormView.browseFileButton.textAndMnemonic=\u6D4F\u89C8...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=\u6837\u5F0F\u66F4\u6539
+AbstractDocument.addition.textAndMnemonic=\u6DFB\u52A0
+AbstractDocument.deletion.textAndMnemonic=\u5220\u9664
+AbstractDocument.undo.textAndMnemonic=\u64A4\u6D88
+AbstractDocument.redo.textAndMnemonic=\u91CD\u505A
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=\u5355\u51FB
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=\u64A4\u6D88
+AbstractUndoableEdit.redo.textAndMnemonic=\u91CD\u505A
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=togglePopup
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=\u8FDB\u5EA6...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=\u5DE6\u952E
+SplitPane.rightButton.textAndMnemonic=\u53F3\u952E
+# Used for Isindex
+IsindexView.prompt=\u8FD9\u662F\u53EF\u641C\u7D22\u7D22\u5F15\u3002\u8BF7\u8F93\u5165\u641C\u7D22\u5173\u952E\u5B57: 
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=\u56FE\u6807\u5316
+InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButtonAccessibleName=\u5173\u95ED
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua_zh_TW.properties	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,183 @@
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used in Swing
+# Currently, it contains the additional strings needed for the Aqua versions of these components:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+
+############ FILE CHOOSER STRINGS #############
+FileChooser.fileDescription.textAndMnemonic=\u4E00\u822C\u6A94\u6848
+FileChooser.directoryDescription.textAndMnemonic=\u76EE\u9304
+FileChooser.newFolderError.textAndMnemonic=\u5EFA\u7ACB\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4
+FileChooser.newFolderErrorSeparator= :
+FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6A94\u6848
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
+FileChooser.saveButton.textAndMnemonic=\u5132\u5B58
+FileChooser.openButton.textAndMnemonic=\u958B\u555F
+FileChooser.saveDialogTitle.textAndMnemonic=\u5132\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u958B\u555F
+FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0
+FileChooser.helpButton.textAndMnemonic=\u8AAA\u660E
+FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u555F
+
+# File Size Units
+FileChooser.fileSizeKiloBytes={0} KB
+FileChooser.fileSizeMegaBytes={0} MB
+FileChooser.fileSizeGigaBytes={0} GB
+
+# Mac-specific strings
+FileChooser.saveTitle.textAndMnemonic=\u5132\u5B58
+FileChooser.openTitle.textAndMnemonic=\u958B\u555F
+FileChooser.newFolderExistsError.textAndMnemonic=\u8A72\u540D\u7A31\u5DF2\u7D93\u88AB\u4F7F\u7528
+FileChooser.chooseButton.textAndMnemonic=\u9078\u64C7
+
+FileChooser.newFolderButton.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
+FileChooser.newFolderTitle.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
+FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848:
+FileChooser.saveDialogFileNameLabel.textAndMnemonic=\u53E6\u5B58\u65B0\u6A94:
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u683C\u5F0F:
+
+FileChooser.desktopName=\u684C\u9762
+FileChooser.newFolderPrompt.textAndMnemonic=\u65B0\u8CC7\u6599\u593E\u540D\u7A31:
+FileChooser.untitledFolderName=\u672A\u547D\u540D\u7684\u8CC7\u6599\u593E
+FileChooser.untitledFileName=\u672A\u547D\u540D
+FileChooser.createButton.textAndMnemonic=\u5EFA\u7ACB
+
+FileChooser.byDate.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
+FileChooser.by.textAndMnemonic=\u540D\u7A31
+FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E
+
+FileChooser.mac.newFolder=\u672A\u547D\u540D\u7684\u8CC7\u6599\u593E
+FileChooser.mac.newFolder.subsequent=\u672A\u547D\u540D\u7684\u8CC7\u6599\u593E {0}
+
+
+############ COLOR CHOOSER STRINGS #############
+ColorChooser.preview.textAndMnemonic=\u9810\u89BD
+ColorChooser.ok.textAndMnemonic=\u78BA\u5B9A
+ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
+ColorChooser.reset.textAndMnemonic=\u91CD\u8A2D(&R)
+ColorChooser.sample.textAndMnemonic=\u7BC4\u4F8B\u6587\u5B57  \u7BC4\u4F8B\u6587\u5B57
+ColorChooser.swatches.textAndMnemonic=\u8ABF\u8272\u677F(&S)
+ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0\u9078\u64C7:
+ColorChooser.hsb.textAndMnemonic=HSB(&H)
+ColorChooser.hsbHue.textAndMnemonic=H
+ColorChooser.hsbSaturation.textAndMnemonic=S
+ColorChooser.hsbBrightness.textAndMnemonic=B
+ColorChooser.hsbRed.textAndMnemonic=R
+ColorChooser.hsbGreen.textAndMnemonic=G
+ColorChooser.hsbBlue.textAndMnemonic=B
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
+ColorChooser.rgbRed.textAndMnemonic=\u7D05(&D)
+ColorChooser.rgbGreen.textAndMnemonic=\u7DA0(&N)
+ColorChooser.rgbBlue.textAndMnemonic=\u85CD(&B)
+
+############ OPTION PANE STRINGS #############
+# We only define mnemonics for YES/NO, but for completeness you can
+# define mnemonics for any of the buttons.
+OptionPane.yesButton.textAndMnemonic=\u662F(&Y)
+OptionPane.noButton.textAndMnemonic=\u5426(&N)
+OptionPane.okButton.textAndMnemonic=\u78BA\u5B9A
+OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+OptionPane.title.textAndMnemonic=\u9078\u53D6\u4E00\u500B\u9078\u9805
+# Title for the dialog for the showInputDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.inputDialog.titleAndMnemonic=\u8F38\u5165
+# Title for the dialog for the showMessageDialog methods. Only used if
+# the developer uses one of the variants that doesn't take a title.
+OptionPane.messageDialog.titleAndMnemonic=\u8A0A\u606F
+
+############ Printing Dialog Strings ############
+PrintingDialog.titleProgress.textAndMnemonic=\u5217\u5370\u4E2D
+PrintingDialog.titleAborting.textAndMnemonic=\u5217\u5370 (\u4E2D\u6B62\u4E2D)
+
+PrintingDialog.contentInitial.textAndMnemonic=\u6B63\u5728\u5217\u5370...
+
+# The following string will be formatted by a MessageFormat
+# and {0} will be replaced by page number being printed
+PrintingDialog.contentProgress.textAndMnemonic=\u5DF2\u5217\u5370\u7B2C {0} \u9801...
+
+PrintingDialog.contentAborting.textAndMnemonic=\u6B63\u5728\u4E2D\u6B62\u5217\u5370...
+
+PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A)
+PrintingDialog.abortButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u5217\u5370
+
+############ Internal Frame Strings ############
+InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316
+InternalFrame.maxButtonToolTip=\u6700\u5927\u5316
+InternalFrame.restoreButtonToolTip=\u5FA9\u539F
+InternalFrame.closeButtonToolTip=\u95DC\u9589
+
+############ Internal Frame Title Pane Strings ############
+InternalFrameTitlePane.restoreButton.textAndMnemonic=\u5FA9\u539F
+InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5
+InternalFrameTitlePane.sizeButton.textAndMnemonic=\u5927\u5C0F
+InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316
+InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButton.textAndMnemonic=\u95DC\u9589
+
+############ Text strings #############
+# Used for html forms
+FormView.submitButton.textAndMnemonic=\u9001\u51FA\u67E5\u8A62
+FormView.resetButton.textAndMnemonic=\u91CD\u8A2D
+FormView.browseFileButton.textAndMnemonic=\u700F\u89BD...
+
+############ Abstract Document Strings ############
+AbstractDocument.styleChange.textAndMnemonic=\u6A23\u5F0F\u8B8A\u66F4
+AbstractDocument.addition.textAndMnemonic=\u9644\u52A0
+AbstractDocument.deletion.textAndMnemonic=\u522A\u9664
+AbstractDocument.undo.textAndMnemonic=\u9084\u539F
+AbstractDocument.redo.textAndMnemonic=\u91CD\u505A
+
+############ Abstract Button Strings ############
+AbstractButton.click.textAndMnemonic=\u6309\u4E00\u4E0B
+
+############ Abstract Undoable Edit Strings ############
+AbstractUndoableEdit.undo.textAndMnemonic=\u9084\u539F
+AbstractUndoableEdit.redo.textAndMnemonic=\u91CD\u505A
+
+############ Combo Box Strings ############
+ComboBox.togglePopup.textAndMnemonic=\u5207\u63DB\u5373\u73FE\u5F0F\u8996\u7A97
+
+############ Progress Monitor Strings ############
+ProgressMonitor.progress.textAndMnemonic=\u9032\u5EA6...
+
+############ Split Pane Strings ############
+SplitPane.leftButton.textAndMnemonic=\u5DE6\u6309\u9215
+SplitPane.rightButton.textAndMnemonic=\u53F3\u6309\u9215
+# Used for Isindex
+IsindexView.prompt=\u9019\u662F\u4E00\u500B\u53EF\u641C\u5C0B\u7684\u7D22\u5F15\u3002\u8F38\u5165\u641C\u5C0B\u95DC\u9375\u5B57: 
+
+############ InternalFrameTitlePane Strings ############
+InternalFrameTitlePane.iconifyButtonAccessibleName=\u5716\u793A\u5316
+InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
+InternalFrameTitlePane.closeButtonAccessibleName=\u95DC\u9589
--- a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java	Wed May 08 11:22:25 2013 +0100
@@ -35,10 +35,18 @@
 
 import sun.java2d.opengl.CGLGraphicsConfig;
 
-public final class CGraphicsDevice extends GraphicsDevice {
+public final class CGraphicsDevice extends GraphicsDevice
+        implements DisplayChangedListener {
 
-    // CoreGraphics display ID
-    private final int displayID;
+    /**
+     * CoreGraphics display ID. This identifier can become non-valid at any time
+     * therefore methods, which is using this id should be ready to it.
+     */
+    private volatile int displayID;
+    private volatile Insets screenInsets;
+    private volatile double xResolution;
+    private volatile double yResolution;
+    private volatile int scale;
 
     // Array of all GraphicsConfig instances for this device
     private final GraphicsConfiguration[] configs;
@@ -51,7 +59,7 @@
     // Save/restore DisplayMode for the Full Screen mode
     private DisplayMode originalMode;
 
-    public CGraphicsDevice(int displayID) {
+    public CGraphicsDevice(final int displayID) {
         this.displayID = displayID;
         configs = new GraphicsConfiguration[] {
             CGLGraphicsConfig.getConfig(this, 0)
@@ -89,7 +97,7 @@
      */
     @Override
     public String getIDstring() {
-        return "Display " + this.displayID;
+        return "Display " + displayID;
     }
 
     /**
@@ -104,15 +112,37 @@
     }
 
     public double getXResolution() {
-        return nativeGetXResolution(displayID);
+        return xResolution;
     }
 
     public double getYResolution() {
-        return nativeGetYResolution(displayID);
+        return yResolution;
     }
 
     public Insets getScreenInsets() {
-        return nativeGetScreenInsets(displayID);
+        return screenInsets;
+    }
+
+    public int getScaleFactor() {
+        return scale;
+    }
+
+    public void invalidate(final int defaultDisplayID) {
+        displayID = defaultDisplayID;
+    }
+
+    @Override
+    public void displayChanged() {
+        xResolution = nativeGetXResolution(displayID);
+        yResolution = nativeGetYResolution(displayID);
+        screenInsets = nativeGetScreenInsets(displayID);
+        scale = (int) nativeGetScaleFactor(displayID);
+        //TODO configs/fullscreenWindow/modes?
+    }
+
+    @Override
+    public void paletteChanged() {
+        // devices do not need to react to this event.
     }
 
     /**
@@ -219,10 +249,6 @@
         return nativeGetDisplayModes(displayID);
     }
 
-    public int getScaleFactor() {
-        return (int) nativeGetScaleFactor(displayID);
-    }
-
     private static native double nativeGetScaleFactor(int displayID);
 
     private static native void nativeSetDisplayMode(int displayID, int w, int h, int bpp, int refrate);
--- a/jdk/src/macosx/classes/sun/awt/CGraphicsEnvironment.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/macosx/classes/sun/awt/CGraphicsEnvironment.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,19 +26,20 @@
 package sun.awt;
 
 import java.awt.*;
-import java.awt.print.*;
 import java.util.*;
 
 import sun.java2d.*;
 
 /**
- * This is an implementation of a GraphicsEnvironment object for the default local GraphicsEnvironment used by the Java
- * Runtime Environment for Mac OS X GUI environments.
+ * This is an implementation of a GraphicsEnvironment object for the default
+ * local GraphicsEnvironment used by the Java Runtime Environment for Mac OS X
+ * GUI environments.
  *
  * @see GraphicsDevice
  * @see GraphicsConfiguration
  */
-public class CGraphicsEnvironment extends SunGraphicsEnvironment {
+public final class CGraphicsEnvironment extends SunGraphicsEnvironment {
+
     // Global initialization of the Cocoa runtime.
     private static native void initCocoa();
 
@@ -53,7 +54,8 @@
     private static native int getMainDisplayID();
 
     /**
-     * Noop function that just acts as an entry point for someone to force a static initialization of this class.
+     * Noop function that just acts as an entry point for someone to force a
+     * static initialization of this class.
      */
     public static void init() { }
 
@@ -78,8 +80,9 @@
     }
 
     /**
-     * Register the instance with CGDisplayRegisterReconfigurationCallback()
-     * The registration uses a weak global reference -- if our instance is garbage collected, the reference will be dropped.
+     * Register the instance with CGDisplayRegisterReconfigurationCallback().
+     * The registration uses a weak global reference -- if our instance is
+     * garbage collected, the reference will be dropped.
      *
      * @return Return the registration context (a pointer).
      */
@@ -91,7 +94,7 @@
     private native void deregisterDisplayReconfiguration(long context);
 
     /** Available CoreGraphics displays. */
-    private final Map<Integer, CGraphicsDevice> devices = new HashMap<Integer, CGraphicsDevice>();
+    private final Map<Integer, CGraphicsDevice> devices = new HashMap<>(5);
 
     /** Reference to the display reconfiguration callback context. */
     private final long displayReconfigContext;
@@ -118,11 +121,18 @@
     /**
      * Called by the CoreGraphics Display Reconfiguration Callback.
      *
-     * @param displayId
-     *            CoreGraphics displayId
+     * @param displayId CoreGraphics displayId
+     * @param removed   true if displayId was removed, false otherwise.
      */
-    void _displayReconfiguration(long displayId) {
-        displayChanged();
+    void _displayReconfiguration(final int displayId, final boolean removed) {
+        synchronized (this) {
+            if (removed && devices.containsKey(displayId)) {
+                final CGraphicsDevice gd = devices.remove(displayId);
+                gd.invalidate(getMainDisplayID());
+                gd.displayChanged();
+            }
+        }
+        initDevices();
     }
 
     @Override
@@ -135,31 +145,30 @@
     }
 
     /**
-     * (Re)create all CGraphicsDevices
-     *
-     * @return
+     * (Re)create all CGraphicsDevices, reuses a devices if it is possible.
      */
-    private synchronized void initDevices() {
-        devices.clear();
+    private void initDevices() {
+        synchronized (this) {
+            final Map<Integer, CGraphicsDevice> old = new HashMap<>(devices);
+            devices.clear();
 
-        int mainID = getMainDisplayID();
+            int mainID = getMainDisplayID();
 
-        // initialization of the graphics device may change
-        // list of displays on hybrid systems via an activation
-        // of discrete video.
-        // So, we initialize the main display first, and then
-        // retrieve actual list of displays.
-        CGraphicsDevice mainDevice = new CGraphicsDevice(mainID);
+            // initialization of the graphics device may change
+            // list of displays on hybrid systems via an activation
+            // of discrete video.
+            // So, we initialize the main display first, and then
+            // retrieve actual list of displays.
+            if (!old.containsKey(mainID)) {
+                old.put(mainID, new CGraphicsDevice(mainID));
+            }
 
-        final int[] displayIDs = getDisplayIDs();
-
-        for (int displayID : displayIDs) {
-            if (displayID != mainID) {
-                devices.put(displayID, new CGraphicsDevice(displayID));
-            } else {
-                devices.put(mainID, mainDevice);
+            for (final int id : getDisplayIDs()) {
+                devices.put(id, old.containsKey(id) ? old.get(id)
+                                                    : new CGraphicsDevice(id));
             }
         }
+        displayChanged();
     }
 
     @Override
@@ -167,7 +176,7 @@
         final int mainDisplayID = getMainDisplayID();
         CGraphicsDevice d = devices.get(mainDisplayID);
         if (d == null) {
-            // we do not exepct that this may happen, the only responce
+            // we do not expect that this may happen, the only response
             // is to re-initialize the list of devices
             initDevices();
 
--- a/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java	Wed May 08 11:22:25 2013 +0100
@@ -87,18 +87,22 @@
 
     private final T target;
 
-    // Container peer. It may not be the peer of the target's direct
-    // parent, for example, in the case of hw/lw mixing. However,
-    // let's skip this scenario for the time being. We also assume
-    // the container peer is not null, which might also be false if
-    // addNotify() is called for a component outside of the hierarchy.
-    // The exception is LWWindowPeers: their parents are always null
-    private LWContainerPeer containerPeer;
+    /**
+     * Container peer. It may not be the peer of the target's direct parent, for
+     * example, in the case of hw/lw mixing. However, let's skip this scenario
+     * for the time being. We also assume the container peer is not null, which
+     * might also be false if addNotify() is called for a component outside of
+     * the hierarchy. The exception is LWWindowPeers: their containers are
+     * always null
+     */
+    private final LWContainerPeer containerPeer;
 
-    // Handy reference to the top-level window peer. Window peer is
-    // borrowed from the containerPeer in constructor, and should also
-    // be updated when the component is reparented to another container
-    private LWWindowPeer windowPeer;
+    /**
+     * Handy reference to the top-level window peer. Window peer is borrowed
+     * from the containerPeer in constructor, and should also be updated when
+     * the component is reparented to another container
+     */
+    private final LWWindowPeer windowPeer;
 
     private final AtomicBoolean disposed = new AtomicBoolean(false);
 
@@ -183,13 +187,13 @@
         this.target = target;
         this.platformComponent = platformComponent;
 
-        initializeContainerPeer();
         // Container peer is always null for LWWindowPeers, so
         // windowPeer is always null for them as well. On the other
         // hand, LWWindowPeer shouldn't use windowPeer at all
-        if (containerPeer != null) {
-            windowPeer = containerPeer.getWindowPeerOrSelf();
-        }
+        final Container container = SunToolkit.getNativeContainer(target);
+        containerPeer = (LWContainerPeer) LWToolkit.targetToPeer(container);
+        windowPeer = containerPeer != null ? containerPeer.getWindowPeerOrSelf()
+                                           : null;
         // don't bother about z-order here as updateZOrder()
         // will be called from addNotify() later anyway
         if (containerPeer != null) {
@@ -356,15 +360,6 @@
         return containerPeer;
     }
 
-    // Just a helper method
-    // Overridden in LWWindowPeer to skip containerPeer initialization
-    protected void initializeContainerPeer() {
-        Container parent = LWToolkit.getNativeContainer(target);
-        if (parent != null) {
-            containerPeer = (LWContainerPeer) LWToolkit.targetToPeer(parent);
-        }
-    }
-
     public PlatformWindow getPlatformWindow() {
         LWWindowPeer windowPeer = getWindowPeer();
         return windowPeer.getPlatformWindow();
--- a/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java	Wed May 08 11:22:25 2013 +0100
@@ -41,7 +41,8 @@
 
 public class LWWindowPeer
     extends LWContainerPeer<Window, JComponent>
-    implements WindowPeer, FramePeer, DialogPeer, FullScreenCapable, PlatformEventNotifier {
+    implements FramePeer, DialogPeer, FullScreenCapable, DisplayChangedListener, PlatformEventNotifier
+{
     public static enum PeerType {
         SIMPLEWINDOW,
         FRAME,
@@ -205,6 +206,7 @@
         if (getSurfaceData() == null) {
             replaceSurfaceData(false);
         }
+        activateDisplayListener();
     }
 
     // Just a helper method
@@ -217,15 +219,11 @@
         return this;
     }
 
-    @Override
-    protected void initializeContainerPeer() {
-        // No-op as LWWindowPeer doesn't have any containerPeer
-    }
-
     // ---- PEER METHODS ---- //
 
     @Override
     protected void disposeImpl() {
+        deactivateDisplayListener();
         SurfaceData oldData = getSurfaceData();
         synchronized (surfaceDataLock){
             surfaceData = null;
@@ -940,6 +938,18 @@
 
     // ---- UTILITY METHODS ---- //
 
+    private void activateDisplayListener() {
+        final GraphicsEnvironment ge =
+                GraphicsEnvironment.getLocalGraphicsEnvironment();
+        ((SunGraphicsEnvironment) ge).addDisplayChangedListener(this);
+    }
+
+    private void deactivateDisplayListener() {
+        final GraphicsEnvironment ge =
+                GraphicsEnvironment.getLocalGraphicsEnvironment();
+        ((SunGraphicsEnvironment) ge).removeDisplayChangedListener(this);
+    }
+
     private void postWindowStateChangedEvent(int newWindowState) {
         if (getTarget() instanceof Frame) {
             AWTAccessor.getFrameAccessor().setExtendedState(
@@ -1004,7 +1014,6 @@
             graphicsDevice = newGraphicsDevice;
         }
 
-        // TODO: DisplayChangedListener stuff
         final GraphicsConfiguration newGC = newGraphicsDevice.getDefaultConfiguration();
 
         if (!setGraphicsConfig(newGC)) return false;
@@ -1017,6 +1026,20 @@
         return true;
     }
 
+    @Override
+    public final void displayChanged() {
+        updateGraphicsDevice();
+        // Replace surface unconditionally, because internal state of the
+        // GraphicsDevice could be changed.
+        replaceSurfaceData();
+        repaintPeer();
+    }
+
+    @Override
+    public final void paletteChanged() {
+        // components do not need to react to this event.
+    }
+
     /*
      * May be called by delegate to provide SD to Java2D code.
      */
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java	Wed May 08 11:22:25 2013 +0100
@@ -32,6 +32,7 @@
 import java.beans.*;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
+import java.util.Objects;
 
 import javax.swing.*;
 
@@ -924,13 +925,16 @@
 
         final Rectangle oldB = nativeBounds;
         nativeBounds = new Rectangle(x, y, width, height);
+        final GraphicsConfiguration oldGC = peer.getGraphicsConfiguration();
 
+        final GraphicsConfiguration newGC = peer.getGraphicsConfiguration();
+        // System-dependent appearance optimization.
         if (peer != null) {
             peer.notifyReshape(x, y, width, height);
         }
 
         if ((byUser && !oldB.getSize().equals(nativeBounds.getSize()))
-            || isFullScreenAnimationOn) {
+            || isFullScreenAnimationOn || !Objects.equals(newGC, oldGC)) {
             flushBuffers();
         }
     }
--- a/jdk/src/macosx/native/sun/awt/AWTEvent.h	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/AWTEvent.h	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,5 +35,6 @@
 jint GetJavaMouseModifiers(NSInteger button, NSUInteger modifierFlags);
 jint NsKeyModifiersToJavaModifiers(NSUInteger nsFlags, BOOL isExtMods);
 NSUInteger JavaModifiersToNsKeyModifiers(jint javaModifiers, BOOL isExtMods);
+unichar NsCharToJavaChar(unichar nsChar, NSUInteger modifiers);
 
 #endif /* __AWTEVENT_H */
--- a/jdk/src/macosx/native/sun/awt/AWTEvent.m	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/AWTEvent.m	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -341,8 +341,7 @@
     {0, 0, 0}
 };
 
-static unichar
-NsCharToJavaChar(unichar nsChar, NSUInteger modifiers)
+unichar NsCharToJavaChar(unichar nsChar, NSUInteger modifiers)
 {
     const struct _char *cur;
     // Mask off just the keyboard modifiers from the event modifier mask.
--- a/jdk/src/macosx/native/sun/awt/CGraphicsEnv.m	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CGraphicsEnv.m	Wed May 08 11:22:25 2013 +0100
@@ -124,10 +124,11 @@
 
         jobject graphicsEnv = [wrapper jObjectWithEnv:env];
         if (graphicsEnv == NULL) return; // ref already GC'd
-
         static JNF_CLASS_CACHE(jc_CGraphicsEnvironment, "sun/awt/CGraphicsEnvironment");
-        static JNF_MEMBER_CACHE(jm_displayReconfiguration, jc_CGraphicsEnvironment, "_displayReconfiguration", "(J)V");
-        JNFCallVoidMethod(env, graphicsEnv, jm_displayReconfiguration);
+        static JNF_MEMBER_CACHE(jm_displayReconfiguration, jc_CGraphicsEnvironment, "_displayReconfiguration", "(IZ)V");
+        JNFCallVoidMethod(env, graphicsEnv, jm_displayReconfiguration,
+                            (jint) display, 
+                            (jboolean) flags & kCGDisplayRemoveFlag);
     });
 }
 
--- a/jdk/src/macosx/native/sun/awt/CMenuItem.m	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CMenuItem.m	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,12 +71,21 @@
 JNF_COCOA_ENTER(env);
 
     // If we are called as a result of user pressing a shorcut, do nothing,
-    // because AVTView has already sent corresponding key event to the Java 
+    // because AVTView has already sent corresponding key event to the Java
     // layer from performKeyEquivalent
     NSEvent *currEvent = [[NSApplication sharedApplication] currentEvent];
     if ([currEvent type] == NSKeyDown) {
         NSString *menuKey = [sender keyEquivalent];
         NSString *eventKey = [currEvent charactersIgnoringModifiers];
+
+        // Apple uses characters from private Unicode range for some of the
+        // keys, so we need to do the same translation here that we do
+        // for the regular key down events
+        if ([eventKey length] == 1) {
+            unichar ch =  NsCharToJavaChar([eventKey characterAtIndex:0], 0);
+            eventKey = [NSString stringWithCharacters: &ch length: 1];
+        }
+
         if ([menuKey isEqualToString:eventKey]) {
             return;
         }
--- a/jdk/src/macosx/native/sun/awt/CTextPipe.m	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CTextPipe.m	Wed May 08 11:22:25 2013 +0100
@@ -143,6 +143,8 @@
     CGContextRef cgRef = qsdo->cgRef;
     CGAffineTransform ctmText = CGContextGetTextMatrix(cgRef);
 
+    BOOL saved = false;
+
     /* Save and restore of graphics context is done before the iteration.  
        This seems to work using our test case (see bug ID 7158350) so we are restoring it at
        the end of the for loop.  If we find out that save/restore outside the loop
@@ -175,10 +177,19 @@
                 CFRelease(fallback);
 
                 if (cgFallback) {
+                    if (!saved) {
+                        CGContextSaveGState(cgRef);
+                        saved = true;
+                    }
                     CGContextSetFont(cgRef, cgFallback);
                     CFRelease(cgFallback);
                 }
             }
+        } else {
+            if (saved) {
+                CGContextRestoreGState(cgRef);
+                saved = false;
+            }
         }
 
         // if we have per-glyph transformations
--- a/jdk/src/macosx/native/sun/awt/awt.m	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/awt.m	Wed May 08 11:22:25 2013 +0100
@@ -316,7 +316,10 @@
     // its finishLaunching has initialized it.
     //  ApplicationDelegate is the support code for com.apple.eawt.
     [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
-        OSXAPP_SetApplicationDelegate([ApplicationDelegate sharedDelegate]);
+        id<NSApplicationDelegate> delegate = [ApplicationDelegate sharedDelegate];
+        if (delegate != nil) {
+            OSXAPP_SetApplicationDelegate(delegate);
+        }        
     }];
 }
 
--- a/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/macosx/native/sun/java2d/opengl/CGLLayer.m	Wed May 08 11:22:25 2013 +0100
@@ -216,7 +216,11 @@
 {
     JNF_COCOA_ENTER(env);
     CGLLayer *layer = jlong_to_ptr(layerPtr);
-    [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
+    // We always call all setXX methods asynchronously, exception is only in 
+    // this method where we need to change native texture size and layer's scale
+    // in one call on appkit, otherwise we'll get window's contents blinking, 
+    // during screen-2-screen moving.
+    [ThreadUtilities performOnMainThreadWaiting:[NSThread isMainThread] block:^(){
         layer.contentsScale = scale;
     }];
     JNF_COCOA_EXIT(env);
--- a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties	Wed May 08 11:22:25 2013 +0100
@@ -77,7 +77,7 @@
 armed=armado
 busy=ocupado
 checked=selecionado
-collapsed=recolhido
+collapsed=contra\u00EDdo
 editable=edit\u00E1vel
 expandable=expans\u00EDvel
 expanded=expandido
--- a/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -27,8 +27,8 @@
 glasspane=\u73BB\u7483\u7A97\u683C
 filechooser=\u6587\u4EF6\u9009\u62E9\u5668
 filler=\u6F0F\u6597
-frame=\u5E27
-internalframe=\u5185\u90E8\u5E27
+frame=\u6846\u67B6
+internalframe=\u5185\u90E8\u6846\u67B6
 label=\u6807\u7B7E
 layeredpane=\u5206\u5C42\u7A97\u683C
 list=\u5217\u8868
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,59 +1,54 @@
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-
-
-
-# GTK specific properties
-
-# GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=&GTK-Farbauswahl
-# mnemonic as a VK_ constant
-
-GTKColorChooserPanel.hue.textAndMnemonic=&Farbton:
-
-GTKColorChooserPanel.red.textAndMnemonic=&Rot:
-
-GTKColorChooserPanel.saturation.textAndMnemonic=S\u00E4ttigung(&S):
-
-GTKColorChooserPanel.green.textAndMnemonic=Gr\u00FCn(&G):
-
-GTKColorChooserPanel.value.textAndMnemonic=&Wert:
-
-GTKColorChooserPanel.blue.textAndMnemonic=&Blau:
-
-GTKColorChooserPanel.color.textAndMnemonic=Farb&name:
-
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.acceptAllFileFilter.textAndMnemonic=Alle Dateien
-FileChooser.newFolderButton.textAndMnemonic=&Neuer Ordner
-FileChooser.newFolderDialog.textAndMnemonic=Ordnername:
-FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Fehler
-FileChooser.newFolderNoDirectoryError.textAndMnemonic=Fehler beim Erstellen von Verzeichnis "{0}": Datei oder Verzeichnis nicht vorhanden
-FileChooser.deleteFileButton.textAndMnemonic=Datei l\u00F6schen(&L)
-FileChooser.renameFileButton.textAndMnemonic=Datei &umbenennen
-FileChooser.cancelButton.textAndMnemonic=&Abbrechen
-FileChooser.saveButton.textAndMnemonic=&OK
-FileChooser.openButton.textAndMnemonic=&OK
-FileChooser.saveDialogTitle.textAndMnemonic=Speichern
-FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
-FileChooser.pathLabel.textAndMnemonic=Aus&wahl:
-FileChooser.filterLabel.textAndMnemonic=Filter:
-FileChooser.foldersLabel.textAndMnemonic=&Ordner
-FileChooser.filesLabel.textAndMnemonic=&Dateien
-
-FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen.
-FileChooser.saveButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei speichern.
-FileChooser.openButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei \u00F6ffnen.
-
-FileChooser.renameFileDialog.textAndMnemonic=Datei "{0}" umbenennen in
-FileChooser.renameFileError.titleAndMnemonic=Fehler
-FileChooser.renameFileError.textAndMnemonic=Fehler beim Umbenennen der Datei "{0}" in "{1}"
-
-# dummy resource added for translation automation
-OptionPane.okButton.textAndMnemonic=&OK
-# dummy resource added for translation automation
-OptionPane.cancelButton.textAndMnemonic=&Abbrechen
-
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+
+
+
+# GTK specific properties
+
+# GTK color chooser properties:
+GTKColorChooserPanel.textAndMnemonic=&GTK-Farbauswahl
+# mnemonic as a VK_ constant
+
+GTKColorChooserPanel.hue.textAndMnemonic=&Farbton:
+
+GTKColorChooserPanel.red.textAndMnemonic=R&ot:
+
+GTKColorChooserPanel.saturation.textAndMnemonic=&S\u00E4ttigung:
+
+GTKColorChooserPanel.green.textAndMnemonic=&Gr\u00FCn:
+
+GTKColorChooserPanel.value.textAndMnemonic=&Wert:
+
+GTKColorChooserPanel.blue.textAndMnemonic=&Blau:
+
+GTKColorChooserPanel.color.textAndMnemonic=Farb&name:
+
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.acceptAllFileFilter.textAndMnemonic=Alle Dateien
+FileChooser.newFolderButton.textAndMnemonic=&Neuer Ordner
+FileChooser.newFolderDialog.textAndMnemonic=Ordnername:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Fehler
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=Fehler beim Erstellen von Verzeichnis "{0}": Datei oder Verzeichnis nicht vorhanden
+FileChooser.deleteFileButton.textAndMnemonic=Datei &l\u00F6schen
+FileChooser.renameFileButton.textAndMnemonic=Datei &umbenennen
+FileChooser.cancelButton.textAndMnemonic=&Abbrechen
+FileChooser.saveButton.textAndMnemonic=&OK
+FileChooser.openButton.textAndMnemonic=&OK
+FileChooser.saveDialogTitle.textAndMnemonic=Speichern
+FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
+FileChooser.pathLabel.textAndMnemonic=Aus&wahl:
+FileChooser.filterLabel.textAndMnemonic=Filter:
+FileChooser.foldersLabel.textAndMnemonic=&Ordner
+FileChooser.filesLabel.textAndMnemonic=&Dateien
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen.
+FileChooser.saveButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei speichern.
+FileChooser.openButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei \u00F6ffnen.
+
+FileChooser.renameFileDialog.textAndMnemonic=Datei "{0}" umbenennen in
+FileChooser.renameFileError.titleAndMnemonic=Fehler
+FileChooser.renameFileError.textAndMnemonic=Fehler beim Umbenennen der Datei "{0}" in "{1}"
+
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,59 +1,54 @@
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-
-
-
-# GTK specific properties
-
-# GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=Selector de Color para &GTK
-# mnemonic as a VK_ constant
-
-GTKColorChooserPanel.hue.textAndMnemonic=&Mat:
-
-GTKColorChooserPanel.red.textAndMnemonic=Ro&jo:
-
-GTKColorChooserPanel.saturation.textAndMnemonic=Saturaci\u00F3n(&S):
-
-GTKColorChooserPanel.green.textAndMnemonic=V&erde:
-
-GTKColorChooserPanel.value.textAndMnemonic=&Valor:
-
-GTKColorChooserPanel.blue.textAndMnemonic=&Azul:
-
-GTKColorChooserPanel.color.textAndMnemonic=&Nombre del Color:
-
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.acceptAllFileFilter.textAndMnemonic=Todos los Archivos
-FileChooser.newFolderButton.textAndMnemonic=&Nueva Carpeta
-FileChooser.newFolderDialog.textAndMnemonic=Nombre de la Carpeta:
-FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Error
-FileChooser.newFolderNoDirectoryError.textAndMnemonic=Error al crear el directorio "{0}": no existe dicho archivo o directorio
-FileChooser.deleteFileButton.textAndMnemonic=Su&primir Archivo
-FileChooser.renameFileButton.textAndMnemonic=Cambia&r Nombre de Archivo
-FileChooser.cancelButton.textAndMnemonic=&Cancelar
-FileChooser.saveButton.textAndMnemonic=&Aceptar
-FileChooser.openButton.textAndMnemonic=&Aceptar
-FileChooser.saveDialogTitle.textAndMnemonic=Guardar
-FileChooser.openDialogTitle.textAndMnemonic=Abrir
-FileChooser.pathLabel.textAndMnemonic=Selecci\u00F3n(&S):
-FileChooser.filterLabel.textAndMnemonic=Filtro:
-FileChooser.foldersLabel.textAndMnemonic=Carpe&tas
-FileChooser.filesLabel.textAndMnemonic=&Archivos
-
-FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar cuadro de di\u00E1logo del selector de archivos.
-FileChooser.saveButtonToolTip.textAndMnemonic=Guardar el archivo seleccionado.
-FileChooser.openButtonToolTip.textAndMnemonic=Abrir el archivo seleccionado.
-
-FileChooser.renameFileDialog.textAndMnemonic=Cambiar el nombre del archivo "{0}" por
-FileChooser.renameFileError.titleAndMnemonic=Error
-FileChooser.renameFileError.textAndMnemonic=Error al cambiar el nombre del archivo "{0}" a "{1}"
-
-# dummy resource added for translation automation
-OptionPane.okButton.textAndMnemonic=&Aceptar
-# dummy resource added for translation automation
-OptionPane.cancelButton.textAndMnemonic=&Cancelar
-
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+
+
+
+# GTK specific properties
+
+# GTK color chooser properties:
+GTKColorChooserPanel.textAndMnemonic=Selector de Color para &GTK
+# mnemonic as a VK_ constant
+
+GTKColorChooserPanel.hue.textAndMnemonic=&Mat:
+
+GTKColorChooserPanel.red.textAndMnemonic=Ro&jo:
+
+GTKColorChooserPanel.saturation.textAndMnemonic=&Saturaci\u00F3n:
+
+GTKColorChooserPanel.green.textAndMnemonic=&Verde:
+
+GTKColorChooserPanel.value.textAndMnemonic=&Valor:
+
+GTKColorChooserPanel.blue.textAndMnemonic=&Azul:
+
+GTKColorChooserPanel.color.textAndMnemonic=&Nombre del Color:
+
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.acceptAllFileFilter.textAndMnemonic=Todos los Archivos
+FileChooser.newFolderButton.textAndMnemonic=&Nueva Carpeta
+FileChooser.newFolderDialog.textAndMnemonic=Nombre de la Carpeta:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Error
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=Error al crear el directorio "{0}": no existe dicho archivo o directorio
+FileChooser.deleteFileButton.textAndMnemonic=Su&primir Archivo
+FileChooser.renameFileButton.textAndMnemonic=Cambiar Nomb&re de Archivo
+FileChooser.cancelButton.textAndMnemonic=&Cancelar
+FileChooser.saveButton.textAndMnemonic=&Aceptar
+FileChooser.openButton.textAndMnemonic=&Aceptar
+FileChooser.saveDialogTitle.textAndMnemonic=Guardar
+FileChooser.openDialogTitle.textAndMnemonic=Abrir
+FileChooser.pathLabel.textAndMnemonic=&Selecci\u00F3n:
+FileChooser.filterLabel.textAndMnemonic=Filtro:
+FileChooser.foldersLabel.textAndMnemonic=Carpe&tas
+FileChooser.filesLabel.textAndMnemonic=&Archivos
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar cuadro de di\u00E1logo del selector de archivos.
+FileChooser.saveButtonToolTip.textAndMnemonic=Guardar el archivo seleccionado.
+FileChooser.openButtonToolTip.textAndMnemonic=Abrir el archivo seleccionado.
+
+FileChooser.renameFileDialog.textAndMnemonic=Cambiar el nombre del archivo "{0}" por
+FileChooser.renameFileError.titleAndMnemonic=Error
+FileChooser.renameFileError.textAndMnemonic=Error al cambiar el nombre del archivo "{0}" a "{1}"
+
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,59 +1,54 @@
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-
-
-
-# GTK specific properties
-
-# GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=S\u00E9lecteur de couleurs GTK(&G)
-# mnemonic as a VK_ constant
-
-GTKColorChooserPanel.hue.textAndMnemonic=&Teinte :
-
-GTKColorChooserPanel.red.textAndMnemonic=Rouge\u00A0(&E):
-
-GTKColorChooserPanel.saturation.textAndMnemonic=&Saturation :
-
-GTKColorChooserPanel.green.textAndMnemonic=V&ert :
-
-GTKColorChooserPanel.value.textAndMnemonic=&Valeur :
-
-GTKColorChooserPanel.blue.textAndMnemonic=&Bleu :
-
-GTKColorChooserPanel.color.textAndMnemonic=&Nom de couleur :
-
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.acceptAllFileFilter.textAndMnemonic=Tous les fichiers
-FileChooser.newFolderButton.textAndMnemonic=&Nouveau dossier
-FileChooser.newFolderDialog.textAndMnemonic=Nom du dossier :
-FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Erreur
-FileChooser.newFolderNoDirectoryError.textAndMnemonic=Erreur lors de la cr\u00E9ation du r\u00E9pertoire "{0}" : ce fichier ou r\u00E9pertoire n''existe pas
-FileChooser.deleteFileButton.textAndMnemonic=Supprimer &le fichier
-FileChooser.renameFileButton.textAndMnemonic=&Renommer le fichier
-FileChooser.cancelButton.textAndMnemonic=&Annuler
-FileChooser.saveButton.textAndMnemonic=&OK
-FileChooser.openButton.textAndMnemonic=&OK
-FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer
-FileChooser.openDialogTitle.textAndMnemonic=Ouvrir
-FileChooser.pathLabel.textAndMnemonic=S\u00E9lection (&S):
-FileChooser.filterLabel.textAndMnemonic=Filtre :
-FileChooser.foldersLabel.textAndMnemonic=&Dossiers
-FileChooser.filesLabel.textAndMnemonic=&Fichiers
-
-FileChooser.cancelButtonToolTip.textAndMnemonic=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers.
-FileChooser.saveButtonToolTip.textAndMnemonic=Enregistre le fichier s\u00E9lectionn\u00E9.
-FileChooser.openButtonToolTip.textAndMnemonic=Ouvre le fichier s\u00E9lectionn\u00E9.
-
-FileChooser.renameFileDialog.textAndMnemonic=Renomme le fichier "{0}" en
-FileChooser.renameFileError.titleAndMnemonic=Erreur
-FileChooser.renameFileError.textAndMnemonic=Erreur lors du changement de nom du fichier "{0}" en "{1}"
-
-# dummy resource added for translation automation
-OptionPane.okButton.textAndMnemonic=&OK
-# dummy resource added for translation automation
-OptionPane.cancelButton.textAndMnemonic=&Annuler
-
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+
+
+
+# GTK specific properties
+
+# GTK color chooser properties:
+GTKColorChooserPanel.textAndMnemonic=S\u00E9lecteur de couleurs &GTK
+# mnemonic as a VK_ constant
+
+GTKColorChooserPanel.hue.textAndMnemonic=&Teinte :
+
+GTKColorChooserPanel.red.textAndMnemonic=Roug&e\u00A0:
+
+GTKColorChooserPanel.saturation.textAndMnemonic=&Saturation :
+
+GTKColorChooserPanel.green.textAndMnemonic=&Vert :
+
+GTKColorChooserPanel.value.textAndMnemonic=&Valeur :
+
+GTKColorChooserPanel.blue.textAndMnemonic=&Bleu :
+
+GTKColorChooserPanel.color.textAndMnemonic=&Nom de couleur :
+
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.acceptAllFileFilter.textAndMnemonic=Tous les fichiers
+FileChooser.newFolderButton.textAndMnemonic=&Nouveau dossier
+FileChooser.newFolderDialog.textAndMnemonic=Nom du dossier :
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Erreur
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=Erreur lors de la cr\u00E9ation du r\u00E9pertoire "{0}" : ce fichier ou r\u00E9pertoire n''existe pas
+FileChooser.deleteFileButton.textAndMnemonic=Supprimer &le fichier
+FileChooser.renameFileButton.textAndMnemonic=&Renommer le fichier
+FileChooser.cancelButton.textAndMnemonic=&Annuler
+FileChooser.saveButton.textAndMnemonic=&OK
+FileChooser.openButton.textAndMnemonic=&OK
+FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer
+FileChooser.openDialogTitle.textAndMnemonic=Ouvrir
+FileChooser.pathLabel.textAndMnemonic=&S\u00E9lection :
+FileChooser.filterLabel.textAndMnemonic=Filtre :
+FileChooser.foldersLabel.textAndMnemonic=&Dossiers
+FileChooser.filesLabel.textAndMnemonic=&Fichiers
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers.
+FileChooser.saveButtonToolTip.textAndMnemonic=Enregistre le fichier s\u00E9lectionn\u00E9.
+FileChooser.openButtonToolTip.textAndMnemonic=Ouvre le fichier s\u00E9lectionn\u00E9.
+
+FileChooser.renameFileDialog.textAndMnemonic=Renomme le fichier "{0}" en
+FileChooser.renameFileError.titleAndMnemonic=Erreur
+FileChooser.renameFileError.textAndMnemonic=Erreur lors du changement de nom du fichier "{0}" en "{1}"
+
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,59 +1,54 @@
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-
-
-
-# GTK specific properties
-
-# GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=Selezione colore &GTK
-# mnemonic as a VK_ constant
-
-GTKColorChooserPanel.hue.textAndMnemonic=&Ton.:
-
-GTKColorChooserPanel.red.textAndMnemonic=R&osso:
-
-GTKColorChooserPanel.saturation.textAndMnemonic=&Saturazione:
-
-GTKColorChooserPanel.green.textAndMnemonic=V&erde:
-
-GTKColorChooserPanel.value.textAndMnemonic=&Valore:
-
-GTKColorChooserPanel.blue.textAndMnemonic=&Blu:
-
-GTKColorChooserPanel.color.textAndMnemonic=&Nome colore:
-
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.acceptAllFileFilter.textAndMnemonic=Tutti i file
-FileChooser.newFolderButton.textAndMnemonic=&Nuova cartella
-FileChooser.newFolderDialog.textAndMnemonic=Nome della cartella:
-FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Errore
-FileChooser.newFolderNoDirectoryError.textAndMnemonic=Errore durante la creazione della directory "{0}": file o directory inesistente
-FileChooser.deleteFileButton.textAndMnemonic=E&limina file
-FileChooser.renameFileButton.textAndMnemonic=&Rinomina file
-FileChooser.cancelButton.textAndMnemonic=&Annulla
-FileChooser.saveButton.textAndMnemonic=&OK
-FileChooser.openButton.textAndMnemonic=&OK
-FileChooser.saveDialogTitle.textAndMnemonic=Salva
-FileChooser.openDialogTitle.textAndMnemonic=Apri
-FileChooser.pathLabel.textAndMnemonic=&Selezione:
-FileChooser.filterLabel.textAndMnemonic=Filtro:
-FileChooser.foldersLabel.textAndMnemonic=Car&telle
-FileChooser.filesLabel.textAndMnemonic=&File
-
-FileChooser.cancelButtonToolTip.textAndMnemonic=Chiude la finestra di dialogo di selezione file.
-FileChooser.saveButtonToolTip.textAndMnemonic=Salva il file selezionato.
-FileChooser.openButtonToolTip.textAndMnemonic=Apre il file selezionato.
-
-FileChooser.renameFileDialog.textAndMnemonic=Rinomina file "{0}" in
-FileChooser.renameFileError.titleAndMnemonic=Errore
-FileChooser.renameFileError.textAndMnemonic=Errore durante la ridenominazione del file "{0}" in "{1}"
-
-# dummy resource added for translation automation
-OptionPane.okButton.textAndMnemonic=&OK
-# dummy resource added for translation automation
-OptionPane.cancelButton.textAndMnemonic=&Annulla
-
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+
+
+
+# GTK specific properties
+
+# GTK color chooser properties:
+GTKColorChooserPanel.textAndMnemonic=Selezione colore &GTK
+# mnemonic as a VK_ constant
+
+GTKColorChooserPanel.hue.textAndMnemonic=&Ton.:
+
+GTKColorChooserPanel.red.textAndMnemonic=R&osso:
+
+GTKColorChooserPanel.saturation.textAndMnemonic=&Saturazione:
+
+GTKColorChooserPanel.green.textAndMnemonic=&Verde:
+
+GTKColorChooserPanel.value.textAndMnemonic=&Valore:
+
+GTKColorChooserPanel.blue.textAndMnemonic=&Blu:
+
+GTKColorChooserPanel.color.textAndMnemonic=&Nome colore:
+
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.acceptAllFileFilter.textAndMnemonic=Tutti i file
+FileChooser.newFolderButton.textAndMnemonic=&Nuova cartella
+FileChooser.newFolderDialog.textAndMnemonic=Nome della cartella:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Errore
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=Errore durante la creazione della directory "{0}": file o directory inesistente
+FileChooser.deleteFileButton.textAndMnemonic=E&limina file
+FileChooser.renameFileButton.textAndMnemonic=&Rinomina file
+FileChooser.cancelButton.textAndMnemonic=&Annulla
+FileChooser.saveButton.textAndMnemonic=&OK
+FileChooser.openButton.textAndMnemonic=&OK
+FileChooser.saveDialogTitle.textAndMnemonic=Salva
+FileChooser.openDialogTitle.textAndMnemonic=Apri
+FileChooser.pathLabel.textAndMnemonic=&Selezione:
+FileChooser.filterLabel.textAndMnemonic=Filtro:
+FileChooser.foldersLabel.textAndMnemonic=Car&telle
+FileChooser.filesLabel.textAndMnemonic=&File
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=Chiude la finestra di dialogo di selezione file.
+FileChooser.saveButtonToolTip.textAndMnemonic=Salva il file selezionato.
+FileChooser.openButtonToolTip.textAndMnemonic=Apre il file selezionato.
+
+FileChooser.renameFileDialog.textAndMnemonic=Rinomina file "{0}" in
+FileChooser.renameFileError.titleAndMnemonic=Errore
+FileChooser.renameFileError.textAndMnemonic=Errore durante la ridenominazione del file "{0}" in "{1}"
+
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,55 +1,54 @@
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-
-
-
-# GTK specific properties
-
-# GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=GTK\u30AB\u30E9\u30FC\u30FB\u30C1\u30E5\u30FC\u30B6(&G)
-# mnemonic as a VK_ constant
-
-GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u76F8(&H):
-
-GTKColorChooserPanel.red.textAndMnemonic=\u8D64(&E):
-
-GTKColorChooserPanel.saturation.textAndMnemonic=\u5F69\u5EA6(&S):
-
-GTKColorChooserPanel.green.textAndMnemonic=\u7DD1(&G):
-
-GTKColorChooserPanel.value.textAndMnemonic=\u5024(&V):
-
-GTKColorChooserPanel.blue.textAndMnemonic=\u9752(&B):
-
-GTKColorChooserPanel.color.textAndMnemonic=\u8272\u540D(&N):
-
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.acceptAllFileFilter.textAndMnemonic=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
-FileChooser.newFolderButton.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0(&N)
-FileChooser.newFolderDialog.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D:
-FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\u30A8\u30E9\u30FC
-FileChooser.newFolderNoDirectoryError.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA"{0}"\u306E\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: \u3053\u306E\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-FileChooser.deleteFileButton.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u524A\u9664(&L)
-FileChooser.renameFileButton.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u5909\u66F4(&R)
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C)
-FileChooser.saveButton.textAndMnemonic=&OK
-FileChooser.openButton.textAndMnemonic=&OK
-FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F
-FileChooser.pathLabel.textAndMnemonic=\u9078\u629E(&S):
-FileChooser.filterLabel.textAndMnemonic=\u30D5\u30A3\u30EB\u30BF:
-FileChooser.foldersLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0(&D)
-FileChooser.filesLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB(&F)
-
-FileChooser.cancelButtonToolTip.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002
-FileChooser.saveButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002
-FileChooser.openButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059\u3002
-
-FileChooser.renameFileDialog.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB"{0}"\u3092\u6B21\u306E\u540D\u524D\u306B\u5909\u66F4:
-FileChooser.renameFileError.titleAndMnemonic=\u30A8\u30E9\u30FC
-FileChooser.renameFileError.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB"{0}"\u306E"{1}"\u3078\u306E\u5909\u66F4\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-
-
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+
+
+
+# GTK specific properties
+
+# GTK color chooser properties:
+GTKColorChooserPanel.textAndMnemonic=GTK\u30AB\u30E9\u30FC\u30FB\u30C1\u30E5\u30FC\u30B6(&G)
+# mnemonic as a VK_ constant
+
+GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u76F8(&H):
+
+GTKColorChooserPanel.red.textAndMnemonic=\u8D64(&E):
+
+GTKColorChooserPanel.saturation.textAndMnemonic=\u5F69\u5EA6(&S):
+
+GTKColorChooserPanel.green.textAndMnemonic=\u7DD1(&G):
+
+GTKColorChooserPanel.value.textAndMnemonic=\u5024(&V):
+
+GTKColorChooserPanel.blue.textAndMnemonic=\u9752(&B):
+
+GTKColorChooserPanel.color.textAndMnemonic=\u8272\u540D(&N):
+
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.acceptAllFileFilter.textAndMnemonic=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
+FileChooser.newFolderButton.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0(&N)
+FileChooser.newFolderDialog.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\u30A8\u30E9\u30FC
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA"{0}"\u306E\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: \u3053\u306E\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
+FileChooser.deleteFileButton.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u524A\u9664(&L)
+FileChooser.renameFileButton.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u5909\u66F4(&R)
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C)
+FileChooser.saveButton.textAndMnemonic=OK(&O)
+FileChooser.openButton.textAndMnemonic=OK(&O)
+FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F
+FileChooser.pathLabel.textAndMnemonic=\u9078\u629E(&S):
+FileChooser.filterLabel.textAndMnemonic=\u30D5\u30A3\u30EB\u30BF:
+FileChooser.foldersLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0(&D)
+FileChooser.filesLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB(&F)
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002
+FileChooser.saveButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002
+FileChooser.openButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059\u3002
+
+FileChooser.renameFileDialog.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB"{0}"\u3092\u6B21\u306E\u540D\u524D\u306B\u5909\u66F4:
+FileChooser.renameFileError.titleAndMnemonic=\u30A8\u30E9\u30FC
+FileChooser.renameFileError.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB"{0}"\u306E"{1}"\u3078\u306E\u5909\u66F4\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,55 +1,54 @@
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-
-
-
-# GTK specific properties
-
-# GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=GTK \uC0C9\uC0C1 \uC120\uD0DD\uAE30(&G)
-# mnemonic as a VK_ constant
-
-GTKColorChooserPanel.hue.textAndMnemonic=\uC0C9\uC870(&H):
-
-GTKColorChooserPanel.red.textAndMnemonic=\uBE68\uAC04\uC0C9(&E):
-
-GTKColorChooserPanel.saturation.textAndMnemonic=\uCC44\uB3C4(&S):
-
-GTKColorChooserPanel.green.textAndMnemonic=\uB179\uC0C9(&G):
-
-GTKColorChooserPanel.value.textAndMnemonic=\uAC12(&V):
-
-GTKColorChooserPanel.blue.textAndMnemonic=\uD30C\uB780\uC0C9(&B):
-
-GTKColorChooserPanel.color.textAndMnemonic=\uC0C9\uC0C1 \uC774\uB984(&N):
-
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.acceptAllFileFilter.textAndMnemonic=\uBAA8\uB4E0 \uD30C\uC77C
-FileChooser.newFolderButton.textAndMnemonic=\uC0C8 \uD3F4\uB354(&N)
-FileChooser.newFolderDialog.textAndMnemonic=\uD3F4\uB354 \uC774\uB984:
-FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\uC624\uB958
-FileChooser.newFolderNoDirectoryError.textAndMnemonic="{0}" \uB514\uB809\uD1A0\uB9AC\uB97C \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: \uD574\uB2F9 \uD30C\uC77C \uB610\uB294 \uB514\uB809\uD1A0\uB9AC\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.
-FileChooser.deleteFileButton.textAndMnemonic=\uD30C\uC77C \uC0AD\uC81C(&L)
-FileChooser.renameFileButton.textAndMnemonic=\uD30C\uC77C \uC774\uB984 \uBC14\uAFB8\uAE30(&R)
-FileChooser.cancelButton.textAndMnemonic=\uCDE8\uC18C(&C)
-FileChooser.saveButton.textAndMnemonic=\uD655\uC778(&O)
-FileChooser.openButton.textAndMnemonic=\uD655\uC778(&O)
-FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
-FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
-FileChooser.pathLabel.textAndMnemonic=\uC120\uD0DD \uC0AC\uD56D(&S):
-FileChooser.filterLabel.textAndMnemonic=\uD544\uD130:
-FileChooser.foldersLabel.textAndMnemonic=\uD3F4\uB354(&D)
-FileChooser.filesLabel.textAndMnemonic=\uD30C\uC77C(&F)
-
-FileChooser.cancelButtonToolTip.textAndMnemonic=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790\uB97C \uC911\uB2E8\uD569\uB2C8\uB2E4.
-FileChooser.saveButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC800\uC7A5\uD569\uB2C8\uB2E4.
-FileChooser.openButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC5FD\uB2C8\uB2E4.
-
-FileChooser.renameFileDialog.textAndMnemonic="{0}" \uD30C\uC77C\uC758 \uC774\uB984 \uBC14\uAFB8\uAE30
-FileChooser.renameFileError.titleAndMnemonic=\uC624\uB958
-FileChooser.renameFileError.textAndMnemonic="{0}" \uD30C\uC77C\uC758 \uC774\uB984\uC744 "{1}"(\uC73C)\uB85C \uBC14\uAFB8\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
-
-
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+
+
+
+# GTK specific properties
+
+# GTK color chooser properties:
+GTKColorChooserPanel.textAndMnemonic=GTK \uC0C9\uC0C1 \uC120\uD0DD\uAE30(&G)
+# mnemonic as a VK_ constant
+
+GTKColorChooserPanel.hue.textAndMnemonic=\uC0C9\uC870(&H):
+
+GTKColorChooserPanel.red.textAndMnemonic=\uBE68\uAC04\uC0C9(&E):
+
+GTKColorChooserPanel.saturation.textAndMnemonic=\uCC44\uB3C4(&S):
+
+GTKColorChooserPanel.green.textAndMnemonic=\uB179\uC0C9(&G):
+
+GTKColorChooserPanel.value.textAndMnemonic=\uAC12(&V):
+
+GTKColorChooserPanel.blue.textAndMnemonic=\uD30C\uB780\uC0C9(&B):
+
+GTKColorChooserPanel.color.textAndMnemonic=\uC0C9\uC0C1 \uC774\uB984(&N):
+
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.acceptAllFileFilter.textAndMnemonic=\uBAA8\uB4E0 \uD30C\uC77C
+FileChooser.newFolderButton.textAndMnemonic=\uC0C8 \uD3F4\uB354(&N)
+FileChooser.newFolderDialog.textAndMnemonic=\uD3F4\uB354 \uC774\uB984:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\uC624\uB958
+FileChooser.newFolderNoDirectoryError.textAndMnemonic="{0}" \uB514\uB809\uD1A0\uB9AC\uB97C \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: \uD574\uB2F9 \uD30C\uC77C \uB610\uB294 \uB514\uB809\uD1A0\uB9AC\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.
+FileChooser.deleteFileButton.textAndMnemonic=\uD30C\uC77C \uC0AD\uC81C(&L)
+FileChooser.renameFileButton.textAndMnemonic=\uD30C\uC77C \uC774\uB984 \uBC14\uAFB8\uAE30(&R)
+FileChooser.cancelButton.textAndMnemonic=\uCDE8\uC18C(&C)
+FileChooser.saveButton.textAndMnemonic=\uD655\uC778(&O)
+FileChooser.openButton.textAndMnemonic=\uD655\uC778(&O)
+FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5
+FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30
+FileChooser.pathLabel.textAndMnemonic=\uC120\uD0DD \uC0AC\uD56D(&S):
+FileChooser.filterLabel.textAndMnemonic=\uD544\uD130:
+FileChooser.foldersLabel.textAndMnemonic=\uD3F4\uB354(&D)
+FileChooser.filesLabel.textAndMnemonic=\uD30C\uC77C(&F)
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790\uB97C \uC911\uB2E8\uD569\uB2C8\uB2E4.
+FileChooser.saveButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC800\uC7A5\uD569\uB2C8\uB2E4.
+FileChooser.openButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC5FD\uB2C8\uB2E4.
+
+FileChooser.renameFileDialog.textAndMnemonic="{0}" \uD30C\uC77C\uC758 \uC774\uB984 \uBC14\uAFB8\uAE30
+FileChooser.renameFileError.titleAndMnemonic=\uC624\uB958
+FileChooser.renameFileError.textAndMnemonic="{0}" \uD30C\uC77C\uC758 \uC774\uB984\uC744 "{1}"(\uC73C)\uB85C \uBC14\uAFB8\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
+
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,59 +1,54 @@
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-
-
-
-# GTK specific properties
-
-# GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=Seletor de Cores do &GTK
-# mnemonic as a VK_ constant
-
-GTKColorChooserPanel.hue.textAndMnemonic=&Matiz:
-
-GTKColorChooserPanel.red.textAndMnemonic=V&ermelho:
-
-GTKColorChooserPanel.saturation.textAndMnemonic=Satura\u00E7\u00E3o(&S):
-
-GTKColorChooserPanel.green.textAndMnemonic=Ver&de:
-
-GTKColorChooserPanel.value.textAndMnemonic=&Valor:
-
-GTKColorChooserPanel.blue.textAndMnemonic=&Azul:
-
-GTKColorChooserPanel.color.textAndMnemonic=&Nome da Cor:
-
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.acceptAllFileFilter.textAndMnemonic=Todos os Arquivos
-FileChooser.newFolderButton.textAndMnemonic=&Nova Pasta
-FileChooser.newFolderDialog.textAndMnemonic=Nome da pasta:
-FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Erro
-FileChooser.newFolderNoDirectoryError.textAndMnemonic=Erro ao criar o diret\u00F3rio "{0}": N\u00E3o h\u00E1 arquivo ou diret\u00F3rio
-FileChooser.deleteFileButton.textAndMnemonic=De&letar Arquivo
-FileChooser.renameFileButton.textAndMnemonic=&Renomear Arquivo
-FileChooser.cancelButton.textAndMnemonic=&Cancelar
-FileChooser.saveButton.textAndMnemonic=&OK
-FileChooser.openButton.textAndMnemonic=&OK
-FileChooser.saveDialogTitle.textAndMnemonic=Salvar
-FileChooser.openDialogTitle.textAndMnemonic=Abrir
-FileChooser.pathLabel.textAndMnemonic=Sele\u00E7\u00E3o(&S):
-FileChooser.filterLabel.textAndMnemonic=Filtro:
-FileChooser.foldersLabel.textAndMnemonic=&Pastas
-FileChooser.filesLabel.textAndMnemonic=&Arquivos
-
-FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar caixa de di\u00E1logo do seletor de arquivos.
-FileChooser.saveButtonToolTip.textAndMnemonic=Salvar arquivo selecionado.
-FileChooser.openButtonToolTip.textAndMnemonic=Abrir arquivo selecionado.
-
-FileChooser.renameFileDialog.textAndMnemonic=Renomear arquivo "{0}" por
-FileChooser.renameFileError.titleAndMnemonic=Erro
-FileChooser.renameFileError.textAndMnemonic=Erro ao renomear o arquivo "{0}" por "{1}"
-
-# dummy resource added for translation automation
-OptionPane.okButton.textAndMnemonic=&OK
-# dummy resource added for translation automation
-OptionPane.cancelButton.textAndMnemonic=&Cancelar
-
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+
+
+
+# GTK specific properties
+
+# GTK color chooser properties:
+GTKColorChooserPanel.textAndMnemonic=Seletor de Cores do &GTK
+# mnemonic as a VK_ constant
+
+GTKColorChooserPanel.hue.textAndMnemonic=&Matiz:
+
+GTKColorChooserPanel.red.textAndMnemonic=V&ermelho:
+
+GTKColorChooserPanel.saturation.textAndMnemonic=&Satura\u00E7\u00E3o:
+
+GTKColorChooserPanel.green.textAndMnemonic=&Verde:
+
+GTKColorChooserPanel.value.textAndMnemonic=&Valor:
+
+GTKColorChooserPanel.blue.textAndMnemonic=&Azul:
+
+GTKColorChooserPanel.color.textAndMnemonic=&Nome da Cor:
+
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.acceptAllFileFilter.textAndMnemonic=Todos os Arquivos
+FileChooser.newFolderButton.textAndMnemonic=&Nova Pasta
+FileChooser.newFolderDialog.textAndMnemonic=Nome da pasta:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Erro
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=Erro ao criar o diret\u00F3rio "{0}": N\u00E3o h\u00E1 arquivo ou diret\u00F3rio
+FileChooser.deleteFileButton.textAndMnemonic=De&letar Arquivo
+FileChooser.renameFileButton.textAndMnemonic=&Renomear Arquivo
+FileChooser.cancelButton.textAndMnemonic=&Cancelar
+FileChooser.saveButton.textAndMnemonic=&OK
+FileChooser.openButton.textAndMnemonic=&OK
+FileChooser.saveDialogTitle.textAndMnemonic=Salvar
+FileChooser.openDialogTitle.textAndMnemonic=Abrir
+FileChooser.pathLabel.textAndMnemonic=&Sele\u00E7\u00E3o:
+FileChooser.filterLabel.textAndMnemonic=Filtro:
+FileChooser.foldersLabel.textAndMnemonic=&Pastas
+FileChooser.filesLabel.textAndMnemonic=&Arquivos
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar caixa de di\u00E1logo do seletor de arquivos.
+FileChooser.saveButtonToolTip.textAndMnemonic=Salvar arquivo selecionado.
+FileChooser.openButtonToolTip.textAndMnemonic=Abrir arquivo selecionado.
+
+FileChooser.renameFileDialog.textAndMnemonic=Renomear arquivo "{0}" por
+FileChooser.renameFileError.titleAndMnemonic=Erro
+FileChooser.renameFileError.textAndMnemonic=Erro ao renomear o arquivo "{0}" por "{1}"
+
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,59 +1,54 @@
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-
-
-
-# GTK specific properties
-
-# GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=GTK-f\u00E4rgv\u00E4ljaren(&G)
-# mnemonic as a VK_ constant
-
-GTKColorChooserPanel.hue.textAndMnemonic=&Nyans:
-
-GTKColorChooserPanel.red.textAndMnemonic=R\u00F6d(&R):
-
-GTKColorChooserPanel.saturation.textAndMnemonic=M\u00E4ttnad(&M):
-
-GTKColorChooserPanel.green.textAndMnemonic=Gr\u00F6n(&G):
-
-GTKColorChooserPanel.value.textAndMnemonic=V\u00E4rde(&V):
-
-GTKColorChooserPanel.blue.textAndMnemonic=Bl\u00E5(&B):
-
-GTKColorChooserPanel.color.textAndMnemonic=F\u00E4rgnamn(&F):
-
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.acceptAllFileFilter.textAndMnemonic=Alla filer
-FileChooser.newFolderButton.textAndMnemonic=&Ny mapp
-FileChooser.newFolderDialog.textAndMnemonic=Mapp:
-FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Fel
-FileChooser.newFolderNoDirectoryError.textAndMnemonic=Ett fel intr\u00E4ffade vid f\u00F6rs\u00F6k att skapa katalogen "{0}": Filen eller katalogen finns inte
-FileChooser.deleteFileButton.textAndMnemonic=Ta &bort fil
-FileChooser.renameFileButton.textAndMnemonic=\u00C4ndra namn p\u00E5 filen(&R)
-FileChooser.cancelButton.textAndMnemonic=&Avbryt
-FileChooser.saveButton.textAndMnemonic=&OK
-FileChooser.openButton.textAndMnemonic=&OK
-FileChooser.saveDialogTitle.textAndMnemonic=Spara
-FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna
-FileChooser.pathLabel.textAndMnemonic=&Urval:
-FileChooser.filterLabel.textAndMnemonic=Filter:
-FileChooser.foldersLabel.textAndMnemonic=Ma&ppar
-FileChooser.filesLabel.textAndMnemonic=&Filer
-
-FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt dialogrutan Filv\u00E4ljare.
-FileChooser.saveButtonToolTip.textAndMnemonic=Spara vald fil.
-FileChooser.openButtonToolTip.textAndMnemonic=\u00D6ppna vald fil.
-
-FileChooser.renameFileDialog.textAndMnemonic=Namn\u00E4ndra fil "{0}" till
-FileChooser.renameFileError.titleAndMnemonic=Fel
-FileChooser.renameFileError.textAndMnemonic=Fel vid namn\u00E4ndring av fil "{0}" till "{1}"
-
-# dummy resource added for translation automation
-OptionPane.okButton.textAndMnemonic=&OK
-# dummy resource added for translation automation
-OptionPane.cancelButton.textAndMnemonic=&Avbryt
-
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+
+
+
+# GTK specific properties
+
+# GTK color chooser properties:
+GTKColorChooserPanel.textAndMnemonic=&GTK-f\u00E4rgv\u00E4ljaren
+# mnemonic as a VK_ constant
+
+GTKColorChooserPanel.hue.textAndMnemonic=&Nyans:
+
+GTKColorChooserPanel.red.textAndMnemonic=R&\u00F6d:
+
+GTKColorChooserPanel.saturation.textAndMnemonic=&M\u00E4ttnad:
+
+GTKColorChooserPanel.green.textAndMnemonic=&Gr\u00F6n:
+
+GTKColorChooserPanel.value.textAndMnemonic=&V\u00E4rde:
+
+GTKColorChooserPanel.blue.textAndMnemonic=&Bl\u00E5:
+
+GTKColorChooserPanel.color.textAndMnemonic=F\u00E4rg&namn:
+
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.acceptAllFileFilter.textAndMnemonic=Alla filer
+FileChooser.newFolderButton.textAndMnemonic=&Ny mapp
+FileChooser.newFolderDialog.textAndMnemonic=Mapp:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Fel
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=Ett fel intr\u00E4ffade vid f\u00F6rs\u00F6k att skapa katalogen "{0}": Filen eller katalogen finns inte
+FileChooser.deleteFileButton.textAndMnemonic=Ta &bort fil
+FileChooser.renameFileButton.textAndMnemonic=&\u00C4ndra namn p\u00E5 filen
+FileChooser.cancelButton.textAndMnemonic=&Avbryt
+FileChooser.saveButton.textAndMnemonic=&OK
+FileChooser.openButton.textAndMnemonic=&OK
+FileChooser.saveDialogTitle.textAndMnemonic=Spara
+FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna
+FileChooser.pathLabel.textAndMnemonic=&Urval:
+FileChooser.filterLabel.textAndMnemonic=Filter:
+FileChooser.foldersLabel.textAndMnemonic=Map&par
+FileChooser.filesLabel.textAndMnemonic=&Filer
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt dialogrutan Filv\u00E4ljare.
+FileChooser.saveButtonToolTip.textAndMnemonic=Spara vald fil.
+FileChooser.openButtonToolTip.textAndMnemonic=\u00D6ppna vald fil.
+
+FileChooser.renameFileDialog.textAndMnemonic=Namn\u00E4ndra fil "{0}" till
+FileChooser.renameFileError.titleAndMnemonic=Fel
+FileChooser.renameFileError.textAndMnemonic=Fel vid namn\u00E4ndring av fil "{0}" till "{1}"
+
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,55 +1,54 @@
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-
-
-
-# GTK specific properties
-
-# GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=GTK \u989C\u8272\u9009\u62E9\u5668(&G)
-# mnemonic as a VK_ constant
-
-GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u8C03(&H):
-
-GTKColorChooserPanel.red.textAndMnemonic=\u7EA2\u8272(&E):
-
-GTKColorChooserPanel.saturation.textAndMnemonic=\u9971\u548C\u5EA6(&S):
-
-GTKColorChooserPanel.green.textAndMnemonic=\u7EFF\u8272(&G):
-
-GTKColorChooserPanel.value.textAndMnemonic=\u503C(&V):
-
-GTKColorChooserPanel.blue.textAndMnemonic=\u84DD\u8272(&B):
-
-GTKColorChooserPanel.color.textAndMnemonic=\u989C\u8272\u540D(&N):
-
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6587\u4EF6
-FileChooser.newFolderButton.textAndMnemonic=\u65B0\u6587\u4EF6\u5939(&N)
-FileChooser.newFolderDialog.textAndMnemonic=\u6587\u4EF6\u5939\u540D:
-FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\u9519\u8BEF
-FileChooser.newFolderNoDirectoryError.textAndMnemonic=\u521B\u5EFA\u76EE\u5F55 "{0}" \u65F6\u51FA\u9519: \u6CA1\u6709\u6B64\u7C7B\u6587\u4EF6\u6216\u76EE\u5F55
-FileChooser.deleteFileButton.textAndMnemonic=\u5220\u9664\u6587\u4EF6(&L)
-FileChooser.renameFileButton.textAndMnemonic=\u91CD\u547D\u540D\u6587\u4EF6(&R)
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C)
-FileChooser.saveButton.textAndMnemonic=\u786E\u5B9A(&O)
-FileChooser.openButton.textAndMnemonic=\u786E\u5B9A(&O)
-FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00
-FileChooser.pathLabel.textAndMnemonic=\u9009\u5B9A\u5185\u5BB9(&S):
-FileChooser.filterLabel.textAndMnemonic=\u7B5B\u9009\u5668:
-FileChooser.foldersLabel.textAndMnemonic=\u6587\u4EF6\u5939(&D)
-FileChooser.filesLabel.textAndMnemonic=\u6587\u4EF6(&F)
-
-FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846\u3002
-FileChooser.saveButtonToolTip.textAndMnemonic=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6\u3002
-FileChooser.openButtonToolTip.textAndMnemonic=\u6253\u5F00\u6240\u9009\u6587\u4EF6\u3002
-
-FileChooser.renameFileDialog.textAndMnemonic=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A
-FileChooser.renameFileError.titleAndMnemonic=\u9519\u8BEF
-FileChooser.renameFileError.textAndMnemonic=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A "{1}" \u65F6\u51FA\u9519
-
-
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+
+
+
+# GTK specific properties
+
+# GTK color chooser properties:
+GTKColorChooserPanel.textAndMnemonic=GTK \u989C\u8272\u9009\u62E9\u5668(&G)
+# mnemonic as a VK_ constant
+
+GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u8C03(&H):
+
+GTKColorChooserPanel.red.textAndMnemonic=\u7EA2\u8272(&E):
+
+GTKColorChooserPanel.saturation.textAndMnemonic=\u9971\u548C\u5EA6(&S):
+
+GTKColorChooserPanel.green.textAndMnemonic=\u7EFF\u8272(&G):
+
+GTKColorChooserPanel.value.textAndMnemonic=\u503C(&V):
+
+GTKColorChooserPanel.blue.textAndMnemonic=\u84DD\u8272(&B):
+
+GTKColorChooserPanel.color.textAndMnemonic=\u989C\u8272\u540D(&N):
+
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6587\u4EF6
+FileChooser.newFolderButton.textAndMnemonic=\u65B0\u6587\u4EF6\u5939(&N)
+FileChooser.newFolderDialog.textAndMnemonic=\u6587\u4EF6\u5939\u540D: 
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\u9519\u8BEF
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=\u521B\u5EFA\u76EE\u5F55 "{0}" \u65F6\u51FA\u9519: \u6CA1\u6709\u6B64\u7C7B\u6587\u4EF6\u6216\u76EE\u5F55
+FileChooser.deleteFileButton.textAndMnemonic=\u5220\u9664\u6587\u4EF6(&L)
+FileChooser.renameFileButton.textAndMnemonic=\u91CD\u547D\u540D\u6587\u4EF6(&R)
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C)
+FileChooser.saveButton.textAndMnemonic=\u786E\u5B9A(&O)
+FileChooser.openButton.textAndMnemonic=\u786E\u5B9A(&O)
+FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00
+FileChooser.pathLabel.textAndMnemonic=\u9009\u5B9A\u5185\u5BB9(&S):
+FileChooser.filterLabel.textAndMnemonic=\u7B5B\u9009\u5668: 
+FileChooser.foldersLabel.textAndMnemonic=\u6587\u4EF6\u5939(&D)
+FileChooser.filesLabel.textAndMnemonic=\u6587\u4EF6(&F)
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846\u3002
+FileChooser.saveButtonToolTip.textAndMnemonic=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6\u3002
+FileChooser.openButtonToolTip.textAndMnemonic=\u6253\u5F00\u6240\u9009\u6587\u4EF6\u3002
+
+FileChooser.renameFileDialog.textAndMnemonic=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A
+FileChooser.renameFileError.titleAndMnemonic=\u9519\u8BEF
+FileChooser.renameFileError.textAndMnemonic=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A "{1}" \u65F6\u51FA\u9519
+
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,55 +1,54 @@
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-
-
-
-# GTK specific properties
-
-# GTK color chooser properties:
-GTKColorChooserPanel.textAndMnemonic=GTK \u8272\u5F69\u9078\u64C7\u5668(&G)
-# mnemonic as a VK_ constant
-
-GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u8ABF(&H)\uFF1A
-
-GTKColorChooserPanel.red.textAndMnemonic=\u7D05(&E):
-
-GTKColorChooserPanel.saturation.textAndMnemonic=\u5F69\u5EA6(&S):
-
-GTKColorChooserPanel.green.textAndMnemonic=\u7DA0(&G):
-
-GTKColorChooserPanel.value.textAndMnemonic=\u503C(&V):
-
-GTKColorChooserPanel.blue.textAndMnemonic=\u85CD(&B):
-
-GTKColorChooserPanel.color.textAndMnemonic=\u984F\u8272\u540D\u7A31(&N):
-
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6A94\u6848
-FileChooser.newFolderButton.textAndMnemonic=\u65B0\u5EFA\u8CC7\u6599\u593E(&N)
-FileChooser.newFolderDialog.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31:
-FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\u932F\u8AA4
-FileChooser.newFolderNoDirectoryError.textAndMnemonic=\u5EFA\u7ACB\u76EE\u9304 "{0}" \u6642\u767C\u751F\u932F\u8AA4: \u6C92\u6709\u6B64\u6A94\u6848\u6216\u76EE\u9304
-FileChooser.deleteFileButton.textAndMnemonic=\u522A\u9664\u6A94\u6848(&L)
-FileChooser.renameFileButton.textAndMnemonic=\u91CD\u65B0\u547D\u540D\u6A94\u6848(&R)
-FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C)
-FileChooser.saveButton.textAndMnemonic=\u78BA\u5B9A(&O)
-FileChooser.openButton.textAndMnemonic=\u78BA\u5B9A(&O)
-FileChooser.saveDialogTitle.textAndMnemonic=\u5132\u5B58
-FileChooser.openDialogTitle.textAndMnemonic=\u958B\u555F
-FileChooser.pathLabel.textAndMnemonic=\u9078\u53D6(&S):
-FileChooser.filterLabel.textAndMnemonic=\u7BE9\u9078:
-FileChooser.foldersLabel.textAndMnemonic=\u8CC7\u6599\u593E(&D)
-FileChooser.filesLabel.textAndMnemonic=\u6A94\u6848(&F)
-
-FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A\u3002
-FileChooser.saveButtonToolTip.textAndMnemonic=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848\u3002
-FileChooser.openButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848\u3002
-
-FileChooser.renameFileDialog.textAndMnemonic=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA
-FileChooser.renameFileError.titleAndMnemonic=\u932F\u8AA4
-FileChooser.renameFileError.textAndMnemonic=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA "{1}" \u6642\u51FA\u73FE\u932F\u8AA4
-
-
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+
+
+
+# GTK specific properties
+
+# GTK color chooser properties:
+GTKColorChooserPanel.textAndMnemonic=GTK \u8272\u5F69\u9078\u64C7\u5668(&G)
+# mnemonic as a VK_ constant
+
+GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u8ABF(&H):
+
+GTKColorChooserPanel.red.textAndMnemonic=\u7D05(&E):
+
+GTKColorChooserPanel.saturation.textAndMnemonic=\u5F69\u5EA6(&S):
+
+GTKColorChooserPanel.green.textAndMnemonic=\u7DA0(&G):
+
+GTKColorChooserPanel.value.textAndMnemonic=\u503C(&V):
+
+GTKColorChooserPanel.blue.textAndMnemonic=\u85CD(&B):
+
+GTKColorChooserPanel.color.textAndMnemonic=\u984F\u8272\u540D\u7A31(&N):
+
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6A94\u6848
+FileChooser.newFolderButton.textAndMnemonic=\u65B0\u5EFA\u8CC7\u6599\u593E(&N)
+FileChooser.newFolderDialog.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31:
+FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\u932F\u8AA4
+FileChooser.newFolderNoDirectoryError.textAndMnemonic=\u5EFA\u7ACB\u76EE\u9304 "{0}" \u6642\u767C\u751F\u932F\u8AA4: \u6C92\u6709\u6B64\u6A94\u6848\u6216\u76EE\u9304
+FileChooser.deleteFileButton.textAndMnemonic=\u522A\u9664\u6A94\u6848(&L)
+FileChooser.renameFileButton.textAndMnemonic=\u91CD\u65B0\u547D\u540D\u6A94\u6848(&R)
+FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C)
+FileChooser.saveButton.textAndMnemonic=\u78BA\u5B9A(&O)
+FileChooser.openButton.textAndMnemonic=\u78BA\u5B9A(&O)
+FileChooser.saveDialogTitle.textAndMnemonic=\u5132\u5B58
+FileChooser.openDialogTitle.textAndMnemonic=\u958B\u555F
+FileChooser.pathLabel.textAndMnemonic=\u9078\u53D6(&S):
+FileChooser.filterLabel.textAndMnemonic=\u7BE9\u9078:
+FileChooser.foldersLabel.textAndMnemonic=\u8CC7\u6599\u593E(&D)
+FileChooser.filesLabel.textAndMnemonic=\u6A94\u6848(&F)
+
+FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A\u3002
+FileChooser.saveButtonToolTip.textAndMnemonic=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848\u3002
+FileChooser.openButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848\u3002
+
+FileChooser.renameFileDialog.textAndMnemonic=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA
+FileChooser.renameFileError.titleAndMnemonic=\u932F\u8AA4
+FileChooser.renameFileError.textAndMnemonic=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA "{1}" \u6642\u51FA\u73FE\u932F\u8AA4
+
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties	Wed May 08 11:22:25 2013 +0100
@@ -26,11 +26,11 @@
 FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
 FileChooser.updateButton.textAndMnemonic=Aktualisieren
 FileChooser.helpButton.textAndMnemonic=Hilfe
-FileChooser.pathLabel.textAndMnemonic=&Pfad- oder Ordnernamen eingeben:
+FileChooser.pathLabel.textAndMnemonic=&Pfad- oder Ordnername eingeben:
 FileChooser.filterLabel.textAndMnemonic=Filte&r
-FileChooser.foldersLabel.textAndMnemonic=Ordner(&L)
+FileChooser.foldersLabel.textAndMnemonic=Ord&ner
 FileChooser.filesLabel.textAndMnemonic=Date&ien
-FileChooser.enterFileNameLabel.textAndMnemonic=Datei&namen eingeben:
+FileChooser.enterFileNameLabel.textAndMnemonic=Dateiname ei&ngeben:
 FileChooser.enterFolderNameLabel.textAndMnemonic=Ordnernamen eingeben:
 
 FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen.
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties	Wed May 08 11:22:25 2013 +0100
@@ -26,9 +26,9 @@
 FileChooser.openDialogTitle.textAndMnemonic=Abrir
 FileChooser.updateButton.textAndMnemonic=Actualizar
 FileChooser.helpButton.textAndMnemonic=Ayuda
-FileChooser.pathLabel.textAndMnemonic=Introducir nombre de la ruta de acceso o car&peta:
+FileChooser.pathLabel.textAndMnemonic=Introducir nombre de ruta de acceso o car&peta:
 FileChooser.filterLabel.textAndMnemonic=Filt&ro
-FileChooser.foldersLabel.textAndMnemonic=Carpetas(&L)
+FileChooser.foldersLabel.textAndMnemonic=Carpe&tas
 FileChooser.filesLabel.textAndMnemonic=Arch&ivos
 FileChooser.enterFileNameLabel.textAndMnemonic=I&ntroducir nombre de archivo:
 FileChooser.enterFolderNameLabel.textAndMnemonic=Introducir nombre de carpeta:
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties	Wed May 08 11:22:25 2013 +0100
@@ -26,9 +26,9 @@
 FileChooser.openDialogTitle.textAndMnemonic=Ouvrir
 FileChooser.updateButton.textAndMnemonic=Mettre \u00E0 jour
 FileChooser.helpButton.textAndMnemonic=Aide
-FileChooser.pathLabel.textAndMnemonic=Entrez le chemin ou le nom du dossier (&P):
+FileChooser.pathLabel.textAndMnemonic=Entrez le c&hemin ou le nom du dossier :
 FileChooser.filterLabel.textAndMnemonic=Filt&re
-FileChooser.foldersLabel.textAndMnemonic=Dossiers(&L)
+FileChooser.foldersLabel.textAndMnemonic=&Dossiers
 FileChooser.filesLabel.textAndMnemonic=F&ichiers
 FileChooser.enterFileNameLabel.textAndMnemonic=E&ntrez le nom du fichier :
 FileChooser.enterFolderNameLabel.textAndMnemonic=Entrez le nom du dossier :
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties	Wed May 08 11:22:25 2013 +0100
@@ -28,9 +28,9 @@
 FileChooser.helpButton.textAndMnemonic=?
 FileChooser.pathLabel.textAndMnemonic=&Percorso o nome cartella:
 FileChooser.filterLabel.textAndMnemonic=Filt&ro
-FileChooser.foldersLabel.textAndMnemonic=Carte&lle
+FileChooser.foldersLabel.textAndMnemonic=Car&telle
 FileChooser.filesLabel.textAndMnemonic=F&ile
-FileChooser.enterFileNameLabel.textAndMnemonic=&Nome file:
+FileChooser.enterFileNameLabel.textAndMnemonic=Immettere il &nome file: 
 FileChooser.enterFolderNameLabel.textAndMnemonic=Nome cartella:
 
 FileChooser.cancelButtonToolTip.textAndMnemonic=Chiude la finestra di dialogo di selezione file.
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties	Wed May 08 11:22:25 2013 +0100
@@ -26,11 +26,11 @@
 FileChooser.openDialogTitle.textAndMnemonic=Abrir
 FileChooser.updateButton.textAndMnemonic=Atualizar
 FileChooser.helpButton.textAndMnemonic=Ajuda
-FileChooser.pathLabel.textAndMnemonic=Informar caminho ou nome da &pasta:
+FileChooser.pathLabel.textAndMnemonic=Informar &caminho ou nome da pasta:
 FileChooser.filterLabel.textAndMnemonic=Filt&ro
-FileChooser.foldersLabel.textAndMnemonic=Pastas(&L)
+FileChooser.foldersLabel.textAndMnemonic=Pa&stas
 FileChooser.filesLabel.textAndMnemonic=Arqu&ivos
-FileChooser.enterFileNameLabel.textAndMnemonic=I&nformar nome do arquivo:
+FileChooser.enterFileNameLabel.textAndMnemonic=I&nforme o nome do arquivo:
 FileChooser.enterFolderNameLabel.textAndMnemonic=Informar nome da pasta:
 
 FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar caixa de di\u00E1logo do seletor de arquivos.
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties	Wed May 08 11:22:25 2013 +0100
@@ -26,9 +26,9 @@
 FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna
 FileChooser.updateButton.textAndMnemonic=Uppdatera
 FileChooser.helpButton.textAndMnemonic=Hj\u00E4lp
-FileChooser.pathLabel.textAndMnemonic=Ange s\u00F6kv\u00E4g eller mappnamn(&P):
+FileChooser.pathLabel.textAndMnemonic=Ange &s\u00F6kv\u00E4g eller mappnamn:
 FileChooser.filterLabel.textAndMnemonic=Filte&r
-FileChooser.foldersLabel.textAndMnemonic=Mappar(&L)
+FileChooser.foldersLabel.textAndMnemonic=Ma&ppar
 FileChooser.filesLabel.textAndMnemonic=F&iler
 FileChooser.enterFileNameLabel.textAndMnemonic=A&nge filnamn:
 FileChooser.enterFolderNameLabel.textAndMnemonic=Ange ett mappnamn:
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -26,11 +26,11 @@
 FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00
 FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0
 FileChooser.helpButton.textAndMnemonic=\u5E2E\u52A9
-FileChooser.pathLabel.textAndMnemonic=\u952E\u5165\u8DEF\u5F84\u6216\u6587\u4EF6\u5939\u540D: (&P)
+FileChooser.pathLabel.textAndMnemonic=\u8F93\u5165\u8DEF\u5F84\u6216\u6587\u4EF6\u5939\u540D(&P):
 FileChooser.filterLabel.textAndMnemonic=\u7B5B\u9009\u5668(&R)
 FileChooser.foldersLabel.textAndMnemonic=\u6587\u4EF6\u5939(&L)
 FileChooser.filesLabel.textAndMnemonic=\u6587\u4EF6(&I)
-FileChooser.enterFileNameLabel.textAndMnemonic=\u952E\u5165\u6587\u4EF6\u540D: (&N)
+FileChooser.enterFileNameLabel.textAndMnemonic=\u8F93\u5165\u6587\u4EF6\u540D(&N):
 FileChooser.enterFolderNameLabel.textAndMnemonic=\u8F93\u5165\u6587\u4EF6\u5939\u540D:
 
 FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846\u3002
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties	Wed May 08 11:22:25 2013 +0100
@@ -20,9 +20,9 @@
 
 FileChooser.lookInLabel.textAndMnemonic=Suchen &in:
 FileChooser.saveInLabel.textAndMnemonic=Speichern in:
-FileChooser.fileNameLabel.textAndMnemonic=Datei&name:
-FileChooser.folderNameLabel.textAndMnemonic=Ord&nername:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Da&teityp:
+FileChooser.fileNameLabel.textAndMnemonic=&Dateiname:
+FileChooser.folderNameLabel.textAndMnemonic=Ordner&name:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Datei&typ:
 FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her
 FileChooser.upFolderAccessibleName=Nach oben
 FileChooser.homeFolderToolTip.textAndMnemonic=Home
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties	Wed May 08 11:22:25 2013 +0100
@@ -18,11 +18,11 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=Buscar en(&I):
+FileChooser.lookInLabel.textAndMnemonic=&Buscar en:
 FileChooser.saveInLabel.textAndMnemonic=Guardar en:
-FileChooser.fileNameLabel.textAndMnemonic=&Nombre de Archivo:
-FileChooser.folderNameLabel.textAndMnemonic=&Nombre de la Carpeta:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de &Tipo:
+FileChooser.fileNameLabel.textAndMnemonic=&Nombre de archivo:
+FileChooser.folderNameLabel.textAndMnemonic=&Nombre de carpeta:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de &tipo:
 FileChooser.upFolderToolTip.textAndMnemonic=Subir un Nivel
 FileChooser.upFolderAccessibleName=Arriba
 FileChooser.homeFolderToolTip.textAndMnemonic=Inicio
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties	Wed May 08 11:22:25 2013 +0100
@@ -18,11 +18,11 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=Rechercher dans (&I):
+FileChooser.lookInLabel.textAndMnemonic=Rechercher &dans :
 FileChooser.saveInLabel.textAndMnemonic=Enregistrer dans :
 FileChooser.fileNameLabel.textAndMnemonic=&Nom du fichier :
 FileChooser.folderNameLabel.textAndMnemonic=&Nom du dossier :
-FileChooser.filesOfTypeLabel.textAndMnemonic=Fichiers de &type :
+FileChooser.filesOfTypeLabel.textAndMnemonic=&Type de fichier :
 FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
 FileChooser.upFolderAccessibleName=Monter
 FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties	Wed May 08 11:22:25 2013 +0100
@@ -21,7 +21,7 @@
 FileChooser.lookInLabel.textAndMnemonic=Cerca &in:
 FileChooser.saveInLabel.textAndMnemonic=Salva in:
 FileChooser.fileNameLabel.textAndMnemonic=&Nome file:
-FileChooser.folderNameLabel.textAndMnemonic=&Nome della cartella:
+FileChooser.folderNameLabel.textAndMnemonic=&Nome cartella:
 FileChooser.filesOfTypeLabel.textAndMnemonic=&Tipo file:
 FileChooser.upFolderToolTip.textAndMnemonic=Cartella superiore
 FileChooser.upFolderAccessibleName=Superiore
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties	Wed May 08 11:22:25 2013 +0100
@@ -18,7 +18,7 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\u53C2\u7167(&I):
+FileChooser.lookInLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240(&I):
 FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
 FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D(&N):
 FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D(&N):
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties	Wed May 08 11:22:25 2013 +0100
@@ -18,7 +18,7 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\uAC80\uC0C9 \uC704\uCE58(&I):
+FileChooser.lookInLabel.textAndMnemonic=\uCC3E\uB294 \uC704\uCE58(&I):
 FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58:
 FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984(&N):
 FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984(&N):
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties	Wed May 08 11:22:25 2013 +0100
@@ -18,7 +18,7 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=Consultar em(&I):
+FileChooser.lookInLabel.textAndMnemonic=Pesquisar &em:
 FileChooser.saveInLabel.textAndMnemonic=Salvar em:
 FileChooser.fileNameLabel.textAndMnemonic=&Nome do arquivo:
 FileChooser.folderNameLabel.textAndMnemonic=&Nome da pasta:
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties	Wed May 08 11:22:25 2013 +0100
@@ -21,8 +21,8 @@
 FileChooser.lookInLabel.textAndMnemonic=Leta &i:
 FileChooser.saveInLabel.textAndMnemonic=Spara i:
 FileChooser.fileNameLabel.textAndMnemonic=Fil&namn:
-FileChooser.folderNameLabel.textAndMnemonic=Mapp(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=Filforma&t:
+FileChooser.folderNameLabel.textAndMnemonic=Mapp&namn:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Filer av &typ:
 FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
 FileChooser.upFolderAccessibleName=Upp
 FileChooser.homeFolderToolTip.textAndMnemonic=Hem
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -18,11 +18,11 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\u67E5\u770B: (&I)
+FileChooser.lookInLabel.textAndMnemonic=\u67E5\u627E(&I):
 FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58: 
-FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D: (&N)
-FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D: (&N)
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B: (&T)
+FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D(&N):
+FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B(&T):
 FileChooser.upFolderToolTip.textAndMnemonic=\u5411\u4E0A\u4E00\u7EA7
 FileChooser.upFolderAccessibleName=\u5411\u4E0A
 FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u5F55
@@ -33,11 +33,11 @@
 FileChooser.listViewButtonToolTip.textAndMnemonic=\u5217\u8868
 FileChooser.listViewButtonAccessibleName=\u5217\u8868
 FileChooser.listViewActionLabel.textAndMnemonic=\u5217\u8868
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
-FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u8D44\u6599
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u4FE1\u606F
+FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u4FE1\u606F
 FileChooser.viewMenuButtonToolTipText = \u67E5\u770B\u83DC\u5355
 FileChooser.viewMenuButtonAccessibleName = \u67E5\u770B\u83DC\u5355
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u4FE1\u606F
 FileChooser.refreshActionLabel.textAndMnemonic=\u5237\u65B0
 FileChooser.viewMenuLabel.textAndMnemonic=\u89C6\u56FE
 FileChooser.fileNameHeader.textAndMnemonic=\u540D\u79F0
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -132,7 +132,12 @@
                 in0.close();
                 Utils.markJarFile(out);
             } else {
-                (new NativeUnpack(this)).run(in0, out);
+                try {
+                    (new NativeUnpack(this)).run(in0, out);
+                } catch (UnsatisfiedLinkError ule) {
+                    // failover to java implementation
+                    (new DoUnpack()).run(in0, out);
+                }
                 in0.close();
                 Utils.markJarFile(out);
             }
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -85,7 +85,7 @@
 webrowsetimpl.invalidrd = \uC77D\uAE30 \uD504\uB85C\uADF8\uB7A8\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
 
 #FilteredRowSetImpl exceptions
-filteredrowsetimpl.relative = \uC0C1\uB300: \uCEE4\uC11C \uC791\uC5C5\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
+filteredrowsetimpl.relative = \uC0C1\uB300: \uCEE4\uC11C \uC791\uC5C5\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4. 
 filteredrowsetimpl.absolute = \uC808\uB300: \uCEE4\uC11C \uC791\uC5C5\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
 filteredrowsetimpl.notallowed = \uC774 \uAC12\uC740 \uD544\uD130\uB97C \uD1B5\uACFC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
 
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -140,7 +140,7 @@
 #WebRowSetXmlReader exception
 wrsxmlreader.invalidcp = Fim de RowSet atingido. Posi\u00E7\u00E3o inv\u00E1lida do cursor
 wrsxmlreader.readxml = readXML : {0}
-wrsxmlreader.parseerr = ** Erro de Parse : {0} , linha : {1} , uri : {2}
+wrsxmlreader.parseerr = ** Erro de Parsing : {0} , linha : {1} , uri : {2}
 
 #WebRowSetXmlWriter exceptions
 wrsxmlwriter.ioex = IOException : {0}
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java	Wed May 08 11:22:25 2013 +0100
@@ -45,7 +45,6 @@
     }
 
     protected GSSContext secCtx = null;
-    protected MessageProp msgProp;              // QOP and privacy for unwrap
     protected static final int JGSS_QOP = 0;    // unrelated to SASL QOP mask
 
     protected GssKrb5Base(Map<String, ?> props, String className)
@@ -74,6 +73,7 @@
         }
 
         try {
+            MessageProp msgProp = new MessageProp(JGSS_QOP, privacy);
             byte[] answer = secCtx.unwrap(incoming, start, len, msgProp);
             if (logger.isLoggable(Level.FINEST)) {
                 traceOutput(myClassName, "KRB501:Unwrap", "incoming: ",
@@ -99,6 +99,7 @@
 
         // Generate GSS token
         try {
+            MessageProp msgProp = new MessageProp(JGSS_QOP, privacy);
             byte[] answer = secCtx.wrap(outgoing, start, len, msgProp);
             if (logger.isLoggable(Level.FINEST)) {
                 traceOutput(myClassName, "KRB503:Wrap", "outgoing: ",
--- a/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java	Wed May 08 11:22:25 2013 +0100
@@ -320,7 +320,6 @@
             }
 
             completed = true;  // server authenticated
-            msgProp = new MessageProp(JGSS_QOP, privacy);
 
             return gssOutToken;
         } catch (GSSException e) {
--- a/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java	Wed May 08 11:22:25 2013 +0100
@@ -270,7 +270,6 @@
             } else if ((selectedQop&INTEGRITY_ONLY_PROTECTION) != 0) {
                 integrity = true;
             }
-            msgProp = new MessageProp(JGSS_QOP, privacy);
 
             // 2nd-4th octets specifies maximum buffer size expected by
             // client (in network byte order). This is the server's send
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties	Wed May 08 11:22:25 2013 +0100
@@ -39,16 +39,16 @@
 FileChooser.newFolderParentDoesntExist.textAndMnemonic=Ordner kann nicht erstellt werden.\n\nSystem kann den angegebenen Pfad nicht finden.
 FileChooser.renameErrorTitle.textAndMnemonic=Fehler beim Umbenennen von Datei oder Ordner
 FileChooser.renameError.textAndMnemonic={0} kann nicht umbenannt werden
-FileChooser.renameErrorFileExists.textAndMnemonic={0} kann nicht umbenannt werden: Es ist bereits eine Datei mit dem angegebenen Namen vorhanden. Geben Sie einen anderen Dateinamen an.
+FileChooser.renameErrorFileExists.textAndMnemonic={0} kann nicht umbenannt werden: Es ist bereits eine Datei mit dem angegebenen Namen vorhanden. Geben Sie einen anderen Dateinamen an. 
 FileChooser.acceptAllFileFilter.textAndMnemonic=Alle Dateien
 FileChooser.cancelButton.textAndMnemonic=Abbrechen
 FileChooser.saveButton.textAndMnemonic=&Speichern
-FileChooser.openButton.textAndMnemonic=\u00D6ffnen(&F)
+FileChooser.openButton.textAndMnemonic=\u00D6&ffnen
 FileChooser.saveDialogTitle.textAndMnemonic=Speichern
 FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen
 FileChooser.updateButton.textAndMnemonic=A&ktualisieren
 FileChooser.helpButton.textAndMnemonic=&Hilfe
-FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ffnen(&F)
+FileChooser.directoryOpenButton.textAndMnemonic=\u00D6&ffnen
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -70,14 +70,14 @@
 FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser-Hilfe
 FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Ausgew\u00E4hltes Verzeichnis \u00F6ffnen
 
-FileChooser.filesListAccessibleName=Files List
-FileChooser.filesDetailsAccessibleName=Files Details
+FileChooser.filesListAccessibleName=Dateiliste
+FileChooser.filesDetailsAccessibleName=Dateidetails
 
 ############ COLOR CHOOSER STRINGS #############
 ColorChooser.preview.textAndMnemonic=Vorschau
 ColorChooser.ok.textAndMnemonic=OK
 ColorChooser.cancel.textAndMnemonic=Abbrechen
-ColorChooser.reset.textAndMnemonic=Zur\u00FCcksetzen(&Z)
+ColorChooser.reset.textAndMnemonic=&Zur\u00FCcksetzen
 ColorChooser.sample.textAndMnemonic=Beispieltext  Beispieltext
 ColorChooser.swatches.textAndMnemonic=&Swatches
 ColorChooser.swatchesRecent.textAndMnemonic=Aktuell:
@@ -93,7 +93,7 @@
 ColorChooser.hslTransparency.textAndMnemonic=Transparenz
 ColorChooser.rgb.textAndMnemonic=R&GB
 ColorChooser.rgbRed.textAndMnemonic=Ro&t
-ColorChooser.rgbGreen.textAndMnemonic=Gr\u00FCn(&N)
+ColorChooser.rgbGreen.textAndMnemonic=Gr\u00FC&n
 ColorChooser.rgbBlue.textAndMnemonic=&Blau
 ColorChooser.rgbAlpha.textAndMnemonic=Alpha
 ColorChooser.rgbHexCode.textAndMnemonic=&Farbcode
@@ -109,8 +109,10 @@
 # define mnemonics for any of the buttons.
 OptionPane.yesButton.textAndMnemonic=&Ja
 OptionPane.noButton.textAndMnemonic=&Nein
-OptionPane.okButton.textAndMnemonic=&OK
-OptionPane.cancelButton.textAndMnemonic=&Abbrechen
+OptionPane.okButton.textAndMnemonic=OK
+#OptionPane.okButtonMnemonic=0
+OptionPane.cancelButton.textAndMnemonic=Abbrechen
+#OptionPane.cancelButtonMnemonic=0
 OptionPane.title.textAndMnemonic=Option ausw\u00E4hlen
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
@@ -184,4 +186,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Als Symbol darstellen
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximieren
 InternalFrameTitlePane.closeButtonAccessibleName=Schlie\u00DFen
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties	Wed May 08 11:22:25 2013 +0100
@@ -16,6 +16,7 @@
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
 #   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
@@ -38,11 +39,11 @@
 FileChooser.newFolderParentDoesntExist.textAndMnemonic=No se ha podido crear la carpeta.\n\nEl sistema no puede encontrar la ruta de acceso especificada.
 FileChooser.renameErrorTitle.textAndMnemonic=Error al cambiar el nombre del archivo o carpeta
 FileChooser.renameError.textAndMnemonic=No se puede cambiar el nombre de {0}
-FileChooser.renameErrorFileExists.textAndMnemonic=No se puede cambiar el nombre de {0}: ya existe un archivo con el nombre especificado. Especifique otro nombre de archivo.
+FileChooser.renameErrorFileExists.textAndMnemonic=No se puede cambiar el nombre de {0}: ya existe un archivo con el nombre especificado. Especifique otro nombre de archivo. 
 FileChooser.acceptAllFileFilter.textAndMnemonic=Todos los Archivos
 FileChooser.cancelButton.textAndMnemonic=Cancelar
 FileChooser.saveButton.textAndMnemonic=&Guardar
-FileChooser.openButton.textAndMnemonic=A&brir
+FileChooser.openButton.textAndMnemonic=&Abrir
 FileChooser.saveDialogTitle.textAndMnemonic=Guardar
 FileChooser.openDialogTitle.textAndMnemonic=Abrir
 FileChooser.updateButton.textAndMnemonic=Act&ualizar
@@ -69,11 +70,11 @@
 FileChooser.helpButtonToolTip.textAndMnemonic=Ayuda del Selector de Archivos
 FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Abrir directorio seleccionado
 
-FileChooser.filesListAccessibleName=Files List
-FileChooser.filesDetailsAccessibleName=Files Details
+FileChooser.filesListAccessibleName=Lista de archivos
+FileChooser.filesDetailsAccessibleName=Detalles de archivos
 
 ############ COLOR CHOOSER STRINGS #############
-ColorChooser.preview.textAndMnemonic=Presentaci\u00F3n Preliminar
+ColorChooser.preview.textAndMnemonic=Vista Previa
 ColorChooser.ok.textAndMnemonic=Aceptar
 ColorChooser.cancel.textAndMnemonic=Cancelar
 ColorChooser.reset.textAndMnemonic=&Restablecer
@@ -95,7 +96,7 @@
 ColorChooser.rgbGreen.textAndMnemonic=&Verde
 ColorChooser.rgbBlue.textAndMnemonic=A&zul
 ColorChooser.rgbAlpha.textAndMnemonic=Alfa
-ColorChooser.rgbHexCode.textAndMnemonic=C\u00F3digo de Color(&C)
+ColorChooser.rgbHexCode.textAndMnemonic=&C\u00F3digo de Color
 ColorChooser.cmyk.textAndMnemonic=C&MYK
 ColorChooser.cmykCyan.textAndMnemonic=Cian
 ColorChooser.cmykMagenta.textAndMnemonic=Magenta
@@ -106,10 +107,12 @@
 ############ OPTION PANE STRINGS #############
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=S\u00ED(&S)
+OptionPane.yesButton.textAndMnemonic=&S\u00ED
 OptionPane.noButton.textAndMnemonic=&No
-OptionPane.okButton.textAndMnemonic=Aceptar(&O)
-OptionPane.cancelButton.textAndMnemonic=&Cancelar
+OptionPane.okButton.textAndMnemonic=Aceptar
+#OptionPane.okButtonMnemonic=0
+OptionPane.cancelButton.textAndMnemonic=Cancelar
+#OptionPane.cancelButtonMnemonic=0
 OptionPane.title.textAndMnemonic=Seleccionar una Opci\u00F3n
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
@@ -126,7 +129,7 @@
 
 # The following string will be formatted by a MessageFormat
 # and {0} will be replaced by page number being printed
-PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina impresa {0}...
+PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina {0} impresa...
 
 PrintingDialog.contentAborting.textAndMnemonic=Abortando la impresi\u00F3n...
 
@@ -183,4 +186,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Convertir en Icono
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar
 InternalFrameTitlePane.closeButtonAccessibleName=Cerrar
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties	Wed May 08 11:22:25 2013 +0100
@@ -16,6 +16,7 @@
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
 #   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
@@ -38,14 +39,14 @@
 FileChooser.newFolderParentDoesntExist.textAndMnemonic=Impossible de cr\u00E9er le dossier.\n\nLe syst\u00E8me ne parvient pas \u00E0 trouver le chemin indiqu\u00E9.
 FileChooser.renameErrorTitle.textAndMnemonic=Erreur lors du changement de nom du fichier ou du dossier
 FileChooser.renameError.textAndMnemonic=Impossible de renommer {0}
-FileChooser.renameErrorFileExists.textAndMnemonic=Impossible de renommer {0} : il existe d\u00E9j\u00E0 un fichier portant le nom indiqu\u00E9. Indiquez-en un autre.
+FileChooser.renameErrorFileExists.textAndMnemonic=Impossible de renommer {0} : il existe d\u00E9j\u00E0 un fichier portant le nom indiqu\u00E9. Indiquez-en un autre. 
 FileChooser.acceptAllFileFilter.textAndMnemonic=Tous les fichiers
 FileChooser.cancelButton.textAndMnemonic=Annuler
 FileChooser.saveButton.textAndMnemonic=Enregi&strer
 FileChooser.openButton.textAndMnemonic=&Ouvrir
 FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer
 FileChooser.openDialogTitle.textAndMnemonic=Ouvrir
-FileChooser.updateButton.textAndMnemonic=Mettre \u00E0 jour(&U)
+FileChooser.updateButton.textAndMnemonic=Mettre \u00E0 jo&ur
 FileChooser.helpButton.textAndMnemonic=&Aide
 FileChooser.directoryOpenButton.textAndMnemonic=&Ouvrir
 
@@ -69,14 +70,14 @@
 FileChooser.helpButtonToolTip.textAndMnemonic=Aide du s\u00E9lecteur de fichiers
 FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Ouvre le r\u00E9pertoire s\u00E9lectionn\u00E9
 
-FileChooser.filesListAccessibleName=Files List
-FileChooser.filesDetailsAccessibleName=Files Details
+FileChooser.filesListAccessibleName=Liste des fichiers
+FileChooser.filesDetailsAccessibleName=D\u00E9tails des fichiers
 
 ############ COLOR CHOOSER STRINGS #############
 ColorChooser.preview.textAndMnemonic=Aper\u00E7u
 ColorChooser.ok.textAndMnemonic=OK
 ColorChooser.cancel.textAndMnemonic=Annuler
-ColorChooser.reset.textAndMnemonic=R\u00E9initialiser(&R)
+ColorChooser.reset.textAndMnemonic=&R\u00E9initialiser
 ColorChooser.sample.textAndMnemonic=Echantillon de texte  Echantillon de texte
 ColorChooser.swatches.textAndMnemonic=&Echantillons
 ColorChooser.swatchesRecent.textAndMnemonic=Dernier :
@@ -108,8 +109,10 @@
 # define mnemonics for any of the buttons.
 OptionPane.yesButton.textAndMnemonic=&Oui
 OptionPane.noButton.textAndMnemonic=&Non
-OptionPane.okButton.textAndMnemonic=&OK
-OptionPane.cancelButton.textAndMnemonic=&Annuler
+OptionPane.okButton.textAndMnemonic=OK
+#OptionPane.okButtonMnemonic=0
+OptionPane.cancelButton.textAndMnemonic=Annuler
+#OptionPane.cancelButtonMnemonic=0
 OptionPane.title.textAndMnemonic=S\u00E9lectionner une option
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
@@ -183,4 +186,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=R\u00E9duire
 InternalFrameTitlePane.maximizeButtonAccessibleName=Agrandir
 InternalFrameTitlePane.closeButtonAccessibleName=Fermer
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties	Wed May 08 11:22:25 2013 +0100
@@ -16,6 +16,7 @@
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
 #   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
@@ -38,15 +39,15 @@
 FileChooser.newFolderParentDoesntExist.textAndMnemonic=Impossibile creare la cartella.\n\nIl sistema non \u00E8 in grado di trovare il percorso specificato.
 FileChooser.renameErrorTitle.textAndMnemonic=Errore durante la ridenominazione del file o della cartella
 FileChooser.renameError.textAndMnemonic=Impossibile rinominare {0}
-FileChooser.renameErrorFileExists.textAndMnemonic=Impossibile rinominare {0}: esiste gi\u00E0 un file con il nome specificato. Specificare un altro nome.
+FileChooser.renameErrorFileExists.textAndMnemonic=Impossibile rinominare {0}: esiste gi\u00E0 un file con il nome specificato. Specificare un altro nome. 
 FileChooser.acceptAllFileFilter.textAndMnemonic=Tutti i file
 FileChooser.cancelButton.textAndMnemonic=Annulla
 FileChooser.saveButton.textAndMnemonic=Sal&va
-FileChooser.openButton.textAndMnemonic=A&pri
+FileChooser.openButton.textAndMnemonic=&Apri
 FileChooser.saveDialogTitle.textAndMnemonic=Salva
 FileChooser.openDialogTitle.textAndMnemonic=Apri
-FileChooser.updateButton.textAndMnemonic=A&ggiorna
-FileChooser.helpButton.textAndMnemonic=?(&H)
+FileChooser.updateButton.textAndMnemonic=Ag&giorna
+FileChooser.helpButton.textAndMnemonic=&?
 FileChooser.directoryOpenButton.textAndMnemonic=&Apri
 
 # File Size Units
@@ -69,8 +70,8 @@
 FileChooser.helpButtonToolTip.textAndMnemonic=Guida FileChooser
 FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Apre la directory selezionata
 
-FileChooser.filesListAccessibleName=Files List
-FileChooser.filesDetailsAccessibleName=Files Details
+FileChooser.filesListAccessibleName=Lista dei file
+FileChooser.filesDetailsAccessibleName=Dettagli file
 
 ############ COLOR CHOOSER STRINGS #############
 ColorChooser.preview.textAndMnemonic=Anteprima
@@ -106,10 +107,12 @@
 ############ OPTION PANE STRINGS #############
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
-OptionPane.yesButton.textAndMnemonic=S\u00EC(&S)
+OptionPane.yesButton.textAndMnemonic=&S\u00EC
 OptionPane.noButton.textAndMnemonic=&No
-OptionPane.okButton.textAndMnemonic=&OK
-OptionPane.cancelButton.textAndMnemonic=&Annulla
+OptionPane.okButton.textAndMnemonic=OK
+#OptionPane.okButtonMnemonic=0
+OptionPane.cancelButton.textAndMnemonic=Annulla
+#OptionPane.cancelButtonMnemonic=0
 OptionPane.title.textAndMnemonic=Selezionare una opzione
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
@@ -183,4 +186,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Riduci a icona
 InternalFrameTitlePane.maximizeButtonAccessibleName=Ingrandisci
 InternalFrameTitlePane.closeButtonAccessibleName=Chiudi
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties	Wed May 08 11:22:25 2013 +0100
@@ -16,6 +16,7 @@
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
 #   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
@@ -38,7 +39,7 @@
 FileChooser.newFolderParentDoesntExist.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002\n\n\u6307\u5B9A\u3057\u305F\u30D1\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
 FileChooser.renameErrorTitle.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u306E\u540D\u524D\u5909\u66F4\u30A8\u30E9\u30FC
 FileChooser.renameError.textAndMnemonic={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093
-FileChooser.renameErrorFileExists.textAndMnemonic={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093: \u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u5225\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+FileChooser.renameErrorFileExists.textAndMnemonic={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093: \u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u5225\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 
 FileChooser.acceptAllFileFilter.textAndMnemonic=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB
 FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88
 FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58(&S)
@@ -69,8 +70,8 @@
 FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser\u306E\u30D8\u30EB\u30D7\u3067\u3059
 FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u958B\u304D\u307E\u3059
 
-FileChooser.filesListAccessibleName=Files List
-FileChooser.filesDetailsAccessibleName=Files Details
+FileChooser.filesListAccessibleName=\u30D5\u30A1\u30A4\u30EB\u30FB\u30EA\u30B9\u30C8
+FileChooser.filesDetailsAccessibleName=\u30D5\u30A1\u30A4\u30EB\u306E\u8A73\u7D30
 
 ############ COLOR CHOOSER STRINGS #############
 ColorChooser.preview.textAndMnemonic=\u30D7\u30EC\u30D3\u30E5\u30FC
@@ -80,17 +81,17 @@
 ColorChooser.sample.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8  \u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8
 ColorChooser.swatches.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB(&S)
 ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0:
-ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsv.textAndMnemonic=HSV(&H)
 ColorChooser.hsvHue.textAndMnemonic=\u8272\u76F8
 ColorChooser.hsvSaturation.textAndMnemonic=\u5F69\u5EA6
 ColorChooser.hsvValue.textAndMnemonic=\u5024
 ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6
-ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hsl.textAndMnemonic=HSL(&L)
 ColorChooser.hslHue.textAndMnemonic=\u8272\u76F8
 ColorChooser.hslSaturation.textAndMnemonic=\u5F69\u5EA6
 ColorChooser.hslLightness.textAndMnemonic=\u660E\u5EA6
 ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6
-ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
 ColorChooser.rgbRed.textAndMnemonic=\u8D64(&D)
 ColorChooser.rgbGreen.textAndMnemonic=\u7DD1(&N)
 ColorChooser.rgbBlue.textAndMnemonic=\u9752(&B)
@@ -108,8 +109,10 @@
 # define mnemonics for any of the buttons.
 OptionPane.yesButton.textAndMnemonic=\u306F\u3044(&Y)
 OptionPane.noButton.textAndMnemonic=\u3044\u3044\u3048(&N)
-OptionPane.okButton.textAndMnemonic=&OK
+OptionPane.okButton.textAndMnemonic=OK
+#OptionPane.okButtonMnemonic=0
 OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+#OptionPane.cancelButtonMnemonic=0
 OptionPane.title.textAndMnemonic=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
@@ -183,4 +186,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=\u30A2\u30A4\u30B3\u30F3\u5316
 InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
 InternalFrameTitlePane.closeButtonAccessibleName=\u9589\u3058\u308B
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties	Wed May 08 11:22:25 2013 +0100
@@ -16,6 +16,7 @@
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
 #   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
@@ -69,8 +70,8 @@
 FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \uB3C4\uC6C0\uB9D0
 FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uB514\uB809\uD1A0\uB9AC \uC5F4\uAE30
 
-FileChooser.filesListAccessibleName=Files List
-FileChooser.filesDetailsAccessibleName=Files Details
+FileChooser.filesListAccessibleName=\uD30C\uC77C \uBAA9\uB85D
+FileChooser.filesDetailsAccessibleName=\uD30C\uC77C \uC138\uBD80 \uC815\uBCF4
 
 ############ COLOR CHOOSER STRINGS #############
 ColorChooser.preview.textAndMnemonic=\uBBF8\uB9AC\uBCF4\uAE30
@@ -80,17 +81,17 @@
 ColorChooser.sample.textAndMnemonic=\uC0D8\uD50C \uD14D\uC2A4\uD2B8  \uC0D8\uD50C \uD14D\uC2A4\uD2B8
 ColorChooser.swatches.textAndMnemonic=\uACAC\uBCF8(&S)
 ColorChooser.swatchesRecent.textAndMnemonic=\uCD5C\uADFC \uBAA9\uB85D:
-ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsv.textAndMnemonic=HSV(&H)
 ColorChooser.hsvHue.textAndMnemonic=\uC0C9\uC870
 ColorChooser.hsvSaturation.textAndMnemonic=\uCC44\uB3C4
 ColorChooser.hsvValue.textAndMnemonic=\uAC12
 ColorChooser.hsvTransparency.textAndMnemonic=\uD22C\uBA85
-ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hsl.textAndMnemonic=HSL(&L)
 ColorChooser.hslHue.textAndMnemonic=\uC0C9\uC870
 ColorChooser.hslSaturation.textAndMnemonic=\uCC44\uB3C4
 ColorChooser.hslLightness.textAndMnemonic=\uBC1D\uAE30
 ColorChooser.hslTransparency.textAndMnemonic=\uD22C\uBA85
-ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
 ColorChooser.rgbRed.textAndMnemonic=\uBE68\uAC04\uC0C9(&D)
 ColorChooser.rgbGreen.textAndMnemonic=\uB179\uC0C9(&N)
 ColorChooser.rgbBlue.textAndMnemonic=\uD30C\uB780\uC0C9(&B)
@@ -108,8 +109,10 @@
 # define mnemonics for any of the buttons.
 OptionPane.yesButton.textAndMnemonic=\uC608(&Y)
 OptionPane.noButton.textAndMnemonic=\uC544\uB2C8\uC624(&N)
-OptionPane.okButton.textAndMnemonic=\uD655\uC778(&O)
+OptionPane.okButton.textAndMnemonic=\uD655\uC778
+#OptionPane.okButtonMnemonic=0
 OptionPane.cancelButton.textAndMnemonic=\uCDE8\uC18C
+#OptionPane.cancelButtonMnemonic=0
 OptionPane.title.textAndMnemonic=\uC635\uC158 \uC120\uD0DD
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
@@ -183,4 +186,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=\uC544\uC774\uCF58\uD654
 InternalFrameTitlePane.maximizeButtonAccessibleName=\uCD5C\uB300\uD654
 InternalFrameTitlePane.closeButtonAccessibleName=\uB2EB\uAE30
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties	Wed May 08 11:22:25 2013 +0100
@@ -16,6 +16,7 @@
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
 #   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
@@ -69,8 +70,8 @@
 FileChooser.helpButtonToolTip.textAndMnemonic=Ajuda do FileChooser
 FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Abrir diret\u00F3rio selecionado
 
-FileChooser.filesListAccessibleName=Files List
-FileChooser.filesDetailsAccessibleName=Files Details
+FileChooser.filesListAccessibleName=Lista de Arquivos
+FileChooser.filesDetailsAccessibleName=Detalhes do Arquivo
 
 ############ COLOR CHOOSER STRINGS #############
 ColorChooser.preview.textAndMnemonic=Visualizar
@@ -95,7 +96,7 @@
 ColorChooser.rgbGreen.textAndMnemonic=&Verde
 ColorChooser.rgbBlue.textAndMnemonic=&Azul
 ColorChooser.rgbAlpha.textAndMnemonic=Alfa
-ColorChooser.rgbHexCode.textAndMnemonic=C\u00F3digo da Cor(&C)
+ColorChooser.rgbHexCode.textAndMnemonic=&C\u00F3digo da Cor
 ColorChooser.cmyk.textAndMnemonic=C&MYK
 ColorChooser.cmykCyan.textAndMnemonic=Ciano
 ColorChooser.cmykMagenta.textAndMnemonic=Magenta
@@ -107,9 +108,11 @@
 # We only define mnemonics for YES/NO, but for completeness you can
 # define mnemonics for any of the buttons.
 OptionPane.yesButton.textAndMnemonic=&Sim
-OptionPane.noButton.textAndMnemonic=N\u00E3o(&N)
-OptionPane.okButton.textAndMnemonic=&OK
-OptionPane.cancelButton.textAndMnemonic=&Cancelar
+OptionPane.noButton.textAndMnemonic=&N\u00E3o
+OptionPane.okButton.textAndMnemonic=OK
+#OptionPane.okButtonMnemonic=0
+OptionPane.cancelButton.textAndMnemonic=Cancelar
+#OptionPane.cancelButtonMnemonic=0
 OptionPane.title.textAndMnemonic=Selecionar uma Op\u00E7\u00E3o
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
@@ -171,7 +174,7 @@
 ComboBox.togglePopup.textAndMnemonic=togglePopup
 
 ############ Progress Monitor Strings ############
-ProgressMonitor.progress.textAndMnemonic=Progresso...
+ProgressMonitor.progress.textAndMnemonic=Andamento...
 
 ############ Split Pane Strings ############
 SplitPane.leftButton.textAndMnemonic=bot\u00E3o esquerdo
@@ -180,7 +183,6 @@
 IsindexView.prompt=Trata-se de um \u00EDndice pesquis\u00E1vel. Informe as palavras-chave de pesquisa:
 
 ############ InternalFrameTitlePane Strings ############
-InternalFrameTitlePane.iconifyButtonAccessibleName=Iconify
+InternalFrameTitlePane.iconifyButtonAccessibleName=Iconizar
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar
 InternalFrameTitlePane.closeButtonAccessibleName=Fechar
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties	Wed May 08 11:22:25 2013 +0100
@@ -16,6 +16,7 @@
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
 #   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
@@ -38,16 +39,16 @@
 FileChooser.newFolderParentDoesntExist.textAndMnemonic=Kan inte skapa mappen.\n\nSystemet kan inte hitta angiven s\u00F6kv\u00E4g.
 FileChooser.renameErrorTitle.textAndMnemonic=Ett fel intr\u00E4ffade vid f\u00F6rs\u00F6k att \u00E4ndra namn p\u00E5 fil eller mapp
 FileChooser.renameError.textAndMnemonic=Kan inte namn\u00E4ndra {0}
-FileChooser.renameErrorFileExists.textAndMnemonic=Kan inte namn\u00E4ndra {0}: En fil med angivet namn finns redan. Ange ett annat filnamn.
+FileChooser.renameErrorFileExists.textAndMnemonic=Kan inte namn\u00E4ndra {0}: En fil med angivet namn finns redan. Ange ett annat filnamn. 
 FileChooser.acceptAllFileFilter.textAndMnemonic=Alla filer
 FileChooser.cancelButton.textAndMnemonic=Avbryt
 FileChooser.saveButton.textAndMnemonic=&Spara
-FileChooser.openButton.textAndMnemonic=\u00D6ppna(&P)
+FileChooser.openButton.textAndMnemonic=&\u00D6ppna
 FileChooser.saveDialogTitle.textAndMnemonic=Spara
 FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna
 FileChooser.updateButton.textAndMnemonic=Upp&datera
-FileChooser.helpButton.textAndMnemonic=Hj\u00E4lp(&H)
-FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ppna(&P)
+FileChooser.helpButton.textAndMnemonic=&Hj\u00E4lp
+FileChooser.directoryOpenButton.textAndMnemonic=&\u00D6ppna
 
 # File Size Units
 FileChooser.fileSizeKiloBytes={0} KB
@@ -69,14 +70,14 @@
 FileChooser.helpButtonToolTip.textAndMnemonic=Hj\u00E4lp - Filv\u00E4ljare
 FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u00D6ppna vald katalog
 
-FileChooser.filesListAccessibleName=Files List
-FileChooser.filesDetailsAccessibleName=Files Details
+FileChooser.filesListAccessibleName=Fillista
+FileChooser.filesDetailsAccessibleName=Fildetaljer
 
 ############ COLOR CHOOSER STRINGS #############
 ColorChooser.preview.textAndMnemonic=Granska
 ColorChooser.ok.textAndMnemonic=OK
 ColorChooser.cancel.textAndMnemonic=Avbryt
-ColorChooser.reset.textAndMnemonic=\u00C5terst\u00E4ll(&T)
+ColorChooser.reset.textAndMnemonic=&\u00C5terst\u00E4ll
 ColorChooser.sample.textAndMnemonic=Exempeltext  Exempeltext
 ColorChooser.swatches.textAndMnemonic=&Prov
 ColorChooser.swatchesRecent.textAndMnemonic=Senaste:
@@ -91,11 +92,11 @@
 ColorChooser.hslLightness.textAndMnemonic=Ljusstyrka
 ColorChooser.hslTransparency.textAndMnemonic=Transparens
 ColorChooser.rgb.textAndMnemonic=R&GB
-ColorChooser.rgbRed.textAndMnemonic=R\u00F6d(&D)
-ColorChooser.rgbGreen.textAndMnemonic=Gr\u00F6n(&N)
-ColorChooser.rgbBlue.textAndMnemonic=Bl\u00E5(&B)
+ColorChooser.rgbRed.textAndMnemonic=R\u00F6&d
+ColorChooser.rgbGreen.textAndMnemonic=Gr\u00F6&n
+ColorChooser.rgbBlue.textAndMnemonic=&Bl\u00E5
 ColorChooser.rgbAlpha.textAndMnemonic=Alfa
-ColorChooser.rgbHexCode.textAndMnemonic=F\u00E4rgkod(&F)
+ColorChooser.rgbHexCode.textAndMnemonic=&F\u00E4rgkod
 ColorChooser.cmyk.textAndMnemonic=C&MYK
 ColorChooser.cmykCyan.textAndMnemonic=Cyan
 ColorChooser.cmykMagenta.textAndMnemonic=Magenta
@@ -108,8 +109,10 @@
 # define mnemonics for any of the buttons.
 OptionPane.yesButton.textAndMnemonic=&Ja
 OptionPane.noButton.textAndMnemonic=&Nej
-OptionPane.okButton.textAndMnemonic=&OK
-OptionPane.cancelButton.textAndMnemonic=&Avbryt
+OptionPane.okButton.textAndMnemonic=OK
+#OptionPane.okButtonMnemonic=0
+OptionPane.cancelButton.textAndMnemonic=Avbryt
+#OptionPane.cancelButtonMnemonic=0
 OptionPane.title.textAndMnemonic=V\u00E4lj ett alternativ
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
@@ -183,4 +186,3 @@
 InternalFrameTitlePane.iconifyButtonAccessibleName=Minimera
 InternalFrameTitlePane.maximizeButtonAccessibleName=Maximera
 InternalFrameTitlePane.closeButtonAccessibleName=St\u00E4ng
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -16,6 +16,7 @@
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
 #   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
@@ -30,7 +31,7 @@
 # @author Steve Wilson
 
 ############ FILE CHOOSER STRINGS #############
-FileChooser.fileDescription.textAndMnemonic=\u666E\u901A\u7684\u6587\u4EF6
+FileChooser.fileDescription.textAndMnemonic=\u901A\u7528\u6587\u4EF6
 FileChooser.directoryDescription.textAndMnemonic=\u76EE\u5F55
 FileChooser.newFolderError.textAndMnemonic=\u521B\u5EFA\u65B0\u7684\u6587\u4EF6\u5939\u65F6\u51FA\u9519
 FileChooser.newFolderErrorSeparator= :
@@ -69,8 +70,8 @@
 FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \u5E2E\u52A9
 FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u6253\u5F00\u9009\u62E9\u7684\u76EE\u5F55
 
-FileChooser.filesListAccessibleName=Files List
-FileChooser.filesDetailsAccessibleName=Files Details
+FileChooser.filesListAccessibleName=\u6587\u4EF6\u5217\u8868
+FileChooser.filesDetailsAccessibleName=\u6587\u4EF6\u8BE6\u7EC6\u4FE1\u606F
 
 ############ COLOR CHOOSER STRINGS #############
 ColorChooser.preview.textAndMnemonic=\u9884\u89C8
@@ -78,19 +79,19 @@
 ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88
 ColorChooser.reset.textAndMnemonic=\u91CD\u7F6E(&R)
 ColorChooser.sample.textAndMnemonic=\u793A\u4F8B\u6587\u672C  \u793A\u4F8B\u6587\u672C
-ColorChooser.swatches.textAndMnemonic=\u793A\u4F8B(&S)
+ColorChooser.swatches.textAndMnemonic=\u6837\u672C(&S)
 ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u8FD1:
-ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsv.textAndMnemonic=HSV(&H)
 ColorChooser.hsvHue.textAndMnemonic=\u8272\u8C03
 ColorChooser.hsvSaturation.textAndMnemonic=\u9971\u548C\u5EA6
 ColorChooser.hsvValue.textAndMnemonic=\u503C
 ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6
-ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hsl.textAndMnemonic=HSL(&L)
 ColorChooser.hslHue.textAndMnemonic=\u8272\u8C03
 ColorChooser.hslSaturation.textAndMnemonic=\u9971\u548C\u5EA6
 ColorChooser.hslLightness.textAndMnemonic=\u4EAE\u5EA6
 ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6
-ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
 ColorChooser.rgbRed.textAndMnemonic=\u7EA2\u8272(&D)
 ColorChooser.rgbGreen.textAndMnemonic=\u7EFF\u8272(&N)
 ColorChooser.rgbBlue.textAndMnemonic=\u84DD\u8272(&B)
@@ -108,8 +109,10 @@
 # define mnemonics for any of the buttons.
 OptionPane.yesButton.textAndMnemonic=\u662F(&Y)
 OptionPane.noButton.textAndMnemonic=\u5426(&N)
-OptionPane.okButton.textAndMnemonic=\u786E\u5B9A(&O)
+OptionPane.okButton.textAndMnemonic=\u786E\u5B9A
+#OptionPane.okButtonMnemonic=0
 OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+#OptionPane.cancelButtonMnemonic=0
 OptionPane.title.textAndMnemonic=\u9009\u62E9\u4E00\u4E2A\u9009\u9879
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
@@ -150,7 +153,7 @@
 ############ Text strings #############
 # Used for html forms
 FormView.submitButton.textAndMnemonic=\u63D0\u4EA4\u67E5\u8BE2
-FormView.resetButton.textAndMnemonic=\u91CD\u8BBE
+FormView.resetButton.textAndMnemonic=\u91CD\u7F6E
 FormView.browseFileButton.textAndMnemonic=\u6D4F\u89C8...
 
 ############ Abstract Document Strings ############
@@ -177,10 +180,9 @@
 SplitPane.leftButton.textAndMnemonic=\u5DE6\u952E
 SplitPane.rightButton.textAndMnemonic=\u53F3\u952E
 # Used for Isindex
-IsindexView.prompt=\u8FD9\u662F\u53EF\u641C\u7D22\u7D22\u5F15\u3002\u8BF7\u8F93\u5165\u641C\u7D22\u5173\u952E\u5B57:
+IsindexView.prompt=\u8FD9\u662F\u53EF\u641C\u7D22\u7D22\u5F15\u3002\u8BF7\u8F93\u5165\u641C\u7D22\u5173\u952E\u5B57: 
 
 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=\u56FE\u6807\u5316
 InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
 InternalFrameTitlePane.closeButtonAccessibleName=\u5173\u95ED
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties	Wed May 08 11:22:25 2013 +0100
@@ -16,6 +16,7 @@
 # Many of strings in this file are used by widgets that have a
 # mnemonic, for example:
 #   ColorChooser.rgbNameTextAndMnemonic=R&GB
+#
 # Indicates that the tab in the ColorChooser for RGB colors will have
 # the text 'RGB', further the mnemonic character will be 'g' and that
 # a decoration will be provided under the 'G'. This will typically
@@ -69,8 +70,8 @@
 FileChooser.helpButtonToolTip.textAndMnemonic=\u300C\u6A94\u6848\u9078\u64C7\u5668\u300D\u8AAA\u660E
 FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u76EE\u9304
 
-FileChooser.filesListAccessibleName=Files List
-FileChooser.filesDetailsAccessibleName=Files Details
+FileChooser.filesListAccessibleName=\u6A94\u6848\u6E05\u55AE
+FileChooser.filesDetailsAccessibleName=\u6A94\u6848\u8A73\u7D30\u8CC7\u8A0A
 
 ############ COLOR CHOOSER STRINGS #############
 ColorChooser.preview.textAndMnemonic=\u9810\u89BD
@@ -80,17 +81,17 @@
 ColorChooser.sample.textAndMnemonic=\u7BC4\u4F8B\u6587\u5B57  \u7BC4\u4F8B\u6587\u5B57
 ColorChooser.swatches.textAndMnemonic=\u8ABF\u8272\u677F(&S)
 ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0\u9078\u64C7:
-ColorChooser.hsv.textAndMnemonic=&HSV
+ColorChooser.hsv.textAndMnemonic=HSV(&H)
 ColorChooser.hsvHue.textAndMnemonic=\u8272\u8ABF
 ColorChooser.hsvSaturation.textAndMnemonic=\u5F69\u5EA6
 ColorChooser.hsvValue.textAndMnemonic=\u6578\u503C
 ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6
-ColorChooser.hsl.textAndMnemonic=HS&L
+ColorChooser.hsl.textAndMnemonic=HSL(&L)
 ColorChooser.hslHue.textAndMnemonic=\u8272\u8ABF
 ColorChooser.hslSaturation.textAndMnemonic=\u5F69\u5EA6
 ColorChooser.hslLightness.textAndMnemonic=\u4EAE\u5EA6
 ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6
-ColorChooser.rgb.textAndMnemonic=R&GB
+ColorChooser.rgb.textAndMnemonic=RGB(&G)
 ColorChooser.rgbRed.textAndMnemonic=\u7D05(&D)
 ColorChooser.rgbGreen.textAndMnemonic=\u7DA0(&N)
 ColorChooser.rgbBlue.textAndMnemonic=\u85CD(&B)
@@ -108,8 +109,10 @@
 # define mnemonics for any of the buttons.
 OptionPane.yesButton.textAndMnemonic=\u662F(&Y)
 OptionPane.noButton.textAndMnemonic=\u5426(&N)
-OptionPane.okButton.textAndMnemonic=\u78BA\u5B9A(&O)
+OptionPane.okButton.textAndMnemonic=\u78BA\u5B9A
+#OptionPane.okButtonMnemonic=0
 OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88
+#OptionPane.cancelButtonMnemonic=0
 OptionPane.title.textAndMnemonic=\u9078\u53D6\u4E00\u500B\u9078\u9805
 # Title for the dialog for the showInputDialog methods. Only used if
 # the developer uses one of the variants that doesn't take a title.
@@ -177,10 +180,9 @@
 SplitPane.leftButton.textAndMnemonic=\u5DE6\u6309\u9215
 SplitPane.rightButton.textAndMnemonic=\u53F3\u6309\u9215
 # Used for Isindex
-IsindexView.prompt=\u9019\u662F\u4E00\u500B\u53EF\u641C\u5C0B\u7684\u7D22\u5F15\u3002\u8F38\u5165\u641C\u5C0B\u95DC\u9375\u5B57:
+IsindexView.prompt=\u9019\u662F\u4E00\u500B\u53EF\u641C\u5C0B\u7684\u7D22\u5F15\u3002\u8F38\u5165\u641C\u5C0B\u95DC\u9375\u5B57: 
 
 ############ InternalFrameTitlePane Strings ############
 InternalFrameTitlePane.iconifyButtonAccessibleName=\u5716\u793A\u5316
 InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316
 InternalFrameTitlePane.closeButtonAccessibleName=\u95DC\u9589
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties	Wed May 08 11:22:25 2013 +0100
@@ -20,9 +20,9 @@
 
 FileChooser.lookInLabel.textAndMnemonic=Suchen &in:
 FileChooser.saveInLabel.textAndMnemonic=Speichern in:
-FileChooser.fileNameLabel.textAndMnemonic=Datei&name:
-FileChooser.folderNameLabel.textAndMnemonic=Ord&nername:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Da&teityp:
+FileChooser.fileNameLabel.textAndMnemonic=&Dateiname:
+FileChooser.folderNameLabel.textAndMnemonic=Ordner&name:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Datei&typ:
 FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her
 FileChooser.upFolderAccessibleName=Nach oben
 FileChooser.homeFolderToolTip.textAndMnemonic=Home
@@ -50,5 +50,4 @@
 MetalTitlePane.restore.titleAndMnemonic=&Wiederherstellen
 MetalTitlePane.iconify.titleAndMnemonic=Minimie&ren
 MetalTitlePane.maximize.titleAndMnemonic=Ma&ximieren
-MetalTitlePane.close.titleAndMnemonic=Schlie\u00DFen(&S)
-
+MetalTitlePane.close.titleAndMnemonic=&Schlie\u00DFen
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties	Wed May 08 11:22:25 2013 +0100
@@ -18,11 +18,11 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=Buscar en(&I):
+FileChooser.lookInLabel.textAndMnemonic=&Buscar en:
 FileChooser.saveInLabel.textAndMnemonic=Guardar en:
-FileChooser.fileNameLabel.textAndMnemonic=&Nombre de Archivo:
-FileChooser.folderNameLabel.textAndMnemonic=&Nombre de la Carpeta:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de &Tipo:
+FileChooser.fileNameLabel.textAndMnemonic=&Nombre de archivo:
+FileChooser.folderNameLabel.textAndMnemonic=&Nombre de carpeta:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de &tipo:
 FileChooser.upFolderToolTip.textAndMnemonic=Subir un Nivel
 FileChooser.upFolderAccessibleName=Arriba
 FileChooser.homeFolderToolTip.textAndMnemonic=Inicio
@@ -51,4 +51,3 @@
 MetalTitlePane.iconify.titleAndMnemonic=Minimi&zar
 MetalTitlePane.maximize.titleAndMnemonic=Ma&ximizar
 MetalTitlePane.close.titleAndMnemonic=&Cerrar
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties	Wed May 08 11:22:25 2013 +0100
@@ -18,11 +18,11 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=Rechercher dans (&I):
+FileChooser.lookInLabel.textAndMnemonic=Rechercher &dans :
 FileChooser.saveInLabel.textAndMnemonic=Enregistrer dans :
 FileChooser.fileNameLabel.textAndMnemonic=&Nom du fichier :
 FileChooser.folderNameLabel.textAndMnemonic=&Nom du dossier :
-FileChooser.filesOfTypeLabel.textAndMnemonic=Fichiers de &type :
+FileChooser.filesOfTypeLabel.textAndMnemonic=&Type de fichier :
 FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
 FileChooser.upFolderAccessibleName=Monter
 FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
@@ -48,7 +48,6 @@
 
 ############ Used by MetalTitlePane if rendering window decorations############
 MetalTitlePane.restore.titleAndMnemonic=&Restaurer
-MetalTitlePane.iconify.titleAndMnemonic=R\u00E9duire(&D)
+MetalTitlePane.iconify.titleAndMnemonic=R\u00E9&duire
 MetalTitlePane.maximize.titleAndMnemonic=&Agrandir
 MetalTitlePane.close.titleAndMnemonic=&Fermer
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties	Wed May 08 11:22:25 2013 +0100
@@ -21,8 +21,8 @@
 FileChooser.lookInLabel.textAndMnemonic=Cerca &in:
 FileChooser.saveInLabel.textAndMnemonic=Salva in:
 FileChooser.fileNameLabel.textAndMnemonic=&Nome file:
-FileChooser.folderNameLabel.textAndMnemonic=&Nome della cartella:
-FileChooser.filesOfTypeLabel.textAndMnemonic=&Tipo file:
+FileChooser.folderNameLabel.textAndMnemonic=&Nome cartella:
+FileChooser.filesOfTypeLabel.textAndMnemonic=&Tipo di file:
 FileChooser.upFolderToolTip.textAndMnemonic=Cartella superiore
 FileChooser.upFolderAccessibleName=Superiore
 FileChooser.homeFolderToolTip.textAndMnemonic=Home
@@ -51,4 +51,3 @@
 MetalTitlePane.iconify.titleAndMnemonic=Rid&uci a icona
 MetalTitlePane.maximize.titleAndMnemonic=In&grandisci
 MetalTitlePane.close.titleAndMnemonic=&Chiudi
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties	Wed May 08 11:22:25 2013 +0100
@@ -18,7 +18,7 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\u53C2\u7167(&I):
+FileChooser.lookInLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240(&I):
 FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
 FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D(&N):
 FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D(&N):
@@ -51,4 +51,3 @@
 MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E)
 MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X)
 MetalTitlePane.close.titleAndMnemonic=\u9589\u3058\u308B(&C)
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties	Wed May 08 11:22:25 2013 +0100
@@ -18,7 +18,7 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\uAC80\uC0C9 \uC704\uCE58(&I):
+FileChooser.lookInLabel.textAndMnemonic=\uCC3E\uB294 \uC704\uCE58(&I):
 FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58:
 FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984(&N):
 FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984(&N):
@@ -51,4 +51,3 @@
 MetalTitlePane.iconify.titleAndMnemonic=\uCD5C\uC18C\uD654(&E)
 MetalTitlePane.maximize.titleAndMnemonic=\uCD5C\uB300\uD654(&X)
 MetalTitlePane.close.titleAndMnemonic=\uB2EB\uAE30(&C)
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties	Wed May 08 11:22:25 2013 +0100
@@ -18,7 +18,7 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=Consultar Em(&I):
+FileChooser.lookInLabel.textAndMnemonic=Pesquisar &em:
 FileChooser.saveInLabel.textAndMnemonic=Salvar Em:
 FileChooser.fileNameLabel.textAndMnemonic=&Nome do Arquivo:
 FileChooser.folderNameLabel.textAndMnemonic=&Nome da pasta:
@@ -51,4 +51,3 @@
 MetalTitlePane.iconify.titleAndMnemonic=&Minimizar
 MetalTitlePane.maximize.titleAndMnemonic=Ma&ximizar
 MetalTitlePane.close.titleAndMnemonic=&Fechar
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties	Wed May 08 11:22:25 2013 +0100
@@ -21,8 +21,8 @@
 FileChooser.lookInLabel.textAndMnemonic=Leta &i:
 FileChooser.saveInLabel.textAndMnemonic=Spara i:
 FileChooser.fileNameLabel.textAndMnemonic=Fil&namn:
-FileChooser.folderNameLabel.textAndMnemonic=Mapp(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=Filforma&t:
+FileChooser.folderNameLabel.textAndMnemonic=Mapp&namn:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Mapp&namn:
 FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
 FileChooser.upFolderAccessibleName=Upp
 FileChooser.homeFolderToolTip.textAndMnemonic=Hem
@@ -47,8 +47,7 @@
 FileChooser.openButton.textAndMnemonic=\u00D6ppna
 
 ############ Used by MetalTitlePane if rendering window decorations############
-MetalTitlePane.restore.titleAndMnemonic=\u00C5terst\u00E4ll(&R)
+MetalTitlePane.restore.titleAndMnemonic=&\u00C5terst\u00E4ll
 MetalTitlePane.iconify.titleAndMnemonic=Minim&era
 MetalTitlePane.maximize.titleAndMnemonic=Ma&ximera
-MetalTitlePane.close.titleAndMnemonic=St\u00E4ng(&S)
-
+MetalTitlePane.close.titleAndMnemonic=&St\u00E4ng
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -18,8 +18,8 @@
 
 ############ FILE CHOOSER STRINGS #############
 
-FileChooser.lookInLabel.textAndMnemonic=\u67E5\u770B(&I):
-FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
+FileChooser.lookInLabel.textAndMnemonic=\u67E5\u627E(&I):
+FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58: 
 FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D(&N):
 FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D(&N):
 FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B(&T):
@@ -33,9 +33,9 @@
 FileChooser.listViewButtonToolTip.textAndMnemonic=\u5217\u8868
 FileChooser.listViewButtonAccessibleName=\u5217\u8868
 FileChooser.listViewActionLabel.textAndMnemonic=\u5217\u8868
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
-FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u8D44\u6599
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u4FE1\u606F
+FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u4FE1\u606F
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u4FE1\u606F
 FileChooser.refreshActionLabel.textAndMnemonic=\u5237\u65B0
 FileChooser.viewMenuLabel.textAndMnemonic=\u89C6\u56FE
 FileChooser.fileNameHeader.textAndMnemonic=\u540D\u79F0
@@ -51,4 +51,3 @@
 MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E)
 MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X)
 MetalTitlePane.close.titleAndMnemonic=\u5173\u95ED(&C)
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties	Wed May 08 11:22:25 2013 +0100
@@ -19,7 +19,7 @@
 ############ FILE CHOOSER STRINGS #############
 
 FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62(&I):
-FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC:
+FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC: 
 FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31(&N):
 FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31(&N):
 FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B(&T):
@@ -51,4 +51,3 @@
 MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E)
 MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X)
 MetalTitlePane.close.titleAndMnemonic=\u95DC\u9589(&C)
-
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Suchen &in:
-FileChooser.saveInLabel.textAndMnemonic=Speichern in:
-FileChooser.fileNameLabel.textAndMnemonic=Datei&name:
-FileChooser.folderNameLabel.textAndMnemonic=Ord&nername:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Da&teityp:
-FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her
-FileChooser.upFolderAccessibleName=Nach oben
-FileChooser.homeFolderToolTip.textAndMnemonic=Home
-FileChooser.homeFolderAccessibleName=Home
-FileChooser.newFolderToolTip.textAndMnemonic=Neuen Ordner erstellen
-FileChooser.newFolderAccessibleName=Neuer Ordner
-FileChooser.newFolderActionLabel.textAndMnemonic=Neuer Ordner
-FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
-FileChooser.listViewButtonAccessibleName=Liste
-FileChooser.listViewActionLabel.textAndMnemonic=Liste
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=Details
-FileChooser.detailsViewButtonAccessibleName=Details
-FileChooser.detailsViewActionLabel.textAndMnemonic=Details
-FileChooser.refreshActionLabel.textAndMnemonic=Aktualisieren
-FileChooser.viewMenuLabel.textAndMnemonic=Ansicht
-FileChooser.fileNameHeader.textAndMnemonic=Name
-FileChooser.fileSizeHeader.textAndMnemonic=Gr\u00F6\u00DFe
-FileChooser.fileTypeHeader.textAndMnemonic=Typ
-FileChooser.fileDateHeader.textAndMnemonic=Ge\u00E4ndert
-FileChooser.fileAttrHeader.textAndMnemonic=Attribute
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Suchen &in:
+FileChooser.saveInLabel.textAndMnemonic=Speichern in:
+FileChooser.fileNameLabel.textAndMnemonic=&Dateiname:
+FileChooser.folderNameLabel.textAndMnemonic=&Ordnername:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Datei&typ:
+FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her
+FileChooser.upFolderAccessibleName=Nach oben
+FileChooser.homeFolderToolTip.textAndMnemonic=Home
+FileChooser.homeFolderAccessibleName=Home
+FileChooser.newFolderToolTip.textAndMnemonic=Neuen Ordner erstellen
+FileChooser.newFolderAccessibleName=Neuer Ordner
+FileChooser.newFolderActionLabel.textAndMnemonic=Neuer Ordner
+FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
+FileChooser.listViewButtonAccessibleName=Liste
+FileChooser.listViewActionLabel.textAndMnemonic=Liste
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Details
+FileChooser.detailsViewButtonAccessibleName=Details
+FileChooser.detailsViewActionLabel.textAndMnemonic=Details
+FileChooser.refreshActionLabel.textAndMnemonic=Aktualisieren
+FileChooser.viewMenuLabel.textAndMnemonic=Ansicht
+FileChooser.fileNameHeader.textAndMnemonic=Name
+FileChooser.fileSizeHeader.textAndMnemonic=Gr\u00F6\u00DFe
+FileChooser.fileTypeHeader.textAndMnemonic=Typ
+FileChooser.fileDateHeader.textAndMnemonic=Ge\u00E4ndert
+FileChooser.fileAttrHeader.textAndMnemonic=Attribute
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Buscar en(&I):
-FileChooser.saveInLabel.textAndMnemonic=Guardar en:
-FileChooser.fileNameLabel.textAndMnemonic=&Nombre de Archivo:
-FileChooser.folderNameLabel.textAndMnemonic=&Nombre de la Carpeta:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de &Tipo:
-FileChooser.upFolderToolTip.textAndMnemonic=Subir un Nivel
-FileChooser.upFolderAccessibleName=Arriba
-FileChooser.homeFolderToolTip.textAndMnemonic=Inicio
-FileChooser.homeFolderAccessibleName=Inicio
-FileChooser.newFolderToolTip.textAndMnemonic=Crear Nueva Carpeta
-FileChooser.newFolderAccessibleName=Nueva Carpeta
-FileChooser.newFolderActionLabel.textAndMnemonic=Nueva Carpeta
-FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
-FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabel.textAndMnemonic=Lista
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalles
-FileChooser.detailsViewButtonAccessibleName=Detalles
-FileChooser.detailsViewActionLabel.textAndMnemonic=Detalles
-FileChooser.refreshActionLabel.textAndMnemonic=Refrescar
-FileChooser.viewMenuLabel.textAndMnemonic=Ver
-FileChooser.fileNameHeader.textAndMnemonic=Nombre
-FileChooser.fileSizeHeader.textAndMnemonic=Tama\u00F1o
-FileChooser.fileTypeHeader.textAndMnemonic=Tipo
-FileChooser.fileDateHeader.textAndMnemonic=Modificado
-FileChooser.fileAttrHeader.textAndMnemonic=Atributos
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=&Buscar en:
+FileChooser.saveInLabel.textAndMnemonic=Guardar en:
+FileChooser.fileNameLabel.textAndMnemonic=&Nombre de archivo:
+FileChooser.folderNameLabel.textAndMnemonic=&Nombre de carpeta:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de &tipo:
+FileChooser.upFolderToolTip.textAndMnemonic=Subir un Nivel
+FileChooser.upFolderAccessibleName=Arriba
+FileChooser.homeFolderToolTip.textAndMnemonic=Inicio
+FileChooser.homeFolderAccessibleName=Inicio
+FileChooser.newFolderToolTip.textAndMnemonic=Crear Nueva Carpeta
+FileChooser.newFolderAccessibleName=Nueva Carpeta
+FileChooser.newFolderActionLabel.textAndMnemonic=Nueva Carpeta
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
+FileChooser.listViewButtonAccessibleName=Lista
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalles
+FileChooser.detailsViewButtonAccessibleName=Detalles
+FileChooser.detailsViewActionLabel.textAndMnemonic=Detalles
+FileChooser.refreshActionLabel.textAndMnemonic=Refrescar
+FileChooser.viewMenuLabel.textAndMnemonic=Ver
+FileChooser.fileNameHeader.textAndMnemonic=Nombre
+FileChooser.fileSizeHeader.textAndMnemonic=Tama\u00F1o
+FileChooser.fileTypeHeader.textAndMnemonic=Tipo
+FileChooser.fileDateHeader.textAndMnemonic=Modificado
+FileChooser.fileAttrHeader.textAndMnemonic=Atributos
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Rechercher dans (&I):
-FileChooser.saveInLabel.textAndMnemonic=Enregistrer dans :
-FileChooser.fileNameLabel.textAndMnemonic=&Nom du fichier :
-FileChooser.folderNameLabel.textAndMnemonic=&Nom du dossier :
-FileChooser.filesOfTypeLabel.textAndMnemonic=Fichiers de &type :
-FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
-FileChooser.upFolderAccessibleName=Monter
-FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
-FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine
-FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
-FileChooser.newFolderAccessibleName=Nouveau dossier
-FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
-FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
-FileChooser.listViewButtonAccessibleName=Liste
-FileChooser.listViewActionLabel.textAndMnemonic=Liste
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=D\u00E9tails
-FileChooser.detailsViewButtonAccessibleName=D\u00E9tails
-FileChooser.detailsViewActionLabel.textAndMnemonic=D\u00E9tails
-FileChooser.refreshActionLabel.textAndMnemonic=Actualiser
-FileChooser.viewMenuLabel.textAndMnemonic=Affichage
-FileChooser.fileNameHeader.textAndMnemonic=Nom
-FileChooser.fileSizeHeader.textAndMnemonic=Taille
-FileChooser.fileTypeHeader.textAndMnemonic=Type
-FileChooser.fileDateHeader.textAndMnemonic=Modifi\u00E9
-FileChooser.fileAttrHeader.textAndMnemonic=Attributs
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Rechercher &dans :
+FileChooser.saveInLabel.textAndMnemonic=Enregistrer dans :
+FileChooser.fileNameLabel.textAndMnemonic=&Nom du fichier :
+FileChooser.folderNameLabel.textAndMnemonic=&Nom du dossier :
+FileChooser.filesOfTypeLabel.textAndMnemonic=&Type de fichier :
+FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau.
+FileChooser.upFolderAccessibleName=Monter
+FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine
+FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine
+FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier.
+FileChooser.newFolderAccessibleName=Nouveau dossier
+FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier
+FileChooser.listViewButtonToolTip.textAndMnemonic=Liste
+FileChooser.listViewButtonAccessibleName=Liste
+FileChooser.listViewActionLabel.textAndMnemonic=Liste
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=D\u00E9tails
+FileChooser.detailsViewButtonAccessibleName=D\u00E9tails
+FileChooser.detailsViewActionLabel.textAndMnemonic=D\u00E9tails
+FileChooser.refreshActionLabel.textAndMnemonic=Actualiser
+FileChooser.viewMenuLabel.textAndMnemonic=Affichage
+FileChooser.fileNameHeader.textAndMnemonic=Nom
+FileChooser.fileSizeHeader.textAndMnemonic=Taille
+FileChooser.fileTypeHeader.textAndMnemonic=Type
+FileChooser.fileDateHeader.textAndMnemonic=Modifi\u00E9
+FileChooser.fileAttrHeader.textAndMnemonic=Attributs
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Cerca &in:
-FileChooser.saveInLabel.textAndMnemonic=Salva in:
-FileChooser.fileNameLabel.textAndMnemonic=&Nome file:
-FileChooser.folderNameLabel.textAndMnemonic=&Nome della cartella:
-FileChooser.filesOfTypeLabel.textAndMnemonic=&Tipo file:
-FileChooser.upFolderToolTip.textAndMnemonic=Cartella superiore
-FileChooser.upFolderAccessibleName=Superiore
-FileChooser.homeFolderToolTip.textAndMnemonic=Home
-FileChooser.homeFolderAccessibleName=Home
-FileChooser.newFolderToolTip.textAndMnemonic=Crea nuova cartella
-FileChooser.newFolderAccessibleName=Nuova cartella
-FileChooser.newFolderActionLabel.textAndMnemonic=Nuova cartella
-FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
-FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabel.textAndMnemonic=Lista
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=Dettagli
-FileChooser.detailsViewButtonAccessibleName=Dettagli
-FileChooser.detailsViewActionLabel.textAndMnemonic=Dettagli
-FileChooser.refreshActionLabel.textAndMnemonic=Aggiorna
-FileChooser.viewMenuLabel.textAndMnemonic=Visualizza
-FileChooser.fileNameHeader.textAndMnemonic=Nome
-FileChooser.fileSizeHeader.textAndMnemonic=Dimensioni
-FileChooser.fileTypeHeader.textAndMnemonic=Tipo
-FileChooser.fileDateHeader.textAndMnemonic=Modificato
-FileChooser.fileAttrHeader.textAndMnemonic=Attributi
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Cerca &in:
+FileChooser.saveInLabel.textAndMnemonic=Salva in:
+FileChooser.fileNameLabel.textAndMnemonic=&Nome file:
+FileChooser.folderNameLabel.textAndMnemonic=&Nome cartella:
+FileChooser.filesOfTypeLabel.textAndMnemonic=&Tipo di file:
+FileChooser.upFolderToolTip.textAndMnemonic=Cartella superiore
+FileChooser.upFolderAccessibleName=Superiore
+FileChooser.homeFolderToolTip.textAndMnemonic=Home
+FileChooser.homeFolderAccessibleName=Home
+FileChooser.newFolderToolTip.textAndMnemonic=Crea nuova cartella
+FileChooser.newFolderAccessibleName=Nuova cartella
+FileChooser.newFolderActionLabel.textAndMnemonic=Nuova cartella
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
+FileChooser.listViewButtonAccessibleName=Lista
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Dettagli
+FileChooser.detailsViewButtonAccessibleName=Dettagli
+FileChooser.detailsViewActionLabel.textAndMnemonic=Dettagli
+FileChooser.refreshActionLabel.textAndMnemonic=Aggiorna
+FileChooser.viewMenuLabel.textAndMnemonic=Visualizza
+FileChooser.fileNameHeader.textAndMnemonic=Nome
+FileChooser.fileSizeHeader.textAndMnemonic=Dimensioni
+FileChooser.fileTypeHeader.textAndMnemonic=Tipo
+FileChooser.fileDateHeader.textAndMnemonic=Modificato
+FileChooser.fileAttrHeader.textAndMnemonic=Attributi
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=\u53C2\u7167(&I):
-FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
-FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D(&N):
-FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7(&T):
-FileChooser.upFolderToolTip.textAndMnemonic=1\u30EC\u30D9\u30EB\u4E0A\u3078
-FileChooser.upFolderAccessibleName=\u4E0A\u3078
-FileChooser.homeFolderToolTip.textAndMnemonic=\u30DB\u30FC\u30E0
-FileChooser.homeFolderAccessibleName=\u30DB\u30FC\u30E0
-FileChooser.newFolderToolTip.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
-FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u30EA\u30B9\u30C8
-FileChooser.listViewButtonAccessibleName=\u30EA\u30B9\u30C8
-FileChooser.listViewActionLabel.textAndMnemonic=\u30EA\u30B9\u30C8
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30
-FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30
-FileChooser.refreshActionLabel.textAndMnemonic=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
-FileChooser.viewMenuLabel.textAndMnemonic=\u8868\u793A
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u524D
-FileChooser.fileSizeHeader.textAndMnemonic=\u30B5\u30A4\u30BA
-FileChooser.fileTypeHeader.textAndMnemonic=\u30BF\u30A4\u30D7
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6B63\u65E5
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240(&I):
+FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
+FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D(&N):
+FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=1\u30EC\u30D9\u30EB\u4E0A\u3078
+FileChooser.upFolderAccessibleName=\u4E0A\u3078
+FileChooser.homeFolderToolTip.textAndMnemonic=\u30DB\u30FC\u30E0
+FileChooser.homeFolderAccessibleName=\u30DB\u30FC\u30E0
+FileChooser.newFolderToolTip.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210
+FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0
+FileChooser.listViewButtonToolTip.textAndMnemonic=\u30EA\u30B9\u30C8
+FileChooser.listViewButtonAccessibleName=\u30EA\u30B9\u30C8
+FileChooser.listViewActionLabel.textAndMnemonic=\u30EA\u30B9\u30C8
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30
+FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30
+FileChooser.refreshActionLabel.textAndMnemonic=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
+FileChooser.viewMenuLabel.textAndMnemonic=\u8868\u793A
+FileChooser.fileNameHeader.textAndMnemonic=\u540D\u524D
+FileChooser.fileSizeHeader.textAndMnemonic=\u30B5\u30A4\u30BA
+FileChooser.fileTypeHeader.textAndMnemonic=\u30BF\u30A4\u30D7
+FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6B63\u65E5
+FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=\uAC80\uC0C9 \uC704\uCE58(&I):
-FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58:
-FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984(&N):
-FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615(&T):
-FileChooser.upFolderToolTip.textAndMnemonic=\uD55C \uB808\uBCA8 \uC704\uB85C
-FileChooser.upFolderAccessibleName=\uC704\uB85C
-FileChooser.homeFolderToolTip.textAndMnemonic=\uD648
-FileChooser.homeFolderAccessibleName=\uD648
-FileChooser.newFolderToolTip.textAndMnemonic=\uC0C8 \uD3F4\uB354 \uC0DD\uC131
-FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354
-FileChooser.newFolderActionLabel.textAndMnemonic=\uC0C8 \uD3F4\uB354
-FileChooser.listViewButtonToolTip.textAndMnemonic=\uBAA9\uB85D
-FileChooser.listViewButtonAccessibleName=\uBAA9\uB85D
-FileChooser.listViewActionLabel.textAndMnemonic=\uBAA9\uB85D
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4
-FileChooser.detailsViewButtonAccessibleName=\uC138\uBD80 \uC815\uBCF4
-FileChooser.detailsViewActionLabel.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4
-FileChooser.refreshActionLabel.textAndMnemonic=\uC0C8\uB85C \uACE0\uCE68
-FileChooser.viewMenuLabel.textAndMnemonic=\uBCF4\uAE30
-FileChooser.fileNameHeader.textAndMnemonic=\uC774\uB984
-FileChooser.fileSizeHeader.textAndMnemonic=\uD06C\uAE30
-FileChooser.fileTypeHeader.textAndMnemonic=\uC720\uD615
-FileChooser.fileDateHeader.textAndMnemonic=\uC218\uC815 \uB0A0\uC9DC
-FileChooser.fileAttrHeader.textAndMnemonic=\uC18D\uC131
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=\uCC3E\uB294 \uC704\uCE58(&I):
+FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58:
+FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984(&N):
+FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=\uD55C \uB808\uBCA8 \uC704\uB85C
+FileChooser.upFolderAccessibleName=\uC704\uB85C
+FileChooser.homeFolderToolTip.textAndMnemonic=\uD648
+FileChooser.homeFolderAccessibleName=\uD648
+FileChooser.newFolderToolTip.textAndMnemonic=\uC0C8 \uD3F4\uB354 \uC0DD\uC131
+FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354
+FileChooser.newFolderActionLabel.textAndMnemonic=\uC0C8 \uD3F4\uB354
+FileChooser.listViewButtonToolTip.textAndMnemonic=\uBAA9\uB85D
+FileChooser.listViewButtonAccessibleName=\uBAA9\uB85D
+FileChooser.listViewActionLabel.textAndMnemonic=\uBAA9\uB85D
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4
+FileChooser.detailsViewButtonAccessibleName=\uC138\uBD80 \uC815\uBCF4
+FileChooser.detailsViewActionLabel.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4
+FileChooser.refreshActionLabel.textAndMnemonic=\uC0C8\uB85C \uACE0\uCE68
+FileChooser.viewMenuLabel.textAndMnemonic=\uBCF4\uAE30
+FileChooser.fileNameHeader.textAndMnemonic=\uC774\uB984
+FileChooser.fileSizeHeader.textAndMnemonic=\uD06C\uAE30
+FileChooser.fileTypeHeader.textAndMnemonic=\uC720\uD615
+FileChooser.fileDateHeader.textAndMnemonic=\uC218\uC815 \uB0A0\uC9DC
+FileChooser.fileAttrHeader.textAndMnemonic=\uC18D\uC131
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Consultar Em(&I):
-FileChooser.saveInLabel.textAndMnemonic=Salvar Em:
-FileChooser.fileNameLabel.textAndMnemonic=&Nome do Arquivo:
-FileChooser.folderNameLabel.textAndMnemonic=&Nome da pasta:
-FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do &Tipo:
-FileChooser.upFolderToolTip.textAndMnemonic=Um N\u00EDvel Acima
-FileChooser.upFolderAccessibleName=Acima
-FileChooser.homeFolderToolTip.textAndMnemonic=In\u00EDcio
-FileChooser.homeFolderAccessibleName=In\u00EDcio
-FileChooser.newFolderToolTip.textAndMnemonic=Criar Nova Pasta
-FileChooser.newFolderAccessibleName=Nova Pasta
-FileChooser.newFolderActionLabel.textAndMnemonic=Nova Pasta
-FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
-FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabel.textAndMnemonic=Lista
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalhes
-FileChooser.detailsViewButtonAccessibleName=Detalhes
-FileChooser.detailsViewActionLabel.textAndMnemonic=Detalhes
-FileChooser.refreshActionLabel.textAndMnemonic=Atualizar
-FileChooser.viewMenuLabel.textAndMnemonic=Exibir
-FileChooser.fileNameHeader.textAndMnemonic=Nome
-FileChooser.fileSizeHeader.textAndMnemonic=Tamanho
-FileChooser.fileTypeHeader.textAndMnemonic=Tipo
-FileChooser.fileDateHeader.textAndMnemonic=Modificado
-FileChooser.fileAttrHeader.textAndMnemonic=Atributos
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Pesquisar &em:
+FileChooser.saveInLabel.textAndMnemonic=Salvar Em:
+FileChooser.fileNameLabel.textAndMnemonic=&Nome do Arquivo:
+FileChooser.folderNameLabel.textAndMnemonic=&Nome da Pasta:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do &Tipo:
+FileChooser.upFolderToolTip.textAndMnemonic=Um N\u00EDvel Acima
+FileChooser.upFolderAccessibleName=Acima
+FileChooser.homeFolderToolTip.textAndMnemonic=In\u00EDcio
+FileChooser.homeFolderAccessibleName=In\u00EDcio
+FileChooser.newFolderToolTip.textAndMnemonic=Criar Nova Pasta
+FileChooser.newFolderAccessibleName=Nova Pasta
+FileChooser.newFolderActionLabel.textAndMnemonic=Nova Pasta
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
+FileChooser.listViewButtonAccessibleName=Lista
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalhes
+FileChooser.detailsViewButtonAccessibleName=Detalhes
+FileChooser.detailsViewActionLabel.textAndMnemonic=Detalhes
+FileChooser.refreshActionLabel.textAndMnemonic=Atualizar
+FileChooser.viewMenuLabel.textAndMnemonic=Exibir
+FileChooser.fileNameHeader.textAndMnemonic=Nome
+FileChooser.fileSizeHeader.textAndMnemonic=Tamanho
+FileChooser.fileTypeHeader.textAndMnemonic=Tipo
+FileChooser.fileDateHeader.textAndMnemonic=Modificado
+FileChooser.fileAttrHeader.textAndMnemonic=Atributos
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=Leta &i:
-FileChooser.saveInLabel.textAndMnemonic=Spara i:
-FileChooser.fileNameLabel.textAndMnemonic=Fil&namn:
-FileChooser.folderNameLabel.textAndMnemonic=Mapp(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=Filforma&t:
-FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
-FileChooser.upFolderAccessibleName=Upp
-FileChooser.homeFolderToolTip.textAndMnemonic=Hem
-FileChooser.homeFolderAccessibleName=Hem
-FileChooser.newFolderToolTip.textAndMnemonic=Skapa ny mapp
-FileChooser.newFolderAccessibleName=Ny mapp
-FileChooser.newFolderActionLabel.textAndMnemonic=Ny mapp
-FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
-FileChooser.listViewButtonAccessibleName=Lista
-FileChooser.listViewActionLabel.textAndMnemonic=Lista
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detaljer
-FileChooser.detailsViewButtonAccessibleName=Detaljer
-FileChooser.detailsViewActionLabel.textAndMnemonic=Detaljer
-FileChooser.refreshActionLabel.textAndMnemonic=F\u00F6rnya
-FileChooser.viewMenuLabel.textAndMnemonic=Vy
-FileChooser.fileNameHeader.textAndMnemonic=Namn
-FileChooser.fileSizeHeader.textAndMnemonic=Storlek
-FileChooser.fileTypeHeader.textAndMnemonic=Typ
-FileChooser.fileDateHeader.textAndMnemonic=\u00C4ndrad
-FileChooser.fileAttrHeader.textAndMnemonic=Attribut
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=Leta &i:
+FileChooser.saveInLabel.textAndMnemonic=Spara i:
+FileChooser.fileNameLabel.textAndMnemonic=Fil&namn:
+FileChooser.folderNameLabel.textAndMnemonic=Mapp&namn:
+FileChooser.filesOfTypeLabel.textAndMnemonic=Filer av &typ:
+FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5
+FileChooser.upFolderAccessibleName=Upp
+FileChooser.homeFolderToolTip.textAndMnemonic=Hem
+FileChooser.homeFolderAccessibleName=Hem
+FileChooser.newFolderToolTip.textAndMnemonic=Skapa ny mapp
+FileChooser.newFolderAccessibleName=Ny mapp
+FileChooser.newFolderActionLabel.textAndMnemonic=Ny mapp
+FileChooser.listViewButtonToolTip.textAndMnemonic=Lista
+FileChooser.listViewButtonAccessibleName=Lista
+FileChooser.listViewActionLabel.textAndMnemonic=Lista
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detaljer
+FileChooser.detailsViewButtonAccessibleName=Detaljer
+FileChooser.detailsViewActionLabel.textAndMnemonic=Detaljer
+FileChooser.refreshActionLabel.textAndMnemonic=F\u00F6rnya
+FileChooser.viewMenuLabel.textAndMnemonic=Vy
+FileChooser.fileNameHeader.textAndMnemonic=Namn
+FileChooser.fileSizeHeader.textAndMnemonic=Storlek
+FileChooser.fileTypeHeader.textAndMnemonic=Typ
+FileChooser.fileDateHeader.textAndMnemonic=\u00C4ndrad
+FileChooser.fileAttrHeader.textAndMnemonic=Attribut
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=\u67E5\u770B(&I):
-FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58:
-FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D(&N):
-FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B(&T):
-FileChooser.upFolderToolTip.textAndMnemonic=\u5411\u4E0A\u4E00\u7EA7
-FileChooser.upFolderAccessibleName=\u5411\u4E0A
-FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u5F55
-FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u5F55
-FileChooser.newFolderToolTip.textAndMnemonic=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939
-FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u5217\u8868
-FileChooser.listViewButtonAccessibleName=\u5217\u8868
-FileChooser.listViewActionLabel.textAndMnemonic=\u5217\u8868
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
-FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u8D44\u6599
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599
-FileChooser.refreshActionLabel.textAndMnemonic=\u5237\u65B0
-FileChooser.viewMenuLabel.textAndMnemonic=\u89C6\u56FE
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u79F0
-FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
-FileChooser.fileTypeHeader.textAndMnemonic=\u7C7B\u578B
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=\u67E5\u627E(&I):
+FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58: 
+FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D(&N):
+FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=\u5411\u4E0A\u4E00\u7EA7
+FileChooser.upFolderAccessibleName=\u5411\u4E0A
+FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u5F55
+FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u5F55
+FileChooser.newFolderToolTip.textAndMnemonic=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939
+FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939
+FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939
+FileChooser.listViewButtonToolTip.textAndMnemonic=\u5217\u8868
+FileChooser.listViewButtonAccessibleName=\u5217\u8868
+FileChooser.listViewActionLabel.textAndMnemonic=\u5217\u8868
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u4FE1\u606F
+FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u4FE1\u606F
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u4FE1\u606F
+FileChooser.refreshActionLabel.textAndMnemonic=\u5237\u65B0
+FileChooser.viewMenuLabel.textAndMnemonic=\u89C6\u56FE
+FileChooser.fileNameHeader.textAndMnemonic=\u540D\u79F0
+FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
+FileChooser.fileTypeHeader.textAndMnemonic=\u7C7B\u578B
+FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
+FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,45 +1,45 @@
-# This properties file is used to create a PropertyResourceBundle
-# It contains Locale specific strings used be the Synth Look and Feel.
-# Currently, the following components need this for support:
-#
-#    FileChooser
-#
-# When this file is read in, the strings are put into the
-# defaults table.  This is an implementation detail of the current
-# workings of Swing.  DO NOT DEPEND ON THIS.
-# This may change in future versions of Swing as we improve localization
-# support.
-#
-# Refer to the note in basic.properties for a description as to what
-# the mnemonics correspond to and how to calculate them.
-#
-# @author Steve Wilson
-
-
-############ FILE CHOOSER STRINGS #############
-
-FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62(&I):
-FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC:
-FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31(&N):
-FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31(&N):
-FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B(&T):
-FileChooser.upFolderToolTip.textAndMnemonic=\u5F80\u4E0A\u4E00\u5C64
-FileChooser.upFolderAccessibleName=\u5F80\u4E0A
-FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u9304
-FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u9304
-FileChooser.newFolderToolTip.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E
-FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E
-FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
-FileChooser.listViewButtonToolTip.textAndMnemonic=\u6E05\u55AE
-FileChooser.listViewButtonAccessibleName=\u6E05\u55AE
-FileChooser.listViewActionLabel.textAndMnemonic=\u6E05\u55AE
-FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
-FileChooser.refreshActionLabel.textAndMnemonic=\u91CD\u65B0\u6574\u7406
-FileChooser.viewMenuLabel.textAndMnemonic=\u6AA2\u8996
-FileChooser.fileNameHeader.textAndMnemonic=\u540D\u7A31
-FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
-FileChooser.fileTypeHeader.textAndMnemonic=\u985E\u578B
-FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
-FileChooser.fileAttrHeader.textAndMnemonic=\u5C6C\u6027
+# This properties file is used to create a PropertyResourceBundle
+# It contains Locale specific strings used be the Synth Look and Feel.
+# Currently, the following components need this for support:
+#
+#    FileChooser
+#
+# When this file is read in, the strings are put into the
+# defaults table.  This is an implementation detail of the current
+# workings of Swing.  DO NOT DEPEND ON THIS.
+# This may change in future versions of Swing as we improve localization
+# support.
+#
+# Refer to the note in basic.properties for a description as to what
+# the mnemonics correspond to and how to calculate them.
+#
+# @author Steve Wilson
+
+
+############ FILE CHOOSER STRINGS #############
+
+FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62(&I):
+FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC: 
+FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31(&N):
+FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31(&N):
+FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B(&T):
+FileChooser.upFolderToolTip.textAndMnemonic=\u5F80\u4E0A\u4E00\u5C64
+FileChooser.upFolderAccessibleName=\u5F80\u4E0A
+FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u9304
+FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u9304
+FileChooser.newFolderToolTip.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E
+FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E
+FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u8CC7\u6599\u593E
+FileChooser.listViewButtonToolTip.textAndMnemonic=\u6E05\u55AE
+FileChooser.listViewButtonAccessibleName=\u6E05\u55AE
+FileChooser.listViewActionLabel.textAndMnemonic=\u6E05\u55AE
+FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
+FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30\u8CC7\u8A0A
+FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A
+FileChooser.refreshActionLabel.textAndMnemonic=\u91CD\u65B0\u6574\u7406
+FileChooser.viewMenuLabel.textAndMnemonic=\u6AA2\u8996
+FileChooser.fileNameHeader.textAndMnemonic=\u540D\u7A31
+FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F
+FileChooser.fileTypeHeader.textAndMnemonic=\u985E\u578B
+FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F
+FileChooser.fileAttrHeader.textAndMnemonic=\u5C6C\u6027
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java	Wed May 08 11:22:25 2013 +0100
@@ -201,7 +201,7 @@
         {"No class named", "\u540D\u524D''{0}''\u306E\u30AF\u30E9\u30B9\u304C\u3042\u308A\u307E\u305B\u3093"},
         {"No class specified.", "\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
         {"No classpath specified.", "\u30AF\u30E9\u30B9\u30D1\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
-        {"No code at line", "{1}\u306E\u884C{0,number,integer}\u306B\u30B3\u30FC\u30C9\u304C\u3042\u308A\u307E\u305B\u3093"},
+        {"No code at line", "\u884C{0,number,integer} ({1}\u5185)\u306B\u30B3\u30FC\u30C9\u304C\u3042\u308A\u307E\u305B\u3093"},
         {"No connect specification.", "\u63A5\u7D9A\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
         {"No connector named:", "\u540D\u524D{0}\u306E\u30B3\u30CD\u30AF\u30BF\u304C\u3042\u308A\u307E\u305B\u3093"},
         {"No current thread", "\u73FE\u5728\u306E\u30B9\u30EC\u30C3\u30C9\u304C\u3042\u308A\u307E\u305B\u3093"},
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java	Wed May 08 11:22:25 2013 +0100
@@ -325,7 +325,7 @@
         {"watch accesses of", "\u76D1\u89C6{0}.{1}\u7684\u8BBF\u95EE"},
         {"watch modification of", "\u76D1\u89C6{0}.{1}\u7684\u4FEE\u6539"},
         {"zz help text",
-             "** \u547D\u4EE4\u5217\u8868 **\nconnectors                -- \u5217\u51FA\u6B64 VM \u4E2D\u53EF\u7528\u7684\u8FDE\u63A5\u5668\u548C\u4F20\u8F93\n\nrun [class [args]]        -- \u5F00\u59CB\u6267\u884C\u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B\u7C7B\n\nthreads [threadgroup]     -- \u5217\u51FA\u7EBF\u7A0B\nthread <thread id>        -- \u8BBE\u7F6E\u9ED8\u8BA4\u7EBF\u7A0B\nsuspend [thread id(s)]    -- \u6302\u8D77\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nresume [thread id(s)]     -- \u6062\u590D\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nwhere [<thread id> | all] -- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808\nwherei [<thread id> | all]-- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808, \u4EE5\u53CA pc \u4FE1\u606F\nup [n frames]             -- \u4E0A\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\ndown [n frames]           -- \u4E0B\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\nkill <thread id> <expr>   -- \u7EC8\u6B62\u5177\u6709\u7ED9\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u5BF9\u8C61\u7684\u7EBF\u7A0B\ninterrupt <thread id>     -- \u4E2D\u65AD\u7EBF\u7A0B\n\nprint <expr>              -- \u8F93\u51FA\u8868\u8FBE\u5F0F\u7684\u503C\ndump <expr>               -- \u8F93\u51FA\u6240\u6709\u5BF9\u8C61\u4FE1\u606F\neval <expr>               -- \u5BF9\u8868\u8FBE\u5F0F\u6C42\u503C (\u4E0E print \u76F8\u540C)\nset <lvalue> = <expr>     -- \u5411\u5B57\u6BB5/\u53D8\u91CF/\u6570\u7EC4\u5143\u7D20\u5206\u914D\u65B0\u503C\nlocals                    -- \u8F93\u51FA\u5F53\u524D\u5806\u6808\u5E27\u4E2D\u7684\u6240\u6709\u672C\u5730\u53D8\u91CF\n\nclasses                   -- \u5217\u51FA\u5F53\u524D\u5DF2\u77E5\u7684\u7C7B\nclass <class id>          -- \u663E\u793A\u5DF2\u547D\u540D\u7C7B\u7684\u8BE6\u7EC6\u8D44\u6599\nmethods <class id>        -- \u5217\u51FA\u7C7B\u7684\u65B9\u6CD5\nfields <class id>         -- \u5217\u51FA\u7C7B\u7684\u5B57\u6BB5\n\nthreadgroups              -- \u5217\u51FA\u7EBF\u7A0B\u7EC4\nthreadgroup <name>        -- \u8BBE\u7F6E\u5F53\u524D\u7EBF\u7A0B\u7EC4\n\nstop in <class id>.<method>[(argument_type,...)]\n                          -- \u5728\u65B9\u6CD5\u4E2D\u8BBE\u7F6E\u65AD\u70B9\nstop at <class id>:<line> -- \u5728\u884C\u4E2D\u8BBE\u7F6E\u65AD\u70B9\nclear <class id>.<method>[(argument_type,...)]\n                          -- \u6E05\u9664\u65B9\u6CD5\u4E2D\u7684\u65AD\u70B9\nclear <class id>:<line>   -- \u6E05\u9664\u884C\u4E2D\u7684\u65AD\u70B9\nclear                     -- \u5217\u51FA\u65AD\u70B9\ncatch [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u51FA\u73B0\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u65F6\u4E2D\u65AD\nignore [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF, \u53D6\u6D88 'catch'\nwatch [access|all] <class id>.<field name>\n                          -- \u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\nunwatch [access|all] <class id>.<field name>\n                          -- \u505C\u6B62\u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\ntrace [go] methods [thread]\n                          -- \u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C\u9000\u51FA\u3002\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\ntrace [go] method exit | exits [thread]\n                          -- \u8DDF\u8E2A\u5F53\u524D\u65B9\u6CD5\u7684\u9000\u51FA, \u6216\u8005\u6240\u6709\u65B9\u6CD5\u7684\u9000\u51FA\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\nuntrace [methods]         -- \u505C\u6B62\u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C/\u6216\u9000\u51FA\nstep                      -- \u6267\u884C\u5F53\u524D\u884C\nstep up                   -- \u4E00\u76F4\u6267\u884C, \u76F4\u5230\u5F53\u524D\u65B9\u6CD5\u8FD4\u56DE\u5230\u5176\u8C03\u7528\u65B9\nstepi                     -- \u6267\u884C\u5F53\u524D\u6307\u4EE4\nnext                      -- \u6B65\u8FDB\u4E00\u884C (\u6B65\u8FC7\u8C03\u7528)\ncont                      -- \u4ECE\u65AD\u70B9\u5904\u7EE7\u7EED\u6267\u884C\n\nlist [line number|method] -- \u8F93\u51FA\u6E90\u4EE3\u7801\nuse (\u6216 sourcepath) [source file path]\n                          -- \u663E\u793A\u6216\u66F4\u6539\u6E90\u8DEF\u5F84\nexclude [<class pattern>, ... | \"none\"]\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u7C7B, \u4E0D\u62A5\u544A\u6B65\u9AA4\u6216\u65B9\u6CD5\u4E8B\u4EF6\nclasspath                 -- \u4ECE\u76EE\u6807 VM \u8F93\u51FA\u7C7B\u8DEF\u5F84\u4FE1\u606F\n\nmonitor <command>         -- \u6BCF\u6B21\u7A0B\u5E8F\u505C\u6B62\u65F6\u6267\u884C\u547D\u4EE4\nmonitor                   -- \u5217\u51FA\u76D1\u89C6\u5668\nunmonitor <monitor#>      -- \u5220\u9664\u76D1\u89C6\u5668\nread <filename>           -- \u8BFB\u53D6\u5E76\u6267\u884C\u547D\u4EE4\u6587\u4EF6\n\nlock <expr>               -- \u8F93\u51FA\u5BF9\u8C61\u7684\u9501\u4FE1\u606F\nthreadlocks [thread id]   -- \u8F93\u51FA\u7EBF\u7A0B\u7684\u9501\u4FE1\u606F\n\npop                       -- \u901A\u8FC7\u5F53\u524D\u5E27\u51FA\u6808, \u4E14\u5305\u542B\u5F53\u524D\u5E27\nreenter                   -- \u4E0E pop \u76F8\u540C, \u4F46\u91CD\u65B0\u8FDB\u5165\u5F53\u524D\u5E27\nredefine <class id> <class file name>\n                          -- \u91CD\u65B0\u5B9A\u4E49\u7C7B\u7684\u4EE3\u7801\n\ndisablegc <expr>          -- \u7981\u6B62\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\nenablegc <expr>           -- \u5141\u8BB8\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\n\n!!                        -- \u91CD\u590D\u6267\u884C\u6700\u540E\u4E00\u4E2A\u547D\u4EE4\n<n> <command>             -- \u5C06\u547D\u4EE4\u91CD\u590D\u6267\u884C n \u6B21\n# <command>               -- \u653E\u5F03 (\u65E0\u64CD\u4F5C)\nhelp (\u6216 ?)               -- \u5217\u51FA\u547D\u4EE4\nversion                   -- \u8F93\u51FA\u7248\u672C\u4FE1\u606F\nexit (\u6216 quit)            -- \u9000\u51FA\u8C03\u8BD5\u5668\n\n<class id>: \u5E26\u6709\u7A0B\u5E8F\u5305\u9650\u5B9A\u7B26\u7684\u5B8C\u6574\u7C7B\u540D\n<class pattern>: \u5E26\u6709\u524D\u5BFC\u6216\u5C3E\u968F\u901A\u914D\u7B26 ('*') \u7684\u7C7B\u540D\n<thread id>: 'threads' \u547D\u4EE4\u4E2D\u62A5\u544A\u7684\u7EBF\u7A0B\u7F16\u53F7\n<expr>: Java(TM) \u7F16\u7A0B\u8BED\u8A00\u8868\u8FBE\u5F0F\u3002\n\u652F\u6301\u5927\u591A\u6570\u5E38\u89C1\u8BED\u6CD5\u3002\n\n\u53EF\u4EE5\u5C06\u542F\u52A8\u547D\u4EE4\u7F6E\u4E8E \"jdb.ini\" \u6216 \".jdbrc\" \u4E2D\n\u4F4D\u4E8E user.home \u6216 user.dir \u4E2D"},
+             "** \u547D\u4EE4\u5217\u8868 **\nconnectors                -- \u5217\u51FA\u6B64 VM \u4E2D\u53EF\u7528\u7684\u8FDE\u63A5\u5668\u548C\u4F20\u8F93\n\nrun [class [args]]        -- \u5F00\u59CB\u6267\u884C\u5E94\u7528\u7A0B\u5E8F\u7684\u4E3B\u7C7B\n\nthreads [threadgroup]     -- \u5217\u51FA\u7EBF\u7A0B\nthread <thread id>        -- \u8BBE\u7F6E\u9ED8\u8BA4\u7EBF\u7A0B\nsuspend [thread id(s)]    -- \u6302\u8D77\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nresume [thread id(s)]     -- \u6062\u590D\u7EBF\u7A0B (\u9ED8\u8BA4\u503C: all)\nwhere [<thread id> | all] -- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808\nwherei [<thread id> | all]-- \u8F6C\u50A8\u7EBF\u7A0B\u7684\u5806\u6808, \u4EE5\u53CA pc \u4FE1\u606F\nup [n frames]             -- \u4E0A\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\ndown [n frames]           -- \u4E0B\u79FB\u7EBF\u7A0B\u7684\u5806\u6808\nkill <thread id> <expr>   -- \u7EC8\u6B62\u5177\u6709\u7ED9\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u5BF9\u8C61\u7684\u7EBF\u7A0B\ninterrupt <thread id>     -- \u4E2D\u65AD\u7EBF\u7A0B\n\nprint <expr>              -- \u8F93\u51FA\u8868\u8FBE\u5F0F\u7684\u503C\ndump <expr>               -- \u8F93\u51FA\u6240\u6709\u5BF9\u8C61\u4FE1\u606F\neval <expr>               -- \u5BF9\u8868\u8FBE\u5F0F\u6C42\u503C (\u4E0E print \u76F8\u540C)\nset <lvalue> = <expr>     -- \u5411\u5B57\u6BB5/\u53D8\u91CF/\u6570\u7EC4\u5143\u7D20\u5206\u914D\u65B0\u503C\nlocals                    -- \u8F93\u51FA\u5F53\u524D\u5806\u6808\u5E27\u4E2D\u7684\u6240\u6709\u672C\u5730\u53D8\u91CF\n\nclasses                   -- \u5217\u51FA\u5F53\u524D\u5DF2\u77E5\u7684\u7C7B\nclass <class id>          -- \u663E\u793A\u5DF2\u547D\u540D\u7C7B\u7684\u8BE6\u7EC6\u8D44\u6599\nmethods <class id>        -- \u5217\u51FA\u7C7B\u7684\u65B9\u6CD5\nfields <class id>         -- \u5217\u51FA\u7C7B\u7684\u5B57\u6BB5\n\nthreadgroups              -- \u5217\u51FA\u7EBF\u7A0B\u7EC4\nthreadgroup <name>        -- \u8BBE\u7F6E\u5F53\u524D\u7EBF\u7A0B\u7EC4\n\nstop in <class id>.<method>[(argument_type,...)]\n                          -- \u5728\u65B9\u6CD5\u4E2D\u8BBE\u7F6E\u65AD\u70B9\nstop at <class id>:<line> -- \u5728\u884C\u4E2D\u8BBE\u7F6E\u65AD\u70B9\nclear <class id>.<method>[(argument_type,...)]\n                          -- \u6E05\u9664\u65B9\u6CD5\u4E2D\u7684\u65AD\u70B9\nclear <class id>:<line>   -- \u6E05\u9664\u884C\u4E2D\u7684\u65AD\u70B9\nclear                     -- \u5217\u51FA\u65AD\u70B9\ncatch [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u51FA\u73B0\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF\u65F6\u4E2D\u65AD\nignore [uncaught|caught|all] <class id>|<class pattern>\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u5F02\u5E38\u9519\u8BEF, \u53D6\u6D88 'catch'\nwatch [access|all] <class id>.<field name>\n                          -- \u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\nunwatch [access|all] <class id>.<field name>\n                          -- \u505C\u6B62\u76D1\u89C6\u5BF9\u5B57\u6BB5\u7684\u8BBF\u95EE/\u4FEE\u6539\ntrace [go] methods [thread]\n                          -- \u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C\u9000\u51FA\u3002\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\ntrace [go] method exit | exits [thread]\n                          -- \u8DDF\u8E2A\u5F53\u524D\u65B9\u6CD5\u7684\u9000\u51FA, \u6216\u8005\u6240\u6709\u65B9\u6CD5\u7684\u9000\u51FA\n                          -- \u9664\u975E\u6307\u5B9A 'go', \u5426\u5219\u6302\u8D77\u6240\u6709\u7EBF\u7A0B\nuntrace [methods]         -- \u505C\u6B62\u8DDF\u8E2A\u65B9\u6CD5\u8FDB\u5165\u548C/\u6216\u9000\u51FA\nstep                      -- \u6267\u884C\u5F53\u524D\u884C\nstep up                   -- \u4E00\u76F4\u6267\u884C, \u76F4\u5230\u5F53\u524D\u65B9\u6CD5\u8FD4\u56DE\u5230\u5176\u8C03\u7528\u65B9\nstepi                     -- \u6267\u884C\u5F53\u524D\u6307\u4EE4\n\u4E0B\u4E00\u6B65                      -- \u6B65\u8FDB\u4E00\u884C (\u6B65\u8FC7\u8C03\u7528)\ncont                      -- \u4ECE\u65AD\u70B9\u5904\u7EE7\u7EED\u6267\u884C\n\nlist [line number|method] -- \u8F93\u51FA\u6E90\u4EE3\u7801\nuse (\u6216 sourcepath) [source file path]\n                          -- \u663E\u793A\u6216\u66F4\u6539\u6E90\u8DEF\u5F84\nexclude [<class pattern>, ... | \"none\"]\n                          -- \u5BF9\u4E8E\u6307\u5B9A\u7684\u7C7B, \u4E0D\u62A5\u544A\u6B65\u9AA4\u6216\u65B9\u6CD5\u4E8B\u4EF6\nclasspath                 -- \u4ECE\u76EE\u6807 VM \u8F93\u51FA\u7C7B\u8DEF\u5F84\u4FE1\u606F\n\nmonitor <command>         -- \u6BCF\u6B21\u7A0B\u5E8F\u505C\u6B62\u65F6\u6267\u884C\u547D\u4EE4\nmonitor                   -- \u5217\u51FA\u76D1\u89C6\u5668\nunmonitor <monitor#>      -- \u5220\u9664\u76D1\u89C6\u5668\nread <filename>           -- \u8BFB\u53D6\u5E76\u6267\u884C\u547D\u4EE4\u6587\u4EF6\n\nlock <expr>               -- \u8F93\u51FA\u5BF9\u8C61\u7684\u9501\u4FE1\u606F\nthreadlocks [thread id]   -- \u8F93\u51FA\u7EBF\u7A0B\u7684\u9501\u4FE1\u606F\n\npop                       -- \u901A\u8FC7\u5F53\u524D\u5E27\u51FA\u6808, \u4E14\u5305\u542B\u5F53\u524D\u5E27\nreenter                   -- \u4E0E pop \u76F8\u540C, \u4F46\u91CD\u65B0\u8FDB\u5165\u5F53\u524D\u5E27\nredefine <class id> <class file name>\n                          -- \u91CD\u65B0\u5B9A\u4E49\u7C7B\u7684\u4EE3\u7801\n\ndisablegc <expr>          -- \u7981\u6B62\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\nenablegc <expr>           -- \u5141\u8BB8\u5BF9\u8C61\u7684\u5783\u573E\u6536\u96C6\n\n!!                        -- \u91CD\u590D\u6267\u884C\u6700\u540E\u4E00\u4E2A\u547D\u4EE4\n<n> <command>             -- \u5C06\u547D\u4EE4\u91CD\u590D\u6267\u884C n \u6B21\n# <command>               -- \u653E\u5F03 (\u65E0\u64CD\u4F5C)\nhelp (\u6216 ?)               -- \u5217\u51FA\u547D\u4EE4\nversion                   -- \u8F93\u51FA\u7248\u672C\u4FE1\u606F\nexit (\u6216 quit)            -- \u9000\u51FA\u8C03\u8BD5\u5668\n\n<class id>: \u5E26\u6709\u7A0B\u5E8F\u5305\u9650\u5B9A\u7B26\u7684\u5B8C\u6574\u7C7B\u540D\n<class pattern>: \u5E26\u6709\u524D\u5BFC\u6216\u5C3E\u968F\u901A\u914D\u7B26 ('*') \u7684\u7C7B\u540D\n<thread id>: 'threads' \u547D\u4EE4\u4E2D\u62A5\u544A\u7684\u7EBF\u7A0B\u7F16\u53F7\n<expr>: Java(TM) \u7F16\u7A0B\u8BED\u8A00\u8868\u8FBE\u5F0F\u3002\n\u652F\u6301\u5927\u591A\u6570\u5E38\u89C1\u8BED\u6CD5\u3002\n\n\u53EF\u4EE5\u5C06\u542F\u52A8\u547D\u4EE4\u7F6E\u4E8E \"jdb.ini\" \u6216 \".jdbrc\" \u4E2D\n\u4F4D\u4E8E user.home \u6216 user.dir \u4E2D"},
         {"zz usage text",
              "\u7528\u6CD5: {0} <options> <class> <arguments>\n\n\u5176\u4E2D, \u9009\u9879\u5305\u62EC:\n    -help             \u8F93\u51FA\u6B64\u6D88\u606F\u5E76\u9000\u51FA\n    -sourcepath <\u7531 \"{1}\" \u5206\u9694\u7684\u76EE\u5F55>\n                      \u8981\u5728\u5176\u4E2D\u67E5\u627E\u6E90\u6587\u4EF6\u7684\u76EE\u5F55\n    -attach <address>\n                      \u4F7F\u7528\u6807\u51C6\u8FDE\u63A5\u5668\u9644\u52A0\u5230\u6307\u5B9A\u5730\u5740\u5904\u6B63\u5728\u8FD0\u884C\u7684 VM\n    -listen <address>\n                      \u7B49\u5F85\u6B63\u5728\u8FD0\u884C\u7684 VM \u4F7F\u7528\u6807\u51C6\u8FDE\u63A5\u5668\u5728\u6307\u5B9A\u5730\u5740\u5904\u8FDE\u63A5\n    -listenany\n                      \u7B49\u5F85\u6B63\u5728\u8FD0\u884C\u7684 VM \u4F7F\u7528\u6807\u51C6\u8FDE\u63A5\u5668\u5728\u4EFB\u4F55\u53EF\u7528\u5730\u5740\u5904\u8FDE\u63A5\n    -launch\n                      \u7ACB\u5373\u542F\u52A8 VM \u800C\u4E0D\u662F\u7B49\u5F85 ''run'' \u547D\u4EE4\n    -listconnectors   \u5217\u51FA\u6B64 VM \u4E2D\u7684\u53EF\u7528\u8FDE\u63A5\u5668\n    -connect <connector-name>:<name1>=<value1>,...\n                      \u4F7F\u7528\u6240\u5217\u53C2\u6570\u503C\u901A\u8FC7\u6307\u5B9A\u7684\u8FDE\u63A5\u5668\u8FDE\u63A5\u5230\u76EE\u6807 VM\n    -dbgtrace [flags] \u8F93\u51FA\u4FE1\u606F\u4F9B\u8C03\u8BD5{0}\n    -tclient          \u5728 HotSpot(TM) \u5BA2\u6237\u673A\u7F16\u8BD1\u5668\u4E2D\u8FD0\u884C\u5E94\u7528\u7A0B\u5E8F\n    -tserver          \u5728 HotSpot(TM) \u670D\u52A1\u5668\u7F16\u8BD1\u5668\u4E2D\u8FD0\u884C\u5E94\u7528\u7A0B\u5E8F\n\n\u8F6C\u53D1\u5230\u88AB\u8C03\u8BD5\u8FDB\u7A0B\u7684\u9009\u9879:\n    -v -verbose[:class|gc|jni]\n                      \u542F\u7528\u8BE6\u7EC6\u6A21\u5F0F\n    -D<name>=<value>  \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n    -classpath <\u7531 \"{1}\" \u5206\u9694\u7684\u76EE\u5F55>\n                      \u5217\u51FA\u8981\u5728\u5176\u4E2D\u67E5\u627E\u7C7B\u7684\u76EE\u5F55\n    -X<option>        \u975E\u6807\u51C6\u76EE\u6807 VM \u9009\u9879\n\n<class> \u662F\u8981\u5F00\u59CB\u8C03\u8BD5\u7684\u7C7B\u7684\u540D\u79F0\n<arguments> \u662F\u4F20\u9012\u5230 <class> \u7684 main() \u65B9\u6CD5\u7684\u53C2\u6570\n\n\u8981\u83B7\u5F97\u547D\u4EE4\u7684\u5E2E\u52A9, \u8BF7\u5728{0}\u63D0\u793A\u4E0B\u952E\u5165 ''help''"},
         // END OF MATERIAL TO LOCALIZE
--- a/jdk/src/share/classes/java/awt/Component.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/awt/Component.java	Wed May 08 11:22:25 2013 +0100
@@ -1051,11 +1051,11 @@
         return parent;
     }
 
-    // This method is overriden in the Window class to return null,
+    // This method is overridden in the Window class to return null,
     //    because the parent field of the Window object contains
     //    the owner of the window, not its parent.
     Container getContainer() {
-        return getParent();
+        return getParent_NoClientCode();
     }
 
     /**
@@ -8194,10 +8194,10 @@
      * Fetches the native container somewhere higher up in the component
      * tree that contains this component.
      */
-    Container getNativeContainer() {
-        Container p = parent;
+    final Container getNativeContainer() {
+        Container p = getContainer();
         while (p != null && p.peer instanceof LightweightPeer) {
-            p = p.getParent_NoClientCode();
+            p = p.getContainer();
         }
         return p;
     }
--- a/jdk/src/share/classes/java/awt/Window.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/awt/Window.java	Wed May 08 11:22:25 2013 +0100
@@ -3914,7 +3914,7 @@
 
     // ************************** MIXING CODE *******************************
 
-    // A window has a parent, but it does NOT have a container
+    // A window has an owner, but it does NOT have a container
     @Override
     final Container getContainer() {
         return null;
--- a/jdk/src/share/classes/java/beans/MetaData.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/beans/MetaData.java	Wed May 08 11:22:25 2013 +0100
@@ -69,8 +69,9 @@
  * @author Philip Milne
  * @author Steve Langley
  */
+class MetaData {
 
-class NullPersistenceDelegate extends PersistenceDelegate {
+static final class NullPersistenceDelegate extends PersistenceDelegate {
     // Note this will be called by all classes when they reach the
     // top of their superclass chain.
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
@@ -87,7 +88,7 @@
  *
  * @author Sergey A. Malenkov
  */
-class EnumPersistenceDelegate extends PersistenceDelegate {
+static final class EnumPersistenceDelegate extends PersistenceDelegate {
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance == newInstance;
     }
@@ -98,7 +99,7 @@
     }
 }
 
-class PrimitivePersistenceDelegate extends PersistenceDelegate {
+static final class PrimitivePersistenceDelegate extends PersistenceDelegate {
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
@@ -109,7 +110,7 @@
     }
 }
 
-class ArrayPersistenceDelegate extends PersistenceDelegate {
+static final class ArrayPersistenceDelegate extends PersistenceDelegate {
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return (newInstance != null &&
                 oldInstance.getClass() == newInstance.getClass() && // Also ensures the subtype is correct.
@@ -150,7 +151,7 @@
     }
 }
 
-class ProxyPersistenceDelegate extends PersistenceDelegate {
+static final class ProxyPersistenceDelegate extends PersistenceDelegate {
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Class<?> type = oldInstance.getClass();
         java.lang.reflect.Proxy p = (java.lang.reflect.Proxy)oldInstance;
@@ -185,7 +186,7 @@
 }
 
 // Strings
-class java_lang_String_PersistenceDelegate extends PersistenceDelegate {
+static final class java_lang_String_PersistenceDelegate extends PersistenceDelegate {
     protected Expression instantiate(Object oldInstance, Encoder out) { return null; }
 
     public void writeObject(Object oldInstance, Encoder out) {
@@ -194,7 +195,7 @@
 }
 
 // Classes
-class java_lang_Class_PersistenceDelegate extends PersistenceDelegate {
+static final class java_lang_Class_PersistenceDelegate extends PersistenceDelegate {
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
@@ -228,7 +229,7 @@
 }
 
 // Fields
-class java_lang_reflect_Field_PersistenceDelegate extends PersistenceDelegate {
+static final class java_lang_reflect_Field_PersistenceDelegate extends PersistenceDelegate {
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
@@ -243,7 +244,7 @@
 }
 
 // Methods
-class java_lang_reflect_Method_PersistenceDelegate extends PersistenceDelegate {
+static final class java_lang_reflect_Method_PersistenceDelegate extends PersistenceDelegate {
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
@@ -267,7 +268,7 @@
  *
  * @author Sergey A. Malenkov
  */
-class java_util_Date_PersistenceDelegate extends PersistenceDelegate {
+static class java_util_Date_PersistenceDelegate extends PersistenceDelegate {
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         if (!super.mutatesTo(oldInstance, newInstance)) {
             return false;
@@ -290,7 +291,7 @@
  *
  * @author Sergey A. Malenkov
  */
-final class java_sql_Timestamp_PersistenceDelegate extends java_util_Date_PersistenceDelegate {
+static final class java_sql_Timestamp_PersistenceDelegate extends java_util_Date_PersistenceDelegate {
     private static final Method getNanosMethod = getNanosMethod();
 
     private static Method getNanosMethod() {
@@ -354,7 +355,7 @@
  *
  * @author Sergey A. Malenkov
  */
-abstract class java_util_Collections extends PersistenceDelegate {
+private static abstract class java_util_Collections extends PersistenceDelegate {
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         if (!super.mutatesTo(oldInstance, newInstance)) {
             return false;
@@ -367,6 +368,10 @@
         return (oldC.size() == newC.size()) && oldC.containsAll(newC);
     }
 
+    protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
+        // do not initialize these custom collections in default way
+    }
+
     static final class EmptyList_PersistenceDelegate extends java_util_Collections {
         protected Expression instantiate(Object oldInstance, Encoder out) {
             return new Expression(oldInstance, Collections.class, "emptyList", null);
@@ -569,7 +574,7 @@
  *
  * @author Sergey A. Malenkov
  */
-class java_util_EnumMap_PersistenceDelegate extends PersistenceDelegate {
+static final class java_util_EnumMap_PersistenceDelegate extends PersistenceDelegate {
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return super.mutatesTo(oldInstance, newInstance) && (getType(oldInstance) == getType(newInstance));
     }
@@ -588,7 +593,7 @@
  *
  * @author Sergey A. Malenkov
  */
-class java_util_EnumSet_PersistenceDelegate extends PersistenceDelegate {
+static final class java_util_EnumSet_PersistenceDelegate extends PersistenceDelegate {
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return super.mutatesTo(oldInstance, newInstance) && (getType(oldInstance) == getType(newInstance));
     }
@@ -603,7 +608,7 @@
 }
 
 // Collection
-class java_util_Collection_PersistenceDelegate extends DefaultPersistenceDelegate {
+static class java_util_Collection_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         java.util.Collection<?> oldO = (java.util.Collection)oldInstance;
         java.util.Collection<?> newO = (java.util.Collection)newInstance;
@@ -618,7 +623,7 @@
 }
 
 // List
-class java_util_List_PersistenceDelegate extends DefaultPersistenceDelegate {
+static class java_util_List_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         java.util.List<?> oldO = (java.util.List<?>)oldInstance;
         java.util.List<?> newO = (java.util.List<?>)newInstance;
@@ -653,7 +658,7 @@
 
 
 // Map
-class java_util_Map_PersistenceDelegate extends DefaultPersistenceDelegate {
+static class java_util_Map_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         // System.out.println("Initializing: " + newInstance);
         java.util.Map<?,?> oldMap = (java.util.Map)oldInstance;
@@ -691,14 +696,14 @@
     }
 }
 
-class java_util_AbstractCollection_PersistenceDelegate extends java_util_Collection_PersistenceDelegate {}
-class java_util_AbstractList_PersistenceDelegate extends java_util_List_PersistenceDelegate {}
-class java_util_AbstractMap_PersistenceDelegate extends java_util_Map_PersistenceDelegate {}
-class java_util_Hashtable_PersistenceDelegate extends java_util_Map_PersistenceDelegate {}
+static final class java_util_AbstractCollection_PersistenceDelegate extends java_util_Collection_PersistenceDelegate {}
+static final class java_util_AbstractList_PersistenceDelegate extends java_util_List_PersistenceDelegate {}
+static final class java_util_AbstractMap_PersistenceDelegate extends java_util_Map_PersistenceDelegate {}
+static final class java_util_Hashtable_PersistenceDelegate extends java_util_Map_PersistenceDelegate {}
 
 
 // Beans
-class java_beans_beancontext_BeanContextSupport_PersistenceDelegate extends java_util_Collection_PersistenceDelegate {}
+static final class java_beans_beancontext_BeanContextSupport_PersistenceDelegate extends java_util_Collection_PersistenceDelegate {}
 
 // AWT
 
@@ -709,7 +714,7 @@
  *
  * @author Sergey A. Malenkov
  */
-final class java_awt_Insets_PersistenceDelegate extends PersistenceDelegate {
+static final class java_awt_Insets_PersistenceDelegate extends PersistenceDelegate {
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
@@ -733,7 +738,7 @@
  *
  * @author Sergey A. Malenkov
  */
-final class java_awt_Font_PersistenceDelegate extends PersistenceDelegate {
+static final class java_awt_Font_PersistenceDelegate extends PersistenceDelegate {
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
@@ -802,7 +807,7 @@
  *
  * @author Sergey A. Malenkov
  */
-final class java_awt_AWTKeyStroke_PersistenceDelegate extends PersistenceDelegate {
+static final class java_awt_AWTKeyStroke_PersistenceDelegate extends PersistenceDelegate {
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
@@ -843,7 +848,7 @@
     }
 }
 
-class StaticFieldsPersistenceDelegate extends PersistenceDelegate {
+static class StaticFieldsPersistenceDelegate extends PersistenceDelegate {
     protected void installFields(Encoder out, Class<?> cls) {
         Field fields[] = cls.getFields();
         for(int i = 0; i < fields.length; i++) {
@@ -870,13 +875,13 @@
 }
 
 // SystemColor
-class java_awt_SystemColor_PersistenceDelegate extends StaticFieldsPersistenceDelegate {}
+static final class java_awt_SystemColor_PersistenceDelegate extends StaticFieldsPersistenceDelegate {}
 
 // TextAttribute
-class java_awt_font_TextAttribute_PersistenceDelegate extends StaticFieldsPersistenceDelegate {}
+static final class java_awt_font_TextAttribute_PersistenceDelegate extends StaticFieldsPersistenceDelegate {}
 
 // MenuShortcut
-class java_awt_MenuShortcut_PersistenceDelegate extends PersistenceDelegate {
+static final class java_awt_MenuShortcut_PersistenceDelegate extends PersistenceDelegate {
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
@@ -889,7 +894,7 @@
 }
 
 // Component
-class java_awt_Component_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class java_awt_Component_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         java.awt.Component c = (java.awt.Component)oldInstance;
@@ -936,7 +941,7 @@
 }
 
 // Container
-class java_awt_Container_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class java_awt_Container_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         // Ignore the children of a JScrollPane.
@@ -971,7 +976,7 @@
 }
 
 // Choice
-class java_awt_Choice_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class java_awt_Choice_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         java.awt.Choice m = (java.awt.Choice)oldInstance;
@@ -983,7 +988,7 @@
 }
 
 // Menu
-class java_awt_Menu_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class java_awt_Menu_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         java.awt.Menu m = (java.awt.Menu)oldInstance;
@@ -995,7 +1000,7 @@
 }
 
 // MenuBar
-class java_awt_MenuBar_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class java_awt_MenuBar_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         java.awt.MenuBar m = (java.awt.MenuBar)oldInstance;
@@ -1007,7 +1012,7 @@
 }
 
 // List
-class java_awt_List_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class java_awt_List_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         java.awt.List m = (java.awt.List)oldInstance;
@@ -1022,7 +1027,7 @@
 // LayoutManagers
 
 // BorderLayout
-class java_awt_BorderLayout_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class java_awt_BorderLayout_PersistenceDelegate extends DefaultPersistenceDelegate {
     private static final String[] CONSTRAINTS = {
             BorderLayout.NORTH,
             BorderLayout.SOUTH,
@@ -1053,41 +1058,44 @@
 }
 
 // CardLayout
-class java_awt_CardLayout_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class java_awt_CardLayout_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance,
                               Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
-        Hashtable<?,?> tab = (Hashtable<?,?>)ReflectionUtils.getPrivateField(oldInstance,
-                                                                   java.awt.CardLayout.class,
-                                                                   "tab",
-                                                                   out.getExceptionListener());
-        if (tab != null) {
-            for(Enumeration<?> e = tab.keys(); e.hasMoreElements();) {
-                Object child = e.nextElement();
-                invokeStatement(oldInstance, "addLayoutComponent",
-                                new Object[]{child, (String)tab.get(child)}, out);
+        if (getVector(newInstance).isEmpty()) {
+            for (Object card : getVector(oldInstance)) {
+                Object[] args = {MetaData.getPrivateFieldValue(card, "java.awt.CardLayout$Card.name"),
+                                 MetaData.getPrivateFieldValue(card, "java.awt.CardLayout$Card.comp")};
+                invokeStatement(oldInstance, "addLayoutComponent", args, out);
             }
         }
     }
+    protected boolean mutatesTo(Object oldInstance, Object newInstance) {
+        return super.mutatesTo(oldInstance, newInstance) && getVector(newInstance).isEmpty();
+    }
+    private static Vector<?> getVector(Object instance) {
+        return (Vector<?>) MetaData.getPrivateFieldValue(instance, "java.awt.CardLayout.vector");
+    }
 }
 
 // GridBagLayout
-class java_awt_GridBagLayout_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class java_awt_GridBagLayout_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance,
                               Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
-        Hashtable<?,?> comptable = (Hashtable<?,?>)ReflectionUtils.getPrivateField(oldInstance,
-                                                 java.awt.GridBagLayout.class,
-                                                 "comptable",
-                                                 out.getExceptionListener());
-        if (comptable != null) {
-            for(Enumeration<?> e = comptable.keys(); e.hasMoreElements();) {
-                Object child = e.nextElement();
-                invokeStatement(oldInstance, "addLayoutComponent",
-                                new Object[]{child, comptable.get(child)}, out);
+        if (getHashtable(newInstance).isEmpty()) {
+            for (Map.Entry<?,?> entry : getHashtable(oldInstance).entrySet()) {
+                Object[] args = {entry.getKey(), entry.getValue()};
+                invokeStatement(oldInstance, "addLayoutComponent", args, out);
             }
         }
     }
+    protected boolean mutatesTo(Object oldInstance, Object newInstance) {
+        return super.mutatesTo(oldInstance, newInstance) && getHashtable(newInstance).isEmpty();
+    }
+    private static Hashtable<?,?> getHashtable(Object instance) {
+        return (Hashtable<?,?>) MetaData.getPrivateFieldValue(instance, "java.awt.GridBagLayout.comptable");
+    }
 }
 
 // Swing
@@ -1095,7 +1103,7 @@
 // JFrame (If we do this for Window instead of JFrame, the setVisible call
 // will be issued before we have added all the children to the JFrame and
 // will appear blank).
-class javax_swing_JFrame_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class javax_swing_JFrame_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         java.awt.Window oldC = (java.awt.Window)oldInstance;
@@ -1115,7 +1123,7 @@
 // Models
 
 // DefaultListModel
-class javax_swing_DefaultListModel_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class javax_swing_DefaultListModel_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         // Note, the "size" property will be set here.
         super.initialize(type, oldInstance, newInstance, out);
@@ -1129,7 +1137,7 @@
 }
 
 // DefaultComboBoxModel
-class javax_swing_DefaultComboBoxModel_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class javax_swing_DefaultComboBoxModel_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         javax.swing.DefaultComboBoxModel<?> m = (javax.swing.DefaultComboBoxModel<?>)oldInstance;
@@ -1141,7 +1149,7 @@
 
 
 // DefaultMutableTreeNode
-class javax_swing_tree_DefaultMutableTreeNode_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class javax_swing_tree_DefaultMutableTreeNode_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance, Object
                               newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
@@ -1157,7 +1165,7 @@
 }
 
 // ToolTipManager
-class javax_swing_ToolTipManager_PersistenceDelegate extends PersistenceDelegate {
+static final class javax_swing_ToolTipManager_PersistenceDelegate extends PersistenceDelegate {
     protected Expression instantiate(Object oldInstance, Encoder out) {
         return new Expression(oldInstance, javax.swing.ToolTipManager.class,
                               "sharedInstance", new Object[]{});
@@ -1165,7 +1173,7 @@
 }
 
 // JTabbedPane
-class javax_swing_JTabbedPane_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class javax_swing_JTabbedPane_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         javax.swing.JTabbedPane p = (javax.swing.JTabbedPane)oldInstance;
@@ -1180,7 +1188,7 @@
 }
 
 // Box
-class javax_swing_Box_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class javax_swing_Box_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return super.mutatesTo(oldInstance, newInstance) && getAxis(oldInstance).equals(getAxis(newInstance));
     }
@@ -1201,7 +1209,7 @@
 // Container will return all of the sub menu items that
 // need to be added to the menu item.
 // Not so for JMenu apparently.
-class javax_swing_JMenu_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class javax_swing_JMenu_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         javax.swing.JMenu m = (javax.swing.JMenu)oldInstance;
@@ -1219,7 +1227,7 @@
  *
  * @author Sergey A. Malenkov
  */
-final class javax_swing_border_MatteBorder_PersistenceDelegate extends PersistenceDelegate {
+static final class javax_swing_border_MatteBorder_PersistenceDelegate extends PersistenceDelegate {
     protected Expression instantiate(Object oldInstance, Encoder out) {
         MatteBorder border = (MatteBorder) oldInstance;
         Insets insets = border.getBorderInsets();
@@ -1239,7 +1247,7 @@
 }
 
 /* XXX - doens't seem to work. Debug later.
-class javax_swing_JMenu_PersistenceDelegate extends DefaultPersistenceDelegate {
+static final class javax_swing_JMenu_PersistenceDelegate extends DefaultPersistenceDelegate {
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         javax.swing.JMenu m = (javax.swing.JMenu)oldInstance;
@@ -1261,7 +1269,7 @@
  *
  * @author Sergey A. Malenkov
  */
-final class sun_swing_PrintColorUIResource_PersistenceDelegate extends PersistenceDelegate {
+static final class sun_swing_PrintColorUIResource_PersistenceDelegate extends PersistenceDelegate {
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
@@ -1273,7 +1281,6 @@
     }
 }
 
-class MetaData {
     private static final Map<String,Field> fields = Collections.synchronizedMap(new WeakHashMap<String, Field>());
     private static Hashtable<String, PersistenceDelegate> internalPersistenceDelegates = new Hashtable<>();
 
@@ -1316,7 +1323,7 @@
         if (Enum.class.isAssignableFrom(type)) {
             return enumPersistenceDelegate;
         }
-        if (ReflectionUtils.isPrimitive(type)) {
+        if (null != XMLEncoder.primitiveTypeFor(type)) {
             return primitivePersistenceDelegate;
         }
         // The persistence delegate for arrays is non-trivial; instantiate it lazily.
@@ -1350,7 +1357,7 @@
             internalPersistenceDelegates.put(typeName, defaultPersistenceDelegate);
             try {
                 String name =  type.getName();
-                Class c = Class.forName("java.beans." + name.replace('.', '_')
+                Class c = Class.forName("java.beans.MetaData$" + name.replace('.', '_')
                                         + "_PersistenceDelegate");
                 pd = (PersistenceDelegate)c.newInstance();
                 internalPersistenceDelegates.put(typeName, pd);
--- a/jdk/src/share/classes/java/beans/ReflectionUtils.java	Wed May 01 12:25:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.beans;
-
-import java.lang.reflect.Field;
-
-/**
- * A utility class for reflectively finding methods, constuctors and fields
- * using reflection.
- */
-class ReflectionUtils {
-
-    @SuppressWarnings("rawtypes")
-    public static boolean isPrimitive(Class type) {
-        return primitiveTypeFor(type) != null;
-    }
-
-    @SuppressWarnings("rawtypes")
-    public static Class primitiveTypeFor(Class wrapper) {
-        if (wrapper == Boolean.class) return Boolean.TYPE;
-        if (wrapper == Byte.class) return Byte.TYPE;
-        if (wrapper == Character.class) return Character.TYPE;
-        if (wrapper == Short.class) return Short.TYPE;
-        if (wrapper == Integer.class) return Integer.TYPE;
-        if (wrapper == Long.class) return Long.TYPE;
-        if (wrapper == Float.class) return Float.TYPE;
-        if (wrapper == Double.class) return Double.TYPE;
-        if (wrapper == Void.class) return Void.TYPE;
-        return null;
-    }
-
-    /**
-     * Returns the value of a private field.
-     *
-     * @param instance object instance
-     * @param cls class
-     * @param name name of the field
-     * @param el an exception listener to handle exceptions; or null
-     * @return value of the field; null if not found or an error is encountered
-     */
-    @SuppressWarnings("rawtypes")
-    public static Object getPrivateField(Object instance, Class cls,
-                                         String name, ExceptionListener el) {
-        try {
-            Field f = cls.getDeclaredField(name);
-            f.setAccessible(true);
-            return f.get(instance);
-        }
-        catch (Exception e) {
-            if (el != null) {
-                el.exceptionThrown(e);
-            }
-        }
-        return null;
-    }
-}
--- a/jdk/src/share/classes/java/beans/XMLEncoder.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/beans/XMLEncoder.java	Wed May 08 11:22:25 2013 +0100
@@ -604,7 +604,7 @@
                 return;
             }
 
-            Class<?> primitiveType = ReflectionUtils.primitiveTypeFor(value.getClass());
+            Class<?> primitiveType = primitiveTypeFor(value.getClass());
             if (primitiveType != null && target == value.getClass() &&
                 methodName.equals("new")) {
                 String primitiveTypeName = primitiveType.getName();
@@ -778,4 +778,18 @@
         indentation--;
         writeln("</" + tag + ">");
     }
+
+    @SuppressWarnings("rawtypes")
+    static Class primitiveTypeFor(Class wrapper) {
+        if (wrapper == Boolean.class) return Boolean.TYPE;
+        if (wrapper == Byte.class) return Byte.TYPE;
+        if (wrapper == Character.class) return Character.TYPE;
+        if (wrapper == Short.class) return Short.TYPE;
+        if (wrapper == Integer.class) return Integer.TYPE;
+        if (wrapper == Long.class) return Long.TYPE;
+        if (wrapper == Float.class) return Float.TYPE;
+        if (wrapper == Double.class) return Double.TYPE;
+        if (wrapper == Void.class) return Void.TYPE;
+        return null;
+    }
 }
--- a/jdk/src/share/classes/java/lang/CharSequence.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/lang/CharSequence.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,13 @@
 
 package java.lang;
 
+import java.util.NoSuchElementException;
+import java.util.PrimitiveIterator;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.function.IntConsumer;
+import java.util.stream.IntStream;
+import java.util.stream.StreamSupport;
 
 /**
  * A <tt>CharSequence</tt> is a readable sequence of <code>char</code> values. This
@@ -108,4 +115,95 @@
      */
     public String toString();
 
+    /**
+     * Returns a stream of {@code int} zero-extending the {@code char} values
+     * from this sequence.  Any char which maps to a <a
+     * href="{@docRoot}/java/lang/Character.html#unicode">surrogate code
+     * point</a> is passed through uninterpreted.
+     *
+     * <p>If the sequence is mutated while the stream is being read, the
+     * result is undefined.
+     *
+     * @return an IntStream of char values from this sequence
+     * @since 1.8
+     */
+    public default IntStream chars() {
+        class CharIterator implements PrimitiveIterator.OfInt {
+            int cur = 0;
+
+            public boolean hasNext() {
+                return cur < length();
+            }
+
+            public int nextInt() {
+                if (hasNext()) {
+                    return charAt(cur++);
+                } else {
+                    throw new NoSuchElementException();
+                }
+            }
+
+            @Override
+            public void forEachRemaining(IntConsumer block) {
+                for (; cur < length(); cur++) {
+                    block.accept(charAt(cur));
+                }
+            }
+        }
+
+        return StreamSupport.intStream(() ->
+                Spliterators.spliterator(
+                        new CharIterator(),
+                        length(),
+                        Spliterator.ORDERED),
+                Spliterator.SUBSIZED | Spliterator.SIZED | Spliterator.ORDERED);
+    }
+
+    /**
+     * Returns a stream of code point values from this sequence.  Any surrogate
+     * pairs encountered in the sequence are combined as if by {@linkplain
+     * Character#toCodePoint Character.toCodePoint} and the result is passed
+     * to the stream. Any other code units, including ordinary BMP characters,
+     * unpaired surrogates, and undefined code units, are zero-extended to
+     * {@code int} values which are then passed to the stream.
+     *
+     * <p>If the sequence is mutated while the stream is being read, the result
+     * is undefined.
+     *
+     * @return an IntStream of Unicode code points from this sequence
+     * @since 1.8
+     */
+    public default IntStream codePoints() {
+        class CodePointIterator implements PrimitiveIterator.OfInt {
+            int cur = 0;
+
+            @Override
+            public void forEachRemaining(IntConsumer block) {
+                while (cur < length()) {
+                    int cp = Character.codePointAt(CharSequence.this, cur);
+                    cur += Character.charCount(cp);
+                    block.accept(cp);
+                }
+            }
+
+            public boolean hasNext() {
+                return cur < length();
+            }
+
+            public int nextInt() {
+                if (!hasNext()) {
+                    throw new NoSuchElementException();
+                }
+                int cp = Character.codePointAt(CharSequence.this, cur);
+                cur += Character.charCount(cp);
+                return cp;
+            }
+        }
+
+        return StreamSupport.intStream(() ->
+                Spliterators.spliteratorUnknownSize(
+                        new CodePointIterator(),
+                        Spliterator.ORDERED),
+                Spliterator.SUBSIZED | Spliterator.SIZED | Spliterator.ORDERED);
+    }
 }
--- a/jdk/src/share/classes/java/lang/String.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/lang/String.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@
 import java.util.Formatter;
 import java.util.Locale;
 import java.util.Objects;
+import java.util.StringJoiner;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -131,7 +132,7 @@
      * string instance within the stream.
      */
     private static final ObjectStreamField[] serialPersistentFields =
-            new ObjectStreamField[0];
+        new ObjectStreamField[0];
 
     /**
      * Initializes a newly created {@code String} object so that it represents
@@ -970,7 +971,7 @@
             return true;
         }
         if (anObject instanceof String) {
-            String anotherString = (String) anObject;
+            String anotherString = (String)anObject;
             int n = value.length;
             if (n == anotherString.value.length) {
                 char v1[] = value;
@@ -978,7 +979,7 @@
                 int i = 0;
                 while (n-- != 0) {
                     if (v1[i] != v2[i])
-                            return false;
+                        return false;
                     i++;
                 }
                 return true;
@@ -1003,7 +1004,7 @@
      * @since  1.4
      */
     public boolean contentEquals(StringBuffer sb) {
-        return contentEquals((CharSequence) sb);
+        return contentEquals((CharSequence)sb);
     }
 
     private boolean nonSyncContentEquals(AbstractStringBuilder sb) {
@@ -1248,7 +1249,8 @@
      * argument.
      * <li>There is some nonnegative integer <i>k</i> less than {@code len}
      * such that:
-     * <code>this.charAt(toffset+<i>k</i>)&nbsp;!=&nbsp;other.charAt(ooffset+<i>k</i>)</code>
+     * {@code this.charAt(toffset + }<i>k</i>{@code ) != other.charAt(ooffset + }
+     * <i>k</i>{@code )}
      * </ul>
      *
      * @param   toffset   the starting offset of the subregion in this string.
@@ -1872,7 +1874,7 @@
         int min = sourceOffset + targetCount - 1;
         int i = min + fromIndex;
 
-        startSearchForLastChar:
+    startSearchForLastChar:
         while (true) {
             while (i >= min && source[i] != strLastChar) {
                 i--;
@@ -1973,7 +1975,7 @@
      * str.substring(begin,&nbsp;end)</pre></blockquote>
      *
      * This method is defined so that the {@code String} class can implement
-     * the {@link CharSequence} interface. </p>
+     * the {@link CharSequence} interface.
      *
      * @param   beginIndex   the begin index, inclusive.
      * @param   endIndex     the end index, exclusive.
@@ -2352,9 +2354,11 @@
 
             // Construct result
             int resultSize = list.size();
-            if (limit == 0)
-                while (resultSize > 0 && list.get(resultSize - 1).length() == 0)
+            if (limit == 0) {
+                while (resultSize > 0 && list.get(resultSize - 1).length() == 0) {
                     resultSize--;
+                }
+            }
             String[] result = new String[resultSize];
             return list.subList(0, resultSize).toArray(result);
         }
@@ -2404,6 +2408,90 @@
     }
 
     /**
+     * Returns a new String composed of copies of the
+     * {@code CharSequence elements} joined together with a copy of
+     * the specified {@code delimiter}.
+     *
+     * <blockquote>For example,
+     * <pre>{@code
+     *     String message = String.join("-", "Java", "is", "cool");
+     *     // message returned is: "Java-is-cool"
+     * }</pre></blockquote>
+     *
+     * Note that if an element is null, then {@code "null"} is added.
+     *
+     * @param  delimiter the delimiter that separates each element
+     * @param  elements the elements to join together.
+     *
+     * @return a new {@code String} that is composed of the {@code elements}
+     *         separated by the {@code delimiter}
+     *
+     * @throws NullPointerException If {@code delimiter} or {@code elements}
+     *         is {@code null}
+     *
+     * @see java.util.StringJoiner
+     * @since 1.8
+     */
+    public static String join(CharSequence delimiter, CharSequence... elements) {
+        Objects.requireNonNull(delimiter);
+        Objects.requireNonNull(elements);
+        // Number of elements not likely worth Arrays.stream overhead.
+        StringJoiner joiner = new StringJoiner(delimiter);
+        for (CharSequence cs: elements) {
+            joiner.add(cs);
+        }
+        return joiner.toString();
+    }
+
+    /**
+     * Returns a new {@code String} composed of copies of the
+     * {@code CharSequence elements} joined together with a copy of the
+     * specified {@code delimiter}.
+     *
+     * <blockquote>For example,
+     * <pre>{@code
+     *     List<String> strings = new LinkedList<>();
+     *     strings.add("Java");strings.add("is");
+     *     strings.add("cool");
+     *     String message = String.join(" ", strings);
+     *     //message returned is: "Java is cool"
+     *
+     *     Set<String> strings = new HashSet<>();
+     *     Strings.add("Java"); strings.add("is");
+     *     strings.add("very"); strings.add("cool");
+     *     String message = String.join("-", strings);
+     *     //message returned is: "Java-is-very-cool"
+     * }</pre></blockquote>
+     *
+     * Note that if an individual element is {@code null}, then {@code "null"} is added.
+     *
+     * @param  delimiter a sequence of characters that is used to separate each
+     *         of the {@code elements} in the resulting {@code String}
+     * @param  elements an {@code Iterable} that will have its {@code elements}
+     *         joined together.
+     *
+     * @return a new {@code String} that is composed from the {@code elements}
+     *         argument
+     *
+     * @throws NullPointerException If {@code delimiter} or {@code elements}
+     *         is {@code null}
+     *
+     * @see    #join(CharSequence,CharSequence...)
+     * @see    java.util.StringJoiner
+     * @since 1.8
+     */
+    public static String join(CharSequence delimiter,
+            Iterable<? extends CharSequence> elements) {
+        Objects.requireNonNull(delimiter);
+        Objects.requireNonNull(elements);
+        StringJoiner joiner = new StringJoiner(delimiter);
+        for (CharSequence cs: elements) {
+            joiner.add(cs);
+        }
+        return joiner.toString();
+    }
+
+    /**
      * Converts all of the characters in this {@code String} to lower
      * case using the rules of the given {@code Locale}.  Case mapping is based
      * on the Unicode Standard version specified by the {@link java.lang.Character Character}
@@ -2650,9 +2738,9 @@
             return this;
         }
 
+        /* result may grow, so i+resultOffset is the write location in result */
+        int resultOffset = 0;
         char[] result = new char[len]; /* may grow */
-        int resultOffset = 0;  /* result may grow, so i+resultOffset
-         * is the write location in result */
 
         /* Just copy the first few upperCase characters. */
         System.arraycopy(value, 0, result, 0, firstLower);
@@ -2757,7 +2845,7 @@
      * object is created, representing the substring of this string that
      * begins with the character at index <i>k</i> and ends with the
      * character at index <i>m</i>-that is, the result of
-     * <code>this.substring(<i>k</i>,&nbsp;<i>m</i>+1)</code>.
+     * {@code this.substring(k, m + 1)}.
      * <p>
      * This method may be used to trim whitespace (as defined above) from
      * the beginning and end of a string.
@@ -3143,8 +3231,8 @@
     *     programmer should be aware that producing distinct integer results
     *     for unequal objects may improve the performance of hash tables.
     * </ul>
-    * </p>
-     * The hash value will never be zero.
+    *
+    * The hash value will never be zero.
     *
     * @return  a hash code value for this object.
     * @see     java.lang.Object#equals(java.lang.Object)
--- a/jdk/src/share/classes/java/lang/Throwable.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/lang/Throwable.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -453,9 +453,10 @@
      */
     public synchronized Throwable initCause(Throwable cause) {
         if (this.cause != this)
-            throw new IllegalStateException("Can't overwrite cause");
+            throw new IllegalStateException("Can't overwrite cause with " +
+                                            Objects.toString(cause, "a null"), this);
         if (cause == this)
-            throw new IllegalArgumentException("Self-causation not permitted");
+            throw new IllegalArgumentException("Self-causation not permitted", this);
         this.cause = cause;
         return this;
     }
@@ -1039,7 +1040,7 @@
      */
     public final synchronized void addSuppressed(Throwable exception) {
         if (exception == this)
-            throw new IllegalArgumentException(SELF_SUPPRESSION_MESSAGE);
+            throw new IllegalArgumentException(SELF_SUPPRESSION_MESSAGE, exception);
 
         if (exception == null)
             throw new NullPointerException(NULL_CAUSE_MESSAGE);
--- a/jdk/src/share/classes/java/lang/reflect/Executable.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/lang/reflect/Executable.java	Wed May 08 11:22:25 2013 +0100
@@ -237,8 +237,8 @@
     public abstract Class<?>[] getParameterTypes();
 
     /**
-     * Returns the number of formal parameters (including any
-     * synthetic or synthesized parameters) for the executable
+     * Returns the number of formal parameters (whether explicitly
+     * declared or implicitly declared or neither) for the executable
      * represented by this object.
      *
      * @return The number of formal parameters for the executable this
--- a/jdk/src/share/classes/java/lang/reflect/Parameter.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/lang/reflect/Parameter.java	Wed May 08 11:22:25 2013 +0100
@@ -148,19 +148,15 @@
     }
 
     /**
-     * Returns the name of the parameter.  The names of the parameters
-     * of a single executable must all the be distinct.  When names
-     * from the originating source are available, they are returned.
-     * Otherwise, an implementation of this method is free to create a
-     * name of this parameter, subject to the unquiness requirments.
+     * Returns the name of the parameter.  If the parameter's name is
+     * defined in a class file, then that name will be returned by
+     * this method.  Otherwise, this method will synthesize a name of
+     * the form argN, where N is the index of the parameter.
      */
     public String getName() {
-        // As per the spec, if a parameter has no name, return argX,
-        // where x is the index.
-        //
-        // Note: spec updates now outlaw empty strings as parameter
-        // names.  The .equals("") is for compatibility with current
-        // JVM behavior.  It may be removed at some point.
+        // Note: empty strings as paramete names are now outlawed.
+        // The .equals("") is for compatibility with current JVM
+        // behavior.  It may be removed at some point.
         if(name == null || name.equals(""))
             return "arg" + index;
         else
@@ -311,6 +307,6 @@
                 declaredAnnotations.put(ann[i].annotationType(), ann[i]);
         }
         return declaredAnnotations;
-    }
+   }
 
 }
--- a/jdk/src/share/classes/java/lang/reflect/Proxy.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/lang/reflect/Proxy.java	Wed May 08 11:22:25 2013 +0100
@@ -25,18 +25,14 @@
 
 package java.lang.reflect;
 
-import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.Map;
-import java.util.Set;
-import java.util.List;
-import java.util.WeakHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.BiFunction;
 import sun.misc.ProxyGenerator;
 import sun.misc.VM;
 import sun.reflect.CallerSensitive;
@@ -232,27 +228,15 @@
 
     private static final long serialVersionUID = -2222568056686623797L;
 
-    /** prefix for all proxy class names */
-    private final static String proxyClassNamePrefix = "$Proxy";
-
     /** parameter types of a proxy class constructor */
-    private final static Class[] constructorParams =
+    private static final Class<?>[] constructorParams =
         { InvocationHandler.class };
 
-    /** maps a class loader to the proxy class cache for that loader */
-    private static Map<ClassLoader, Map<List<String>, Object>> loaderToCache
-        = new WeakHashMap<>();
-
-    /** marks that a particular proxy class is currently being generated */
-    private static Object pendingGenerationMarker = new Object();
-
-    /** next number to use for generation of unique proxy class names */
-    private static long nextUniqueNumber = 0;
-    private static Object nextUniqueNumberLock = new Object();
-
-    /** set of all generated proxy classes, for isProxyClass implementation */
-    private static Map<Class<?>, Void> proxyClasses =
-        Collections.synchronizedMap(new WeakHashMap<Class<?>, Void>());
+    /**
+     * a cache of proxy classes
+     */
+    private static final WeakCache<ClassLoader, Class<?>[], Class<?>>
+        proxyClassCache = new WeakCache<>(new KeyFactory(), new ProxyClassFactory());
 
     /**
      * the invocation handler for this proxy instance.
@@ -423,131 +407,190 @@
             throw new IllegalArgumentException("interface limit exceeded");
         }
 
-        Class<?> proxyClass = null;
+        // If the proxy class defined by the given loader implementing
+        // the given interfaces exists, this will simply return the cached copy;
+        // otherwise, it will create the proxy class via the ProxyClassFactory
+        return proxyClassCache.get(loader, interfaces);
+    }
+
+    /*
+     * a key used for proxy class with 0 implemented interfaces
+     */
+    private static final Object key0 = new Object();
+
+    /*
+     * Key1 and Key2 are optimized for the common use of dynamic proxies
+     * that implement 1 or 2 interfaces.
+     */
 
-        /* collect interface names to use as key for proxy class cache */
-        String[] interfaceNames = new String[interfaces.length];
+    /*
+     * a key used for proxy class with 1 implemented interface
+     */
+    private static final class Key1 extends WeakReference<Class<?>> {
+        private final int hash;
+
+        Key1(Class<?> intf) {
+            super(intf);
+            this.hash = intf.hashCode();
+        }
 
-        // for detecting duplicates
-        Set<Class<?>> interfaceSet = new HashSet<>();
+        @Override
+        public int hashCode() {
+            return hash;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            Class<?> intf;
+            return this == obj ||
+                   obj != null &&
+                   obj.getClass() == Key1.class &&
+                   (intf = get()) != null &&
+                   intf == ((Key1) obj).get();
+        }
+    }
 
-        for (int i = 0; i < interfaces.length; i++) {
-            /*
-             * Verify that the class loader resolves the name of this
-             * interface to the same Class object.
-             */
-            String interfaceName = interfaces[i].getName();
-            Class<?> interfaceClass = null;
-            try {
-                interfaceClass = Class.forName(interfaceName, false, loader);
-            } catch (ClassNotFoundException e) {
+    /*
+     * a key used for proxy class with 2 implemented interfaces
+     */
+    private static final class Key2 extends WeakReference<Class<?>> {
+        private final int hash;
+        private final WeakReference<Class<?>> ref2;
+
+        Key2(Class<?> intf1, Class<?> intf2) {
+            super(intf1);
+            hash = 31 * intf1.hashCode() + intf2.hashCode();
+            ref2 = new WeakReference<Class<?>>(intf2);
+        }
+
+        @Override
+        public int hashCode() {
+            return hash;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            Class<?> intf1, intf2;
+            return this == obj ||
+                   obj != null &&
+                   obj.getClass() == Key2.class &&
+                   (intf1 = get()) != null &&
+                   intf1 == ((Key2) obj).get() &&
+                   (intf2 = ref2.get()) != null &&
+                   intf2 == ((Key2) obj).ref2.get();
+        }
+    }
+
+    /*
+     * a key used for proxy class with any number of implemented interfaces
+     * (used here for 3 or more only)
+     */
+    private static final class KeyX {
+        private final int hash;
+        private final WeakReference<Class<?>>[] refs;
+
+        KeyX(Class<?>[] interfaces) {
+            hash = Arrays.hashCode(interfaces);
+            refs = new WeakReference[interfaces.length];
+            for (int i = 0; i < interfaces.length; i++) {
+                refs[i] = new WeakReference<>(interfaces[i]);
             }
-            if (interfaceClass != interfaces[i]) {
-                throw new IllegalArgumentException(
-                    interfaces[i] + " is not visible from class loader");
-            }
-
-            /*
-             * Verify that the Class object actually represents an
-             * interface.
-             */
-            if (!interfaceClass.isInterface()) {
-                throw new IllegalArgumentException(
-                    interfaceClass.getName() + " is not an interface");
-            }
-
-            /*
-             * Verify that this interface is not a duplicate.
-             */
-            if (interfaceSet.contains(interfaceClass)) {
-                throw new IllegalArgumentException(
-                    "repeated interface: " + interfaceClass.getName());
-            }
-            interfaceSet.add(interfaceClass);
-
-            interfaceNames[i] = interfaceName;
         }
 
-        /*
-         * Using string representations of the proxy interfaces as
-         * keys in the proxy class cache (instead of their Class
-         * objects) is sufficient because we require the proxy
-         * interfaces to be resolvable by name through the supplied
-         * class loader, and it has the advantage that using a string
-         * representation of a class makes for an implicit weak
-         * reference to the class.
-         */
-        List<String> key = Arrays.asList(interfaceNames);
+        @Override
+        public int hashCode() {
+            return hash;
+        }
 
-        /*
-         * Find or create the proxy class cache for the class loader.
-         */
-        Map<List<String>, Object> cache;
-        synchronized (loaderToCache) {
-            cache = loaderToCache.get(loader);
-            if (cache == null) {
-                cache = new HashMap<>();
-                loaderToCache.put(loader, cache);
-            }
-            /*
-             * This mapping will remain valid for the duration of this
-             * method, without further synchronization, because the mapping
-             * will only be removed if the class loader becomes unreachable.
-             */
+        @Override
+        public boolean equals(Object obj) {
+            return this == obj ||
+                   obj != null &&
+                   obj.getClass() == KeyX.class &&
+                   equals(refs, ((KeyX) obj).refs);
         }
 
-        /*
-         * Look up the list of interfaces in the proxy class cache using
-         * the key.  This lookup will result in one of three possible
-         * kinds of values:
-         *     null, if there is currently no proxy class for the list of
-         *         interfaces in the class loader,
-         *     the pendingGenerationMarker object, if a proxy class for the
-         *         list of interfaces is currently being generated,
-         *     or a weak reference to a Class object, if a proxy class for
-         *         the list of interfaces has already been generated.
-         */
-        synchronized (cache) {
-            /*
-             * Note that we need not worry about reaping the cache for
-             * entries with cleared weak references because if a proxy class
-             * has been garbage collected, its class loader will have been
-             * garbage collected as well, so the entire cache will be reaped
-             * from the loaderToCache map.
-             */
-            do {
-                Object value = cache.get(key);
-                if (value instanceof Reference) {
-                    proxyClass = (Class<?>) ((Reference) value).get();
+        private static boolean equals(WeakReference<Class<?>>[] refs1,
+                                      WeakReference<Class<?>>[] refs2) {
+            if (refs1.length != refs2.length) {
+                return false;
+            }
+            for (int i = 0; i < refs1.length; i++) {
+                Class<?> intf = refs1[i].get();
+                if (intf == null || intf != refs2[i].get()) {
+                    return false;
                 }
-                if (proxyClass != null) {
-                    // proxy class already generated: return it
-                    return proxyClass;
-                } else if (value == pendingGenerationMarker) {
-                    // proxy class being generated: wait for it
-                    try {
-                        cache.wait();
-                    } catch (InterruptedException e) {
-                        /*
-                         * The class generation that we are waiting for should
-                         * take a small, bounded time, so we can safely ignore
-                         * thread interrupts here.
-                         */
-                    }
-                    continue;
-                } else {
-                    /*
-                     * No proxy class for this list of interfaces has been
-                     * generated or is being generated, so we will go and
-                     * generate it now.  Mark it as pending generation.
-                     */
-                    cache.put(key, pendingGenerationMarker);
-                    break;
+            }
+            return true;
+        }
+    }
+
+    /**
+     * A function that maps an array of interfaces to an optimal key where
+     * Class objects representing interfaces are weakly referenced.
+     */
+    private static final class KeyFactory
+        implements BiFunction<ClassLoader, Class<?>[], Object>
+    {
+        @Override
+        public Object apply(ClassLoader classLoader, Class<?>[] interfaces) {
+            switch (interfaces.length) {
+                case 1: return new Key1(interfaces[0]); // the most frequent
+                case 2: return new Key2(interfaces[0], interfaces[1]);
+                case 0: return key0;
+                default: return new KeyX(interfaces);
+            }
+        }
+    }
+
+    /**
+     * A factory function that generates, defines and returns the proxy class given
+     * the ClassLoader and array of interfaces.
+     */
+    private static final class ProxyClassFactory
+        implements BiFunction<ClassLoader, Class<?>[], Class<?>>
+    {
+        // prefix for all proxy class names
+        private static final String proxyClassNamePrefix = "$Proxy";
+
+        // next number to use for generation of unique proxy class names
+        private static final AtomicLong nextUniqueNumber = new AtomicLong();
+
+        @Override
+        public Class<?> apply(ClassLoader loader, Class<?>[] interfaces) {
+
+            Map<Class<?>, Boolean> interfaceSet = new IdentityHashMap<>(interfaces.length);
+            for (Class<?> intf : interfaces) {
+                /*
+                 * Verify that the class loader resolves the name of this
+                 * interface to the same Class object.
+                 */
+                Class<?> interfaceClass = null;
+                try {
+                    interfaceClass = Class.forName(intf.getName(), false, loader);
+                } catch (ClassNotFoundException e) {
                 }
-            } while (true);
-        }
+                if (interfaceClass != intf) {
+                    throw new IllegalArgumentException(
+                        intf + " is not visible from class loader");
+                }
+                /*
+                 * Verify that the Class object actually represents an
+                 * interface.
+                 */
+                if (!interfaceClass.isInterface()) {
+                    throw new IllegalArgumentException(
+                        interfaceClass.getName() + " is not an interface");
+                }
+                /*
+                 * Verify that this interface is not a duplicate.
+                 */
+                if (interfaceSet.put(interfaceClass, Boolean.TRUE) != null) {
+                    throw new IllegalArgumentException(
+                        "repeated interface: " + interfaceClass.getName());
+                }
+            }
 
-        try {
             String proxyPkg = null;     // package to define proxy class in
             int accessFlags = Modifier.PUBLIC | Modifier.FINAL;
 
@@ -556,11 +599,11 @@
              * proxy class will be defined in the same package.  Verify that
              * all non-public proxy interfaces are in the same package.
              */
-            for (int i = 0; i < interfaces.length; i++) {
-                int flags = interfaces[i].getModifiers();
+            for (Class<?> intf : interfaces) {
+                int flags = intf.getModifiers();
                 if (!Modifier.isPublic(flags)) {
                     accessFlags = Modifier.FINAL;
-                    String name = interfaces[i].getName();
+                    String name = intf.getName();
                     int n = name.lastIndexOf('.');
                     String pkg = ((n == -1) ? "" : name.substring(0, n + 1));
                     if (proxyPkg == null) {
@@ -577,60 +620,31 @@
                 proxyPkg = ReflectUtil.PROXY_PACKAGE + ".";
             }
 
-            {
+            /*
+             * Choose a name for the proxy class to generate.
+             */
+            long num = nextUniqueNumber.getAndIncrement();
+            String proxyName = proxyPkg + proxyClassNamePrefix + num;
+
+            /*
+             * Generate the specified proxy class.
+             */
+            byte[] proxyClassFile = ProxyGenerator.generateProxyClass(
+                proxyName, interfaces, accessFlags);
+            try {
+                return defineClass0(loader, proxyName,
+                                    proxyClassFile, 0, proxyClassFile.length);
+            } catch (ClassFormatError e) {
                 /*
-                 * Choose a name for the proxy class to generate.
-                 */
-                long num;
-                synchronized (nextUniqueNumberLock) {
-                    num = nextUniqueNumber++;
-                }
-                String proxyName = proxyPkg + proxyClassNamePrefix + num;
-                /*
-                 * Verify that the class loader hasn't already
-                 * defined a class with the chosen name.
-                 */
-
-                /*
-                 * Generate the specified proxy class.
+                 * A ClassFormatError here means that (barring bugs in the
+                 * proxy class generation code) there was some other
+                 * invalid aspect of the arguments supplied to the proxy
+                 * class creation (such as virtual machine limitations
+                 * exceeded).
                  */
-                byte[] proxyClassFile = ProxyGenerator.generateProxyClass(
-                    proxyName, interfaces, accessFlags);
-                try {
-                    proxyClass = defineClass0(loader, proxyName,
-                        proxyClassFile, 0, proxyClassFile.length);
-                } catch (ClassFormatError e) {
-                    /*
-                     * A ClassFormatError here means that (barring bugs in the
-                     * proxy class generation code) there was some other
-                     * invalid aspect of the arguments supplied to the proxy
-                     * class creation (such as virtual machine limitations
-                     * exceeded).
-                     */
-                    throw new IllegalArgumentException(e.toString());
-                }
-            }
-            // add to set of all generated proxy classes, for isProxyClass
-            proxyClasses.put(proxyClass, null);
-
-        } finally {
-            /*
-             * We must clean up the "pending generation" state of the proxy
-             * class cache entry somehow.  If a proxy class was successfully
-             * generated, store it in the cache (with a weak reference);
-             * otherwise, remove the reserved entry.  In all cases, notify
-             * all waiters on reserved entries in this cache.
-             */
-            synchronized (cache) {
-                if (proxyClass != null) {
-                    cache.put(key, new WeakReference<Class<?>>(proxyClass));
-                } else {
-                    cache.remove(key);
-                }
-                cache.notifyAll();
+                throw new IllegalArgumentException(e.toString());
             }
         }
-        return proxyClass;
     }
 
     /**
@@ -753,21 +767,6 @@
         }
     }
 
-    private static Object newInstance(Constructor<?> cons, InvocationHandler h) {
-        try {
-            return cons.newInstance(new Object[] {h} );
-        } catch (IllegalAccessException | InstantiationException e) {
-            throw new InternalError(e.toString(), e);
-        } catch (InvocationTargetException e) {
-            Throwable t = e.getCause();
-            if (t instanceof RuntimeException) {
-                throw (RuntimeException) t;
-            } else {
-                throw new InternalError(t.toString(), t);
-            }
-        }
-    }
-
     /**
      * Returns true if and only if the specified class was dynamically
      * generated to be a proxy class using the {@code getProxyClass}
@@ -783,11 +782,7 @@
      * @throws  NullPointerException if {@code cl} is {@code null}
      */
     public static boolean isProxyClass(Class<?> cl) {
-        if (cl == null) {
-            throw new NullPointerException();
-        }
-
-        return proxyClasses.containsKey(cl);
+        return Proxy.class.isAssignableFrom(cl) && proxyClassCache.containsValue(cl);
     }
 
     /**
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/lang/reflect/WeakCache.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,379 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.lang.reflect;
+
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.BiFunction;
+import java.util.function.Supplier;
+
+/**
+ * Cache mapping pairs of {@code (key, sub-key) -> value}. Keys and values are
+ * weakly but sub-keys are strongly referenced.  Keys are passed directly to
+ * {@link #get} method which also takes a {@code parameter}. Sub-keys are
+ * calculated from keys and parameters using the {@code subKeyFactory} function
+ * passed to the constructor. Values are calculated from keys and parameters
+ * using the {@code valueFactory} function passed to the constructor.
+ * Keys can be {@code null} and are compared by identity while sub-keys returned by
+ * {@code subKeyFactory} or values returned by {@code valueFactory}
+ * can not be null. Sub-keys are compared using their {@link #equals} method.
+ * Entries are expunged from cache lazily on each invocation to {@link #get},
+ * {@link #containsValue} or {@link #size} methods when the WeakReferences to
+ * keys are cleared. Cleared WeakReferences to individual values don't cause
+ * expunging, but such entries are logically treated as non-existent and
+ * trigger re-evaluation of {@code valueFactory} on request for their
+ * key/subKey.
+ *
+ * @author Peter Levart
+ * @param <K> type of keys
+ * @param <P> type of parameters
+ * @param <V> type of values
+ */
+final class WeakCache<K, P, V> {
+
+    private final ReferenceQueue<K> refQueue
+        = new ReferenceQueue<>();
+    // the key type is Object for supporting null key
+    private final ConcurrentMap<Object, ConcurrentMap<Object, Supplier<V>>> map
+        = new ConcurrentHashMap<>();
+    private final ConcurrentMap<Supplier<V>, Boolean> reverseMap
+        = new ConcurrentHashMap<>();
+    private final BiFunction<K, P, ?> subKeyFactory;
+    private final BiFunction<K, P, V> valueFactory;
+
+    /**
+     * Construct an instance of {@code WeakCache}
+     *
+     * @param subKeyFactory a function mapping a pair of
+     *                      {@code (key, parameter) -> sub-key}
+     * @param valueFactory  a function mapping a pair of
+     *                      {@code (key, parameter) -> value}
+     * @throws NullPointerException if {@code subKeyFactory} or
+     *                              {@code valueFactory} is null.
+     */
+    public WeakCache(BiFunction<K, P, ?> subKeyFactory,
+                     BiFunction<K, P, V> valueFactory) {
+        this.subKeyFactory = Objects.requireNonNull(subKeyFactory);
+        this.valueFactory = Objects.requireNonNull(valueFactory);
+    }
+
+    /**
+     * Look-up the value through the cache. This always evaluates the
+     * {@code subKeyFactory} function and optionally evaluates
+     * {@code valueFactory} function if there is no entry in the cache for given
+     * pair of (key, subKey) or the entry has already been cleared.
+     *
+     * @param key       possibly null key
+     * @param parameter parameter used together with key to create sub-key and
+     *                  value (should not be null)
+     * @return the cached value (never null)
+     * @throws NullPointerException if {@code parameter} passed in or
+     *                              {@code sub-key} calculated by
+     *                              {@code subKeyFactory} or {@code value}
+     *                              calculated by {@code valueFactory} is null.
+     */
+    public V get(K key, P parameter) {
+        Objects.requireNonNull(parameter);
+
+        expungeStaleEntries();
+
+        Object cacheKey = CacheKey.valueOf(key, refQueue);
+
+        // lazily install the 2nd level valuesMap for the particular cacheKey
+        ConcurrentMap<Object, Supplier<V>> valuesMap = map.get(cacheKey);
+        if (valuesMap == null) {
+            ConcurrentMap<Object, Supplier<V>> oldValuesMap
+                = map.putIfAbsent(cacheKey,
+                                  valuesMap = new ConcurrentHashMap<>());
+            if (oldValuesMap != null) {
+                valuesMap = oldValuesMap;
+            }
+        }
+
+        // create subKey and retrieve the possible Supplier<V> stored by that
+        // subKey from valuesMap
+        Object subKey = Objects.requireNonNull(subKeyFactory.apply(key, parameter));
+        Supplier<V> supplier = valuesMap.get(subKey);
+        Factory factory = null;
+
+        while (true) {
+            if (supplier != null) {
+                // supplier might be a Factory or a CacheValue<V> instance
+                V value = supplier.get();
+                if (value != null) {
+                    return value;
+                }
+            }
+            // else no supplier in cache
+            // or a supplier that returned null (could be a cleared CacheValue
+            // or a Factory that wasn't successful in installing the CacheValue)
+
+            // lazily construct a Factory
+            if (factory == null) {
+                factory = new Factory(key, parameter, subKey, valuesMap);
+            }
+
+            if (supplier == null) {
+                supplier = valuesMap.putIfAbsent(subKey, factory);
+                if (supplier == null) {
+                    // successfully installed Factory
+                    supplier = factory;
+                }
+                // else retry with winning supplier
+            } else {
+                if (valuesMap.replace(subKey, supplier, factory)) {
+                    // successfully replaced
+                    // cleared CacheEntry / unsuccessful Factory
+                    // with our Factory
+                    supplier = factory;
+                } else {
+                    // retry with current supplier
+                    supplier = valuesMap.get(subKey);
+                }
+            }
+        }
+    }
+
+    /**
+     * Checks whether the specified non-null value is already present in this
+     * {@code WeakCache}. The check is made using identity comparison regardless
+     * of whether value's class overrides {@link Object#equals} or not.
+     *
+     * @param value the non-null value to check
+     * @return true if given {@code value} is already cached
+     * @throws NullPointerException if value is null
+     */
+    public boolean containsValue(V value) {
+        Objects.requireNonNull(value);
+
+        expungeStaleEntries();
+        return reverseMap.containsKey(new LookupValue<>(value));
+    }
+
+    /**
+     * Returns the current number of cached entries that
+     * can decrease over time when keys/values are GC-ed.
+     */
+    public int size() {
+        expungeStaleEntries();
+        return reverseMap.size();
+    }
+
+    private void expungeStaleEntries() {
+        CacheKey<K> cacheKey;
+        while ((cacheKey = (CacheKey<K>)refQueue.poll()) != null) {
+            cacheKey.expungeFrom(map, reverseMap);
+        }
+    }
+
+    /**
+     * A factory {@link Supplier} that implements the lazy synchronized
+     * construction of the value and installment of it into the cache.
+     */
+    private final class Factory implements Supplier<V> {
+
+        private final K key;
+        private final P parameter;
+        private final Object subKey;
+        private final ConcurrentMap<Object, Supplier<V>> valuesMap;
+
+        Factory(K key, P parameter, Object subKey,
+                ConcurrentMap<Object, Supplier<V>> valuesMap) {
+            this.key = key;
+            this.parameter = parameter;
+            this.subKey = subKey;
+            this.valuesMap = valuesMap;
+        }
+
+        @Override
+        public synchronized V get() { // serialize access
+            // re-check
+            Supplier<V> supplier = valuesMap.get(subKey);
+            if (supplier != this) {
+                // something changed while we were waiting:
+                // might be that we were replaced by a CacheValue
+                // or were removed because of failure ->
+                // return null to signal WeakCache.get() to retry
+                // the loop
+                return null;
+            }
+            // else still us (supplier == this)
+
+            // create new value
+            V value = null;
+            try {
+                value = Objects.requireNonNull(valueFactory.apply(key, parameter));
+            } finally {
+                if (value == null) { // remove us on failure
+                    valuesMap.remove(subKey, this);
+                }
+            }
+            // the only path to reach here is with non-null value
+            assert value != null;
+
+            // wrap value with CacheValue (WeakReference)
+            CacheValue<V> cacheValue = new CacheValue<>(value);
+
+            // try replacing us with CacheValue (this should always succeed)
+            if (valuesMap.replace(subKey, this, cacheValue)) {
+                // put also in reverseMap
+                reverseMap.put(cacheValue, Boolean.TRUE);
+            } else {
+                throw new AssertionError("Should not reach here");
+            }
+
+            // successfully replaced us with new CacheValue -> return the value
+            // wrapped by it
+            return value;
+        }
+    }
+
+    /**
+     * Common type of value suppliers that are holding a referent.
+     * The {@link #equals} and {@link #hashCode} of implementations is defined
+     * to compare the referent by identity.
+     */
+    private interface Value<V> extends Supplier<V> {}
+
+    /**
+     * An optimized {@link Value} used to look-up the value in
+     * {@link WeakCache#containsValue} method so that we are not
+     * constructing the whole {@link CacheValue} just to look-up the referent.
+     */
+    private static final class LookupValue<V> implements Value<V> {
+        private final V value;
+
+        LookupValue(V value) {
+            this.value = value;
+        }
+
+        @Override
+        public V get() {
+            return value;
+        }
+
+        @Override
+        public int hashCode() {
+            return System.identityHashCode(value); // compare by identity
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return obj == this ||
+                   obj instanceof Value &&
+                   this.value == ((Value<?>) obj).get();  // compare by identity
+        }
+    }
+
+    /**
+     * A {@link Value} that weakly references the referent.
+     */
+    private static final class CacheValue<V>
+        extends WeakReference<V> implements Value<V>
+    {
+        private final int hash;
+
+        CacheValue(V value) {
+            super(value);
+            this.hash = System.identityHashCode(value); // compare by identity
+        }
+
+        @Override
+        public int hashCode() {
+            return hash;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            V value;
+            return obj == this ||
+                   obj instanceof Value &&
+                   // cleared CacheValue is only equal to itself
+                   (value = get()) != null &&
+                   value == ((Value<?>) obj).get(); // compare by identity
+        }
+    }
+
+    /**
+     * CacheKey containing a weakly referenced {@code key}. It registers
+     * itself with the {@code refQueue} so that it can be used to expunge
+     * the entry when the {@link WeakReference} is cleared.
+     */
+    private static final class CacheKey<K> extends WeakReference<K> {
+
+        // a replacement for null keys
+        private static final Object NULL_KEY = new Object();
+
+        static <K> Object valueOf(K key, ReferenceQueue<K> refQueue) {
+            return key == null
+                   // null key means we can't weakly reference it,
+                   // so we use a NULL_KEY singleton as cache key
+                   ? NULL_KEY
+                   // non-null key requires wrapping with a WeakReference
+                   : new CacheKey<>(key, refQueue);
+        }
+
+        private final int hash;
+
+        private CacheKey(K key, ReferenceQueue<K> refQueue) {
+            super(key, refQueue);
+            this.hash = System.identityHashCode(key);  // compare by identity
+        }
+
+        @Override
+        public int hashCode() {
+            return hash;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            K key;
+            return obj == this ||
+                   obj != null &&
+                   obj.getClass() == this.getClass() &&
+                   // cleared CacheKey is only equal to itself
+                   (key = this.get()) != null &&
+                   // compare key by identity
+                   key == ((CacheKey<K>) obj).get();
+        }
+
+        void expungeFrom(ConcurrentMap<?, ? extends ConcurrentMap<?, ?>> map,
+                         ConcurrentMap<?, Boolean> reverseMap) {
+            // removing just by key is always safe here because after a CacheKey
+            // is cleared and enqueue-ed it is only equal to itself
+            // (see equals method)...
+            ConcurrentMap<?, ?> valuesMap = map.remove(this);
+            // remove also from reverseMap if needed
+            if (valuesMap != null) {
+                for (Object cacheValue : valuesMap.values()) {
+                    reverseMap.remove(cacheValue);
+                }
+            }
+        }
+    }
+}
--- a/jdk/src/share/classes/java/net/Inet6Address.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/net/Inet6Address.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -203,6 +203,12 @@
      */
     private transient NetworkInterface scope_ifname;  // null
 
+    /**
+     * set if the object is constructed with a scoped
+     * interface instead of a numeric scope id.
+     */
+    private boolean scope_ifname_set; // false;
+
     private static final long serialVersionUID = 6880410070516793377L;
 
     // Perform native initialization
@@ -332,7 +338,7 @@
         }
     }
 
-    private void initif(String hostName, byte addr[],NetworkInterface nif)
+    private void initif(String hostName, byte addr[], NetworkInterface nif)
         throws UnknownHostException
     {
         holder().hostName = hostName;
@@ -344,6 +350,7 @@
             scope_ifname = nif;
             scope_id = deriveNumericScope(nif);
             scope_id_set = true;
+            scope_ifname_set = true;  // for consistency
         }
     }
 
@@ -431,6 +438,7 @@
             try {
                 scope_ifname = NetworkInterface.getByName(ifname);
                 if (scope_ifname != null) {
+                    scope_ifname_set = true;
                     try {
                         scope_id = deriveNumericScope(scope_ifname);
                     } catch (UnknownHostException e) {
@@ -438,6 +446,12 @@
                         // the machine being used for deserialization has
                         // the same interface name but without IPv6 configured.
                     }
+                } else {
+                    /* the interface does not exist on this system, so we clear
+                     * the scope information completely */
+                    scope_id_set = false;
+                    scope_ifname_set = false;
+                    scope_id = 0;
                 }
             } catch (SocketException e) {}
 
@@ -784,8 +798,10 @@
     private synchronized void writeObject(java.io.ObjectOutputStream s)
         throws IOException
     {
-        if (scope_ifname != null)
+        if (scope_ifname != null) {
             ifname = scope_ifname.getName();
+            scope_ifname_set = true;
+        }
         s.defaultWriteObject();
     }
 }
--- a/jdk/src/share/classes/java/nio/file/FileTreeWalker.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/nio/file/FileTreeWalker.java	Wed May 08 11:22:25 2013 +0100
@@ -25,27 +25,147 @@
 
 package java.nio.file;
 
-import java.nio.file.attribute.*;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.io.Closeable;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayDeque;
+import java.util.Iterator;
+import java.util.Set;
 import sun.nio.fs.BasicFileAttributesHolder;
 
 /**
- * Simple file tree walker that works in a similar manner to nftw(3C).
+ * Walks a file tree, generating a sequence of events corresponding to the files
+ * in the tree.
+ *
+ * <pre>{@code
+ *     Path top = ...
+ *     Set<FileVisitOption> options = ...
+ *     int maxDepth = ...
+ *
+ *     try (FileTreeWalker walker = new FileTreeWalker(options, maxDepth)) {
+ *         FileTreeWalker.Event ev = walker.walk(top);
+ *         do {
+ *             process(ev);
+ *             ev = walker.next();
+ *         } while (ev != null);
+ *     }
+ * }</pre>
  *
  * @see Files#walkFileTree
  */
 
-class FileTreeWalker {
+class FileTreeWalker implements Closeable {
     private final boolean followLinks;
     private final LinkOption[] linkOptions;
-    private final FileVisitor<? super Path> visitor;
     private final int maxDepth;
+    private final ArrayDeque<DirectoryNode> stack = new ArrayDeque<>();
+    private boolean closed;
+
+    /**
+     * The element on the walking stack corresponding to a directory node.
+     */
+    private static class DirectoryNode {
+        private final Path dir;
+        private final Object key;
+        private final DirectoryStream<Path> stream;
+        private final Iterator<Path> iterator;
+        private boolean skipped;
+
+        DirectoryNode(Path dir, Object key, DirectoryStream<Path> stream) {
+            this.dir = dir;
+            this.key = key;
+            this.stream = stream;
+            this.iterator = stream.iterator();
+        }
+
+        Path directory() {
+            return dir;
+        }
+
+        Object key() {
+            return key;
+        }
+
+        DirectoryStream<Path> stream() {
+            return stream;
+        }
+
+        Iterator<Path> iterator() {
+            return iterator;
+        }
+
+        void skip() {
+            skipped = true;
+        }
+
+        boolean skipped() {
+            return skipped;
+        }
+    }
 
-    FileTreeWalker(Set<FileVisitOption> options,
-                   FileVisitor<? super Path> visitor,
-                   int maxDepth)
-    {
+    /**
+     * The event types.
+     */
+    static enum EventType {
+        /**
+         * Start of a directory
+         */
+        START_DIRECTORY,
+        /**
+         * End of a directory
+         */
+        END_DIRECTORY,
+        /**
+         * An entry in a directory
+         */
+        ENTRY;
+    }
+
+    /**
+     * Events returned by the {@link #walk} and {@link #next} methods.
+     */
+    static class Event {
+        private final EventType type;
+        private final Path file;
+        private final BasicFileAttributes attrs;
+        private final IOException ioe;
+
+        private Event(EventType type, Path file, BasicFileAttributes attrs, IOException ioe) {
+            this.type = type;
+            this.file = file;
+            this.attrs = attrs;
+            this.ioe = ioe;
+        }
+
+        Event(EventType type, Path file, BasicFileAttributes attrs) {
+            this(type, file, attrs, null);
+        }
+
+        Event(EventType type, Path file, IOException ioe) {
+            this(type, file, null, ioe);
+        }
+
+        EventType type() {
+            return type;
+        }
+
+        Path file() {
+            return file;
+        }
+
+        BasicFileAttributes attributes() {
+            return attrs;
+        }
+
+        IOException ioeException() {
+            return ioe;
+        }
+    }
+
+    /**
+     * Creates a {@code FileTreeWalker}.
+     */
+    FileTreeWalker(Set<FileVisitOption> options, int maxDepth) {
         boolean fl = false;
         for (FileVisitOption option: options) {
             // will throw NPE if options contains null
@@ -58,191 +178,236 @@
         this.followLinks = fl;
         this.linkOptions = (fl) ? new LinkOption[0] :
             new LinkOption[] { LinkOption.NOFOLLOW_LINKS };
-        this.visitor = visitor;
         this.maxDepth = maxDepth;
     }
 
     /**
-     * Walk file tree starting at the given file
+     * Returns the attributes of the given file, taking into account whether
+     * the walk is following sym links is not. The {@code canUseCached}
+     * argument determines whether this method can use cached attributes.
      */
-    void walk(Path start) throws IOException {
-        FileVisitResult result = walk(start,
-                                      0,
-                                      new ArrayList<AncestorDirectory>());
-        Objects.requireNonNull(result, "FileVisitor returned null");
-    }
-
-    /**
-     * @param   file
-     *          the directory to visit
-     * @param   depth
-     *          depth remaining
-     * @param   ancestors
-     *          use when cycle detection is enabled
-     */
-    private FileVisitResult walk(Path file,
-                                 int depth,
-                                 List<AncestorDirectory> ancestors)
+    private BasicFileAttributes getAttributes(Path file, boolean canUseCached)
         throws IOException
     {
         // if attributes are cached then use them if possible
-        BasicFileAttributes attrs = null;
-        if ((depth > 0) &&
+        if (canUseCached &&
             (file instanceof BasicFileAttributesHolder) &&
             (System.getSecurityManager() == null))
         {
             BasicFileAttributes cached = ((BasicFileAttributesHolder)file).get();
-            if (cached != null && (!followLinks || !cached.isSymbolicLink()))
-                attrs = cached;
-        }
-        IOException exc = null;
-
-        // attempt to get attributes of file. If fails and we are following
-        // links then a link target might not exist so get attributes of link
-        if (attrs == null) {
-            try {
-                try {
-                    attrs = Files.readAttributes(file, BasicFileAttributes.class, linkOptions);
-                } catch (IOException x1) {
-                    if (followLinks) {
-                        try {
-                            attrs = Files.readAttributes(file,
-                                                         BasicFileAttributes.class,
-                                                         LinkOption.NOFOLLOW_LINKS);
-                        } catch (IOException x2) {
-                            exc = x2;
-                        }
-                    } else {
-                        exc = x1;
-                    }
-                }
-            } catch (SecurityException x) {
-                // If access to starting file is denied then SecurityException
-                // is thrown, otherwise the file is ignored.
-                if (depth == 0)
-                    throw x;
-                return FileVisitResult.CONTINUE;
+            if (cached != null && (!followLinks || !cached.isSymbolicLink())) {
+                return cached;
             }
         }
 
-        // unable to get attributes of file
-        if (exc != null) {
-            return visitor.visitFileFailed(file, exc);
+        // attempt to get attributes of file. If fails and we are following
+        // links then a link target might not exist so get attributes of link
+        BasicFileAttributes attrs;
+        try {
+            attrs = Files.readAttributes(file, BasicFileAttributes.class, linkOptions);
+        } catch (IOException ioe) {
+            if (!followLinks)
+                throw ioe;
+
+            // attempt to get attrmptes without following links
+            attrs = Files.readAttributes(file,
+                                         BasicFileAttributes.class,
+                                         LinkOption.NOFOLLOW_LINKS);
+        }
+        return attrs;
+    }
+
+    /**
+     * Returns true if walking into the given directory would result in a
+     * file system loop/cycle.
+     */
+    private boolean wouldLoop(Path dir, Object key) {
+        // if this directory and ancestor has a file key then we compare
+        // them; otherwise we use less efficient isSameFile test.
+        for (DirectoryNode ancestor: stack) {
+            Object ancestorKey = ancestor.key();
+            if (key != null && ancestorKey != null) {
+                if (key.equals(ancestorKey)) {
+                    // cycle detected
+                    return true;
+                }
+            } else {
+                try {
+                    if (Files.isSameFile(dir, ancestor.directory())) {
+                        // cycle detected
+                        return true;
+                    }
+                } catch (IOException | SecurityException x) {
+                    // ignore
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Visits the given file, returning the {@code Event} corresponding to that
+     * visit.
+     *
+     * The {@code ignoreSecurityException} parameter determines whether
+     * any SecurityException should be ignored or not. If a SecurityException
+     * is thrown, and is ignored, then this method returns {@code null} to
+     * mean that there is no event corresponding to a visit to the file.
+     *
+     * The {@code canUseCached} parameter determines whether cached attributes
+     * for the file can be used or not.
+     */
+    private Event visit(Path entry, boolean ignoreSecurityException, boolean canUseCached) {
+        // need the file attributes
+        BasicFileAttributes attrs;
+        try {
+            attrs = getAttributes(entry, canUseCached);
+        } catch (IOException ioe) {
+            return new Event(EventType.ENTRY, entry, ioe);
+        } catch (SecurityException se) {
+            if (ignoreSecurityException)
+                return null;
+            throw se;
         }
 
         // at maximum depth or file is not a directory
+        int depth = stack.size();
         if (depth >= maxDepth || !attrs.isDirectory()) {
-            return visitor.visitFile(file, attrs);
+            return new Event(EventType.ENTRY, entry, attrs);
         }
 
         // check for cycles when following links
-        if (followLinks) {
-            Object key = attrs.fileKey();
+        if (followLinks && wouldLoop(entry, attrs.fileKey())) {
+            return new Event(EventType.ENTRY, entry,
+                             new FileSystemLoopException(entry.toString()));
+        }
+
+        // file is a directory, attempt to open it
+        DirectoryStream<Path> stream = null;
+        try {
+            stream = Files.newDirectoryStream(entry);
+        } catch (IOException ioe) {
+            return new Event(EventType.ENTRY, entry, ioe);
+        } catch (SecurityException se) {
+            if (ignoreSecurityException)
+                return null;
+            throw se;
+        }
+
+        // push a directory node to the stack and return an event
+        stack.push(new DirectoryNode(entry, attrs.fileKey(), stream));
+        return new Event(EventType.START_DIRECTORY, entry, attrs);
+    }
+
 
-            // if this directory and ancestor has a file key then we compare
-            // them; otherwise we use less efficient isSameFile test.
-            for (AncestorDirectory ancestor: ancestors) {
-                Object ancestorKey = ancestor.fileKey();
-                if (key != null && ancestorKey != null) {
-                    if (key.equals(ancestorKey)) {
-                        // cycle detected
-                        return visitor.visitFileFailed(file,
-                            new FileSystemLoopException(file.toString()));
+    /**
+     * Start walking from the given file.
+     */
+    Event walk(Path file) {
+        if (closed)
+            throw new IllegalStateException("Closed");
+
+        Event ev = visit(file,
+                         false,   // ignoreSecurityException
+                         false);  // canUseCached
+        assert ev != null;
+        return ev;
+    }
+
+    /**
+     * Returns the next Event or {@code null} if there are no more events or
+     * the walker is closed.
+     */
+    Event next() {
+        DirectoryNode top = stack.peek();
+        if (top == null)
+            return null;      // stack is empty, we are done
+
+        // continue iteration of the directory at the top of the stack
+        Event ev;
+        do {
+            Path entry = null;
+            IOException ioe = null;
+
+            // get next entry in the directory
+            if (!top.skipped()) {
+                Iterator<Path> iterator = top.iterator();
+                try {
+                    if (iterator.hasNext()) {
+                        entry = iterator.next();
                     }
-                } else {
-                    boolean isSameFile = false;
-                    try {
-                        isSameFile = Files.isSameFile(file, ancestor.file());
-                    } catch (IOException x) {
-                        // ignore
-                    } catch (SecurityException x) {
-                        // ignore
-                    }
-                    if (isSameFile) {
-                        // cycle detected
-                        return visitor.visitFileFailed(file,
-                            new FileSystemLoopException(file.toString()));
-                    }
+                } catch (DirectoryIteratorException x) {
+                    ioe = x.getCause();
                 }
             }
 
-            ancestors.add(new AncestorDirectory(file, key));
-        }
-
-        // visit directory
-        try {
-            DirectoryStream<Path> stream = null;
-            FileVisitResult result;
-
-            // open the directory
-            try {
-                stream = Files.newDirectoryStream(file);
-            } catch (IOException x) {
-                return visitor.visitFileFailed(file, x);
-            } catch (SecurityException x) {
-                // ignore, as per spec
-                return FileVisitResult.CONTINUE;
+            // no next entry so close and pop directory, creating corresponding event
+            if (entry == null) {
+                try {
+                    top.stream().close();
+                } catch (IOException e) {
+                    if (ioe != null) {
+                        ioe = e;
+                    } else {
+                        ioe.addSuppressed(e);
+                    }
+                }
+                stack.pop();
+                return new Event(EventType.END_DIRECTORY, top.directory(), ioe);
             }
 
-            // the exception notified to the postVisitDirectory method
-            IOException ioe = null;
+            // visit the entry
+            ev = visit(entry,
+                       true,   // ignoreSecurityException
+                       true);  // canUseCached
 
-            // invoke preVisitDirectory and then visit each entry
-            try {
-                result = visitor.preVisitDirectory(file, attrs);
-                if (result != FileVisitResult.CONTINUE) {
-                    return result;
-                }
+        } while (ev == null);
 
-                try {
-                    for (Path entry: stream) {
-                        result = walk(entry, depth+1, ancestors);
-
-                        // returning null will cause NPE to be thrown
-                        if (result == null || result == FileVisitResult.TERMINATE)
-                            return result;
+        return ev;
+    }
 
-                        // skip remaining siblings in this directory
-                        if (result == FileVisitResult.SKIP_SIBLINGS)
-                            break;
-                    }
-                } catch (DirectoryIteratorException e) {
-                    // IOException will be notified to postVisitDirectory
-                    ioe = e.getCause();
-                }
-            } finally {
-                try {
-                    stream.close();
-                } catch (IOException e) {
-                    // IOException will be notified to postVisitDirectory
-                    if (ioe == null)
-                        ioe = e;
-                }
-            }
-
-            // invoke postVisitDirectory last
-            return visitor.postVisitDirectory(file, ioe);
-
-        } finally {
-            // remove key from trail if doing cycle detection
-            if (followLinks) {
-                ancestors.remove(ancestors.size()-1);
-            }
+    /**
+     * Pops the directory node that is the current top of the stack so that
+     * there are no more events for the directory (including no END_DIRECTORY)
+     * event. This method is a no-op if the stack is empty or the walker is
+     * closed.
+     */
+    void pop() {
+        if (!stack.isEmpty()) {
+            DirectoryNode node = stack.pop();
+            try {
+                node.stream().close();
+            } catch (IOException ignore) { }
         }
     }
 
-    private static class AncestorDirectory {
-        private final Path dir;
-        private final Object key;
-        AncestorDirectory(Path dir, Object key) {
-            this.dir = dir;
-            this.key = key;
+    /**
+     * Skips the remaining entries in the directory at the top of the stack.
+     * This method is a no-op if the stack is empty or the walker is closed.
+     */
+    void skipRemainingSiblings() {
+        if (!stack.isEmpty()) {
+            stack.peek().skip();
         }
-        Path file() {
-            return dir;
-        }
-        Object fileKey() {
-            return key;
+    }
+
+    /**
+     * Returns {@code true} if the walker is open.
+     */
+    boolean isOpen() {
+        return !closed;
+    }
+
+    /**
+     * Closes/pops all directories on the stack.
+     */
+    @Override
+    public void close() {
+        if (!closed) {
+            while (!stack.isEmpty()) {
+                pop();
+            }
+            closed = true;
         }
     }
 }
--- a/jdk/src/share/classes/java/nio/file/Files.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/nio/file/Files.java	Wed May 08 11:22:25 2013 +0100
@@ -2598,7 +2598,60 @@
     {
         if (maxDepth < 0)
             throw new IllegalArgumentException("'maxDepth' is negative");
-        new FileTreeWalker(options, visitor, maxDepth).walk(start);
+
+        /**
+         * Create a FileTreeWalker to walk the file tree, invoking the visitor
+         * for each event.
+         */
+        try (FileTreeWalker walker = new FileTreeWalker(options, maxDepth)) {
+            FileTreeWalker.Event ev = walker.walk(start);
+            do {
+                FileVisitResult result;
+                switch (ev.type()) {
+                    case ENTRY :
+                        IOException ioe = ev.ioeException();
+                        if (ioe == null) {
+                            assert ev.attributes() != null;
+                            result = visitor.visitFile(ev.file(), ev.attributes());
+                        } else {
+                            result = visitor.visitFileFailed(ev.file(), ioe);
+                        }
+                        break;
+
+                    case START_DIRECTORY :
+                        result = visitor.preVisitDirectory(ev.file(), ev.attributes());
+
+                        // if SKIP_SIBLINGS and SKIP_SUBTREE is returned then
+                        // there shouldn't be any more events for the current
+                        // directory.
+                        if (result == FileVisitResult.SKIP_SUBTREE ||
+                            result == FileVisitResult.SKIP_SIBLINGS)
+                            walker.pop();
+                        break;
+
+                    case END_DIRECTORY :
+                        result = visitor.postVisitDirectory(ev.file(), ev.ioeException());
+
+                        // SKIP_SIBLINGS is a no-op for postVisitDirectory
+                        if (result == FileVisitResult.SKIP_SIBLINGS)
+                            result = FileVisitResult.CONTINUE;
+                        break;
+
+                    default :
+                        throw new AssertionError("Should not get here");
+                }
+
+                if (Objects.requireNonNull(result) != FileVisitResult.CONTINUE) {
+                    if (result == FileVisitResult.TERMINATE) {
+                        break;
+                    } else if (result == FileVisitResult.SKIP_SIBLINGS) {
+                        walker.skipRemainingSiblings();
+                    }
+                }
+                ev = walker.next();
+            } while (ev != null);
+        }
+
         return start;
     }
 
--- a/jdk/src/share/classes/java/nio/file/attribute/FileTime.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/nio/file/attribute/FileTime.java	Wed May 08 11:22:25 2013 +0100
@@ -219,8 +219,8 @@
      *
      * <p> {@code FileTime} can store points on the time-line further in the
      * future and further in the past than {@code Instant}. Conversion
-     * from such further time points saturates to {@link Instant.MIN} if
-     * earlier than {@code Instant.MIN} or {@link Instant.MAX} if later
+     * from such further time points saturates to {@link Instant#MIN} if
+     * earlier than {@code Instant.MIN} or {@link Instant#MAX} if later
      * than {@code Instant.MAX}.
      *
      * @return  an instant representing the same point on the time-line as
--- a/jdk/src/share/classes/java/sql/Driver.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/sql/Driver.java	Wed May 08 11:22:25 2013 +0100
@@ -44,13 +44,16 @@
  *
  * <P>When a Driver class is loaded, it should create an instance of
  * itself and register it with the DriverManager. This means that a
- * user can load and register a driver by calling
- * <pre>
- *   <code>Class.forName("foo.bah.Driver")</code>
- * </pre>
- *
+ * user can load and register a driver by calling:
+ * <p>
+ * {@code Class.forName("foo.bah.Driver")}
+ * <p>
+ * A JDBC driver may create a {@linkplain DriverAction} implementation in order
+ * to receive notifications when {@linkplain DriverManager#deregisterDriver} has
+ * been called.
  * @see DriverManager
  * @see Connection
+ * @see DriverAction
  */
 public interface Driver {
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/sql/DriverAction.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.sql;
+
+/**
+ * An interface that must be implemented when a {@linkplain Driver} wants to be
+ * notified by {@code DriverManager}.
+ *<P>
+ * A {@code DriverAction} implementation is not intended to be used
+ * directly by applications. A JDBC Driver  may choose
+ * to create its {@code DriverAction} implementation in a private class
+ * to avoid it being called directly.
+ * <o>
+ * The JDBC driver's static initialization block must call
+ * {@linkplain DriverManager#registerDriver(java.sql.Driver, java.sql.DriverAction) } in order
+ * to inform {@code DriverManager} which {@code DriverAction} implementation to
+ * call when the JDBC driver is de-registered.
+ * @since 1.8
+ */
+public interface DriverAction {
+    /**
+     * Method called by
+     * {@linkplain DriverManager#deregisterDriver(Driver) }
+     *  to notify the JDBC driver that it was de-registered.
+     * <p>
+     * The {@code deregister} method is intended only to be used by JDBC Drivers
+     * and not by applications.  JDBC drivers are recommended to not implement
+     * {@code DriverAction} in a public class.  If there are active
+     * connections to the database at the time that the {@code deregister}
+     * method is called, it is implementation specific as to whether the
+     * connections are closed or allowed to continue. Once this method is
+     * called, it is implementation specific as to whether the driver may
+     * limit the ability to create new connections to the database, invoke
+     * other {@code Driver} methods or throw a {@code SQLException}.
+     * Consult your JDBC driver's documentation for additional information
+     * on its behavior.
+     * @see DriverManager#registerDriver(java.sql.Driver, java.sql.DriverAction)
+     * @see DriverManager#deregisterDriver(Driver)
+     * @since 1.8
+     */
+    void deregister();
+
+}
--- a/jdk/src/share/classes/java/sql/DriverManager.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/sql/DriverManager.java	Wed May 08 11:22:25 2013 +0100
@@ -110,6 +110,14 @@
     final static SQLPermission SET_LOG_PERMISSION =
         new SQLPermission("setLog");
 
+    /**
+     * The {@code SQLPermission} constant that allows the
+     * un-register a registered JDBC driver.
+     * @since 1.8
+     */
+    final static SQLPermission DEREGISTER_DRIVER_PERMISSION =
+        new SQLPermission("deregisterDriver");
+
     //--------------------------JDBC 2.0-----------------------------
 
     /**
@@ -309,21 +317,42 @@
 
 
     /**
-     * Registers the given driver with the <code>DriverManager</code>.
+     * Registers the given driver with the {@code DriverManager}.
      * A newly-loaded driver class should call
-     * the method <code>registerDriver</code> to make itself
-     * known to the <code>DriverManager</code>.
+     * the method {@code registerDriver} to make itself
+     * known to the {@code DriverManager}. If the driver had previously been
+     * registered, no action is taken.
      *
      * @param driver the new JDBC Driver that is to be registered with the
-     *               <code>DriverManager</code>
+     *               {@code DriverManager}
      * @exception SQLException if a database access error occurs
      */
     public static synchronized void registerDriver(java.sql.Driver driver)
         throws SQLException {
 
+        registerDriver(driver, null);
+    }
+
+    /**
+     * Registers the given driver with the {@code DriverManager}.
+     * A newly-loaded driver class should call
+     * the method {@code registerDriver} to make itself
+     * known to the {@code DriverManager}. If the driver had previously been
+     * registered, no action is taken.
+     *
+     * @param driver the new JDBC Driver that is to be registered with the
+     *               {@code DriverManager}
+     * @param da     the {@code DriverAction} implementation to be used when
+     *               {@code DriverManager#deregisterDriver} is called
+     * @exception SQLException if a database access error occurs
+     */
+    public static synchronized void registerDriver(java.sql.Driver driver,
+            DriverAction da)
+        throws SQLException {
+
         /* Register the driver if it has not already been added to our list */
         if(driver != null) {
-            registeredDrivers.addIfAbsent(new DriverInfo(driver));
+            registeredDrivers.addIfAbsent(new DriverInfo(driver, da));
         } else {
             // This is for compatibility with the original DriverManager
             throw new NullPointerException();
@@ -334,11 +363,29 @@
     }
 
     /**
-     * Drops a driver from the <code>DriverManager</code>'s list.
-     *  Applets can only deregister drivers from their own classloaders.
+     * Removes the specified driver from the {@code DriverManager}'s list of
+     * registered drivers.
+     * <p>
+     * If a {@code null} value is specified for the driver to be removed, then no
+     * action is taken.
+     * <p>
+     * If a security manager exists and its {@code checkPermission} denies
+     * permission, then a {@code SecurityException} will be thrown.
+     * <p>
+     * If the specified driver is not found in the list of registered drivers,
+     * then no action is taken.  If the driver was found, it will be removed
+     * from the list of registered drivers.
+     * <p>
+     * If a {@code DriverAction} instance was specified when the JDBC driver was
+     * registered, its deregister method will be called
+     * prior to the driver being removed from the list of registered drivers.
      *
-     * @param driver the JDBC Driver to drop
+     * @param driver the JDBC Driver to remove
      * @exception SQLException if a database access error occurs
+     * @throws SecurityException if a security manager exists and its
+     * {@code checkPermission} method denies permission to deregister a driver.
+     *
+     * @see SecurityManager#checkPermission
      */
     @CallerSensitive
     public static synchronized void deregisterDriver(Driver driver)
@@ -347,11 +394,22 @@
             return;
         }
 
+        SecurityManager sec = System.getSecurityManager();
+        if (sec != null) {
+            sec.checkPermission(DEREGISTER_DRIVER_PERMISSION);
+        }
+
         println("DriverManager.deregisterDriver: " + driver);
 
-        DriverInfo aDriver = new DriverInfo(driver);
+        DriverInfo aDriver = new DriverInfo(driver, null);
         if(registeredDrivers.contains(aDriver)) {
             if (isDriverAllowed(driver, Reflection.getCallerClass())) {
+                DriverInfo di = registeredDrivers.get(registeredDrivers.indexOf(aDriver));
+                 // If a DriverAction was specified, Call it to notify the
+                 // driver that it has been deregistered
+                 if(di.action() != null) {
+                     di.action().deregister();
+                 }
                  registeredDrivers.remove(aDriver);
             } else {
                 // If the caller does not have permission to load the driver then
@@ -639,8 +697,10 @@
 class DriverInfo {
 
     final Driver driver;
-    DriverInfo(Driver driver) {
+    DriverAction da;
+    DriverInfo(Driver driver, DriverAction action) {
         this.driver = driver;
+        da = action;
     }
 
     @Override
@@ -658,4 +718,8 @@
     public String toString() {
         return ("driver[className="  + driver + "]");
     }
+
+    DriverAction action() {
+        return da;
+    }
 }
--- a/jdk/src/share/classes/java/sql/SQLPermission.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/sql/SQLPermission.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,9 @@
 
 /**
  * The permission for which the <code>SecurityManager</code> will check
- * when code that is running in an applet, or an application with a
+ * when code that is running an application with a
  * <code>SecurityManager</code> enabled, calls the
+ * {@code DriverManager.deregisterDriver} method,
  * <code>DriverManager.setLogWriter</code> method,
  * <code>DriverManager.setLogStream</code> (deprecated) method,
  * {@code SyncFactory.setJNDIContext} method,
@@ -95,14 +96,16 @@
  * <code>Connection</code> or
  * objects created from the <code>Connection</code>
  * will wait for the database to reply to any one request.</td>
+ * <tr>
+ * <td>deregisterDriver</td>
+ *   <td>Allows the invocation of the {@code DriverManager}
+ * method {@code deregisterDriver}</td>
+ *   <td>Permits an application to remove a JDBC driver from the list of
+ * registered Drivers and release its resources.</td>
+ * </tr>
  * </tr>
  * </table>
  *<p>
- * The person running an applet decides what permissions to allow
- * and will run the <code>Policy Tool</code> to create an
- * <code>SQLPermission</code> in a policy file.  A programmer does
- * not use a constructor directly to create an instance of <code>SQLPermission</code>
- * but rather uses a tool.
  * @since 1.3
  * @see java.security.BasicPermission
  * @see java.security.Permission
--- a/jdk/src/share/classes/java/text/CalendarBuilder.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/text/CalendarBuilder.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -91,6 +91,15 @@
         return field[index] > UNSET;
     }
 
+    CalendarBuilder clear(int index) {
+        if (index == ISO_DAY_OF_WEEK) {
+            index = DAY_OF_WEEK;
+        }
+        field[index] = UNSET;
+        field[MAX_FIELD + index] = 0;
+        return this;
+    }
+
     Calendar establish(Calendar cal) {
         boolean weekDate = isSet(WEEK_YEAR)
                             && field[WEEK_YEAR] > field[YEAR];
--- a/jdk/src/share/classes/java/text/SimpleDateFormat.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/text/SimpleDateFormat.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1719,7 +1719,7 @@
             // determine the local time. (6645292)
             int dstAmount = (nameIndex >= 3) ? tz.getDSTSavings() : 0;
             if (!(useSameName || (nameIndex >= 3 && dstAmount == 0))) {
-                calb.set(Calendar.DST_OFFSET, dstAmount);
+                calb.clear(Calendar.ZONE_OFFSET).set(Calendar.DST_OFFSET, dstAmount);
             }
             return (start + zoneNames[nameIndex].length());
         }
--- a/jdk/src/share/classes/java/util/ArrayList.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/util/ArrayList.java	Wed May 08 11:22:25 2013 +0100
@@ -29,10 +29,6 @@
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.function.UnaryOperator;
-
 /**
  * Resizable-array implementation of the <tt>List</tt> interface.  Implements
  * all optional list operations, and permits all elements, including
--- a/jdk/src/share/classes/java/util/Arrays.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/util/Arrays.java	Wed May 08 11:22:25 2013 +0100
@@ -25,7 +25,21 @@
 
 package java.util;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Array;
+import java.util.concurrent.ForkJoinPool;
+import java.util.function.BinaryOperator;
+import java.util.function.DoubleBinaryOperator;
+import java.util.function.IntBinaryOperator;
+import java.util.function.IntFunction;
+import java.util.function.IntToDoubleFunction;
+import java.util.function.IntToLongFunction;
+import java.util.function.IntUnaryOperator;
+import java.util.function.LongBinaryOperator;
+import java.util.stream.DoubleStream;
+import java.util.stream.IntStream;
+import java.util.stream.LongStream;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 import static java.util.ArraysParallelSortHelpers.*;
 
 /**
@@ -4306,17 +4320,171 @@
         dejaVu.remove(a);
     }
 
+
     /**
-     * Creates a {@link Spliterator} covering all of the specified array.
+     * Set all elements of the specified array, using the provided
+     * generator function to compute each element.
+     *
+     * <p>If the generator function throws an exception, it is relayed to
+     * the caller and the array is left in an indeterminate state.
+     *
+     * @param <T> type of elements of the array
+     * @param array array to be initialized
+     * @param generator a function accepting an index and producing the desired
+     *        value for that position
+     * @throws NullPointerException if the generator is null
+     * @since 1.8
+     */
+    public static <T> void setAll(T[] array, IntFunction<? extends T> generator) {
+        Objects.requireNonNull(generator);
+        for (int i = 0; i < array.length; i++)
+            array[i] = generator.apply(i);
+    }
+
+    /**
+     * Set all elements of the specified array, in parallel, using the
+     * provided generator function to compute each element.
+     *
+     * <p>If the generator function throws an exception, an unchecked exception
+     * is thrown from {@code parallelSetAll} and the array is left in an
+     * indeterminate state.
+     *
+     * @param <T> type of elements of the array
+     * @param array array to be initialized
+     * @param generator a function accepting an index and producing the desired
+     *        value for that position
+     * @throws NullPointerException if the generator is null
+     * @since 1.8
+     */
+    public static <T> void parallelSetAll(T[] array, IntFunction<? extends T> generator) {
+        Objects.requireNonNull(generator);
+        IntStream.range(0, array.length).parallel().forEach(i -> { array[i] = generator.apply(i); });
+    }
+
+    /**
+     * Set all elements of the specified array, using the provided
+     * generator function to compute each element.
+     *
+     * <p>If the generator function throws an exception, it is relayed to
+     * the caller and the array is left in an indeterminate state.
+     *
+     * @param array array to be initialized
+     * @param generator a function accepting an index and producing the desired
+     *        value for that position
+     * @throws NullPointerException if the generator is null
+     * @since 1.8
+     */
+    public static void setAll(int[] array, IntUnaryOperator generator) {
+        Objects.requireNonNull(generator);
+        for (int i = 0; i < array.length; i++)
+            array[i] = generator.applyAsInt(i);
+    }
+
+    /**
+     * Set all elements of the specified array, in parallel, using the
+     * provided generator function to compute each element.
+     *
+     * <p>If the generator function throws an exception, an unchecked exception
+     * is thrown from {@code parallelSetAll} and the array is left in an
+     * indeterminate state.
+     *
+     * @param array array to be initialized
+     * @param generator a function accepting an index and producing the desired
+     * value for that position
+     * @throws NullPointerException if the generator is null
+     * @since 1.8
+     */
+    public static void parallelSetAll(int[] array, IntUnaryOperator generator) {
+        Objects.requireNonNull(generator);
+        IntStream.range(0, array.length).parallel().forEach(i -> { array[i] = generator.applyAsInt(i); });
+    }
+
+    /**
+     * Set all elements of the specified array, using the provided
+     * generator function to compute each element.
+     *
+     * <p>If the generator function throws an exception, it is relayed to
+     * the caller and the array is left in an indeterminate state.
+     *
+     * @param array array to be initialized
+     * @param generator a function accepting an index and producing the desired
+     *        value for that position
+     * @throws NullPointerException if the generator is null
+     * @since 1.8
+     */
+    public static void setAll(long[] array, IntToLongFunction generator) {
+        Objects.requireNonNull(generator);
+        for (int i = 0; i < array.length; i++)
+            array[i] = generator.applyAsLong(i);
+    }
+
+    /**
+     * Set all elements of the specified array, in parallel, using the
+     * provided generator function to compute each element.
+     *
+     * <p>If the generator function throws an exception, an unchecked exception
+     * is thrown from {@code parallelSetAll} and the array is left in an
+     * indeterminate state.
+     *
+     * @param array array to be initialized
+     * @param generator a function accepting an index and producing the desired
+     *        value for that position
+     * @throws NullPointerException if the generator is null
+     * @since 1.8
+     */
+    public static void parallelSetAll(long[] array, IntToLongFunction generator) {
+        Objects.requireNonNull(generator);
+        IntStream.range(0, array.length).parallel().forEach(i -> { array[i] = generator.applyAsLong(i); });
+    }
+
+    /**
+     * Set all elements of the specified array, using the provided
+     * generator function to compute each element.
+     *
+     * <p>If the generator function throws an exception, it is relayed to
+     * the caller and the array is left in an indeterminate state.
+     *
+     * @param array array to be initialized
+     * @param generator a function accepting an index and producing the desired
+     *        value for that position
+     * @throws NullPointerException if the generator is null
+     * @since 1.8
+     */
+    public static void setAll(double[] array, IntToDoubleFunction generator) {
+        Objects.requireNonNull(generator);
+        for (int i = 0; i < array.length; i++)
+            array[i] = generator.applyAsDouble(i);
+    }
+
+    /**
+     * Set all elements of the specified array, in parallel, using the
+     * provided generator function to compute each element.
+     *
+     * <p>If the generator function throws an exception, an unchecked exception
+     * is thrown from {@code parallelSetAll} and the array is left in an
+     * indeterminate state.
+     *
+     * @param array array to be initialized
+     * @param generator a function accepting an index and producing the desired
+     *        value for that position
+     * @throws NullPointerException if the generator is null
+     * @since 1.8
+     */
+    public static void parallelSetAll(double[] array, IntToDoubleFunction generator) {
+        Objects.requireNonNull(generator);
+        IntStream.range(0, array.length).parallel().forEach(i -> { array[i] = generator.applyAsDouble(i); });
+    }
+
+    /**
+     * Returns a {@link Spliterator} covering all of the specified array.
      *
      * <p>The spliterator reports {@link Spliterator#SIZED},
      * {@link Spliterator#SUBSIZED}, {@link Spliterator#ORDERED}, and
      * {@link Spliterator#IMMUTABLE}.
      *
-     * @param <T> Type of elements
-     * @param array The array, assumed to be unmodified during use
-     * @return A spliterator from the array
-     * @throws NullPointerException if the specified array is {@code null}
+     * @param <T> type of elements
+     * @param array the array, assumed to be unmodified during use
+     * @return a spliterator for the array elements
      * @since 1.8
      */
     public static <T> Spliterator<T> spliterator(T[] array) {
@@ -4325,39 +4493,38 @@
     }
 
     /**
-     * Creates a {@link Spliterator} covering the specified range of the
+     * Returns a {@link Spliterator} covering the specified range of the
      * specified array.
      *
      * <p>The spliterator reports {@link Spliterator#SIZED},
      * {@link Spliterator#SUBSIZED}, {@link Spliterator#ORDERED}, and
      * {@link Spliterator#IMMUTABLE}.
      *
-     * @param <T> Type of elements
-     * @param array The array, assumed to be unmodified during use
-     * @param fromIndex The least index (inclusive) to cover
-     * @param toIndex One past the greatest index to cover
-     * @return A spliterator from the array
-     * @throws NullPointerException if the specified array is {@code null}
-     * @throws ArrayIndexOutOfBoundsException if {@code fromIndex} is negative,
-     *         {@code toIndex} is less than {@code fromIndex}, or
-     *         {@code toIndex} is greater than the array size
+     * @param <T> type of elements
+     * @param array the array, assumed to be unmodified during use
+     * @param startInclusive the first index to cover, inclusive
+     * @param endExclusive index immediately past the last index to cover
+     * @return a spliterator for the array elements
+     * @throws ArrayIndexOutOfBoundsException if {@code startInclusive} is
+     *         negative, {@code endExclusive} is less than
+     *         {@code startInclusive}, or {@code endExclusive} is greater than
+     *         the array size
      * @since 1.8
      */
-    public static <T> Spliterator<T> spliterator(T[] array, int fromIndex, int toIndex) {
-        return Spliterators.spliterator(array, fromIndex, toIndex,
+    public static <T> Spliterator<T> spliterator(T[] array, int startInclusive, int endExclusive) {
+        return Spliterators.spliterator(array, startInclusive, endExclusive,
                                         Spliterator.ORDERED | Spliterator.IMMUTABLE);
     }
 
     /**
-     * Creates a {@link Spliterator.OfInt} covering all of the specified array.
+     * Returns a {@link Spliterator.OfInt} covering all of the specified array.
      *
      * <p>The spliterator reports {@link Spliterator#SIZED},
      * {@link Spliterator#SUBSIZED}, {@link Spliterator#ORDERED}, and
      * {@link Spliterator#IMMUTABLE}.
      *
-     * @param array The array, assumed to be unmodified during use
-     * @return A spliterator from the array
-     * @throws NullPointerException if the specified array is {@code null}
+     * @param array the array, assumed to be unmodified during use
+     * @return a spliterator for the array elements
      * @since 1.8
      */
     public static Spliterator.OfInt spliterator(int[] array) {
@@ -4366,38 +4533,37 @@
     }
 
     /**
-     * Creates a {@link Spliterator.OfInt} covering the specified range of the
+     * Returns a {@link Spliterator.OfInt} covering the specified range of the
      * specified array.
      *
      * <p>The spliterator reports {@link Spliterator#SIZED},
      * {@link Spliterator#SUBSIZED}, {@link Spliterator#ORDERED}, and
      * {@link Spliterator#IMMUTABLE}.
      *
-     * @param array The array, assumed to be unmodified during use
-     * @param fromIndex The least index (inclusive) to cover
-     * @param toIndex One past the greatest index to cover
-     * @return A spliterator from the array
-     * @throws NullPointerException if the specified array is {@code null}
-     * @throws ArrayIndexOutOfBoundsException if {@code fromIndex} is negative,
-     *         {@code toIndex} is less than {@code fromIndex}, or
-     *         {@code toIndex} is greater than the array size
+     * @param array the array, assumed to be unmodified during use
+     * @param startInclusive the first index to cover, inclusive
+     * @param endExclusive index immediately past the last index to cover
+     * @return a spliterator for the array elements
+     * @throws ArrayIndexOutOfBoundsException if {@code startInclusive} is
+     *         negative, {@code endExclusive} is less than
+     *         {@code startInclusive}, or {@code endExclusive} is greater than
+     *         the array size
      * @since 1.8
      */
-    public static Spliterator.OfInt spliterator(int[] array, int fromIndex, int toIndex) {
-        return Spliterators.spliterator(array, fromIndex, toIndex,
+    public static Spliterator.OfInt spliterator(int[] array, int startInclusive, int endExclusive) {
+        return Spliterators.spliterator(array, startInclusive, endExclusive,
                                         Spliterator.ORDERED | Spliterator.IMMUTABLE);
     }
 
     /**
-     * Creates a {@link Spliterator.OfLong} covering all of the specified array.
+     * Returns a {@link Spliterator.OfLong} covering all of the specified array.
      *
      * <p>The spliterator reports {@link Spliterator#SIZED},
      * {@link Spliterator#SUBSIZED}, {@link Spliterator#ORDERED}, and
      * {@link Spliterator#IMMUTABLE}.
      *
-     * @param array The array, assumed to be unmodified during use
-     * @return A spliterator from the array
-     * @throws NullPointerException if the specified array is {@code null}
+     * @param array the array, assumed to be unmodified during use
+     * @return the spliterator for the array elements
      * @since 1.8
      */
     public static Spliterator.OfLong spliterator(long[] array) {
@@ -4406,39 +4572,38 @@
     }
 
     /**
-     * Creates a {@link Spliterator.OfLong} covering the specified range of the
+     * Returns a {@link Spliterator.OfLong} covering the specified range of the
      * specified array.
      *
      * <p>The spliterator reports {@link Spliterator#SIZED},
      * {@link Spliterator#SUBSIZED}, {@link Spliterator#ORDERED}, and
      * {@link Spliterator#IMMUTABLE}.
      *
-     * @param array The array, assumed to be unmodified during use
-     * @param fromIndex The least index (inclusive) to cover
-     * @param toIndex One past the greatest index to cover
-     * @return A spliterator from the array
-     * @throws NullPointerException if the specified array is {@code null}
-     * @throws ArrayIndexOutOfBoundsException if {@code fromIndex} is negative,
-     *         {@code toIndex} is less than {@code fromIndex}, or
-     *         {@code toIndex} is greater than the array size
+     * @param array the array, assumed to be unmodified during use
+     * @param startInclusive the first index to cover, inclusive
+     * @param endExclusive index immediately past the last index to cover
+     * @return a spliterator for the array elements
+     * @throws ArrayIndexOutOfBoundsException if {@code startInclusive} is
+     *         negative, {@code endExclusive} is less than
+     *         {@code startInclusive}, or {@code endExclusive} is greater than
+     *         the array size
      * @since 1.8
      */
-    public static Spliterator.OfLong spliterator(long[] array, int fromIndex, int toIndex) {
-        return Spliterators.spliterator(array, fromIndex, toIndex,
+    public static Spliterator.OfLong spliterator(long[] array, int startInclusive, int endExclusive) {
+        return Spliterators.spliterator(array, startInclusive, endExclusive,
                                         Spliterator.ORDERED | Spliterator.IMMUTABLE);
     }
 
     /**
-     * Creates a {@link Spliterator.OfDouble} covering all of the specified
+     * Returns a {@link Spliterator.OfDouble} covering all of the specified
      * array.
      *
      * <p>The spliterator reports {@link Spliterator#SIZED},
      * {@link Spliterator#SUBSIZED}, {@link Spliterator#ORDERED}, and
      * {@link Spliterator#IMMUTABLE}.
      *
-     * @param array The array, assumed to be unmodified during use
-     * @return A spliterator from the array
-     * @throws NullPointerException if the specified array is {@code null}
+     * @param array the array, assumed to be unmodified during use
+     * @return a spliterator for the array elements
      * @since 1.8
      */
     public static Spliterator.OfDouble spliterator(double[] array) {
@@ -4447,25 +4612,147 @@
     }
 
     /**
-     * Creates a {@link Spliterator.OfDouble} covering the specified range of
+     * Returns a {@link Spliterator.OfDouble} covering the specified range of
      * the specified array.
      *
      * <p>The spliterator reports {@link Spliterator#SIZED},
      * {@link Spliterator#SUBSIZED}, {@link Spliterator#ORDERED}, and
      * {@link Spliterator#IMMUTABLE}.
      *
+     * @param array the array, assumed to be unmodified during use
+     * @param startInclusive the first index to cover, inclusive
+     * @param endExclusive index immediately past the last index to cover
+     * @return a spliterator for the array elements
+     * @throws ArrayIndexOutOfBoundsException if {@code startInclusive} is
+     *         negative, {@code endExclusive} is less than
+     *         {@code startInclusive}, or {@code endExclusive} is greater than
+     *         the array size
+     * @since 1.8
+     */
+    public static Spliterator.OfDouble spliterator(double[] array, int startInclusive, int endExclusive) {
+        return Spliterators.spliterator(array, startInclusive, endExclusive,
+                                        Spliterator.ORDERED | Spliterator.IMMUTABLE);
+    }
+
+    /**
+     * Returns a sequential {@link Stream} with the specified array as its
+     * source.
+     *
+     * @param <T> The type of the array elements
      * @param array The array, assumed to be unmodified during use
-     * @param fromIndex The least index (inclusive) to cover
-     * @param toIndex One past the greatest index to cover
-     * @return A spliterator from the array
-     * @throws NullPointerException if the specified array is {@code null}
-     * @throws ArrayIndexOutOfBoundsException if {@code fromIndex} is negative,
-     *         {@code toIndex} is less than {@code fromIndex}, or
-     *         {@code toIndex} is greater than the array size
+     * @return a {@code Stream} for the array
+     * @since 1.8
+     */
+    public static <T> Stream<T> stream(T[] array) {
+        return stream(array, 0, array.length);
+    }
+
+    /**
+     * Returns a sequential {@link Stream} with the specified range of the
+     * specified array as its source.
+     *
+     * @param <T> the type of the array elements
+     * @param array the array, assumed to be unmodified during use
+     * @param startInclusive the first index to cover, inclusive
+     * @param endExclusive index immediately past the last index to cover
+     * @return a {@code Stream} for the array range
+     * @throws ArrayIndexOutOfBoundsException if {@code startInclusive} is
+     *         negative, {@code endExclusive} is less than
+     *         {@code startInclusive}, or {@code endExclusive} is greater than
+     *         the array size
+     * @since 1.8
+     */
+    public static <T> Stream<T> stream(T[] array, int startInclusive, int endExclusive) {
+        return StreamSupport.stream(spliterator(array, startInclusive, endExclusive));
+    }
+
+    /**
+     * Returns a sequential {@link IntStream} with the specified array as its
+     * source.
+     *
+     * @param array the array, assumed to be unmodified during use
+     * @return an {@code IntStream} for the array
      * @since 1.8
      */
-    public static Spliterator.OfDouble spliterator(double[] array, int fromIndex, int toIndex) {
-        return Spliterators.spliterator(array, fromIndex, toIndex,
-                                        Spliterator.ORDERED | Spliterator.IMMUTABLE);
+    public static IntStream stream(int[] array) {
+        return stream(array, 0, array.length);
+    }
+
+    /**
+     * Returns a sequential {@link IntStream} with the specified range of the
+     * specified array as its source.
+     *
+     * @param array the array, assumed to be unmodified during use
+     * @param startInclusive the first index to cover, inclusive
+     * @param endExclusive index immediately past the last index to cover
+     * @return an {@code IntStream} for the array range
+     * @throws ArrayIndexOutOfBoundsException if {@code startInclusive} is
+     *         negative, {@code endExclusive} is less than
+     *         {@code startInclusive}, or {@code endExclusive} is greater than
+     *         the array size
+     * @since 1.8
+     */
+    public static IntStream stream(int[] array, int startInclusive, int endExclusive) {
+        return StreamSupport.intStream(spliterator(array, startInclusive, endExclusive));
+    }
+
+    /**
+     * Returns a sequential {@link LongStream} with the specified array as its
+     * source.
+     *
+     * @param array the array, assumed to be unmodified during use
+     * @return a {@code LongStream} for the array
+     * @since 1.8
+     */
+    public static LongStream stream(long[] array) {
+        return stream(array, 0, array.length);
+    }
+
+    /**
+     * Returns a sequential {@link LongStream} with the specified range of the
+     * specified array as its source.
+     *
+     * @param array the array, assumed to be unmodified during use
+     * @param startInclusive the first index to cover, inclusive
+     * @param endExclusive index immediately past the last index to cover
+     * @return a {@code LongStream} for the array range
+     * @throws ArrayIndexOutOfBoundsException if {@code startInclusive} is
+     *         negative, {@code endExclusive} is less than
+     *         {@code startInclusive}, or {@code endExclusive} is greater than
+     *         the array size
+     * @since 1.8
+     */
+    public static LongStream stream(long[] array, int startInclusive, int endExclusive) {
+        return StreamSupport.longStream(spliterator(array, startInclusive, endExclusive));
+    }
+
+    /**
+     * Returns a sequential {@link DoubleStream} with the specified array as its
+     * source.
+     *
+     * @param array the array, assumed to be unmodified during use
+     * @return a {@code DoubleStream} for the array
+     * @since 1.8
+     */
+    public static DoubleStream stream(double[] array) {
+        return stream(array, 0, array.length);
+    }
+
+    /**
+     * Returns a sequential {@link DoubleStream} with the specified range of the
+     * specified array as its source.
+     *
+     * @param array the array, assumed to be unmodified during use
+     * @param startInclusive the first index to cover, inclusive
+     * @param endExclusive index immediately past the last index to cover
+     * @return a {@code DoubleStream} for the array range
+     * @throws ArrayIndexOutOfBoundsException if {@code startInclusive} is
+     *         negative, {@code endExclusive} is less than
+     *         {@code startInclusive}, or {@code endExclusive} is greater than
+     *         the array size
+     * @since 1.8
+     */
+    public static DoubleStream stream(double[] array, int startInclusive, int endExclusive) {
+        return StreamSupport.doubleStream(spliterator(array, startInclusive, endExclusive));
     }
 }
--- a/jdk/src/share/classes/java/util/Base64.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/util/Base64.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,6 +139,9 @@
                  throw new IllegalArgumentException(
                      "Illegal base64 line separator character 0x" + Integer.toString(b, 16));
          }
+         if (lineLength <= 0) {
+             return Encoder.RFC4648;
+         }
          return new Encoder(false, lineSeparator, lineLength >> 2 << 2);
     }
 
--- a/jdk/src/share/classes/java/util/Collection.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/util/Collection.java	Wed May 08 11:22:25 2013 +0100
@@ -26,6 +26,8 @@
 package java.util;
 
 import java.util.function.Predicate;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 /**
  * The root interface in the <i>collection hierarchy</i>.  A collection
@@ -499,9 +501,28 @@
     /**
      * Creates a {@link Spliterator} over the elements in this collection.
      *
-     * <p>The {@code Spliterator} reports {@link Spliterator#SIZED}.
-     * Implementations should document the reporting of additional
-     * characteristic values.
+     * <p>The returned {@code Spliterator} must report the characteristic
+     * {@link Spliterator#SIZED}; implementations should document any additional
+     * characteristic values reported by the returned Spliterator.
+     *
+     * <p>The default implementation should be overridden by subclasses that
+     * can return a more efficient spliterator.  In order to
+     * preserve expected laziness behavior for the {@link #stream()} and
+     * {@link #parallelStream()}} methods, spliterators should either have the
+     * characteristic of {@code IMMUTABLE} or {@code CONCURRENT}, or be
+     * <em><a href="Spliterator.html#binding">late-binding</a></em>.
+     * If none of these is practical, the overriding class should describe the
+     * spliterator's documented policy of binding and structural interference,
+     * and should override the {@link #stream()} and {@link #parallelStream()}
+     * methods to create streams using a {@code Supplier} of the spliterator,
+     * as in:
+     * <pre>{@code
+     *     Stream<E> s = StreamSupport.stream(() -> spliterator(), spliteratorCharacteristics)
+     * }</pre>
+     * <p>These requirements ensure that streams produced by the
+     * {@link #stream()} and {@link #parallelStream()} methods will reflect the
+     * contents of the collection as of initiation of the terminal stream
+     * operation.
      *
      * @implSpec
      * The default implementation creates a
@@ -510,7 +531,7 @@
      * <em>fail-fast</em> properties of the collection's iterator.
      *
      * @implNote
-     * The created {@code Spliterator} additionally reports
+     * The returned {@code Spliterator} additionally reports
      * {@link Spliterator#SUBSIZED}.
      *
      * @return a {@code Spliterator} over the elements in this collection
@@ -519,4 +540,44 @@
     default Spliterator<E> spliterator() {
         return Spliterators.spliterator(this, 0);
     }
+
+    /**
+     * Returns a sequential {@code Stream} with this collection as its source.
+     *
+     * <p>This method should be overridden when the {@link #spliterator()}
+     * method cannot return a spliterator that is {@code IMMUTABLE},
+     * {@code CONCURRENT}, or <em>late-binding</em>. (See {@link #spliterator()}
+     * for details.)
+     *
+     * @implSpec
+     * The default implementation creates a sequential {@code Stream} from the
+     * collection's {@code Spliterator}.
+     *
+     * @return a sequential {@code Stream} over the elements in this collection
+     * @since 1.8
+     */
+    default Stream<E> stream() {
+        return StreamSupport.stream(spliterator());
+    }
+
+    /**
+     * Returns a possibly parallel {@code Stream} with this collection as its
+     * source.  It is allowable for this method to return a sequential stream.
+     *
+     * <p>This method should be overridden when the {@link #spliterator()}
+     * method cannot return a spliterator that is {@code IMMUTABLE},
+     * {@code CONCURRENT}, or <em>late-binding</em>. (See {@link #spliterator()}
+     * for details.)
+     *
+     * @implSpec
+     * The default implementation creates a parallel {@code Stream} from the
+     * collection's {@code Spliterator}.
+     *
+     * @return a possibly parallel {@code Stream} over the elements in this
+     * collection
+     * @since 1.8
+     */
+    default Stream<E> parallelStream() {
+        return StreamSupport.parallelStream(spliterator());
+    }
 }
--- a/jdk/src/share/classes/java/util/LinkedList.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/util/LinkedList.java	Wed May 08 11:22:25 2013 +0100
@@ -957,6 +957,7 @@
                 next = next.next;
                 nextIndex++;
             }
+            lastReturned = next;
             checkForComodification();
         }
 
--- a/jdk/src/share/classes/java/util/Spliterator.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/util/Spliterator.java	Wed May 08 11:22:25 2013 +0100
@@ -438,7 +438,7 @@
     /**
      * If this Spliterator's source is {@link #SORTED} by a {@link Comparator},
      * returns that {@code Comparator}. If the source is {@code SORTED} in
-     * {@linkplain Comparable natural order, returns {@code null}.  Otherwise,
+     * {@linkplain Comparable natural order}, returns {@code null}.  Otherwise,
      * if the source is not {@code SORTED}, throws {@link IllegalStateException}.
      *
      * @implSpec
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/StringJoiner.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util;
+
+/**
+ * {@code StringJoiner} is used to construct a sequence of characters separated
+ * by a delimiter and optionally starting with a supplied prefix
+ * and ending with a supplied suffix.
+ * <p>
+ * For example, the String {@code "[George:Sally:Fred]"} may
+ * be constructed as follows:
+ * <pre> {@code
+ *     StringJoiner sj = new StringJoiner(":", "[", "]");
+ *     sj.add("George").add("Sally").add("Fred");
+ *     String desiredString = sj.toString();
+ * }</pre>
+ * <p>
+ * Prior to adding something to the {@code StringJoiner}, its
+ * {@code sj.toString()} method will, by default, return {@code prefix + suffix}.
+ * However, if the {@code setEmptyValue} method is called, the {@code emptyValue}
+ * supplied will be returned instead. This can be used, for example, when
+ * creating a string using set notation to indicate an empty set, i.e.
+ * <code>"{}"</code>, where the {@code prefix} is <code>"{"</code>, the
+ * {@code suffix} is <code>"}"</code> and nothing has been added to the
+ * {@code StringJoiner}.
+ * <p>
+ * A {@code StringJoiner} may be employed to create formatted output from a
+ * collection using lambda expressions as shown in the following example.
+ *
+ * <pre> {@code
+ *     List<Person> people = ...
+ *     String commaSeparatedNames =
+ *         people.map(p -> p.getName()).into(new StringJoiner(", ")).toString();
+ * }</pre>
+ *
+ * @author Jim Gish
+ * @since  1.8
+*/
+public final class StringJoiner {
+    private final String prefix;
+    private final String delimiter;
+    private final String suffix;
+
+    /*
+     * StringBuilder value -- at any time, the characters constructed from the
+     * prefix, the added element separated by the delimiter, but without the
+     * suffix, so that we can more easily add elements without having to jigger
+     * the suffix each time.
+     */
+    private StringBuilder value;
+
+    /*
+     * By default, the string consisting of prefix+suffix, returned by
+     * toString(), or properties of value, when no elements have yet been added,
+     * i.e. when it is empty.  This may be overridden by the user to be some
+     * other value including the empty String.
+     */
+    private String emptyValue;
+
+    /**
+     * Constructs a {@code StringJoiner} with no characters in it, with no
+     * {@code prefix} or {@code suffix}, and a copy of the supplied
+     * {@code delimiter}.
+     * If no characters are added to the {@code StringJoiner} and methods
+     * accessing the value of it are invoked, it will not return a
+     * {@code prefix} or {@code suffix} (or properties thereof) in the result,
+     * unless {@code setEmptyValue} has first been called.
+     *
+     * @param  delimiter the sequence of characters to be used between each
+     *         element added to the {@code StringJoiner} value
+     * @throws NullPointerException if {@code delimiter} is {@code null}
+     */
+    public StringJoiner(CharSequence delimiter) {
+        this(delimiter, "", "");
+    }
+
+    /**
+     * Constructs a {@code StringJoiner} with no characters in it using copies
+     * of the supplied {@code prefix}, {@code delimiter} and {@code suffix}.
+     * If no characters are added to the {@code StringJoiner} and methods
+     * accessing the string value of it are invoked, it will return the
+     * {@code prefix + suffix} (or properties thereof) in the result, unless
+     * {@code setEmptyValue} has first been called.
+     *
+     * @param  delimiter the sequence of characters to be used between each
+     *         element added to the {@code StringJoiner}
+     * @param  prefix the sequence of characters to be used at the beginning
+     * @param  suffix the sequence of characters to be used at the end
+     * @throws NullPointerException if {@code prefix}, {@code delimiter}, or
+     *         {@code suffix} is {@code null}
+     */
+    public StringJoiner(CharSequence delimiter, CharSequence prefix,
+            CharSequence suffix) {
+        Objects.requireNonNull(prefix, "The prefix must not be null");
+        Objects.requireNonNull(delimiter, "The delimiter must not be null");
+        Objects.requireNonNull(suffix, "The suffix must not be null");
+        // make defensive copies of arguments
+        this.prefix = prefix.toString();
+        this.delimiter = delimiter.toString();
+        this.suffix = suffix.toString();
+        this.emptyValue = this.prefix + this.suffix;
+    }
+
+    /**
+     * Sets the sequence of characters to be used when determining the string
+     * representation of this {@code StringJoiner} and no elements have been
+     * added yet, i.e. when it is empty.  A copy of the {@code emptyValue}
+     * parameter is made for this purpose. Note that once an add method has been
+     * called, the {@code StringJoiner} is no longer considered empty, even if
+     * the element(s) added correspond to the empty {@code String}.
+     *
+     * @param  emptyValue the characters to return as the value of an empty
+     *         {@code StringJoiner}
+     * @return this {@code StringJoiner} itself so the calls may be chained
+     * @throws NullPointerException when the {@code emptyValue} parameter is
+     *         {@code null}
+     */
+    public StringJoiner setEmptyValue(CharSequence emptyValue) {
+        this.emptyValue = Objects.requireNonNull(emptyValue,
+            "The empty value must not be null").toString();
+        return this;
+    }
+
+    /**
+     * Returns the current value, consisting of the {@code prefix}, the values
+     * added so far separated by the {@code delimiter}, and the {@code suffix},
+     * unless no elements have been added in which case, the
+     * {@code prefix + suffix} or the {@code emptyValue} characters are returned
+     *
+     * @return the string representation of this {@code StringJoiner}
+     */
+    @Override
+    public String toString() {
+        if (value == null) {
+            return emptyValue;
+        } else {
+            if (suffix.equals("")) {
+                return value.toString();
+            } else {
+                int initialLength = value.length();
+                String result = value.append(suffix).toString();
+                // reset value to pre-append initialLength
+                value.setLength(initialLength);
+                return result;
+            }
+        }
+    }
+
+    /**
+     * Add the a copy of the supplied {@code CharSequence} value as the next
+     * element of the {@code StringJoiner} value. If {@code newElement} is
+     * {@code null}, then {@code "null"} is added.
+     *
+     * @param  newElement The element to add
+     * @return a reference to this {@code StringJoiner}
+     */
+    public StringJoiner add(CharSequence newElement) {
+        prepareBuilder().append(newElement);
+        return this;
+    }
+
+    private StringBuilder prepareBuilder() {
+        if (value != null) {
+            value.append(delimiter);
+        } else {
+            value = new StringBuilder().append(prefix);
+        }
+        return value;
+    }
+
+    /**
+     * The length of the {@code StringJoiner} value, i.e. the length of
+     * {@code String} representation of the {@code StringJoiner}. Note that if
+     * no add methods have been called, then the length of the {@code String}
+     * representation (either {@code prefix + suffix} or {@code emptyValue})
+     * will be returned. The value should be equivalent to
+     * {@code toString().length()}.
+     *
+     * @return the length of the current value of {@code StringJoiner}
+     */
+    public int length() {
+        // Remember that we never actually append the suffix unless we return
+        // the full (present) value or some sub-string or length of it, so that
+        // we can add on more if we need to.
+        return (value != null ? value.length() + suffix.length() :
+                emptyValue.length());
+    }
+}
--- a/jdk/src/share/classes/java/util/Vector.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/util/Vector.java	Wed May 08 11:22:25 2013 +0100
@@ -29,8 +29,6 @@
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 
-import java.util.function.Consumer;
-
 /**
  * The {@code Vector} class implements a growable array of
  * objects. Like an array, it contains components that can be
@@ -1161,7 +1159,7 @@
         public void forEachRemaining(Consumer<? super E> action) {
             Objects.requireNonNull(action);
             synchronized (Vector.this) {
-                final int size = Vector.this.elementCount;
+                final int size = elementCount;
                 int i = cursor;
                 if (i >= size) {
                     return;
--- a/jdk/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java	Wed May 08 11:22:25 2013 +0100
@@ -1059,6 +1059,17 @@
         public void add(E e) {
             throw new UnsupportedOperationException();
         }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public void forEachRemaining(Consumer<? super E> action) {
+            Objects.requireNonNull(action);
+            final int size = snapshot.length;
+            for (int i=cursor; i < size; i++) {
+                action.accept((E) snapshot[i]);
+            }
+            cursor = size;
+        }
     }
 
     /**
@@ -1367,6 +1378,15 @@
         public void add(E e) {
             throw new UnsupportedOperationException();
         }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public void forEachRemaining(Consumer<? super E> action) {
+            Objects.requireNonNull(action);
+            while (nextIndex() < size) {
+                action.accept(it.next());
+            }
+        }
     }
 
     // Support for resetting lock while deserializing
--- a/jdk/src/share/classes/java/util/regex/Pattern.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/util/regex/Pattern.java	Wed May 08 11:22:25 2013 +0100
@@ -4334,7 +4334,6 @@
                 info.deterministic = detm;
             else
                 info.deterministic = false;
-
             return next.study(info);
         }
     }
@@ -4415,6 +4414,8 @@
         }
         // Aggressive group match
         boolean match0(Matcher matcher, int i, int j, CharSequence seq) {
+            // don't back off passing the starting "j"
+            int min = j;
             int[] groups = matcher.groups;
             int save0 = 0;
             int save1 = 0;
@@ -4452,7 +4453,7 @@
                         break;
                     }
                 }
-                while (j > cmin) {
+                while (j > min) {
                     if (next.match(matcher, i, seq)) {
                         if (capture) {
                             groups[groupIndex+1] = i;
@@ -4544,7 +4545,6 @@
             } else {
                 info.deterministic = false;
             }
-
             return next.study(info);
         }
     }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/AbstractPipeline.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,674 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+import java.util.Objects;
+import java.util.Spliterator;
+import java.util.function.IntFunction;
+import java.util.function.Supplier;
+
+/**
+ * Abstract base class for "pipeline" classes, which are the core
+ * implementations of the Stream interface and its primitive specializations.
+ * Manages construction and evaluation of stream pipelines.
+ *
+ * <p>An {@code AbstractPipeline} represents an initial portion of a stream
+ * pipeline, encapsulating a stream source and zero or more intermediate
+ * operations.  The individual {@code AbstractPipeline} objects are often
+ * referred to as <em>stages</em>, where each stage describes either the stream
+ * source or an intermediate operation.
+ *
+ * <p>A concrete intermediate stage is generally built from an
+ * {@code AbstractPipeline}, a shape-specific pipeline class which extends it
+ * (e.g., {@code IntPipeline}) which is also abstract, and an operation-specific
+ * concrete class which extends that.  {@code AbstractPipeline} contains most of
+ * the mechanics of evaluating the pipeline, and implements methods that will be
+ * used by the operation; the shape-specific classes add helper methods for
+ * dealing with collection of results into the appropriate shape-specific
+ * containers.
+ *
+ * <p>After chaining a new intermediate operation, or executing a terminal
+ * operation, the stream is considered to be consumed, and no more intermediate
+ * or terminal operations are permitted on this stream instance.
+ *
+ * <p>{@code AbstractPipeline} implements a number of methods that are
+ * specified in {@link BaseStream}, though it does not implement
+ * {@code BaseStream} directly.  Subclasses of {@code AbstractPipeline}
+ * will generally implement {@code BaseStream}.
+ *
+ * @implNote
+ * <p>For sequential streams, and parallel streams without
+ * <a href="package-summary.html#StreamOps">stateful intermediate
+ * operations</a>, parallel streams, pipeline evaluation is done in a single
+ * pass that "jams" all the operations together.  For parallel streams with
+ * stateful operations, execution is divided into segments, where each
+ * stateful operations marks the end of a segment, and each segment is
+ * evaluated separately and the result used as the input to the next
+ * segment.  In all cases, the source data is not consumed until a terminal
+ * operation begins.
+ *
+ * @param <E_IN>  type of input elements
+ * @param <E_OUT> type of output elements
+ * @param <S> type of the subclass implementing {@code BaseStream}
+ * @since 1.8
+ */
+abstract class AbstractPipeline<E_IN, E_OUT, S extends BaseStream<E_OUT, S>>
+        extends PipelineHelper<E_OUT> {
+    /**
+     * Backlink to the head of the pipeline chain (self if this is the source
+     * stage).
+     */
+    private final AbstractPipeline sourceStage;
+
+    /**
+     * The "upstream" pipeline, or null if this is the source stage.
+     */
+    private final AbstractPipeline previousStage;
+
+    /**
+     * The operation flags for the intermediate operation represented by this
+     * pipeline object.
+     */
+    protected final int sourceOrOpFlags;
+
+    /**
+     * The next stage in the pipeline, or null if this is the last stage.
+     * Effectively final at the point of linking to the next pipeline.
+     */
+    private AbstractPipeline nextStage;
+
+    /**
+     * The number of intermediate operations between this pipeline object
+     * and the stream source if sequential, or the previous stateful if parallel.
+     * Valid at the point of pipeline preparation for evaluation.
+     */
+    private int depth;
+
+    /**
+     * The combined source and operation flags for the source and all operations
+     * up to and including the operation represented by this pipeline object.
+     * Valid at the point of pipeline preparation for evaluation.
+     */
+    private int combinedFlags;
+
+    /**
+     * The source spliterator. Only valid for the head pipeline.
+     * Before the pipeline is consumed if non-null then {@code sourceSupplier}
+     * must be null. After the pipeline is consumed if non-null then is set to
+     * null.
+     */
+    private Spliterator<?> sourceSpliterator;
+
+    /**
+     * The source supplier. Only valid for the head pipeline. Before the
+     * pipeline is consumed if non-null then {@code sourceSpliterator} must be
+     * null. After the pipeline is consumed if non-null then is set to null.
+     */
+    private Supplier<? extends Spliterator<?>> sourceSupplier;
+
+    /**
+     * True if this pipeline has been linked or consumed
+     */
+    private boolean linkedOrConsumed;
+
+    /**
+     * True if there are any stateful ops in the pipeline; only valid for the
+     * source stage.
+     */
+    private boolean sourceAnyStateful;
+
+    /**
+     * True if pipeline is parallel, otherwise the pipeline is sequential; only
+     * valid for the source stage.
+     */
+    private boolean parallel;
+
+    /**
+     * Constructor for the head of a stream pipeline.
+     *
+     * @param source {@code Supplier<Spliterator>} describing the stream source
+     * @param sourceFlags The source flags for the stream source, described in
+     * {@link StreamOpFlag}
+     * @param parallel True if the pipeline is parallel
+     */
+    AbstractPipeline(Supplier<? extends Spliterator<?>> source,
+                     int sourceFlags, boolean parallel) {
+        this.previousStage = null;
+        this.sourceSupplier = source;
+        this.sourceStage = this;
+        this.sourceOrOpFlags = sourceFlags & StreamOpFlag.STREAM_MASK;
+        // The following is an optimization of:
+        // StreamOpFlag.combineOpFlags(sourceOrOpFlags, StreamOpFlag.INITIAL_OPS_VALUE);
+        this.combinedFlags = (~(sourceOrOpFlags << 1)) & StreamOpFlag.INITIAL_OPS_VALUE;
+        this.depth = 0;
+        this.parallel = parallel;
+    }
+
+    /**
+     * Constructor for the head of a stream pipeline.
+     *
+     * @param source {@code Spliterator} describing the stream source
+     * @param sourceFlags the source flags for the stream source, described in
+     * {@link StreamOpFlag}
+     * @param parallel {@code true} if the pipeline is parallel
+     */
+    AbstractPipeline(Spliterator<?> source,
+                     int sourceFlags, boolean parallel) {
+        this.previousStage = null;
+        this.sourceSpliterator = source;
+        this.sourceStage = this;
+        this.sourceOrOpFlags = sourceFlags & StreamOpFlag.STREAM_MASK;
+        // The following is an optimization of:
+        // StreamOpFlag.combineOpFlags(sourceOrOpFlags, StreamOpFlag.INITIAL_OPS_VALUE);
+        this.combinedFlags = (~(sourceOrOpFlags << 1)) & StreamOpFlag.INITIAL_OPS_VALUE;
+        this.depth = 0;
+        this.parallel = parallel;
+    }
+
+    /**
+     * Constructor for appending an intermediate operation stage onto an
+     * existing pipeline.
+     *
+     * @param previousStage the upstream pipeline stage
+     * @param opFlags the operation flags for the new stage, described in
+     * {@link StreamOpFlag}
+     */
+    AbstractPipeline(AbstractPipeline<?, E_IN, ?> previousStage, int opFlags) {
+        if (previousStage.linkedOrConsumed)
+            throw new IllegalStateException("stream has already been operated upon");
+        previousStage.linkedOrConsumed = true;
+        previousStage.nextStage = this;
+
+        this.previousStage = previousStage;
+        this.sourceOrOpFlags = opFlags & StreamOpFlag.OP_MASK;
+        this.combinedFlags = StreamOpFlag.combineOpFlags(opFlags, previousStage.combinedFlags);
+        this.sourceStage = previousStage.sourceStage;
+        if (opIsStateful())
+            sourceStage.sourceAnyStateful = true;
+        this.depth = previousStage.depth + 1;
+    }
+
+
+    // Terminal evaluation methods
+
+    /**
+     * Evaluate the pipeline with a terminal operation to produce a result.
+     *
+     * @param <R> the type of result
+     * @param terminalOp the terminal operation to be applied to the pipeline.
+     * @return the result
+     */
+    final <R> R evaluate(TerminalOp<E_OUT, R> terminalOp) {
+        assert getOutputShape() == terminalOp.inputShape();
+        if (linkedOrConsumed)
+            throw new IllegalStateException("stream has already been operated upon");
+        linkedOrConsumed = true;
+
+        return isParallel()
+               ? (R) terminalOp.evaluateParallel(this, sourceSpliterator(terminalOp.getOpFlags()))
+               : (R) terminalOp.evaluateSequential(this, sourceSpliterator(terminalOp.getOpFlags()));
+    }
+
+    /**
+     * Collect the elements output from the pipeline stage.
+     *
+     * @param generator the array generator to be used to create array instances
+     * @return a flat array-backed Node that holds the collected output elements
+     */
+    final Node<E_OUT> evaluateToArrayNode(IntFunction<E_OUT[]> generator) {
+        if (linkedOrConsumed)
+            throw new IllegalStateException("stream has already been operated upon");
+        linkedOrConsumed = true;
+
+        // If the last intermediate operation is stateful then
+        // evaluate directly to avoid an extra collection step
+        if (isParallel() && previousStage != null && opIsStateful()) {
+            return opEvaluateParallel(previousStage, previousStage.sourceSpliterator(0), generator);
+        }
+        else {
+            return evaluate(sourceSpliterator(0), true, generator);
+        }
+    }
+
+    /**
+     * Gets the source stage spliterator if this pipeline stage is the source
+     * stage.  The pipeline is consumed after this method is called and
+     * returns successfully.
+     *
+     * @return the source stage spliterator
+     * @throws IllegalStateException if this pipeline stage is not the source
+     *         stage.
+     */
+    final Spliterator<E_OUT> sourceStageSpliterator() {
+        if (this != sourceStage)
+            throw new IllegalStateException();
+
+        if (linkedOrConsumed)
+            throw new IllegalStateException("stream has already been operated upon");
+        linkedOrConsumed = true;
+
+        if (sourceStage.sourceSpliterator != null) {
+            Spliterator<E_OUT> s = sourceStage.sourceSpliterator;
+            sourceStage.sourceSpliterator = null;
+            return s;
+        }
+        else if (sourceStage.sourceSupplier != null) {
+            Spliterator<E_OUT> s = (Spliterator<E_OUT>) sourceStage.sourceSupplier.get();
+            sourceStage.sourceSupplier = null;
+            return s;
+        }
+        else {
+            throw new IllegalStateException("source already consumed");
+        }
+    }
+
+    // BaseStream
+
+    /**
+     * Implements {@link BaseStream#sequential()}
+     */
+    public final S sequential() {
+        sourceStage.parallel = false;
+        return (S) this;
+    }
+
+    /**
+     * Implements {@link BaseStream#parallel()}
+     */
+    public final S parallel() {
+        sourceStage.parallel = true;
+        return (S) this;
+    }
+
+    // Primitive specialization use co-variant overrides, hence is not final
+    /**
+     * Implements {@link BaseStream#spliterator()}
+     */
+    public Spliterator<E_OUT> spliterator() {
+        if (linkedOrConsumed)
+            throw new IllegalStateException("stream has already been operated upon");
+        linkedOrConsumed = true;
+
+        if (this == sourceStage) {
+            if (sourceStage.sourceSpliterator != null) {
+                Spliterator<E_OUT> s = sourceStage.sourceSpliterator;
+                sourceStage.sourceSpliterator = null;
+                return s;
+            }
+            else if (sourceStage.sourceSupplier != null) {
+                Supplier<Spliterator<E_OUT>> s = sourceStage.sourceSupplier;
+                sourceStage.sourceSupplier = null;
+                return lazySpliterator(s);
+            }
+            else {
+                throw new IllegalStateException("source already consumed");
+            }
+        }
+        else {
+            return wrap(this, () -> sourceSpliterator(0), isParallel());
+        }
+    }
+
+    /**
+     * Implements {@link BaseStream#isParallel()}
+     */
+    public final boolean isParallel() {
+        return sourceStage.parallel;
+    }
+
+
+    /**
+     * Returns the composition of stream flags of the stream source and all
+     * intermediate operations.
+     *
+     * @return the composition of stream flags of the stream source and all
+     *         intermediate operations
+     * @see StreamOpFlag
+     */
+    final int getStreamFlags() {
+        return StreamOpFlag.toStreamFlags(combinedFlags);
+    }
+
+    /**
+     * Prepare the pipeline for a parallel execution.  As the pipeline is built,
+     * the flags and depth indicators are set up for a sequential execution.
+     * If the execution is parallel, and there are any stateful operations, then
+     * some of these need to be adjusted, as well as adjusting for flags from
+     * the terminal operation (such as back-propagating UNORDERED).
+     * Need not be called for a sequential execution.
+     *
+     * @param terminalFlags Operation flags for the terminal operation
+     */
+    private void parallelPrepare(int terminalFlags) {
+        AbstractPipeline backPropagationHead = sourceStage;
+        if (sourceStage.sourceAnyStateful) {
+            int depth = 1;
+            for (AbstractPipeline u = sourceStage, p = sourceStage.nextStage;
+                 p != null;
+                 u = p, p = p.nextStage) {
+                int thisOpFlags = p.sourceOrOpFlags;
+                if (p.opIsStateful()) {
+                    // If the stateful operation is a short-circuit operation
+                    // then move the back propagation head forwards
+                    // NOTE: there are no size-injecting ops
+                    if (StreamOpFlag.SHORT_CIRCUIT.isKnown(thisOpFlags)) {
+                        backPropagationHead = p;
+                    }
+
+                    depth = 0;
+                    // The following injects size, it is equivalent to:
+                    // StreamOpFlag.combineOpFlags(StreamOpFlag.IS_SIZED, p.combinedFlags);
+                    thisOpFlags = (thisOpFlags & ~StreamOpFlag.NOT_SIZED) | StreamOpFlag.IS_SIZED;
+                }
+                p.depth = depth++;
+                p.combinedFlags = StreamOpFlag.combineOpFlags(thisOpFlags, u.combinedFlags);
+            }
+        }
+
+        // Apply the upstream terminal flags
+        if (terminalFlags != 0) {
+            int upstreamTerminalFlags = terminalFlags & StreamOpFlag.UPSTREAM_TERMINAL_OP_MASK;
+            for (AbstractPipeline p = backPropagationHead; p.nextStage != null; p = p.nextStage) {
+                p.combinedFlags = StreamOpFlag.combineOpFlags(upstreamTerminalFlags, p.combinedFlags);
+            }
+
+            combinedFlags = StreamOpFlag.combineOpFlags(terminalFlags, combinedFlags);
+        }
+    }
+
+    /**
+     * Get the source spliterator for this pipeline stage.  For a sequential or
+     * stateless parallel pipeline, this is the source spliterator.  For a
+     * stateful parallel pipeline, this is a spliterator describing the results
+     * of all computations up to and including the most recent stateful
+     * operation.
+     */
+    private Spliterator<?> sourceSpliterator(int terminalFlags) {
+        // Get the source spliterator of the pipeline
+        Spliterator<?> spliterator = null;
+        if (sourceStage.sourceSpliterator != null) {
+            spliterator = sourceStage.sourceSpliterator;
+            sourceStage.sourceSpliterator = null;
+        }
+        else if (sourceStage.sourceSupplier != null) {
+            spliterator = (Spliterator<?>) sourceStage.sourceSupplier.get();
+            sourceStage.sourceSupplier = null;
+        }
+        else {
+            throw new IllegalStateException("source already consumed");
+        }
+
+        if (isParallel()) {
+            // @@@ Merge parallelPrepare with the loop below and use the
+            //     spliterator characteristics to determine if SIZED
+            //     should be injected
+            parallelPrepare(terminalFlags);
+
+            // Adapt the source spliterator, evaluating each stateful op
+            // in the pipeline up to and including this pipeline stage
+            for (AbstractPipeline u = sourceStage, p = sourceStage.nextStage, e = this;
+                 u != e;
+                 u = p, p = p.nextStage) {
+
+                if (p.opIsStateful()) {
+                    spliterator = p.opEvaluateParallelLazy(u, spliterator);
+                }
+            }
+        }
+        else if (terminalFlags != 0)  {
+            combinedFlags = StreamOpFlag.combineOpFlags(terminalFlags, combinedFlags);
+        }
+
+        return spliterator;
+    }
+
+
+    // PipelineHelper
+
+    @Override
+    final <P_IN> long exactOutputSizeIfKnown(Spliterator<P_IN> spliterator) {
+        return StreamOpFlag.SIZED.isKnown(getStreamAndOpFlags()) ? spliterator.getExactSizeIfKnown() : -1;
+    }
+
+    @Override
+    final <P_IN, S extends Sink<E_OUT>> S wrapAndCopyInto(S sink, Spliterator<P_IN> spliterator) {
+        copyInto(wrapSink(Objects.requireNonNull(sink)), spliterator);
+        return sink;
+    }
+
+    @Override
+    final <P_IN> void copyInto(Sink<P_IN> wrappedSink, Spliterator<P_IN> spliterator) {
+        Objects.requireNonNull(wrappedSink);
+
+        if (!StreamOpFlag.SHORT_CIRCUIT.isKnown(getStreamAndOpFlags())) {
+            wrappedSink.begin(spliterator.getExactSizeIfKnown());
+            spliterator.forEachRemaining(wrappedSink);
+            wrappedSink.end();
+        }
+        else {
+            copyIntoWithCancel(wrappedSink, spliterator);
+        }
+    }
+
+    @Override
+    final <P_IN> void copyIntoWithCancel(Sink<P_IN> wrappedSink, Spliterator<P_IN> spliterator) {
+        AbstractPipeline p = AbstractPipeline.this;
+        while (p.depth > 0) {
+            p = p.previousStage;
+        }
+        wrappedSink.begin(spliterator.getExactSizeIfKnown());
+        p.forEachWithCancel(spliterator, wrappedSink);
+        wrappedSink.end();
+    }
+
+    @Override
+    final int getStreamAndOpFlags() {
+        return combinedFlags;
+    }
+
+    final boolean isOrdered() {
+        return StreamOpFlag.ORDERED.isKnown(combinedFlags);
+    }
+
+    @Override
+    final <P_IN> Sink<P_IN> wrapSink(Sink<E_OUT> sink) {
+        Objects.requireNonNull(sink);
+
+        for (AbstractPipeline p=AbstractPipeline.this; p.depth > 0; p=p.previousStage) {
+            sink = p.opWrapSink(p.previousStage.combinedFlags, sink);
+        }
+        return (Sink<P_IN>) sink;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    final <P_IN> Node<E_OUT> evaluate(Spliterator<P_IN> spliterator,
+                                      boolean flatten,
+                                      IntFunction<E_OUT[]> generator) {
+        if (isParallel()) {
+            // @@@ Optimize if op of this pipeline stage is a stateful op
+            return evaluateToNode(this, spliterator, flatten, generator);
+        }
+        else {
+            Node.Builder<E_OUT> nb = makeNodeBuilder(
+                    exactOutputSizeIfKnown(spliterator), generator);
+            return wrapAndCopyInto(nb, spliterator).build();
+        }
+    }
+
+
+    // Shape-specific abstract methods, implemented by XxxPipeline classes
+
+    /**
+     * Get the output shape of the pipeline.  If the pipeline is the head,
+     * then it's output shape corresponds to the shape of the source.
+     * Otherwise, it's output shape corresponds to the output shape of the
+     * associated operation.
+     *
+     * @return the output shape
+     */
+    abstract StreamShape getOutputShape();
+
+    /**
+     * Collect elements output from a pipeline into a Node that holds elements
+     * of this shape.
+     *
+     * @param helper the pipeline helper describing the pipeline stages
+     * @param spliterator the source spliterator
+     * @param flattenTree true if the returned node should be flattened
+     * @param generator the array generator
+     * @return a Node holding the output of the pipeline
+     */
+    abstract <P_IN> Node<E_OUT> evaluateToNode(PipelineHelper<E_OUT> helper,
+                                               Spliterator<P_IN> spliterator,
+                                               boolean flattenTree,
+                                               IntFunction<E_OUT[]> generator);
+
+    /**
+     * Create a spliterator that wraps a source spliterator, compatible with
+     * this stream shape, and operations associated with a {@link
+     * PipelineHelper}.
+     *
+     * @param ph the pipeline helper describing the pipeline stages
+     * @param supplier the supplier of a spliterator
+     * @return a wrapping spliterator compatible with this shape
+     */
+    abstract <P_IN> Spliterator<E_OUT> wrap(PipelineHelper<E_OUT> ph,
+                                            Supplier<Spliterator<P_IN>> supplier,
+                                            boolean isParallel);
+
+    /**
+     * Create a lazy spliterator that wraps and obtains the supplied the
+     * spliterator when a method is invoked on the lazy spliterator.
+     * @param supplier the supplier of a spliterator
+     */
+    abstract Spliterator<E_OUT> lazySpliterator(Supplier<? extends Spliterator<E_OUT>> supplier);
+
+    /**
+     * Traverse the elements of a spliterator compatible with this stream shape,
+     * pushing those elements into a sink.   If the sink requests cancellation,
+     * no further elements will be pulled or pushed.
+     *
+     * @param spliterator the spliterator to pull elements from
+     * @param sink the sink to push elements to
+     */
+    abstract void forEachWithCancel(Spliterator<E_OUT> spliterator, Sink<E_OUT> sink);
+
+    /**
+     * Make a node builder compatible with this stream shape.
+     *
+     * @param exactSizeIfKnown if {@literal >=0}, then a node builder will be created that
+     * has a fixed capacity of at most sizeIfKnown elements. If {@literal < 0},
+     * then the node builder has an unfixed capacity. A fixed capacity node
+     * builder will throw exceptions if an element is added after builder has
+     * reached capacity, or is built before the builder has reached capacity.
+     * @param generator the array generator to be used to create instances of a
+     * T[] array. For implementations supporting primitive nodes, this parameter
+     * may be ignored.
+     * @return a node builder
+     */
+    abstract Node.Builder<E_OUT> makeNodeBuilder(long exactSizeIfKnown,
+                                                 IntFunction<E_OUT[]> generator);
+
+
+    // Op-specific abstract methods, implemented by the operation class
+
+    /**
+     * Returns whether this operation is stateful or not.  If it is stateful,
+     * then the method
+     * {@link #opEvaluateParallel(PipelineHelper, java.util.Spliterator, java.util.function.IntFunction)}
+     * must be overridden.
+     *
+     * @return {@code true} if this operation is stateful
+     */
+    abstract boolean opIsStateful();
+
+    /**
+     * Accepts a {@code Sink} which will receive the results of this operation,
+     * and return a {@code Sink} which accepts elements of the input type of
+     * this operation and which performs the operation, passing the results to
+     * the provided {@code Sink}.
+     *
+     * @apiNote
+     * The implementation may use the {@code flags} parameter to optimize the
+     * sink wrapping.  For example, if the input is already {@code DISTINCT},
+     * the implementation for the {@code Stream#distinct()} method could just
+     * return the sink it was passed.
+     *
+     * @param flags The combined stream and operation flags up to, but not
+     *        including, this operation
+     * @param sink sink to which elements should be sent after processing
+     * @return a sink which accepts elements, perform the operation upon
+     *         each element, and passes the results (if any) to the provided
+     *         {@code Sink}.
+     */
+    abstract Sink<E_IN> opWrapSink(int flags, Sink<E_OUT> sink);
+
+    /**
+     * Performs a parallel evaluation of the operation using the specified
+     * {@code PipelineHelper} which describes the upstream intermediate
+     * operations.  Only called on stateful operations.  If {@link
+     * #opIsStateful()} returns true then implementations must override the
+     * default implementation.
+     *
+     * @implSpec The default implementation always throw
+     * {@code UnsupportedOperationException}.
+     *
+     * @param helper the pipeline helper describing the pipeline stages
+     * @param spliterator the source {@code Spliterator}
+     * @param generator the array generator
+     * @return a {@code Node} describing the result of the evaluation
+     */
+    <P_IN> Node<E_OUT> opEvaluateParallel(PipelineHelper<E_OUT> helper,
+                                          Spliterator<P_IN> spliterator,
+                                          IntFunction<E_OUT[]> generator) {
+        throw new UnsupportedOperationException("Parallel evaluation is not supported");
+    }
+
+    /**
+     * Returns a {@code Spliterator} describing a parallel evaluation of the
+     * operation, using the specified {@code PipelineHelper} which describes the
+     * upstream intermediate operations.  Only called on stateful operations.
+     * It is not necessary (though acceptable) to do a full computation of the
+     * result here; it is preferable, if possible, to describe the result via a
+     * lazily evaluated spliterator.
+     *
+     * @implSpec The default implementation behaves as if:
+     * <pre>{@code
+     *     return evaluateParallel(helper, i -> (E_OUT[]) new
+     * Object[i]).spliterator();
+     * }</pre>
+     * and is suitable for implementations that cannot do better than a full
+     * synchronous evaluation.
+     *
+     * @param helper the pipeline helper
+     * @param spliterator the source {@code Spliterator}
+     * @return a {@code Spliterator} describing the result of the evaluation
+     */
+    <P_IN> Spliterator<E_OUT> opEvaluateParallelLazy(PipelineHelper<E_OUT> helper,
+                                                     Spliterator<P_IN> spliterator) {
+        return opEvaluateParallel(helper, spliterator, i -> (E_OUT[]) new Object[i]).spliterator();
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/AbstractSpinedBuffer.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+/**
+ * Base class for a data structure for gathering elements into a buffer and then
+ * iterating them. Maintains an array of increasingly sized arrays, so there is
+ * no copying cost associated with growing the data structure.
+ * @since 1.8
+ */
+abstract class AbstractSpinedBuffer {
+    /**
+     * Minimum power-of-two for the first chunk.
+     */
+    public static final int MIN_CHUNK_POWER = 4;
+
+    /**
+     * Minimum size for the first chunk.
+     */
+    public static final int MIN_CHUNK_SIZE = 1 << MIN_CHUNK_POWER;
+
+    /**
+     * Max power-of-two for chunks.
+     */
+    public static final int MAX_CHUNK_POWER = 30;
+
+    /**
+     * Minimum array size for array-of-chunks.
+     */
+    public static final int MIN_SPINE_SIZE = 8;
+
+
+    /**
+     * log2 of the size of the first chunk.
+     */
+    protected final int initialChunkPower;
+
+    /**
+     * Index of the *next* element to write; may point into, or just outside of,
+     * the current chunk.
+     */
+    protected int elementIndex;
+
+    /**
+     * Index of the *current* chunk in the spine array, if the spine array is
+     * non-null.
+     */
+    protected int spineIndex;
+
+    /**
+     * Count of elements in all prior chunks.
+     */
+    protected long[] priorElementCount;
+
+    /**
+     * Construct with an initial capacity of 16.
+     */
+    protected AbstractSpinedBuffer() {
+        this.initialChunkPower = MIN_CHUNK_POWER;
+    }
+
+    /**
+     * Construct with a specified initial capacity.
+     *
+     * @param initialCapacity The minimum expected number of elements
+     */
+    protected AbstractSpinedBuffer(int initialCapacity) {
+        if (initialCapacity < 0)
+            throw new IllegalArgumentException("Illegal Capacity: "+ initialCapacity);
+
+        this.initialChunkPower = Math.max(MIN_CHUNK_POWER,
+                                          Integer.SIZE - Integer.numberOfLeadingZeros(initialCapacity - 1));
+    }
+
+    /**
+     * Is the buffer currently empty?
+     */
+    public boolean isEmpty() {
+        return (spineIndex == 0) && (elementIndex == 0);
+    }
+
+    /**
+     * How many elements are currently in the buffer?
+     */
+    public long count() {
+        return (spineIndex == 0)
+               ? elementIndex
+               : priorElementCount[spineIndex] + elementIndex;
+    }
+
+    /**
+     * How big should the nth chunk be?
+     */
+    protected int chunkSize(int n) {
+        int power = (n == 0 || n == 1)
+                    ? initialChunkPower
+                    : Math.min(initialChunkPower + n - 1, AbstractSpinedBuffer.MAX_CHUNK_POWER);
+        return 1 << power;
+    }
+
+    /**
+     * Remove all data from the buffer
+     */
+    public abstract void clear();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/Collectors.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,1320 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Comparators;
+import java.util.DoubleSummaryStatistics;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.IntSummaryStatistics;
+import java.util.Iterator;
+import java.util.List;
+import java.util.LongSummaryStatistics;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Set;
+import java.util.StringJoiner;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.BiFunction;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.function.ToDoubleFunction;
+import java.util.function.ToIntFunction;
+import java.util.function.ToLongFunction;
+
+/**
+ * Implementations of {@link Collector} that implement various useful reduction
+ * operations, such as accumulating elements into collections, summarizing
+ * elements according to various criteria, etc.
+ *
+ * <p>The following are examples of using the predefined {@code Collector}
+ * implementations in {@link Collectors} with the {@code Stream} API to perform
+ * mutable reduction tasks:
+ *
+ * <pre>{@code
+ *     // Accumulate elements into a List
+ *     List<Person> list = people.collect(Collectors.toList());
+ *
+ *     // Accumulate elements into a TreeSet
+ *     List<Person> list = people.collect(Collectors.toCollection(TreeSet::new));
+ *
+ *     // Convert elements to strings and concatenate them, separated by commas
+ *     String joined = stream.map(Object::toString)
+ *                           .collect(Collectors.toStringJoiner(", "))
+ *                           .toString();
+ *
+ *     // Find highest-paid employee
+ *     Employee highestPaid = employees.stream()
+ *                                     .collect(Collectors.maxBy(Comparators.comparing(Employee::getSalary)));
+ *
+ *     // Group employees by department
+ *     Map<Department, List<Employee>> byDept
+ *         = employees.stream()
+ *                    .collect(Collectors.groupingBy(Employee::getDepartment));
+ *
+ *     // Find highest-paid employee by department
+ *     Map<Department, Employee> highestPaidByDept
+ *         = employees.stream()
+ *                    .collect(Collectors.groupingBy(Employee::getDepartment,
+ *                                                   Collectors.maxBy(Comparators.comparing(Employee::getSalary))));
+ *
+ *     // Partition students into passing and failing
+ *     Map<Boolean, List<Student>> passingFailing =
+ *         students.stream()
+ *                 .collect(Collectors.partitioningBy(s -> s.getGrade() >= PASS_THRESHOLD);
+ *
+ * }</pre>
+ *
+ * TODO explanation of parallel collection
+ *
+ * @since 1.8
+ */
+public final class Collectors {
+
+    private static final Set<Collector.Characteristics> CH_CONCURRENT
+            = Collections.unmodifiableSet(EnumSet.of(Collector.Characteristics.CONCURRENT,
+                                                     Collector.Characteristics.STRICTLY_MUTATIVE,
+                                                     Collector.Characteristics.UNORDERED));
+    private static final Set<Collector.Characteristics> CH_STRICT
+            = Collections.unmodifiableSet(EnumSet.of(Collector.Characteristics.STRICTLY_MUTATIVE));
+    private static final Set<Collector.Characteristics> CH_STRICT_UNORDERED
+            = Collections.unmodifiableSet(EnumSet.of(Collector.Characteristics.STRICTLY_MUTATIVE,
+                                                     Collector.Characteristics.UNORDERED));
+
+    private Collectors() { }
+
+    /**
+     * Returns a merge function, suitable for use in
+     * {@link Map#merge(Object, Object, BiFunction) Map.merge()} or
+     * {@link #toMap(Function, Function, BinaryOperator) toMap()}, which always
+     * throws {@code IllegalStateException}.  This can be used to enforce the
+     * assumption that the elements being collected are distinct.
+     *
+     * @param <T> the type of input arguments to the merge function
+     * @return a merge function which always throw {@code IllegalStateException}
+     *
+     * @see #firstWinsMerger()
+     * @see #lastWinsMerger()
+     */
+    public static <T> BinaryOperator<T> throwingMerger() {
+        return (u,v) -> { throw new IllegalStateException(String.format("Duplicate key %s", u)); };
+    }
+
+    /**
+     * Returns a merge function, suitable for use in
+     * {@link Map#merge(Object, Object, BiFunction) Map.merge()} or
+     * {@link #toMap(Function, Function, BinaryOperator) toMap()},
+     * which implements a "first wins" policy.
+     *
+     * @param <T> the type of input arguments to the merge function
+     * @return a merge function which always returns its first argument
+     * @see #lastWinsMerger()
+     * @see #throwingMerger()
+     */
+    public static <T> BinaryOperator<T> firstWinsMerger() {
+        return (u,v) -> u;
+    }
+
+    /**
+     * Returns a merge function, suitable for use in
+     * {@link Map#merge(Object, Object, BiFunction) Map.merge()} or
+     * {@link #toMap(Function, Function, BinaryOperator) toMap()},
+     * which implements a "last wins" policy.
+     *
+     * @param <T> the type of input arguments to the merge function
+     * @return a merge function which always returns its second argument
+     * @see #firstWinsMerger()
+     * @see #throwingMerger()
+     */
+    public static <T> BinaryOperator<T> lastWinsMerger() {
+        return (u,v) -> v;
+    }
+
+    /**
+     * Simple implementation class for {@code Collector}.
+     *
+     * @param <T> the type of elements to be collected
+     * @param <R> the type of the result
+     */
+    private static final class CollectorImpl<T, R> implements Collector<T,R> {
+        private final Supplier<R> resultSupplier;
+        private final BiFunction<R, T, R> accumulator;
+        private final BinaryOperator<R> combiner;
+        private final Set<Characteristics> characteristics;
+
+        CollectorImpl(Supplier<R> resultSupplier,
+                      BiFunction<R, T, R> accumulator,
+                      BinaryOperator<R> combiner,
+                      Set<Characteristics> characteristics) {
+            this.resultSupplier = resultSupplier;
+            this.accumulator = accumulator;
+            this.combiner = combiner;
+            this.characteristics = characteristics;
+        }
+
+        CollectorImpl(Supplier<R> resultSupplier,
+                      BiFunction<R, T, R> accumulator,
+                      BinaryOperator<R> combiner) {
+            this(resultSupplier, accumulator, combiner, Collections.emptySet());
+        }
+
+        @Override
+        public BiFunction<R, T, R> accumulator() {
+            return accumulator;
+        }
+
+        @Override
+        public Supplier<R> resultSupplier() {
+            return resultSupplier;
+        }
+
+        @Override
+        public BinaryOperator<R> combiner() {
+            return combiner;
+        }
+
+        @Override
+        public Set<Characteristics> characteristics() {
+            return characteristics;
+        }
+    }
+
+    /**
+     * Returns a {@code Collector} that accumulates the input elements into a
+     * new {@code Collection}, in encounter order.  The {@code Collection} is
+     * created by the provided factory.
+     *
+     * @param <T> the type of the input elements
+     * @param <C> the type of the resulting {@code Collection}
+     * @param collectionFactory a {@code Supplier} which returns a new, empty
+     * {@code Collection} of the appropriate type
+     * @return a {@code Collector} which collects all the input elements into a
+     * {@code Collection}, in encounter order
+     */
+    public static <T, C extends Collection<T>>
+    Collector<T, C> toCollection(Supplier<C> collectionFactory) {
+        return new CollectorImpl<>(collectionFactory,
+                                   (r, t) -> { r.add(t); return r; },
+                                   (r1, r2) -> { r1.addAll(r2); return r1; },
+                                   CH_STRICT);
+    }
+
+    /**
+     * Returns a {@code Collector} that accumulates the input elements into a
+     * new {@code List}. There are no guarantees on the type, mutability,
+     * serializability, or thread-safety of the {@code List} returned.
+     *
+     * @param <T> the type of the input elements
+     * @return a {@code Collector} which collects all the input elements into a
+     * {@code List}, in encounter order
+     */
+    public static <T>
+    Collector<T, List<T>> toList() {
+        BiFunction<List<T>, T, List<T>> accumulator = (list, t) -> {
+            switch (list.size()) {
+                case 0:
+                    return Collections.singletonList(t);
+                case 1:
+                    List<T> newList = new ArrayList<>();
+                    newList.add(list.get(0));
+                    newList.add(t);
+                    return newList;
+                default:
+                    list.add(t);
+                    return list;
+            }
+        };
+        BinaryOperator<List<T>> combiner = (left, right) -> {
+            switch (left.size()) {
+                case 0:
+                    return right;
+                case 1:
+                    List<T> newList = new ArrayList<>(left.size() + right.size());
+                    newList.addAll(left);
+                    newList.addAll(right);
+                    return newList;
+                default:
+                    left.addAll(right);
+                    return left;
+            }
+        };
+        return new CollectorImpl<>(Collections::emptyList, accumulator, combiner);
+    }
+
+    /**
+     * Returns a {@code Collector} that accumulates the input elements into a
+     * new {@code Set}. There are no guarantees on the type, mutability,
+     * serializability, or thread-safety of the {@code Set} returned.
+     *
+     * <p>This is an {@link Collector.Characteristics#UNORDERED unordered}
+     * Collector.
+     *
+     * @param <T> the type of the input elements
+     * @return a {@code Collector} which collects all the input elements into a
+     * {@code Set}
+     */
+    public static <T>
+    Collector<T, Set<T>> toSet() {
+        return new CollectorImpl<>((Supplier<Set<T>>) HashSet::new,
+                                   (r, t) -> { r.add(t); return r; },
+                                   (r1, r2) -> { r1.addAll(r2); return r1; },
+                                   CH_STRICT_UNORDERED);
+    }
+
+    /**
+     * Returns a {@code Collector} that concatenates the input elements into a
+     * new {@link StringBuilder}.
+     *
+     * @return a {@code Collector} which collects String elements into a
+     * {@code StringBuilder}, in encounter order
+     */
+    public static Collector<String, StringBuilder> toStringBuilder() {
+        return new CollectorImpl<>(StringBuilder::new,
+                                   (r, t) -> { r.append(t); return r; },
+                                   (r1, r2) -> { r1.append(r2); return r1; },
+                                   CH_STRICT);
+    }
+
+    /**
+     * Returns a {@code Collector} that concatenates the input elements into a
+     * new {@link StringJoiner}, using the specified delimiter.
+     *
+     * @param delimiter the delimiter to be used between each element
+     * @return A {@code Collector} which collects String elements into a
+     * {@code StringJoiner}, in encounter order
+     */
+    public static Collector<CharSequence, StringJoiner> toStringJoiner(CharSequence delimiter) {
+        BinaryOperator<StringJoiner> merger = (sj, other) -> {
+            if (other.length() > 0)
+                sj.add(other.toString());
+            return sj;
+        };
+        return new CollectorImpl<>(() -> new StringJoiner(delimiter),
+                                   (r, t) -> { r.add(t); return r; },
+                                   merger, CH_STRICT);
+    }
+
+    /**
+     * {@code BinaryOperator<Map>} that merges the contents of its right
+     * argument into its left argument, using the provided merge function to
+     * handle duplicate keys.
+     *
+     * @param <K> type of the map keys
+     * @param <V> type of the map values
+     * @param <M> type of the map
+     * @param mergeFunction A merge function suitable for
+     * {@link Map#merge(Object, Object, BiFunction) Map.merge()}
+     * @return a merge function for two maps
+     */
+    private static <K, V, M extends Map<K,V>>
+    BinaryOperator<M> mapMerger(BinaryOperator<V> mergeFunction) {
+        return (m1, m2) -> {
+            for (Map.Entry<K,V> e : m2.entrySet())
+                m1.merge(e.getKey(), e.getValue(), mergeFunction);
+            return m1;
+        };
+    }
+
+    /**
+     * Adapts a {@code Collector<U,R>} to a {@code Collector<T,R>} by applying
+     * a mapping function to each input element before accumulation.
+     *
+     * @apiNote
+     * The {@code mapping()} collectors are most useful when used in a
+     * multi-level reduction, downstream of {@code groupingBy} or
+     * {@code partitioningBy}.  For example, given a stream of
+     * {@code Person}, to accumulate the set of last names in each city:
+     * <pre>{@code
+     *     Map<City, Set<String>> lastNamesByCity
+     *         = people.stream().collect(groupingBy(Person::getCity,
+     *                                              mapping(Person::getLastName, toSet())));
+     * }</pre>
+     *
+     * @param <T> the type of the input elements
+     * @param <U> type of elements accepted by downstream collector
+     * @param <R> result type of collector
+     * @param mapper a function to be applied to the input elements
+     * @param downstream a collector which will accept mapped values
+     * @return a collector which applies the mapping function to the input
+     * elements and provides the mapped results to the downstream collector
+     */
+    public static <T, U, R> Collector<T, R>
+    mapping(Function<? super T, ? extends U> mapper, Collector<? super U, R> downstream) {
+        BiFunction<R, ? super U, R> downstreamAccumulator = downstream.accumulator();
+        return new CollectorImpl<>(downstream.resultSupplier(),
+                                   (r, t) -> downstreamAccumulator.apply(r, mapper.apply(t)),
+                                   downstream.combiner(), downstream.characteristics());
+    }
+
+    /**
+     * Returns a {@code Collector<T, Long>} that counts the number of input
+     * elements.
+     *
+     * @implSpec
+     * This produces a result equivalent to:
+     * <pre>{@code
+     *     reducing(0L, e -> 1L, Long::sum)
+     * }</pre>
+     *
+     * @param <T> the type of the input elements
+     * @return a {@code Collector} that counts the input elements
+     */
+    public static <T> Collector<T, Long>
+    counting() {
+        return reducing(0L, e -> 1L, Long::sum);
+    }
+
+    /**
+     * Returns a {@code Collector<T, T>} that produces the minimal element
+     * according to a given {@code Comparator}.
+     *
+     * @implSpec
+     * This produces a result equivalent to:
+     * <pre>{@code
+     *     reducing(Comparators.lesserOf(comparator))
+     * }</pre>
+     *
+     * @param <T> the type of the input elements
+     * @param comparator a {@code Comparator} for comparing elements
+     * @return a {@code Collector} that produces the minimal value
+     */
+    public static <T> Collector<T, T>
+    minBy(Comparator<? super T> comparator) {
+        return reducing(Comparators.lesserOf(comparator));
+    }
+
+    /**
+     * Returns a {@code Collector<T, T>} that produces the maximal element
+     * according to a given {@code Comparator}.
+     *
+     * @implSpec
+     * This produces a result equivalent to:
+     * <pre>{@code
+     *     reducing(Comparators.greaterOf(comparator))
+     * }</pre>
+     *
+     * @param <T> the type of the input elements
+     * @param comparator a {@code Comparator} for comparing elements
+     * @return a {@code Collector} that produces the maximal value
+     */
+    public static <T> Collector<T, T>
+    maxBy(Comparator<? super T> comparator) {
+        return reducing(Comparators.greaterOf(comparator));
+    }
+
+    /**
+     * Returns a {@code Collector<T, Long>} that produces the sum of a
+     * long-valued function applied to the input element.
+     *
+     * @implSpec
+     * This produces a result equivalent to:
+     * <pre>{@code
+     *     reducing(0L, mapper, Long::sum)
+     * }</pre>
+     *
+     * @param <T> the type of the input elements
+     * @param mapper a function extracting the property to be summed
+     * @return a {@code Collector} that produces the sum of a derived property
+     */
+    public static <T> Collector<T, Long>
+    sumBy(Function<? super T, Long> mapper) {
+        return reducing(0L, mapper, Long::sum);
+    }
+
+    /**
+     * Returns a {@code Collector<T,T>} which performs a reduction of its
+     * input elements under a specified {@code BinaryOperator}.
+     *
+     * @apiNote
+     * The {@code reducing()} collectors are most useful when used in a
+     * multi-level reduction, downstream of {@code groupingBy} or
+     * {@code partitioningBy}.  To perform a simple reduction on a stream,
+     * use {@link Stream#reduce(BinaryOperator)} instead.
+     *
+     * @param <T> element type for the input and output of the reduction
+     * @param identity the identity value for the reduction (also, the value
+     *                 that is returned when there are no input elements)
+     * @param op a {@code BinaryOperator<T>} used to reduce the input elements
+     * @return a {@code Collector} which implements the reduction operation
+     *
+     * @see #reducing(BinaryOperator)
+     * @see #reducing(Object, Function, BinaryOperator)
+     */
+    public static <T> Collector<T, T>
+    reducing(T identity, BinaryOperator<T> op) {
+        return new CollectorImpl<>(() -> identity, (r, t) -> (r == null ? t : op.apply(r, t)), op);
+    }
+
+    /**
+     * Returns a {@code Collector<T,T>} which performs a reduction of its
+     * input elements under a specified {@code BinaryOperator}.
+     *
+     * @apiNote
+     * The {@code reducing()} collectors are most useful when used in a
+     * multi-level reduction, downstream of {@code groupingBy} or
+     * {@code partitioningBy}.  To perform a simple reduction on a stream,
+     * use {@link Stream#reduce(BinaryOperator)} instead.
+     *
+     * <p>For example, given a stream of {@code Person}, to calculate tallest
+     * person in each city:
+     * <pre>{@code
+     *     Comparator<Person> byHeight = Comparators.comparing(Person::getHeight);
+     *     BinaryOperator<Person> tallerOf = Comparators.greaterOf(byHeight);
+     *     Map<City, Person> tallestByCity
+     *         = people.stream().collect(groupingBy(Person::getCity, reducing(tallerOf)));
+     * }</pre>
+     *
+     * @implSpec
+     * The default implementation is equivalent to:
+     * <pre>{@code
+     *     reducing(null, op);
+     * }</pre>
+     *
+     * @param <T> element type for the input and output of the reduction
+     * @param op a {@code BinaryOperator<T>} used to reduce the input elements
+     * @return a {@code Collector} which implements the reduction operation
+     *
+     * @see #reducing(Object, BinaryOperator)
+     * @see #reducing(Object, Function, BinaryOperator)
+     */
+    public static <T> Collector<T, T>
+    reducing(BinaryOperator<T> op) {
+        return reducing(null, op);
+    }
+
+    /**
+     * Returns a {@code Collector<T,U>} which performs a reduction of its
+     * input elements under a specified mapping function and
+     * {@code BinaryOperator}. This is a generalization of
+     * {@link #reducing(Object, BinaryOperator)} which allows a transformation
+     * of the elements before reduction.
+     *
+     * @apiNote
+     * The {@code reducing()} collectors are most useful when used in a
+     * multi-level reduction, downstream of {@code groupingBy} or
+     * {@code partitioningBy}.  To perform a simple reduction on a stream,
+     * use {@link Stream#reduce(BinaryOperator)} instead.
+     *
+     * <p>For example, given a stream of {@code Person}, to calculate the longest
+     * last name of residents in each city:
+     * <pre>{@code
+     *     Comparator<String> byLength = Comparators.comparing(String::length);
+     *     BinaryOperator<String> longerOf = Comparators.greaterOf(byLength);
+     *     Map<City, String> longestLastNameByCity
+     *         = people.stream().collect(groupingBy(Person::getCity,
+     *                                              reducing(Person::getLastName, longerOf)));
+     * }</pre>
+     *
+     * @param <T> the type of the input elements
+     * @param <U> the type of the mapped values
+     * @param identity the identity value for the reduction (also, the value
+     *                 that is returned when there are no input elements)
+     * @param mapper a mapping function to apply to each input value
+     * @param op a {@code BinaryOperator<U>} used to reduce the mapped values
+     * @return a {@code Collector} implementing the map-reduce operation
+     *
+     * @see #reducing(Object, BinaryOperator)
+     * @see #reducing(BinaryOperator)
+     */
+    public static <T, U>
+    Collector<T, U> reducing(U identity,
+                             Function<? super T, ? extends U> mapper,
+                             BinaryOperator<U> op) {
+        return new CollectorImpl<>(() -> identity,
+                                   (r, t) -> (r == null ? mapper.apply(t) : op.apply(r, mapper.apply(t))),
+                                   op);
+    }
+
+    /**
+     * Returns a {@code Collector} implementing a "group by" operation on
+     * input elements of type {@code T}, grouping elements according to a
+     * classification function.
+     *
+     * <p>The classification function maps elements to some key type {@code K}.
+     * The collector produces a {@code Map<K, List<T>>} whose keys are the
+     * values resulting from applying the classification function to the input
+     * elements, and whose corresponding values are {@code List}s containing the
+     * input elements which map to the associated key under the classification
+     * function.
+     *
+     * <p>There are no guarantees on the type, mutability, serializability, or
+     * thread-safety of the {@code Map} or {@code List} objects returned.
+     * @implSpec
+     * This produces a result similar to:
+     * <pre>{@code
+     *     groupingBy(classifier, toList());
+     * }</pre>
+     *
+     * @param <T> the type of the input elements
+     * @param <K> the type of the keys
+     * @param classifier the classifier function mapping input elements to keys
+     * @return a {@code Collector} implementing the group-by operation
+     *
+     * @see #groupingBy(Function, Collector)
+     * @see #groupingBy(Function, Supplier, Collector)
+     * @see #groupingByConcurrent(Function)
+     */
+    public static <T, K>
+    Collector<T, Map<K, List<T>>> groupingBy(Function<? super T, ? extends K> classifier) {
+        return groupingBy(classifier, HashMap::new, toList());
+    }
+
+    /**
+     * Returns a {@code Collector} implementing a cascaded "group by" operation
+     * on input elements of type {@code T}, grouping elements according to a
+     * classification function, and then performing a reduction operation on
+     * the values associated with a given key using the specified downstream
+     * {@code Collector}.
+     *
+     * <p>The classification function maps elements to some key type {@code K}.
+     * The downstream collector operates on elements of type {@code T} and
+     * produces a result of type {@code D}. The resulting collector produces a
+     * {@code Map<K, D>}.
+     *
+     * <p>There are no guarantees on the type, mutability,
+     * serializability, or thread-safety of the {@code Map} returned.
+     *
+     * <p>For example, to compute the set of last names of people in each city:
+     * <pre>{@code
+     *     Map<City, Set<String>> namesByCity
+     *         = people.stream().collect(groupingBy(Person::getCity,
+     *                                              mapping(Person::getLastName, toSet())));
+     * }</pre>
+     *
+     * @param <T> the type of the input elements
+     * @param <K> the type of the keys
+     * @param <D> the result type of the downstream reduction
+     * @param classifier a classifier function mapping input elements to keys
+     * @param downstream a {@code Collector} implementing the downstream reduction
+     * @return a {@code Collector} implementing the cascaded group-by operation
+     * @see #groupingBy(Function)
+     *
+     * @see #groupingBy(Function, Supplier, Collector)
+     * @see #groupingByConcurrent(Function, Collector)
+     */
+    public static <T, K, D>
+    Collector<T, Map<K, D>> groupingBy(Function<? super T, ? extends K> classifier,
+                                       Collector<? super T, D> downstream) {
+        return groupingBy(classifier, HashMap::new, downstream);
+    }
+
+    /**
+     * Returns a {@code Collector} implementing a cascaded "group by" operation
+     * on input elements of type {@code T}, grouping elements according to a
+     * classification function, and then performing a reduction operation on
+     * the values associated with a given key using the specified downstream
+     * {@code Collector}.  The {@code Map} produced by the Collector is created
+     * with the supplied factory function.
+     *
+     * <p>The classification function maps elements to some key type {@code K}.
+     * The downstream collector operates on elements of type {@code T} and
+     * produces a result of type {@code D}. The resulting collector produces a
+     * {@code Map<K, D>}.
+     *
+     * <p>For example, to compute the set of last names of people in each city,
+     * where the city names are sorted:
+     * <pre>{@code
+     *     Map<City, Set<String>> namesByCity
+     *         = people.stream().collect(groupingBy(Person::getCity, TreeMap::new,
+     *                                              mapping(Person::getLastName, toSet())));
+     * }</pre>
+     *
+     * @param <T> the type of the input elements
+     * @param <K> the type of the keys
+     * @param <D> the result type of the downstream reduction
+     * @param <M> the type of the resulting {@code Map}
+     * @param classifier a classifier function mapping input elements to keys
+     * @param downstream a {@code Collector} implementing the downstream reduction
+     * @param mapFactory a function which, when called, produces a new empty
+     *                   {@code Map} of the desired type
+     * @return a {@code Collector} implementing the cascaded group-by operation
+     *
+     * @see #groupingBy(Function, Collector)
+     * @see #groupingBy(Function)
+     * @see #groupingByConcurrent(Function, Supplier, Collector)
+     */
+    public static <T, K, D, M extends Map<K, D>>
+    Collector<T, M> groupingBy(Function<? super T, ? extends K> classifier,
+                               Supplier<M> mapFactory,
+                               Collector<? super T, D> downstream) {
+        Supplier<D> downstreamSupplier = downstream.resultSupplier();
+        BiFunction<D, ? super T, D> downstreamAccumulator = downstream.accumulator();
+        BiFunction<M, T, M> accumulator = (m, t) -> {
+            K key = Objects.requireNonNull(classifier.apply(t), "element cannot be mapped to a null key");
+            D oldContainer = m.computeIfAbsent(key, k -> downstreamSupplier.get());
+            D newContainer = downstreamAccumulator.apply(oldContainer, t);
+            if (newContainer != oldContainer)
+                m.put(key, newContainer);
+            return m;
+        };
+        return new CollectorImpl<>(mapFactory, accumulator, mapMerger(downstream.combiner()), CH_STRICT);
+    }
+
+    /**
+     * Returns a {@code Collector} implementing a concurrent "group by"
+     * operation on input elements of type {@code T}, grouping elements
+     * according to a classification function.
+     *
+     * <p>This is a {@link Collector.Characteristics#CONCURRENT concurrent} and
+     * {@link Collector.Characteristics#UNORDERED unordered} Collector.
+     *
+     * <p>The classification function maps elements to some key type {@code K}.
+     * The collector produces a {@code ConcurrentMap<K, List<T>>} whose keys are the
+     * values resulting from applying the classification function to the input
+     * elements, and whose corresponding values are {@code List}s containing the
+     * input elements which map to the associated key under the classification
+     * function.
+     *
+     * <p>There are no guarantees on the type, mutability, or serializability
+     * of the {@code Map} or {@code List} objects returned, or of the
+     * thread-safety of the {@code List} objects returned.
+     * @implSpec
+     * This produces a result similar to:
+     * <pre>{@code
+     *     groupingByConcurrent(classifier, toList());
+     * }</pre>
+     *
+     * @param <T> the type of the input elements
+     * @param <K> the type of the keys
+     * @param classifier a classifier function mapping input elements to keys
+     * @return a {@code Collector} implementing the group-by operation
+     *
+     * @see #groupingBy(Function)
+     * @see #groupingByConcurrent(Function, Collector)
+     * @see #groupingByConcurrent(Function, Supplier, Collector)
+     */
+    public static <T, K>
+    Collector<T, ConcurrentMap<K, List<T>>> groupingByConcurrent(Function<? super T, ? extends K> classifier) {
+        return groupingByConcurrent(classifier, ConcurrentHashMap::new, toList());
+    }
+
+    /**
+     * Returns a {@code Collector} implementing a concurrent cascaded "group by"
+     * operation on input elements of type {@code T}, grouping elements
+     * according to a classification function, and then performing a reduction
+     * operation on the values associated with a given key using the specified
+     * downstream {@code Collector}.
+     *
+     * <p>This is a {@link Collector.Characteristics#CONCURRENT concurrent} and
+     * {@link Collector.Characteristics#UNORDERED unordered} Collector.
+     *
+     * <p>The classification function maps elements to some key type {@code K}.
+     * The downstream collector operates on elements of type {@code T} and
+     * produces a result of type {@code D}. The resulting collector produces a
+     * {@code Map<K, D>}.
+     *
+     * <p>For example, to compute the set of last names of people in each city,
+     * where the city names are sorted:
+     * <pre>{@code
+     *     ConcurrentMap<City, Set<String>> namesByCity
+     *         = people.stream().collect(groupingByConcurrent(Person::getCity, TreeMap::new,
+     *                                                        mapping(Person::getLastName, toSet())));
+     * }</pre>
+     *
+     * @param <T> the type of the input elements
+     * @param <K> the type of the keys
+     * @param <D> the result type of the downstream reduction
+     * @param classifier a classifier function mapping input elements to keys
+     * @param downstream a {@code Collector} implementing the downstream reduction
+     * @return a {@code Collector} implementing the cascaded group-by operation
+     *
+     * @see #groupingBy(Function, Collector)
+     * @see #groupingByConcurrent(Function)
+     * @see #groupingByConcurrent(Function, Supplier, Collector)
+     */
+    public static <T, K, D>
+    Collector<T, ConcurrentMap<K, D>> groupingByConcurrent(Function<? super T, ? extends K> classifier,
+                                                           Collector<? super T, D> downstream) {
+        return groupingByConcurrent(classifier, ConcurrentHashMap::new, downstream);
+    }
+
+    /**
+     * Returns a concurrent {@code Collector} implementing a cascaded "group by"
+     * operation on input elements of type {@code T}, grouping elements
+     * according to a classification function, and then performing a reduction
+     * operation on the values associated with a given key using the specified
+     * downstream {@code Collector}.  The {@code ConcurrentMap} produced by the
+     * Collector is created with the supplied factory function.
+     *
+     * <p>This is a {@link Collector.Characteristics#CONCURRENT concurrent} and
+     * {@link Collector.Characteristics#UNORDERED unordered} Collector.
+     *
+     * <p>The classification function maps elements to some key type {@code K}.
+     * The downstream collector operates on elements of type {@code T} and
+     * produces a result of type {@code D}. The resulting collector produces a
+     * {@code Map<K, D>}.
+     *
+     * <p>For example, to compute the set of last names of people in each city,
+     * where the city names are sorted:
+     * <pre>{@code
+     *     ConcurrentMap<City, Set<String>> namesByCity
+     *         = people.stream().collect(groupingBy(Person::getCity, ConcurrentSkipListMap::new,
+     *                                              mapping(Person::getLastName, toSet())));
+     * }</pre>
+     *
+     *
+     * @param <T> the type of the input elements
+     * @param <K> the type of the keys
+     * @param <D> the result type of the downstream reduction
+     * @param <M> the type of the resulting {@code ConcurrentMap}
+     * @param classifier a classifier function mapping input elements to keys
+     * @param downstream a {@code Collector} implementing the downstream reduction
+     * @param mapFactory a function which, when called, produces a new empty
+     *                   {@code ConcurrentMap} of the desired type
+     * @return a {@code Collector} implementing the cascaded group-by operation
+     *
+     * @see #groupingByConcurrent(Function)
+     * @see #groupingByConcurrent(Function, Collector)
+     * @see #groupingBy(Function, Supplier, Collector)
+     */
+    public static <T, K, D, M extends ConcurrentMap<K, D>>
+    Collector<T, M> groupingByConcurrent(Function<? super T, ? extends K> classifier,
+                                         Supplier<M> mapFactory,
+                                         Collector<? super T, D> downstream) {
+        Supplier<D> downstreamSupplier = downstream.resultSupplier();
+        BiFunction<D, ? super T, D> downstreamAccumulator = downstream.accumulator();
+        BinaryOperator<M> combiner = mapMerger(downstream.combiner());
+        if (downstream.characteristics().contains(Collector.Characteristics.CONCURRENT)) {
+            BiFunction<M, T, M> accumulator = (m, t) -> {
+                K key = Objects.requireNonNull(classifier.apply(t), "element cannot be mapped to a null key");
+                downstreamAccumulator.apply(m.computeIfAbsent(key, k -> downstreamSupplier.get()), t);
+                return m;
+            };
+            return new CollectorImpl<>(mapFactory, accumulator, combiner, CH_CONCURRENT);
+        } else if (downstream.characteristics().contains(Collector.Characteristics.STRICTLY_MUTATIVE)) {
+            BiFunction<M, T, M> accumulator = (m, t) -> {
+                K key = Objects.requireNonNull(classifier.apply(t), "element cannot be mapped to a null key");
+                D resultContainer = m.computeIfAbsent(key, k -> downstreamSupplier.get());
+                synchronized (resultContainer) {
+                    downstreamAccumulator.apply(resultContainer, t);
+                }
+                return m;
+            };
+            return new CollectorImpl<>(mapFactory, accumulator, combiner, CH_CONCURRENT);
+        } else {
+            BiFunction<M, T, M> accumulator = (m, t) -> {
+                K key = Objects.requireNonNull(classifier.apply(t), "element cannot be mapped to a null key");
+                do {
+                    D oldResult = m.computeIfAbsent(key, k -> downstreamSupplier.get());
+                    if (oldResult == null) {
+                        if (m.putIfAbsent(key, downstreamAccumulator.apply(null, t)) == null)
+                            return m;
+                    } else {
+                        synchronized (oldResult) {
+                            if (m.get(key) != oldResult)
+                                continue;
+                            D newResult = downstreamAccumulator.apply(oldResult, t);
+                            if (oldResult != newResult)
+                                m.put(key, newResult);
+                            return m;
+                        }
+                    }
+                } while (true);
+            };
+            return new CollectorImpl<>(mapFactory, accumulator, combiner, CH_CONCURRENT);
+        }
+    }
+
+    /**
+     * Returns a {@code Collector} which partitions the input elements according
+     * to a {@code Predicate}, and organizes them into a
+     * {@code Map<Boolean, List<T>>}.
+     *
+     * There are no guarantees on the type, mutability,
+     * serializability, or thread-safety of the {@code Map} returned.
+     *
+     * @param <T> the type of the input elements
+     * @param predicate a predicate used for classifying input elements
+     * @return a {@code Collector} implementing the partitioning operation
+     *
+     * @see #partitioningBy(Predicate, Collector)
+     */
+    public static <T>
+    Collector<T, Map<Boolean, List<T>>> partitioningBy(Predicate<? super T> predicate) {
+        return partitioningBy(predicate, toList());
+    }
+
+    /**
+     * Returns a {@code Collector} which partitions the input elements according
+     * to a {@code Predicate}, reduces the values in each partition according to
+     * another {@code Collector}, and organizes them into a
+     * {@code Map<Boolean, D>} whose values are the result of the downstream
+     * reduction.
+     *
+     * <p>There are no guarantees on the type, mutability,
+     * serializability, or thread-safety of the {@code Map} returned.
+     *
+     * @param <T> the type of the input elements
+     * @param <D> the result type of the downstream reduction
+     * @param predicate a predicate used for classifying input elements
+     * @param downstream a {@code Collector} implementing the downstream
+     *                   reduction
+     * @return a {@code Collector} implementing the cascaded partitioning
+     *         operation
+     *
+     * @see #partitioningBy(Predicate)
+     */
+    public static <T, D>
+    Collector<T, Map<Boolean, D>> partitioningBy(Predicate<? super T> predicate,
+                                                 Collector<? super T, D> downstream) {
+        BiFunction<D, ? super T, D> downstreamAccumulator = downstream.accumulator();
+        BiFunction<Map<Boolean, D>, T, Map<Boolean, D>> accumulator = (result, t) -> {
+            Partition<D> asPartition = ((Partition<D>) result);
+            if (predicate.test(t)) {
+                D newResult = downstreamAccumulator.apply(asPartition.forTrue, t);
+                if (newResult != asPartition.forTrue)
+                    asPartition.forTrue = newResult;
+            } else {
+                D newResult = downstreamAccumulator.apply(asPartition.forFalse, t);
+                if (newResult != asPartition.forFalse)
+                    asPartition.forFalse = newResult;
+            }
+            return result;
+        };
+        return new CollectorImpl<>(() -> new Partition<>(downstream.resultSupplier().get(),
+                                                         downstream.resultSupplier().get()),
+                                   accumulator, partitionMerger(downstream.combiner()), CH_STRICT);
+    }
+
+    /**
+     * Merge function for two partitions, given a merge function for the
+     * elements.
+     */
+    private static <D> BinaryOperator<Map<Boolean, D>> partitionMerger(BinaryOperator<D> op) {
+        return (m1, m2) -> {
+            Partition<D> left = (Partition<D>) m1;
+            Partition<D> right = (Partition<D>) m2;
+            if (left.forFalse == null)
+                left.forFalse = right.forFalse;
+            else if (right.forFalse != null)
+                left.forFalse = op.apply(left.forFalse, right.forFalse);
+            if (left.forTrue == null)
+                left.forTrue = right.forTrue;
+            else if (right.forTrue != null)
+                left.forTrue = op.apply(left.forTrue, right.forTrue);
+            return left;
+        };
+    }
+
+    /**
+     * Accumulate elements into a {@code Map} whose keys and values are the
+     * result of applying mapping functions to the input elements.
+     * If the mapped keys contains duplicates (according to
+     * {@link Object#equals(Object)}), an {@code IllegalStateException} is
+     * thrown when the collection operation is performed.  If the mapped keys
+     * may have duplicates, use {@link #toMap(Function, Function, BinaryOperator)}
+     * instead.
+     *
+     * @apiNote
+     * It is common for either the key or the value to be the input elements.
+     * In this case, the utility method
+     * {@link java.util.function.Function#identity()} may be helpful.
+     * For example, the following produces a {@code Map} mapping
+     * students to their grade point average:
+     * <pre>{@code
+     *     Map<Student, Double> studentToGPA
+     *         students.stream().collect(toMap(Functions.identity(),
+     *                                         student -> computeGPA(student)));
+     * }</pre>
+     * And the following produces a {@code Map} mapping a unique identifier to
+     * students:
+     * <pre>{@code
+     *     Map<String, Student> studentIdToStudent
+     *         students.stream().collect(toMap(Student::getId,
+     *                                         Functions.identity());
+     * }</pre>
+     *
+     * @param <T> the type of the input elements
+     * @param <K> the output type of the key mapping function
+     * @param <U> the output type of the value mapping function
+     * @param keyMapper a mapping function to produce keys
+     * @param valueMapper a mapping function to produce values
+     * @return a {@code Collector} which collects elements into a {@code Map}
+     * whose keys and values are the result of applying mapping functions to
+     * the input elements
+     *
+     * @see #toMap(Function, Function, BinaryOperator)
+     * @see #toMap(Function, Function, BinaryOperator, Supplier)
+     * @see #toConcurrentMap(Function, Function)
+     */
+    public static <T, K, U>
+    Collector<T, Map<K,U>> toMap(Function<? super T, ? extends K> keyMapper,
+                                 Function<? super T, ? extends U> valueMapper) {
+        return toMap(keyMapper, valueMapper, throwingMerger(), HashMap::new);
+    }
+
+    /**
+     * Accumulate elements into a {@code Map} whose keys and values are the
+     * result of applying mapping functions to the input elements. If the mapped
+     * keys contains duplicates (according to {@link Object#equals(Object)}),
+     * the value mapping function is applied to each equal element, and the
+     * results are merged using the provided merging function.
+     *
+     * @apiNote
+     * There are multiple ways to deal with collisions between multiple elements
+     * mapping to the same key.  There are some predefined merging functions,
+     * such as {@link #throwingMerger()}, {@link #firstWinsMerger()}, and
+     * {@link #lastWinsMerger()}, that implement common policies, or you can
+     * implement custom policies easily.  For example, if you have a stream
+     * of {@code Person}, and you want to produce a "phone book" mapping name to
+     * address, but it is possible that two persons have the same name, you can
+     * do as follows to gracefully deals with these collisions, and produce a
+     * {@code Map} mapping names to a concatenated list of addresses:
+     * <pre>{@code
+     *     Map<String, String> phoneBook
+     *         people.stream().collect(toMap(Person::getName,
+     *                                       Person::getAddress,
+     *                                       (s, a) -> s + ", " + a));
+     * }</pre>
+     *
+     * @param <T> the type of the input elements
+     * @param <K> the output type of the key mapping function
+     * @param <U> the output type of the value mapping function
+     * @param keyMapper a mapping function to produce keys
+     * @param valueMapper a mapping function to produce values
+     * @param mergeFunction a merge function, used to resolve collisions between
+     *                      values associated with the same key, as supplied
+     *                      to {@link Map#merge(Object, Object, BiFunction)}
+     * @return a {@code Collector} which collects elements into a {@code Map}
+     * whose keys are the result of applying a key mapping function to the input
+     * elements, and whose values are the result of applying a value mapping
+     * function to all input elements equal to the key and combining them
+     * using the merge function
+     *
+     * @see #toMap(Function, Function)
+     * @see #toMap(Function, Function, BinaryOperator, Supplier)
+     * @see #toConcurrentMap(Function, Function, BinaryOperator)
+     */
+    public static <T, K, U>
+    Collector<T, Map<K,U>> toMap(Function<? super T, ? extends K> keyMapper,
+                                 Function<? super T, ? extends U> valueMapper,
+                                 BinaryOperator<U> mergeFunction) {
+        return toMap(keyMapper, valueMapper, mergeFunction, HashMap::new);
+    }
+
+    /**
+     * Accumulate elements into a {@code Map} whose keys and values are the
+     * result of applying mapping functions to the input elements. If the mapped
+     * keys contains duplicates (according to {@link Object#equals(Object)}),
+     * the value mapping function is applied to each equal element, and the
+     * results are merged using the provided merging function.  The {@code Map}
+     * is created by a provided supplier function.
+     *
+     * @param <T> the type of the input elements
+     * @param <K> the output type of the key mapping function
+     * @param <U> the output type of the value mapping function
+     * @param <M> the type of the resulting {@code Map}
+     * @param keyMapper a mapping function to produce keys
+     * @param valueMapper a mapping function to produce values
+     * @param mergeFunction a merge function, used to resolve collisions between
+     *                      values associated with the same key, as supplied
+     *                      to {@link Map#merge(Object, Object, BiFunction)}
+     * @param mapSupplier a function which returns a new, empty {@code Map} into
+     *                    which the results will be inserted
+     * @return a {@code Collector} which collects elements into a {@code Map}
+     * whose keys are the result of applying a key mapping function to the input
+     * elements, and whose values are the result of applying a value mapping
+     * function to all input elements equal to the key and combining them
+     * using the merge function
+     *
+     * @see #toMap(Function, Function)
+     * @see #toMap(Function, Function, BinaryOperator)
+     * @see #toConcurrentMap(Function, Function, BinaryOperator, Supplier)
+     */
+    public static <T, K, U, M extends Map<K, U>>
+    Collector<T, M> toMap(Function<? super T, ? extends K> keyMapper,
+                          Function<? super T, ? extends U> valueMapper,
+                          BinaryOperator<U> mergeFunction,
+                          Supplier<M> mapSupplier) {
+        BiFunction<M, T, M> accumulator
+                = (map, element) -> {
+                      map.merge(keyMapper.apply(element), valueMapper.apply(element), mergeFunction);
+                      return map;
+                  };
+        return new CollectorImpl<>(mapSupplier, accumulator, mapMerger(mergeFunction), CH_STRICT);
+    }
+
+    /**
+     * Accumulate elements into a {@code ConcurrentMap} whose keys and values
+     * are the result of applying mapping functions to the input elements.
+     * If the mapped keys contains duplicates (according to
+     * {@link Object#equals(Object)}), an {@code IllegalStateException} is
+     * thrown when the collection operation is performed.  If the mapped keys
+     * may have duplicates, use
+     * {@link #toConcurrentMap(Function, Function, BinaryOperator)} instead.
+     *
+     * @apiNote
+     * It is common for either the key or the value to be the input elements.
+     * In this case, the utility method
+     * {@link java.util.function.Function#identity()} may be helpful.
+     * For example, the following produces a {@code Map} mapping
+     * students to their grade point average:
+     * <pre>{@code
+     *     Map<Student, Double> studentToGPA
+     *         students.stream().collect(toMap(Functions.identity(),
+     *                                         student -> computeGPA(student)));
+     * }</pre>
+     * And the following produces a {@code Map} mapping a unique identifier to
+     * students:
+     * <pre>{@code
+     *     Map<String, Student> studentIdToStudent
+     *         students.stream().collect(toConcurrentMap(Student::getId,
+     *                                                   Functions.identity());
+     * }</pre>
+     *
+     * <p>This is a {@link Collector.Characteristics#CONCURRENT concurrent} and
+     * {@link Collector.Characteristics#UNORDERED unordered} Collector.
+     *
+     * @param <T> the type of the input elements
+     * @param <K> the output type of the key mapping function
+     * @param <U> the output type of the value mapping function
+     * @param keyMapper the mapping function to produce keys
+     * @param valueMapper the mapping function to produce values
+     * @return a concurrent {@code Collector} which collects elements into a
+     * {@code ConcurrentMap} whose keys are the result of applying a key mapping
+     * function to the input elements, and whose values are the result of
+     * applying a value mapping function to the input elements
+     *
+     * @see #toMap(Function, Function)
+     * @see #toConcurrentMap(Function, Function, BinaryOperator)
+     * @see #toConcurrentMap(Function, Function, BinaryOperator, Supplier)
+     */
+    public static <T, K, U>
+    Collector<T, ConcurrentMap<K,U>> toConcurrentMap(Function<? super T, ? extends K> keyMapper,
+                                                     Function<? super T, ? extends U> valueMapper) {
+        return toConcurrentMap(keyMapper, valueMapper, throwingMerger(), ConcurrentHashMap::new);
+    }
+
+    /**
+     * Accumulate elements into a {@code ConcurrentMap} whose keys and values
+     * are the result of applying mapping functions to the input elements. If
+     * the mapped keys contains duplicates (according to {@link Object#equals(Object)}),
+     * the value mapping function is applied to each equal element, and the
+     * results are merged using the provided merging function.
+     *
+     * @apiNote
+     * There are multiple ways to deal with collisions between multiple elements
+     * mapping to the same key.  There are some predefined merging functions,
+     * such as {@link #throwingMerger()}, {@link #firstWinsMerger()}, and
+     * {@link #lastWinsMerger()}, that implement common policies, or you can
+     * implement custom policies easily.  For example, if you have a stream
+     * of {@code Person}, and you want to produce a "phone book" mapping name to
+     * address, but it is possible that two persons have the same name, you can
+     * do as follows to gracefully deals with these collisions, and produce a
+     * {@code Map} mapping names to a concatenated list of addresses:
+     * <pre>{@code
+     *     Map<String, String> phoneBook
+     *         people.stream().collect(toConcurrentMap(Person::getName,
+     *                                                 Person::getAddress,
+     *                                                 (s, a) -> s + ", " + a));
+     * }</pre>
+     *
+     * <p>This is a {@link Collector.Characteristics#CONCURRENT concurrent} and
+     * {@link Collector.Characteristics#UNORDERED unordered} Collector.
+     *
+     * @param <T> the type of the input elements
+     * @param <K> the output type of the key mapping function
+     * @param <U> the output type of the value mapping function
+     * @param keyMapper a mapping function to produce keys
+     * @param valueMapper a mapping function to produce values
+     * @param mergeFunction a merge function, used to resolve collisions between
+     *                      values associated with the same key, as supplied
+     *                      to {@link Map#merge(Object, Object, BiFunction)}
+     * @return a concurrent {@code Collector} which collects elements into a
+     * {@code ConcurrentMap} whose keys are the result of applying a key mapping
+     * function to the input elements, and whose values are the result of
+     * applying a value mapping function to all input elements equal to the key
+     * and combining them using the merge function
+     *
+     * @see #toConcurrentMap(Function, Function)
+     * @see #toConcurrentMap(Function, Function, BinaryOperator, Supplier)
+     * @see #toMap(Function, Function, BinaryOperator)
+     */
+    public static <T, K, U>
+    Collector<T, ConcurrentMap<K,U>> toConcurrentMap(Function<? super T, ? extends K> keyMapper,
+                                                     Function<? super T, ? extends U> valueMapper,
+                                                     BinaryOperator<U> mergeFunction) {
+        return toConcurrentMap(keyMapper, valueMapper, mergeFunction, ConcurrentHashMap::new);
+    }
+
+    /**
+     * Accumulate elements into a {@code ConcurrentMap} whose keys and values
+     * are the result of applying mapping functions to the input elements. If
+     * the mapped keys contains duplicates (according to {@link Object#equals(Object)}),
+     * the value mapping function is applied to each equal element, and the
+     * results are merged using the provided merging function.  The
+     * {@code ConcurrentMap} is created by a provided supplier function.
+     *
+     * <p>This is a {@link Collector.Characteristics#CONCURRENT concurrent} and
+     * {@link Collector.Characteristics#UNORDERED unordered} Collector.
+     *
+     * @param <T> the type of the input elements
+     * @param <K> the output type of the key mapping function
+     * @param <U> the output type of the value mapping function
+     * @param <M> the type of the resulting {@code ConcurrentMap}
+     * @param keyMapper a mapping function to produce keys
+     * @param valueMapper a mapping function to produce values
+     * @param mergeFunction a merge function, used to resolve collisions between
+     *                      values associated with the same key, as supplied
+     *                      to {@link Map#merge(Object, Object, BiFunction)}
+     * @param mapSupplier a function which returns a new, empty {@code Map} into
+     *                    which the results will be inserted
+     * @return a concurrent {@code Collector} which collects elements into a
+     * {@code ConcurrentMap} whose keys are the result of applying a key mapping
+     * function to the input elements, and whose values are the result of
+     * applying a value mapping function to all input elements equal to the key
+     * and combining them using the merge function
+     *
+     * @see #toConcurrentMap(Function, Function)
+     * @see #toConcurrentMap(Function, Function, BinaryOperator)
+     * @see #toMap(Function, Function, BinaryOperator, Supplier)
+     */
+    public static <T, K, U, M extends ConcurrentMap<K, U>>
+    Collector<T, M> toConcurrentMap(Function<? super T, ? extends K> keyMapper,
+                                    Function<? super T, ? extends U> valueMapper,
+                                    BinaryOperator<U> mergeFunction,
+                                    Supplier<M> mapSupplier) {
+        BiFunction<M, T, M> accumulator = (map, element) -> {
+            map.merge(keyMapper.apply(element), valueMapper.apply(element), mergeFunction);
+            return map;
+        };
+        return new CollectorImpl<>(mapSupplier, accumulator, mapMerger(mergeFunction), CH_CONCURRENT);
+    }
+
+    /**
+     * Returns a {@code Collector} which applies an {@code int}-producing
+     * mapping function to each input element, and returns summary statistics
+     * for the resulting values.
+     *
+     * @param <T> the type of the input elements
+     * @param mapper a mapping function to apply to each element
+     * @return a {@code Collector} implementing the summary-statistics reduction
+     *
+     * @see #toDoubleSummaryStatistics(ToDoubleFunction)
+     * @see #toLongSummaryStatistics(ToLongFunction)
+     */
+    public static <T>
+    Collector<T, IntSummaryStatistics> toIntSummaryStatistics(ToIntFunction<? super T> mapper) {
+        return new CollectorImpl<>(IntSummaryStatistics::new,
+                                   (r, t) -> { r.accept(mapper.applyAsInt(t)); return r; },
+                                   (l, r) -> { l.combine(r); return l; }, CH_STRICT);
+    }
+
+    /**
+     * Returns a {@code Collector} which applies an {@code long}-producing
+     * mapping function to each input element, and returns summary statistics
+     * for the resulting values.
+     *
+     * @param <T> the type of the input elements
+     * @param mapper the mapping function to apply to each element
+     * @return a {@code Collector} implementing the summary-statistics reduction
+     *
+     * @see #toDoubleSummaryStatistics(ToDoubleFunction)
+     * @see #toIntSummaryStatistics(ToIntFunction)
+     */
+    public static <T>
+    Collector<T, LongSummaryStatistics> toLongSummaryStatistics(ToLongFunction<? super T> mapper) {
+        return new CollectorImpl<>(LongSummaryStatistics::new,
+                                   (r, t) -> { r.accept(mapper.applyAsLong(t)); return r; },
+                                   (l, r) -> { l.combine(r); return l; }, CH_STRICT);
+    }
+
+    /**
+     * Returns a {@code Collector} which applies an {@code double}-producing
+     * mapping function to each input element, and returns summary statistics
+     * for the resulting values.
+     *
+     * @param <T> the type of the input elements
+     * @param mapper a mapping function to apply to each element
+     * @return a {@code Collector} implementing the summary-statistics reduction
+     *
+     * @see #toLongSummaryStatistics(ToLongFunction)
+     * @see #toIntSummaryStatistics(ToIntFunction)
+     */
+    public static <T>
+    Collector<T, DoubleSummaryStatistics> toDoubleSummaryStatistics(ToDoubleFunction<? super T> mapper) {
+        return new CollectorImpl<>(DoubleSummaryStatistics::new,
+                                   (r, t) -> { r.accept(mapper.applyAsDouble(t)); return r; },
+                                   (l, r) -> { l.combine(r); return l; }, CH_STRICT);
+    }
+
+    /**
+     * Implementation class used by partitioningBy.
+     */
+    private static final class Partition<T>
+            extends AbstractMap<Boolean, T>
+            implements Map<Boolean, T> {
+        T forTrue;
+        T forFalse;
+
+        Partition(T forTrue, T forFalse) {
+            this.forTrue = forTrue;
+            this.forFalse = forFalse;
+        }
+
+        @Override
+        public Set<Map.Entry<Boolean, T>> entrySet() {
+            return new AbstractSet<Map.Entry<Boolean, T>>() {
+                @Override
+                public Iterator<Map.Entry<Boolean, T>> iterator() {
+
+                    return new Iterator<Map.Entry<Boolean, T>>() {
+                        int state = 0;
+
+                        @Override
+                        public boolean hasNext() {
+                            return state < 2;
+                        }
+
+                        @Override
+                        public Map.Entry<Boolean, T> next() {
+                            if (state >= 2)
+                                throw new NoSuchElementException();
+                            return (state++ == 0)
+                                   ? new SimpleImmutableEntry<>(false, forFalse)
+                                   : new SimpleImmutableEntry<>(true, forTrue);
+                        }
+                    };
+                }
+
+                @Override
+                public int size() {
+                    return 2;
+                }
+            };
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/DistinctOps.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Objects;
+import java.util.Set;
+import java.util.Spliterator;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.IntFunction;
+
+/**
+ * Factory methods for transforming streams into duplicate-free streams, using
+ * {@link Object#equals(Object)} to determine equality.
+ *
+ * @since 1.8
+ */
+final class DistinctOps {
+
+    private DistinctOps() { }
+
+    /**
+     * Appends a "distinct" operation to the provided stream, and returns the
+     * new stream.
+     *
+     * @param <T> the type of both input and output elements
+     * @param upstream a reference stream with element type T
+     * @return the new stream
+     */
+    static <T> ReferencePipeline<T, T> makeRef(AbstractPipeline<?, T, ?> upstream) {
+        return new ReferencePipeline.StatefulOp<T, T>(upstream, StreamShape.REFERENCE,
+                                                      StreamOpFlag.IS_DISTINCT | StreamOpFlag.NOT_SIZED) {
+            @Override
+            <P_IN> Node<T> opEvaluateParallel(PipelineHelper<T> helper,
+                                              Spliterator<P_IN> spliterator,
+                                              IntFunction<T[]> generator) {
+                if (StreamOpFlag.DISTINCT.isKnown(helper.getStreamAndOpFlags())) {
+                    // No-op
+                    return helper.evaluate(spliterator, false, generator);
+                }
+                else if (StreamOpFlag.ORDERED.isKnown(helper.getStreamAndOpFlags())) {
+                    // If the stream is SORTED then it should also be ORDERED so the following will also
+                    // preserve the sort order
+                    TerminalOp<T, LinkedHashSet<T>> reduceOp
+                            = ReduceOps.<T, LinkedHashSet<T>>makeRef(LinkedHashSet::new, LinkedHashSet::add,
+                                                                     LinkedHashSet::addAll);
+                    return Nodes.node(reduceOp.evaluateParallel(helper, spliterator));
+                }
+                else {
+                    // Holder of null state since ConcurrentHashMap does not support null values
+                    AtomicBoolean seenNull = new AtomicBoolean(false);
+                    ConcurrentHashMap<T, Boolean> map = new ConcurrentHashMap<>();
+                    TerminalOp<T, Void> forEachOp = ForEachOps.makeRef(t -> {
+                        if (t == null)
+                            seenNull.set(true);
+                        else
+                            map.putIfAbsent(t, Boolean.TRUE);
+                    }, false);
+                    forEachOp.evaluateParallel(helper, spliterator);
+
+                    // If null has been seen then copy the key set into a HashSet that supports null values
+                    // and add null
+                    Set<T> keys = map.keySet();
+                    if (seenNull.get()) {
+                        // TODO Implement a more efficient set-union view, rather than copying
+                        keys = new HashSet<>(keys);
+                        keys.add(null);
+                    }
+                    return Nodes.node(keys);
+                }
+            }
+
+            @Override
+            Sink<T> opWrapSink(int flags, Sink<T> sink) {
+                Objects.requireNonNull(sink);
+
+                if (StreamOpFlag.DISTINCT.isKnown(flags)) {
+                    return sink;
+                } else if (StreamOpFlag.SORTED.isKnown(flags)) {
+                    return new Sink.ChainedReference<T>(sink) {
+                        boolean seenNull;
+                        T lastSeen;
+
+                        @Override
+                        public void begin(long size) {
+                            seenNull = false;
+                            lastSeen = null;
+                            downstream.begin(-1);
+                        }
+
+                        @Override
+                        public void end() {
+                            seenNull = false;
+                            lastSeen = null;
+                            downstream.end();
+                        }
+
+                        @Override
+                        public void accept(T t) {
+                            if (t == null) {
+                                if (!seenNull) {
+                                    seenNull = true;
+                                    downstream.accept(lastSeen = null);
+                                }
+                            } else if (lastSeen == null || !t.equals(lastSeen)) {
+                                downstream.accept(lastSeen = t);
+                            }
+                        }
+                    };
+                } else {
+                    return new Sink.ChainedReference<T>(sink) {
+                        Set<T> seen;
+
+                        @Override
+                        public void begin(long size) {
+                            seen = new HashSet<>();
+                            downstream.begin(-1);
+                        }
+
+                        @Override
+                        public void end() {
+                            seen = null;
+                            downstream.end();
+                        }
+
+                        @Override
+                        public void accept(T t) {
+                            if (!seen.contains(t)) {
+                                seen.add(t);
+                                downstream.accept(t);
+                            }
+                        }
+                    };
+                }
+            }
+        };
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/DoublePipeline.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,596 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+import java.util.DoubleSummaryStatistics;
+import java.util.Objects;
+import java.util.OptionalDouble;
+import java.util.PrimitiveIterator;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.function.BiConsumer;
+import java.util.function.BinaryOperator;
+import java.util.function.DoubleBinaryOperator;
+import java.util.function.DoubleConsumer;
+import java.util.function.DoubleFunction;
+import java.util.function.DoublePredicate;
+import java.util.function.DoubleToIntFunction;
+import java.util.function.DoubleToLongFunction;
+import java.util.function.DoubleUnaryOperator;
+import java.util.function.IntFunction;
+import java.util.function.ObjDoubleConsumer;
+import java.util.function.Supplier;
+
+/**
+ * Abstract base class for an intermediate pipeline stage or pipeline source
+ * stage implementing whose elements are of type {@code double}.
+ *
+ * @param <E_IN> type of elements in the upstream source
+ *
+ * @since 1.8
+ */
+abstract class DoublePipeline<E_IN>
+        extends AbstractPipeline<E_IN, Double, DoubleStream>
+        implements DoubleStream {
+
+    /**
+     * Constructor for the head of a stream pipeline.
+     *
+     * @param source {@code Supplier<Spliterator>} describing the stream source
+     * @param sourceFlags the source flags for the stream source, described in
+     * {@link StreamOpFlag}
+     */
+    DoublePipeline(Supplier<? extends Spliterator<Double>> source,
+                   int sourceFlags, boolean parallel) {
+        super(source, sourceFlags, parallel);
+    }
+
+    /**
+     * Constructor for the head of a stream pipeline.
+     *
+     * @param source {@code Spliterator} describing the stream source
+     * @param sourceFlags the source flags for the stream source, described in
+     * {@link StreamOpFlag}
+     */
+    DoublePipeline(Spliterator<Double> source,
+                   int sourceFlags, boolean parallel) {
+        super(source, sourceFlags, parallel);
+    }
+
+    /**
+     * Constructor for appending an intermediate operation onto an existing
+     * pipeline.
+     *
+     * @param upstream the upstream element source.
+     * @param opFlags the operation flags
+     */
+    DoublePipeline(AbstractPipeline<?, E_IN, ?> upstream, int opFlags) {
+        super(upstream, opFlags);
+    }
+
+    /**
+     * Adapt a {@code Sink<Double> to a {@code DoubleConsumer}, ideally simply
+     * by casting.
+     */
+    private static DoubleConsumer adapt(Sink<Double> sink) {
+        if (sink instanceof DoubleConsumer) {
+            return (DoubleConsumer) sink;
+        } else {
+            if (Tripwire.ENABLED)
+                Tripwire.trip(AbstractPipeline.class,
+                              "using DoubleStream.adapt(Sink<Double> s)");
+            return sink::accept;
+        }
+    }
+
+    /**
+     * Adapt a {@code Spliterator<Double>} to a {@code Spliterator.OfDouble}.
+     *
+     * @implNote
+     * The implementation attempts to cast to a Spliterator.OfDouble, and throws
+     * an exception if this cast is not possible.
+     */
+    private static Spliterator.OfDouble adapt(Spliterator<Double> s) {
+        if (s instanceof Spliterator.OfDouble) {
+            return (Spliterator.OfDouble) s;
+        } else {
+            if (Tripwire.ENABLED)
+                Tripwire.trip(AbstractPipeline.class,
+                              "using DoubleStream.adapt(Spliterator<Double> s)");
+            throw new UnsupportedOperationException("DoubleStream.adapt(Spliterator<Double> s)");
+        }
+    }
+
+
+    // Shape-specific methods
+
+    @Override
+    final StreamShape getOutputShape() {
+        return StreamShape.DOUBLE_VALUE;
+    }
+
+    @Override
+    final <P_IN> Node<Double> evaluateToNode(PipelineHelper<Double> helper,
+                                             Spliterator<P_IN> spliterator,
+                                             boolean flattenTree,
+                                             IntFunction<Double[]> generator) {
+        return Nodes.collectDouble(helper, spliterator, flattenTree);
+    }
+
+    @Override
+    final <P_IN> Spliterator<Double> wrap(PipelineHelper<Double> ph,
+                                          Supplier<Spliterator<P_IN>> supplier,
+                                          boolean isParallel) {
+        return new StreamSpliterators.DoubleWrappingSpliterator<>(ph, supplier, isParallel);
+    }
+
+    @Override
+    final Spliterator.OfDouble lazySpliterator(Supplier<? extends Spliterator<Double>> supplier) {
+        return new StreamSpliterators.DelegatingSpliterator.OfDouble((Supplier<Spliterator.OfDouble>) supplier);
+    }
+
+    @Override
+    final void forEachWithCancel(Spliterator<Double> spliterator, Sink<Double> sink) {
+        Spliterator.OfDouble spl = adapt(spliterator);
+        DoubleConsumer adaptedSink = adapt(sink);
+        do { } while (!sink.cancellationRequested() && spl.tryAdvance(adaptedSink));
+    }
+
+    @Override
+    final  Node.Builder<Double> makeNodeBuilder(long exactSizeIfKnown, IntFunction<Double[]> generator) {
+        return Nodes.doubleBuilder(exactSizeIfKnown);
+    }
+
+
+    // DoubleStream
+
+    @Override
+    public final PrimitiveIterator.OfDouble iterator() {
+        return Spliterators.iteratorFromSpliterator(spliterator());
+    }
+
+    @Override
+    public final Spliterator.OfDouble spliterator() {
+        return adapt(super.spliterator());
+    }
+
+    // Stateless intermediate ops from DoubleStream
+
+    @Override
+    public final Stream<Double> boxed() {
+        return mapToObj(Double::valueOf);
+    }
+
+    @Override
+    public final DoubleStream map(DoubleUnaryOperator mapper) {
+        Objects.requireNonNull(mapper);
+        return new StatelessOp<Double>(this, StreamShape.DOUBLE_VALUE,
+                                       StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
+                return new Sink.ChainedDouble(sink) {
+                    @Override
+                    public void accept(double t) {
+                        downstream.accept(mapper.applyAsDouble(t));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final <U> Stream<U> mapToObj(DoubleFunction<? extends U> mapper) {
+        Objects.requireNonNull(mapper);
+        return new ReferencePipeline.StatelessOp<Double, U>(this, StreamShape.DOUBLE_VALUE,
+                                                            StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<Double> opWrapSink(int flags, Sink<U> sink) {
+                return new Sink.ChainedDouble(sink) {
+                    @Override
+                    public void accept(double t) {
+                        downstream.accept(mapper.apply(t));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final IntStream mapToInt(DoubleToIntFunction mapper) {
+        Objects.requireNonNull(mapper);
+        return new IntPipeline.StatelessOp<Double>(this, StreamShape.DOUBLE_VALUE,
+                                                   StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<Double> opWrapSink(int flags, Sink<Integer> sink) {
+                return new Sink.ChainedDouble(sink) {
+                    @Override
+                    public void accept(double t) {
+                        downstream.accept(mapper.applyAsInt(t));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final LongStream mapToLong(DoubleToLongFunction mapper) {
+        Objects.requireNonNull(mapper);
+        return new LongPipeline.StatelessOp<Double>(this, StreamShape.DOUBLE_VALUE,
+                                                    StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<Double> opWrapSink(int flags, Sink<Long> sink) {
+                return new Sink.ChainedDouble(sink) {
+                    @Override
+                    public void accept(double t) {
+                        downstream.accept(mapper.applyAsLong(t));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final DoubleStream flatMap(DoubleFunction<? extends DoubleStream> mapper) {
+        return new StatelessOp<Double>(this, StreamShape.DOUBLE_VALUE,
+                                        StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
+            @Override
+            Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
+                return new Sink.ChainedDouble(sink) {
+                    public void accept(double t) {
+                        // We can do better that this too; optimize for depth=0 case and just grab spliterator and forEach it
+                        DoubleStream result = mapper.apply(t);
+                        if (result != null)
+                            result.sequential().forEach(i -> downstream.accept(i));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public DoubleStream unordered() {
+        if (!isOrdered())
+            return this;
+        return new StatelessOp<Double>(this, StreamShape.DOUBLE_VALUE, StreamOpFlag.NOT_ORDERED) {
+            @Override
+            Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
+                return sink;
+            }
+        };
+    }
+
+    @Override
+    public final DoubleStream filter(DoublePredicate predicate) {
+        Objects.requireNonNull(predicate);
+        return new StatelessOp<Double>(this, StreamShape.DOUBLE_VALUE,
+                                       StreamOpFlag.NOT_SIZED) {
+            @Override
+            Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
+                return new Sink.ChainedDouble(sink) {
+                    @Override
+                    public void accept(double t) {
+                        if (predicate.test(t))
+                            downstream.accept(t);
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final DoubleStream peek(DoubleConsumer consumer) {
+        Objects.requireNonNull(consumer);
+        return new StatelessOp<Double>(this, StreamShape.DOUBLE_VALUE,
+                                       0) {
+            @Override
+            Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
+                return new Sink.ChainedDouble(sink) {
+                    @Override
+                    public void accept(double t) {
+                        consumer.accept(t);
+                        downstream.accept(t);
+                    }
+                };
+            }
+        };
+    }
+
+    // Stateful intermediate ops from DoubleStream
+
+    @Override
+    public final DoubleStream limit(long maxSize) {
+        if (maxSize < 0)
+            throw new IllegalArgumentException(Long.toString(maxSize));
+        return SliceOps.makeDouble(this, (long) 0, maxSize);
+    }
+
+    @Override
+    public final DoubleStream substream(long startingOffset) {
+        if (startingOffset < 0)
+            throw new IllegalArgumentException(Long.toString(startingOffset));
+        if (startingOffset == 0)
+            return this;
+        else {
+            long limit = -1;
+            return SliceOps.makeDouble(this, startingOffset, limit);
+        }
+    }
+
+    @Override
+    public final DoubleStream substream(long startingOffset, long endingOffset) {
+        if (startingOffset < 0 || endingOffset < startingOffset)
+            throw new IllegalArgumentException(String.format("substream(%d, %d)", startingOffset, endingOffset));
+        return SliceOps.makeDouble(this, startingOffset, endingOffset - startingOffset);
+    }
+
+    @Override
+    public final DoubleStream sorted() {
+        return SortedOps.makeDouble(this);
+    }
+
+    @Override
+    public final DoubleStream distinct() {
+        // While functional and quick to implement, this approach is not very efficient.
+        // An efficient version requires a double-specific map/set implementation.
+        return boxed().distinct().mapToDouble(i -> (double) i);
+    }
+
+    // Terminal ops from DoubleStream
+
+    @Override
+    public void forEach(DoubleConsumer consumer) {
+        evaluate(ForEachOps.makeDouble(consumer, false));
+    }
+
+    @Override
+    public void forEachOrdered(DoubleConsumer consumer) {
+        evaluate(ForEachOps.makeDouble(consumer, true));
+    }
+
+    @Override
+    public final double sum() {
+        // TODO: better algorithm to compensate for errors
+        return reduce(0.0, Double::sum);
+    }
+
+    @Override
+    public final OptionalDouble min() {
+        return reduce(Math::min);
+    }
+
+    @Override
+    public final OptionalDouble max() {
+        return reduce(Math::max);
+    }
+
+    @Override
+    public final OptionalDouble average() {
+        double[] avg = collect(() -> new double[2],
+                               (ll, i) -> {
+                                   ll[0]++;
+                                   ll[1] += i;
+                               },
+                               (ll, rr) -> {
+                                   ll[0] += rr[0];
+                                   ll[1] += rr[1];
+                               });
+        return avg[0] > 0
+               ? OptionalDouble.of(avg[1] / avg[0])
+               : OptionalDouble.empty();
+    }
+
+    @Override
+    public final long count() {
+        return mapToObj(e -> null).mapToInt(e -> 1).sum();
+    }
+
+    @Override
+    public final DoubleSummaryStatistics summaryStatistics() {
+        return collect(DoubleSummaryStatistics::new, DoubleSummaryStatistics::accept,
+                       DoubleSummaryStatistics::combine);
+    }
+
+    @Override
+    public final double reduce(double identity, DoubleBinaryOperator op) {
+        return evaluate(ReduceOps.makeDouble(identity, op));
+    }
+
+    @Override
+    public final OptionalDouble reduce(DoubleBinaryOperator op) {
+        return evaluate(ReduceOps.makeDouble(op));
+    }
+
+    @Override
+    public final <R> R collect(Supplier<R> resultFactory,
+                               ObjDoubleConsumer<R> accumulator,
+                               BiConsumer<R, R> combiner) {
+        BinaryOperator<R> operator = (left, right) -> {
+            combiner.accept(left, right);
+            return left;
+        };
+        return evaluate(ReduceOps.makeDouble(resultFactory, accumulator, operator));
+    }
+
+    @Override
+    public final boolean anyMatch(DoublePredicate predicate) {
+        return evaluate(MatchOps.makeDouble(predicate, MatchOps.MatchKind.ANY));
+    }
+
+    @Override
+    public final boolean allMatch(DoublePredicate predicate) {
+        return evaluate(MatchOps.makeDouble(predicate, MatchOps.MatchKind.ALL));
+    }
+
+    @Override
+    public final boolean noneMatch(DoublePredicate predicate) {
+        return evaluate(MatchOps.makeDouble(predicate, MatchOps.MatchKind.NONE));
+    }
+
+    @Override
+    public final OptionalDouble findFirst() {
+        return evaluate(FindOps.makeDouble(true));
+    }
+
+    @Override
+    public final OptionalDouble findAny() {
+        return evaluate(FindOps.makeDouble(false));
+    }
+
+    @Override
+    public final double[] toArray() {
+        return Nodes.flattenDouble((Node.OfDouble) evaluateToArrayNode(Double[]::new))
+                        .asDoubleArray();
+    }
+
+    //
+
+    /**
+     * Source stage of a DoubleStream
+     *
+     * @param <E_IN> type of elements in the upstream source
+     */
+    static class Head<E_IN> extends DoublePipeline<E_IN> {
+        /**
+         * Constructor for the source stage of a DoubleStream.
+         *
+         * @param source {@code Supplier<Spliterator>} describing the stream
+         *               source
+         * @param sourceFlags the source flags for the stream source, described
+         *                    in {@link StreamOpFlag}
+         * @param parallel {@code true} if the pipeline is parallel
+         */
+        Head(Supplier<? extends Spliterator<Double>> source,
+             int sourceFlags, boolean parallel) {
+            super(source, sourceFlags, parallel);
+        }
+
+        /**
+         * Constructor for the source stage of a DoubleStream.
+         *
+         * @param source {@code Spliterator} describing the stream source
+         * @param sourceFlags the source flags for the stream source, described
+         *                    in {@link StreamOpFlag}
+         * @param parallel {@code true} if the pipeline is parallel
+         */
+        Head(Spliterator<Double> source,
+             int sourceFlags, boolean parallel) {
+            super(source, sourceFlags, parallel);
+        }
+
+        @Override
+        final boolean opIsStateful() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        final Sink<E_IN> opWrapSink(int flags, Sink<Double> sink) {
+            throw new UnsupportedOperationException();
+        }
+
+        // Optimized sequential terminal operations for the head of the pipeline
+
+        @Override
+        public void forEach(DoubleConsumer consumer) {
+            if (!isParallel()) {
+                adapt(sourceStageSpliterator()).forEachRemaining(consumer);
+            }
+            else {
+                super.forEach(consumer);
+            }
+        }
+
+        @Override
+        public void forEachOrdered(DoubleConsumer consumer) {
+            if (!isParallel()) {
+                adapt(sourceStageSpliterator()).forEachRemaining(consumer);
+            }
+            else {
+                super.forEachOrdered(consumer);
+            }
+        }
+
+    }
+
+    /**
+     * Base class for a stateless intermediate stage of a DoubleStream.
+     *
+     * @param <E_IN> type of elements in the upstream source
+     * @since 1.8
+     */
+    abstract static class StatelessOp<E_IN> extends DoublePipeline<E_IN> {
+        /**
+         * Construct a new DoubleStream by appending a stateless intermediate
+         * operation to an existing stream.
+         *
+         * @param upstream the upstream pipeline stage
+         * @param inputShape the stream shape for the upstream pipeline stage
+         * @param opFlags operation flags for the new stage
+         */
+        StatelessOp(AbstractPipeline<?, E_IN, ?> upstream,
+                    StreamShape inputShape,
+                    int opFlags) {
+            super(upstream, opFlags);
+            assert upstream.getOutputShape() == inputShape;
+        }
+
+        @Override
+        final boolean opIsStateful() {
+            return false;
+        }
+    }
+
+    /**
+     * Base class for a stateful intermediate stage of a DoubleStream.
+     *
+     * @param <E_IN> type of elements in the upstream source
+     * @since 1.8
+     */
+    abstract static class StatefulOp<E_IN> extends DoublePipeline<E_IN> {
+        /**
+         * Construct a new DoubleStream by appending a stateful intermediate
+         * operation to an existing stream.
+         *
+         * @param upstream the upstream pipeline stage
+         * @param inputShape the stream shape for the upstream pipeline stage
+         * @param opFlags operation flags for the new stage
+         */
+        StatefulOp(AbstractPipeline<?, E_IN, ?> upstream,
+                   StreamShape inputShape,
+                   int opFlags) {
+            super(upstream, opFlags);
+            assert upstream.getOutputShape() == inputShape;
+        }
+
+        @Override
+        final boolean opIsStateful() {
+            return true;
+        }
+
+        @Override
+        abstract <P_IN> Node<Double> opEvaluateParallel(PipelineHelper<Double> helper,
+                                                        Spliterator<P_IN> spliterator,
+                                                        IntFunction<Double[]> generator);
+    }
+}
--- a/jdk/src/share/classes/java/util/stream/DoubleStream.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/util/stream/DoubleStream.java	Wed May 08 11:22:25 2013 +0100
@@ -24,15 +24,19 @@
  */
 package java.util.stream;
 
+import java.util.Arrays;
 import java.util.DoubleSummaryStatistics;
+import java.util.Objects;
 import java.util.OptionalDouble;
 import java.util.PrimitiveIterator;
 import java.util.Spliterator;
+import java.util.Spliterators;
 import java.util.function.BiConsumer;
 import java.util.function.DoubleBinaryOperator;
 import java.util.function.DoubleConsumer;
 import java.util.function.DoubleFunction;
 import java.util.function.DoublePredicate;
+import java.util.function.DoubleSupplier;
 import java.util.function.DoubleToIntFunction;
 import java.util.function.DoubleToLongFunction;
 import java.util.function.DoubleUnaryOperator;
@@ -649,4 +653,175 @@
 
     @Override
     Spliterator.OfDouble spliterator();
+
+
+    // Static factories
+
+    /**
+     * Returns a builder for a {@code DoubleStream}.
+     *
+     * @return a stream builder
+     */
+    public static StreamBuilder.OfDouble builder() {
+        return new Streams.DoubleStreamBuilderImpl();
+    }
+
+    /**
+     * Returns an empty sequential {@code DoubleStream}.
+     *
+     * @return an empty sequential stream
+     */
+    public static DoubleStream empty() {
+        return StreamSupport.doubleStream(Spliterators.emptyDoubleSpliterator());
+    }
+
+    /**
+     * Returns a sequential {@code DoubleStream} containing a single element.
+     *
+     * @param t the single element
+     * @return a singleton sequential stream
+     */
+    public static DoubleStream of(double t) {
+        return StreamSupport.doubleStream(new Streams.DoubleStreamBuilderImpl(t));
+    }
+
+    /**
+     * Returns a sequential stream whose elements are the specified values.
+     *
+     * @param values the elements of the new stream
+     * @return the new stream
+     */
+    public static DoubleStream of(double... values) {
+        return Arrays.stream(values);
+    }
+
+    /**
+     * Returns an infinite sequential {@code DoubleStream} produced by iterative
+     * application of a function {@code f} to an initial element {@code seed},
+     * producing a {@code Stream} consisting of {@code seed}, {@code f(seed)},
+     * {@code f(f(seed))}, etc.
+     *
+     * <p>The first element (position {@code 0}) in the {@code DoubleStream}
+     * will be the provided {@code seed}.  For {@code n > 0}, the element at
+     * position {@code n}, will be the result of applying the function {@code f}
+     *  to the element at position {@code n - 1}.
+     *
+     * @param seed the initial element
+     * @param f a function to be applied to to the previous element to produce
+     *          a new element
+     * @return a new sequential {@code DoubleStream}
+     */
+    public static DoubleStream iterate(final double seed, final DoubleUnaryOperator f) {
+        Objects.requireNonNull(f);
+        final PrimitiveIterator.OfDouble iterator = new PrimitiveIterator.OfDouble() {
+            double t = seed;
+
+            @Override
+            public boolean hasNext() {
+                return true;
+            }
+
+            @Override
+            public double nextDouble() {
+                double v = t;
+                t = f.applyAsDouble(t);
+                return v;
+            }
+        };
+        return StreamSupport.doubleStream(Spliterators.spliteratorUnknownSize(
+                iterator,
+                Spliterator.ORDERED | Spliterator.IMMUTABLE | Spliterator.NONNULL));
+    }
+
+    /**
+     * Returns a sequential {@code DoubleStream} where each element is
+     * generated by an {@code DoubleSupplier}.  This is suitable for generating
+     * constant streams, streams of random elements, etc.
+     *
+     * @param s the {@code DoubleSupplier} for generated elements
+     * @return a new sequential {@code DoubleStream}
+     */
+    public static DoubleStream generate(DoubleSupplier s) {
+        Objects.requireNonNull(s);
+        return StreamSupport.doubleStream(Spliterators.spliteratorUnknownSize(
+                new PrimitiveIterator.OfDouble() {
+                    @Override
+                    public boolean hasNext() { return true; }
+
+                    @Override
+                    public double nextDouble() { return s.getAsDouble(); }
+                },
+                Spliterator.ORDERED | Spliterator.IMMUTABLE | Spliterator.NONNULL));
+    }
+
+    /**
+     * Returns a sequential {@code DoubleStream} from {@code startInclusive} (inclusive)
+     * to {@code endExclusive} (exclusive) by an incremental step of 1.0.
+     *
+     * @implSpec
+     * The implementation behaves as if:
+     * <pre>{@code
+     *     doubleRange(startInclusive, endExclusive, 1.0);
+     * }</pre>
+     *
+     * @param startInclusive the (inclusive) initial value
+     * @param endExclusive the exclusive upper bound
+     * @return a sequential {@code DoubleStream} for the range of {@code double}
+     *         elements
+     */
+    public static DoubleStream range(double startInclusive, double endExclusive) {
+        return range(startInclusive, endExclusive, 1.0);
+    }
+
+    /**
+     * Returns a sequential {@code DoubleStream} from {@code startInclusive}
+     * (inclusive) to {@code endExclusive} (exclusive) by {@code step}. If
+     * {@code startInclusive} is greater than or equal to {@code
+     * endExclusive}, an empty stream is returned.
+     *
+     * An equivalent sequence of increasing values can be produced
+     * sequentially using a {@code for} loop as follows:
+     * <pre>{@code
+     *     long size = (long) Math.ceil((startInclusive - endExclusive) / step);
+     *     long i = 0
+     *     for (double v = startInclusive; i < size; i++, v = startInclusive + step * i) {
+     *         ...
+     *     }
+     * }</pre>
+     *
+     * @param startInclusive the (inclusive) initial value
+     * @param endExclusive the exclusive upper bound
+     * @param step the difference between consecutive values
+     * @return a sequential {@code DoubleStream} for tne range of {@code double}
+     *         elements
+     * @throws IllegalArgumentException if {@code step} is less than or equal to
+     *         0. is {@code NaN}, or the count of elements in the range would be
+     *         greater than {@code Long.MAX_VALUE}
+     */
+    public static DoubleStream range(double startInclusive, double endExclusive, double step) {
+        // @@@ Need to check for ranges that may not produce distinct values
+        //     such as when the step is very small
+        //     Also clarify the size of the range which may produce more or less
+        //     than expected
+        if (step <= 0 || Double.isNaN(step)) {
+            throw new IllegalArgumentException(String.format("Illegal step: %f", step));
+        } else {
+            double range = endExclusive - startInclusive;
+            if (range <= 0) {
+                return empty();
+            }
+            double size = Math.ceil((endExclusive - startInclusive) / step);
+            if (Double.isNaN(size)) {
+                throw new IllegalArgumentException(
+                        String.format("Illegal range: %f size is NaN", size));
+            } else if (size > Long.MAX_VALUE) {
+                throw new IllegalArgumentException(
+                        String.format("Illegal range: size %f > Long.MAX_VALUE", size));
+            } else {
+                return StreamSupport.doubleStream(
+                        new Streams.RangeDoubleSpliterator(
+                                startInclusive, endExclusive, step, 0, (long) size));
+            }
+        }
+    }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/IntPipeline.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,631 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+import java.util.IntSummaryStatistics;
+import java.util.Objects;
+import java.util.OptionalDouble;
+import java.util.OptionalInt;
+import java.util.PrimitiveIterator;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.function.BiConsumer;
+import java.util.function.BinaryOperator;
+import java.util.function.IntBinaryOperator;
+import java.util.function.IntConsumer;
+import java.util.function.IntFunction;
+import java.util.function.IntPredicate;
+import java.util.function.IntToDoubleFunction;
+import java.util.function.IntToLongFunction;
+import java.util.function.IntUnaryOperator;
+import java.util.function.ObjIntConsumer;
+import java.util.function.Supplier;
+
+/**
+ * Abstract base class for an intermediate pipeline stage or pipeline source
+ * stage implementing whose elements are of type {@code int}.
+ *
+ * @param <E_IN> type of elements in the upstream source
+ * @since 1.8
+ */
+abstract class IntPipeline<E_IN>
+        extends AbstractPipeline<E_IN, Integer, IntStream>
+        implements IntStream {
+
+    /**
+     * Constructor for the head of a stream pipeline.
+     *
+     * @param source {@code Supplier<Spliterator>} describing the stream source
+     * @param sourceFlags The source flags for the stream source, described in
+     *        {@link StreamOpFlag}
+     * @param parallel {@code true} if the pipeline is parallel
+     */
+    IntPipeline(Supplier<? extends Spliterator<Integer>> source,
+                int sourceFlags, boolean parallel) {
+        super(source, sourceFlags, parallel);
+    }
+
+    /**
+     * Constructor for the head of a stream pipeline.
+     *
+     * @param source {@code Spliterator} describing the stream source
+     * @param sourceFlags The source flags for the stream source, described in
+     *        {@link StreamOpFlag}
+     * @param parallel {@code true} if the pipeline is parallel
+     */
+    IntPipeline(Spliterator<Integer> source,
+                int sourceFlags, boolean parallel) {
+        super(source, sourceFlags, parallel);
+    }
+
+    /**
+     * Constructor for appending an intermediate operation onto an existing
+     * pipeline.
+     *
+     * @param upstream the upstream element source
+     * @param opFlags the operation flags for the new operation
+     */
+    IntPipeline(AbstractPipeline<?, E_IN, ?> upstream, int opFlags) {
+        super(upstream, opFlags);
+    }
+
+    /**
+     * Adapt a {@code Sink<Integer> to an {@code IntConsumer}, ideally simply
+     * by casting.
+     */
+    private static IntConsumer adapt(Sink<Integer> sink) {
+        if (sink instanceof IntConsumer) {
+            return (IntConsumer) sink;
+        }
+        else {
+            if (Tripwire.ENABLED)
+                Tripwire.trip(AbstractPipeline.class,
+                              "using IntStream.adapt(Sink<Integer> s)");
+            return sink::accept;
+        }
+    }
+
+    /**
+     * Adapt a {@code Spliterator<Integer>} to a {@code Spliterator.OfInt}.
+     *
+     * @implNote
+     * The implementation attempts to cast to a Spliterator.OfInt, and throws an
+     * exception if this cast is not possible.
+     */
+    private static Spliterator.OfInt adapt(Spliterator<Integer> s) {
+        if (s instanceof Spliterator.OfInt) {
+            return (Spliterator.OfInt) s;
+        }
+        else {
+            if (Tripwire.ENABLED)
+                Tripwire.trip(AbstractPipeline.class,
+                              "using IntStream.adapt(Spliterator<Integer> s)");
+            throw new UnsupportedOperationException("IntStream.adapt(Spliterator<Integer> s)");
+        }
+    }
+
+
+    // Shape-specific methods
+
+    @Override
+    final StreamShape getOutputShape() {
+        return StreamShape.INT_VALUE;
+    }
+
+    @Override
+    final <P_IN> Node<Integer> evaluateToNode(PipelineHelper<Integer> helper,
+                                              Spliterator<P_IN> spliterator,
+                                              boolean flattenTree,
+                                              IntFunction<Integer[]> generator) {
+        return Nodes.collectInt(helper, spliterator, flattenTree);
+    }
+
+    @Override
+    final <P_IN> Spliterator<Integer> wrap(PipelineHelper<Integer> ph,
+                                           Supplier<Spliterator<P_IN>> supplier,
+                                           boolean isParallel) {
+        return new StreamSpliterators.IntWrappingSpliterator<>(ph, supplier, isParallel);
+    }
+
+    @Override
+    final Spliterator.OfInt lazySpliterator(Supplier<? extends Spliterator<Integer>> supplier) {
+        return new StreamSpliterators.DelegatingSpliterator.OfInt((Supplier<Spliterator.OfInt>) supplier);
+    }
+
+    @Override
+    final void forEachWithCancel(Spliterator<Integer> spliterator, Sink<Integer> sink) {
+        Spliterator.OfInt spl = adapt(spliterator);
+        IntConsumer adaptedSink = adapt(sink);
+        do { } while (!sink.cancellationRequested() && spl.tryAdvance(adaptedSink));
+    }
+
+    @Override
+    final Node.Builder<Integer> makeNodeBuilder(long exactSizeIfKnown,
+                                                IntFunction<Integer[]> generator) {
+        return Nodes.intBuilder(exactSizeIfKnown);
+    }
+
+
+    // IntStream
+
+    @Override
+    public final PrimitiveIterator.OfInt iterator() {
+        return Spliterators.iteratorFromSpliterator(spliterator());
+    }
+
+    @Override
+    public final Spliterator.OfInt spliterator() {
+        return adapt(super.spliterator());
+    }
+
+    // Stateless intermediate ops from IntStream
+
+    @Override
+    public final LongStream longs() {
+        return new LongPipeline.StatelessOp<Integer>(this, StreamShape.INT_VALUE,
+                                                     StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<Integer> opWrapSink(int flags, Sink<Long> sink) {
+                return new Sink.ChainedInt(sink) {
+                    @Override
+                    public void accept(int t) {
+                        downstream.accept((long) t);
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final DoubleStream doubles() {
+        return new DoublePipeline.StatelessOp<Integer>(this, StreamShape.INT_VALUE,
+                                                       StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<Integer> opWrapSink(int flags, Sink<Double> sink) {
+                return new Sink.ChainedInt(sink) {
+                    @Override
+                    public void accept(int t) {
+                        downstream.accept((double) t);
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final Stream<Integer> boxed() {
+        return mapToObj(Integer::valueOf);
+    }
+
+    @Override
+    public final IntStream map(IntUnaryOperator mapper) {
+        Objects.requireNonNull(mapper);
+        return new StatelessOp<Integer>(this, StreamShape.INT_VALUE,
+                                        StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
+                return new Sink.ChainedInt(sink) {
+                    @Override
+                    public void accept(int t) {
+                        downstream.accept(mapper.applyAsInt(t));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final <U> Stream<U> mapToObj(IntFunction<? extends U> mapper) {
+        Objects.requireNonNull(mapper);
+        return new ReferencePipeline.StatelessOp<Integer, U>(this, StreamShape.INT_VALUE,
+                                                             StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<Integer> opWrapSink(int flags, Sink<U> sink) {
+                return new Sink.ChainedInt(sink) {
+                    @Override
+                    public void accept(int t) {
+                        downstream.accept(mapper.apply(t));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final LongStream mapToLong(IntToLongFunction mapper) {
+        Objects.requireNonNull(mapper);
+        return new LongPipeline.StatelessOp<Integer>(this, StreamShape.INT_VALUE,
+                                                     StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<Integer> opWrapSink(int flags, Sink<Long> sink) {
+                return new Sink.ChainedInt(sink) {
+                    @Override
+                    public void accept(int t) {
+                        downstream.accept(mapper.applyAsLong(t));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final DoubleStream mapToDouble(IntToDoubleFunction mapper) {
+        Objects.requireNonNull(mapper);
+        return new DoublePipeline.StatelessOp<Integer>(this, StreamShape.INT_VALUE,
+                                                       StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<Integer> opWrapSink(int flags, Sink<Double> sink) {
+                return new Sink.ChainedInt(sink) {
+                    @Override
+                    public void accept(int t) {
+                        downstream.accept(mapper.applyAsDouble(t));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final IntStream flatMap(IntFunction<? extends IntStream> mapper) {
+        return new StatelessOp<Integer>(this, StreamShape.INT_VALUE,
+                                        StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
+            @Override
+            Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
+                return new Sink.ChainedInt(sink) {
+                    public void accept(int t) {
+                        // We can do better that this too; optimize for depth=0 case and just grab spliterator and forEach it
+                        IntStream result = mapper.apply(t);
+                        if (result != null)
+                            result.sequential().forEach(i -> downstream.accept(i));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public IntStream unordered() {
+        if (!isOrdered())
+            return this;
+        return new StatelessOp<Integer>(this, StreamShape.INT_VALUE, StreamOpFlag.NOT_ORDERED) {
+            @Override
+            Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
+                return sink;
+            }
+        };
+    }
+
+    @Override
+    public final IntStream filter(IntPredicate predicate) {
+        Objects.requireNonNull(predicate);
+        return new StatelessOp<Integer>(this, StreamShape.INT_VALUE,
+                                        StreamOpFlag.NOT_SIZED) {
+            @Override
+            Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
+                return new Sink.ChainedInt(sink) {
+                    @Override
+                    public void accept(int t) {
+                        if (predicate.test(t))
+                            downstream.accept(t);
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final IntStream peek(IntConsumer consumer) {
+        Objects.requireNonNull(consumer);
+        return new StatelessOp<Integer>(this, StreamShape.INT_VALUE,
+                                        0) {
+            @Override
+            Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
+                return new Sink.ChainedInt(sink) {
+                    @Override
+                    public void accept(int t) {
+                        consumer.accept(t);
+                        downstream.accept(t);
+                    }
+                };
+            }
+        };
+    }
+
+    // Stateful intermediate ops from IntStream
+
+    private IntStream slice(long skip, long limit) {
+        return SliceOps.makeInt(this, skip, limit);
+    }
+
+    @Override
+    public final IntStream limit(long maxSize) {
+        if (maxSize < 0)
+            throw new IllegalArgumentException(Long.toString(maxSize));
+        return slice(0, maxSize);
+    }
+
+    @Override
+    public final IntStream substream(long startingOffset) {
+        if (startingOffset < 0)
+            throw new IllegalArgumentException(Long.toString(startingOffset));
+        if (startingOffset == 0)
+            return this;
+        else
+            return slice(startingOffset, -1);
+    }
+
+    @Override
+    public final IntStream substream(long startingOffset, long endingOffset) {
+        if (startingOffset < 0 || endingOffset < startingOffset)
+            throw new IllegalArgumentException(String.format("substream(%d, %d)", startingOffset, endingOffset));
+        return slice(startingOffset, endingOffset - startingOffset);
+    }
+
+    @Override
+    public final IntStream sorted() {
+        return SortedOps.makeInt(this);
+    }
+
+    @Override
+    public final IntStream distinct() {
+        // While functional and quick to implement, this approach is not very efficient.
+        // An efficient version requires an int-specific map/set implementation.
+        return boxed().distinct().mapToInt(i -> i);
+    }
+
+    // Terminal ops from IntStream
+
+    @Override
+    public void forEach(IntConsumer action) {
+        evaluate(ForEachOps.makeInt(action, false));
+    }
+
+    @Override
+    public void forEachOrdered(IntConsumer action) {
+        evaluate(ForEachOps.makeInt(action, true));
+    }
+
+    @Override
+    public final int sum() {
+        return reduce(0, Integer::sum);
+    }
+
+    @Override
+    public final OptionalInt min() {
+        return reduce(Math::min);
+    }
+
+    @Override
+    public final OptionalInt max() {
+        return reduce(Math::max);
+    }
+
+    @Override
+    public final long count() {
+        return longs().map(e -> 1L).sum();
+    }
+
+    @Override
+    public final OptionalDouble average() {
+        long[] avg = collect(() -> new long[2],
+                             (ll, i) -> {
+                                 ll[0]++;
+                                 ll[1] += i;
+                             },
+                             (ll, rr) -> {
+                                 ll[0] += rr[0];
+                                 ll[1] += rr[1];
+                             });
+        return avg[0] > 0
+               ? OptionalDouble.of((double) avg[1] / avg[0])
+               : OptionalDouble.empty();
+    }
+
+    @Override
+    public final IntSummaryStatistics summaryStatistics() {
+        return collect(IntSummaryStatistics::new, IntSummaryStatistics::accept,
+                       IntSummaryStatistics::combine);
+    }
+
+    @Override
+    public final int reduce(int identity, IntBinaryOperator op) {
+        return evaluate(ReduceOps.makeInt(identity, op));
+    }
+
+    @Override
+    public final OptionalInt reduce(IntBinaryOperator op) {
+        return evaluate(ReduceOps.makeInt(op));
+    }
+
+    @Override
+    public final <R> R collect(Supplier<R> resultFactory,
+                               ObjIntConsumer<R> accumulator,
+                               BiConsumer<R, R> combiner) {
+        BinaryOperator<R> operator = (left, right) -> {
+            combiner.accept(left, right);
+            return left;
+        };
+        return evaluate(ReduceOps.makeInt(resultFactory, accumulator, operator));
+    }
+
+    @Override
+    public final boolean anyMatch(IntPredicate predicate) {
+        return evaluate(MatchOps.makeInt(predicate, MatchOps.MatchKind.ANY));
+    }
+
+    @Override
+    public final boolean allMatch(IntPredicate predicate) {
+        return evaluate(MatchOps.makeInt(predicate, MatchOps.MatchKind.ALL));
+    }
+
+    @Override
+    public final boolean noneMatch(IntPredicate predicate) {
+        return evaluate(MatchOps.makeInt(predicate, MatchOps.MatchKind.NONE));
+    }
+
+    @Override
+    public final OptionalInt findFirst() {
+        return evaluate(FindOps.makeInt(true));
+    }
+
+    @Override
+    public final OptionalInt findAny() {
+        return evaluate(FindOps.makeInt(false));
+    }
+
+    @Override
+    public final int[] toArray() {
+        return Nodes.flattenInt((Node.OfInt) evaluateToArrayNode(Integer[]::new))
+                        .asIntArray();
+    }
+
+    //
+
+    /**
+     * Source stage of an IntStream.
+     *
+     * @param <E_IN> type of elements in the upstream source
+     * @since 1.8
+     */
+    static class Head<E_IN> extends IntPipeline<E_IN> {
+        /**
+         * Constructor for the source stage of an IntStream.
+         *
+         * @param source {@code Supplier<Spliterator>} describing the stream
+         *               source
+         * @param sourceFlags the source flags for the stream source, described
+         *                    in {@link StreamOpFlag}
+         * @param parallel {@code true} if the pipeline is parallel
+         */
+        Head(Supplier<? extends Spliterator<Integer>> source,
+             int sourceFlags, boolean parallel) {
+            super(source, sourceFlags, parallel);
+        }
+
+        /**
+         * Constructor for the source stage of an IntStream.
+         *
+         * @param source {@code Spliterator} describing the stream source
+         * @param sourceFlags the source flags for the stream source, described
+         *                    in {@link StreamOpFlag}
+         * @param parallel {@code true} if the pipeline is parallel
+         */
+        Head(Spliterator<Integer> source,
+             int sourceFlags, boolean parallel) {
+            super(source, sourceFlags, parallel);
+        }
+
+        @Override
+        final boolean opIsStateful() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        final Sink<E_IN> opWrapSink(int flags, Sink<Integer> sink) {
+            throw new UnsupportedOperationException();
+        }
+
+        // Optimized sequential terminal operations for the head of the pipeline
+
+        @Override
+        public void forEach(IntConsumer action) {
+            if (!isParallel()) {
+                adapt(sourceStageSpliterator()).forEachRemaining(action);
+            }
+            else {
+                super.forEach(action);
+            }
+        }
+
+        @Override
+        public void forEachOrdered(IntConsumer action) {
+            if (!isParallel()) {
+                adapt(sourceStageSpliterator()).forEachRemaining(action);
+            }
+            else {
+                super.forEachOrdered(action);
+            }
+        }
+    }
+
+    /**
+     * Base class for a stateless intermediate stage of an IntStream
+     *
+     * @param <E_IN> type of elements in the upstream source
+     * @since 1.8
+     */
+    abstract static class StatelessOp<E_IN> extends IntPipeline<E_IN> {
+        /**
+         * Construct a new IntStream by appending a stateless intermediate
+         * operation to an existing stream.
+         * @param upstream The upstream pipeline stage
+         * @param inputShape The stream shape for the upstream pipeline stage
+         * @param opFlags Operation flags for the new stage
+         */
+        StatelessOp(AbstractPipeline<?, E_IN, ?> upstream,
+                    StreamShape inputShape,
+                    int opFlags) {
+            super(upstream, opFlags);
+            assert upstream.getOutputShape() == inputShape;
+        }
+
+        @Override
+        final boolean opIsStateful() {
+            return false;
+        }
+    }
+
+    /**
+     * Base class for a stateful intermediate stage of an IntStream.
+     *
+     * @param <E_IN> type of elements in the upstream source
+     * @since 1.8
+     */
+    abstract static class StatefulOp<E_IN> extends IntPipeline<E_IN> {
+        /**
+         * Construct a new IntStream by appending a stateful intermediate
+         * operation to an existing stream.
+         * @param upstream The upstream pipeline stage
+         * @param inputShape The stream shape for the upstream pipeline stage
+         * @param opFlags Operation flags for the new stage
+         */
+        StatefulOp(AbstractPipeline<?, E_IN, ?> upstream,
+                   StreamShape inputShape,
+                   int opFlags) {
+            super(upstream, opFlags);
+            assert upstream.getOutputShape() == inputShape;
+        }
+
+        @Override
+        final boolean opIsStateful() {
+            return true;
+        }
+
+        @Override
+        abstract <P_IN> Node<Integer> opEvaluateParallel(PipelineHelper<Integer> helper,
+                                                         Spliterator<P_IN> spliterator,
+                                                         IntFunction<Integer[]> generator);
+    }
+}
--- a/jdk/src/share/classes/java/util/stream/IntStream.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/util/stream/IntStream.java	Wed May 08 11:22:25 2013 +0100
@@ -24,17 +24,21 @@
  */
 package java.util.stream;
 
+import java.util.Arrays;
 import java.util.IntSummaryStatistics;
+import java.util.Objects;
 import java.util.OptionalDouble;
 import java.util.OptionalInt;
 import java.util.PrimitiveIterator;
 import java.util.Spliterator;
+import java.util.Spliterators;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.function.IntBinaryOperator;
 import java.util.function.IntConsumer;
 import java.util.function.IntFunction;
 import java.util.function.IntPredicate;
+import java.util.function.IntSupplier;
 import java.util.function.IntToDoubleFunction;
 import java.util.function.IntToLongFunction;
 import java.util.function.IntUnaryOperator;
@@ -652,4 +656,153 @@
 
     @Override
     Spliterator.OfInt spliterator();
+
+    // Static factories
+
+    /**
+     * Returns a builder for an {@code IntStream}.
+     *
+     * @return a stream builder
+     */
+    public static StreamBuilder.OfInt builder() {
+        return new Streams.IntStreamBuilderImpl();
+    }
+
+    /**
+     * Returns an empty sequential {@code IntStream}.
+     *
+     * @return an empty sequential stream
+     */
+    public static IntStream empty() {
+        return StreamSupport.intStream(Spliterators.emptyIntSpliterator());
+    }
+
+    /**
+     * Returns a sequential {@code IntStream} containing a single element.
+     *
+     * @param t the single element
+     * @return a singleton sequential stream
+     */
+    public static IntStream of(int t) {
+        return StreamSupport.intStream(new Streams.IntStreamBuilderImpl(t));
+    }
+
+    /**
+     * Returns a sequential stream whose elements are the specified values.
+     *
+     * @param values the elements of the new stream
+     * @return the new stream
+     */
+    public static IntStream of(int... values) {
+        return Arrays.stream(values);
+    }
+
+    /**
+     * Returns an infinite sequential {@code IntStream} produced by iterative
+     * application of a function {@code f} to an initial element {@code seed},
+     * producing a {@code Stream} consisting of {@code seed}, {@code f(seed)},
+     * {@code f(f(seed))}, etc.
+     *
+     * <p>The first element (position {@code 0}) in the {@code IntStream} will be
+     * the provided {@code seed}.  For {@code n > 0}, the element at position
+     * {@code n}, will be the result of applying the function {@code f} to the
+     * element at position {@code n - 1}.
+     *
+     * @param seed the initial element
+     * @param f a function to be applied to to the previous element to produce
+     *          a new element
+     * @return A new sequential {@code IntStream}
+     */
+    public static IntStream iterate(final int seed, final IntUnaryOperator f) {
+        Objects.requireNonNull(f);
+        final PrimitiveIterator.OfInt iterator = new PrimitiveIterator.OfInt() {
+            int t = seed;
+
+            @Override
+            public boolean hasNext() {
+                return true;
+            }
+
+            @Override
+            public int nextInt() {
+                int v = t;
+                t = f.applyAsInt(t);
+                return v;
+            }
+        };
+        return StreamSupport.intStream(Spliterators.spliteratorUnknownSize(
+                iterator,
+                Spliterator.ORDERED | Spliterator.IMMUTABLE | Spliterator.NONNULL));
+    }
+
+    /**
+     * Returns a sequential {@code IntStream} where each element is
+     * generated by an {@code IntSupplier}.  This is suitable for generating
+     * constant streams, streams of random elements, etc.
+     *
+     * @param s the {@code IntSupplier} for generated elements
+     * @return a new sequential {@code IntStream}
+     */
+    public static IntStream generate(IntSupplier s) {
+        Objects.requireNonNull(s);
+        return StreamSupport.intStream(Spliterators.spliteratorUnknownSize(
+                new PrimitiveIterator.OfInt() {
+                    @Override
+                    public boolean hasNext() { return true; }
+
+                    @Override
+                    public int nextInt() { return s.getAsInt(); }
+                },
+                Spliterator.ORDERED | Spliterator.IMMUTABLE | Spliterator.NONNULL));
+    }
+
+    /**
+     * Returns a sequential {@code IntStream} from {@code startInclusive}
+     * (inclusive) to {@code endExclusive} (exclusive) by an incremental step of
+     * 1.
+     *
+     * @implSpec
+     * The implementation behaves as if:
+     * <pre>{@code
+     *     intRange(startInclusive, endExclusive, 1);
+     * }</pre>
+     *
+     * @param startInclusive the (inclusive) initial value
+     * @param endExclusive the exclusive upper bound
+     * @return a sequential {@code IntStream} for the range of {@code int}
+     *         elements
+     */
+    public static IntStream range(int startInclusive, int endExclusive) {
+        return range(startInclusive, endExclusive, 1);
+    }
+
+    /**
+     * Returns a sequential {@code IntStream} from {@code startInclusive}
+     * (inclusive) to {@code endExclusive} (exclusive) by a positive {@code
+     * step}.  If {@code startInclusive} is greater than or equal to {@code
+     * endExclusive}, an empty stream is returned.
+     *
+     * <p>An equivalent sequence of increasing values can be produced
+     * sequentially using a {@code for} loop as follows:
+     * <pre>{@code
+     *     for (int i = startInclusive; i < endExclusive ; i += step) { ... }
+     * }</pre>
+     *
+     * @param startInclusive the (inclusive) initial value
+     * @param endExclusive the exclusive upper bound
+     * @param step the positive difference between consecutive values
+     * @return a sequential {@code IntStream} for the range of {@code int}
+     *         elements
+     * @throws IllegalArgumentException if {@code step} is less than or equal to
+     *                                  0
+     */
+    public static IntStream range(int startInclusive, int endExclusive, int step) {
+        if (step <= 0) {
+            throw new IllegalArgumentException(String.format("Illegal step: %d", step));
+        } else if (startInclusive >= endExclusive) {
+            return empty();
+        } else {
+            return StreamSupport.intStream(new Streams.RangeIntSpliterator(startInclusive, endExclusive, step));
+        }
+    }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/LongPipeline.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,610 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+import java.util.LongSummaryStatistics;
+import java.util.Objects;
+import java.util.OptionalDouble;
+import java.util.OptionalLong;
+import java.util.PrimitiveIterator;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.function.BiConsumer;
+import java.util.function.BinaryOperator;
+import java.util.function.IntFunction;
+import java.util.function.LongBinaryOperator;
+import java.util.function.LongConsumer;
+import java.util.function.LongFunction;
+import java.util.function.LongPredicate;
+import java.util.function.LongToDoubleFunction;
+import java.util.function.LongToIntFunction;
+import java.util.function.LongUnaryOperator;
+import java.util.function.ObjLongConsumer;
+import java.util.function.Supplier;
+
+/**
+ * Abstract base class for an intermediate pipeline stage or pipeline source
+ * stage implementing whose elements are of type {@code long}.
+ *
+ * @param <E_IN> type of elements in the upstream source
+ * @since 1.8
+ */
+abstract class LongPipeline<E_IN>
+        extends AbstractPipeline<E_IN, Long, LongStream>
+        implements LongStream {
+
+    /**
+     * Constructor for the head of a stream pipeline.
+     *
+     * @param source {@code Supplier<Spliterator>} describing the stream source
+     * @param sourceFlags the source flags for the stream source, described in
+     *        {@link StreamOpFlag}
+     * @param parallel {@code true} if the pipeline is parallel
+     */
+    LongPipeline(Supplier<? extends Spliterator<Long>> source,
+                 int sourceFlags, boolean parallel) {
+        super(source, sourceFlags, parallel);
+    }
+
+    /**
+     * Constructor for the head of a stream pipeline.
+     *
+     * @param source {@code Spliterator} describing the stream source
+     * @param sourceFlags the source flags for the stream source, described in
+     *        {@link StreamOpFlag}
+     * @param parallel {@code true} if the pipeline is parallel
+     */
+    LongPipeline(Spliterator<Long> source,
+                 int sourceFlags, boolean parallel) {
+        super(source, sourceFlags, parallel);
+    }
+
+    /**
+     * Constructor for appending an intermediate operation onto an existing pipeline.
+     *
+     * @param upstream the upstream element source.
+     * @param opFlags the operation flags
+     */
+    LongPipeline(AbstractPipeline<?, E_IN, ?> upstream, int opFlags) {
+        super(upstream, opFlags);
+    }
+
+    /**
+     * Adapt a {@code Sink<Long> to an {@code LongConsumer}, ideally simply
+     * by casting.
+     */
+    private static LongConsumer adapt(Sink<Long> sink) {
+        if (sink instanceof LongConsumer) {
+            return (LongConsumer) sink;
+        } else {
+            if (Tripwire.ENABLED)
+                Tripwire.trip(AbstractPipeline.class,
+                              "using LongStream.adapt(Sink<Long> s)");
+            return sink::accept;
+        }
+    }
+
+    /**
+     * Adapt a {@code Spliterator<Long>} to a {@code Spliterator.OfLong}.
+     *
+     * @implNote
+     * The implementation attempts to cast to a Spliterator.OfLong, and throws
+     * an exception if this cast is not possible.
+     */
+    private static Spliterator.OfLong adapt(Spliterator<Long> s) {
+        if (s instanceof Spliterator.OfLong) {
+            return (Spliterator.OfLong) s;
+        } else {
+            if (Tripwire.ENABLED)
+                Tripwire.trip(AbstractPipeline.class,
+                              "using LongStream.adapt(Spliterator<Long> s)");
+            throw new UnsupportedOperationException("LongStream.adapt(Spliterator<Long> s)");
+        }
+    }
+
+
+    // Shape-specific methods
+
+    @Override
+    final StreamShape getOutputShape() {
+        return StreamShape.LONG_VALUE;
+    }
+
+    @Override
+    final <P_IN> Node<Long> evaluateToNode(PipelineHelper<Long> helper,
+                                           Spliterator<P_IN> spliterator,
+                                           boolean flattenTree,
+                                           IntFunction<Long[]> generator) {
+        return Nodes.collectLong(helper, spliterator, flattenTree);
+    }
+
+    @Override
+    final <P_IN> Spliterator<Long> wrap(PipelineHelper<Long> ph,
+                                        Supplier<Spliterator<P_IN>> supplier,
+                                        boolean isParallel) {
+        return new StreamSpliterators.LongWrappingSpliterator<>(ph, supplier, isParallel);
+    }
+
+    @Override
+    final Spliterator.OfLong lazySpliterator(Supplier<? extends Spliterator<Long>> supplier) {
+        return new StreamSpliterators.DelegatingSpliterator.OfLong((Supplier<Spliterator.OfLong>) supplier);
+    }
+
+    @Override
+    final void forEachWithCancel(Spliterator<Long> spliterator, Sink<Long> sink) {
+        Spliterator.OfLong spl = adapt(spliterator);
+        LongConsumer adaptedSink =  adapt(sink);
+        do { } while (!sink.cancellationRequested() && spl.tryAdvance(adaptedSink));
+    }
+
+    @Override
+    final Node.Builder<Long> makeNodeBuilder(long exactSizeIfKnown, IntFunction<Long[]> generator) {
+        return Nodes.longBuilder(exactSizeIfKnown);
+    }
+
+
+    // LongStream
+
+    @Override
+    public final PrimitiveIterator.OfLong iterator() {
+        return Spliterators.iteratorFromSpliterator(spliterator());
+    }
+
+    @Override
+    public final Spliterator.OfLong spliterator() {
+        return adapt(super.spliterator());
+    }
+
+    // Stateless intermediate ops from LongStream
+
+    @Override
+    public final DoubleStream doubles() {
+        return new DoublePipeline.StatelessOp<Long>(this, StreamShape.LONG_VALUE,
+                                                    StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<Long> opWrapSink(int flags, Sink<Double> sink) {
+                return new Sink.ChainedLong(sink) {
+                    @Override
+                    public void accept(long t) {
+                        downstream.accept((double) t);
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final Stream<Long> boxed() {
+        return mapToObj(Long::valueOf);
+    }
+
+    @Override
+    public final LongStream map(LongUnaryOperator mapper) {
+        Objects.requireNonNull(mapper);
+        return new StatelessOp<Long>(this, StreamShape.LONG_VALUE,
+                                     StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
+                return new Sink.ChainedLong(sink) {
+                    @Override
+                    public void accept(long t) {
+                        downstream.accept(mapper.applyAsLong(t));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final <U> Stream<U> mapToObj(LongFunction<? extends U> mapper) {
+        Objects.requireNonNull(mapper);
+        return new ReferencePipeline.StatelessOp<Long, U>(this, StreamShape.LONG_VALUE,
+                                                          StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<Long> opWrapSink(int flags, Sink<U> sink) {
+                return new Sink.ChainedLong(sink) {
+                    @Override
+                    public void accept(long t) {
+                        downstream.accept(mapper.apply(t));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final IntStream mapToInt(LongToIntFunction mapper) {
+        Objects.requireNonNull(mapper);
+        return new IntPipeline.StatelessOp<Long>(this, StreamShape.LONG_VALUE,
+                                                 StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<Long> opWrapSink(int flags, Sink<Integer> sink) {
+                return new Sink.ChainedLong(sink) {
+                    @Override
+                    public void accept(long t) {
+                        downstream.accept(mapper.applyAsInt(t));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final DoubleStream mapToDouble(LongToDoubleFunction mapper) {
+        Objects.requireNonNull(mapper);
+        return new DoublePipeline.StatelessOp<Long>(this, StreamShape.LONG_VALUE,
+                                                    StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<Long> opWrapSink(int flags, Sink<Double> sink) {
+                return new Sink.ChainedLong(sink) {
+                    @Override
+                    public void accept(long t) {
+                        downstream.accept(mapper.applyAsDouble(t));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final LongStream flatMap(LongFunction<? extends LongStream> mapper) {
+        return new StatelessOp<Long>(this, StreamShape.LONG_VALUE,
+                                     StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
+            @Override
+            Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
+                return new Sink.ChainedLong(sink) {
+                    public void accept(long t) {
+                        // We can do better that this too; optimize for depth=0 case and just grab spliterator and forEach it
+                        LongStream result = mapper.apply(t);
+                        if (result != null)
+                            result.sequential().forEach(i -> downstream.accept(i));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public LongStream unordered() {
+        if (!isOrdered())
+            return this;
+        return new StatelessOp<Long>(this, StreamShape.LONG_VALUE, StreamOpFlag.NOT_ORDERED) {
+            @Override
+            Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
+                return sink;
+            }
+        };
+    }
+
+    @Override
+    public final LongStream filter(LongPredicate predicate) {
+        Objects.requireNonNull(predicate);
+        return new StatelessOp<Long>(this, StreamShape.LONG_VALUE,
+                                     StreamOpFlag.NOT_SIZED) {
+            @Override
+            Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
+                return new Sink.ChainedLong(sink) {
+                    @Override
+                    public void accept(long t) {
+                        if (predicate.test(t))
+                            downstream.accept(t);
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final LongStream peek(LongConsumer consumer) {
+        Objects.requireNonNull(consumer);
+        return new StatelessOp<Long>(this, StreamShape.LONG_VALUE,
+                                     0) {
+            @Override
+            Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
+                return new Sink.ChainedLong(sink) {
+                    @Override
+                    public void accept(long t) {
+                        consumer.accept(t);
+                        downstream.accept(t);
+                    }
+                };
+            }
+        };
+    }
+
+    // Stateful intermediate ops from LongStream
+
+    private LongStream slice(long skip, long limit) {
+        return SliceOps.makeLong(this, skip, limit);
+    }
+
+    @Override
+    public final LongStream limit(long maxSize) {
+        if (maxSize < 0)
+            throw new IllegalArgumentException(Long.toString(maxSize));
+        return slice(0, maxSize);
+    }
+
+    @Override
+    public final LongStream substream(long startingOffset) {
+        if (startingOffset < 0)
+            throw new IllegalArgumentException(Long.toString(startingOffset));
+        if (startingOffset == 0)
+            return this;
+        else
+            return slice(startingOffset, -1);
+    }
+
+    @Override
+    public final LongStream substream(long startingOffset, long endingOffset) {
+        if (startingOffset < 0 || endingOffset < startingOffset)
+            throw new IllegalArgumentException(String.format("substream(%d, %d)", startingOffset, endingOffset));
+        return slice(startingOffset, endingOffset - startingOffset);
+    }
+
+    @Override
+    public final LongStream sorted() {
+        return SortedOps.makeLong(this);
+    }
+
+    @Override
+    public final LongStream distinct() {
+        // While functional and quick to implement, this approach is not very efficient.
+        // An efficient version requires a long-specific map/set implementation.
+        return boxed().distinct().mapToLong(i -> (long) i);
+    }
+
+    // Terminal ops from LongStream
+
+    @Override
+    public void forEach(LongConsumer action) {
+        evaluate(ForEachOps.makeLong(action, false));
+    }
+
+    @Override
+    public void forEachOrdered(LongConsumer action) {
+        evaluate(ForEachOps.makeLong(action, true));
+    }
+
+    @Override
+    public final long sum() {
+        // use better algorithm to compensate for intermediate overflow?
+        return reduce(0, Long::sum);
+    }
+
+    @Override
+    public final OptionalLong min() {
+        return reduce(Math::min);
+    }
+
+    @Override
+    public final OptionalLong max() {
+        return reduce(Math::max);
+    }
+
+    @Override
+    public final OptionalDouble average() {
+        long[] avg = collect(() -> new long[2],
+                             (ll, i) -> {
+                                 ll[0]++;
+                                 ll[1] += i;
+                             },
+                             (ll, rr) -> {
+                                 ll[0] += rr[0];
+                                 ll[1] += rr[1];
+                             });
+        return avg[0] > 0
+               ? OptionalDouble.of((double) avg[1] / avg[0])
+               : OptionalDouble.empty();
+    }
+
+    @Override
+    public final long count() {
+        return map(e -> 1L).sum();
+    }
+
+    @Override
+    public final LongSummaryStatistics summaryStatistics() {
+        return collect(LongSummaryStatistics::new, LongSummaryStatistics::accept,
+                       LongSummaryStatistics::combine);
+    }
+
+    @Override
+    public final long reduce(long identity, LongBinaryOperator op) {
+        return evaluate(ReduceOps.makeLong(identity, op));
+    }
+
+    @Override
+    public final OptionalLong reduce(LongBinaryOperator op) {
+        return evaluate(ReduceOps.makeLong(op));
+    }
+
+    @Override
+    public final <R> R collect(Supplier<R> resultFactory,
+                               ObjLongConsumer<R> accumulator,
+                               BiConsumer<R, R> combiner) {
+        BinaryOperator<R> operator = (left, right) -> {
+            combiner.accept(left, right);
+            return left;
+        };
+        return evaluate(ReduceOps.makeLong(resultFactory, accumulator, operator));
+    }
+
+    @Override
+    public final boolean anyMatch(LongPredicate predicate) {
+        return evaluate(MatchOps.makeLong(predicate, MatchOps.MatchKind.ANY));
+    }
+
+    @Override
+    public final boolean allMatch(LongPredicate predicate) {
+        return evaluate(MatchOps.makeLong(predicate, MatchOps.MatchKind.ALL));
+    }
+
+    @Override
+    public final boolean noneMatch(LongPredicate predicate) {
+        return evaluate(MatchOps.makeLong(predicate, MatchOps.MatchKind.NONE));
+    }
+
+    @Override
+    public final OptionalLong findFirst() {
+        return evaluate(FindOps.makeLong(true));
+    }
+
+    @Override
+    public final OptionalLong findAny() {
+        return evaluate(FindOps.makeLong(false));
+    }
+
+    @Override
+    public final long[] toArray() {
+        return Nodes.flattenLong((Node.OfLong) evaluateToArrayNode(Long[]::new)).asLongArray();
+    }
+
+
+    //
+
+    /**
+     * Source stage of a LongPipeline.
+     *
+     * @param <E_IN> type of elements in the upstream source
+     * @since 1.8
+     */
+    static class Head<E_IN> extends LongPipeline<E_IN> {
+        /**
+         * Constructor for the source stage of a LongStream.
+         *
+         * @param source {@code Supplier<Spliterator>} describing the stream
+         *               source
+         * @param sourceFlags the source flags for the stream source, described
+         *                    in {@link StreamOpFlag}
+         * @param parallel {@code true} if the pipeline is parallel
+         */
+        Head(Supplier<? extends Spliterator<Long>> source,
+             int sourceFlags, boolean parallel) {
+            super(source, sourceFlags, parallel);
+        }
+
+        /**
+         * Constructor for the source stage of a LongStream.
+         *
+         * @param source {@code Spliterator} describing the stream source
+         * @param sourceFlags the source flags for the stream source, described
+         *                    in {@link StreamOpFlag}
+         * @param parallel {@code true} if the pipeline is parallel
+         */
+        Head(Spliterator<Long> source,
+             int sourceFlags, boolean parallel) {
+            super(source, sourceFlags, parallel);
+        }
+
+        @Override
+        final boolean opIsStateful() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        final Sink<E_IN> opWrapSink(int flags, Sink<Long> sink) {
+            throw new UnsupportedOperationException();
+        }
+
+        // Optimized sequential terminal operations for the head of the pipeline
+
+        @Override
+        public void forEach(LongConsumer action) {
+            if (!isParallel()) {
+                adapt(sourceStageSpliterator()).forEachRemaining(action);
+            } else {
+                super.forEach(action);
+            }
+        }
+
+        @Override
+        public void forEachOrdered(LongConsumer action) {
+            if (!isParallel()) {
+                adapt(sourceStageSpliterator()).forEachRemaining(action);
+            } else {
+                super.forEachOrdered(action);
+            }
+        }
+    }
+
+    /** Base class for a stateless intermediate stage of a LongStream.
+     *
+     * @param <E_IN> type of elements in the upstream source
+     * @since 1.8
+     */
+    abstract static class StatelessOp<E_IN> extends LongPipeline<E_IN> {
+        /**
+         * Construct a new LongStream by appending a stateless intermediate
+         * operation to an existing stream.
+         * @param upstream The upstream pipeline stage
+         * @param inputShape The stream shape for the upstream pipeline stage
+         * @param opFlags Operation flags for the new stage
+         */
+        StatelessOp(AbstractPipeline<?, E_IN, ?> upstream,
+                    StreamShape inputShape,
+                    int opFlags) {
+            super(upstream, opFlags);
+            assert upstream.getOutputShape() == inputShape;
+        }
+
+        @Override
+        final boolean opIsStateful() {
+            return false;
+        }
+    }
+
+    /**
+     * Base class for a stateful intermediate stage of a LongStream.
+     *
+     * @param <E_IN> type of elements in the upstream source
+     * @since 1.8
+     */
+    abstract static class StatefulOp<E_IN> extends LongPipeline<E_IN> {
+        /**
+         * Construct a new LongStream by appending a stateful intermediate
+         * operation to an existing stream.
+         * @param upstream The upstream pipeline stage
+         * @param inputShape The stream shape for the upstream pipeline stage
+         * @param opFlags Operation flags for the new stage
+         */
+        StatefulOp(AbstractPipeline<?, E_IN, ?> upstream,
+                   StreamShape inputShape,
+                   int opFlags) {
+            super(upstream, opFlags);
+            assert upstream.getOutputShape() == inputShape;
+        }
+
+        @Override
+        final boolean opIsStateful() {
+            return true;
+        }
+
+        @Override
+        abstract <P_IN> Node<Long> opEvaluateParallel(PipelineHelper<Long> helper,
+                                                      Spliterator<P_IN> spliterator,
+                                                      IntFunction<Long[]> generator);
+    }
+}
--- a/jdk/src/share/classes/java/util/stream/LongStream.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/util/stream/LongStream.java	Wed May 08 11:22:25 2013 +0100
@@ -24,17 +24,21 @@
  */
 package java.util.stream;
 
+import java.util.Arrays;
 import java.util.LongSummaryStatistics;
+import java.util.Objects;
 import java.util.OptionalDouble;
 import java.util.OptionalLong;
 import java.util.PrimitiveIterator;
 import java.util.Spliterator;
+import java.util.Spliterators;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.function.LongBinaryOperator;
 import java.util.function.LongConsumer;
 import java.util.function.LongFunction;
 import java.util.function.LongPredicate;
+import java.util.function.LongSupplier;
 import java.util.function.LongToDoubleFunction;
 import java.util.function.LongToIntFunction;
 import java.util.function.LongUnaryOperator;
@@ -643,4 +647,153 @@
 
     @Override
     Spliterator.OfLong spliterator();
+
+    // Static factories
+
+    /**
+     * Returns a builder for a {@code LongStream}.
+     *
+     * @return a stream builder
+     */
+    public static StreamBuilder.OfLong builder() {
+        return new Streams.LongStreamBuilderImpl();
+    }
+
+    /**
+     * Returns an empty sequential {@code LongStream}.
+     *
+     * @return an empty sequential stream
+     */
+    public static LongStream empty() {
+        return StreamSupport.longStream(Spliterators.emptyLongSpliterator());
+    }
+
+    /**
+     * Returns a sequential {@code LongStream} containing a single element.
+     *
+     * @param t the single element
+     * @return a singleton sequential stream
+     */
+    public static LongStream of(long t) {
+        return StreamSupport.longStream(new Streams.LongStreamBuilderImpl(t));
+    }
+
+    /**
+     * Returns a sequential stream whose elements are the specified values.
+     *
+     * @param values the elements of the new stream
+     * @return the new stream
+     */
+    public static LongStream of(long... values) {
+        return Arrays.stream(values);
+    }
+
+    /**
+     * Returns an infinite sequential {@code LongStream} produced by iterative
+     * application of a function {@code f} to an initial element {@code seed},
+     * producing a {@code Stream} consisting of {@code seed}, {@code f(seed)},
+     * {@code f(f(seed))}, etc.
+     *
+     * <p>The first element (position {@code 0}) in the {@code LongStream} will
+     * be the provided {@code seed}.  For {@code n > 0}, the element at position
+     * {@code n}, will be the result of applying the function {@code f} to the
+     * element at position {@code n - 1}.
+     *
+     * @param seed the initial element
+     * @param f a function to be applied to to the previous element to produce
+     *          a new element
+     * @return a new sequential {@code LongStream}
+     */
+    public static LongStream iterate(final long seed, final LongUnaryOperator f) {
+        Objects.requireNonNull(f);
+        final PrimitiveIterator.OfLong iterator = new PrimitiveIterator.OfLong() {
+            long t = seed;
+
+            @Override
+            public boolean hasNext() {
+                return true;
+            }
+
+            @Override
+            public long nextLong() {
+                long v = t;
+                t = f.applyAsLong(t);
+                return v;
+            }
+        };
+        return StreamSupport.longStream(Spliterators.spliteratorUnknownSize(
+                iterator,
+                Spliterator.ORDERED | Spliterator.IMMUTABLE | Spliterator.NONNULL));
+    }
+
+    /**
+     * Returns a sequential {@code LongStream} where each element is generated
+     * by a {@code LongSupplier}.  This is suitable for generating constant
+     * streams, streams of random elements, etc.
+     *
+     * @param s the {@code LongSupplier} for generated elements
+     * @return a new sequential {@code LongStream}
+     */
+    public static LongStream generate(LongSupplier s) {
+        Objects.requireNonNull(s);
+        return StreamSupport.longStream(Spliterators.spliteratorUnknownSize(
+                new PrimitiveIterator.OfLong() {
+                    @Override
+                    public boolean hasNext() { return true; }
+
+                    @Override
+                    public long nextLong() { return s.getAsLong(); }
+                },
+                Spliterator.ORDERED | Spliterator.IMMUTABLE | Spliterator.NONNULL));
+    }
+
+    /**
+     * Returns a sequential {@code LongStream} from {@code startInclusive}
+     * (inclusive) to {@code endExclusive} (exclusive) by an incremental step of
+     * 1.
+     *
+     * @implSpec
+     * The implementation behaves as if:
+     * <pre>{@code
+     *     longRange(startInclusive, endExclusive, 1);
+     * }</pre>
+     *
+     * @param startInclusive the (inclusive) initial value
+     * @param endExclusive the exclusive upper bound
+     * @return a sequential {@code LongStream} for the range of {@code long}
+     *         elements
+     */
+    public static LongStream range(long startInclusive, final long endExclusive) {
+        return range(startInclusive, endExclusive, 1);
+    }
+
+    /**
+     * Returns a sequential {@code LongStream} from {@code startInclusive}
+     * (inclusive) to {@code endExclusive} (exclusive) by {@code step}. If
+     * {@code startInclusive} is greater than or equal to {@code
+     * endExclusive}, an empty stream is returned.
+     *
+     * <p>An equivalent sequence of increasing values can be produced
+     * sequentially using a {@code for} loop as follows:
+     * <pre>{@code
+     *     for (long i = startInclusive; i < endExclusive ; i += step) { ... }
+     * }</pre>
+     *
+     * @param startInclusive the (inclusive) initial value
+     * @param endExclusive the exclusive upper bound
+     * @param step the difference between consecutive values
+     * @return a sequential {@code LongStream} for the range of {@code long}
+     *         elements
+     * @throws IllegalArgumentException if {@code step} is less than or equal to
+     *                                  0
+     */
+    public static LongStream range(long startInclusive, final long endExclusive, final long step) {
+        if (step <= 0) {
+            throw new IllegalArgumentException(String.format("Illegal step: %d", step));
+        } else if (startInclusive >= endExclusive) {
+            return empty();
+        } else {
+            return StreamSupport.longStream(new Streams.RangeLongSpliterator(startInclusive, endExclusive, step));
+        }
+    }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/Nodes.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,2467 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.List;
+import java.util.Objects;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.concurrent.CountedCompleter;
+import java.util.function.Consumer;
+import java.util.function.DoubleConsumer;
+import java.util.function.IntConsumer;
+import java.util.function.IntFunction;
+import java.util.function.LongConsumer;
+
+/**
+ * Factory methods for constructing implementations of {@link Node} and
+ * {@link Node.Builder} and their primitive specializations.  Fork/Join tasks
+ * for collecting output from a {@link PipelineHelper} to a {@link Node} and
+ * flattening {@link Node}s.
+ *
+ * @since 1.8
+ */
+final class Nodes {
+
+    private Nodes() {
+        throw new Error("no instances");
+    }
+
+    /**
+     * The maximum size of an array that can be allocated.
+     */
+    static final long MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
+
+    private static final Node EMPTY_NODE = new EmptyNode.OfRef();
+    private static final Node.OfInt EMPTY_INT_NODE = new EmptyNode.OfInt();
+    private static final Node.OfLong EMPTY_LONG_NODE = new EmptyNode.OfLong();
+    private static final Node.OfDouble EMPTY_DOUBLE_NODE = new EmptyNode.OfDouble();
+
+    // General shape-based node creation methods
+
+    /**
+     * Produces an empty node whose count is zero, has no children and no content.
+     *
+     * @param <T> the type of elements of the created node
+     * @param shape the shape of the node to be created
+     * @return an empty node.
+     */
+    @SuppressWarnings("unchecked")
+    static <T> Node<T> emptyNode(StreamShape shape) {
+        switch (shape) {
+            case REFERENCE:    return (Node<T>) EMPTY_NODE;
+            case INT_VALUE:    return (Node<T>) EMPTY_INT_NODE;
+            case LONG_VALUE:   return (Node<T>) EMPTY_LONG_NODE;
+            case DOUBLE_VALUE: return (Node<T>) EMPTY_DOUBLE_NODE;
+            default:
+                throw new IllegalStateException("Unknown shape " + shape);
+        }
+    }
+
+    /**
+     * Produces a concatenated {@link Node} that has two or more children.
+     * <p>The count of the concatenated node is equal to the sum of the count
+     * of each child. Traversal of the concatenated node traverses the content
+     * of each child in encounter order of the list of children. Splitting a
+     * spliterator obtained from the concatenated node preserves the encounter
+     * order of the list of children.
+     *
+     * <p>The result may be a concatenated node, the input sole node if the size
+     * of the list is 1, or an empty node.
+     *
+     * @param <T> the type of elements of the concatenated node
+     * @param shape the shape of the concatenated node to be created
+     * @param nodes the input nodes
+     * @return a {@code Node} covering the elements of the input nodes
+     * @throws IllegalStateException if all {@link Node} elements of the list
+     * are an not instance of type supported by this factory.
+     */
+    @SuppressWarnings("unchecked")
+    static <T> Node<T> conc(StreamShape shape, List<? extends Node<T>> nodes) {
+        int size = nodes.size();
+        if (size == 0)
+            return emptyNode(shape);
+        else if (size == 1)
+            return nodes.get(0);
+        else {
+            // Create a right-balanced tree when there are more that 2 nodes
+            switch (shape) {
+                case REFERENCE: {
+                    List<Node<T>> refNodes = (List<Node<T>>) nodes;
+                    ConcNode<T> c = new ConcNode<>(refNodes.get(size - 2), refNodes.get(size - 1));
+                    for (int i = size - 3; i >= 0; i--) {
+                        c = new ConcNode<>(refNodes.get(i), c);
+                    }
+                    return c;
+                }
+                case INT_VALUE: {
+                    List<? extends Node.OfInt> intNodes = (List<? extends Node.OfInt>) nodes;
+                    IntConcNode c = new IntConcNode(intNodes.get(size - 2), intNodes.get(size - 1));
+                    for (int i = size - 3; i >= 0; i--) {
+                        c = new IntConcNode(intNodes.get(i), c);
+                    }
+                    return (Node<T>) c;
+                }
+                case LONG_VALUE: {
+                    List<? extends Node.OfLong> longNodes = (List<? extends Node.OfLong>) nodes;
+                    LongConcNode c = new LongConcNode(longNodes.get(size - 2), longNodes.get(size - 1));
+                    for (int i = size - 3; i >= 0; i--) {
+                        c = new LongConcNode(longNodes.get(i), c);
+                    }
+                    return (Node<T>) c;
+                }
+                case DOUBLE_VALUE: {
+                    List<? extends Node.OfDouble> doubleNodes = (List<? extends Node.OfDouble>) nodes;
+                    DoubleConcNode c = new DoubleConcNode(doubleNodes.get(size - 2), doubleNodes.get(size - 1));
+                    for (int i = size - 3; i >= 0; i--) {
+                        c = new DoubleConcNode(doubleNodes.get(i), c);
+                    }
+                    return (Node<T>) c;
+                }
+                default:
+                    throw new IllegalStateException("Unknown shape " + shape);
+            }
+        }
+
+    }
+
+    /**
+     * Truncate a {@link Node}, returning a node describing a subsequence of
+     * the contents of the input node.
+     *
+     * @param <T> the type of elements of the input node and truncated node
+     * @param input the input node
+     * @param from the starting offset to include in the truncated node (inclusive)
+     * @param to the ending offset ot include in the truncated node (exclusive)
+     * @param generator the array factory (only used for reference nodes)
+     * @return the truncated node
+     */
+    @SuppressWarnings("unchecked")
+    static <T> Node<T> truncateNode(Node<T> input, long from, long to, IntFunction<T[]> generator) {
+        StreamShape shape = input.getShape();
+        long size = truncatedSize(input.count(), from, to);
+        if (size == 0)
+            return emptyNode(shape);
+        else if (from == 0 && to >= input.count())
+            return input;
+
+        switch (shape) {
+            case REFERENCE: {
+                Spliterator<T> spliterator = input.spliterator();
+                Node.Builder<T> nodeBuilder = Nodes.builder(size, generator);
+                nodeBuilder.begin(size);
+                for (int i = 0; i < from && spliterator.tryAdvance(e -> { }); i++) { }
+                for (int i = 0; (i < size) && spliterator.tryAdvance(nodeBuilder); i++) { }
+                nodeBuilder.end();
+                return nodeBuilder.build();
+            }
+            case INT_VALUE: {
+                Spliterator.OfInt spliterator = ((Node.OfInt) input).spliterator();
+                Node.Builder.OfInt nodeBuilder = Nodes.intBuilder(size);
+                nodeBuilder.begin(size);
+                for (int i = 0; i < from && spliterator.tryAdvance((IntConsumer) e -> { }); i++) { }
+                for (int i = 0; (i < size) && spliterator.tryAdvance((IntConsumer) nodeBuilder); i++) { }
+                nodeBuilder.end();
+                return (Node<T>) nodeBuilder.build();
+            }
+            case LONG_VALUE: {
+                Spliterator.OfLong spliterator = ((Node.OfLong) input).spliterator();
+                Node.Builder.OfLong nodeBuilder = Nodes.longBuilder(size);
+                nodeBuilder.begin(size);
+                for (int i = 0; i < from && spliterator.tryAdvance((LongConsumer) e -> { }); i++) { }
+                for (int i = 0; (i < size) && spliterator.tryAdvance((LongConsumer) nodeBuilder); i++) { }
+                nodeBuilder.end();
+                return (Node<T>) nodeBuilder.build();
+            }
+            case DOUBLE_VALUE: {
+                Spliterator.OfDouble spliterator = ((Node.OfDouble) input).spliterator();
+                Node.Builder.OfDouble nodeBuilder = Nodes.doubleBuilder(size);
+                nodeBuilder.begin(size);
+                for (int i = 0; i < from && spliterator.tryAdvance((DoubleConsumer) e -> { }); i++) { }
+                for (int i = 0; (i < size) && spliterator.tryAdvance((DoubleConsumer) nodeBuilder); i++) { }
+                nodeBuilder.end();
+                return (Node<T>) nodeBuilder.build();
+            }
+            default:
+                throw new IllegalStateException("Unknown shape " + shape);
+        }
+    }
+
+    private static long truncatedSize(long size, long from, long to) {
+        if (from >= 0)
+            size = Math.max(0, size - from);
+        long limit = to - from;
+        if (limit >= 0)
+            size = Math.min(size, limit);
+        return size;
+    }
+
+    // Reference-based node methods
+
+    /**
+     * Produces a {@link Node} describing an array.
+     *
+     * <p>The node will hold a reference to the array and will not make a copy.
+     *
+     * @param <T> the type of elements held by the node
+     * @param array the array
+     * @return a node holding an array
+     */
+    static <T> Node<T> node(T[] array) {
+        return new ArrayNode<>(array);
+    }
+
+    /**
+     * Produces a {@link Node} describing a {@link Collection}.
+     * <p>
+     * The node will hold a reference to the collection and will not make a copy.
+     *
+     * @param <T> the type of elements held by the node
+     * @param c the collection
+     * @return a node holding a collection
+     */
+    static <T> Node<T> node(Collection<T> c) {
+        return new CollectionNode<>(c);
+    }
+
+    /**
+     * Produces a {@link Node.Builder}.
+     *
+     * @param exactSizeIfKnown -1 if a variable size builder is requested,
+     * otherwise the exact capacity desired.  A fixed capacity builder will
+     * fail if the wrong number of elements are added to the builder.
+     * @param generator the array factory
+     * @param <T> the type of elements of the node builder
+     * @return a {@code Node.Builder}
+     */
+    static <T> Node.Builder<T> builder(long exactSizeIfKnown, IntFunction<T[]> generator) {
+        return (exactSizeIfKnown >= 0 && exactSizeIfKnown < MAX_ARRAY_SIZE)
+               ? new FixedNodeBuilder<>(exactSizeIfKnown, generator)
+               : builder();
+    }
+
+    /**
+     * Produces a variable size @{link Node.Builder}.
+     *
+     * @param <T> the type of elements of the node builder
+     * @return a {@code Node.Builder}
+     */
+    static <T> Node.Builder<T> builder() {
+        return new SpinedNodeBuilder<>();
+    }
+
+    // Int nodes
+
+    /**
+     * Produces a {@link Node.OfInt} describing an int[] array.
+     *
+     * <p>The node will hold a reference to the array and will not make a copy.
+     *
+     * @param array the array
+     * @return a node holding an array
+     */
+    static Node.OfInt node(int[] array) {
+        return new IntArrayNode(array);
+    }
+
+    /**
+     * Produces a {@link Node.Builder.OfInt}.
+     *
+     * @param exactSizeIfKnown -1 if a variable size builder is requested,
+     * otherwise the exact capacity desired.  A fixed capacity builder will
+     * fail if the wrong number of elements are added to the builder.
+     * @return a {@code Node.Builder.OfInt}
+     */
+    static Node.Builder.OfInt intBuilder(long exactSizeIfKnown) {
+        return (exactSizeIfKnown >= 0 && exactSizeIfKnown < MAX_ARRAY_SIZE)
+               ? new IntFixedNodeBuilder(exactSizeIfKnown)
+               : intBuilder();
+    }
+
+    /**
+     * Produces a variable size @{link Node.Builder.OfInt}.
+     *
+     * @return a {@code Node.Builder.OfInt}
+     */
+    static Node.Builder.OfInt intBuilder() {
+        return new IntSpinedNodeBuilder();
+    }
+
+    // Long nodes
+
+    /**
+     * Produces a {@link Node.OfLong} describing a long[] array.
+     * <p>
+     * The node will hold a reference to the array and will not make a copy.
+     *
+     * @param array the array
+     * @return a node holding an array
+     */
+    static Node.OfLong node(final long[] array) {
+        return new LongArrayNode(array);
+    }
+
+    /**
+     * Produces a {@link Node.Builder.OfLong}.
+     *
+     * @param exactSizeIfKnown -1 if a variable size builder is requested,
+     * otherwise the exact capacity desired.  A fixed capacity builder will
+     * fail if the wrong number of elements are added to the builder.
+     * @return a {@code Node.Builder.OfLong}
+     */
+    static Node.Builder.OfLong longBuilder(long exactSizeIfKnown) {
+        return (exactSizeIfKnown >= 0 && exactSizeIfKnown < MAX_ARRAY_SIZE)
+               ? new LongFixedNodeBuilder(exactSizeIfKnown)
+               : longBuilder();
+    }
+
+    /**
+     * Produces a variable size @{link Node.Builder.OfLong}.
+     *
+     * @return a {@code Node.Builder.OfLong}
+     */
+    static Node.Builder.OfLong longBuilder() {
+        return new LongSpinedNodeBuilder();
+    }
+
+    // Double nodes
+
+    /**
+     * Produces a {@link Node.OfDouble} describing a double[] array.
+     *
+     * <p>The node will hold a reference to the array and will not make a copy.
+     *
+     * @param array the array
+     * @return a node holding an array
+     */
+    static Node.OfDouble node(final double[] array) {
+        return new DoubleArrayNode(array);
+    }
+
+    /**
+     * Produces a {@link Node.Builder.OfDouble}.
+     *
+     * @param exactSizeIfKnown -1 if a variable size builder is requested,
+     * otherwise the exact capacity desired.  A fixed capacity builder will
+     * fail if the wrong number of elements are added to the builder.
+     * @return a {@code Node.Builder.OfDouble}
+     */
+    static Node.Builder.OfDouble doubleBuilder(long exactSizeIfKnown) {
+        return (exactSizeIfKnown >= 0 && exactSizeIfKnown < MAX_ARRAY_SIZE)
+               ? new DoubleFixedNodeBuilder(exactSizeIfKnown)
+               : doubleBuilder();
+    }
+
+    /**
+     * Produces a variable size @{link Node.Builder.OfDouble}.
+     *
+     * @return a {@code Node.Builder.OfDouble}
+     */
+    static Node.Builder.OfDouble doubleBuilder() {
+        return new DoubleSpinedNodeBuilder();
+    }
+
+    // Parallel evaluation of pipelines to nodes
+
+    /**
+     * Collect, in parallel, elements output from a pipeline and describe those
+     * elements with a {@link Node}.
+     *
+     * @implSpec
+     * If the exact size of the output from the pipeline is known and the source
+     * {@link Spliterator} has the {@link Spliterator#SUBSIZED} characteristic,
+     * then a flat {@link Node} will be returned whose content is an array,
+     * since the size is known the array can be constructed in advance and
+     * output elements can be placed into the array concurrently by leaf
+     * tasks at the correct offsets.  If the exact size is not known, output
+     * elements are collected into a conc-node whose shape mirrors that
+     * of the computation. This conc-node can then be flattened in
+     * parallel to produce a flat {@code Node} if desired.
+     *
+     * @param helper the pipeline helper describing the pipeline
+     * @param flattenTree whether a conc node should be flattened into a node
+     *                    describing an array before returning
+     * @param generator the array generator
+     * @return a {@link Node} describing the output elements
+     */
+    public static <P_IN, P_OUT> Node<P_OUT> collect(PipelineHelper<P_OUT> helper,
+                                                    Spliterator<P_IN> spliterator,
+                                                    boolean flattenTree,
+                                                    IntFunction<P_OUT[]> generator) {
+        long size = helper.exactOutputSizeIfKnown(spliterator);
+        if (size >= 0 && spliterator.hasCharacteristics(Spliterator.SUBSIZED)) {
+            if (size >= MAX_ARRAY_SIZE)
+                throw new IllegalArgumentException("Stream size exceeds max array size");
+            P_OUT[] array = generator.apply((int) size);
+            new SizedCollectorTask.OfRef<>(spliterator, helper, array).invoke();
+            return node(array);
+        } else {
+            Node<P_OUT> node = new CollectorTask<>(helper, generator, spliterator).invoke();
+            return flattenTree ? flatten(node, generator) : node;
+        }
+    }
+
+    /**
+     * Collect, in parallel, elements output from an int-valued pipeline and
+     * describe those elements with a {@link Node.OfInt}.
+     *
+     * @implSpec
+     * If the exact size of the output from the pipeline is known and the source
+     * {@link Spliterator} has the {@link Spliterator#SUBSIZED} characteristic,
+     * then a flat {@link Node} will be returned whose content is an array,
+     * since the size is known the array can be constructed in advance and
+     * output elements can be placed into the array concurrently by leaf
+     * tasks at the correct offsets.  If the exact size is not known, output
+     * elements are collected into a conc-node whose shape mirrors that
+     * of the computation. This conc-node can then be flattened in
+     * parallel to produce a flat {@code Node.OfInt} if desired.
+     *
+     * @param <P_IN> the type of elements from the source Spliterator
+     * @param helper the pipeline helper describing the pipeline
+     * @param flattenTree whether a conc node should be flattened into a node
+     *                    describing an array before returning
+     * @return a {@link Node.OfInt} describing the output elements
+     */
+    public static <P_IN> Node.OfInt collectInt(PipelineHelper<Integer> helper,
+                                               Spliterator<P_IN> spliterator,
+                                               boolean flattenTree) {
+        long size = helper.exactOutputSizeIfKnown(spliterator);
+        if (size >= 0 && spliterator.hasCharacteristics(Spliterator.SUBSIZED)) {
+            if (size >= MAX_ARRAY_SIZE)
+                throw new IllegalArgumentException("Stream size exceeds max array size");
+            int[] array = new int[(int) size];
+            new SizedCollectorTask.OfInt<>(spliterator, helper, array).invoke();
+            return node(array);
+        }
+        else {
+            Node.OfInt node = new IntCollectorTask<>(helper, spliterator).invoke();
+            return flattenTree ? flattenInt(node) : node;
+        }
+    }
+
+    /**
+     * Collect, in parallel, elements output from a long-valued pipeline and
+     * describe those elements with a {@link Node.OfLong}.
+     *
+     * @implSpec
+     * If the exact size of the output from the pipeline is known and the source
+     * {@link Spliterator} has the {@link Spliterator#SUBSIZED} characteristic,
+     * then a flat {@link Node} will be returned whose content is an array,
+     * since the size is known the array can be constructed in advance and
+     * output elements can be placed into the array concurrently by leaf
+     * tasks at the correct offsets.  If the exact size is not known, output
+     * elements are collected into a conc-node whose shape mirrors that
+     * of the computation. This conc-node can then be flattened in
+     * parallel to produce a flat {@code Node.OfLong} if desired.
+     *
+     * @param <P_IN> the type of elements from the source Spliterator
+     * @param helper the pipeline helper describing the pipeline
+     * @param flattenTree whether a conc node should be flattened into a node
+     *                    describing an array before returning
+     * @return a {@link Node.OfLong} describing the output elements
+     */
+    public static <P_IN> Node.OfLong collectLong(PipelineHelper<Long> helper,
+                                                 Spliterator<P_IN> spliterator,
+                                                 boolean flattenTree) {
+        long size = helper.exactOutputSizeIfKnown(spliterator);
+        if (size >= 0 && spliterator.hasCharacteristics(Spliterator.SUBSIZED)) {
+            if (size >= MAX_ARRAY_SIZE)
+                throw new IllegalArgumentException("Stream size exceeds max array size");
+            long[] array = new long[(int) size];
+            new SizedCollectorTask.OfLong<>(spliterator, helper, array).invoke();
+            return node(array);
+        }
+        else {
+            Node.OfLong node = new LongCollectorTask<>(helper, spliterator).invoke();
+            return flattenTree ? flattenLong(node) : node;
+        }
+    }
+
+    /**
+     * Collect, in parallel, elements output from n double-valued pipeline and
+     * describe those elements with a {@link Node.OfDouble}.
+     *
+     * @implSpec
+     * If the exact size of the output from the pipeline is known and the source
+     * {@link Spliterator} has the {@link Spliterator#SUBSIZED} characteristic,
+     * then a flat {@link Node} will be returned whose content is an array,
+     * since the size is known the array can be constructed in advance and
+     * output elements can be placed into the array concurrently by leaf
+     * tasks at the correct offsets.  If the exact size is not known, output
+     * elements are collected into a conc-node whose shape mirrors that
+     * of the computation. This conc-node can then be flattened in
+     * parallel to produce a flat {@code Node.OfDouble} if desired.
+     *
+     * @param <P_IN> the type of elements from the source Spliterator
+     * @param helper the pipeline helper describing the pipeline
+     * @param flattenTree whether a conc node should be flattened into a node
+     *                    describing an array before returning
+     * @return a {@link Node.OfDouble} describing the output elements
+     */
+    public static <P_IN> Node.OfDouble collectDouble(PipelineHelper<Double> helper,
+                                                     Spliterator<P_IN> spliterator,
+                                                     boolean flattenTree) {
+        long size = helper.exactOutputSizeIfKnown(spliterator);
+        if (size >= 0 && spliterator.hasCharacteristics(Spliterator.SUBSIZED)) {
+            if (size >= MAX_ARRAY_SIZE)
+                throw new IllegalArgumentException("Stream size exceeds max array size");
+            double[] array = new double[(int) size];
+            new SizedCollectorTask.OfDouble<>(spliterator, helper, array).invoke();
+            return node(array);
+        }
+        else {
+            Node.OfDouble node = new DoubleCollectorTask<>(helper, spliterator).invoke();
+            return flattenTree ? flattenDouble(node) : node;
+        }
+    }
+
+    // Parallel flattening of nodes
+
+    /**
+     * Flatten, in parallel, a {@link Node}.  A flattened node is one that has
+     * no children.  If the node is already flat, it is simply returned.
+     *
+     * @implSpec
+     * If a new node is to be created, the generator is used to create an array
+     * whose length is {@link Node#count()}.  Then the node tree is traversed
+     * and leaf node elements are placed in the array concurrently by leaf tasks
+     * at the correct offsets.
+     *
+     * @param <T> type of elements contained by the node
+     * @param node the node to flatten
+     * @param generator the array factory used to create array instances
+     * @return a flat {@code Node}
+     */
+    public static <T> Node<T> flatten(Node<T> node, IntFunction<T[]> generator) {
+        if (node.getChildCount() > 0) {
+            T[] array = generator.apply((int) node.count());
+            new ToArrayTask.OfRef<>(node, array, 0).invoke();
+            return node(array);
+        } else {
+            return node;
+        }
+    }
+
+    /**
+     * Flatten, in parallel, a {@link Node.OfInt}.  A flattened node is one that
+     * has no children.  If the node is already flat, it is simply returned.
+     *
+     * @implSpec
+     * If a new node is to be created, a new int[] array is created whose length
+     * is {@link Node#count()}.  Then the node tree is traversed and leaf node
+     * elements are placed in the array concurrently by leaf tasks at the
+     * correct offsets.
+     *
+     * @param node the node to flatten
+     * @return a flat {@code Node.OfInt}
+     */
+    public static Node.OfInt flattenInt(Node.OfInt node) {
+        if (node.getChildCount() > 0) {
+            int[] array = new int[(int) node.count()];
+            new ToArrayTask.OfInt(node, array, 0).invoke();
+            return node(array);
+        } else {
+            return node;
+        }
+    }
+
+    /**
+     * Flatten, in parallel, a {@link Node.OfLong}.  A flattened node is one that
+     * has no children.  If the node is already flat, it is simply returned.
+     *
+     * @implSpec
+     * If a new node is to be created, a new long[] array is created whose length
+     * is {@link Node#count()}.  Then the node tree is traversed and leaf node
+     * elements are placed in the array concurrently by leaf tasks at the
+     * correct offsets.
+     *
+     * @param node the node to flatten
+     * @return a flat {@code Node.OfLong}
+     */
+    public static Node.OfLong flattenLong(Node.OfLong node) {
+        if (node.getChildCount() > 0) {
+            long[] array = new long[(int) node.count()];
+            new ToArrayTask.OfLong(node, array, 0).invoke();
+            return node(array);
+        } else {
+            return node;
+        }
+    }
+
+    /**
+     * Flatten, in parallel, a {@link Node.OfDouble}.  A flattened node is one that
+     * has no children.  If the node is already flat, it is simply returned.
+     *
+     * @implSpec
+     * If a new node is to be created, a new double[] array is created whose length
+     * is {@link Node#count()}.  Then the node tree is traversed and leaf node
+     * elements are placed in the array concurrently by leaf tasks at the
+     * correct offsets.
+     *
+     * @param node the node to flatten
+     * @return a flat {@code Node.OfDouble}
+     */
+    public static Node.OfDouble flattenDouble(Node.OfDouble node) {
+        if (node.getChildCount() > 0) {
+            double[] array = new double[(int) node.count()];
+            new ToArrayTask.OfDouble(node, array, 0).invoke();
+            return node(array);
+        } else {
+            return node;
+        }
+    }
+
+    // Implementations
+
+    private static abstract class EmptyNode<T, T_ARR, T_CONS> implements Node<T> {
+        EmptyNode() { }
+
+        @Override
+        public T[] asArray(IntFunction<T[]> generator) {
+            return generator.apply(0);
+        }
+
+        public void copyInto(T_ARR array, int offset) { }
+
+        @Override
+        public long count() {
+            return 0;
+        }
+
+        public void forEach(T_CONS consumer) { }
+
+        private static class OfRef<T> extends EmptyNode<T, T[], Consumer<? super T>> {
+            private OfRef() {
+                super();
+            }
+
+            @Override
+            public Spliterator<T> spliterator() {
+                return Spliterators.emptySpliterator();
+            }
+        }
+
+        private static final class OfInt
+                extends EmptyNode<Integer, int[], IntConsumer>
+                implements Node.OfInt {
+
+            OfInt() { } // Avoid creation of special accessor
+
+            @Override
+            public Spliterator.OfInt spliterator() {
+                return Spliterators.emptyIntSpliterator();
+            }
+
+            @Override
+            public int[] asIntArray() {
+                return EMPTY_INT_ARRAY;
+            }
+        }
+
+        private static final class OfLong
+                extends EmptyNode<Long, long[], LongConsumer>
+                implements Node.OfLong {
+
+            OfLong() { } // Avoid creation of special accessor
+
+            @Override
+            public Spliterator.OfLong spliterator() {
+                return Spliterators.emptyLongSpliterator();
+            }
+
+            @Override
+            public long[] asLongArray() {
+                return EMPTY_LONG_ARRAY;
+            }
+        }
+
+        private static final class OfDouble
+                extends EmptyNode<Double, double[], DoubleConsumer>
+                implements Node.OfDouble {
+
+            OfDouble() { } // Avoid creation of special accessor
+
+            @Override
+            public Spliterator.OfDouble spliterator() {
+                return Spliterators.emptyDoubleSpliterator();
+            }
+
+            @Override
+            public double[] asDoubleArray() {
+                return EMPTY_DOUBLE_ARRAY;
+            }
+        }
+    }
+
+    /** Node class for a reference array */
+    private static class ArrayNode<T> implements Node<T> {
+        final T[] array;
+        int curSize;
+
+        @SuppressWarnings("unchecked")
+        ArrayNode(long size, IntFunction<T[]> generator) {
+            if (size >= MAX_ARRAY_SIZE)
+                throw new IllegalArgumentException("Stream size exceeds max array size");
+            this.array = generator.apply((int) size);
+            this.curSize = 0;
+        }
+
+        ArrayNode(T[] array) {
+            this.array = array;
+            this.curSize = array.length;
+        }
+
+        // Node
+
+        @Override
+        public Spliterator<T> spliterator() {
+            return Arrays.spliterator(array, 0, curSize);
+        }
+
+        @Override
+        public void copyInto(T[] dest, int destOffset) {
+            System.arraycopy(array, 0, dest, destOffset, curSize);
+        }
+
+        @Override
+        public T[] asArray(IntFunction<T[]> generator) {
+            if (array.length == curSize) {
+                return array;
+            } else {
+                throw new IllegalStateException();
+            }
+        }
+
+        @Override
+        public long count() {
+            return curSize;
+        }
+
+        // Traversable
+
+        @Override
+        public void forEach(Consumer<? super T> consumer) {
+            for (int i = 0; i < curSize; i++) {
+                consumer.accept(array[i]);
+            }
+        }
+
+        //
+
+        @Override
+        public String toString() {
+            return String.format("ArrayNode[%d][%s]",
+                                 array.length - curSize, Arrays.toString(array));
+        }
+    }
+
+    /** Node class for a Collection */
+    private static final class CollectionNode<T> implements Node<T> {
+        private final Collection<T> c;
+
+        CollectionNode(Collection<T> c) {
+            this.c = c;
+        }
+
+        // Node
+
+        @Override
+        public Spliterator<T> spliterator() {
+            return c.stream().spliterator();
+        }
+
+        @Override
+        public void copyInto(T[] array, int offset) {
+            for (T t : c)
+                array[offset++] = t;
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public T[] asArray(IntFunction<T[]> generator) {
+            return c.toArray(generator.apply(c.size()));
+        }
+
+        @Override
+        public long count() {
+            return c.size();
+        }
+
+        @Override
+        public void forEach(Consumer<? super T> consumer) {
+            c.forEach(consumer);
+        }
+
+        //
+
+        @Override
+        public String toString() {
+            return String.format("CollectionNode[%d][%s]", c.size(), c);
+        }
+    }
+
+    /**
+     * Node class for an internal node with two or more children
+     */
+    static final class ConcNode<T> implements Node<T> {
+        private final Node<T> left;
+        private final Node<T> right;
+
+        private final long size;
+
+        ConcNode(Node<T> left, Node<T> right) {
+            this.left = left;
+            this.right = right;
+            // The Node count will be required when the Node spliterator is
+            // obtained and it is cheaper to aggressively calculate bottom up
+            // as the tree is built rather than later on from the top down
+            // traversing the tree
+            this.size = left.count() + right.count();
+        }
+
+        // Node
+
+        @Override
+        public Spliterator<T> spliterator() {
+            return new Nodes.InternalNodeSpliterator.OfRef<>(this);
+        }
+
+        @Override
+        public int getChildCount() {
+            return 2;
+        }
+
+        @Override
+        public Node<T> getChild(int i) {
+            if (i == 0) return left;
+            if (i == 1) return right;
+            throw new IndexOutOfBoundsException();
+        }
+
+        @Override
+        public void copyInto(T[] array, int offset) {
+            Objects.requireNonNull(array);
+            left.copyInto(array, offset);
+            right.copyInto(array, offset + (int) left.count());
+        }
+
+        @Override
+        public T[] asArray(IntFunction<T[]> generator) {
+            T[] array = generator.apply((int) count());
+            copyInto(array, 0);
+            return array;
+        }
+
+        @Override
+        public long count() {
+            return size;
+        }
+
+        @Override
+        public void forEach(Consumer<? super T> consumer) {
+            left.forEach(consumer);
+            right.forEach(consumer);
+        }
+
+        @Override
+        public String toString() {
+            if (count() < 32) {
+                return String.format("ConcNode[%s.%s]", left, right);
+            } else {
+                return String.format("ConcNode[size=%d]", count());
+            }
+        }
+    }
+
+    /** Abstract class for spliterator for all internal node classes */
+    private static abstract class InternalNodeSpliterator<T,
+                                                          S extends Spliterator<T>,
+                                                          N extends Node<T>, C>
+            implements Spliterator<T> {
+        // Node we are pointing to
+        // null if full traversal has occurred
+        N curNode;
+
+        // next child of curNode to consume
+        int curChildIndex;
+
+        // The spliterator of the curNode if that node is last and has no children.
+        // This spliterator will be delegated to for splitting and traversing.
+        // null if curNode has children
+        S lastNodeSpliterator;
+
+        // spliterator used while traversing with tryAdvance
+        // null if no partial traversal has occurred
+        S tryAdvanceSpliterator;
+
+        // node stack used when traversing to search and find leaf nodes
+        // null if no partial traversal has occurred
+        Deque<N> tryAdvanceStack;
+
+        InternalNodeSpliterator(N curNode) {
+            this.curNode = curNode;
+        }
+
+        /**
+         * Initiate a stack containing, in left-to-right order, the child nodes
+         * covered by this spliterator
+         */
+        protected final Deque<N> initStack() {
+            // Bias size to the case where leaf nodes are close to this node
+            // 8 is the minimum initial capacity for the ArrayDeque implementation
+            Deque<N> stack = new ArrayDeque<>(8);
+            for (int i = curNode.getChildCount() - 1; i >= curChildIndex; i--)
+                stack.addFirst((N) curNode.getChild(i));
+            return stack;
+        }
+
+        /**
+         * Depth first search, in left-to-right order, of the node tree, using
+         * an explicit stack, to find the next non-empty leaf node.
+         */
+        protected final N findNextLeafNode(Deque<N> stack) {
+            N n = null;
+            while ((n = stack.pollFirst()) != null) {
+                if (n.getChildCount() == 0) {
+                    if (n.count() > 0)
+                        return n;
+                } else {
+                    for (int i = n.getChildCount() - 1; i >= 0; i--)
+                        stack.addFirst((N) n.getChild(i));
+                }
+            }
+
+            return null;
+        }
+
+        protected final boolean internalTryAdvance(C consumer) {
+            if (curNode == null)
+                return false;
+
+            if (tryAdvanceSpliterator == null) {
+                if (lastNodeSpliterator == null) {
+                    // Initiate the node stack
+                    tryAdvanceStack = initStack();
+                    N leaf = findNextLeafNode(tryAdvanceStack);
+                    if (leaf != null)
+                        tryAdvanceSpliterator = (S) leaf.spliterator();
+                    else {
+                        // A non-empty leaf node was not found
+                        // No elements to traverse
+                        curNode = null;
+                        return false;
+                    }
+                }
+                else
+                    tryAdvanceSpliterator = lastNodeSpliterator;
+            }
+
+            boolean hasNext = tryAdvance(tryAdvanceSpliterator, consumer);
+            if (!hasNext) {
+                if (lastNodeSpliterator == null) {
+                    // Advance to the spliterator of the next non-empty leaf node
+                    Node<T> leaf = findNextLeafNode(tryAdvanceStack);
+                    if (leaf != null) {
+                        tryAdvanceSpliterator = (S) leaf.spliterator();
+                        // Since the node is not-empty the spliterator can be advanced
+                        return tryAdvance(tryAdvanceSpliterator, consumer);
+                    }
+                }
+                // No more elements to traverse
+                curNode = null;
+            }
+            return hasNext;
+        }
+
+        protected abstract boolean tryAdvance(S spliterator, C consumer);
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public S trySplit() {
+            if (curNode == null || tryAdvanceSpliterator != null)
+                return null; // Cannot split if fully or partially traversed
+            else if (lastNodeSpliterator != null)
+                return (S) lastNodeSpliterator.trySplit();
+            else if (curChildIndex < curNode.getChildCount() - 1)
+                return (S) curNode.getChild(curChildIndex++).spliterator();
+            else {
+                curNode = (N) curNode.getChild(curChildIndex);
+                if (curNode.getChildCount() == 0) {
+                    lastNodeSpliterator = (S) curNode.spliterator();
+                    return (S) lastNodeSpliterator.trySplit();
+                }
+                else {
+                    curChildIndex = 0;
+                    return (S) curNode.getChild(curChildIndex++).spliterator();
+                }
+            }
+        }
+
+        @Override
+        public long estimateSize() {
+            if (curNode == null)
+                return 0;
+
+            // Will not reflect the effects of partial traversal.
+            // This is compliant with the specification
+            if (lastNodeSpliterator != null)
+                return lastNodeSpliterator.estimateSize();
+            else {
+                long size = 0;
+                for (int i = curChildIndex; i < curNode.getChildCount(); i++)
+                    size += curNode.getChild(i).count();
+                return size;
+            }
+        }
+
+        @Override
+        public int characteristics() {
+            return Spliterator.SIZED;
+        }
+
+        private static final class OfRef<T>
+                extends InternalNodeSpliterator<T, Spliterator<T>, Node<T>, Consumer<? super T>> {
+
+            OfRef(Node<T> curNode) {
+                super(curNode);
+            }
+
+            @Override
+            public boolean tryAdvance(Consumer<? super T> consumer) {
+                return internalTryAdvance(consumer);
+            }
+
+            @Override
+            protected boolean tryAdvance(Spliterator<T> spliterator,
+                                         Consumer<? super T> consumer) {
+                return spliterator.tryAdvance(consumer);
+            }
+
+            @Override
+            public void forEachRemaining(Consumer<? super T> consumer) {
+                if (curNode == null)
+                    return;
+
+                if (tryAdvanceSpliterator == null) {
+                    if (lastNodeSpliterator == null) {
+                        Deque<Node<T>> stack = initStack();
+                        Node<T> leaf;
+                        while ((leaf = findNextLeafNode(stack)) != null) {
+                            leaf.forEach(consumer);
+                        }
+                        curNode = null;
+                    }
+                    else
+                        lastNodeSpliterator.forEachRemaining(consumer);
+                }
+                else
+                    while(tryAdvance(consumer)) { }
+            }
+        }
+
+        private static final class OfInt
+                extends InternalNodeSpliterator<Integer, Spliterator.OfInt, Node.OfInt, IntConsumer>
+                implements Spliterator.OfInt {
+
+            OfInt(Node.OfInt cur) {
+                super(cur);
+            }
+
+            @Override
+            public boolean tryAdvance(IntConsumer consumer) {
+                return internalTryAdvance(consumer);
+            }
+
+            @Override
+            protected boolean tryAdvance(Spliterator.OfInt spliterator,
+                                         IntConsumer consumer) {
+                return spliterator.tryAdvance(consumer);
+            }
+
+            @Override
+            public void forEachRemaining(IntConsumer consumer) {
+                if (curNode == null)
+                    return;
+
+                if (tryAdvanceSpliterator == null) {
+                    if (lastNodeSpliterator == null) {
+                        Deque<Node.OfInt> stack = initStack();
+                        Node.OfInt leaf;
+                        while ((leaf = findNextLeafNode(stack)) != null) {
+                            leaf.forEach(consumer);
+                        }
+                        curNode = null;
+                    }
+                    else
+                        lastNodeSpliterator.forEachRemaining(consumer);
+                }
+                else
+                    while(tryAdvance(consumer)) { }
+            }
+        }
+
+        private static final class OfLong
+                extends InternalNodeSpliterator<Long, Spliterator.OfLong, Node.OfLong, LongConsumer>
+                implements Spliterator.OfLong {
+
+            OfLong(Node.OfLong cur) {
+                super(cur);
+            }
+
+            @Override
+            public boolean tryAdvance(LongConsumer consumer) {
+                return internalTryAdvance(consumer);
+            }
+
+            @Override
+            protected boolean tryAdvance(Spliterator.OfLong spliterator,
+                                         LongConsumer consumer) {
+                return spliterator.tryAdvance(consumer);
+            }
+
+            @Override
+            public void forEachRemaining(LongConsumer consumer) {
+                if (curNode == null)
+                    return;
+
+                if (tryAdvanceSpliterator == null) {
+                    if (lastNodeSpliterator == null) {
+                        Deque<Node.OfLong> stack = initStack();
+                        Node.OfLong leaf;
+                        while ((leaf = findNextLeafNode(stack)) != null) {
+                            leaf.forEach(consumer);
+                        }
+                        curNode = null;
+                    }
+                    else
+                        lastNodeSpliterator.forEachRemaining(consumer);
+                }
+                else
+                    while(tryAdvance(consumer)) { }
+            }
+        }
+
+        private static final class OfDouble
+                extends InternalNodeSpliterator<Double, Spliterator.OfDouble, Node.OfDouble, DoubleConsumer>
+                implements Spliterator.OfDouble {
+
+            OfDouble(Node.OfDouble cur) {
+                super(cur);
+            }
+
+            @Override
+            public boolean tryAdvance(DoubleConsumer consumer) {
+                return internalTryAdvance(consumer);
+            }
+
+            @Override
+            protected boolean tryAdvance(Spliterator.OfDouble spliterator,
+                                         DoubleConsumer consumer) {
+                return spliterator.tryAdvance(consumer);
+            }
+
+            @Override
+            public void forEachRemaining(DoubleConsumer consumer) {
+                if (curNode == null)
+                    return;
+
+                if (tryAdvanceSpliterator == null) {
+                    if (lastNodeSpliterator == null) {
+                        Deque<Node.OfDouble> stack = initStack();
+                        Node.OfDouble leaf;
+                        while ((leaf = findNextLeafNode(stack)) != null) {
+                            leaf.forEach(consumer);
+                        }
+                        curNode = null;
+                    }
+                    else
+                        lastNodeSpliterator.forEachRemaining(consumer);
+                }
+                else
+                    while(tryAdvance(consumer)) { }
+            }
+        }
+    }
+
+    /**
+     * Fixed-sized builder class for reference nodes
+     */
+    private static final class FixedNodeBuilder<T>
+            extends ArrayNode<T>
+            implements Node.Builder<T> {
+
+        FixedNodeBuilder(long size, IntFunction<T[]> generator) {
+            super(size, generator);
+            assert size < MAX_ARRAY_SIZE;
+        }
+
+        @Override
+        public Node<T> build() {
+            if (curSize < array.length)
+                throw new IllegalStateException(String.format("Current size %d is less than fixed size %d",
+                                                              curSize, array.length));
+            return this;
+        }
+
+        @Override
+        public void begin(long size) {
+            if (size != array.length)
+                throw new IllegalStateException(String.format("Begin size %d is not equal to fixed size %d",
+                                                              size, array.length));
+            curSize = 0;
+        }
+
+        @Override
+        public void accept(T t) {
+            if (curSize < array.length) {
+                array[curSize++] = t;
+            } else {
+                throw new IllegalStateException(String.format("Accept exceeded fixed size of %d",
+                                                              array.length));
+            }
+        }
+
+        @Override
+        public void end() {
+            if (curSize < array.length)
+                throw new IllegalStateException(String.format("End size %d is less than fixed size %d",
+                                                              curSize, array.length));
+        }
+
+        @Override
+        public String toString() {
+            return String.format("FixedNodeBuilder[%d][%s]",
+                                 array.length - curSize, Arrays.toString(array));
+        }
+    }
+
+    /**
+     * Variable-sized builder class for reference nodes
+     */
+    private static final class SpinedNodeBuilder<T>
+            extends SpinedBuffer<T>
+            implements Node<T>, Node.Builder<T> {
+        private boolean building = false;
+
+        SpinedNodeBuilder() {} // Avoid creation of special accessor
+
+        @Override
+        public Spliterator<T> spliterator() {
+            assert !building : "during building";
+            return super.spliterator();
+        }
+
+        @Override
+        public void forEach(Consumer<? super T> consumer) {
+            assert !building : "during building";
+            super.forEach(consumer);
+        }
+
+        //
+        @Override
+        public void begin(long size) {
+            assert !building : "was already building";
+            building = true;
+            clear();
+            ensureCapacity(size);
+        }
+
+        @Override
+        public void accept(T t) {
+            assert building : "not building";
+            super.accept(t);
+        }
+
+        @Override
+        public void end() {
+            assert building : "was not building";
+            building = false;
+            // @@@ check begin(size) and size
+        }
+
+        @Override
+        public void copyInto(T[] array, int offset) {
+            assert !building : "during building";
+            super.copyInto(array, offset);
+        }
+
+        @Override
+        public T[] asArray(IntFunction<T[]> arrayFactory) {
+            assert !building : "during building";
+            return super.asArray(arrayFactory);
+        }
+
+        @Override
+        public Node<T> build() {
+            assert !building : "during building";
+            return this;
+        }
+    }
+
+    //
+
+    private static final int[] EMPTY_INT_ARRAY = new int[0];
+    private static final long[] EMPTY_LONG_ARRAY = new long[0];
+    private static final double[] EMPTY_DOUBLE_ARRAY = new double[0];
+
+    private abstract static class AbstractPrimitiveConcNode<E, N extends Node<E>>
+            implements Node<E> {
+        final N left;
+        final N right;
+        final long size;
+
+        AbstractPrimitiveConcNode(N left, N right) {
+            this.left = left;
+            this.right = right;
+            // The Node count will be required when the Node spliterator is
+            // obtained and it is cheaper to aggressively calculate bottom up as
+            // the tree is built rather than later on by traversing the tree
+            this.size = left.count() + right.count();
+        }
+
+        @Override
+        public int getChildCount() {
+            return 2;
+        }
+
+        @Override
+        public N getChild(int i) {
+            if (i == 0) return left;
+            if (i == 1) return right;
+            throw new IndexOutOfBoundsException();
+        }
+
+        @Override
+        public long count() {
+            return size;
+        }
+
+        @Override
+        public String toString() {
+            if (count() < 32)
+                return String.format("%s[%s.%s]", this.getClass().getName(), left, right);
+            else
+                return String.format("%s[size=%d]", this.getClass().getName(), count());
+        }
+    }
+
+    private static class IntArrayNode implements Node.OfInt {
+        final int[] array;
+        int curSize;
+
+        IntArrayNode(long size) {
+            if (size >= MAX_ARRAY_SIZE)
+                throw new IllegalArgumentException("Stream size exceeds max array size");
+            this.array = new int[(int) size];
+            this.curSize = 0;
+        }
+
+        IntArrayNode(int[] array) {
+            this.array = array;
+            this.curSize = array.length;
+        }
+
+        // Node
+
+        @Override
+        public Spliterator.OfInt spliterator() {
+            return Arrays.spliterator(array, 0, curSize);
+        }
+
+        @Override
+        public int[] asIntArray() {
+            if (array.length == curSize) {
+                return array;
+            } else {
+                return Arrays.copyOf(array, curSize);
+            }
+        }
+
+        @Override
+        public void copyInto(int[] dest, int destOffset) {
+            System.arraycopy(array, 0, dest, destOffset, curSize);
+        }
+
+        @Override
+        public long count() {
+            return curSize;
+        }
+
+        @Override
+        public void forEach(IntConsumer consumer) {
+            for (int i = 0; i < curSize; i++) {
+                consumer.accept(array[i]);
+            }
+        }
+
+        @Override
+        public String toString() {
+            return String.format("IntArrayNode[%d][%s]",
+                                 array.length - curSize, Arrays.toString(array));
+        }
+    }
+
+    private static class LongArrayNode implements Node.OfLong {
+        final long[] array;
+        int curSize;
+
+        LongArrayNode(long size) {
+            if (size >= MAX_ARRAY_SIZE)
+                throw new IllegalArgumentException("Stream size exceeds max array size");
+            this.array = new long[(int) size];
+            this.curSize = 0;
+        }
+
+        LongArrayNode(long[] array) {
+            this.array = array;
+            this.curSize = array.length;
+        }
+
+        @Override
+        public Spliterator.OfLong spliterator() {
+            return Arrays.spliterator(array, 0, curSize);
+        }
+
+        @Override
+        public long[] asLongArray() {
+            if (array.length == curSize) {
+                return array;
+            } else {
+                return Arrays.copyOf(array, curSize);
+            }
+        }
+
+        @Override
+        public void copyInto(long[] dest, int destOffset) {
+            System.arraycopy(array, 0, dest, destOffset, curSize);
+        }
+
+        @Override
+        public long count() {
+            return curSize;
+        }
+
+        @Override
+        public void forEach(LongConsumer consumer) {
+            for (int i = 0; i < curSize; i++) {
+                consumer.accept(array[i]);
+            }
+        }
+
+        @Override
+        public String toString() {
+            return String.format("LongArrayNode[%d][%s]",
+                                 array.length - curSize, Arrays.toString(array));
+        }
+    }
+
+    private static class DoubleArrayNode implements Node.OfDouble {
+        final double[] array;
+        int curSize;
+
+        DoubleArrayNode(long size) {
+            if (size >= MAX_ARRAY_SIZE)
+                throw new IllegalArgumentException("Stream size exceeds max array size");
+            this.array = new double[(int) size];
+            this.curSize = 0;
+        }
+
+        DoubleArrayNode(double[] array) {
+            this.array = array;
+            this.curSize = array.length;
+        }
+
+        @Override
+        public Spliterator.OfDouble spliterator() {
+            return Arrays.spliterator(array, 0, curSize);
+        }
+
+        @Override
+        public double[] asDoubleArray() {
+            if (array.length == curSize) {
+                return array;
+            } else {
+                return Arrays.copyOf(array, curSize);
+            }
+        }
+
+        @Override
+        public void copyInto(double[] dest, int destOffset) {
+            System.arraycopy(array, 0, dest, destOffset, curSize);
+        }
+
+        @Override
+        public long count() {
+            return curSize;
+        }
+
+        @Override
+        public void forEach(DoubleConsumer consumer) {
+            for (int i = 0; i < curSize; i++) {
+                consumer.accept(array[i]);
+            }
+        }
+
+        @Override
+        public String toString() {
+            return String.format("DoubleArrayNode[%d][%s]",
+                                 array.length - curSize, Arrays.toString(array));
+        }
+    }
+
+    static final class IntConcNode
+            extends AbstractPrimitiveConcNode<Integer, Node.OfInt>
+            implements Node.OfInt {
+
+        IntConcNode(Node.OfInt left, Node.OfInt right) {
+            super(left, right);
+        }
+
+        @Override
+        public void forEach(IntConsumer consumer) {
+            left.forEach(consumer);
+            right.forEach(consumer);
+        }
+
+        @Override
+        public Spliterator.OfInt spliterator() {
+            return new InternalNodeSpliterator.OfInt(this);
+        }
+
+        @Override
+        public void copyInto(int[] array, int offset) {
+            left.copyInto(array, offset);
+            right.copyInto(array, offset + (int) left.count());
+        }
+
+        @Override
+        public int[] asIntArray() {
+            int[] array = new int[(int) count()];
+            copyInto(array, 0);
+            return array;
+        }
+    }
+
+    static final class LongConcNode
+            extends AbstractPrimitiveConcNode<Long, Node.OfLong>
+            implements Node.OfLong {
+
+        LongConcNode(Node.OfLong left, Node.OfLong right) {
+            super(left, right);
+        }
+
+        @Override
+        public void forEach(LongConsumer consumer) {
+            left.forEach(consumer);
+            right.forEach(consumer);
+        }
+
+        @Override
+        public Spliterator.OfLong spliterator() {
+            return new InternalNodeSpliterator.OfLong(this);
+        }
+
+        @Override
+        public void copyInto(long[] array, int offset) {
+            left.copyInto(array, offset);
+            right.copyInto(array, offset + (int) left.count());
+        }
+
+        @Override
+        public long[] asLongArray() {
+            long[] array = new long[(int) count()];
+            copyInto(array, 0);
+            return array;
+        }
+    }
+
+    static final class DoubleConcNode
+            extends AbstractPrimitiveConcNode<Double, Node.OfDouble>
+            implements Node.OfDouble {
+
+        DoubleConcNode(Node.OfDouble left, Node.OfDouble right) {
+            super(left, right);
+        }
+
+        @Override
+        public void forEach(DoubleConsumer consumer) {
+            left.forEach(consumer);
+            right.forEach(consumer);
+        }
+
+        @Override
+        public Spliterator.OfDouble spliterator() {
+            return new InternalNodeSpliterator.OfDouble(this);
+        }
+
+        @Override
+        public void copyInto(double[] array, int offset) {
+            left.copyInto(array, offset);
+            right.copyInto(array, offset + (int) left.count());
+        }
+
+        @Override
+        public double[] asDoubleArray() {
+            double[] array = new double[(int) count()];
+            copyInto(array, 0);
+            return array;
+        }
+    }
+
+    private static final class IntFixedNodeBuilder
+            extends IntArrayNode
+            implements Node.Builder.OfInt {
+
+        IntFixedNodeBuilder(long size) {
+            super(size);
+            assert size < MAX_ARRAY_SIZE;
+        }
+
+        @Override
+        public Node.OfInt build() {
+            if (curSize < array.length) {
+                throw new IllegalStateException(String.format("Current size %d is less than fixed size %d",
+                                                              curSize, array.length));
+            }
+
+            return this;
+        }
+
+        @Override
+        public void begin(long size) {
+            if (size != array.length) {
+                throw new IllegalStateException(String.format("Begin size %d is not equal to fixed size %d",
+                                                              size, array.length));
+            }
+
+            curSize = 0;
+        }
+
+        @Override
+        public void accept(int i) {
+            if (curSize < array.length) {
+                array[curSize++] = i;
+            } else {
+                throw new IllegalStateException(String.format("Accept exceeded fixed size of %d",
+                                                              array.length));
+            }
+        }
+
+        @Override
+        public void end() {
+            if (curSize < array.length) {
+                throw new IllegalStateException(String.format("End size %d is less than fixed size %d",
+                                                              curSize, array.length));
+            }
+        }
+
+        @Override
+        public String toString() {
+            return String.format("IntFixedNodeBuilder[%d][%s]",
+                                 array.length - curSize, Arrays.toString(array));
+        }
+    }
+
+    private static final class LongFixedNodeBuilder
+            extends LongArrayNode
+            implements Node.Builder.OfLong {
+
+        LongFixedNodeBuilder(long size) {
+            super(size);
+            assert size < MAX_ARRAY_SIZE;
+        }
+
+        @Override
+        public Node.OfLong build() {
+            if (curSize < array.length) {
+                throw new IllegalStateException(String.format("Current size %d is less than fixed size %d",
+                                                              curSize, array.length));
+            }
+
+            return this;
+        }
+
+        @Override
+        public void begin(long size) {
+            if (size != array.length) {
+                throw new IllegalStateException(String.format("Begin size %d is not equal to fixed size %d",
+                                                              size, array.length));
+            }
+
+            curSize = 0;
+        }
+
+        @Override
+        public void accept(long i) {
+            if (curSize < array.length) {
+                array[curSize++] = i;
+            } else {
+                throw new IllegalStateException(String.format("Accept exceeded fixed size of %d",
+                                                              array.length));
+            }
+        }
+
+        @Override
+        public void end() {
+            if (curSize < array.length) {
+                throw new IllegalStateException(String.format("End size %d is less than fixed size %d",
+                                                              curSize, array.length));
+            }
+        }
+
+        @Override
+        public String toString() {
+            return String.format("LongFixedNodeBuilder[%d][%s]",
+                                 array.length - curSize, Arrays.toString(array));
+        }
+    }
+
+    private static final class DoubleFixedNodeBuilder
+            extends DoubleArrayNode
+            implements Node.Builder.OfDouble {
+
+        DoubleFixedNodeBuilder(long size) {
+            super(size);
+            assert size < MAX_ARRAY_SIZE;
+        }
+
+        @Override
+        public Node.OfDouble build() {
+            if (curSize < array.length) {
+                throw new IllegalStateException(String.format("Current size %d is less than fixed size %d",
+                                                              curSize, array.length));
+            }
+
+            return this;
+        }
+
+        @Override
+        public void begin(long size) {
+            if (size != array.length) {
+                throw new IllegalStateException(String.format("Begin size %d is not equal to fixed size %d",
+                                                              size, array.length));
+            }
+
+            curSize = 0;
+        }
+
+        @Override
+        public void accept(double i) {
+            if (curSize < array.length) {
+                array[curSize++] = i;
+            } else {
+                throw new IllegalStateException(String.format("Accept exceeded fixed size of %d",
+                                                              array.length));
+            }
+        }
+
+        @Override
+        public void end() {
+            if (curSize < array.length) {
+                throw new IllegalStateException(String.format("End size %d is less than fixed size %d",
+                                                              curSize, array.length));
+            }
+        }
+
+        @Override
+        public String toString() {
+            return String.format("DoubleFixedNodeBuilder[%d][%s]",
+                                 array.length - curSize, Arrays.toString(array));
+        }
+    }
+
+    private static final class IntSpinedNodeBuilder
+            extends SpinedBuffer.OfInt
+            implements Node.OfInt, Node.Builder.OfInt {
+        private boolean building = false;
+
+        IntSpinedNodeBuilder() {} // Avoid creation of special accessor
+
+        @Override
+        public Spliterator.OfInt spliterator() {
+            assert !building : "during building";
+            return super.spliterator();
+        }
+
+        @Override
+        public void forEach(IntConsumer consumer) {
+            assert !building : "during building";
+            super.forEach(consumer);
+        }
+
+        //
+        @Override
+        public void begin(long size) {
+            assert !building : "was already building";
+            building = true;
+            clear();
+            ensureCapacity(size);
+        }
+
+        @Override
+        public void accept(int i) {
+            assert building : "not building";
+            super.accept(i);
+        }
+
+        @Override
+        public void end() {
+            assert building : "was not building";
+            building = false;
+            // @@@ check begin(size) and size
+        }
+
+        @Override
+        public void copyInto(int[] array, int offset) throws IndexOutOfBoundsException {
+            assert !building : "during building";
+            super.copyInto(array, offset);
+        }
+
+        @Override
+        public int[] asIntArray() {
+            assert !building : "during building";
+            return super.asIntArray();
+        }
+
+        @Override
+        public Node.OfInt build() {
+            assert !building : "during building";
+            return this;
+        }
+    }
+
+    private static final class LongSpinedNodeBuilder
+            extends SpinedBuffer.OfLong
+            implements Node.OfLong, Node.Builder.OfLong {
+        private boolean building = false;
+
+        LongSpinedNodeBuilder() {} // Avoid creation of special accessor
+
+        @Override
+        public Spliterator.OfLong spliterator() {
+            assert !building : "during building";
+            return super.spliterator();
+        }
+
+        @Override
+        public void forEach(LongConsumer consumer) {
+            assert !building : "during building";
+            super.forEach(consumer);
+        }
+
+        //
+        @Override
+        public void begin(long size) {
+            assert !building : "was already building";
+            building = true;
+            clear();
+            ensureCapacity(size);
+        }
+
+        @Override
+        public void accept(long i) {
+            assert building : "not building";
+            super.accept(i);
+        }
+
+        @Override
+        public void end() {
+            assert building : "was not building";
+            building = false;
+            // @@@ check begin(size) and size
+        }
+
+        @Override
+        public void copyInto(long[] array, int offset) {
+            assert !building : "during building";
+            super.copyInto(array, offset);
+        }
+
+        @Override
+        public long[] asLongArray() {
+            assert !building : "during building";
+            return super.asLongArray();
+        }
+
+        @Override
+        public Node.OfLong build() {
+            assert !building : "during building";
+            return this;
+        }
+    }
+
+    private static final class DoubleSpinedNodeBuilder
+            extends SpinedBuffer.OfDouble
+            implements Node.OfDouble, Node.Builder.OfDouble {
+        private boolean building = false;
+
+        DoubleSpinedNodeBuilder() {} // Avoid creation of special accessor
+
+        @Override
+        public Spliterator.OfDouble spliterator() {
+            assert !building : "during building";
+            return super.spliterator();
+        }
+
+        @Override
+        public void forEach(DoubleConsumer consumer) {
+            assert !building : "during building";
+            super.forEach(consumer);
+        }
+
+        //
+        @Override
+        public void begin(long size) {
+            assert !building : "was already building";
+            building = true;
+            clear();
+            ensureCapacity(size);
+        }
+
+        @Override
+        public void accept(double i) {
+            assert building : "not building";
+            super.accept(i);
+        }
+
+        @Override
+        public void end() {
+            assert building : "was not building";
+            building = false;
+            // @@@ check begin(size) and size
+        }
+
+        @Override
+        public void copyInto(double[] array, int offset) {
+            assert !building : "during building";
+            super.copyInto(array, offset);
+        }
+
+        @Override
+        public double[] asDoubleArray() {
+            assert !building : "during building";
+            return super.asDoubleArray();
+        }
+
+        @Override
+        public Node.OfDouble build() {
+            assert !building : "during building";
+            return this;
+        }
+    }
+
+    private static abstract class SizedCollectorTask<P_IN, P_OUT, T_SINK extends Sink<P_OUT>,
+                                                     K extends SizedCollectorTask<P_IN, P_OUT, T_SINK, K>>
+            extends CountedCompleter<Void>
+            implements Sink<P_OUT> {
+        protected final Spliterator<P_IN> spliterator;
+        protected final PipelineHelper<P_OUT> helper;
+        protected final long targetSize;
+        protected long offset;
+        protected long length;
+        // For Sink implementation
+        protected int index, fence;
+
+        SizedCollectorTask(Spliterator<P_IN> spliterator,
+                           PipelineHelper<P_OUT> helper,
+                           int arrayLength) {
+            assert spliterator.hasCharacteristics(Spliterator.SUBSIZED);
+            this.spliterator = spliterator;
+            this.helper = helper;
+            this.targetSize = AbstractTask.suggestTargetSize(spliterator.estimateSize());
+            this.offset = 0;
+            this.length = arrayLength;
+        }
+
+        SizedCollectorTask(K parent, Spliterator<P_IN> spliterator,
+                           long offset, long length, int arrayLength) {
+            super(parent);
+            assert spliterator.hasCharacteristics(Spliterator.SUBSIZED);
+            this.spliterator = spliterator;
+            this.helper = parent.helper;
+            this.targetSize = parent.targetSize;
+            this.offset = offset;
+            this.length = length;
+
+            if (offset < 0 || length < 0 || (offset + length - 1 >= arrayLength)) {
+                throw new IllegalArgumentException(
+                        String.format("offset and length interval [%d, %d + %d) is not within array size interval [0, %d)",
+                                      offset, offset, length, arrayLength));
+            }
+        }
+
+        @Override
+        public void compute() {
+            SizedCollectorTask<P_IN, P_OUT, T_SINK, K> task = this;
+            while (true) {
+                Spliterator<P_IN> leftSplit;
+                if (!AbstractTask.suggestSplit(task.spliterator, task.targetSize)
+                    || ((leftSplit = task.spliterator.trySplit()) == null)) {
+                    if (task.offset + task.length >= MAX_ARRAY_SIZE)
+                        throw new IllegalArgumentException("Stream size exceeds max array size");
+                    T_SINK sink = (T_SINK) task;
+                    task.helper.wrapAndCopyInto(sink, task.spliterator);
+                    task.propagateCompletion();
+                    return;
+                }
+                else {
+                    task.setPendingCount(1);
+                    long leftSplitSize = leftSplit.estimateSize();
+                    task.makeChild(leftSplit, task.offset, leftSplitSize).fork();
+                    task = task.makeChild(task.spliterator, task.offset + leftSplitSize,
+                                          task.length - leftSplitSize);
+                }
+            }
+        }
+
+        abstract K makeChild(Spliterator<P_IN> spliterator, long offset, long size);
+
+        @Override
+        public void begin(long size) {
+            if(size > length)
+                throw new IllegalStateException("size passed to Sink.begin exceeds array length");
+            index = (int) offset;
+            fence = (int) offset + (int) length;
+        }
+
+        static final class OfRef<P_IN, P_OUT>
+                extends SizedCollectorTask<P_IN, P_OUT, Sink<P_OUT>, OfRef<P_IN, P_OUT>>
+                implements Sink<P_OUT> {
+            private final P_OUT[] array;
+
+            OfRef(Spliterator<P_IN> spliterator, PipelineHelper<P_OUT> helper, P_OUT[] array) {
+                super(spliterator, helper, array.length);
+                this.array = array;
+            }
+
+            OfRef(OfRef<P_IN, P_OUT> parent, Spliterator<P_IN> spliterator,
+                  long offset, long length) {
+                super(parent, spliterator, offset, length, parent.array.length);
+                this.array = parent.array;
+            }
+
+            @Override
+            OfRef<P_IN, P_OUT> makeChild(Spliterator<P_IN> spliterator,
+                                         long offset, long size) {
+                return new OfRef<>(this, spliterator, offset, size);
+            }
+
+            @Override
+            public void accept(P_OUT value) {
+                if (index >= fence) {
+                    throw new IndexOutOfBoundsException(Integer.toString(index));
+                }
+                array[index++] = value;
+            }
+        }
+
+        static final class OfInt<P_IN>
+                extends SizedCollectorTask<P_IN, Integer, Sink.OfInt, OfInt<P_IN>>
+                implements Sink.OfInt {
+            private final int[] array;
+
+            OfInt(Spliterator<P_IN> spliterator, PipelineHelper<Integer> helper, int[] array) {
+                super(spliterator, helper, array.length);
+                this.array = array;
+            }
+
+            OfInt(SizedCollectorTask.OfInt<P_IN> parent, Spliterator<P_IN> spliterator,
+                  long offset, long length) {
+                super(parent, spliterator, offset, length, parent.array.length);
+                this.array = parent.array;
+            }
+
+            @Override
+            SizedCollectorTask.OfInt<P_IN> makeChild(Spliterator<P_IN> spliterator,
+                                                     long offset, long size) {
+                return new SizedCollectorTask.OfInt<>(this, spliterator, offset, size);
+            }
+
+            @Override
+            public void accept(int value) {
+                if (index >= fence) {
+                    throw new IndexOutOfBoundsException(Integer.toString(index));
+                }
+                array[index++] = value;
+            }
+        }
+
+        static final class OfLong<P_IN>
+                extends SizedCollectorTask<P_IN, Long, Sink.OfLong, OfLong<P_IN>>
+                implements Sink.OfLong {
+            private final long[] array;
+
+            OfLong(Spliterator<P_IN> spliterator, PipelineHelper<Long> helper, long[] array) {
+                super(spliterator, helper, array.length);
+                this.array = array;
+            }
+
+            OfLong(SizedCollectorTask.OfLong<P_IN> parent, Spliterator<P_IN> spliterator,
+                   long offset, long length) {
+                super(parent, spliterator, offset, length, parent.array.length);
+                this.array = parent.array;
+            }
+
+            @Override
+            SizedCollectorTask.OfLong<P_IN> makeChild(Spliterator<P_IN> spliterator,
+                                                      long offset, long size) {
+                return new SizedCollectorTask.OfLong<>(this, spliterator, offset, size);
+            }
+
+            @Override
+            public void accept(long value) {
+                if (index >= fence) {
+                    throw new IndexOutOfBoundsException(Integer.toString(index));
+                }
+                array[index++] = value;
+            }
+        }
+
+        static final class OfDouble<P_IN>
+                extends SizedCollectorTask<P_IN, Double, Sink.OfDouble, OfDouble<P_IN>>
+                implements Sink.OfDouble {
+            private final double[] array;
+
+            OfDouble(Spliterator<P_IN> spliterator, PipelineHelper<Double> helper, double[] array) {
+                super(spliterator, helper, array.length);
+                this.array = array;
+            }
+
+            OfDouble(SizedCollectorTask.OfDouble<P_IN> parent, Spliterator<P_IN> spliterator,
+                     long offset, long length) {
+                super(parent, spliterator, offset, length, parent.array.length);
+                this.array = parent.array;
+            }
+
+            @Override
+            SizedCollectorTask.OfDouble<P_IN> makeChild(Spliterator<P_IN> spliterator,
+                                                        long offset, long size) {
+                return new SizedCollectorTask.OfDouble<>(this, spliterator, offset, size);
+            }
+
+            @Override
+            public void accept(double value) {
+                if (index >= fence) {
+                    throw new IndexOutOfBoundsException(Integer.toString(index));
+                }
+                array[index++] = value;
+            }
+        }
+    }
+
+    private static abstract class ToArrayTask<T, T_NODE extends Node<T>,
+                                              K extends ToArrayTask<T, T_NODE, K>>
+            extends CountedCompleter<Void> {
+        protected final T_NODE node;
+        protected final int offset;
+
+        ToArrayTask(T_NODE node, int offset) {
+            this.node = node;
+            this.offset = offset;
+        }
+
+        ToArrayTask(K parent, T_NODE node, int offset) {
+            super(parent);
+            this.node = node;
+            this.offset = offset;
+        }
+
+        abstract void copyNodeToArray();
+
+        abstract K makeChild(int childIndex, int offset);
+
+        @Override
+        public void compute() {
+            ToArrayTask<T, T_NODE, K> task = this;
+            while (true) {
+                if (task.node.getChildCount() == 0) {
+                    task.copyNodeToArray();
+                    task.propagateCompletion();
+                    return;
+                }
+                else {
+                    task.setPendingCount(task.node.getChildCount() - 1);
+
+                    int size = 0;
+                    int i = 0;
+                    for (;i < task.node.getChildCount() - 1; i++) {
+                        K leftTask = task.makeChild(i, task.offset + size);
+                        size += leftTask.node.count();
+                        leftTask.fork();
+                    }
+                    task = task.makeChild(i, task.offset + size);
+                }
+            }
+        }
+
+        private static final class OfRef<T>
+                extends ToArrayTask<T, Node<T>, OfRef<T>> {
+            private final T[] array;
+
+            private OfRef(Node<T> node, T[] array, int offset) {
+                super(node, offset);
+                this.array = array;
+            }
+
+            private OfRef(OfRef<T> parent, Node<T> node, int offset) {
+                super(parent, node, offset);
+                this.array = parent.array;
+            }
+
+            @Override
+            OfRef<T> makeChild(int childIndex, int offset) {
+                return new OfRef<>(this, node.getChild(childIndex), offset);
+            }
+
+            @Override
+            void copyNodeToArray() {
+                node.copyInto(array, offset);
+            }
+        }
+
+        private static final class OfInt
+                extends ToArrayTask<Integer, Node.OfInt, OfInt> {
+            private final int[] array;
+
+            private OfInt(Node.OfInt node, int[] array, int offset) {
+                super(node, offset);
+                this.array = array;
+            }
+
+            private OfInt(OfInt parent, Node.OfInt node, int offset) {
+                super(parent, node, offset);
+                this.array = parent.array;
+            }
+
+            @Override
+            OfInt makeChild(int childIndex, int offset) {
+                return new OfInt(this, node.getChild(childIndex), offset);
+            }
+
+            @Override
+            void copyNodeToArray() {
+                node.copyInto(array, offset);
+            }
+        }
+
+        private static final class OfLong
+                extends ToArrayTask<Long, Node.OfLong, OfLong> {
+            private final long[] array;
+
+            private OfLong(Node.OfLong node, long[] array, int offset) {
+                super(node, offset);
+                this.array = array;
+            }
+
+            private OfLong(OfLong parent, Node.OfLong node, int offset) {
+                super(parent, node, offset);
+                this.array = parent.array;
+            }
+
+            @Override
+            OfLong makeChild(int childIndex, int offset) {
+                return new OfLong(this, node.getChild(childIndex), offset);
+            }
+
+            @Override
+            void copyNodeToArray() {
+                node.copyInto(array, offset);
+            }
+        }
+
+        private static final class OfDouble
+                extends ToArrayTask<Double, Node.OfDouble, OfDouble> {
+            private final double[] array;
+
+            private OfDouble(Node.OfDouble node, double[] array, int offset) {
+                super(node, offset);
+                this.array = array;
+            }
+
+            private OfDouble(OfDouble parent, Node.OfDouble node, int offset) {
+                super(parent, node, offset);
+                this.array = parent.array;
+            }
+
+            @Override
+            OfDouble makeChild(int childIndex, int offset) {
+                return new OfDouble(this, node.getChild(childIndex), offset);
+            }
+
+            @Override
+            void copyNodeToArray() {
+                node.copyInto(array, offset);
+            }
+        }
+    }
+
+    private static final class CollectorTask<P_IN, P_OUT>
+            extends AbstractTask<P_IN, P_OUT, Node<P_OUT>, CollectorTask<P_IN, P_OUT>> {
+        private final PipelineHelper<P_OUT> helper;
+        private final IntFunction<P_OUT[]> generator;
+
+        CollectorTask(PipelineHelper<P_OUT> helper,
+                      IntFunction<P_OUT[]> generator,
+                      Spliterator<P_IN> spliterator) {
+            super(helper, spliterator);
+            this.helper = helper;
+            this.generator = generator;
+        }
+
+        CollectorTask(CollectorTask<P_IN, P_OUT> parent, Spliterator<P_IN> spliterator) {
+            super(parent, spliterator);
+            helper = parent.helper;
+            generator = parent.generator;
+        }
+
+        @Override
+        protected CollectorTask<P_IN, P_OUT> makeChild(Spliterator<P_IN> spliterator) {
+            return new CollectorTask<>(this, spliterator);
+        }
+
+        @Override
+        protected Node<P_OUT> doLeaf() {
+            Node.Builder<P_OUT> builder
+                    = builder(helper.exactOutputSizeIfKnown(spliterator),
+                                    generator);
+            return helper.wrapAndCopyInto(builder, spliterator).build();
+        }
+
+        @Override
+        public void onCompletion(CountedCompleter caller) {
+            if (!isLeaf()) {
+                setLocalResult(new ConcNode<>(leftChild.getLocalResult(), rightChild.getLocalResult()));
+            }
+            super.onCompletion(caller);
+        }
+    }
+
+    private static final class IntCollectorTask<P_IN>
+            extends AbstractTask<P_IN, Integer, Node.OfInt, IntCollectorTask<P_IN>> {
+        private final PipelineHelper<Integer> helper;
+
+        IntCollectorTask(PipelineHelper<Integer> helper, Spliterator<P_IN> spliterator) {
+            super(helper, spliterator);
+            this.helper = helper;
+        }
+
+        IntCollectorTask(IntCollectorTask<P_IN> parent, Spliterator<P_IN> spliterator) {
+            super(parent, spliterator);
+            helper = parent.helper;
+        }
+
+        @Override
+        protected IntCollectorTask<P_IN> makeChild(Spliterator<P_IN> spliterator) {
+            return new IntCollectorTask<>(this, spliterator);
+        }
+
+        @Override
+        protected Node.OfInt doLeaf() {
+            Node.Builder.OfInt builder = intBuilder(helper.exactOutputSizeIfKnown(spliterator));
+            return helper.wrapAndCopyInto(builder, spliterator).build();
+        }
+
+        @Override
+        public void onCompletion(CountedCompleter caller) {
+            if (!isLeaf()) {
+                setLocalResult(new IntConcNode(leftChild.getLocalResult(), rightChild.getLocalResult()));
+            }
+            super.onCompletion(caller);
+        }
+    }
+
+    private static final class LongCollectorTask<P_IN>
+            extends AbstractTask<P_IN, Long, Node.OfLong, LongCollectorTask<P_IN>> {
+        private final PipelineHelper<Long> helper;
+
+        LongCollectorTask(PipelineHelper<Long> helper, Spliterator<P_IN> spliterator) {
+            super(helper, spliterator);
+            this.helper = helper;
+        }
+
+        LongCollectorTask(LongCollectorTask<P_IN> parent, Spliterator<P_IN> spliterator) {
+            super(parent, spliterator);
+            helper = parent.helper;
+        }
+
+        @Override
+        protected LongCollectorTask<P_IN> makeChild(Spliterator<P_IN> spliterator) {
+            return new LongCollectorTask<>(this, spliterator);
+        }
+
+        @Override
+        protected Node.OfLong doLeaf() {
+            Node.Builder.OfLong builder = longBuilder(helper.exactOutputSizeIfKnown(spliterator));
+            return helper.wrapAndCopyInto(builder, spliterator).build();
+        }
+
+        @Override
+        public void onCompletion(CountedCompleter caller) {
+            if (!isLeaf()) {
+                setLocalResult(new LongConcNode(leftChild.getLocalResult(), rightChild.getLocalResult()));
+            }
+            super.onCompletion(caller);
+        }
+    }
+
+    private static final class DoubleCollectorTask<P_IN>
+            extends AbstractTask<P_IN, Double, Node.OfDouble, DoubleCollectorTask<P_IN>> {
+        private final PipelineHelper<Double> helper;
+
+        DoubleCollectorTask(PipelineHelper<Double> helper, Spliterator<P_IN> spliterator) {
+            super(helper, spliterator);
+            this.helper = helper;
+        }
+
+        DoubleCollectorTask(DoubleCollectorTask<P_IN> parent, Spliterator<P_IN> spliterator) {
+            super(parent, spliterator);
+            helper = parent.helper;
+        }
+
+        @Override
+        protected DoubleCollectorTask<P_IN> makeChild(Spliterator<P_IN> spliterator) {
+            return new DoubleCollectorTask<>(this, spliterator);
+        }
+
+        @Override
+        protected Node.OfDouble doLeaf() {
+            Node.Builder.OfDouble builder
+                    = doubleBuilder(helper.exactOutputSizeIfKnown(spliterator));
+            return helper.wrapAndCopyInto(builder, spliterator).build();
+        }
+
+        @Override
+        public void onCompletion(CountedCompleter caller) {
+            if (!isLeaf()) {
+                setLocalResult(new DoubleConcNode(leftChild.getLocalResult(), rightChild.getLocalResult()));
+            }
+            super.onCompletion(caller);
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/ReduceOps.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,762 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.OptionalDouble;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+import java.util.Spliterator;
+import java.util.concurrent.CountedCompleter;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.BinaryOperator;
+import java.util.function.DoubleBinaryOperator;
+import java.util.function.IntBinaryOperator;
+import java.util.function.LongBinaryOperator;
+import java.util.function.ObjDoubleConsumer;
+import java.util.function.ObjIntConsumer;
+import java.util.function.ObjLongConsumer;
+import java.util.function.Supplier;
+
+/**
+ * Factory for the creating instances of {@code TerminalOp) that implement
+ * reductions.
+ *
+ * @since 1.8
+ */
+final class ReduceOps {
+
+    private ReduceOps() { }
+
+    /**
+     * Constructs a {@code TerminalOp} that implements a functional reduce on
+     * reference values.
+     *
+     * @param <T> the type of the input elements
+     * @param <U> the type of the result
+     * @param seed the identity element for the reduction
+     * @param reducer the accumulating function that incorporates an additional
+     *        input element into the result
+     * @param combiner the combining function that combines two intermediate
+     *        results
+     * @return a {@code TerminalOp} implementing the reduction
+     */
+    public static <T, U> TerminalOp<T, U>
+    makeRef(U seed, BiFunction<U, ? super T, U> reducer, BinaryOperator<U> combiner) {
+        Objects.requireNonNull(reducer);
+        Objects.requireNonNull(combiner);
+        class ReducingSink extends Box<U> implements AccumulatingSink<T, U, ReducingSink> {
+            @Override
+            public void begin(long size) {
+                state = seed;
+            }
+
+            @Override
+            public void accept(T t) {
+                state = reducer.apply(state, t);
+            }
+
+            @Override
+            public void combine(ReducingSink other) {
+                state = combiner.apply(state, other.state);
+            }
+        }
+        return new ReduceOp<T, U, ReducingSink>(StreamShape.REFERENCE) {
+            @Override
+            public ReducingSink makeSink() {
+                return new ReducingSink();
+            }
+        };
+    }
+
+    /**
+     * Constructs a {@code TerminalOp} that implements a functional reduce on
+     * reference values producing an optional reference result.
+     *
+     * @param <T> The type of the input elements, and the type of the result
+     * @param operator The reducing function
+     * @return A {@code TerminalOp} implementing the reduction
+     */
+    public static <T> TerminalOp<T, Optional<T>>
+    makeRef(BinaryOperator<T> operator) {
+        Objects.requireNonNull(operator);
+        class ReducingSink
+                implements AccumulatingSink<T, Optional<T>, ReducingSink> {
+            private boolean empty;
+            private T state;
+
+            public void begin(long size) {
+                empty = true;
+                state = null;
+            }
+
+            @Override
+            public void accept(T t) {
+                if (empty) {
+                    empty = false;
+                    state = t;
+                } else {
+                    state = operator.apply(state, t);
+                }
+            }
+
+            @Override
+            public Optional<T> get() {
+                return empty ? Optional.empty() : Optional.of(state);
+            }
+
+            @Override
+            public void combine(ReducingSink other) {
+                if (!other.empty)
+                    accept(other.state);
+            }
+        }
+        return new ReduceOp<T, Optional<T>, ReducingSink>(StreamShape.REFERENCE) {
+            @Override
+            public ReducingSink makeSink() {
+                return new ReducingSink();
+            }
+        };
+    }
+
+    /**
+     * Constructs a {@code TerminalOp} that implements a mutable reduce on
+     * reference values.
+     *
+     * @param <T> the type of the input elements
+     * @param <R> the type of the result
+     * @param collector a {@code Collector} defining the reduction
+     * @return a {@code ReduceOp} implementing the reduction
+     */
+    public static <T,R> TerminalOp<T, R>
+    makeRef(Collector<? super T,R> collector) {
+        Supplier<R> supplier = Objects.requireNonNull(collector).resultSupplier();
+        BiFunction<R, ? super T, R> accumulator = collector.accumulator();
+        BinaryOperator<R> combiner = collector.combiner();
+        class ReducingSink extends Box<R>
+                implements AccumulatingSink<T, R, ReducingSink> {
+            @Override
+            public void begin(long size) {
+                state = supplier.get();
+            }
+
+            @Override
+            public void accept(T t) {
+                R newResult = accumulator.apply(state, t);
+                if (state != newResult)
+                    state = newResult;
+            }
+
+            @Override
+            public void combine(ReducingSink other) {
+                state = combiner.apply(state, other.state);
+            }
+        }
+        return new ReduceOp<T, R, ReducingSink>(StreamShape.REFERENCE) {
+            @Override
+            public ReducingSink makeSink() {
+                return new ReducingSink();
+            }
+
+            @Override
+            public int getOpFlags() {
+                return collector.characteristics().contains(Collector.Characteristics.UNORDERED)
+                       ? StreamOpFlag.NOT_ORDERED
+                       : 0;
+            }
+        };
+    }
+
+    /**
+     * Constructs a {@code TerminalOp} that implements a mutable reduce on
+     * reference values.
+     *
+     * @param <T> the type of the input elements
+     * @param <R> the type of the result
+     * @param seedFactory a factory to produce a new base accumulator
+     * @param accumulator a function to incorporate an element into an
+     *        accumulator
+     * @param reducer a function to combine an accumulator into another
+     * @return a {@code TerminalOp} implementing the reduction
+     */
+    public static <T, R> TerminalOp<T, R>
+    makeRef(Supplier<R> seedFactory,
+            BiConsumer<R, ? super T> accumulator,
+            BiConsumer<R,R> reducer) {
+        Objects.requireNonNull(seedFactory);
+        Objects.requireNonNull(accumulator);
+        Objects.requireNonNull(reducer);
+        class ReducingSink extends Box<R>
+                implements AccumulatingSink<T, R, ReducingSink> {
+            @Override
+            public void begin(long size) {
+                state = seedFactory.get();
+            }
+
+            @Override
+            public void accept(T t) {
+                accumulator.accept(state, t);
+            }
+
+            @Override
+            public void combine(ReducingSink other) {
+                reducer.accept(state, other.state);
+            }
+        }
+        return new ReduceOp<T, R, ReducingSink>(StreamShape.REFERENCE) {
+            @Override
+            public ReducingSink makeSink() {
+                return new ReducingSink();
+            }
+        };
+    }
+
+    /**
+     * Constructs a {@code TerminalOp} that implements a functional reduce on
+     * {@code int} values.
+     *
+     * @param identity the identity for the combining function
+     * @param operator the combining function
+     * @return a {@code TerminalOp} implementing the reduction
+     */
+    public static TerminalOp<Integer, Integer>
+    makeInt(int identity, IntBinaryOperator operator) {
+        Objects.requireNonNull(operator);
+        class ReducingSink
+                implements AccumulatingSink<Integer, Integer, ReducingSink>, Sink.OfInt {
+            private int state;
+
+            @Override
+            public void begin(long size) {
+                state = identity;
+            }
+
+            @Override
+            public void accept(int t) {
+                state = operator.applyAsInt(state, t);
+            }
+
+            @Override
+            public Integer get() {
+                return state;
+            }
+
+            @Override
+            public void combine(ReducingSink other) {
+                accept(other.state);
+            }
+        }
+        return new ReduceOp<Integer, Integer, ReducingSink>(StreamShape.INT_VALUE) {
+            @Override
+            public ReducingSink makeSink() {
+                return new ReducingSink();
+            }
+        };
+    }
+
+    /**
+     * Constructs a {@code TerminalOp} that implements a functional reduce on
+     * {@code int} values, producing an optional integer result.
+     *
+     * @param operator the combining function
+     * @return a {@code TerminalOp} implementing the reduction
+     */
+    public static TerminalOp<Integer, OptionalInt>
+    makeInt(IntBinaryOperator operator) {
+        Objects.requireNonNull(operator);
+        class ReducingSink
+                implements AccumulatingSink<Integer, OptionalInt, ReducingSink>, Sink.OfInt {
+            private boolean empty;
+            private int state;
+
+            public void begin(long size) {
+                empty = true;
+                state = 0;
+            }
+
+            @Override
+            public void accept(int t) {
+                if (empty) {
+                    empty = false;
+                    state = t;
+                }
+                else {
+                    state = operator.applyAsInt(state, t);
+                }
+            }
+
+            @Override
+            public OptionalInt get() {
+                return empty ? OptionalInt.empty() : OptionalInt.of(state);
+            }
+
+            @Override
+            public void combine(ReducingSink other) {
+                if (!other.empty)
+                    accept(other.state);
+            }
+        }
+        return new ReduceOp<Integer, OptionalInt, ReducingSink>(StreamShape.INT_VALUE) {
+            @Override
+            public ReducingSink makeSink() {
+                return new ReducingSink();
+            }
+        };
+    }
+
+    /**
+     * Constructs a {@code TerminalOp} that implements a mutable reduce on
+     * {@code int} values.
+     *
+     * @param <R> The type of the result
+     * @param supplier a factory to produce a new accumulator of the result type
+     * @param accumulator a function to incorporate an int into an
+     *        accumulator
+     * @param combiner a function to combine an accumulator into another
+     * @return A {@code ReduceOp} implementing the reduction
+     */
+    public static <R> TerminalOp<Integer, R>
+    makeInt(Supplier<R> supplier,
+            ObjIntConsumer<R> accumulator,
+            BinaryOperator<R> combiner) {
+        Objects.requireNonNull(supplier);
+        Objects.requireNonNull(accumulator);
+        Objects.requireNonNull(combiner);
+        class ReducingSink extends Box<R>
+                implements AccumulatingSink<Integer, R, ReducingSink>, Sink.OfInt {
+            @Override
+            public void begin(long size) {
+                state = supplier.get();
+            }
+
+            @Override
+            public void accept(int t) {
+                accumulator.accept(state, t);
+            }
+
+            @Override
+            public void combine(ReducingSink other) {
+                state = combiner.apply(state, other.state);
+            }
+        }
+        return new ReduceOp<Integer, R, ReducingSink>(StreamShape.INT_VALUE) {
+            @Override
+            public ReducingSink makeSink() {
+                return new ReducingSink();
+            }
+        };
+    }
+
+    /**
+     * Constructs a {@code TerminalOp} that implements a functional reduce on
+     * {@code long} values.
+     *
+     * @param identity the identity for the combining function
+     * @param operator the combining function
+     * @return a {@code TerminalOp} implementing the reduction
+     */
+    public static TerminalOp<Long, Long>
+    makeLong(long identity, LongBinaryOperator operator) {
+        Objects.requireNonNull(operator);
+        class ReducingSink
+                implements AccumulatingSink<Long, Long, ReducingSink>, Sink.OfLong {
+            private long state;
+
+            @Override
+            public void begin(long size) {
+                state = identity;
+            }
+
+            @Override
+            public void accept(long t) {
+                state = operator.applyAsLong(state, t);
+            }
+
+            @Override
+            public Long get() {
+                return state;
+            }
+
+            @Override
+            public void combine(ReducingSink other) {
+                accept(other.state);
+            }
+        }
+        return new ReduceOp<Long, Long, ReducingSink>(StreamShape.LONG_VALUE) {
+            @Override
+            public ReducingSink makeSink() {
+                return new ReducingSink();
+            }
+        };
+    }
+
+    /**
+     * Constructs a {@code TerminalOp} that implements a functional reduce on
+     * {@code long} values, producing an optional long result.
+     *
+     * @param operator the combining function
+     * @return a {@code TerminalOp} implementing the reduction
+     */
+    public static TerminalOp<Long, OptionalLong>
+    makeLong(LongBinaryOperator operator) {
+        Objects.requireNonNull(operator);
+        class ReducingSink
+                implements AccumulatingSink<Long, OptionalLong, ReducingSink>, Sink.OfLong {
+            private boolean empty;
+            private long state;
+
+            public void begin(long size) {
+                empty = true;
+                state = 0;
+            }
+
+            @Override
+            public void accept(long t) {
+                if (empty) {
+                    empty = false;
+                    state = t;
+                }
+                else {
+                    state = operator.applyAsLong(state, t);
+                }
+            }
+
+            @Override
+            public OptionalLong get() {
+                return empty ? OptionalLong.empty() : OptionalLong.of(state);
+            }
+
+            @Override
+            public void combine(ReducingSink other) {
+                if (!other.empty)
+                    accept(other.state);
+            }
+        }
+        return new ReduceOp<Long, OptionalLong, ReducingSink>(StreamShape.LONG_VALUE) {
+            @Override
+            public ReducingSink makeSink() {
+                return new ReducingSink();
+            }
+        };
+    }
+
+    /**
+     * Constructs a {@code TerminalOp} that implements a mutable reduce on
+     * {@code long} values.
+     *
+     * @param <R> the type of the result
+     * @param supplier a factory to produce a new accumulator of the result type
+     * @param accumulator a function to incorporate an int into an
+     *        accumulator
+     * @param combiner a function to combine an accumulator into another
+     * @return a {@code TerminalOp} implementing the reduction
+     */
+    public static <R> TerminalOp<Long, R>
+    makeLong(Supplier<R> supplier,
+             ObjLongConsumer<R> accumulator,
+             BinaryOperator<R> combiner) {
+        Objects.requireNonNull(supplier);
+        Objects.requireNonNull(accumulator);
+        Objects.requireNonNull(combiner);
+        class ReducingSink extends Box<R>
+                implements AccumulatingSink<Long, R, ReducingSink>, Sink.OfLong {
+            @Override
+            public void begin(long size) {
+                state = supplier.get();
+            }
+
+            @Override
+            public void accept(long t) {
+                accumulator.accept(state, t);
+            }
+
+            @Override
+            public void combine(ReducingSink other) {
+                state = combiner.apply(state, other.state);
+            }
+        }
+        return new ReduceOp<Long, R, ReducingSink>(StreamShape.LONG_VALUE) {
+            @Override
+            public ReducingSink makeSink() {
+                return new ReducingSink();
+            }
+        };
+    }
+
+    /**
+     * Constructs a {@code TerminalOp} that implements a functional reduce on
+     * {@code double} values.
+     *
+     * @param identity the identity for the combining function
+     * @param operator the combining function
+     * @return a {@code TerminalOp} implementing the reduction
+     */
+    public static TerminalOp<Double, Double>
+    makeDouble(double identity, DoubleBinaryOperator operator) {
+        Objects.requireNonNull(operator);
+        class ReducingSink
+                implements AccumulatingSink<Double, Double, ReducingSink>, Sink.OfDouble {
+            private double state;
+
+            @Override
+            public void begin(long size) {
+                state = identity;
+            }
+
+            @Override
+            public void accept(double t) {
+                state = operator.applyAsDouble(state, t);
+            }
+
+            @Override
+            public Double get() {
+                return state;
+            }
+
+            @Override
+            public void combine(ReducingSink other) {
+                accept(other.state);
+            }
+        }
+        return new ReduceOp<Double, Double, ReducingSink>(StreamShape.DOUBLE_VALUE) {
+            @Override
+            public ReducingSink makeSink() {
+                return new ReducingSink();
+            }
+        };
+    }
+
+    /**
+     * Constructs a {@code TerminalOp} that implements a functional reduce on
+     * {@code double} values, producing an optional double result.
+     *
+     * @param operator the combining function
+     * @return a {@code TerminalOp} implementing the reduction
+     */
+    public static TerminalOp<Double, OptionalDouble>
+    makeDouble(DoubleBinaryOperator operator) {
+        Objects.requireNonNull(operator);
+        class ReducingSink
+                implements AccumulatingSink<Double, OptionalDouble, ReducingSink>, Sink.OfDouble {
+            private boolean empty;
+            private double state;
+
+            public void begin(long size) {
+                empty = true;
+                state = 0;
+            }
+
+            @Override
+            public void accept(double t) {
+                if (empty) {
+                    empty = false;
+                    state = t;
+                }
+                else {
+                    state = operator.applyAsDouble(state, t);
+                }
+            }
+
+            @Override
+            public OptionalDouble get() {
+                return empty ? OptionalDouble.empty() : OptionalDouble.of(state);
+            }
+
+            @Override
+            public void combine(ReducingSink other) {
+                if (!other.empty)
+                    accept(other.state);
+            }
+        }
+        return new ReduceOp<Double, OptionalDouble, ReducingSink>(StreamShape.DOUBLE_VALUE) {
+            @Override
+            public ReducingSink makeSink() {
+                return new ReducingSink();
+            }
+        };
+    }
+
+    /**
+     * Constructs a {@code TerminalOp} that implements a mutable reduce on
+     * {@code double} values.
+     *
+     * @param <R> the type of the result
+     * @param supplier a factory to produce a new accumulator of the result type
+     * @param accumulator a function to incorporate an int into an
+     *        accumulator
+     * @param combiner a function to combine an accumulator into another
+     * @return a {@code TerminalOp} implementing the reduction
+     */
+    public static <R> TerminalOp<Double, R>
+    makeDouble(Supplier<R> supplier,
+               ObjDoubleConsumer<R> accumulator,
+               BinaryOperator<R> combiner) {
+        Objects.requireNonNull(supplier);
+        Objects.requireNonNull(accumulator);
+        Objects.requireNonNull(combiner);
+        class ReducingSink extends Box<R>
+                implements AccumulatingSink<Double, R, ReducingSink>, Sink.OfDouble {
+            @Override
+            public void begin(long size) {
+                state = supplier.get();
+            }
+
+            @Override
+            public void accept(double t) {
+                accumulator.accept(state, t);
+            }
+
+            @Override
+            public void combine(ReducingSink other) {
+                state = combiner.apply(state, other.state);
+            }
+        }
+        return new ReduceOp<Double, R, ReducingSink>(StreamShape.DOUBLE_VALUE) {
+            @Override
+            public ReducingSink makeSink() {
+                return new ReducingSink();
+            }
+        };
+    }
+
+    /**
+     * A type of {@code TerminalSink} that implements an associative reducing
+     * operation on elements of type {@code T} and producing a result of type
+     * {@code R}.
+     *
+     * @param <T> the type of input element to the combining operation
+     * @param <R> the result type
+     * @param <K> the type of the {@code AccumulatingSink}.
+     */
+    private interface AccumulatingSink<T, R, K extends AccumulatingSink<T, R, K>>
+            extends TerminalSink<T, R> {
+        public void combine(K other);
+    }
+
+    /**
+     * State box for a single state element, used as a base class for
+     * {@code AccumulatingSink} instances
+     *
+     * @param <U> The type of the state element
+     */
+    private static abstract class Box<U> {
+        U state;
+
+        Box() {} // Avoid creation of special accessor
+
+        public U get() {
+            return state;
+        }
+    }
+
+    /**
+     * A {@code TerminalOp} that evaluates a stream pipeline and sends the
+     * output into an {@code AccumulatingSink}, which performs a reduce
+     * operation. The {@code AccumulatingSink} must represent an associative
+     * reducing operation.
+     *
+     * @param <T> the output type of the stream pipeline
+     * @param <R> the result type of the reducing operation
+     * @param <S> the type of the {@code AccumulatingSink}
+     */
+    private static abstract class ReduceOp<T, R, S extends AccumulatingSink<T, R, S>>
+            implements TerminalOp<T, R> {
+        private final StreamShape inputShape;
+
+        /**
+         * Create a {@code ReduceOp} of the specified stream shape which uses
+         * the specified {@code Supplier} to create accumulating sinks.
+         *
+         * @param shape The shape of the stream pipeline
+         */
+        ReduceOp(StreamShape shape) {
+            inputShape = shape;
+        }
+
+        public abstract S makeSink();
+
+        @Override
+        public StreamShape inputShape() {
+            return inputShape;
+        }
+
+        @Override
+        public <P_IN> R evaluateSequential(PipelineHelper<T> helper,
+                                           Spliterator<P_IN> spliterator) {
+            return helper.wrapAndCopyInto(makeSink(), spliterator).get();
+        }
+
+        @Override
+        public <P_IN> R evaluateParallel(PipelineHelper<T> helper,
+                                         Spliterator<P_IN> spliterator) {
+            return new ReduceTask<>(this, helper, spliterator).invoke().get();
+        }
+    }
+
+    /**
+     * A {@code ForkJoinTask} for performing a parallel reduce operation.
+     */
+    private static final class ReduceTask<P_IN, P_OUT, R,
+                                          S extends AccumulatingSink<P_OUT, R, S>>
+            extends AbstractTask<P_IN, P_OUT, S, ReduceTask<P_IN, P_OUT, R, S>> {
+        private final ReduceOp<P_OUT, R, S> op;
+
+        ReduceTask(ReduceOp<P_OUT, R, S> op,
+                   PipelineHelper<P_OUT> helper,
+                   Spliterator<P_IN> spliterator) {
+            super(helper, spliterator);
+            this.op = op;
+        }
+
+        ReduceTask(ReduceTask<P_IN, P_OUT, R, S> parent,
+                   Spliterator<P_IN> spliterator) {
+            super(parent, spliterator);
+            this.op = parent.op;
+        }
+
+        @Override
+        protected ReduceTask<P_IN, P_OUT, R, S> makeChild(Spliterator<P_IN> spliterator) {
+            return new ReduceTask<>(this, spliterator);
+        }
+
+        @Override
+        protected S doLeaf() {
+            return helper.wrapAndCopyInto(op.makeSink(), spliterator);
+        }
+
+        @Override
+        public void onCompletion(CountedCompleter caller) {
+            if (!isLeaf()) {
+                S leftResult = leftChild.getLocalResult();
+                leftResult.combine(rightChild.getLocalResult());
+                setLocalResult(leftResult);
+            }
+            // GC spliterator, left and right child
+            super.onCompletion(caller);
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/ReferencePipeline.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,632 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+import java.util.Comparator;
+import java.util.Comparators;
+import java.util.Iterator;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.BinaryOperator;
+import java.util.function.Consumer;
+import java.util.function.DoubleConsumer;
+import java.util.function.Function;
+import java.util.function.IntConsumer;
+import java.util.function.IntFunction;
+import java.util.function.LongConsumer;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.function.ToDoubleFunction;
+import java.util.function.ToIntFunction;
+import java.util.function.ToLongFunction;
+
+/**
+ * Abstract base class for an intermediate pipeline stage or pipeline source
+ * stage implementing whose elements are of type {@code U}.
+ *
+ * @param <P_IN> type of elements in the upstream source
+ * @param <P_OUT> type of elements in produced by this stage
+ *
+ * @since 1.8
+ */
+abstract class ReferencePipeline<P_IN, P_OUT>
+        extends AbstractPipeline<P_IN, P_OUT, Stream<P_OUT>>
+        implements Stream<P_OUT>  {
+
+    /**
+     * Constructor for the head of a stream pipeline.
+     *
+     * @param source {@code Supplier<Spliterator>} describing the stream source
+     * @param sourceFlags the source flags for the stream source, described in
+     *        {@link StreamOpFlag}
+     * @param parallel {@code true} if the pipeline is parallel
+     */
+    ReferencePipeline(Supplier<? extends Spliterator<?>> source,
+                      int sourceFlags, boolean parallel) {
+        super(source, sourceFlags, parallel);
+    }
+
+    /**
+     * Constructor for the head of a stream pipeline.
+     *
+     * @param source {@code Spliterator} describing the stream source
+     * @param sourceFlags The source flags for the stream source, described in
+     *        {@link StreamOpFlag}
+     * @param parallel {@code true} if the pipeline is parallel
+     */
+    ReferencePipeline(Spliterator<?> source,
+                      int sourceFlags, boolean parallel) {
+        super(source, sourceFlags, parallel);
+    }
+
+    /**
+     * Constructor for appending an intermediate operation onto an existing
+     * pipeline.
+     *
+     * @param upstream the upstream element source.
+     */
+    ReferencePipeline(AbstractPipeline<?, P_IN, ?> upstream, int opFlags) {
+        super(upstream, opFlags);
+    }
+
+    // Shape-specific methods
+
+    @Override
+    final StreamShape getOutputShape() {
+        return StreamShape.REFERENCE;
+    }
+
+    @Override
+    final <P_IN> Node<P_OUT> evaluateToNode(PipelineHelper<P_OUT> helper,
+                                        Spliterator<P_IN> spliterator,
+                                        boolean flattenTree,
+                                        IntFunction<P_OUT[]> generator) {
+        return Nodes.collect(helper, spliterator, flattenTree, generator);
+    }
+
+    @Override
+    final <P_IN> Spliterator<P_OUT> wrap(PipelineHelper<P_OUT> ph,
+                                     Supplier<Spliterator<P_IN>> supplier,
+                                     boolean isParallel) {
+        return new StreamSpliterators.WrappingSpliterator<>(ph, supplier, isParallel);
+    }
+
+    @Override
+    final Spliterator<P_OUT> lazySpliterator(Supplier<? extends Spliterator<P_OUT>> supplier) {
+        return new StreamSpliterators.DelegatingSpliterator<>(supplier);
+    }
+
+    @Override
+    final void forEachWithCancel(Spliterator<P_OUT> spliterator, Sink<P_OUT> sink) {
+        do { } while (!sink.cancellationRequested() && spliterator.tryAdvance(sink));
+    }
+
+    @Override
+    final Node.Builder<P_OUT> makeNodeBuilder(long exactSizeIfKnown, IntFunction<P_OUT[]> generator) {
+        return Nodes.builder(exactSizeIfKnown, generator);
+    }
+
+
+    // BaseStream
+
+    @Override
+    public final Iterator<P_OUT> iterator() {
+        return Spliterators.iteratorFromSpliterator(spliterator());
+    }
+
+
+    // Stream
+
+    // Stateless intermediate operations from Stream
+
+    @Override
+    public Stream<P_OUT> unordered() {
+        if (!isOrdered())
+            return this;
+        return new StatelessOp<P_OUT, P_OUT>(this, StreamShape.REFERENCE, StreamOpFlag.NOT_ORDERED) {
+            @Override
+            Sink<P_OUT> opWrapSink(int flags, Sink<P_OUT> sink) {
+                return sink;
+            }
+        };
+    }
+
+    @Override
+    public final Stream<P_OUT> filter(Predicate<? super P_OUT> predicate) {
+        Objects.requireNonNull(predicate);
+        return new StatelessOp<P_OUT, P_OUT>(this, StreamShape.REFERENCE,
+                                     StreamOpFlag.NOT_SIZED) {
+            @Override
+            Sink<P_OUT> opWrapSink(int flags, Sink<P_OUT> sink) {
+                return new Sink.ChainedReference<P_OUT>(sink) {
+                    @Override
+                    public void accept(P_OUT u) {
+                        if (predicate.test(u))
+                            downstream.accept(u);
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final <R> Stream<R> map(Function<? super P_OUT, ? extends R> mapper) {
+        Objects.requireNonNull(mapper);
+        return new StatelessOp<P_OUT, R>(this, StreamShape.REFERENCE,
+                                     StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<P_OUT> opWrapSink(int flags, Sink<R> sink) {
+                return new Sink.ChainedReference<P_OUT>(sink) {
+                    @Override
+                    public void accept(P_OUT u) {
+                        downstream.accept(mapper.apply(u));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final IntStream mapToInt(ToIntFunction<? super P_OUT> mapper) {
+        Objects.requireNonNull(mapper);
+        return new IntPipeline.StatelessOp<P_OUT>(this, StreamShape.REFERENCE,
+                                              StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<P_OUT> opWrapSink(int flags, Sink<Integer> sink) {
+                return new Sink.ChainedReference<P_OUT>(sink) {
+                    @Override
+                    public void accept(P_OUT u) {
+                        downstream.accept(mapper.applyAsInt(u));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final LongStream mapToLong(ToLongFunction<? super P_OUT> mapper) {
+        Objects.requireNonNull(mapper);
+        return new LongPipeline.StatelessOp<P_OUT>(this, StreamShape.REFERENCE,
+                                      StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<P_OUT> opWrapSink(int flags, Sink<Long> sink) {
+                return new Sink.ChainedReference<P_OUT>(sink) {
+                    @Override
+                    public void accept(P_OUT u) {
+                        downstream.accept(mapper.applyAsLong(u));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final DoubleStream mapToDouble(ToDoubleFunction<? super P_OUT> mapper) {
+        Objects.requireNonNull(mapper);
+        return new DoublePipeline.StatelessOp<P_OUT>(this, StreamShape.REFERENCE,
+                                        StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT) {
+            @Override
+            Sink<P_OUT> opWrapSink(int flags, Sink<Double> sink) {
+                return new Sink.ChainedReference<P_OUT>(sink) {
+                    @Override
+                    public void accept(P_OUT u) {
+                        downstream.accept(mapper.applyAsDouble(u));
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final <R> Stream<R> flatMap(Function<? super P_OUT, ? extends Stream<? extends R>> mapper) {
+        Objects.requireNonNull(mapper);
+        // We can do better than this, by polling cancellationRequested when stream is infinite
+        return new StatelessOp<P_OUT, R>(this, StreamShape.REFERENCE,
+                                     StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
+            @Override
+            Sink<P_OUT> opWrapSink(int flags, Sink<R> sink) {
+                return new Sink.ChainedReference<P_OUT>(sink) {
+                    public void accept(P_OUT u) {
+                        // We can do better that this too; optimize for depth=0 case and just grab spliterator and forEach it
+                        Stream<? extends R> result = mapper.apply(u);
+                        if (result != null)
+                            result.sequential().forEach(downstream);
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final IntStream flatMapToInt(Function<? super P_OUT, ? extends IntStream> mapper) {
+        Objects.requireNonNull(mapper);
+        // We can do better than this, by polling cancellationRequested when stream is infinite
+        return new IntPipeline.StatelessOp<P_OUT>(this, StreamShape.REFERENCE,
+                                              StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
+            @Override
+            Sink<P_OUT> opWrapSink(int flags, Sink<Integer> sink) {
+                return new Sink.ChainedReference<P_OUT>(sink) {
+                    IntConsumer downstreamAsInt = downstream::accept;
+                    public void accept(P_OUT u) {
+                        // We can do better that this too; optimize for depth=0 case and just grab spliterator and forEach it
+                        IntStream result = mapper.apply(u);
+                        if (result != null)
+                            result.sequential().forEach(downstreamAsInt);
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final DoubleStream flatMapToDouble(Function<? super P_OUT, ? extends DoubleStream> mapper) {
+        Objects.requireNonNull(mapper);
+        // We can do better than this, by polling cancellationRequested when stream is infinite
+        return new DoublePipeline.StatelessOp<P_OUT>(this, StreamShape.REFERENCE,
+                                                     StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
+            @Override
+            Sink<P_OUT> opWrapSink(int flags, Sink<Double> sink) {
+                return new Sink.ChainedReference<P_OUT>(sink) {
+                    DoubleConsumer downstreamAsDouble = downstream::accept;
+                    public void accept(P_OUT u) {
+                        // We can do better that this too; optimize for depth=0 case and just grab spliterator and forEach it
+                        DoubleStream result = mapper.apply(u);
+                        if (result != null)
+                            result.sequential().forEach(downstreamAsDouble);
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final LongStream flatMapToLong(Function<? super P_OUT, ? extends LongStream> mapper) {
+        Objects.requireNonNull(mapper);
+        // We can do better than this, by polling cancellationRequested when stream is infinite
+        return new LongPipeline.StatelessOp<P_OUT>(this, StreamShape.REFERENCE,
+                                                   StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
+            @Override
+            Sink<P_OUT> opWrapSink(int flags, Sink<Long> sink) {
+                return new Sink.ChainedReference<P_OUT>(sink) {
+                    LongConsumer downstreamAsLong = downstream::accept;
+                    public void accept(P_OUT u) {
+                        // We can do better that this too; optimize for depth=0 case and just grab spliterator and forEach it
+                        LongStream result = mapper.apply(u);
+                        if (result != null)
+                            result.sequential().forEach(downstreamAsLong);
+                    }
+                };
+            }
+        };
+    }
+
+    @Override
+    public final Stream<P_OUT> peek(Consumer<? super P_OUT> tee) {
+        Objects.requireNonNull(tee);
+        return new StatelessOp<P_OUT, P_OUT>(this, StreamShape.REFERENCE,
+                                     0) {
+            @Override
+            Sink<P_OUT> opWrapSink(int flags, Sink<P_OUT> sink) {
+                return new Sink.ChainedReference<P_OUT>(sink) {
+                    @Override
+                    public void accept(P_OUT u) {
+                        tee.accept(u);
+                        downstream.accept(u);
+                    }
+                };
+            }
+        };
+    }
+
+    // Stateful intermediate operations from Stream
+
+    @Override
+    public final Stream<P_OUT> distinct() {
+        return DistinctOps.makeRef(this);
+    }
+
+    @Override
+    public final Stream<P_OUT> sorted() {
+        return SortedOps.makeRef(this);
+    }
+
+    @Override
+    public final Stream<P_OUT> sorted(Comparator<? super P_OUT> comparator) {
+        return SortedOps.makeRef(this, comparator);
+    }
+
+    private Stream<P_OUT> slice(long skip, long limit) {
+        return SliceOps.makeRef(this, skip, limit);
+    }
+
+    @Override
+    public final Stream<P_OUT> limit(long maxSize) {
+        if (maxSize < 0)
+            throw new IllegalArgumentException(Long.toString(maxSize));
+        return slice(0, maxSize);
+    }
+
+    @Override
+    public final Stream<P_OUT> substream(long startingOffset) {
+        if (startingOffset < 0)
+            throw new IllegalArgumentException(Long.toString(startingOffset));
+        if (startingOffset == 0)
+            return this;
+        else
+            return slice(startingOffset, -1);
+    }
+
+    @Override
+    public final Stream<P_OUT> substream(long startingOffset, long endingOffset) {
+        if (startingOffset < 0 || endingOffset < startingOffset)
+            throw new IllegalArgumentException(String.format("substream(%d, %d)", startingOffset, endingOffset));
+        return slice(startingOffset, endingOffset - startingOffset);
+    }
+
+    // Terminal operations from Stream
+
+    @Override
+    public void forEach(Consumer<? super P_OUT> action) {
+        evaluate(ForEachOps.makeRef(action, false));
+    }
+
+    @Override
+    public void forEachOrdered(Consumer<? super P_OUT> action) {
+        evaluate(ForEachOps.makeRef(action, true));
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public final <A> A[] toArray(IntFunction<A[]> generator) {
+        // Since A has no relation to U (not possible to declare that A is an upper bound of U)
+        // there will be no static type checking.
+        // Therefore use a raw type and assume A == U rather than propagating the separation of A and U
+        // throughout the code-base.
+        // The runtime type of U is never checked for equality with the component type of the runtime type of A[].
+        // Runtime checking will be performed when an element is stored in A[], thus if A is not a
+        // super type of U an ArrayStoreException will be thrown.
+        IntFunction rawGenerator = (IntFunction) generator;
+        return (A[]) Nodes.flatten(evaluateToArrayNode(rawGenerator), rawGenerator)
+                              .asArray(rawGenerator);
+    }
+
+    @Override
+    public final Object[] toArray() {
+        return toArray(Object[]::new);
+    }
+
+    @Override
+    public final boolean anyMatch(Predicate<? super P_OUT> predicate) {
+        return evaluate(MatchOps.makeRef(predicate, MatchOps.MatchKind.ANY));
+    }
+
+    @Override
+    public final boolean allMatch(Predicate<? super P_OUT> predicate) {
+        return evaluate(MatchOps.makeRef(predicate, MatchOps.MatchKind.ALL));
+    }
+
+    @Override
+    public final boolean noneMatch(Predicate<? super P_OUT> predicate) {
+        return evaluate(MatchOps.makeRef(predicate, MatchOps.MatchKind.NONE));
+    }
+
+    @Override
+    public final Optional<P_OUT> findFirst() {
+        return evaluate(FindOps.makeRef(true));
+    }
+
+    @Override
+    public final Optional<P_OUT> findAny() {
+        return evaluate(FindOps.makeRef(false));
+    }
+
+    @Override
+    public final P_OUT reduce(final P_OUT identity, final BinaryOperator<P_OUT> accumulator) {
+        return evaluate(ReduceOps.makeRef(identity, accumulator, accumulator));
+    }
+
+    @Override
+    public final Optional<P_OUT> reduce(BinaryOperator<P_OUT> accumulator) {
+        return evaluate(ReduceOps.makeRef(accumulator));
+    }
+
+    @Override
+    public final <R> R reduce(R identity, BiFunction<R, ? super P_OUT, R> accumulator, BinaryOperator<R> combiner) {
+        return evaluate(ReduceOps.makeRef(identity, accumulator, combiner));
+    }
+
+    @Override
+    public final <R> R collect(Collector<? super P_OUT, R> collector) {
+        if (isParallel()
+                && (collector.characteristics().contains(Collector.Characteristics.CONCURRENT))
+                && (!isOrdered() || collector.characteristics().contains(Collector.Characteristics.UNORDERED))) {
+            R container = collector.resultSupplier().get();
+            BiFunction<R, ? super P_OUT, R> accumulator = collector.accumulator();
+            forEach(u -> accumulator.apply(container, u));
+            return container;
+        }
+        return evaluate(ReduceOps.makeRef(collector));
+    }
+
+    @Override
+    public final <R> R collect(Supplier<R> resultFactory,
+                               BiConsumer<R, ? super P_OUT> accumulator,
+                               BiConsumer<R, R> combiner) {
+        return evaluate(ReduceOps.makeRef(resultFactory, accumulator, combiner));
+    }
+
+    @Override
+    public final Optional<P_OUT> max(Comparator<? super P_OUT> comparator) {
+        return reduce(Comparators.greaterOf(comparator));
+    }
+
+    @Override
+    public final Optional<P_OUT> min(Comparator<? super P_OUT> comparator) {
+        return reduce(Comparators.lesserOf(comparator));
+
+    }
+
+    @Override
+    public final long count() {
+        return mapToLong(e -> 1L).sum();
+    }
+
+
+    //
+
+    /**
+     * Source stage of a ReferencePipeline.
+     *
+     * @param <E_IN> type of elements in the upstream source
+     * @param <E_OUT> type of elements in produced by this stage
+     * @since 1.8
+     */
+    static class Head<E_IN, E_OUT> extends ReferencePipeline<E_IN, E_OUT> {
+        /**
+         * Constructor for the source stage of a Stream.
+         *
+         * @param source {@code Supplier<Spliterator>} describing the stream
+         *               source
+         * @param sourceFlags the source flags for the stream source, described
+         *                    in {@link StreamOpFlag}
+         */
+        Head(Supplier<? extends Spliterator<?>> source,
+             int sourceFlags, boolean parallel) {
+            super(source, sourceFlags, parallel);
+        }
+
+        /**
+         * Constructor for the source stage of a Stream.
+         *
+         * @param source {@code Spliterator} describing the stream source
+         * @param sourceFlags the source flags for the stream source, described
+         *                    in {@link StreamOpFlag}
+         */
+        Head(Spliterator<?> source,
+             int sourceFlags, boolean parallel) {
+            super(source, sourceFlags, parallel);
+        }
+
+        @Override
+        final boolean opIsStateful() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        final Sink<E_IN> opWrapSink(int flags, Sink<E_OUT> sink) {
+            throw new UnsupportedOperationException();
+        }
+
+        // Optimized sequential terminal operations for the head of the pipeline
+
+        @Override
+        public void forEach(Consumer<? super E_OUT> action) {
+            if (!isParallel()) {
+                sourceStageSpliterator().forEachRemaining(action);
+            }
+            else {
+                super.forEach(action);
+            }
+        }
+
+        @Override
+        public void forEachOrdered(Consumer<? super E_OUT> action) {
+            if (!isParallel()) {
+                sourceStageSpliterator().forEachRemaining(action);
+            }
+            else {
+                super.forEachOrdered(action);
+            }
+        }
+    }
+
+    /**
+     * Base class for a stateless intermediate stage of a Stream.
+     *
+     * @param <E_IN> type of elements in the upstream source
+     * @param <E_OUT> type of elements in produced by this stage
+     * @since 1.8
+     */
+    abstract static class StatelessOp<E_IN, E_OUT>
+            extends ReferencePipeline<E_IN, E_OUT> {
+        /**
+         * Construct a new Stream by appending a stateless intermediate
+         * operation to an existing stream.
+         *
+         * @param upstream The upstream pipeline stage
+         * @param inputShape The stream shape for the upstream pipeline stage
+         * @param opFlags Operation flags for the new stage
+         */
+        StatelessOp(AbstractPipeline<?, E_IN, ?> upstream,
+                    StreamShape inputShape,
+                    int opFlags) {
+            super(upstream, opFlags);
+            assert upstream.getOutputShape() == inputShape;
+        }
+
+        @Override
+        final boolean opIsStateful() {
+            return false;
+        }
+    }
+
+    /**
+     * Base class for a stateful intermediate stage of a Stream.
+     *
+     * @param <E_IN> type of elements in the upstream source
+     * @param <E_OUT> type of elements in produced by this stage
+     * @since 1.8
+     */
+    abstract static class StatefulOp<E_IN, E_OUT>
+            extends ReferencePipeline<E_IN, E_OUT> {
+        /**
+         * Construct a new Stream by appending a stateful intermediate operation
+         * to an existing stream.
+         * @param upstream The upstream pipeline stage
+         * @param inputShape The stream shape for the upstream pipeline stage
+         * @param opFlags Operation flags for the new stage
+         */
+        StatefulOp(AbstractPipeline<?, E_IN, ?> upstream,
+                   StreamShape inputShape,
+                   int opFlags) {
+            super(upstream, opFlags);
+            assert upstream.getOutputShape() == inputShape;
+        }
+
+        @Override
+        final boolean opIsStateful() {
+            return true;
+        }
+
+        @Override
+        abstract <P_IN> Node<E_OUT> opEvaluateParallel(PipelineHelper<E_OUT> helper,
+                                                       Spliterator<P_IN> spliterator,
+                                                       IntFunction<E_OUT[]> generator);
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/SliceOps.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,511 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Spliterator;
+import java.util.concurrent.CountedCompleter;
+import java.util.function.IntFunction;
+
+/**
+ * Factory for instances of a short-circuiting stateful intermediate operations
+ * that produce subsequences of their input stream.
+ *
+ * @since 1.8
+ */
+final class SliceOps {
+
+    // No instances
+    private SliceOps() { }
+
+    /**
+     * Appends a "slice" operation to the provided stream.  The slice operation
+     * may be may be skip-only, limit-only, or skip-and-limit.
+     *
+     * @param <T> the type of both input and output elements
+     * @param upstream a reference stream with element type T
+     * @param skip the number of elements to skip.  Must be >= 0.
+     * @param limit the maximum size of the resulting stream, or -1 if no limit
+     *        is to be imposed
+     */
+    public static <T> Stream<T> makeRef(AbstractPipeline<?, T, ?> upstream,
+                                       long skip, long limit) {
+        if (skip < 0)
+            throw new IllegalArgumentException("Skip must be non-negative: " + skip);
+
+        return new ReferencePipeline.StatefulOp<T,T>(upstream, StreamShape.REFERENCE,
+                                                     flags(limit)) {
+            @Override
+            <P_IN> Node<T> opEvaluateParallel(PipelineHelper<T> helper,
+                                              Spliterator<P_IN> spliterator,
+                                              IntFunction<T[]> generator) {
+                return new SliceTask<>(this, helper, spliterator, generator, skip, limit).invoke();
+            }
+
+            @Override
+            Sink<T> opWrapSink(int flags, Sink<T> sink) {
+                return new Sink.ChainedReference<T>(sink) {
+                    long n = skip;
+                    long m = limit >= 0 ? limit : Long.MAX_VALUE;
+
+                    @Override
+                    public void accept(T t) {
+                        if (n == 0) {
+                            if (m > 0) {
+                                m--;
+                                downstream.accept(t);
+                            }
+                        }
+                        else {
+                            n--;
+                        }
+                    }
+
+                    @Override
+                    public boolean cancellationRequested() {
+                        return m == 0 || downstream.cancellationRequested();
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Appends a "slice" operation to the provided IntStream.  The slice
+     * operation may be may be skip-only, limit-only, or skip-and-limit.
+     *
+     * @param upstream An IntStream
+     * @param skip The number of elements to skip.  Must be >= 0.
+     * @param limit The maximum size of the resulting stream, or -1 if no limit
+     *        is to be imposed
+     */
+    public static IntStream makeInt(AbstractPipeline<?, Integer, ?> upstream,
+                                    long skip, long limit) {
+        if (skip < 0)
+            throw new IllegalArgumentException("Skip must be non-negative: " + skip);
+
+        return new IntPipeline.StatefulOp<Integer>(upstream, StreamShape.INT_VALUE,
+                                                   flags(limit)) {
+            @Override
+            <P_IN> Node<Integer> opEvaluateParallel(PipelineHelper<Integer> helper,
+                                                    Spliterator<P_IN> spliterator,
+                                                    IntFunction<Integer[]> generator) {
+                return new SliceTask<>(this, helper, spliterator, generator, skip, limit).invoke();
+            }
+
+            @Override
+            Sink<Integer> opWrapSink(int flags, Sink<Integer> sink) {
+                return new Sink.ChainedInt(sink) {
+                    long n = skip;
+                    long m = limit >= 0 ? limit : Long.MAX_VALUE;
+
+                    @Override
+                    public void accept(int t) {
+                        if (n == 0) {
+                            if (m > 0) {
+                                m--;
+                                downstream.accept(t);
+                            }
+                        }
+                        else {
+                            n--;
+                        }
+                    }
+
+                    @Override
+                    public boolean cancellationRequested() {
+                        return m == 0 || downstream.cancellationRequested();
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Appends a "slice" operation to the provided LongStream.  The slice
+     * operation may be may be skip-only, limit-only, or skip-and-limit.
+     *
+     * @param upstream A LongStream
+     * @param skip The number of elements to skip.  Must be >= 0.
+     * @param limit The maximum size of the resulting stream, or -1 if no limit
+     *        is to be imposed
+     */
+    public static LongStream makeLong(AbstractPipeline<?, Long, ?> upstream,
+                                      long skip, long limit) {
+        if (skip < 0)
+            throw new IllegalArgumentException("Skip must be non-negative: " + skip);
+
+        return new LongPipeline.StatefulOp<Long>(upstream, StreamShape.LONG_VALUE,
+                                                 flags(limit)) {
+            @Override
+            <P_IN> Node<Long> opEvaluateParallel(PipelineHelper<Long> helper,
+                                                 Spliterator<P_IN> spliterator,
+                                                 IntFunction<Long[]> generator) {
+                return new SliceTask<>(this, helper, spliterator, generator, skip, limit).invoke();
+            }
+
+            @Override
+            Sink<Long> opWrapSink(int flags, Sink<Long> sink) {
+                return new Sink.ChainedLong(sink) {
+                    long n = skip;
+                    long m = limit >= 0 ? limit : Long.MAX_VALUE;
+
+                    @Override
+                    public void accept(long t) {
+                        if (n == 0) {
+                            if (m > 0) {
+                                m--;
+                                downstream.accept(t);
+                            }
+                        }
+                        else {
+                            n--;
+                        }
+                    }
+
+                    @Override
+                    public boolean cancellationRequested() {
+                        return m == 0 || downstream.cancellationRequested();
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Appends a "slice" operation to the provided DoubleStream.  The slice
+     * operation may be may be skip-only, limit-only, or skip-and-limit.
+     *
+     * @param upstream A DoubleStream
+     * @param skip The number of elements to skip.  Must be >= 0.
+     * @param limit The maximum size of the resulting stream, or -1 if no limit
+     *        is to be imposed
+     */
+    public static DoubleStream makeDouble(AbstractPipeline<?, Double, ?> upstream,
+                                          long skip, long limit) {
+        if (skip < 0)
+            throw new IllegalArgumentException("Skip must be non-negative: " + skip);
+
+        return new DoublePipeline.StatefulOp<Double>(upstream, StreamShape.DOUBLE_VALUE,
+                                                     flags(limit)) {
+            @Override
+            <P_IN> Node<Double> opEvaluateParallel(PipelineHelper<Double> helper,
+                                                   Spliterator<P_IN> spliterator,
+                                                   IntFunction<Double[]> generator) {
+                return new SliceTask<>(this, helper, spliterator, generator, skip, limit).invoke();
+            }
+
+            @Override
+            Sink<Double> opWrapSink(int flags, Sink<Double> sink) {
+                return new Sink.ChainedDouble(sink) {
+                    long n = skip;
+                    long m = limit >= 0 ? limit : Long.MAX_VALUE;
+
+                    @Override
+                    public void accept(double t) {
+                        if (n == 0) {
+                            if (m > 0) {
+                                m--;
+                                downstream.accept(t);
+                            }
+                        }
+                        else {
+                            n--;
+                        }
+                    }
+
+                    @Override
+                    public boolean cancellationRequested() {
+                        return m == 0 || downstream.cancellationRequested();
+                    }
+                };
+            }
+        };
+    }
+
+    private static int flags(long limit) {
+        return StreamOpFlag.NOT_SIZED | ((limit != -1) ? StreamOpFlag.IS_SHORT_CIRCUIT : 0);
+    }
+
+    // Parallel strategy -- two cases
+    // IF we have full size information
+    // - decompose, keeping track of each leaf's (offset, size)
+    // - calculate leaf only if intersection between (offset, size) and desired slice
+    // - Construct a Node containing the appropriate sections of the appropriate leaves
+    // IF we don't
+    // - decompose, and calculate size of each leaf
+    // - on complete of any node, compute completed initial size from the root, and if big enough, cancel later nodes
+    // - @@@ this can be significantly improved
+
+    // @@@ Currently we don't do the sized version at all
+
+    // @@@ Should take into account ORDERED flag; if not ORDERED, we can limit in temporal order instead
+
+    /**
+     * {@code ForkJoinTask} implementing slice computation.
+     *
+     * @param <P_IN> Input element type to the stream pipeline
+     * @param <P_OUT> Output element type from the stream pipeline
+     */
+    private static final class SliceTask<P_IN, P_OUT>
+            extends AbstractShortCircuitTask<P_IN, P_OUT, Node<P_OUT>, SliceTask<P_IN, P_OUT>> {
+        private final AbstractPipeline<P_OUT, P_OUT, ?> op;
+        private final IntFunction<P_OUT[]> generator;
+        private final long targetOffset, targetSize;
+        private long thisNodeSize;
+
+        private volatile boolean completed;
+
+        SliceTask(AbstractPipeline<?, P_OUT, ?> op,
+                  PipelineHelper<P_OUT> helper,
+                  Spliterator<P_IN> spliterator,
+                  IntFunction<P_OUT[]> generator,
+                  long offset, long size) {
+            super(helper, spliterator);
+            this.op = (AbstractPipeline<P_OUT, P_OUT, ?>) op;
+            this.generator = generator;
+            this.targetOffset = offset;
+            this.targetSize = size;
+        }
+
+        SliceTask(SliceTask<P_IN, P_OUT> parent, Spliterator<P_IN> spliterator) {
+            super(parent, spliterator);
+            this.op = parent.op;
+            this.generator = parent.generator;
+            this.targetOffset = parent.targetOffset;
+            this.targetSize = parent.targetSize;
+        }
+
+        @Override
+        protected SliceTask<P_IN, P_OUT> makeChild(Spliterator<P_IN> spliterator) {
+            return new SliceTask<>(this, spliterator);
+        }
+
+        @Override
+        protected final Node<P_OUT> getEmptyResult() {
+            return Nodes.emptyNode(op.getOutputShape());
+        }
+
+        @Override
+        protected final Node<P_OUT> doLeaf() {
+            if (isRoot()) {
+                long sizeIfKnown = StreamOpFlag.SIZED.isPreserved(op.sourceOrOpFlags)
+                                   ? op.exactOutputSizeIfKnown(spliterator)
+                                   : -1;
+                final Node.Builder<P_OUT> nb = op.makeNodeBuilder(sizeIfKnown, generator);
+                Sink<P_OUT> opSink = op.opWrapSink(op.sourceOrOpFlags, nb);
+
+                if (!StreamOpFlag.SHORT_CIRCUIT.isKnown(op.sourceOrOpFlags))
+                    helper.wrapAndCopyInto(opSink, spliterator);
+                else
+                    helper.copyIntoWithCancel(helper.wrapSink(opSink), spliterator);
+                return nb.build();
+            }
+            else {
+                Node<P_OUT> node = helper.wrapAndCopyInto(helper.makeNodeBuilder(-1, generator),
+                                                      spliterator).build();
+                thisNodeSize = node.count();
+                completed = true;
+                return node;
+            }
+        }
+
+        @Override
+        public final void onCompletion(CountedCompleter<?> caller) {
+            if (!isLeaf()) {
+                thisNodeSize = leftChild.thisNodeSize + rightChild.thisNodeSize;
+                completed = true;
+
+                if (isRoot()) {
+                    // Only collect nodes once absolute size information is known
+
+                    ArrayList<Node<P_OUT>> nodes = new ArrayList<>();
+                    visit(nodes, 0);
+                    Node<P_OUT> result;
+                    if (nodes.size() == 0)
+                        result = Nodes.emptyNode(op.getOutputShape());
+                    else if (nodes.size() == 1)
+                        result = nodes.get(0);
+                    else
+                        // This will create a tree of depth 1 and will not be a sub-tree
+                        // for leaf nodes within the require range
+                        result = Nodes.conc(op.getOutputShape(), nodes);
+                    setLocalResult(result);
+                }
+            }
+            if (targetSize >= 0) {
+                if (((SliceTask<P_IN, P_OUT>) getRoot()).leftSize() >= targetOffset + targetSize)
+                    cancelLaterNodes();
+            }
+            // Don't call super.onCompletion(), we don't look at the child nodes until farther up the tree
+        }
+
+        /** Compute the cumulative size of the longest leading prefix of completed children */
+        private long leftSize() {
+            if (completed)
+                return thisNodeSize;
+            else if (isLeaf())
+                return 0;
+            else {
+                long leftSize = 0;
+                for (SliceTask<P_IN, P_OUT> child = leftChild, p = null; child != p;
+                     p = child, child = rightChild) {
+                    if (child.completed)
+                        leftSize += child.thisNodeSize;
+                    else {
+                        leftSize += child.leftSize();
+                        break;
+                    }
+                }
+                return leftSize;
+            }
+        }
+
+        private void visit(List<Node<P_OUT>> results, int offset) {
+            if (!isLeaf()) {
+                for (SliceTask<P_IN, P_OUT> child = leftChild, p = null; child != p;
+                     p = child, child = rightChild) {
+                    child.visit(results, offset);
+                    offset += child.thisNodeSize;
+                }
+            }
+            else {
+                if (results.size() == 0) {
+                    if (offset + thisNodeSize >= targetOffset)
+                        results.add(truncateNode(getLocalResult(),
+                                                 Math.max(0, targetOffset - offset),
+                                                 targetSize >= 0 ? Math.max(0, offset + thisNodeSize - (targetOffset + targetSize)) : 0));
+                }
+                else {
+                    if (targetSize == -1 || offset < targetOffset + targetSize) {
+                        results.add(truncateNode(getLocalResult(),
+                                                 0,
+                                                 targetSize >= 0 ? Math.max(0, offset + thisNodeSize - (targetOffset + targetSize)) : 0));
+                    }
+                }
+            }
+        }
+
+        /**
+         * Return a new node describing the result of truncating an existing Node
+         * at the left and/or right.
+         */
+        private Node<P_OUT> truncateNode(Node<P_OUT> input,
+                                         long skipLeft, long skipRight) {
+            if (skipLeft == 0 && skipRight == 0)
+                return input;
+            else {
+                return Nodes.truncateNode(input, skipLeft, thisNodeSize - skipRight, generator);
+            }
+        }
+    }
+
+    // @@@ Currently unused -- optimization for when all sizes are known
+//    private static class SizedSliceTask<S, T> extends AbstractShortCircuitTask<S, T, Node<T>, SizedSliceTask<S, T>> {
+//        private final int targetOffset, targetSize;
+//        private final int offset, size;
+//
+//        private SizedSliceTask(ParallelPipelineHelper<S, T> helper, int offset, int size) {
+//            super(helper);
+//            targetOffset = offset;
+//            targetSize = size;
+//            this.offset = 0;
+//            this.size = spliterator.getSizeIfKnown();
+//        }
+//
+//        private SizedSliceTask(SizedSliceTask<S, T> parent, Spliterator<S> spliterator) {
+//            // Makes assumptions about order in which siblings are created and linked into parent!
+//            super(parent, spliterator);
+//            targetOffset = parent.targetOffset;
+//            targetSize = parent.targetSize;
+//            int siblingSizes = 0;
+//            for (SizedSliceTask<S, T> sibling = parent.children; sibling != null; sibling = sibling.nextSibling)
+//                siblingSizes += sibling.size;
+//            size = spliterator.getSizeIfKnown();
+//            offset = parent.offset + siblingSizes;
+//        }
+//
+//        @Override
+//        protected SizedSliceTask<S, T> makeChild(Spliterator<S> spliterator) {
+//            return new SizedSliceTask<>(this, spliterator);
+//        }
+//
+//        @Override
+//        protected Node<T> getEmptyResult() {
+//            return Nodes.emptyNode();
+//        }
+//
+//        @Override
+//        public boolean taskCanceled() {
+//            if (offset > targetOffset+targetSize || offset+size < targetOffset)
+//                return true;
+//            else
+//                return super.taskCanceled();
+//        }
+//
+//        @Override
+//        protected Node<T> doLeaf() {
+//            int skipLeft = Math.max(0, targetOffset - offset);
+//            int skipRight = Math.max(0, offset + size - (targetOffset + targetSize));
+//            if (skipLeft == 0 && skipRight == 0)
+//                return helper.into(Nodes.<T>makeBuilder(spliterator.getSizeIfKnown())).build();
+//            else {
+//                // If we're the first or last node that intersects the target range, peel off irrelevant elements
+//                int truncatedSize = size - skipLeft - skipRight;
+//                NodeBuilder<T> builder = Nodes.<T>makeBuilder(truncatedSize);
+//                Sink<S> wrappedSink = helper.wrapSink(builder);
+//                wrappedSink.begin(truncatedSize);
+//                Iterator<S> iterator = spliterator.iterator();
+//                for (int i=0; i<skipLeft; i++)
+//                    iterator.next();
+//                for (int i=0; i<truncatedSize; i++)
+//                    wrappedSink.apply(iterator.next());
+//                wrappedSink.end();
+//                return builder.build();
+//            }
+//        }
+//
+//        @Override
+//        public void onCompletion(CountedCompleter<?> caller) {
+//            if (!isLeaf()) {
+//                Node<T> result = null;
+//                for (SizedSliceTask<S, T> child = children.nextSibling; child != null; child = child.nextSibling) {
+//                    Node<T> childResult = child.getRawResult();
+//                    if (childResult == null)
+//                        continue;
+//                    else if (result == null)
+//                        result = childResult;
+//                    else
+//                        result = Nodes.node(result, childResult);
+//                }
+//                setRawResult(result);
+//                if (offset <= targetOffset && offset+size >= targetOffset+targetSize)
+//                    shortCircuit(result);
+//            }
+//        }
+//    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/SortedOps.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,547 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Comparators;
+import java.util.Objects;
+import java.util.Spliterator;
+import java.util.concurrent.ForkJoinTask;
+import java.util.function.IntFunction;
+
+
+/**
+ * Factory methods for transforming streams into sorted streams.
+ *
+ * @since 1.8
+ */
+final class SortedOps {
+
+    private SortedOps() { }
+
+    /**
+     * Appends a "sorted" operation to the provided stream.
+     *
+     * @param <T> the type of both input and output elements
+     * @param upstream a reference stream with element type T
+     */
+    static <T> Stream<T> makeRef(AbstractPipeline<?, T, ?> upstream) {
+        return new OfRef<>(upstream);
+    }
+
+    /**
+     * Appends a "sorted" operation to the provided stream.
+     *
+     * @param <T> the type of both input and output elements
+     * @param upstream a reference stream with element type T
+     * @param comparator the comparator to order elements by
+     */
+    static <T> Stream<T> makeRef(AbstractPipeline<?, T, ?> upstream,
+                                Comparator<? super T> comparator) {
+        return new OfRef<>(upstream, comparator);
+    }
+
+    /**
+     * Appends a "sorted" operation to the provided stream.
+     *
+     * @param <T> the type of both input and output elements
+     * @param upstream a reference stream with element type T
+     */
+    static <T> IntStream makeInt(AbstractPipeline<?, Integer, ?> upstream) {
+        return new OfInt(upstream);
+    }
+
+    /**
+     * Appends a "sorted" operation to the provided stream.
+     *
+     * @param <T> the type of both input and output elements
+     * @param upstream a reference stream with element type T
+     */
+    static <T> LongStream makeLong(AbstractPipeline<?, Long, ?> upstream) {
+        return new OfLong(upstream);
+    }
+
+    /**
+     * Appends a "sorted" operation to the provided stream.
+     *
+     * @param <T> the type of both input and output elements
+     * @param upstream a reference stream with element type T
+     */
+    static <T> DoubleStream makeDouble(AbstractPipeline<?, Double, ?> upstream) {
+        return new OfDouble(upstream);
+    }
+
+    /**
+     * Specialized subtype for sorting reference streams
+     */
+    private static final class OfRef<T> extends ReferencePipeline.StatefulOp<T, T> {
+        /**
+         * Comparator used for sorting
+         */
+        private final boolean isNaturalSort;
+        private final Comparator<? super T> comparator;
+
+        /**
+         * Sort using natural order of {@literal <T>} which must be
+         * {@code Comparable}.
+         */
+        OfRef(AbstractPipeline<?, T, ?> upstream) {
+            super(upstream, StreamShape.REFERENCE,
+                  StreamOpFlag.IS_ORDERED | StreamOpFlag.IS_SORTED);
+            this.isNaturalSort = true;
+            // Will throw CCE when we try to sort if T is not Comparable
+            this.comparator = (Comparator<? super T>) Comparators.naturalOrder();
+        }
+
+        /**
+         * Sort using the provided comparator.
+         *
+         * @param comparator The comparator to be used to evaluate ordering.
+         */
+        OfRef(AbstractPipeline<?, T, ?> upstream, Comparator<? super T> comparator) {
+            super(upstream, StreamShape.REFERENCE,
+                  StreamOpFlag.IS_ORDERED | StreamOpFlag.NOT_SORTED);
+            this.isNaturalSort = false;
+            this.comparator = Objects.requireNonNull(comparator);
+        }
+
+        @Override
+        public Sink<T> opWrapSink(int flags, Sink sink) {
+            Objects.requireNonNull(sink);
+
+            // If the input is already naturally sorted and this operation
+            // also naturally sorted then this is a no-op
+            if (StreamOpFlag.SORTED.isKnown(flags) && isNaturalSort)
+                return sink;
+            else if (StreamOpFlag.SIZED.isKnown(flags))
+                return new SizedRefSortingSink<>(sink, comparator);
+            else
+                return new RefSortingSink<>(sink, comparator);
+        }
+
+        @Override
+        public <P_IN> Node<T> opEvaluateParallel(PipelineHelper<T> helper,
+                                                 Spliterator<P_IN> spliterator,
+                                                 IntFunction<T[]> generator) {
+            // If the input is already naturally sorted and this operation
+            // naturally sorts then collect the output
+            if (StreamOpFlag.SORTED.isKnown(helper.getStreamAndOpFlags()) && isNaturalSort) {
+                return helper.evaluate(spliterator, false, generator);
+            }
+            else {
+                // @@@ Weak two-pass parallel implementation; parallel collect, parallel sort
+                T[] flattenedData = helper.evaluate(spliterator, true, generator).asArray(generator);
+                Arrays.parallelSort(flattenedData, comparator);
+                return Nodes.node(flattenedData);
+            }
+        }
+    }
+
+    /**
+     * Specialized subtype for sorting int streams.
+     */
+    private static final class OfInt extends IntPipeline.StatefulOp<Integer> {
+        OfInt(AbstractPipeline<?, Integer, ?> upstream) {
+            super(upstream, StreamShape.INT_VALUE,
+                  StreamOpFlag.IS_ORDERED | StreamOpFlag.IS_SORTED);
+        }
+
+        @Override
+        public Sink<Integer> opWrapSink(int flags, Sink sink) {
+            Objects.requireNonNull(sink);
+
+            if (StreamOpFlag.SORTED.isKnown(flags))
+                return sink;
+            else if (StreamOpFlag.SIZED.isKnown(flags))
+                return new SizedIntSortingSink(sink);
+            else
+                return new IntSortingSink(sink);
+        }
+
+        @Override
+        public <P_IN> Node<Integer> opEvaluateParallel(PipelineHelper<Integer> helper,
+                                                       Spliterator<P_IN> spliterator,
+                                                       IntFunction<Integer[]> generator) {
+            if (StreamOpFlag.SORTED.isKnown(helper.getStreamAndOpFlags())) {
+                return helper.evaluate(spliterator, false, generator);
+            }
+            else {
+                Node.OfInt n = (Node.OfInt) helper.evaluate(spliterator, true, generator);
+
+                int[] content = n.asIntArray();
+                Arrays.parallelSort(content);
+
+                return Nodes.node(content);
+            }
+        }
+    }
+
+    /**
+     * Specialized subtype for sorting long streams.
+     */
+    private static final class OfLong extends LongPipeline.StatefulOp<Long> {
+        OfLong(AbstractPipeline<?, Long, ?> upstream) {
+            super(upstream, StreamShape.LONG_VALUE,
+                  StreamOpFlag.IS_ORDERED | StreamOpFlag.IS_SORTED);
+        }
+
+        @Override
+        public Sink<Long> opWrapSink(int flags, Sink sink) {
+            Objects.requireNonNull(sink);
+
+            if (StreamOpFlag.SORTED.isKnown(flags))
+                return sink;
+            else if (StreamOpFlag.SIZED.isKnown(flags))
+                return new SizedLongSortingSink(sink);
+            else
+                return new LongSortingSink(sink);
+        }
+
+        @Override
+        public <P_IN> Node<Long> opEvaluateParallel(PipelineHelper<Long> helper,
+                                                    Spliterator<P_IN> spliterator,
+                                                    IntFunction<Long[]> generator) {
+            if (StreamOpFlag.SORTED.isKnown(helper.getStreamAndOpFlags())) {
+                return helper.evaluate(spliterator, false, generator);
+            }
+            else {
+                Node.OfLong n = (Node.OfLong) helper.evaluate(spliterator, true, generator);
+
+                long[] content = n.asLongArray();
+                Arrays.parallelSort(content);
+
+                return Nodes.node(content);
+            }
+        }
+    }
+
+    /**
+     * Specialized subtype for sorting double streams.
+     */
+    private static final class OfDouble extends DoublePipeline.StatefulOp<Double> {
+        OfDouble(AbstractPipeline<?, Double, ?> upstream) {
+            super(upstream, StreamShape.DOUBLE_VALUE,
+                  StreamOpFlag.IS_ORDERED | StreamOpFlag.IS_SORTED);
+        }
+
+        @Override
+        public Sink<Double> opWrapSink(int flags, Sink sink) {
+            Objects.requireNonNull(sink);
+
+            if (StreamOpFlag.SORTED.isKnown(flags))
+                return sink;
+            else if (StreamOpFlag.SIZED.isKnown(flags))
+                return new SizedDoubleSortingSink(sink);
+            else
+                return new DoubleSortingSink(sink);
+        }
+
+        @Override
+        public <P_IN> Node<Double> opEvaluateParallel(PipelineHelper<Double> helper,
+                                                      Spliterator<P_IN> spliterator,
+                                                      IntFunction<Double[]> generator) {
+            if (StreamOpFlag.SORTED.isKnown(helper.getStreamAndOpFlags())) {
+                return helper.evaluate(spliterator, false, generator);
+            }
+            else {
+                Node.OfDouble n = (Node.OfDouble) helper.evaluate(spliterator, true, generator);
+
+                double[] content = n.asDoubleArray();
+                Arrays.parallelSort(content);
+
+                return Nodes.node(content);
+            }
+        }
+    }
+
+    /**
+     * {@link ForkJoinTask} for implementing sort on SIZED reference streams.
+     */
+    private static final class SizedRefSortingSink<T> extends Sink.ChainedReference<T> {
+        private final Comparator<? super T> comparator;
+        private T[] array;
+        private int offset;
+
+        SizedRefSortingSink(Sink sink, Comparator<? super T> comparator) {
+            super(sink);
+            this.comparator = comparator;
+        }
+
+        @Override
+        public void begin(long size) {
+            if (size >= Nodes.MAX_ARRAY_SIZE)
+                throw new IllegalArgumentException("Stream size exceeds max array size");
+            array = (T[]) new Object[(int) size];
+        }
+
+        @Override
+        public void end() {
+            // Need to use offset rather than array.length since the downstream
+            // many be short-circuiting
+            // @@@ A better approach is to know if the downstream short-circuits
+            //     and check sink.cancellationRequested
+            Arrays.sort(array, 0, offset, comparator);
+            downstream.begin(offset);
+            for (int i = 0; i < offset; i++)
+                downstream.accept(array[i]);
+            downstream.end();
+            array = null;
+        }
+
+        @Override
+        public void accept(T t) {
+            array[offset++] = t;
+        }
+    }
+
+    /**
+     * {@link Sink} for implementing sort on reference streams.
+     */
+    private static final class RefSortingSink<T> extends Sink.ChainedReference<T> {
+        private final Comparator<? super T> comparator;
+        private ArrayList<T> list;
+
+        RefSortingSink(Sink sink, Comparator<? super T> comparator) {
+            super(sink);
+            this.comparator = comparator;
+        }
+
+        @Override
+        public void begin(long size) {
+            list = (size >= 0) ? new ArrayList<T>((int) size) : new ArrayList<T>();
+        }
+
+        @Override
+        public void end() {
+            list.sort(comparator);
+            downstream.begin(list.size());
+            list.forEach(downstream::accept);
+            downstream.end();
+            list = null;
+        }
+
+        @Override
+        public void accept(T t) {
+            list.add(t);
+        }
+    }
+
+    /**
+     * {@link Sink} for implementing sort on SIZED int streams.
+     */
+    private static final class SizedIntSortingSink extends Sink.ChainedInt {
+        private int[] array;
+        private int offset;
+
+        SizedIntSortingSink(Sink downstream) {
+            super(downstream);
+        }
+
+        @Override
+        public void begin(long size) {
+            if (size >= Nodes.MAX_ARRAY_SIZE)
+                throw new IllegalArgumentException("Stream size exceeds max array size");
+            array = new int[(int) size];
+        }
+
+        @Override
+        public void end() {
+            Arrays.sort(array, 0, offset);
+            downstream.begin(offset);
+            for (int i = 0; i < offset; i++)
+                downstream.accept(array[i]);
+            downstream.end();
+            array = null;
+        }
+
+        @Override
+        public void accept(int t) {
+            array[offset++] = t;
+        }
+    }
+
+    /**
+     * {@link Sink} for implementing sort on int streams.
+     */
+    private static final class IntSortingSink extends Sink.ChainedInt {
+        private SpinedBuffer.OfInt b;
+
+        IntSortingSink(Sink sink) {
+            super(sink);
+        }
+
+        @Override
+        public void begin(long size) {
+            b = (size > 0) ? new SpinedBuffer.OfInt((int) size) : new SpinedBuffer.OfInt();
+        }
+
+        @Override
+        public void end() {
+            int[] ints = b.asIntArray();
+            Arrays.sort(ints);
+            downstream.begin(ints.length);
+            for (int anInt : ints)
+                downstream.accept(anInt);
+            downstream.end();
+        }
+
+        @Override
+        public void accept(int t) {
+            b.accept(t);
+        }
+    }
+
+    /**
+     * {@link Sink} for implementing sort on SIZED long streams.
+     */
+    private static final class SizedLongSortingSink extends Sink.ChainedLong {
+        private long[] array;
+        private int offset;
+
+        SizedLongSortingSink(Sink downstream) {
+            super(downstream);
+        }
+
+        @Override
+        public void begin(long size) {
+            if (size >= Nodes.MAX_ARRAY_SIZE)
+                throw new IllegalArgumentException("Stream size exceeds max array size");
+            array = new long[(int) size];
+        }
+
+        @Override
+        public void end() {
+            Arrays.sort(array, 0, offset);
+            downstream.begin(offset);
+            for (int i = 0; i < offset; i++)
+                downstream.accept(array[i]);
+            downstream.end();
+            array = null;
+        }
+
+        @Override
+        public void accept(long t) {
+            array[offset++] = t;
+        }
+    }
+
+    /**
+     * {@link Sink} for implementing sort on long streams.
+     */
+    private static final class LongSortingSink extends Sink.ChainedLong {
+        private SpinedBuffer.OfLong b;
+
+        LongSortingSink(Sink sink) {
+            super(sink);
+        }
+
+        @Override
+        public void begin(long size) {
+            b = (size > 0) ? new SpinedBuffer.OfLong((int) size) : new SpinedBuffer.OfLong();
+        }
+
+        @Override
+        public void end() {
+            long[] longs = b.asLongArray();
+            Arrays.sort(longs);
+            downstream.begin(longs.length);
+            for (long aLong : longs)
+                downstream.accept(aLong);
+            downstream.end();
+        }
+
+        @Override
+        public void accept(long t) {
+            b.accept(t);
+        }
+    }
+
+    /**
+     * {@link Sink} for implementing sort on SIZED double streams.
+     */
+    private static final class SizedDoubleSortingSink extends Sink.ChainedDouble {
+        private double[] array;
+        private int offset;
+
+        SizedDoubleSortingSink(Sink downstream) {
+            super(downstream);
+        }
+
+        @Override
+        public void begin(long size) {
+            if (size >= Nodes.MAX_ARRAY_SIZE)
+                throw new IllegalArgumentException("Stream size exceeds max array size");
+            array = new double[(int) size];
+        }
+
+        @Override
+        public void end() {
+            Arrays.sort(array, 0, offset);
+            downstream.begin(offset);
+            for (int i = 0; i < offset; i++)
+                downstream.accept(array[i]);
+            downstream.end();
+            array = null;
+        }
+
+        @Override
+        public void accept(double t) {
+            array[offset++] = t;
+        }
+    }
+
+    /**
+     * {@link Sink} for implementing sort on double streams.
+     */
+    private static final class DoubleSortingSink extends Sink.ChainedDouble {
+        private SpinedBuffer.OfDouble b;
+
+        DoubleSortingSink(Sink sink) {
+            super(sink);
+        }
+
+        @Override
+        public void begin(long size) {
+            b = (size > 0) ? new SpinedBuffer.OfDouble((int) size) : new SpinedBuffer.OfDouble();
+        }
+
+        @Override
+        public void end() {
+            double[] doubles = b.asDoubleArray();
+            Arrays.sort(doubles);
+            downstream.begin(doubles.length);
+            for (double aDouble : doubles)
+                downstream.accept(aDouble);
+            downstream.end();
+        }
+
+        @Override
+        public void accept(double t) {
+            b.accept(t);
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/SpinedBuffer.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,958 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.PrimitiveIterator;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.function.Consumer;
+import java.util.function.DoubleConsumer;
+import java.util.function.IntConsumer;
+import java.util.function.IntFunction;
+import java.util.function.LongConsumer;
+
+/**
+ * An ordered collection of elements.  Elements can be added, but not removed.
+ * Goes through a building phase, during which elements can be added, and a
+ * traversal phase, during which elements can be traversed in order but no
+ * further modifications are possible.
+ *
+ * <p> One or more arrays are used to store elements. The use of a multiple
+ * arrays has better performance characteristics than a single array used by
+ * {@link ArrayList}, as when the capacity of the list needs to be increased
+ * no copying of elements is required.  This is usually beneficial in the case
+ * where the results will be traversed a small number of times.
+ *
+ * @param <E> the type of elements in this list
+ * @since 1.8
+ */
+class SpinedBuffer<E>
+        extends AbstractSpinedBuffer
+        implements Consumer<E>, Iterable<E> {
+
+    /*
+     * We optimistically hope that all the data will fit into the first chunk,
+     * so we try to avoid inflating the spine[] and priorElementCount[] arrays
+     * prematurely.  So methods must be prepared to deal with these arrays being
+     * null.  If spine is non-null, then spineIndex points to the current chunk
+     * within the spine, otherwise it is zero.  The spine and priorElementCount
+     * arrays are always the same size, and for any i <= spineIndex,
+     * priorElementCount[i] is the sum of the sizes of all the prior chunks.
+     *
+     * The curChunk pointer is always valid.  The elementIndex is the index of
+     * the next element to be written in curChunk; this may be past the end of
+     * curChunk so we have to check before writing. When we inflate the spine
+     * array, curChunk becomes the first element in it.  When we clear the
+     * buffer, we discard all chunks except the first one, which we clear,
+     * restoring it to the initial single-chunk state.
+     */
+
+    /**
+     * Chunk that we're currently writing into; may or may not be aliased with
+     * the first element of the spine.
+     */
+    protected E[] curChunk;
+
+    /**
+     * All chunks, or null if there is only one chunk.
+     */
+    protected E[][] spine;
+
+    /**
+     * Constructs an empty list with the specified initial capacity.
+     *
+     * @param  initialCapacity  the initial capacity of the list
+     * @throws IllegalArgumentException if the specified initial capacity
+     *         is negative
+     */
+    SpinedBuffer(int initialCapacity) {
+        super(initialCapacity);
+        curChunk = (E[]) new Object[1 << initialChunkPower];
+    }
+
+    /**
+     * Constructs an empty list with an initial capacity of sixteen.
+     */
+    SpinedBuffer() {
+        super();
+        curChunk = (E[]) new Object[1 << initialChunkPower];
+    }
+
+    /**
+     * Returns the current capacity of the buffer
+     */
+    protected long capacity() {
+        return (spineIndex == 0)
+               ? curChunk.length
+               : priorElementCount[spineIndex] + spine[spineIndex].length;
+    }
+
+    private void inflateSpine() {
+        if (spine == null) {
+            spine = (E[][]) new Object[MIN_SPINE_SIZE][];
+            priorElementCount = new long[MIN_SPINE_SIZE];
+            spine[0] = curChunk;
+        }
+    }
+
+    /**
+     * Ensure that the buffer has at least capacity to hold the target size
+     */
+    protected final void ensureCapacity(long targetSize) {
+        long capacity = capacity();
+        if (targetSize > capacity) {
+            inflateSpine();
+            for (int i=spineIndex+1; targetSize > capacity; i++) {
+                if (i >= spine.length) {
+                    int newSpineSize = spine.length * 2;
+                    spine = Arrays.copyOf(spine, newSpineSize);
+                    priorElementCount = Arrays.copyOf(priorElementCount, newSpineSize);
+                }
+                int nextChunkSize = chunkSize(i);
+                spine[i] = (E[]) new Object[nextChunkSize];
+                priorElementCount[i] = priorElementCount[i-1] + spine[i-1].length;
+                capacity += nextChunkSize;
+            }
+        }
+    }
+
+    /**
+     * Force the buffer to increase its capacity.
+     */
+    protected void increaseCapacity() {
+        ensureCapacity(capacity() + 1);
+    }
+
+    /**
+     * Retrieve the element at the specified index.
+     */
+    public E get(long index) {
+        // @@@ can further optimize by caching last seen spineIndex,
+        // which is going to be right most of the time
+        if (spineIndex == 0) {
+            if (index < elementIndex)
+                return curChunk[((int) index)];
+            else
+                throw new IndexOutOfBoundsException(Long.toString(index));
+        }
+
+        if (index >= count())
+            throw new IndexOutOfBoundsException(Long.toString(index));
+
+        for (int j=0; j <= spineIndex; j++)
+            if (index < priorElementCount[j] + spine[j].length)
+                return spine[j][((int) (index - priorElementCount[j]))];
+
+        throw new IndexOutOfBoundsException(Long.toString(index));
+    }
+
+    /**
+     * Copy the elements, starting at the specified offset, into the specified
+     * array.
+     */
+    public void copyInto(E[] array, int offset) {
+        long finalOffset = offset + count();
+        if (finalOffset > array.length || finalOffset < offset) {
+            throw new IndexOutOfBoundsException("does not fit");
+        }
+
+        if (spineIndex == 0)
+            System.arraycopy(curChunk, 0, array, offset, elementIndex);
+        else {
+            // full chunks
+            for (int i=0; i < spineIndex; i++) {
+                System.arraycopy(spine[i], 0, array, offset, spine[i].length);
+                offset += spine[i].length;
+            }
+            if (elementIndex > 0)
+                System.arraycopy(curChunk, 0, array, offset, elementIndex);
+        }
+    }
+
+    /**
+     * Create a new array using the specified array factory, and copy the
+     * elements into it.
+     */
+    public E[] asArray(IntFunction<E[]> arrayFactory) {
+        // @@@ will fail for size == MAX_VALUE
+        E[] result = arrayFactory.apply((int) count());
+
+        copyInto(result, 0);
+
+        return result;
+    }
+
+    @Override
+    public void clear() {
+        if (spine != null) {
+            curChunk = spine[0];
+            for (int i=0; i<curChunk.length; i++)
+                curChunk[i] = null;
+            spine = null;
+            priorElementCount = null;
+        }
+        else {
+            for (int i=0; i<elementIndex; i++)
+                curChunk[i] = null;
+        }
+        elementIndex = 0;
+        spineIndex = 0;
+    }
+
+    @Override
+    public Iterator<E> iterator() {
+        return Spliterators.iteratorFromSpliterator(spliterator());
+    }
+
+    @Override
+    public void forEach(Consumer<? super E> consumer) {
+        // completed chunks, if any
+        for (int j = 0; j < spineIndex; j++)
+            for (E t : spine[j])
+                consumer.accept(t);
+
+        // current chunk
+        for (int i=0; i<elementIndex; i++)
+            consumer.accept(curChunk[i]);
+    }
+
+    @Override
+    public void accept(E e) {
+        if (elementIndex == curChunk.length) {
+            inflateSpine();
+            if (spineIndex+1 >= spine.length || spine[spineIndex+1] == null)
+                increaseCapacity();
+            elementIndex = 0;
+            ++spineIndex;
+            curChunk = spine[spineIndex];
+        }
+        curChunk[elementIndex++] = e;
+    }
+
+    @Override
+    public String toString() {
+        List<E> list = new ArrayList<>();
+        forEach(list::add);
+        return "SpinedBuffer:" + list.toString();
+    }
+
+    private static final int SPLITERATOR_CHARACTERISTICS
+            = Spliterator.SIZED | Spliterator.ORDERED | Spliterator.SUBSIZED;
+
+    /**
+     * Return a {@link Spliterator} describing the contents of the buffer.
+     */
+    public Spliterator<E> spliterator() {
+        return new Spliterator<E>() {
+            // The current spine index
+            int splSpineIndex;
+
+            // The current element index into the current spine
+            int splElementIndex;
+
+            // When splSpineIndex >= spineIndex and splElementIndex >= elementIndex then
+            // this spliterator is fully traversed
+            // tryAdvance can set splSpineIndex > spineIndex if the last spine is full
+
+            // The current spine array
+            E[] splChunk = (spine == null) ? curChunk : spine[0];
+
+            @Override
+            public long estimateSize() {
+                return (spine == null)
+                       ? (elementIndex - splElementIndex)
+                       : count() - (priorElementCount[splSpineIndex] + splElementIndex);
+            }
+
+            @Override
+            public int characteristics() {
+                return SPLITERATOR_CHARACTERISTICS;
+            }
+
+            @Override
+            public boolean tryAdvance(Consumer<? super E> consumer) {
+                if (splSpineIndex < spineIndex
+                    || (splSpineIndex == spineIndex && splElementIndex < elementIndex)) {
+                    consumer.accept(splChunk[splElementIndex++]);
+
+                    if (splElementIndex == splChunk.length) {
+                        splElementIndex = 0;
+                        ++splSpineIndex;
+                        if (spine != null && splSpineIndex < spine.length)
+                            splChunk = spine[splSpineIndex];
+                    }
+                    return true;
+                }
+                return false;
+            }
+
+            @Override
+            public void forEachRemaining(Consumer<? super E> consumer) {
+                if (splSpineIndex < spineIndex
+                    || (splSpineIndex == spineIndex && splElementIndex < elementIndex)) {
+                    int i = splElementIndex;
+                    // completed chunks, if any
+                    for (int sp = splSpineIndex; sp < spineIndex; sp++) {
+                        E[] chunk = spine[sp];
+                        for (; i < chunk.length; i++) {
+                            consumer.accept(chunk[i]);
+                        }
+                        i = 0;
+                    }
+
+                    // current chunk
+                    E[] chunk = curChunk;
+                    int hElementIndex = elementIndex;
+                    for (; i < hElementIndex; i++) {
+                        consumer.accept(chunk[i]);
+                    }
+
+                    splSpineIndex = spineIndex;
+                    splElementIndex = elementIndex;
+                }
+            }
+
+            @Override
+            public Spliterator<E> trySplit() {
+                if (splSpineIndex < spineIndex) {
+                    Spliterator<E> ret = Arrays.spliterator(spine[splSpineIndex],
+                                                            splElementIndex, spine[splSpineIndex].length);
+                    splChunk = spine[++splSpineIndex];
+                    splElementIndex = 0;
+                    return ret;
+                }
+                else if (splSpineIndex == spineIndex) {
+                    int t = (elementIndex - splElementIndex) / 2;
+                    if (t == 0)
+                        return null;
+                    else {
+                        Spliterator<E> ret = Arrays.spliterator(curChunk, splElementIndex, splElementIndex + t);
+                        splElementIndex += t;
+                        return ret;
+                    }
+                }
+                else {
+                    return null;
+                }
+            }
+        };
+    }
+
+    /**
+     * An ordered collection of primitive values.  Elements can be added, but
+     * not removed. Goes through a building phase, during which elements can be
+     * added, and a traversal phase, during which elements can be traversed in
+     * order but no further modifications are possible.
+     *
+     * <p> One or more arrays are used to store elements. The use of a multiple
+     * arrays has better performance characteristics than a single array used by
+     * {@link ArrayList}, as when the capacity of the list needs to be increased
+     * no copying of elements is required.  This is usually beneficial in the case
+     * where the results will be traversed a small number of times.
+     *
+     * @param <E> the wrapper type for this primitive type
+     * @param <T_ARR> the array type for this primitive type
+     * @param <T_CONS> the Consumer type for this primitive type
+     */
+    abstract static class OfPrimitive<E, T_ARR, T_CONS>
+            extends AbstractSpinedBuffer implements Iterable<E> {
+
+        /*
+         * We optimistically hope that all the data will fit into the first chunk,
+         * so we try to avoid inflating the spine[] and priorElementCount[] arrays
+         * prematurely.  So methods must be prepared to deal with these arrays being
+         * null.  If spine is non-null, then spineIndex points to the current chunk
+         * within the spine, otherwise it is zero.  The spine and priorElementCount
+         * arrays are always the same size, and for any i <= spineIndex,
+         * priorElementCount[i] is the sum of the sizes of all the prior chunks.
+         *
+         * The curChunk pointer is always valid.  The elementIndex is the index of
+         * the next element to be written in curChunk; this may be past the end of
+         * curChunk so we have to check before writing. When we inflate the spine
+         * array, curChunk becomes the first element in it.  When we clear the
+         * buffer, we discard all chunks except the first one, which we clear,
+         * restoring it to the initial single-chunk state.
+         */
+
+        // The chunk we're currently writing into
+        T_ARR curChunk;
+
+        // All chunks, or null if there is only one chunk
+        T_ARR[] spine;
+
+        /**
+         * Constructs an empty list with the specified initial capacity.
+         *
+         * @param  initialCapacity  the initial capacity of the list
+         * @throws IllegalArgumentException if the specified initial capacity
+         *         is negative
+         */
+        OfPrimitive(int initialCapacity) {
+            super(initialCapacity);
+            curChunk = newArray(1 << initialChunkPower);
+        }
+
+        /**
+         * Constructs an empty list with an initial capacity of sixteen.
+         */
+        OfPrimitive() {
+            super();
+            curChunk = newArray(1 << initialChunkPower);
+        }
+
+        @Override
+        public abstract Iterator<E> iterator();
+
+        @Override
+        public abstract void forEach(Consumer<? super E> consumer);
+
+        /** Create a new array-of-array of the proper type and size */
+        protected abstract T_ARR[] newArrayArray(int size);
+
+        /** Create a new array of the proper type and size */
+        protected abstract T_ARR newArray(int size);
+
+        /** Get the length of an array */
+        protected abstract int arrayLength(T_ARR array);
+
+        /** Iterate an array with the provided consumer */
+        protected abstract void arrayForEach(T_ARR array, int from, int to,
+                                             T_CONS consumer);
+
+        protected long capacity() {
+            return (spineIndex == 0)
+                   ? arrayLength(curChunk)
+                   : priorElementCount[spineIndex] + arrayLength(spine[spineIndex]);
+        }
+
+        private void inflateSpine() {
+            if (spine == null) {
+                spine = newArrayArray(MIN_SPINE_SIZE);
+                priorElementCount = new long[MIN_SPINE_SIZE];
+                spine[0] = curChunk;
+            }
+        }
+
+        protected final void ensureCapacity(long targetSize) {
+            long capacity = capacity();
+            if (targetSize > capacity) {
+                inflateSpine();
+                for (int i=spineIndex+1; targetSize > capacity; i++) {
+                    if (i >= spine.length) {
+                        int newSpineSize = spine.length * 2;
+                        spine = Arrays.copyOf(spine, newSpineSize);
+                        priorElementCount = Arrays.copyOf(priorElementCount, newSpineSize);
+                    }
+                    int nextChunkSize = chunkSize(i);
+                    spine[i] = newArray(nextChunkSize);
+                    priorElementCount[i] = priorElementCount[i-1] + arrayLength(spine[i - 1]);
+                    capacity += nextChunkSize;
+                }
+            }
+        }
+
+        protected void increaseCapacity() {
+            ensureCapacity(capacity() + 1);
+        }
+
+        protected int chunkFor(long index) {
+            if (spineIndex == 0) {
+                if (index < elementIndex)
+                    return 0;
+                else
+                    throw new IndexOutOfBoundsException(Long.toString(index));
+            }
+
+            if (index >= count())
+                throw new IndexOutOfBoundsException(Long.toString(index));
+
+            for (int j=0; j <= spineIndex; j++)
+                if (index < priorElementCount[j] + arrayLength(spine[j]))
+                    return j;
+
+            throw new IndexOutOfBoundsException(Long.toString(index));
+        }
+
+        public void copyInto(T_ARR array, int offset) {
+            long finalOffset = offset + count();
+            if (finalOffset > arrayLength(array) || finalOffset < offset) {
+                throw new IndexOutOfBoundsException("does not fit");
+            }
+
+            if (spineIndex == 0)
+                System.arraycopy(curChunk, 0, array, offset, elementIndex);
+            else {
+                // full chunks
+                for (int i=0; i < spineIndex; i++) {
+                    System.arraycopy(spine[i], 0, array, offset, arrayLength(spine[i]));
+                    offset += arrayLength(spine[i]);
+                }
+                if (elementIndex > 0)
+                    System.arraycopy(curChunk, 0, array, offset, elementIndex);
+            }
+        }
+
+        public T_ARR asPrimitiveArray() {
+            // @@@ will fail for size == MAX_VALUE
+            T_ARR result = newArray((int) count());
+            copyInto(result, 0);
+            return result;
+        }
+
+        protected void preAccept() {
+            if (elementIndex == arrayLength(curChunk)) {
+                inflateSpine();
+                if (spineIndex+1 >= spine.length || spine[spineIndex+1] == null)
+                    increaseCapacity();
+                elementIndex = 0;
+                ++spineIndex;
+                curChunk = spine[spineIndex];
+            }
+        }
+
+        public void clear() {
+            if (spine != null) {
+                curChunk = spine[0];
+                spine = null;
+                priorElementCount = null;
+            }
+            elementIndex = 0;
+            spineIndex = 0;
+        }
+
+        public void forEach(T_CONS consumer) {
+            // completed chunks, if any
+            for (int j = 0; j < spineIndex; j++)
+                arrayForEach(spine[j], 0, arrayLength(spine[j]), consumer);
+
+            // current chunk
+            arrayForEach(curChunk, 0, elementIndex, consumer);
+        }
+
+        abstract class BaseSpliterator<T_SPLITER extends Spliterator<E>>
+                implements Spliterator<E> {
+            // The current spine index
+            int splSpineIndex;
+
+            // The current element index into the current spine
+            int splElementIndex;
+
+            // When splSpineIndex >= spineIndex and splElementIndex >= elementIndex then
+            // this spliterator is fully traversed
+            // tryAdvance can set splSpineIndex > spineIndex if the last spine is full
+
+            // The current spine array
+            T_ARR splChunk = (spine == null) ? curChunk : spine[0];
+
+            abstract void arrayForOne(T_ARR array, int index, T_CONS consumer);
+
+            abstract T_SPLITER arraySpliterator(T_ARR array, int offset, int len);
+
+            @Override
+            public long estimateSize() {
+                return (spine == null)
+                       ? (elementIndex - splElementIndex)
+                       : count() - (priorElementCount[splSpineIndex] + splElementIndex);
+            }
+
+            @Override
+            public int characteristics() {
+                return SPLITERATOR_CHARACTERISTICS;
+            }
+
+            public boolean tryAdvance(T_CONS consumer) {
+                if (splSpineIndex < spineIndex
+                    || (splSpineIndex == spineIndex && splElementIndex < elementIndex)) {
+                    arrayForOne(splChunk, splElementIndex++, consumer);
+
+                    if (splElementIndex == arrayLength(splChunk)) {
+                        splElementIndex = 0;
+                        ++splSpineIndex;
+                        if (spine != null && splSpineIndex < spine.length)
+                            splChunk = spine[splSpineIndex];
+                    }
+                    return true;
+                }
+                return false;
+            }
+
+            public void forEachRemaining(T_CONS consumer) {
+                if (splSpineIndex < spineIndex
+                    || (splSpineIndex == spineIndex && splElementIndex < elementIndex)) {
+                    int i = splElementIndex;
+                    // completed chunks, if any
+                    for (int sp = splSpineIndex; sp < spineIndex; sp++) {
+                        T_ARR chunk = spine[sp];
+                        arrayForEach(chunk, i, arrayLength(chunk), consumer);
+                        i = 0;
+                    }
+
+                    arrayForEach(curChunk, i, elementIndex, consumer);
+
+                    splSpineIndex = spineIndex;
+                    splElementIndex = elementIndex;
+                }
+            }
+
+            @Override
+            public T_SPLITER trySplit() {
+                if (splSpineIndex < spineIndex) {
+                    T_SPLITER ret = arraySpliterator(spine[splSpineIndex], splElementIndex,
+                                                     arrayLength(spine[splSpineIndex]) - splElementIndex);
+                    splChunk = spine[++splSpineIndex];
+                    splElementIndex = 0;
+                    return ret;
+                }
+                else if (splSpineIndex == spineIndex) {
+                    int t = (elementIndex - splElementIndex) / 2;
+                    if (t == 0)
+                        return null;
+                    else {
+                        T_SPLITER ret = arraySpliterator(curChunk, splElementIndex, t);
+                        splElementIndex += t;
+                        return ret;
+                    }
+                }
+                else {
+                    return null;
+                }
+            }
+        }
+    }
+
+    /**
+     * An ordered collection of {@code int} values.
+     */
+    static class OfInt extends SpinedBuffer.OfPrimitive<Integer, int[], IntConsumer>
+            implements IntConsumer {
+        OfInt() { }
+
+        OfInt(int initialCapacity) {
+            super(initialCapacity);
+        }
+
+        @Override
+        public void forEach(Consumer<? super Integer> consumer) {
+            if (consumer instanceof IntConsumer) {
+                forEach((IntConsumer) consumer);
+            }
+            else {
+                if (Tripwire.ENABLED)
+                    Tripwire.trip(getClass(), "{0} calling SpinedBuffer.OfInt.forEach(Consumer)");
+                spliterator().forEachRemaining(consumer);
+            }
+        }
+
+        @Override
+        protected int[][] newArrayArray(int size) {
+            return new int[size][];
+        }
+
+        @Override
+        protected int[] newArray(int size) {
+            return new int[size];
+        }
+
+        @Override
+        protected int arrayLength(int[] array) {
+            return array.length;
+        }
+
+        @Override
+        protected void arrayForEach(int[] array,
+                                    int from, int to,
+                                    IntConsumer consumer) {
+            for (int i = from; i < to; i++)
+                consumer.accept(array[i]);
+        }
+
+        @Override
+        public void accept(int i) {
+            preAccept();
+            curChunk[elementIndex++] = i;
+        }
+
+        public int get(long index) {
+            int ch = chunkFor(index);
+            if (spineIndex == 0 && ch == 0)
+                return curChunk[(int) index];
+            else
+                return spine[ch][(int) (index-priorElementCount[ch])];
+        }
+
+        public int[] asIntArray() {
+            return asPrimitiveArray();
+        }
+
+        @Override
+        public PrimitiveIterator.OfInt iterator() {
+            return Spliterators.iteratorFromSpliterator(spliterator());
+        }
+
+        public Spliterator.OfInt spliterator() {
+            class Splitr extends BaseSpliterator<Spliterator.OfInt>
+                    implements Spliterator.OfInt {
+
+                @Override
+                void arrayForOne(int[] array, int index, IntConsumer consumer) {
+                    consumer.accept(array[index]);
+                }
+
+                @Override
+                Spliterator.OfInt arraySpliterator(int[] array, int offset, int len) {
+                    return Arrays.spliterator(array, offset, offset+len);
+                }
+            };
+            return new Splitr();
+        }
+
+        @Override
+        public String toString() {
+            int[] array = asIntArray();
+            if (array.length < 200) {
+                return String.format("%s[length=%d, chunks=%d]%s",
+                                     getClass().getSimpleName(), array.length,
+                                     spineIndex, Arrays.toString(array));
+            }
+            else {
+                int[] array2 = Arrays.copyOf(array, 200);
+                return String.format("%s[length=%d, chunks=%d]%s...",
+                                     getClass().getSimpleName(), array.length,
+                                     spineIndex, Arrays.toString(array2));
+            }
+        }
+    }
+
+    /**
+     * An ordered collection of {@code long} values.
+     */
+    static class OfLong extends SpinedBuffer.OfPrimitive<Long, long[], LongConsumer>
+            implements LongConsumer {
+        OfLong() { }
+
+        OfLong(int initialCapacity) {
+            super(initialCapacity);
+        }
+
+        @Override
+        public void forEach(Consumer<? super Long> consumer) {
+            if (consumer instanceof LongConsumer) {
+                forEach((LongConsumer) consumer);
+            }
+            else {
+                if (Tripwire.ENABLED)
+                    Tripwire.trip(getClass(), "{0} calling SpinedBuffer.OfLong.forEach(Consumer)");
+                spliterator().forEachRemaining(consumer);
+            }
+        }
+
+        @Override
+        protected long[][] newArrayArray(int size) {
+            return new long[size][];
+        }
+
+        @Override
+        protected long[] newArray(int size) {
+            return new long[size];
+        }
+
+        @Override
+        protected int arrayLength(long[] array) {
+            return array.length;
+        }
+
+        @Override
+        protected void arrayForEach(long[] array,
+                                    int from, int to,
+                                    LongConsumer consumer) {
+            for (int i = from; i < to; i++)
+                consumer.accept(array[i]);
+        }
+
+        @Override
+        public void accept(long i) {
+            preAccept();
+            curChunk[elementIndex++] = i;
+        }
+
+        public long get(long index) {
+            int ch = chunkFor(index);
+            if (spineIndex == 0 && ch == 0)
+                return curChunk[(int) index];
+            else
+                return spine[ch][(int) (index-priorElementCount[ch])];
+        }
+
+        public long[] asLongArray() {
+            return asPrimitiveArray();
+        }
+
+        @Override
+        public PrimitiveIterator.OfLong iterator() {
+            return Spliterators.iteratorFromSpliterator(spliterator());
+        }
+
+
+        public Spliterator.OfLong spliterator() {
+            class Splitr extends BaseSpliterator<Spliterator.OfLong>
+                    implements Spliterator.OfLong {
+                @Override
+                void arrayForOne(long[] array, int index, LongConsumer consumer) {
+                    consumer.accept(array[index]);
+                }
+
+                @Override
+                Spliterator.OfLong arraySpliterator(long[] array, int offset, int len) {
+                    return Arrays.spliterator(array, offset, offset+len);
+                }
+            };
+            return new Splitr();
+        }
+
+        @Override
+        public String toString() {
+            long[] array = asLongArray();
+            if (array.length < 200) {
+                return String.format("%s[length=%d, chunks=%d]%s",
+                                     getClass().getSimpleName(), array.length,
+                                     spineIndex, Arrays.toString(array));
+            }
+            else {
+                long[] array2 = Arrays.copyOf(array, 200);
+                return String.format("%s[length=%d, chunks=%d]%s...",
+                                     getClass().getSimpleName(), array.length,
+                                     spineIndex, Arrays.toString(array2));
+            }
+        }
+    }
+
+    /**
+     * An ordered collection of {@code double} values.
+     */
+    static class OfDouble
+            extends SpinedBuffer.OfPrimitive<Double, double[], DoubleConsumer>
+            implements DoubleConsumer {
+        OfDouble() { }
+
+        OfDouble(int initialCapacity) {
+            super(initialCapacity);
+        }
+
+        @Override
+        public void forEach(Consumer<? super Double> consumer) {
+            if (consumer instanceof DoubleConsumer) {
+                forEach((DoubleConsumer) consumer);
+            }
+            else {
+                if (Tripwire.ENABLED)
+                    Tripwire.trip(getClass(), "{0} calling SpinedBuffer.OfDouble.forEach(Consumer)");
+                spliterator().forEachRemaining(consumer);
+            }
+        }
+
+        @Override
+        protected double[][] newArrayArray(int size) {
+            return new double[size][];
+        }
+
+        @Override
+        protected double[] newArray(int size) {
+            return new double[size];
+        }
+
+        @Override
+        protected int arrayLength(double[] array) {
+            return array.length;
+        }
+
+        @Override
+        protected void arrayForEach(double[] array,
+                                    int from, int to,
+                                    DoubleConsumer consumer) {
+            for (int i = from; i < to; i++)
+                consumer.accept(array[i]);
+        }
+
+        @Override
+        public void accept(double i) {
+            preAccept();
+            curChunk[elementIndex++] = i;
+        }
+
+        public double get(long index) {
+            int ch = chunkFor(index);
+            if (spineIndex == 0 && ch == 0)
+                return curChunk[(int) index];
+            else
+                return spine[ch][(int) (index-priorElementCount[ch])];
+        }
+
+        public double[] asDoubleArray() {
+            return asPrimitiveArray();
+        }
+
+        @Override
+        public PrimitiveIterator.OfDouble iterator() {
+            return Spliterators.iteratorFromSpliterator(spliterator());
+        }
+
+        public Spliterator.OfDouble spliterator() {
+            class Splitr extends BaseSpliterator<Spliterator.OfDouble>
+                    implements Spliterator.OfDouble {
+                @Override
+                void arrayForOne(double[] array, int index, DoubleConsumer consumer) {
+                    consumer.accept(array[index]);
+                }
+
+                @Override
+                Spliterator.OfDouble arraySpliterator(double[] array, int offset, int len) {
+                    return Arrays.spliterator(array, offset, offset+len);
+                }
+            }
+            return new Splitr();
+        }
+
+        @Override
+        public String toString() {
+            double[] array = asDoubleArray();
+            if (array.length < 200) {
+                return String.format("%s[length=%d, chunks=%d]%s",
+                                     getClass().getSimpleName(), array.length,
+                                     spineIndex, Arrays.toString(array));
+            }
+            else {
+                double[] array2 = Arrays.copyOf(array, 200);
+                return String.format("%s[length=%d, chunks=%d]%s...",
+                                     getClass().getSimpleName(), array.length,
+                                     spineIndex, Arrays.toString(array2));
+            }
+        }
+    }
+}
+
--- a/jdk/src/share/classes/java/util/stream/Stream.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/java/util/stream/Stream.java	Wed May 08 11:22:25 2013 +0100
@@ -24,8 +24,13 @@
  */
 package java.util.stream;
 
+import java.util.Arrays;
 import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.Spliterator;
+import java.util.Spliterators;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.BinaryOperator;
@@ -37,6 +42,7 @@
 import java.util.function.ToDoubleFunction;
 import java.util.function.ToIntFunction;
 import java.util.function.ToLongFunction;
+import java.util.function.UnaryOperator;
 
 // @@@ Specification to-do list @@@
 // - Describe the difference between sequential and parallel streams
@@ -779,4 +785,109 @@
      * @see #findFirst()
      */
     Optional<T> findAny();
+
+    // Static factories
+
+    /**
+     * Returns a builder for a {@code Stream}.
+     *
+     * @param <T> type of elements
+     * @return a stream builder
+     */
+    public static<T> StreamBuilder<T> builder() {
+        return new Streams.StreamBuilderImpl<>();
+    }
+
+    /**
+     * Returns an empty sequential {@code Stream}.
+     *
+     * @param <T> the type of stream elements
+     * @return an empty sequential stream
+     */
+    public static<T> Stream<T> empty() {
+        return StreamSupport.stream(Spliterators.<T>emptySpliterator());
+    }
+
+    /**
+     * Returns a sequential {@code Stream} containing a single element.
+     *
+     * @param t the single element
+     * @param <T> the type of stream elements
+     * @return a singleton sequential stream
+     */
+    public static<T> Stream<T> of(T t) {
+        return StreamSupport.stream(new Streams.StreamBuilderImpl<>(t));
+    }
+
+    /**
+     * Returns a sequential stream whose elements are the specified values.
+     *
+     * @param <T> the type of stream elements
+     * @param values the elements of the new stream
+     * @return the new stream
+     */
+    @SafeVarargs
+    public static<T> Stream<T> of(T... values) {
+        return Arrays.stream(values);
+    }
+
+    /**
+     * Returns an infinite sequential {@code Stream} produced by iterative
+     * application of a function {@code f} to an initial element {@code seed},
+     * producing a {@code Stream} consisting of {@code seed}, {@code f(seed)},
+     * {@code f(f(seed))}, etc.
+     *
+     * <p>The first element (position {@code 0}) in the {@code Stream} will be
+     * the provided {@code seed}.  For {@code n > 0}, the element at position
+     * {@code n}, will be the result of applying the function {@code f} to the
+     * element at position {@code n - 1}.
+     *
+     * @param <T> the type of stream elements
+     * @param seed the initial element
+     * @param f a function to be applied to to the previous element to produce
+     *          a new element
+     * @return a new sequential {@code Stream}
+     */
+    public static<T> Stream<T> iterate(final T seed, final UnaryOperator<T> f) {
+        Objects.requireNonNull(f);
+        final Iterator<T> iterator = new Iterator<T>() {
+            @SuppressWarnings("unchecked")
+            T t = (T) Streams.NONE;
+
+            @Override
+            public boolean hasNext() {
+                return true;
+            }
+
+            @Override
+            public T next() {
+                return t = (t == Streams.NONE) ? seed : f.apply(t);
+            }
+        };
+        return StreamSupport.stream(Spliterators.spliteratorUnknownSize(
+                iterator,
+                Spliterator.ORDERED | Spliterator.IMMUTABLE));
+    }
+
+    /**
+     * Returns a sequential {@code Stream} where each element is
+     * generated by a {@code Supplier}.  This is suitable for generating
+     * constant streams, streams of random elements, etc.
+     *
+     * @param <T> the type of stream elements
+     * @param s the {@code Supplier} of generated elements
+     * @return a new sequential {@code Stream}
+     */
+    public static<T> Stream<T> generate(Supplier<T> s) {
+        Objects.requireNonNull(s);
+        return StreamSupport.stream(Spliterators.spliteratorUnknownSize(
+                new Iterator<T>() {
+                    @Override
+                    public boolean hasNext() { return true; }
+
+                    @Override
+                    public T next() { return s.get(); }
+                },
+                Spliterator.ORDERED | Spliterator.IMMUTABLE));
+    }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/StreamBuilder.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,265 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+import java.util.function.Consumer;
+import java.util.function.DoubleConsumer;
+import java.util.function.IntConsumer;
+import java.util.function.LongConsumer;
+
+/**
+ * A mutable builder for a {@code Stream}.  This allows the creation of a
+ * {@code Stream} by generating elements individually and adding them to the
+ * {@code StreamBuilder} (without the copying overhead that comes from using
+ * an {@code ArrayList} as a temporary buffer.)
+ *
+ * <p>A {@code StreamBuilder} has a lifecycle, where it starts in a building
+ * phase, during which elements can be added, and then transitions to a built
+ * phase, after which elements may not be added.  The built phase begins
+ * when the {@link #build()}} method is called, which creates an ordered
+ * {@code Stream} whose elements are the elements that were added to the stream
+ * builder, in the order they were added.
+ *
+ * <p>Primitive specializations of {@code StreamBuilder} are provided
+ * for {@link OfInt int}, {@link OfLong long}, and {@link OfDouble double}
+ * values.
+ *
+ * @param <T> the type of stream elements
+ * @see Stream#builder()
+ * @since 1.8
+ */
+public interface StreamBuilder<T> extends Consumer<T> {
+
+    /**
+     * Adds an element to the stream being built.
+     *
+     * @throws IllegalStateException if the builder has already transitioned to
+     * the built state
+     */
+    @Override
+    void accept(T t);
+
+    /**
+     * Adds an element to the stream being built.
+     *
+     * @implSpec
+     * The default implementation behaves as if:
+     * <pre>{@code
+     *     accept(t)
+     *     return this;
+     * }</pre>
+     *
+     * @param t the element to add
+     * @return {@code this} builder
+     * @throws IllegalStateException if the builder has already transitioned to
+     * the built state
+     */
+    default StreamBuilder<T> add(T t) {
+        accept(t);
+        return this;
+    }
+
+    /**
+     * Builds the stream, transitioning this builder to the built state.
+     * An {@code IllegalStateException} is thrown if there are further attempts
+     * to operate on the builder after it has entered the built state.
+     *
+     * @return the built stream
+     * @throws IllegalStateException if the builder has already transitioned to
+     * the built state
+     */
+    Stream<T> build();
+
+    /**
+     * A mutable builder for an {@code IntStream}.
+     *
+     * <p>A stream builder has a lifecycle, where it starts in a building
+     * phase, during which elements can be added, and then transitions to a
+     * built phase, after which elements may not be added.  The built phase
+     * begins when the {@link #build()}} method is called, which creates an
+     * ordered stream whose elements are the elements that were added to the
+     * stream builder, in the order they were added.
+     *
+     * @see IntStream#builder()
+     * @since 1.8
+     */
+    interface OfInt extends IntConsumer {
+
+        /**
+         * Adds an element to the stream being built.
+         *
+         * @throws IllegalStateException if the builder has already transitioned
+         * to the built state
+         */
+        @Override
+        void accept(int t);
+
+        /**
+         * Adds an element to the stream being built.
+         *
+         * @implSpec
+         * The default implementation behaves as if:
+         * <pre>{@code
+         *     accept(t)
+         *     return this;
+         * }</pre>
+         *
+         * @param t the element to add
+         * @return {@code this} builder
+         * @throws IllegalStateException if the builder has already transitioned
+         * to the built state
+         */
+        default StreamBuilder.OfInt add(int t) {
+            accept(t);
+            return this;
+        }
+
+        /**
+         * Builds the stream, transitioning this builder to the built state.
+         * An {@code IllegalStateException} is thrown if there are further
+         * attempts to operate on the builder after it has entered the built
+         * state.
+         *
+         * @return the built stream
+         * @throws IllegalStateException if the builder has already transitioned to
+         * the built state
+         */
+        IntStream build();
+    }
+
+    /**
+     * A mutable builder for a {@code LongStream}.
+     *
+     * <p>A stream builder has a lifecycle, where it starts in a building
+     * phase, during which elements can be added, and then transitions to a
+     * built phase, after which elements may not be added.  The built phase
+     * begins when the {@link #build()}} method is called, which creates an
+     * ordered stream whose elements are the elements that were added to the
+     * stream builder, in the order they were added.
+     *
+     * @see LongStream#builder()
+     * @since 1.8
+     */
+    interface OfLong extends LongConsumer {
+
+        /**
+         * Adds an element to the stream being built.
+         *
+         * @throws IllegalStateException if the builder has already transitioned
+         * to the built state
+         */
+        @Override
+        void accept(long t);
+
+        /**
+         * Adds an element to the stream being built.
+         *
+         * @implSpec
+         * The default implementation behaves as if:
+         * <pre>{@code
+         *     accept(t)
+         *     return this;
+         * }</pre>
+         *
+         * @param t the element to add
+         * @return {@code this} builder
+         * @throws IllegalStateException if the builder has already transitioned
+         * to the built state
+         */
+        default StreamBuilder.OfLong add(long t) {
+            accept(t);
+            return this;
+        }
+
+        /**
+         * Builds the stream, transitioning this builder to the built state.
+         * An {@code IllegalStateException} is thrown if there are further
+         * attempts to operate on the builder after it has entered the built
+         * state.
+         *
+         * @return the built stream
+         * @throws IllegalStateException if the builder has already transitioned
+         * to the built state
+         */
+        LongStream build();
+    }
+
+    /**
+     * A mutable builder for a {@code DoubleStream}.
+     *
+     * @see LongStream#builder()
+     * @since 1.8
+     */
+    interface OfDouble extends DoubleConsumer {
+
+        /**
+         * Adds an element to the stream being built.
+         *
+         * <p>A stream builder  has a lifecycle, where it starts in a building
+         * phase, during which elements can be added, and then transitions to a
+         * built phase, after which elements may not be added.  The built phase
+         * begins when the {@link #build()}} method is called, which creates an
+         * ordered stream whose elements are the elements that were added to the
+         * stream builder, in the order they were added.
+         *
+         * @throws IllegalStateException if the builder has already transitioned
+         * to the built state
+         */
+        @Override
+        void accept(double t);
+
+        /**
+         * Adds an element to the stream being built.
+         *
+         * @implSpec
+         * The default implementation behaves as if:
+         * <pre>{@code
+         *     accept(t)
+         *     return this;
+         * }</pre>
+         *
+         * @param t the element to add
+         * @return {@code this} builder
+         * @throws IllegalStateException if the builder has already transitioned
+         * to the built state
+         */
+        default StreamBuilder.OfDouble add(double t) {
+            accept(t);
+            return this;
+        }
+
+        /**
+         * Builds the stream, transitioning this builder to the built state.
+         * An {@code IllegalStateException} is thrown if there are further
+         * attempts to operate on the builder after it has entered the built
+         * state.
+         *
+         * @return the built stream
+         * @throws IllegalStateException if the builder has already transitioned
+         * to the built state
+         */
+        DoubleStream build();
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/StreamSpliterators.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,636 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+import java.util.Comparator;
+import java.util.Spliterator;
+import java.util.function.BooleanSupplier;
+import java.util.function.Consumer;
+import java.util.function.DoubleConsumer;
+import java.util.function.IntConsumer;
+import java.util.function.LongConsumer;
+import java.util.function.Supplier;
+
+/**
+ * Spliterator implementations for wrapping and delegating spliterators, used
+ * in the implementation of the {@link Stream#spliterator()} method.
+ *
+ * @since 1.8
+ */
+class StreamSpliterators {
+
+    /**
+     * Abstract wrapping spliterator that binds to the spliterator of a
+     * pipeline helper on first operation.
+     *
+     * <p>This spliterator is not late-binding and will bind to the source
+     * spliterator when first operated on.
+     *
+     * <p>A wrapping spliterator produced from a sequential stream
+     * cannot be split if there are stateful operations present.
+     */
+    private static abstract class AbstractWrappingSpliterator<P_IN, P_OUT,
+                                                              T_BUFFER extends AbstractSpinedBuffer>
+            implements Spliterator<P_OUT> {
+
+        // @@@ Detect if stateful operations are present or not
+        //     If not then can split otherwise cannot
+
+        /**
+         * True if this spliterator supports splitting
+         */
+        final boolean isParallel;
+
+        final PipelineHelper<P_OUT> ph;
+
+        /**
+         * Supplier for the source spliterator.  Client provides either a
+         * spliterator or a supplier.
+         */
+        private Supplier<Spliterator<P_IN>> spliteratorSupplier;
+
+        /**
+         * Source spliterator.  Either provided from client or obtained from
+         * supplier.
+         */
+        Spliterator<P_IN> spliterator;
+
+        /**
+         * Sink chain for the downstream stages of the pipeline, ultimately
+         * leading to the buffer. Used during partial traversal.
+         */
+        Sink<P_IN> bufferSink;
+
+        /**
+         * A function that advances one element of the spliterator, pushing
+         * it to bufferSink.  Returns whether any elements were processed.
+         * Used during partial traversal.
+         */
+        BooleanSupplier pusher;
+
+        /** Next element to consume from the buffer, used during partial traversal */
+        long nextToConsume;
+
+        /** Buffer into which elements are pushed.  Used during partial traversal. */
+        T_BUFFER buffer;
+
+        /**
+         * True if full traversal has occurred (with possible cancelation).
+         * If doing a partial traversal, there may be still elements in buffer.
+         */
+        boolean finished;
+
+        /**
+         * Construct an AbstractWrappingSpliterator from a
+         * {@code Supplier<Spliterator>}.
+         */
+        AbstractWrappingSpliterator(PipelineHelper<P_OUT> ph,
+                                    Supplier<Spliterator<P_IN>> spliteratorSupplier,
+                                    boolean parallel) {
+            this.ph = ph;
+            this.spliteratorSupplier = spliteratorSupplier;
+            this.spliterator = null;
+            this.isParallel = parallel;
+        }
+
+        /**
+         * Construct an AbstractWrappingSpliterator from a
+         * {@code Spliterator}.
+         */
+        AbstractWrappingSpliterator(PipelineHelper<P_OUT> ph,
+                                    Spliterator<P_IN> spliterator,
+                                    boolean parallel) {
+            this.ph = ph;
+            this.spliteratorSupplier = null;
+            this.spliterator = spliterator;
+            this.isParallel = parallel;
+        }
+
+        /**
+         * Called before advancing to set up spliterator, if needed.
+         */
+        final void init() {
+            if (spliterator == null) {
+                spliterator = spliteratorSupplier.get();
+                spliteratorSupplier = null;
+            }
+        }
+
+        /**
+         * Get an element from the source, pushing it into the sink chain,
+         * setting up the buffer if needed
+         * @return whether there are elements to consume from the buffer
+         */
+        final boolean doAdvance() {
+            if (buffer == null) {
+                if (finished)
+                    return false;
+
+                init();
+                initPartialTraversalState();
+                nextToConsume = 0;
+                bufferSink.begin(spliterator.getExactSizeIfKnown());
+                return fillBuffer();
+            }
+            else {
+                ++nextToConsume;
+                boolean hasNext = nextToConsume < buffer.count();
+                if (!hasNext) {
+                    nextToConsume = 0;
+                    buffer.clear();
+                    hasNext = fillBuffer();
+                }
+                return hasNext;
+            }
+        }
+
+        /**
+         * Invokes the shape-specific constructor with the provided arguments
+         * and returns the result.
+         */
+        abstract AbstractWrappingSpliterator<P_IN, P_OUT, ?> wrap(Spliterator<P_IN> s);
+
+        /**
+         * Initializes buffer, sink chain, and pusher for a shape-specific
+         * implementation.
+         */
+        abstract void initPartialTraversalState();
+
+        @Override
+        public Spliterator<P_OUT> trySplit() {
+            if (isParallel && !finished) {
+                init();
+
+                Spliterator<P_IN> split = spliterator.trySplit();
+                return (split == null) ? null : wrap(split);
+            }
+            else
+                return null;
+        }
+
+        /**
+         * If the buffer is empty, push elements into the sink chain until
+         * the source is empty or cancellation is requested.
+         * @return whether there are elements to consume from the buffer
+         */
+        private boolean fillBuffer() {
+            while (buffer.count() == 0) {
+                if (bufferSink.cancellationRequested() || !pusher.getAsBoolean()) {
+                    if (finished)
+                        return false;
+                    else {
+                        bufferSink.end(); // might trigger more elements
+                        finished = true;
+                    }
+                }
+            }
+            return true;
+        }
+
+        @Override
+        public final long estimateSize() {
+            init();
+            return StreamOpFlag.SIZED.isKnown(ph.getStreamAndOpFlags())
+                   ? spliterator.estimateSize()
+                   : Long.MAX_VALUE;
+        }
+
+        @Override
+        public final long getExactSizeIfKnown() {
+            init();
+            return StreamOpFlag.SIZED.isKnown(ph.getStreamAndOpFlags())
+                   ? spliterator.getExactSizeIfKnown()
+                   : -1;
+        }
+
+        @Override
+        public final int characteristics() {
+            init();
+
+            // Get the characteristics from the pipeline
+            int c = StreamOpFlag.toCharacteristics(StreamOpFlag.toStreamFlags(ph.getStreamAndOpFlags()));
+
+            // Mask off the size and uniform characteristics and replace with
+            // those of the spliterator
+            // Note that a non-uniform spliterator can change from something
+            // with an exact size to an estimate for a sub-split, for example
+            // with HashSet where the size is known at the top level spliterator
+            // but for sub-splits only an estimate is known
+            if ((c & Spliterator.SIZED) != 0) {
+                c &= ~(Spliterator.SIZED | Spliterator.SUBSIZED);
+                c |= (spliterator.characteristics() & Spliterator.SIZED & Spliterator.SUBSIZED);
+            }
+
+            return c;
+        }
+
+        @Override
+        public Comparator<? super P_OUT> getComparator() {
+            if (!hasCharacteristics(SORTED))
+                throw new IllegalStateException();
+            return null;
+        }
+
+        @Override
+        public final String toString() {
+            return String.format("%s[%s]", getClass().getName(), spliterator);
+        }
+    }
+
+    static final class WrappingSpliterator<P_IN, P_OUT>
+            extends AbstractWrappingSpliterator<P_IN, P_OUT, SpinedBuffer<P_OUT>> {
+
+        WrappingSpliterator(PipelineHelper<P_OUT> ph,
+                            Supplier<Spliterator<P_IN>> supplier,
+                            boolean parallel) {
+            super(ph, supplier, parallel);
+        }
+
+        WrappingSpliterator(PipelineHelper<P_OUT> ph,
+                            Spliterator<P_IN> spliterator,
+                            boolean parallel) {
+            super(ph, spliterator, parallel);
+        }
+
+        @Override
+        WrappingSpliterator<P_IN, P_OUT> wrap(Spliterator<P_IN> s) {
+            return new WrappingSpliterator<>(ph, s, isParallel);
+        }
+
+        @Override
+        void initPartialTraversalState() {
+            SpinedBuffer<P_OUT> b = new SpinedBuffer<>();
+            buffer = b;
+            bufferSink = ph.wrapSink(b::accept);
+            pusher = () -> spliterator.tryAdvance(bufferSink);
+        }
+
+        @Override
+        public boolean tryAdvance(Consumer<? super P_OUT> consumer) {
+            boolean hasNext = doAdvance();
+            if (hasNext)
+                consumer.accept(buffer.get(nextToConsume));
+            return hasNext;
+        }
+
+        @Override
+        public void forEachRemaining(Consumer<? super P_OUT> consumer) {
+            if (buffer == null && !finished) {
+                init();
+
+                ph.wrapAndCopyInto((Sink<P_OUT>) consumer::accept, spliterator);
+                finished = true;
+            }
+            else {
+                while (tryAdvance(consumer)) { }
+            }
+        }
+    }
+
+    static final class IntWrappingSpliterator<P_IN>
+            extends AbstractWrappingSpliterator<P_IN, Integer, SpinedBuffer.OfInt>
+            implements Spliterator.OfInt {
+
+        IntWrappingSpliterator(PipelineHelper<Integer> ph,
+                               Supplier<Spliterator<P_IN>> supplier,
+                               boolean parallel) {
+            super(ph, supplier, parallel);
+        }
+
+        IntWrappingSpliterator(PipelineHelper<Integer> ph,
+                               Spliterator<P_IN> spliterator,
+                               boolean parallel) {
+            super(ph, spliterator, parallel);
+        }
+
+        @Override
+        AbstractWrappingSpliterator<P_IN, Integer, ?> wrap(Spliterator<P_IN> s) {
+            return new IntWrappingSpliterator<>(ph, s, isParallel);
+        }
+
+        @Override
+        void initPartialTraversalState() {
+            SpinedBuffer.OfInt b = new SpinedBuffer.OfInt();
+            buffer = b;
+            bufferSink = ph.wrapSink((Sink.OfInt) b::accept);
+            pusher = () -> spliterator.tryAdvance(bufferSink);
+        }
+
+        @Override
+        public Spliterator.OfInt trySplit() {
+            return (Spliterator.OfInt) super.trySplit();
+        }
+
+        @Override
+        public boolean tryAdvance(IntConsumer consumer) {
+            boolean hasNext = doAdvance();
+            if (hasNext)
+                consumer.accept(buffer.get(nextToConsume));
+            return hasNext;
+        }
+
+        @Override
+        public void forEachRemaining(IntConsumer consumer) {
+            if (buffer == null && !finished) {
+                init();
+
+                ph.wrapAndCopyInto((Sink.OfInt) consumer::accept, spliterator);
+                finished = true;
+            }
+            else {
+                while (tryAdvance(consumer)) { }
+            }
+        }
+    }
+
+    static final class LongWrappingSpliterator<P_IN>
+            extends AbstractWrappingSpliterator<P_IN, Long, SpinedBuffer.OfLong>
+            implements Spliterator.OfLong {
+
+        LongWrappingSpliterator(PipelineHelper<Long> ph,
+                                Supplier<Spliterator<P_IN>> supplier,
+                                boolean parallel) {
+            super(ph, supplier, parallel);
+        }
+
+        LongWrappingSpliterator(PipelineHelper<Long> ph,
+                                Spliterator<P_IN> spliterator,
+                                boolean parallel) {
+            super(ph, spliterator, parallel);
+        }
+
+        @Override
+        AbstractWrappingSpliterator<P_IN, Long, ?> wrap(Spliterator<P_IN> s) {
+            return new LongWrappingSpliterator<>(ph, s, isParallel);
+        }
+
+        @Override
+        void initPartialTraversalState() {
+            SpinedBuffer.OfLong b = new SpinedBuffer.OfLong();
+            buffer = b;
+            bufferSink = ph.wrapSink((Sink.OfLong) b::accept);
+            pusher = () -> spliterator.tryAdvance(bufferSink);
+        }
+
+        @Override
+        public Spliterator.OfLong trySplit() {
+            return (Spliterator.OfLong) super.trySplit();
+        }
+
+        @Override
+        public boolean tryAdvance(LongConsumer consumer) {
+            boolean hasNext = doAdvance();
+            if (hasNext)
+                consumer.accept(buffer.get(nextToConsume));
+            return hasNext;
+        }
+
+        @Override
+        public void forEachRemaining(LongConsumer consumer) {
+            if (buffer == null && !finished) {
+                init();
+
+                ph.wrapAndCopyInto((Sink.OfLong) consumer::accept, spliterator);
+                finished = true;
+            }
+            else {
+                while (tryAdvance(consumer)) { }
+            }
+        }
+    }
+
+    static final class DoubleWrappingSpliterator<P_IN>
+            extends AbstractWrappingSpliterator<P_IN, Double, SpinedBuffer.OfDouble>
+            implements Spliterator.OfDouble {
+
+        DoubleWrappingSpliterator(PipelineHelper<Double> ph,
+                                  Supplier<Spliterator<P_IN>> supplier,
+                                  boolean parallel) {
+            super(ph, supplier, parallel);
+        }
+
+        DoubleWrappingSpliterator(PipelineHelper<Double> ph,
+                                  Spliterator<P_IN> spliterator,
+                                  boolean parallel) {
+            super(ph, spliterator, parallel);
+        }
+
+        @Override
+        AbstractWrappingSpliterator<P_IN, Double, ?> wrap(Spliterator<P_IN> s) {
+            return new DoubleWrappingSpliterator<>(ph, s, isParallel);
+        }
+
+        @Override
+        void initPartialTraversalState() {
+            SpinedBuffer.OfDouble b = new SpinedBuffer.OfDouble();
+            buffer = b;
+            bufferSink = ph.wrapSink((Sink.OfDouble) b::accept);
+            pusher = () -> spliterator.tryAdvance(bufferSink);
+        }
+
+        @Override
+        public Spliterator.OfDouble trySplit() {
+            return (Spliterator.OfDouble) super.trySplit();
+        }
+
+        @Override
+        public boolean tryAdvance(DoubleConsumer consumer) {
+            boolean hasNext = doAdvance();
+            if (hasNext)
+                consumer.accept(buffer.get(nextToConsume));
+            return hasNext;
+        }
+
+        @Override
+        public void forEachRemaining(DoubleConsumer consumer) {
+            if (buffer == null && !finished) {
+                init();
+
+                ph.wrapAndCopyInto((Sink.OfDouble) consumer::accept, spliterator);
+                finished = true;
+            }
+            else {
+                while (tryAdvance(consumer)) { }
+            }
+        }
+    }
+
+    /**
+     * Spliterator implementation that delegates to an underlying spliterator,
+     * acquiring the spliterator from a {@code Supplier<Spliterator>} on the
+     * first call to any spliterator method.
+     * @param <T>
+     */
+    static class DelegatingSpliterator<T> implements Spliterator<T> {
+        private final Supplier<Spliterator<T>> supplier;
+
+        private Spliterator<T> s;
+
+        @SuppressWarnings("unchecked")
+        DelegatingSpliterator(Supplier<? extends Spliterator<T>> supplier) {
+            this.supplier = (Supplier<Spliterator<T>>) supplier;
+        }
+
+        Spliterator<T> get() {
+            if (s == null) {
+                s = supplier.get();
+            }
+            return s;
+        }
+
+        @Override
+        public Spliterator<T> trySplit() {
+            return get().trySplit();
+        }
+
+        @Override
+        public boolean tryAdvance(Consumer<? super T> consumer) {
+            return get().tryAdvance(consumer);
+        }
+
+        @Override
+        public void forEachRemaining(Consumer<? super T> consumer) {
+            get().forEachRemaining(consumer);
+        }
+
+        @Override
+        public long estimateSize() {
+            return get().estimateSize();
+        }
+
+        @Override
+        public int characteristics() {
+            return get().characteristics();
+        }
+
+        @Override
+        public Comparator<? super T> getComparator() {
+            return get().getComparator();
+        }
+
+        @Override
+        public long getExactSizeIfKnown() {
+            return get().getExactSizeIfKnown();
+        }
+
+        @Override
+        public String toString() {
+            return getClass().getName() + "[" + get() + "]";
+        }
+
+        static final class OfInt extends DelegatingSpliterator<Integer> implements Spliterator.OfInt {
+            private Spliterator.OfInt s;
+
+            OfInt(Supplier<Spliterator.OfInt> supplier) {
+                super(supplier);
+            }
+
+            @Override
+            Spliterator.OfInt get() {
+                if (s == null) {
+                    s = (Spliterator.OfInt) super.get();
+                }
+                return s;
+            }
+
+            @Override
+            public Spliterator.OfInt trySplit() {
+                return get().trySplit();
+            }
+
+            @Override
+            public boolean tryAdvance(IntConsumer consumer) {
+                return get().tryAdvance(consumer);
+            }
+
+            @Override
+            public void forEachRemaining(IntConsumer consumer) {
+                get().forEachRemaining(consumer);
+            }
+        }
+
+        static final class OfLong extends DelegatingSpliterator<Long> implements Spliterator.OfLong {
+            private Spliterator.OfLong s;
+
+            OfLong(Supplier<Spliterator.OfLong> supplier) {
+                super(supplier);
+            }
+
+            @Override
+            Spliterator.OfLong get() {
+                if (s == null) {
+                    s = (Spliterator.OfLong) super.get();
+                }
+                return s;
+            }
+
+            @Override
+            public Spliterator.OfLong trySplit() {
+                return get().trySplit();
+            }
+
+            @Override
+            public boolean tryAdvance(LongConsumer consumer) {
+                return get().tryAdvance(consumer);
+            }
+
+            @Override
+            public void forEachRemaining(LongConsumer consumer) {
+                get().forEachRemaining(consumer);
+            }
+        }
+
+        static final class OfDouble extends DelegatingSpliterator<Double> implements Spliterator.OfDouble {
+            private Spliterator.OfDouble s;
+
+            OfDouble(Supplier<Spliterator.OfDouble> supplier) {
+                super(supplier);
+            }
+
+            @Override
+            Spliterator.OfDouble get() {
+                if (s == null) {
+                    s = (Spliterator.OfDouble) super.get();
+                }
+                return s;
+            }
+
+            @Override
+            public Spliterator.OfDouble trySplit() {
+                return get().trySplit();
+            }
+
+            @Override
+            public boolean tryAdvance(DoubleConsumer consumer) {
+                return get().tryAdvance(consumer);
+            }
+
+            @Override
+            public void forEachRemaining(DoubleConsumer consumer) {
+                get().forEachRemaining(consumer);
+            }
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/StreamSupport.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,511 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+import java.util.Objects;
+import java.util.Spliterator;
+import java.util.function.Supplier;
+
+/**
+ * Low-level utility methods for creating and manipulating streams.
+ *
+ * <p>This class is mostly for library writers presenting stream views
+ * of their data structures; most static stream methods for end users are in
+ * {@link Streams}.
+ *
+ * <p>Unless otherwise stated, streams are created as sequential
+ * streams.  A sequential stream can be transformed into a parallel stream by
+ * calling the {@code parallel()} method on the created stream.
+ *
+ * @since 1.8
+ */
+public class StreamSupport {
+    /**
+     * Creates a new sequential {@code Stream} from a {@code Spliterator}.
+     *
+     * <p>The spliterator is only traversed, split, or queried for estimated
+     * size after the terminal operation of the stream pipeline commences.
+     *
+     * <p>It is strongly recommended the spliterator report a characteristic of
+     * {@code IMMUTABLE} or {@code CONCURRENT}, or be
+     * <a href="Spliterator.html#binding">late-binding</a>.  Otherwise,
+     * {@link #stream(Supplier, int)} should be used to
+     * reduce the scope of potential interference with the source.  See
+     * <a href="package-summary.html#Non-Interference">Non-Interference</a> for
+     * more details.
+     *
+     * @param <T> the type of stream elements
+     * @param spliterator a {@code Spliterator} describing the stream elements
+     * @return a new sequential {@code Stream}
+     */
+    public static <T> Stream<T> stream(Spliterator<T> spliterator) {
+        Objects.requireNonNull(spliterator);
+        return new ReferencePipeline.Head<>(spliterator,
+                                            StreamOpFlag.fromCharacteristics(spliterator),
+                                            false);
+    }
+
+    /**
+     * Creates a new parallel {@code Stream} from a {@code Spliterator}.
+     *
+     * <p>The spliterator is only traversed, split, or queried for estimated
+     * size after the terminal operation of the stream pipeline commences.
+     *
+     * <p>It is strongly recommended the spliterator report a characteristic of
+     * {@code IMMUTABLE} or {@code CONCURRENT}, or be
+     * <a href="Spliterator.html#binding">late-binding</a>.  Otherwise,
+     * {@link #stream(Supplier, int)} should be used to
+     * reduce the scope of potential interference with the source.  See
+     * <a href="package-summary.html#Non-Interference">Non-Interference</a> for
+     * more details.
+     *
+     * @param <T> the type of stream elements
+     * @param spliterator a {@code Spliterator} describing the stream elements
+     * @return a new parallel {@code Stream}
+     */
+    public static <T> Stream<T> parallelStream(Spliterator<T> spliterator) {
+        Objects.requireNonNull(spliterator);
+        return new ReferencePipeline.Head<>(spliterator,
+                                            StreamOpFlag.fromCharacteristics(spliterator),
+                                            true);
+    }
+
+    /**
+     * Creates a new sequential {@code Stream} from a {@code Supplier} of
+     * {@code Spliterator}.
+     *
+     * <p>The {@link Supplier#get()} method will be invoked on the supplier no
+     * more than once, and after the terminal operation of the stream pipeline
+     * commences.
+     *
+     * <p>For spliterators that report a characteristic of {@code IMMUTABLE}
+     * or {@code CONCURRENT}, or that are
+     * <a href="Spliterator.html#binding">late-binding</a>, it is likely
+     * more efficient to use {@link #stream(java.util.Spliterator)} instead.
+     * The use of a {@code Supplier} in this form provides a level of
+     * indirection that reduces the scope of potential interference with the
+     * source.  Since the supplier is only invoked after the terminal operation
+     * commences, any modifications to the source up to the start of the
+     * terminal operation are reflected in the stream result.  See
+     * <a href="package-summary.html#Non-Interference">Non-Interference</a> for
+     * more details.
+     *
+     * @param <T> the type of stream elements
+     * @param supplier a {@code Supplier} of a {@code Spliterator}
+     * @param characteristics Spliterator characteristics of the supplied
+     *        {@code Spliterator}.  The characteristics must be equal to
+     *        {@code source.get().getCharacteristics()}.
+     * @return a new sequential {@code Stream}
+     * @see #stream(Spliterator)
+     */
+    public static <T> Stream<T> stream(Supplier<? extends Spliterator<T>> supplier,
+                                      int characteristics) {
+        Objects.requireNonNull(supplier);
+        return new ReferencePipeline.Head<>(supplier,
+                                            StreamOpFlag.fromCharacteristics(characteristics),
+                                            false);
+    }
+
+    /**
+     * Creates a new parallel {@code Stream} from a {@code Supplier} of
+     * {@code Spliterator}.
+     *
+     * <p>The {@link Supplier#get()} method will be invoked on the supplier no
+     * more than once, and after the terminal operation of the stream pipeline
+     * commences.
+     *
+     * <p>For spliterators that report a characteristic of {@code IMMUTABLE}
+     * or {@code CONCURRENT}, or that are
+     * <a href="Spliterator.html#binding">late-binding</a>, it is likely
+     * more efficient to use {@link #stream(Spliterator)} instead.
+     * The use of a {@code Supplier} in this form provides a level of
+     * indirection that reduces the scope of potential interference with the
+     * source.  Since the supplier is only invoked after the terminal operation
+     * commences, any modifications to the source up to the start of the
+     * terminal operation are reflected in the stream result.  See
+     * <a href="package-summary.html#Non-Interference">Non-Interference</a> for
+     * more details.
+     *
+     * @param <T> the type of stream elements
+     * @param supplier a {@code Supplier} of a {@code Spliterator}
+     * @param characteristics Spliterator characteristics of the supplied
+     *        {@code Spliterator}.  The characteristics must be equal to
+     *        {@code source.get().getCharacteristics()}
+     * @return a new parallel {@code Stream}
+     * @see #parallelStream(Spliterator)
+     */
+    public static <T> Stream<T> parallelStream(Supplier<? extends Spliterator<T>> supplier,
+                                              int characteristics) {
+        Objects.requireNonNull(supplier);
+        return new ReferencePipeline.Head<>(supplier,
+                                            StreamOpFlag.fromCharacteristics(characteristics),
+                                            true);
+    }
+
+    /**
+     * Creates a new sequential {@code IntStream} from a {@code Spliterator.OfInt}.
+     *
+     * <p>The spliterator is only traversed, split, or queried for estimated size
+     * after the terminal operation of the stream pipeline commences.
+     *
+     * <p>It is strongly recommended the spliterator report a characteristic of
+     * {@code IMMUTABLE} or {@code CONCURRENT}, or be
+     * <a href="Spliterator.html#binding">late-binding</a>.  Otherwise,
+     * {@link #stream(Supplier, int)}} should be used to
+     * reduce the scope of potential interference with the source.  See
+     * <a href="package-summary.html#Non-Interference">Non-Interference</a> for
+     * more details.
+     *
+     * @param spliterator a {@code Spliterator.OfInt} describing the stream elements
+     * @return a new sequential {@code IntStream}
+     */
+    public static IntStream intStream(Spliterator.OfInt spliterator) {
+        return new IntPipeline.Head<>(spliterator,
+                                      StreamOpFlag.fromCharacteristics(spliterator),
+                                      false);
+    }
+
+    /**
+     * Creates a new parallel {@code IntStream} from a {@code Spliterator.OfInt}.
+     *
+     * <p>he spliterator is only traversed, split, or queried for estimated size
+     * after the terminal operation of the stream pipeline commences.
+     *
+     * <p>It is strongly recommended the spliterator report a characteristic of
+     * {@code IMMUTABLE} or {@code CONCURRENT}, or be
+     * <a href="Spliterator.html#binding">late-binding</a>.  Otherwise,
+     * {@link #stream(Supplier, int)}} should be used to
+     * reduce the scope of potential interference with the source.  See
+     * <a href="package-summary.html#Non-Interference">Non-Interference</a> for
+     * more details.
+     *
+     * @param spliterator a {@code Spliterator.OfInt} describing the stream elements
+     * @return a new parallel {@code IntStream}
+     */
+    public static IntStream intParallelStream(Spliterator.OfInt spliterator) {
+        return new IntPipeline.Head<>(spliterator,
+                                      StreamOpFlag.fromCharacteristics(spliterator),
+                                      true);
+    }
+
+    /**
+     * Creates a new sequential {@code IntStream} from a {@code Supplier} of
+     * {@code Spliterator.OfInt}.
+     *
+     * <p>The {@link Supplier#get()} method will be invoked on the supplier no
+     * more than once, and after the terminal operation of the stream pipeline
+     * commences.
+     *
+     * <p>For spliterators that report a characteristic of {@code IMMUTABLE}
+     * or {@code CONCURRENT}, or that are
+     * <a href="Spliterator.html#binding">late-binding</a>, it is likely
+     * more efficient to use {@link #intStream(Spliterator.OfInt)} instead.
+     * The use of a {@code Supplier} in this form provides a level of
+     * indirection that reduces the scope of potential interference with the
+     * source.  Since the supplier is only invoked after the terminal operation
+     * commences, any modifications to the source up to the start of the
+     * terminal operation are reflected in the stream result.  See
+     * <a href="package-summary.html#Non-Interference">Non-Interference</a> for
+     * more details.
+     *
+     * @param supplier a {@code Supplier} of a {@code Spliterator.OfInt}
+     * @param characteristics Spliterator characteristics of the supplied
+     *        {@code Spliterator.OfInt}.  The characteristics must be equal to
+     *        {@code source.get().getCharacteristics()}
+     * @return a new sequential {@code IntStream}
+     * @see #intStream(Spliterator.OfInt)
+     */
+    public static IntStream intStream(Supplier<? extends Spliterator.OfInt> supplier,
+                                      int characteristics) {
+        return new IntPipeline.Head<>(supplier,
+                                      StreamOpFlag.fromCharacteristics(characteristics),
+                                      false);
+    }
+
+    /**
+     * Creates a new parallel {@code IntStream} from a {@code Supplier} of
+     * {@code Spliterator.OfInt}.
+     *
+     * <p>The {@link Supplier#get()} method will be invoked on the supplier no
+     * more than once, and after the terminal operation of the stream pipeline
+     * commences.
+     *
+     * <p>For spliterators that report a characteristic of {@code IMMUTABLE}
+     * or {@code CONCURRENT}, or that are
+     * <a href="Spliterator.html#binding">late-binding</a>, it is likely
+     * more efficient to use {@link #intStream(Spliterator.OfInt)} instead.
+     * The use of a {@code Supplier} in this form provides a level of
+     * indirection that reduces the scope of potential interference with the
+     * source.  Since the supplier is only invoked after the terminal operation
+     * commences, any modifications to the source up to the start of the
+     * terminal operation are reflected in the stream result.  See
+     * <a href="package-summary.html#Non-Interference">Non-Interference</a> for
+     * more details.
+     *
+     * @param supplier a {@code Supplier} of a {@code Spliterator.OfInt}
+     * @param characteristics Spliterator characteristics of the supplied
+     *        {@code Spliterator.OfInt}.  The characteristics must be equal to
+     *        {@code source.get().getCharacteristics()}
+     * @return a new parallel {@code IntStream}
+     * @see #intParallelStream(Spliterator.OfInt)
+     */
+    public static IntStream intParallelStream(Supplier<? extends Spliterator.OfInt> supplier,
+                                              int characteristics) {
+        return new IntPipeline.Head<>(supplier,
+                                      StreamOpFlag.fromCharacteristics(characteristics),
+                                      true);
+    }
+
+    /**
+     * Creates a new sequential {@code LongStream} from a {@code Spliterator.OfLong}.
+     *
+     * <p>The spliterator is only traversed, split, or queried for estimated
+     * size after the terminal operation of the stream pipeline commences.
+     *
+     * <p>It is strongly recommended the spliterator report a characteristic of
+     * {@code IMMUTABLE} or {@code CONCURRENT}, or be
+     * <a href="Spliterator.html#binding">late-binding</a>.  Otherwise,
+     * {@link #stream(Supplier, int)} should be used to
+     * reduce the scope of potential interference with the source.  See
+     * <a href="package-summary.html#Non-Interference">Non-Interference</a> for
+     * more details.
+     *
+     * @param spliterator a {@code Spliterator.OfLong} describing the stream
+     * elements
+     * @return a new sequential {@code LongStream}
+     */
+    public static LongStream longStream(Spliterator.OfLong spliterator) {
+        return new LongPipeline.Head<>(spliterator,
+                                       StreamOpFlag.fromCharacteristics(spliterator),
+                                       false);
+    }
+
+    /**
+     * Creates a new parallel {@code LongStream} from a {@code Spliterator.OfLong}.
+     *
+     * <p>The spliterator is only traversed, split, or queried for estimated
+     * size after the terminal operation of the stream pipeline commences.
+     *
+     * <p>It is strongly recommended the spliterator report a characteristic of
+     * {@code IMMUTABLE} or {@code CONCURRENT}, or be
+     * <a href="Spliterator.html#binding">late-binding</a>.  Otherwise,
+     * {@link #stream(Supplier, int)} should be used to
+     * reduce the scope of potential interference with the source.  See
+     * <a href="package-summary.html#Non-Interference">Non-Interference</a> for
+     * more details.
+     *
+     * @param spliterator a {@code Spliterator.OfLong} describing the stream elements
+     * @return a new parallel {@code LongStream}
+     */
+    public static LongStream longParallelStream(Spliterator.OfLong spliterator) {
+        return new LongPipeline.Head<>(spliterator,
+                                       StreamOpFlag.fromCharacteristics(spliterator),
+                                       true);
+    }
+
+    /**
+     * Creates a new sequential {@code LongStream} from a {@code Supplier} of
+     * {@code Spliterator.OfLong}.
+     *
+     * <p>The {@link Supplier#get()} method will be invoked on the supplier no
+     * more than once, and after the terminal operation of the stream pipeline
+     * commences.
+     *
+     * <p>For spliterators that report a characteristic of {@code IMMUTABLE}
+     * or {@code CONCURRENT}, or that are
+     * <a href="Spliterator.html#binding">late-binding</a>, it is likely
+     * more efficient to use {@link #longStream(Spliterator.OfLong)} instead.
+     * The use of a {@code Supplier} in this form provides a level of
+     * indirection that reduces the scope of potential interference with the
+     * source.  Since the supplier is only invoked after the terminal operation
+     * commences, any modifications to the source up to the start of the
+     * terminal operation are reflected in the stream result.  See
+     * <a href="package-summary.html#Non-Interference">Non-Interference</a> for
+     * more details.
+     *
+     * @param supplier a {@code Supplier} of a {@code Spliterator.OfLong}
+     * @param characteristics Spliterator characteristics of the supplied
+     *        {@code Spliterator.OfLong}.  The characteristics must be equal to
+     *        {@code source.get().getCharacteristics()}
+     * @return a new sequential {@code LongStream}
+     * @see #longStream(Spliterator.OfLong)
+     */
+    public static LongStream longStream(Supplier<? extends Spliterator.OfLong> supplier,
+                                        int characteristics) {
+        return new LongPipeline.Head<>(supplier,
+                                       StreamOpFlag.fromCharacteristics(characteristics),
+                                       false);
+    }
+
+    /**
+     * Creates a new parallel {@code LongStream} from a {@code Supplier} of
+     * {@code Spliterator.OfLong}.
+     *
+     * <p>The {@link Supplier#get()} method will be invoked on the supplier no
+     * more than once, and after the terminal operation of the stream pipeline
+     * commences.
+     *
+     * <p>For spliterators that report a characteristic of {@code IMMUTABLE}
+     * or {@code CONCURRENT}, or that are
+     * <a href="Spliterator.html#binding">late-binding</a>, it is likely
+     * more efficient to use {@link #longStream(Spliterator.OfLong)} instead.
+     * The use of a {@code Supplier} in this form provides a level of
+     * indirection that reduces the scope of potential interference with the
+     * source.  Since the supplier is only invoked after the terminal operation
+     * commences, any modifications to the source up to the start of the
+     * terminal operation are reflected in the stream result.  See
+     * <a href="package-summary.html#Non-Interference">Non-Interference</a> for
+     * more details.
+     *
+     * @param supplier A {@code Supplier} of a {@code Spliterator.OfLong}
+     * @param characteristics Spliterator characteristics of the supplied
+     *        {@code Spliterator.OfLong}.  The characteristics must be equal to
+     *        {@code source.get().getCharacteristics()}
+     * @return A new parallel {@code LongStream}
+     * @see #longParallelStream(Spliterator.OfLong)
+     */
+    public static LongStream longParallelStream(Supplier<? extends Spliterator.OfLong> supplier,
+                                                int characteristics) {
+        return new LongPipeline.Head<>(supplier,
+                                       StreamOpFlag.fromCharacteristics(characteristics),
+                                       true);
+    }
+
+    /**
+     * Creates a new sequential {@code DoubleStream} from a
+     * {@code Spliterator.OfDouble}.
+     *
+     * <p>The spliterator is only traversed, split, or queried for estimated size
+     * after the terminal operation of the stream pipeline commences.
+     *
+     * <p>It is strongly recommended the spliterator report a characteristic of
+     * {@code IMMUTABLE} or {@code CONCURRENT}, or be
+     * <a href="Spliterator.html#binding">late-binding</a>.  Otherwise,
+     * {@link #stream(Supplier, int)} should be used to
+     * reduce the scope of potential interference with the source.  See
+     * <a href="package-summary.html#Non-Interference">Non-Interference</a> for
+     * more details.
+     *
+     * @param spliterator A {@code Spliterator.OfDouble} describing the stream elements
+     * @return A new sequential {@code DoubleStream}
+     */
+    public static DoubleStream doubleStream(Spliterator.OfDouble spliterator) {
+        return new DoublePipeline.Head<>(spliterator,
+                                         StreamOpFlag.fromCharacteristics(spliterator),
+                                         false);
+    }
+
+    /**
+     * Creates a new parallel {@code DoubleStream} from a
+     * {@code Spliterator.OfDouble}.
+     *
+     * <p>The spliterator is only traversed, split, or queried for estimated size
+     * after the terminal operation of the stream pipeline commences.
+     *
+     * <p>It is strongly recommended the spliterator report a characteristic of
+     * {@code IMMUTABLE} or {@code CONCURRENT}, or be
+     * <a href="Spliterator.html#binding">late-binding</a>.  Otherwise,
+     * {@link #stream(Supplier, int)} should be used to
+     * reduce the scope of potential interference with the source.  See
+     * <a href="package-summary.html#Non-Interference">Non-Interference</a> for
+     * more details.
+     *
+     * @param spliterator A {@code Spliterator.OfDouble} describing the stream elements
+     * @return A new parallel {@code DoubleStream}
+     */
+    public static DoubleStream doubleParallelStream(Spliterator.OfDouble spliterator) {
+        return new DoublePipeline.Head<>(spliterator,
+                                         StreamOpFlag.fromCharacteristics(spliterator),
+                                         true);
+    }
+
+    /**
+     * Creates a new sequential {@code DoubleStream} from a {@code Supplier} of
+     * {@code Spliterator.OfDouble}.
+     * <p>
+     * The {@link Supplier#get()} method will be invoked on the supplier no
+     * more than once, and after the terminal operation of the stream pipeline
+     * commences.
+     * <p>
+     * For spliterators that report a characteristic of {@code IMMUTABLE}
+     * or {@code CONCURRENT}, or that are
+     * <a href="Spliterator.html#binding">late-binding</a>, it is likely
+     * more efficient to use {@link #doubleStream(Spliterator.OfDouble)} instead.
+     * The use of a {@code Supplier} in this form provides a level of
+     * indirection that reduces the scope of potential interference with the
+     * source.  Since the supplier is only invoked after the terminal operation
+     * commences, any modifications to the source up to the start of the
+     * terminal operation are reflected in the stream result.  See
+     * <a href="package-summary.html#Non-Interference">Non-Interference</a> for
+     * more details.
+     *
+     * @param supplier A {@code Supplier} of a {@code Spliterator.OfDouble}
+     * @param characteristics Spliterator characteristics of the supplied
+     *        {@code Spliterator.OfDouble}.  The characteristics must be equal to
+     *        {@code source.get().getCharacteristics()}
+     * @return A new sequential {@code DoubleStream}
+     * @see #doubleStream(Spliterator.OfDouble)
+     */
+    public static DoubleStream doubleStream(Supplier<? extends Spliterator.OfDouble> supplier,
+                                            int characteristics) {
+        return new DoublePipeline.Head<>(supplier,
+                                         StreamOpFlag.fromCharacteristics(characteristics),
+                                         false);
+    }
+
+    /**
+     * Creates a new parallel {@code DoubleStream} from a {@code Supplier} of
+     * {@code Spliterator.OfDouble}.
+     *
+     * <p>The {@link Supplier#get()} method will be invoked on the supplier no
+     * more than once, and after the terminal operation of the stream pipeline
+     * commences.
+     *
+     * <p>For spliterators that report a characteristic of {@code IMMUTABLE}
+     * or {@code CONCURRENT}, or that are
+     * <a href="Spliterator.html#binding">late-binding</a>, it is likely
+     * more efficient to use {@link #doubleStream(Spliterator.OfDouble)} instead.
+     * The use of a {@code Supplier} in this form provides a level of
+     * indirection that reduces the scope of potential interference with the
+     * source.  Since the supplier is only invoked after the terminal operation
+     * commences, any modifications to the source up to the start of the
+     * terminal operation are reflected in the stream result.  See
+     * <a href="package-summary.html#Non-Interference">Non-Interference</a> for
+     * more details.
+     *
+     * @param supplier a {@code Supplier} of a {@code Spliterator.OfDouble}
+     * @param characteristics Spliterator characteristics of the supplied
+     *        {@code Spliterator.OfDouble}.  The characteristics must be equal to
+     *        {@code source.get().getCharacteristics()}
+     * @return a new parallel {@code DoubleStream}
+     * @see #doubleParallelStream(Spliterator.OfDouble)
+     */
+    public static DoubleStream doubleParallelStream(Supplier<? extends Spliterator.OfDouble> supplier,
+                                                    int characteristics) {
+        return new DoublePipeline.Head<>(supplier,
+                                         StreamOpFlag.fromCharacteristics(characteristics),
+                                         true);
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/stream/Streams.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,656 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.stream;
+
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Objects;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.DoubleConsumer;
+import java.util.function.IntConsumer;
+import java.util.function.LongConsumer;
+
+/**
+ * Utility methods for operating on and creating streams.
+ *
+ * <p>Unless otherwise stated, streams are created as sequential streams.  A
+ * sequential stream can be transformed into a parallel stream by calling the
+ * {@code parallel()} method on the created stream.
+ *
+ * @since 1.8
+ */
+class Streams {
+
+    private Streams() {
+        throw new Error("no instances");
+    }
+
+    /**
+     * An object instance representing no value, that cannot be an actual
+     * data element of a stream.  Used when processing streams that can contain
+     * {@code null} elements to distinguish between a {@code null} value and no
+     * value.
+     */
+    static final Object NONE = new Object();
+
+    /**
+     * An {@code int} range spliterator.
+     */
+    static final class RangeIntSpliterator implements Spliterator.OfInt {
+        private int from;
+        private final int upTo;
+        private final int step;
+
+        RangeIntSpliterator(int from, int upTo, int step) {
+            this.from = from;
+            this.upTo = upTo;
+            this.step = step;
+        }
+
+        @Override
+        public boolean tryAdvance(IntConsumer consumer) {
+            boolean hasNext = from < upTo;
+            if (hasNext) {
+                consumer.accept(from);
+                from += step;
+            }
+            return hasNext;
+        }
+
+        @Override
+        public void forEachRemaining(IntConsumer consumer) {
+            int hUpTo = upTo;
+            int hStep = step; // hoist accesses and checks from loop
+            for (int i = from; i < hUpTo; i += hStep)
+                consumer.accept(i);
+            from = upTo;
+        }
+
+        @Override
+        public long estimateSize() {
+            int d = upTo - from;
+            return (d / step) + ((d % step == 0) ? 0 : 1);
+        }
+
+        @Override
+        public int characteristics() {
+            return Spliterator.ORDERED | Spliterator.SIZED | Spliterator.SUBSIZED |
+                   Spliterator.IMMUTABLE | Spliterator.NONNULL |
+                   Spliterator.DISTINCT | Spliterator.SORTED;
+        }
+
+        @Override
+        public Comparator<? super Integer> getComparator() {
+            return null;
+        }
+
+        @Override
+        public Spliterator.OfInt trySplit() {
+            return estimateSize() <= 1
+                   ? null
+                   : new RangeIntSpliterator(from, from = from + midPoint(), step);
+        }
+
+        private int midPoint() {
+            // Size is known to be >= 2
+            int bisection = (upTo - from) / 2;
+            // If bisection > step then round down to nearest multiple of step
+            // otherwise round up to step
+            return bisection > step ? bisection - bisection % step : step;
+        }
+    }
+
+    /**
+     * A {@code long} range spliterator.
+     */
+    static final class RangeLongSpliterator implements Spliterator.OfLong {
+        private long from;
+        private final long upTo;
+        private final long step;
+
+        RangeLongSpliterator(long from, long upTo, long step) {
+            this.from = from;
+            this.upTo = upTo;
+            this.step = step;
+        }
+
+        @Override
+        public boolean tryAdvance(LongConsumer consumer) {
+            boolean hasNext = from < upTo;
+            if (hasNext) {
+                consumer.accept(from);
+                from += step;
+            }
+            return hasNext;
+        }
+
+        @Override
+        public void forEachRemaining(LongConsumer consumer) {
+            long hUpTo = upTo;
+            long hStep = step; // hoist accesses and checks from loop
+            for (long i = from; i < hUpTo; i += hStep)
+                consumer.accept(i);
+            from = upTo;
+        }
+
+        @Override
+        public long estimateSize() {
+            long d = upTo - from;
+            return (d / step) + ((d % step == 0) ? 0 : 1);
+        }
+
+        @Override
+        public int characteristics() {
+            return Spliterator.ORDERED | Spliterator.SIZED | Spliterator.SUBSIZED |
+                   Spliterator.IMMUTABLE | Spliterator.NONNULL |
+                   Spliterator.DISTINCT | Spliterator.SORTED;
+        }
+
+        @Override
+        public Comparator<? super Long> getComparator() {
+            return null;
+        }
+
+        @Override
+        public Spliterator.OfLong trySplit() {
+            return estimateSize() <= 1
+                   ? null
+                   : new RangeLongSpliterator(from, from = from + midPoint(), step);
+        }
+
+        private long midPoint() {
+            // Size is known to be >= 2
+            long bisection = (upTo - from) / 2;
+            // If bisection > step then round down to nearest multiple of step
+            // otherwise round up to step
+            return bisection > step ? bisection - bisection % step : step;
+        }
+    }
+
+    /**
+     * A {@code double} range spliterator.
+     *
+     * <p>The traversing and splitting logic is equivalent to that of
+     * {@code RangeLongSpliterator} for increasing values with a {@code step} of
+     * {@code 1}.
+     *
+     *  <p>A {@code double} value is calculated from the function
+     * {@code start + i * step} where {@code i} is the absolute position of the
+     * value when traversing an instance of this class that has not been split.
+     * This ensures the same values are produced at the same absolute positions
+     * regardless of how an instance of this class is split or traversed.
+     */
+    static final class RangeDoubleSpliterator implements Spliterator.OfDouble {
+        private final double from;
+        private final double upTo;
+        private final double step;
+
+        private long lFrom;
+        private final long lUpTo;
+
+        RangeDoubleSpliterator(double from, double upTo, double step, long lFrom, long lUpTo) {
+            this.from = from;
+            this.upTo = upTo;
+            this.step = step;
+            this.lFrom = lFrom;
+            this.lUpTo = lUpTo;
+        }
+
+        @Override
+        public boolean tryAdvance(DoubleConsumer consumer) {
+            boolean hasNext = lFrom < lUpTo;
+            if (hasNext) {
+                consumer.accept(from + lFrom * step);
+                lFrom++;
+            }
+            return hasNext;
+        }
+
+        @Override
+        public void forEachRemaining(DoubleConsumer consumer) {
+            double hOrigin = from;
+            double hStep = step;
+            long hLUpTo = lUpTo;
+            long i = lFrom;
+            for (; i < hLUpTo; i++) {
+                consumer.accept(hOrigin + i * hStep);
+            }
+            lFrom = i;
+        }
+
+        @Override
+        public long estimateSize() {
+            return lUpTo - lFrom;
+        }
+
+        @Override
+        public int characteristics() {
+            return Spliterator.ORDERED | Spliterator.SIZED | Spliterator.SUBSIZED |
+                   Spliterator.IMMUTABLE | Spliterator.NONNULL |
+                   Spliterator.DISTINCT | Spliterator.SORTED;
+        }
+
+        @Override
+        public Comparator<? super Double> getComparator() {
+            return null;
+        }
+
+        @Override
+        public Spliterator.OfDouble trySplit() {
+            return estimateSize() <= 1
+                   ? null
+                   : new RangeDoubleSpliterator(from, upTo, step, lFrom, lFrom = lFrom + midPoint());
+        }
+
+        private long midPoint() {
+            // Size is known to be >= 2
+            return (lUpTo - lFrom) / 2;
+        }
+    }
+
+    private static abstract class AbstractStreamBuilderImpl<T, S extends Spliterator<T>> implements Spliterator<T> {
+        // >= 0 when building, < 0 when built
+        // -1 == no elements
+        // -2 == one element, held by first
+        // -3 == two or more elements, held by buffer
+        int count;
+
+        // Spliterator implementation for 0 or 1 element
+        // count == -1 for no elements
+        // count == -2 for one element held by first
+
+        @Override
+        public S trySplit() {
+            return null;
+        }
+
+        @Override
+        public long estimateSize() {
+            return -count - 1;
+        }
+
+        @Override
+        public int characteristics() {
+            return Spliterator.SIZED | Spliterator.SUBSIZED |
+                   Spliterator.ORDERED | Spliterator.IMMUTABLE;
+        }
+    }
+
+    static final class StreamBuilderImpl<T>
+            extends AbstractStreamBuilderImpl<T, Spliterator<T>>
+            implements StreamBuilder<T> {
+        // The first element in the stream
+        // valid if count == 1
+        T first;
+
+        // The first and subsequent elements in the stream
+        // non-null if count == 2
+        SpinedBuffer<T> buffer;
+
+        /**
+         * Constructor for building a stream of 0 or more elements.
+         */
+        StreamBuilderImpl() { }
+
+        /**
+         * Constructor for a singleton stream.
+         *
+         * @param t the single element
+         */
+        StreamBuilderImpl(T t) {
+            first = t;
+            count = -2;
+        }
+
+        // StreamBuilder implementation
+
+        @Override
+        public void accept(T t) {
+            if (count == 0) {
+                first = t;
+                count++;
+            }
+            else if (count > 0) {
+                if (buffer == null) {
+                    buffer = new SpinedBuffer<>();
+                    buffer.accept(first);
+                    count++;
+                }
+
+                buffer.accept(t);
+            }
+            else {
+                throw new IllegalStateException();
+            }
+        }
+
+        public StreamBuilder<T> add(T t) {
+            accept(t);
+            return this;
+        }
+
+        @Override
+        public Stream<T> build() {
+            int c = count;
+            if (c >= 0) {
+                // Switch count to negative value signalling the builder is built
+                count = -count - 1;
+                // Use this spliterator if 0 or 1 elements, otherwise use
+                // the spliterator of the spined buffer
+                return (c < 2) ? StreamSupport.stream(this) : StreamSupport.stream(buffer.spliterator());
+            }
+
+            throw new IllegalStateException();
+        }
+
+        // Spliterator implementation for 0 or 1 element
+        // count == -1 for no elements
+        // count == -2 for one element held by first
+
+        @Override
+        public boolean tryAdvance(Consumer<? super T> action) {
+            if (count == -2) {
+                action.accept(first);
+                count = -1;
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+
+        @Override
+        public void forEachRemaining(Consumer<? super T> action) {
+            if (count == -2) {
+                action.accept(first);
+                count = -1;
+            }
+        }
+    }
+
+    static final class IntStreamBuilderImpl
+            extends AbstractStreamBuilderImpl<Integer, Spliterator.OfInt>
+            implements StreamBuilder.OfInt, Spliterator.OfInt {
+        // The first element in the stream
+        // valid if count == 1
+        int first;
+
+        // The first and subsequent elements in the stream
+        // non-null if count == 2
+        SpinedBuffer.OfInt buffer;
+
+        /**
+         * Constructor for building a stream of 0 or more elements.
+         */
+        IntStreamBuilderImpl() { }
+
+        /**
+         * Constructor for a singleton stream.
+         *
+         * @param t the single element
+         */
+        IntStreamBuilderImpl(int t) {
+            first = t;
+            count = -2;
+        }
+
+        // StreamBuilder implementation
+
+        @Override
+        public void accept(int t) {
+            if (count == 0) {
+                first = t;
+                count++;
+            }
+            else if (count > 0) {
+                if (buffer == null) {
+                    buffer = new SpinedBuffer.OfInt();
+                    buffer.accept(first);
+                    count++;
+                }
+
+                buffer.accept(t);
+            }
+            else {
+                throw new IllegalStateException();
+            }
+        }
+
+        @Override
+        public IntStream build() {
+            int c = count;
+            if (c >= 0) {
+                // Switch count to negative value signalling the builder is built
+                count = -count - 1;
+                // Use this spliterator if 0 or 1 elements, otherwise use
+                // the spliterator of the spined buffer
+                return (c < 2) ? StreamSupport.intStream(this) : StreamSupport.intStream(buffer.spliterator());
+            }
+
+            throw new IllegalStateException();
+        }
+
+        // Spliterator implementation for 0 or 1 element
+        // count == -1 for no elements
+        // count == -2 for one element held by first
+
+        @Override
+        public boolean tryAdvance(IntConsumer action) {
+            if (count == -2) {
+                action.accept(first);
+                count = -1;
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+
+        @Override
+        public void forEachRemaining(IntConsumer action) {
+            if (count == -2) {
+                action.accept(first);
+                count = -1;
+            }
+        }
+    }
+
+    static final class LongStreamBuilderImpl
+            extends AbstractStreamBuilderImpl<Long, Spliterator.OfLong>
+            implements StreamBuilder.OfLong, Spliterator.OfLong {
+        // The first element in the stream
+        // valid if count == 1
+        long first;
+
+        // The first and subsequent elements in the stream
+        // non-null if count == 2
+        SpinedBuffer.OfLong buffer;
+
+        /**
+         * Constructor for building a stream of 0 or more elements.
+         */
+        LongStreamBuilderImpl() { }
+
+        /**
+         * Constructor for a singleton stream.
+         *
+         * @param t the single element
+         */
+        LongStreamBuilderImpl(long t) {
+            first = t;
+            count = -2;
+        }
+
+        // StreamBuilder implementation
+
+        @Override
+        public void accept(long t) {
+            if (count == 0) {
+                first = t;
+                count++;
+            }
+            else if (count > 0) {
+                if (buffer == null) {
+                    buffer = new SpinedBuffer.OfLong();
+                    buffer.accept(first);
+                    count++;
+                }
+
+                buffer.accept(t);
+            }
+            else {
+                throw new IllegalStateException();
+            }
+        }
+
+        @Override
+        public LongStream build() {
+            int c = count;
+            if (c >= 0) {
+                // Switch count to negative value signalling the builder is built
+                count = -count - 1;
+                // Use this spliterator if 0 or 1 elements, otherwise use
+                // the spliterator of the spined buffer
+                return (c < 2) ? StreamSupport.longStream(this) : StreamSupport.longStream(buffer.spliterator());
+            }
+
+            throw new IllegalStateException();
+        }
+
+        // Spliterator implementation for 0 or 1 element
+        // count == -1 for no elements
+        // count == -2 for one element held by first
+
+        @Override
+        public boolean tryAdvance(LongConsumer action) {
+            if (count == -2) {
+                action.accept(first);
+                count = -1;
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+
+        @Override
+        public void forEachRemaining(LongConsumer action) {
+            if (count == -2) {
+                action.accept(first);
+                count = -1;
+            }
+        }
+    }
+
+    static final class DoubleStreamBuilderImpl
+            extends AbstractStreamBuilderImpl<Double, Spliterator.OfDouble>
+            implements StreamBuilder.OfDouble, Spliterator.OfDouble {
+        // The first element in the stream
+        // valid if count == 1
+        double first;
+
+        // The first and subsequent elements in the stream
+        // non-null if count == 2
+        SpinedBuffer.OfDouble buffer;
+
+        /**
+         * Constructor for building a stream of 0 or more elements.
+         */
+        DoubleStreamBuilderImpl() { }
+
+        /**
+         * Constructor for a singleton stream.
+         *
+         * @param t the single element
+         */
+        DoubleStreamBuilderImpl(double t) {
+            first = t;
+            count = -2;
+        }
+
+        // StreamBuilder implementation
+
+        @Override
+        public void accept(double t) {
+            if (count == 0) {
+                first = t;
+                count++;
+            }
+            else if (count > 0) {
+                if (buffer == null) {
+                    buffer = new SpinedBuffer.OfDouble();
+                    buffer.accept(first);
+                    count++;
+                }
+
+                buffer.accept(t);
+            }
+            else {
+                throw new IllegalStateException();
+            }
+        }
+
+        @Override
+        public DoubleStream build() {
+            int c = count;
+            if (c >= 0) {
+                // Switch count to negative value signalling the builder is built
+                count = -count - 1;
+                // Use this spliterator if 0 or 1 elements, otherwise use
+                // the spliterator of the spined buffer
+                return (c < 2) ? StreamSupport.doubleStream(this) : StreamSupport.doubleStream(buffer.spliterator());
+            }
+
+            throw new IllegalStateException();
+        }
+
+        // Spliterator implementation for 0 or 1 element
+        // count == -1 for no elements
+        // count == -2 for one element held by first
+
+        @Override
+        public boolean tryAdvance(DoubleConsumer action) {
+            if (count == -2) {
+                action.accept(first);
+                count = -1;
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+
+        @Override
+        public void forEachRemaining(DoubleConsumer action) {
+            if (count == -2) {
+                action.accept(first);
+                count = -1;
+            }
+        }
+    }
+}
--- a/jdk/src/share/classes/javax/swing/JDesktopPane.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/javax/swing/JDesktopPane.java	Wed May 08 11:22:25 2013 +0100
@@ -428,6 +428,15 @@
     }
 
     /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void remove(Component comp) {
+        super.remove(comp);
+        updateFramesCache();
+    }
+
+    /**
      * Selects the next <code>JInternalFrame</code> in this desktop pane.
      *
      * @param forward a boolean indicating which direction to select in;
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_de.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_de.java	Wed May 08 11:22:25 2013 +0100
@@ -109,7 +109,7 @@
             {"appletclassloader.getresourceasstream.verbose", "Ressource {0} als Systemressource gefunden"},
             {"appletpanel.runloader.err", "Objekt oder Codeparameter."},
             {"appletpanel.runloader.exception", "Ausnahme beim Deserialisieren von {0}"},
-            {"appletpanel.destroyed", "Applet endg\u00FCltig gel\u00F6scht."},
+            {"appletpanel.destroyed", "Applet zerst\u00F6rt."},
             {"appletpanel.loaded", "Applet geladen."},
             {"appletpanel.started", "Applet gestartet."},
             {"appletpanel.inited", "Applet initialisiert."},
@@ -127,8 +127,8 @@
             {"appletpanel.notloaded", "Init.: Applet nicht geladen."},
             {"appletpanel.notinited", "Starten: Applet nicht initialisiert."},
             {"appletpanel.notstarted", "Stoppen: Applet nicht gestartet."},
-            {"appletpanel.notstopped", "Endg\u00FCltig l\u00F6schen: Applet nicht gestoppt."},
-            {"appletpanel.notdestroyed", "Verwerfen: Applet nicht endg\u00FCltig gel\u00F6scht."},
+            {"appletpanel.notstopped", "Zerst\u00F6ren: Applet nicht gestoppt."},
+            {"appletpanel.notdestroyed", "Verwerfen: Applet nicht zerst\u00F6rt."},
             {"appletpanel.notdisposed", "Laden: Applet nicht verworfen."},
             {"appletpanel.bail", "Unterbrochen: Zur\u00FCckziehen."},
             {"appletpanel.filenotfound", "Datei nicht gefunden beim Suchen nach: {0}"},
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java	Wed May 08 11:22:25 2013 +0100
@@ -38,7 +38,7 @@
             {"appletviewer.menuitem.stop", "\u505C\u6B62"},
             {"appletviewer.menuitem.save", "\u4FDD\u5B58..."},
             {"appletviewer.menuitem.start", "\u958B\u59CB"},
-            {"appletviewer.menuitem.clone", "\u30AF\u30ED\u30FC\u30F3\u306E\u4F5C\u6210..."},
+            {"appletviewer.menuitem.clone", "\u30AF\u30ED\u30FC\u30F3..."},
             {"appletviewer.menuitem.tag", "\u30BF\u30B0..."},
             {"appletviewer.menuitem.info", "\u60C5\u5831..."},
             {"appletviewer.menuitem.edit", "\u7DE8\u96C6"},
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java	Wed May 08 11:22:25 2013 +0100
@@ -87,7 +87,7 @@
             {"appletviewer.main.err.prop.cantsave", "N\u00E3o \u00E9 poss\u00EDvel salvar o arquivo de propriedades do usu\u00E1rio: {0}"},
             {"appletviewer.main.warn.nosecmgr", "Advert\u00EAncia: desativando a seguran\u00E7a."},
             {"appletviewer.main.debug.cantfinddebug", "N\u00E3o \u00E9 poss\u00EDvel localizar o depurador!"},
-            {"appletviewer.main.debug.cantfindmain", "N\u00E3o \u00E9 poss\u00EDvel localizar o m\u00E9todo principal no depurador!"},
+            {"appletviewer.main.debug.cantfindmain", "N\u00E3o \u00E9 poss\u00EDvel localizar o m\u00E9todo main no depurador!"},
             {"appletviewer.main.debug.exceptionindebug", "Exce\u00E7\u00E3o no depurador!"},
             {"appletviewer.main.debug.cantaccess", "N\u00E3o \u00E9 poss\u00EDvel acessar o depurador!"},
             {"appletviewer.main.nosecmgr", "Advert\u00EAncia: SecurityManager n\u00E3o instalado!"},
@@ -137,7 +137,7 @@
             {"appletpanel.fileexception", "exce\u00E7\u00E3o de {0} ao carregar: {1}"},
             {"appletpanel.filedeath", "{0} eliminado ao carregar: {1}"},
             {"appletpanel.fileerror", "erro de {0} ao carregar: {1}"},
-            {"appletpanel.badattribute.exception", "Parse de HTML: valor incorreto do atributo de largura/altura"},
+            {"appletpanel.badattribute.exception", "Parsing de HTML: valor incorreto do atributo de largura/altura"},
             {"appletillegalargumentexception.objectinputstream", "AppletObjectInputStream requer um carregador n\u00E3o nulo"},
             {"appletprops.title", "Propriedades do AppletViewer"},
             {"appletprops.label.http.server", "Servidor proxy Http:"},
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java	Wed May 08 11:22:25 2013 +0100
@@ -98,11 +98,11 @@
             {"appletioexception.loadclass.throw.notloaded", "klass inte inl\u00E4st: {0}"},
             {"appletclassloader.loadcode.verbose", "\u00D6ppnar str\u00F6m till: {0} f\u00F6r h\u00E4mtning av {1}"},
             {"appletclassloader.filenotfound", "Hittade inte fil vid s\u00F6kning efter: {0}"},
-            {"appletclassloader.fileformat", "Undantag av filformat vid l\u00E4sning av: {0}"},
-            {"appletclassloader.fileioexception", "I/O-undantag vid l\u00E4sning: {0}"},
-            {"appletclassloader.fileexception", "{0} undantag vid l\u00E4sning: {1}"},
-            {"appletclassloader.filedeath", "{0} avslutad vid l\u00E4sning: {1}"},
-            {"appletclassloader.fileerror", "{0} fel vid l\u00E4sning: {1}"},
+            {"appletclassloader.fileformat", "Undantag av filformat vid laddning av: {0}"},
+            {"appletclassloader.fileioexception", "I/O-undantag vid laddning: {0}"},
+            {"appletclassloader.fileexception", "{0} undantag vid laddning: {1}"},
+            {"appletclassloader.filedeath", "{0} avslutad vid laddning: {1}"},
+            {"appletclassloader.fileerror", "{0} fel vid laddning: {1}"},
             {"appletclassloader.findclass.verbose.openstream", "\u00D6ppnar str\u00F6m till: {0} f\u00F6r h\u00E4mtning av {1}"},
             {"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource f\u00F6r namnet: {0}"},
             {"appletclassloader.getresource.verbose.found", "Hittade resursen: {0} som systemresurs"},
@@ -132,11 +132,11 @@
             {"appletpanel.notdisposed", "Ladda: applet har inte kasserats."},
             {"appletpanel.bail", "Avbruten."},
             {"appletpanel.filenotfound", "Hittade inte fil vid s\u00F6kning efter: {0}"},
-            {"appletpanel.fileformat", "Undantag av filformat vid l\u00E4sning av: {0}"},
-            {"appletpanel.fileioexception", "I/O-undantag vid l\u00E4sning: {0}"},
-            {"appletpanel.fileexception", "{0} undantag vid l\u00E4sning: {1}"},
-            {"appletpanel.filedeath", "{0} avslutad vid l\u00E4sning: {1}"},
-            {"appletpanel.fileerror", "{0} fel vid l\u00E4sning: {1}"},
+            {"appletpanel.fileformat", "Undantag av filformat vid laddning av: {0}"},
+            {"appletpanel.fileioexception", "I/O-undantag vid laddning: {0}"},
+            {"appletpanel.fileexception", "{0} undantag vid laddning: {1}"},
+            {"appletpanel.filedeath", "{0} avslutad vid laddning: {1}"},
+            {"appletpanel.fileerror", "{0} fel vid laddning: {1}"},
             {"appletpanel.badattribute.exception", "HTML-tolkning: felaktigt v\u00E4rde f\u00F6r bredd-/h\u00F6jdattribut"},
             {"appletillegalargumentexception.objectinputstream", "AppletObjectInputStream kr\u00E4ver laddare med icke-null"},
             {"appletprops.title", "AppletViewer-egenskaper"},
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java	Wed May 08 11:22:25 2013 +0100
@@ -87,7 +87,7 @@
             {"appletviewer.main.err.prop.cantsave", "\u65E0\u6CD5\u4FDD\u5B58\u7528\u6237\u5C5E\u6027\u6587\u4EF6: {0}"},
             {"appletviewer.main.warn.nosecmgr", "\u8B66\u544A: \u7981\u7528\u5B89\u5168\u3002"},
             {"appletviewer.main.debug.cantfinddebug", "\u627E\u4E0D\u5230\u8C03\u8BD5\u5668!"},
-            {"appletviewer.main.debug.cantfindmain", "\u5728\u8C03\u8BD5\u5668\u4E2D\u627E\u4E0D\u5230\u4E3B\u8981\u65B9\u6CD5!"},
+            {"appletviewer.main.debug.cantfindmain", "\u5728\u8C03\u8BD5\u5668\u4E2D\u627E\u4E0D\u5230 main \u65B9\u6CD5!"},
             {"appletviewer.main.debug.exceptionindebug", "\u8C03\u8BD5\u5668\u4E2D\u5B58\u5728\u5F02\u5E38\u9519\u8BEF!"},
             {"appletviewer.main.debug.cantaccess", "\u65E0\u6CD5\u8BBF\u95EE\u8C03\u8BD5\u5668!"},
             {"appletviewer.main.nosecmgr", "\u8B66\u544A: \u672A\u5B89\u88C5 SecurityManager!"},
@@ -154,7 +154,7 @@
             {"appletprops.choice.unsignedapplet.yes", "\u662F"},
             {"appletprops.button.apply", "\u5E94\u7528"},
             {"appletprops.button.cancel", "\u53D6\u6D88"},
-            {"appletprops.button.reset", "\u91CD\u8BBE"},
+            {"appletprops.button.reset", "\u91CD\u7F6E"},
             {"appletprops.apply.exception", "\u65E0\u6CD5\u4FDD\u5B58\u5C5E\u6027: {0}"},
             /* 4066432 */
             {"appletprops.title.invalidproxy", "\u6761\u76EE\u65E0\u6548"},
--- a/jdk/src/share/classes/sun/awt/resources/awt_de.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/awt/resources/awt_de.properties	Wed May 08 11:22:25 2013 +0100
@@ -105,7 +105,7 @@
 AWT.colon=Doppelpunkt
 AWT.circumflex=Zirkumflex
 AWT.dollar=Dollarzeichen
-AWT.euro=Euro-Zeichen
+AWT.euro=Euro
 AWT.exclamationMark=Ausrufezeichen
 AWT.invertedExclamationMark=Umgekehrtes Ausrufezeichen
 AWT.leftParenthesis=Linke Klammer
--- a/jdk/src/share/classes/sun/awt/resources/awt_es.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/awt/resources/awt_es.properties	Wed May 08 11:22:25 2013 +0100
@@ -4,7 +4,7 @@
 #
 
 # Modifier names
-AWT.shift=May\u00FAsculas
+AWT.shift=May\u00FAs
 AWT.control=Ctrl
 AWT.alt=Alt
 AWT.meta=Meta
--- a/jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties	Wed May 08 11:22:25 2013 +0100
@@ -44,7 +44,7 @@
 AWT.subtract=Teclado Num\u00E9rico -
 AWT.decimal=Teclado Num\u00E9rico .
 AWT.divide=Teclado Num\u00E9rico /
-AWT.delete=Delete
+AWT.delete=Deletar
 AWT.numLock=Num Lock
 AWT.scrollLock=Scroll Lock
 AWT.f1=F1
--- a/jdk/src/share/classes/sun/awt/resources/awt_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/awt/resources/awt_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -174,7 +174,7 @@
 AWT.InputMethodSelectionMenu=\u9009\u62E9\u8F93\u5165\u7A97\u53E3
 AWT.HostInputMethodDisplayName=\u7CFB\u7EDF\u8F93\u5165\u6CD5
 AWT.InputMethodLanguage.ja=\u65E5\u6587
-AWT.InputMethodLanguage.ko=\u97E9\u6587
+AWT.InputMethodLanguage.ko=\u671D\u9C9C\u6587
 AWT.InputMethodLanguage.zh=\u4E2D\u6587
 AWT.InputMethodLanguage.zh_CN=\u7B80\u4F53\u4E2D\u6587
 AWT.InputMethodLanguage.zh_TW=\u7E41\u4F53\u4E2D\u6587
--- a/jdk/src/share/classes/sun/java2d/pipe/AAShapePipe.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/java2d/pipe/AAShapePipe.java	Wed May 08 11:22:25 2013 +0100
@@ -127,7 +127,7 @@
 
     private static byte[] theTile;
 
-    public synchronized static byte[] getAlphaTile(int len) {
+    private synchronized static byte[] getAlphaTile(int len) {
         byte[] t = theTile;
         if (t == null || t.length < len) {
             t = new byte[len];
@@ -137,7 +137,7 @@
         return t;
     }
 
-    public synchronized static void dropAlphaTile(byte[] t) {
+    private synchronized static void dropAlphaTile(byte[] t) {
         theTile = t;
     }
 
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_de.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   Verwendung: {0} [-options] class [args...]\n\           (zur Ausf\u00FChrung einer Klasse)\n   oder  {0} [-options] -jar jarfile [args...]\n\           (zur Ausf\u00FChrung einer JAR-Datei)\nwobei options Folgendes umfasst:\n
+java.launcher.opt.header  =   Verwendung: {0} [-options] class [args...]\n           (zur Ausf\u00FChrung einer Klasse)\n   oder  {0} [-options] -jar jarfile [args...]\n           (zur Ausf\u00FChrung einer JAR-Datei)\nwobei options Folgendes umfasst:\n
 
 java.launcher.opt.datamodel  =\    -d{0}\t  Verwendet ein {0}-Bit-Datenmodell, sofern verf\u00FCgbar\n
 java.launcher.opt.vmselect   =\    {0}\t  zur Auswahl der "{1}" VM\n
@@ -34,15 +34,21 @@
 java.launcher.ergo.message2  =\                  weil die Ausf\u00FChrung auf einem Server-Class-Rechner erfolgt.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer     =\    -cp <Class-Suchpfad von Verzeichnissen und ZIP-/JAR-Dateien>\n\    -classpath <Class-Suchpfad von Verzeichnissen und ZIP-/JAR-Dateien>\n\                  Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n\                  und ZIP-Archiven zur Suche nach Klassendateien.\n\    -D<name>=<value>\n\                  Setzt eine Systemeigenschaft\n\    -verbose[:class|gc|jni]\n\                  Aktiviert die Verbose-Ausgabe\n\    -version      Druckt Produktversion und beendet das Programm\n\    -version:<value>\n\                  Erfordert die angegebene Version zur Ausf\u00FChrung\n\    -showversion  Druckt Produktversion und f\u00E4hrt fort\n\    -jre-restrict-search | -no-jre-restrict-search\n\                  Bezieht private JREs des Benutzers in Versionssuche ein bzw. schlie\u00DFt sie aus\n\    -? -help      Druckt diese Hilfemeldung\n\    -X            Druckt Hilfe zu Nicht-Standardoptionen\n\    -ea[:<packagename>...|:<classname>]\n\    -enableassertions[:<packagename>...|:<classname>]\n\                  Aktiviert Assertionen mit angegebener Granularit\u00E4t\n\    -da[:<packagename>...|:<classname>]\n\    -disableassertions[:<packagename>...|:<classname>]\n\                  Deaktiviert Assertionen mit angegebener Granularit\u00E4t\n\    -esa | -enablesystemassertions\n\                  Aktiviert Systemassertionen\n\    -dsa | -disablesystemassertions\n\                  Deaktiviert Systemassertionen\n\    -agentlib:<libname>[=<options>]\n\                  L\u00E4dt native Agent Library <libname>, z.B. -agentlib:hprof\n\                  siehe auch, -agentlib:jdwp=help und -agentlib:hprof=help\n\    -agentpath:<pathname>[=<options>]\n\                  L\u00E4dt native Agent Library nach vollem Pfadnamen\n\    -javaagent:<jarpath>[=<options>]\n\                  L\u00E4dt Java-Programmiersprachen-Agent, siehe java.lang.instrument\n\    -splash:<imagepath>\n\                  Zeigt Startbildschirm mit angegebenem Bild\nWeitere Einzelheiten finden Sie unter http://java.sun.com/javase/reference.
+java.launcher.opt.footer     =\    -cp <Klassensuchpfad von Verzeichnissen und ZIP-/JAR-Dateien>\n    -classpath <Klassensuchpfad von Verzeichnissen und ZIP-/JAR-Dateien>\n                  Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n                  und ZIP-Archiven zur Suche nach Klassendateien.\n    -D<name>=<value>\n                  Legt eine Systemeigenschaft fest\n    -verbose[:class|gc|jni]\n                  Aktiviert die Verbose-Ausgabe\n    -version      Druckt Produktversion und beendet das Programm\n    -version:<value>\n                  Erfordert die angegebene Version zur Ausf\u00FChrung\n    -showversion  Druckt Produktversion und f\u00E4hrt fort\n    -jre-restrict-search | -no-jre-restrict-search\n                  Bezieht private JREs des Benutzers in Versionssuche ein bzw. schlie\u00DFt sie aus\n    -? -help      Druckt diese Hilfemeldung\n    -X            Druckt Hilfe zu Nicht-Standardoptionen\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  Aktiviert Assertionen mit angegebener Granularit\u00E4t\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  Deaktiviert Assertionen mit angegebener Granularit\u00E4t\n    -esa | -enablesystemassertions\n                  Aktiviert Systemassertionen\n    -dsa | -disablesystemassertions\n                  Deaktiviert Systemassertionen\n    -agentlib:<libname>[=<options>]\n                  L\u00E4dt native Agent Library <libname>, z.B. -agentlib:hprof\n                  siehe auch -agentlib:jdwp=help und -agentlib:hprof=help\n    -agentpath:<pathname>[=<options>]\n                  L\u00E4dt native Agent Library nach vollem Pfadnamen\n    -javaagent:<jarpath>[=<options>]\n                  L\u00E4dt Java-Programmiersprachen-Agent, siehe java.lang.instrument\n    -splash:<imagepath>\n                  Zeigt Startbildschirm mit angegebenem Bild\nWeitere Einzelheiten finden Sie unter http://www.oracle.com/technetwork/java/javase/documentation/index.html
+
+# Translators please note do not translate the options themselves
+java.launcher.X.usage=\    -Xmixed           Ausf\u00FChrung im gemischten Modus (Standard)\n    -Xint             Nur Ausf\u00FChrung im interpretierten Modus\n    -Xbootclasspath:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n                      Legt Suchpfad f\u00FCr Bootstrap-Klassen und Ressourcen fest\n    -Xbootclasspath/a:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n                      H\u00E4ngt an das Ende des Bootstrap Classpath an\n    -Xbootclasspath/p:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n                      Stellt Bootstrap Classpath voran\n    -Xdiag            Zeigt zus\u00E4tzliche Diagnosemeldungen an\n    -Xnoclassgc       Deaktiviert Klassen-Garbage Collection\n    -Xincgc           Aktiviert inkrementelle Garbage Collection\n    -Xloggc:<file>    Loggt GC-Status in einer Datei mit Zeitstempeln\n    -Xbatch           Deaktiviert Hintergrundkompilierung\n    -Xms<size>        Legt anf\u00E4ngliche Java Heap-Gr\u00F6\u00DFe fest\n    -Xmx<size>        Legt maximale Java Heap-Gr\u00F6\u00DFe fest\n    -Xss<size>        Legt Java-Thread-Stack-Gr\u00F6\u00DFe fest\n    -Xprof            Gibt CPU-Profiling-Daten aus\n    -Xfuture          Aktiviert strengste Pr\u00FCfungen, antizipiert zuk\u00FCnftigen Standardwert\n    -Xrs              Reduziert Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n    -Xcheck:jni       F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen durch\n    -Xshare:off       Kein Versuch, gemeinsame Klassendaten zu verwenden\n    -Xshare:auto      Verwendet gemeinsame Klassendaten, wenn m\u00F6glich (Standard)\n    -Xshare:on        Erfordert die Verwendung gemeinsamer Klassendaten, sonst verl\u00E4uft der Vorgang nicht erfolgreich.\n    -XshowSettings    Zeigt alle Einstellungen und f\u00E4hrt fort\n    -XshowSettings:all\n                      Zeigt alle Einstellungen und f\u00E4hrt fort\n    -XshowSettings:vm Zeigt alle VM-bezogenen Einstellungen und f\u00E4hrt fort\n    -XshowSettings:properties\n                      Zeigt alle Eigenschaftseinstellungen und f\u00E4hrt fort\n    -XshowSettings:locale\n                      Zeigt alle gebietsschemabezogenen Einstellungen und f\u00E4hrt fort\n\nDie -X-Optionen sind keine Standardoptionen und k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\    -Xmixed           Ausf\u00FChrung im gemischten Modus (Standard)\n\    -Xint             Nur Ausf\u00FChrung im interpretierten Modus\n\    -Xbootclasspath:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n\                      Legt Suchpfad f\u00FCr Bootstrap-Klassen und Ressourcen fest\n\    -Xbootclasspath/a:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n\                      H\u00E4ngt an das Ende des Bootstrap Classpath an\n\    -Xbootclasspath/p:<Verzeichnisse und ZIP-/JAR-Dateien durch {0} getrennt>\n\                      Stellt Bootstrap Classpath voran\n\    -Xdiag            Zeigt zus\u00E4tzliche Diagnosemeldungen an\n\    -Xnoclassgc       Deaktiviert Klassen-Garbage Collection\n\    -Xincgc           Aktiviert inkrementelle Garbage Collection\n\    -Xloggc:<file>    Loggt GC-Status in einer Datei mit Zeitstempeln\n\    -Xbatch           Deaktiviert Hintergrundkompilierung\n\    -Xms<size>        Legt anf\u00E4ngliche Java Heap-Gr\u00F6\u00DFe fest\n\    -Xmx<size>        Legt maximale Java Heap-Gr\u00F6\u00DFe fest\n\    -Xss<size>        Legt Java-Thread-Stack-Gr\u00F6\u00DFe fest\n\    -Xprof            Gibt CPU-Profiling-Daten aus\n\    -Xfuture          Aktiviert strengste Pr\u00FCfungen, antizipiert zuk\u00FCnftigen Standardwert\n\    -Xrs              Reduziert Verwendung von BS-Signalen durch Java/VM (siehe Dokumentation)\n\    -Xcheck:jni       F\u00FChrt zus\u00E4tzliche Pr\u00FCfungen f\u00FCr JNI-Funktionen durch\n\    -Xshare:off       Kein Versuch, gemeinsame Klassendaten zu verwenden\n\    -Xshare:auto      Verwendet gemeinsame Klassendaten, wenn m\u00F6glich (Standard)\n\    -Xshare:on        Erfordert die Verwendung gemeinsamer Klassendaten, sonst verl\u00E4uft der Vorgang nicht erfolgreich.\n\    -XshowSettings    Zeigt alle Einstellungen und f\u00E4hrt fort\n\    -XshowSettings:all\n\                      Zeigt alle Einstellungen und f\u00E4hrt fort\n\    -XshowSettings:vm Zeigt alle VM-bezogenen Einstellungen und f\u00E4hrt fort\n\    -XshowSettings:properties\n\                      Zeigt alle Eigenschaftseinstellungen und f\u00E4hrt fort\n\    -XshowSettings:locale\n\                      Zeigt alle gebietsschemabezogenen Einstellungen und f\u00E4hrt fort\n\nDie -X-Optionen sind keine Standardoptionen und k\u00F6nnen ohne Vorank\u00FCndigung ge\u00E4ndert werden.\n
+java.launcher.X.macosx.usage=\nDie folgenden Optionen sind f\u00FCr Mac OS X spezifisch:\n    -XstartOnFirstThread\n                      f\u00FChrt die main()-Methode f\u00FCr den ersten (AppKit) Thread aus\n    -Xdock:name=<Anwendungsname>"\n                      \u00DCberschreibt den in der Uhr angezeigten Standardanwendungsnamen\n    -Xdock:icon=<Pfad zu Symboldatei>\n                      \u00DCberschreibt das in der Uhr angezeigte Standardsymbol\n\n
 
 java.launcher.cls.error1=Fehler: Hauptklasse {0} konnte nicht gefunden oder geladen werden
-java.launcher.cls.error2=Fehler: Hauptmethode ist nicht {0} in Klasse {1}. Definieren Sie die Hauptmethode als:\n\   public static void main(String[] args)
-java.launcher.cls.error3=Fehler: Hauptmethode muss einen Wert vom Typ void in Klasse {0} zur\u00FCckgeben. Definieren Sie \ndie Hauptmethode als:\n\   public static void main(String[] args)
-java.launcher.cls.error4=Fehler: Hauptmethode in Klasse {0} nicht gefunden. Definieren Sie die Hauptmethode als:\n\   public static void main(String[] args)
+java.launcher.cls.error2=Fehler: Hauptmethode ist nicht {0} in Klasse {1}. Definieren Sie die Hauptmethode als:\n   public static void main(String[] args)
+java.launcher.cls.error3=Fehler: Hauptmethode muss einen Wert vom Typ void in Klasse {0} zur\u00FCckgeben. Definieren Sie \ndie Hauptmethode als:\n   public static void main(String[] args)
+java.launcher.cls.error4=Fehler: Hauptmethode in Klasse {0} nicht gefunden. Definieren Sie die Hauptmethode als:\n   public static void main(String[] args):\noder eine JavaFX-Anwendung muss {1} erweitern
+java.launcher.cls.error5=Fehler: Zum Ausf\u00FChren dieser Anwendung ben\u00F6tigte JavaFX-Runtime-Komponenten fehlen
 java.launcher.jar.error1=Fehler: Beim Versuch, Datei {0} zu \u00F6ffnen, ist ein unerwarteter Fehler aufgetreten
 java.launcher.jar.error2=Manifest in {0} nicht gefunden
 java.launcher.jar.error3=kein Hauptmanifestattribut, in {0}
+java.launcher.init.error=Initialisierungsfehler
+java.launcher.javafx.error1=Fehler: Die JavaFX-Methode launchApplication hat die falsche Signatur, sie\nmuss als statisch deklariert werden und einen Wert vom Typ VOID zur\u00FCckgeben
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_es.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_es.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   Sintaxis: {0} [-options] class [args...]\n\           (para ejecutar una clase)\n   o  {0} [-options] -jar jarfile [args...]\n\           (para ejecutar un archivo jar)\ndonde las opciones incluyen:\n
+java.launcher.opt.header  =   Sintaxis: {0} [-options] class [args...]\n           (para ejecutar una clase)\n   o  {0} [-options] -jar jarfile [args...]\n           (para ejecutar un archivo jar)\ndonde las opciones incluyen:\n
 
 java.launcher.opt.datamodel  =\    -d{0}\t  usar un modelo de datos de {0} bits, si est\u00E1 disponible\n
 java.launcher.opt.vmselect   =\    {0}\t  para seleccionar la VM "{1}"\n
@@ -34,15 +34,21 @@
 java.launcher.ergo.message2  =\                  porque la ejecuci\u00F3n se est\u00E1 llevando a cabo en una m\u00E1quina de clase de servidor.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer     =\    -cp <ruta de acceso de b\u00FAsqueda de clases de los directorios y los archivos zip/jar>\n\    -classpath <ruta de acceso de b\u00FAsqueda de clases de los directorios y los archivos zip/jar>\n\                  Una lista separada por {0} de directorios, archivos JAR,\n\                  y archivos ZIP para buscar archivos de clase.\n\    -D<nombre>=<valor>\n\                  definir una propiedad del sistema\n\    -verbose[:class|gc|jni]\n\                  activar la salida verbose\n\    -version      imprimir la versi\u00F3n del producto y salir\n\    -version:<valor>\n\                  es necesario que se ejecute la versi\u00F3n especificada\n\    -showversion  imprimir la versi\u00F3n del producto y continuar\n\    -jre-restrict-search | -no-jre-restrict-search\n\                  incluir/excluir JRE privados de usuario en la b\u00FAsqueda de versi\u00F3n\n\    -? -help      imprimir este mensaje de ayuda\n\    -X            imprimir la ayuda sobre las opciones que no sean est\u00E1ndar\n\    -ea[:<nombre_paquete>...|:<nombre_clase>]\n\    -enableassertions[:<nombre_paquete>...|:<nombre_clase>]\n\                  activar afirmaciones con la granularidad especificada\n\    -da[:<nombre_paquete>...|:<nombre_clase>]\n\    -disableassertions[:<nombre_paquete>...|:<nombre_clase>]\n\                  desactivar afirmaciones con la granularidad especificada\n\    -esa | -enablesystemassertions\n\                  activar afirmaciones del sistema\n\    -dsa | -disablesystemassertions\n\                  desactivar afirmaciones del sistema\n\    -agentlib:<nombre_bib>[=<opciones>]\n\                  cargar la biblioteca de agente nativa <nombre_bib>, como -agentlib:hprof\n\                  v\u00E9ase tambi\u00E9n -agentlib:jdwp=help y -agentlib:hprof=help\n\    -agentpath:<nombre_ruta_acceso>[=<opciones>]\n\                  cargar biblioteca de agente nativa con la ruta de acceso completa\n\    -javaagent:<ruta_acceso_jar>[=<opciones>]\n\                  cargar agente de lenguaje de programaci\u00F3n Java, v\u00E9ase java.lang.instrument\n\    -splash:<ruta_acceso_imagen>\n\                  mostrar una pantalla de presentaci\u00F3n con la imagen especificada\nConsulte http://java.sun.com/javase/reference para obtener m\u00E1s informaci\u00F3n.
+java.launcher.opt.footer     =\    -cp <ruta de acceso de b\u00FAsqueda de clases de los directorios y los archivos zip/jar>\n\\    -classpath <ruta de acceso de b\u00FAsqueda de clases de los directorios y los archivos zip/jar>\n\\                  Lista separada por {0} de directorios, archivos JAR\n\\                  y archivos ZIP para buscar archivos de clase.\n\\    -D<nombre>=<valor>\n\\                  definir una propiedad del sistema\n\\    -verbose:[class|gc|jni]\n\\                  activar la salida verbose\n\\    -version      imprimir la versi\u00F3n del producto y salir\n\\    -version:<valor>\n\\                  es necesario que se ejecute la versi\u00F3n especificada\n\\    -showversion  imprimir la versi\u00F3n del producto y continuar\n\\    -jre-restrict-search | -no-jre-restrict-search\n\\                  incluir/excluir JRE privados de usuario en la b\u00FAsqueda de versi\u00F3n\n\\    -? -help      imprimir este mensaje de ayuda\n\\    -X            imprimir la ayuda sobre las opciones que no sean est\u00E1ndar\n\\    -ea[:<nombre_paquete>...|:<nombre_clase>]\n\\    -enableassertions[:<nombre_paquete>...|:<nombre_clase>]\n\\                  activar afirmaciones con la granularidad especificada\n\\    -da[:<nombre_paquete>...|:<nombre_clase>]\n\\    -disableassertions[:<nombre_paquete>...|:<nombre_clase>]\n\\                  desactivar afirmaciones con la granularidad especificada\n\\    -esa | -enablesystemassertions\n\\                  activar afirmaciones del sistema\n\\    -dsa | -disablesystemassertions\n\\                  desactivar afirmaciones del sistema\n\\    -agentlib:<nombre_bib>[=<opciones>]\n\\                  cargar la biblioteca de agente nativa <nombre_bib>, como -agentlib:hprof\n\\                  v\u00E9ase tambi\u00E9n -agentlib:jdwp=help y -agentlib:hprof=help\n\\    -agentpath:<nombre_ruta_acceso>[=<opciones>]\n\\                  cargar biblioteca de agente nativa con el nombre de la ruta de acceso completa\n\\    -javaagent:<ruta_acceso_jar>[=<opciones>]\n\\                  cargar agente de lenguaje de programaci\u00F3n Java, v\u00E9ase java.lang.instrument\n\\    -splash:<ruta_acceso_imagen>\n\\                  mostrar una pantalla de presentaci\u00F3n con la imagen especificada\nConsulte http://www.oracle.com/technetwork/java/javase/documentation/index.html para obtener m\u00E1s informaci\u00F3n.
+
+# Translators please note do not translate the options themselves
+java.launcher.X.usage=\    -Xmixed           ejecuci\u00F3n de modo mixto (por defecto)\n    -Xint             s\u00F3lo ejecuci\u00F3n de modo interpretado\n    -Xbootclasspath:<directorios y archivos zip/jar separados por {0}>\n                      definir la ruta de acceso de b\u00FAsqueda para los recursos y clases de inicializaci\u00F3n de datos\n    -Xbootclasspath/a:<directorios y archivos zip/jar separados por {0}>\n                      agregar al final de la ruta de acceso de la clase de inicializaci\u00F3n de datos\n    -Xbootclasspath/p:<directorios y archivos zip/jar separados por {0}>\n                      anteponer a la ruta de acceso de la clase de inicializaci\u00F3n de datos\n    -Xdiag            mostrar mensajes de diagn\u00F3stico adicionales\n    -Xnoclassgc       desactivar la recolecci\u00F3n de basura de clases\n    -Xincgc           activar la recolecci\u00F3n de basura de clases\n    -Xloggc:<archivo>    registrar el estado de GC en un archivo con registros de hora\n    -Xbatch           desactivar compilaci\u00F3n en segundo plano\n    -Xms<tama\u00F1o>        definir tama\u00F1o de pila Java inicial\n    -Xmx<tama\u00F1o>        definir tama\u00F1o de pila Java m\u00E1ximo\n    -Xss<tama\u00F1o>        definir tama\u00F1o de la pila del thread de Java\n    -Xprof            datos de salida de creaci\u00F3n de perfil de CPU\n    -Xfuture          activar las comprobaciones m\u00E1s estrictas, anticip\u00E1ndose al futuro valor por defecto\n    -Xrs              reducir el uso de se\u00F1ales de sistema operativo por parte de Java/VM (consulte la documentaci\u00F3n)\n    -Xcheck:jni       realizar comprobaciones adicionales para las funciones de JNI\n    -Xshare:off       no intentar usar datos de clase compartidos\n    -Xshare:auto      usar datos de clase compartidos si es posible (valor por defecto)\n    -Xshare:on        es obligatorio el uso de datos de clase compartidos, de lo contrario se emitir\u00E1 un fallo.\n    -XshowSettings    mostrar todos los valores y continuar\n    -XshowSettings:all\n                      mostrar todos los valores y continuar\n    -XshowSettings:vm mostrar todos los valores de la VM y continuar\n    -XshowSettings:properties\n                      mostrar todos los valores de las propiedades y continuar\n    -XshowSettings:locale\n                      mostrar todos los valores relacionados con la configuraci\u00F3n regional y continuar\n\nLas opciones -X no son est\u00E1ndar, por lo que podr\u00EDan cambiarse sin previo aviso.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\    -Xmixed           ejecuci\u00F3n de modo mixto (por defecto)\n\    -Xint             s\u00F3lo ejecuci\u00F3n de modo interpretado\n\    -Xbootclasspath:<directorios y archivos zip/jar separados por {0}>\n\                      definir la ruta de acceso de b\u00FAsqueda para los recursos y clases de inicializaci\u00F3n de datos\n\    -Xbootclasspath/a:<directorios y archivos zip/jar separados por {0}>\n\                      agregar al final de la ruta de acceso de la clase de inicializaci\u00F3n de datos\n\    -Xbootclasspath/p:<directorios y archivos zip/jar separados por {0}>\n\                      anteponer a la ruta de acceso de la clase de inicializaci\u00F3n de datos\n\    -Xdiag            mostrar mensajes de diagn\u00F3stico adicionales\n\    -Xnoclassgc       desactivar la recolecci\u00F3n de basura de clases\n\    -Xincgc           activar la recolecci\u00F3n de basura de clases\n\    -Xloggc:<archivo>    registrar el estado de GC en un archivo con registros de hora\n\    -Xbatch           desactivar compilaci\u00F3n en segundo plano\n\    -Xms<tama\u00F1o>        definir tama\u00F1o de pila Java inicial\n\    -Xmx<tama\u00F1o>        definir tama\u00F1o de pila Java m\u00E1ximo\n\    -Xss<tama\u00F1o>        definir tama\u00F1o de la pila del thread de Java\n\    -Xprof            datos de salida de creaci\u00F3n de perfil de CPU\n\    -Xfuture          activar las comprobaciones m\u00E1s estrictas, anticip\u00E1ndose al futuro valor por defecto\n\    -Xrs              reducir el uso de se\u00F1ales de sistema operativo por parte de Java/VM (consulte la documentaci\u00F3n)\n\    -Xcheck:jni       realizar comprobaciones adicionales para las funciones de JNI\n\    -Xshare:off       no intentar usar datos de clase compartidos\n\    -Xshare:auto      usar datos de clase compartidos si es posible (valor por defecto)\n\    -Xshare:on        es obligatorio el uso de datos de clase compartidos, de lo contrario se emitir\u00E1 un fallo.\n\    -XshowSettings    mostrar todos los valores y continuar\n\    -XshowSettings:all\n\                      mostrar todos los valores y continuar\n\    -XshowSettings:vm mostrar todos los valores de la VM y continuar\n\    -XshowSettings:properties\n\                      mostrar todos los valores de las propiedades y continuar\n\    -XshowSettings:locale\n\                      mostrar todos los valores relacionados con la configuraci\u00F3n regional y continuar\n\nLas opciones -X no son est\u00E1ndar, por lo que podr\u00EDan cambiarse sin previo aviso.\n
+java.launcher.X.macosx.usage=\nLas siguientes opciones son espec\u00EDficas para Mac OS X:\n    -XstartOnFirstThread\n                      ejecuta el m\u00E9todo main() del primer thread (AppKit)\n    -Xdock:name=<nombre de aplicaci\u00F3n>"\n                      sustituye al nombre por defecto de la aplicaci\u00F3n que se muestra en el Dock\n    -Xdock:icon=<ruta de acceso a archivo de icono>\n                      sustituye al icono por defecto que se muestra en el Dock\n\n
 
 java.launcher.cls.error1=Error: no se ha encontrado o cargado la clase principal {0}
-java.launcher.cls.error2=Error: el m\u00E9todo principal no es {0} en la clase {1}, defina el m\u00E9todo principal del siguiente modo:\n\   public static void main(String[] args)
-java.launcher.cls.error3=Error: el m\u00E9todo principal debe devolver un valor del tipo void en la clase {0}, \ndefina el m\u00E9todo principal del siguiente modo:\n\   public static void main(String[] args)
-java.launcher.cls.error4=Error: no se ha encontrado el m\u00E9todo principal en la clase {0}, defina el m\u00E9todo principal del siguiente modo:\n\   public static void main(String[] args)
+java.launcher.cls.error2=Error: el m\u00E9todo principal no es {0} en la clase {1}, defina el m\u00E9todo principal del siguiente modo:\n   public static void main(String[] args)
+java.launcher.cls.error3=Error: el m\u00E9todo principal debe devolver un valor del tipo void en la clase {0}, \ndefina el m\u00E9todo principal del siguiente modo:\n   public static void main(String[] args)
+java.launcher.cls.error4=Error: no se ha encontrado el m\u00E9todo principal en la clase {0}, defina el m\u00E9todo principal del siguiente modo:\\n   public static void main(String[] args)\\nde lo contrario, se deber\u00E1 ampliar una clase de aplicaci\u00F3n JavaFX {1}
+java.launcher.cls.error5=Error: faltan los componentes de JavaFX runtime y son necesarios para ejecutar esta aplicaci\u00F3n
 java.launcher.jar.error1=Error: se ha producido un error inesperado al intentar abrir el archivo {0}
 java.launcher.jar.error2=no se ha encontrado el manifiesto en {0}
 java.launcher.jar.error3=no hay ning\u00FAn atributo de manifiesto principal en {0}
+java.launcher.init.error=error de inicializaci\u00F3n
+java.launcher.javafx.error1=Error: el m\u00E9todo launchApplication de JavaFX tiene una firma que no es correcta.\\nSe debe declarar est\u00E1tico y devolver un valor de tipo nulo
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   Syntaxe : {0} [-options] class [args...]\n\           (pour l''ex\u00E9cution d''une classe)\n   ou  {0} [-options] -jar jarfile [args...]\n\           (pour l''ex\u00E9cution d''un fichier JAR)\no\u00F9 les options comprennent :\n
+java.launcher.opt.header  =   Syntaxe : {0} [-options] class [args...]\n           (pour l''ex\u00E9cution d''une classe)\n   ou  {0} [-options] -jar jarfile [args...]\n           (pour l''ex\u00E9cution d''un fichier JAR)\no\u00F9 les options comprennent :\n
 
 java.launcher.opt.datamodel  =\    -d{0}\t  utilisez le mod\u00E8le de donn\u00E9es {0} bits s''il est disponible\n
 java.launcher.opt.vmselect   =\    {0}\t  pour s\u00E9lectionner la machine virtuelle "{1}"\n
@@ -34,15 +34,21 @@
 java.launcher.ergo.message2  =\                  car vous ex\u00E9cutez une machine de classe de serveur.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer     =\    -cp <class search path of directories and zip/jar files>\n\    -classpath <class search path of directories and zip/jar files>\n\                  Liste de r\u00E9pertoires, d''archives JAR et\n\                   d''archives ZIP s\u00E9par\u00E9s par des {0}, dans laquelle rechercher les fichiers de classe.\n\    -D<name>=<value>\n\                  d\u00E9finition d''une propri\u00E9t\u00E9 syst\u00E8me\n\    -verbose[:class|gc|jni]\n\                  activation de la sortie en mode verbose\n\    -version      impression de la version du produit et fin de l''op\u00E9ration\n\    -version:<value>\n\                  ex\u00E9cution de la version sp\u00E9cifi\u00E9e obligatoire\n\    -showversion  impression de la version du produit et poursuite de l''op\u00E9ration\n\    -jre-restrict-search | -no-jre-restrict-search\n\                  inclusion/exclusion des environnements JRE priv\u00E9s de l''utilisateur dans la recherche de version\n\    -? -help      impression du message d''aide\n\    -X            impression de l''aide sur les options non standard\n\    -ea[:<packagename>...|:<classname>]\n\    -enableassertions[:<packagename>...|:<classname>]\n\                  activation des assertions avec la granularit\u00E9 sp\u00E9cifi\u00E9e\n\    -da[:<packagename>...|:<classname>]\n\    -disableassertions[:<packagename>...|:<classname>]\n\                  d\u00E9sactivation des assertions avec la granularit\u00E9 sp\u00E9cifi\u00E9e\n\    -esa | -enablesystemassertions\n\                  activation des assertions syst\u00E8me\n\    -dsa | -disablesystemassertions\n\                  d\u00E9sactivation des assertions syst\u00E8me\n\    -agentlib:<libname>[=<options>]\n\                  chargement de la biblioth\u00E8que d''agent natif <libname>, par exemple -agentlib:hprof\n\                  voir \u00E9galement, -agentlib:jdwp=help et -agentlib:hprof=help\n\    -agentpath:<pathname>[=<options>]\n\                  chargement de la biblioth\u00E8que d''agent natif via le chemin d''acc\u00E8s complet\n\    -javaagent:<jarpath>[=<options>]\n\                  chargement de l''agent du langage de programmation Java, voir java.lang.instrument\n\    -splash:<imagepath>\n\                  affichage de l''\u00E9cran d''accueil avec l''image sp\u00E9cifi\u00E9e\nVoir http://java.sun.com/javase/reference pour plus de d\u00E9tails.
+java.launcher.opt.footer     =\    -cp <class search path of directories and zip/jar files>\n    -classpath <class search path of directories and zip/jar files>\n                  Liste de r\u00E9pertoires, d''archives JAR et\n                   d''archives ZIP s\u00E9par\u00E9s par des {0}, dans laquelle rechercher les fichiers de classe.\n    -D<name>=<value>\n                  d\u00E9finition d''une propri\u00E9t\u00E9 syst\u00E8me\n    -verbose[:class|gc|jni]\n                  activation de la sortie en mode verbose\n    -version      impression de la version du produit et fin de l''op\u00E9ration\n    -version:<value>\n                  ex\u00E9cution de la version sp\u00E9cifi\u00E9e obligatoire\n    -showversion  impression de la version du produit et poursuite de l''op\u00E9ration\n    -jre-restrict-search | -no-jre-restrict-search\n                  inclusion/exclusion des environnements JRE priv\u00E9s de l''utilisateur dans la recherche de version\n    -? -help      impression du message d''aide\n    -X            impression de l''aide sur les options non standard\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  activation des assertions avec la granularit\u00E9 sp\u00E9cifi\u00E9e\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  d\u00E9sactivation des assertions avec la granularit\u00E9 sp\u00E9cifi\u00E9e\n    -esa | -enablesystemassertions\n                  activation des assertions syst\u00E8me\n    -dsa | -disablesystemassertions\n                  d\u00E9sactivation des assertions syst\u00E8me\n    -agentlib:<libname>[=<options>]\n                  chargement de la biblioth\u00E8que d''agent natif <libname>, par exemple -agentlib:hprof\n                  voir \u00E9galement, -agentlib:jdwp=help et -agentlib:hprof=help\n    -agentpath:<pathname>[=<options>]\n                  chargement de la biblioth\u00E8que d''agent natif via le chemin d''acc\u00E8s complet\n    -javaagent:<jarpath>[=<options>]\n                  chargement de l''agent du langage de programmation Java, voir java.lang.instrument\n    -splash:<imagepath>\n                  affichage de l''\u00E9cran d''accueil avec l''image sp\u00E9cifi\u00E9e\nVoir http://www.oracle.com/technetwork/java/javase/documentation/index.html pour plus de d\u00E9tails.
+
+# Translators please note do not translate the options themselves
+java.launcher.X.usage=\    -Xmixed           ex\u00E9cution en mode mixte (valeur par d\u00E9faut)\n    -Xint             ex\u00E9cution en mode interpr\u00E9t\u00E9 uniquement\n    -Xbootclasspath:<directories and zip/jar files separated by {0}>\n                      d\u00E9finition du chemin de recherche pour les ressources et classes bootstrap\n    -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n                      ajout \u00E0 la fin du chemin de classe bootstrap\n    -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n                      ajout au d\u00E9but du chemin de classe bootstrap\n    -Xdiag            affichage de messages de diagnostic suppl\u00E9mentaires\n    -Xnoclassgc       d\u00E9sactivation de l''op\u00E9ration de ramasse-miette (garbage collection) de la classe\n    -Xincgc           activation de l''op\u00E9ration de ramasse-miette (garbage collection) incr\u00E9mentielle\n    -Xloggc:<file>    journalisation du statut de l''op\u00E9ration de ramasse-miette (garbage collection) dans un fichier avec horodatages\n    -Xbatch           d\u00E9sactivation de la compilation en arri\u00E8re-plan\n    -Xms<size>        d\u00E9finition de la taille initiale des portions de m\u00E9moire Java\n    -Xmx<size>        d\u00E9finition de la taille maximale des portions de m\u00E9moire Java\n    -Xss<size>        d\u00E9finition de la taille de pile de thread Java\n    -Xprof            sortie des donn\u00E9es de profilage de l''unit\u00E9 centrale\n    -Xfuture          activation des contr\u00F4les les plus stricts en vue d''anticiper la future valeur par d\u00E9faut\n    -Xrs              r\u00E9duction de l''utilisation des signaux OS par Java/la machine virtuelle (voir documentation)\n    -Xcheck:jni       ex\u00E9cution de contr\u00F4les suppl\u00E9mentaires pour les fonctions JNI\n    -Xshare:off       aucune tentative d''utilisation des donn\u00E9es de classe partag\u00E9es\n    -Xshare:auto      utilisation des donn\u00E9es de classe partag\u00E9es si possible (valeur par d\u00E9faut)\n    -Xshare:on        utilisation des donn\u00E9es de classe partag\u00E9es obligatoire ou \u00E9chec de l''op\u00E9ration\n    -XshowSettings    affichage de tous les param\u00E8tres et poursuite de l''op\u00E9ration\n    -XshowSettings:all\n                      affichage de tous les param\u00E8tres et poursuite de l''op\u00E9ration\n    -XshowSettings:vm affichage de tous les param\u00E8tres de machine virtuelle et poursuite de l''op\u00E9ration\n    -XshowSettings:properties\n                      affichage de tous les param\u00E8tres de propri\u00E9t\u00E9 et poursuite de l''op\u00E9ration\n    -XshowSettings:locale\n                      affichage de tous les param\u00E8tres d''environnement local et poursuite de l''op\u00E9ration\n\nLes options -X ne sont pas des options standard et peuvent faire l''objet de modifications sans pr\u00E9avis.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\    -Xmixed           ex\u00E9cution en mode mixte (valeur par d\u00E9faut)\n\    -Xint             ex\u00E9cution en mode interpr\u00E9t\u00E9 uniquement\n\    -Xbootclasspath:<directories and zip/jar files separated by {0}>\n\                      d\u00E9finition du chemin de recherche pour les ressources et classes bootstrap\n\    -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n\                      ajout \u00E0 la fin du chemin de classe bootstrap\n\    -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n\                      ajout au d\u00E9but du chemin de classe bootstrap\n\    -Xdiag            affichage de messages de diagnostic suppl\u00E9mentaires\n\    -Xnoclassgc       d\u00E9sactivation de l''op\u00E9ration de ramasse-miette (garbage collection) de la classe\n\    -Xincgc           activation de l''op\u00E9ration de ramasse-miette (garbage collection) incr\u00E9mentielle\n\    -Xloggc:<file>    journalisation du statut de l''op\u00E9ration de ramasse-miette (garbage collection) dans un fichier avec horodatages\n\    -Xbatch           d\u00E9sactivation de la compilation en arri\u00E8re-plan\n\    -Xms<size>        d\u00E9finition de la taille initiale des portions de m\u00E9moire Java\n\    -Xmx<size>        d\u00E9finition de la taille maximale des portions de m\u00E9moire Java\n\    -Xss<size>        d\u00E9finition de la taille de pile de thread Java\n\    -Xprof            sortie des donn\u00E9es de profilage de l''unit\u00E9 centrale\n\    -Xfuture          activation des contr\u00F4les les plus stricts en vue d''anticiper la future valeur par d\u00E9faut\n\    -Xrs              r\u00E9duction de l''utilisation des signaux OS par Java/la machine virtuelle (voir documentation)\n\    -Xcheck:jni       ex\u00E9cution de contr\u00F4les suppl\u00E9mentaires pour les fonctions JNI\n\    -Xshare:off       aucune tentative d''utilisation des donn\u00E9es de classe partag\u00E9es\n\    -Xshare:auto      utilisation des donn\u00E9es de classe partag\u00E9es si possible (valeur par d\u00E9faut)\n\    -Xshare:on        utilisation des donn\u00E9es de classe partag\u00E9es obligatoire ou \u00E9chec de l''op\u00E9ration\n\    -XshowSettings    affichage de tous les param\u00E8tres et poursuite de l''op\u00E9ration\n\    -XshowSettings:all\n\                      affichage de tous les param\u00E8tres et poursuite de l''op\u00E9ration\n\    -XshowSettings:vm affichage de tous les param\u00E8tres de machine virtuelle et poursuite de l''op\u00E9ration\n\    -XshowSettings:properties\n\                      affichage de tous les param\u00E8tres de propri\u00E9t\u00E9 et poursuite de l''op\u00E9ration\n\    -XshowSettings:locale\n\                      affichage de tous les param\u00E8tres d''environnement local et poursuite de l''op\u00E9ration\n\nLes options -X ne sont pas des options standard et peuvent faire l''objet de modifications sans pr\u00E9avis.\n
+java.launcher.X.macosx.usage=\nLes options suivantes sont propres \u00E0 Mac OS X :\n    -XstartOnFirstThread\n                      ex\u00E9cute la m\u00E9thode main() sur le premier thread (AppKit)\n    -Xdock:name=<application name>"\n                      remplace le nom d'application par d\u00E9faut affich\u00E9 dans l'ancrage\n    -Xdock:icon=<path to icon file>\n                      remplace l'ic\u00F4ne par d\u00E9faut affich\u00E9e dans l'ancrage\n\n
 
 java.launcher.cls.error1=Erreur : impossible de trouver ou charger la classe principale {0}
-java.launcher.cls.error2=Erreur : la m\u00E9thode principale n''est pas {0} dans la classe {1}, d\u00E9finissez la m\u00E9thode principale comme suit :\n\   public static void main(String[] args)
-java.launcher.cls.error3=Erreur : la m\u00E9thode principale doit renvoyer une valeur de type void dans la classe {0}, \nd\u00E9finissez la m\u00E9thode principale comme suit :\n\   public static void main(String[] args)
-java.launcher.cls.error4=Erreur : la m\u00E9thode principale est introuvable dans la classe {0}, d\u00E9finissez la m\u00E9thode principale comme suit :\n\   public static void main(String[] args)
+java.launcher.cls.error2=Erreur : la m\u00E9thode principale n''est pas {0} dans la classe {1}, d\u00E9finissez la m\u00E9thode principale comme suit :\n   public static void main(String[] args)
+java.launcher.cls.error3=Erreur : la m\u00E9thode principale doit renvoyer une valeur de type void dans la classe {0}, \nd\u00E9finissez la m\u00E9thode principale comme suit :\n   public static void main(String[] args)
+java.launcher.cls.error4=Erreur : la m\u00E9thode principale est introuvable dans la classe {0}, d\u00E9finissez la m\u00E9thode principale comme suit :\n   public static void main(String[] args)\nou une classe d''applications JavaFX doit \u00E9tendre {1}
+java.launcher.cls.error5=Erreur : des composants d'ex\u00E9cution JavaFX obligatoires pour ex\u00E9cuter cette application sont manquants.
 java.launcher.jar.error1=Erreur : une erreur inattendue est survenue lors de la tentative d''ouverture du fichier {0}
 java.launcher.jar.error2=fichier manifeste introuvable dans {0}
 java.launcher.jar.error3=aucun attribut manifest principal dans {0}
+java.launcher.init.error=erreur d'initialisation
+java.launcher.javafx.error1=Erreur : la signature de la m\u00E9thode launchApplication JavaFX est incorrecte, la\nm\u00E9thode doit \u00EAtre d\u00E9clar\u00E9e statique et renvoyer une valeur de type void
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_it.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_it.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   Uso: {0} [-opzioni] class [argomenti...]\n\           (per eseguire una classe)\n   oppure  {0} [-opzioni] -jar filejar [argomenti...]\n\           (per eseguire un file jar)\ndove le opzioni sono:\n
+java.launcher.opt.header  =   Uso: {0} [-opzioni] class [argomenti...]\n           (per eseguire una classe)\n   oppure  {0} [-opzioni] -jar filejar [argomenti...]\n           (per eseguire un file jar)\ndove le opzioni sono:\n
 
 java.launcher.opt.datamodel  =\    -d{0}\t  usare un modello di dati {0}-bit se disponibile\n
 java.launcher.opt.vmselect   =\    {0}\t  per selezionare la VM "{1}"\n
@@ -34,15 +34,21 @@
 java.launcher.ergo.message2  =\                  perch\u00E9 si utilizza un computer di classe server.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer     =\    -cp <classpath di ricerca di directory e file zip/jar>\n\    -classpath <classpath di ricerca di directory e file zip/jar>\n\                  Una lista separata da {0} di directory, archivi JAR\n\                  e archivi ZIP utilizzata per la ricerca di file di classe.\n\    -D<nome>=<valore>\n\                  imposta una propriet\u00E0 di sistema\n\    -verbose[:class|gc|jni]\n\                  abilita l''output descrittivo\n\    -version      stampa la versione del prodotto ed esce\n\    -version:<valore>\n\                  richiede l''esecuzione della versione specificata\n\    -showversion  stampa la versione del prodotto e continua\n\    -jre-restrict-search | -no-jre-restrict-search\n\                  include/esclude gli ambienti JRE privati dell''utente nella ricerca della versione\n\    -? -help      stampa questo messaggio della Guida\n\    -X            stampa la Guida sulle opzioni non standard\n\    -ea[:<nomepackage>...|:<nomeclasse>]\n\    -enableassertions[:<nomepackage>...|:<nomeclasse>]\n\                  abilita le asserzioni con la granularit\u00E0 specificata\n\    -da[:<nomepackage>...|:<nomeclasse>]\n\    -disableassertions[:<nomepackage>...|:<nomeclasse>]\n\                  disabilita le asserzioni con la granularit\u00E0 specificata\n\    -esa | -enablesystemassertions\n\                  abilita le asserzioni di sistema\n\    -dsa | -disablesystemassertions\n\                  disabilita le asserzioni di sistema\n\    -agentlib:<nomelib>[=<opzioni>]\n\                  carica la libreria agenti nativa <nomelib>, ad esempio -agentlib:hprof\n\                  vedere anche -agentlib:jdwp=help and -agentlib:hprof=help\n\    -agentpath:<nomepercorso>[=<opzioni>]\n\                  carica la libreria agenti nativa con il percorso completo\n\    -javaagent:<percorsojar>[=<opzioni>]\n\                  carica l''agente del linguaggio di programmazione Java. Vedere java.lang.instrument\n\    -splash:<percorsoimmagine>\n\                  mostra la schermata iniziale con l''immagine specificata\nVedere http://java.sun.com/javase/reference per maggiori dettagli.
+java.launcher.opt.footer     =\    -cp <classpath di ricerca di directory e file zip/jar>\n\\    -classpath <classpath di ricerca di directory e file zip/jar>\n\\                  Una lista separata da {0} di directory, archivi JAR,\n\\                  e archivi ZIP utilizzata per la ricerca di file di classe.\n\\    -D<nome>=<valore>\n\\                  imposta una propriet\u00E0 di sistema\n\\    -verbose:[class|gc|jni]\n\\                  abilita l''output descrittivo\n\\    -version      stampa la versione del prodotto ed esce\n\\    -version:<valore>\n\\                  richiede l''esecuzione della versione specificata\n\\    -showversion  stampa la versione del prodotto e continua\n\\    -jre-restrict-search | -no-jre-restrict-search\n\\                  include/esclude gli ambienti JRE privati dell''utente nella ricerca della versione\n\\    -? -help      stampa questo messaggio della Guida\n\\    -X            stampa la Guida sulle opzioni non standard\n\\    -ea[:<nomepackage>...|:<nomeclasse>]\n\\    -enableassertions[:<nomepackage>...|:<nomeclasse>]\n\\                  abilita le asserzioni con la granularit\u00E0 specificata\n\\    -da[:<nomepackage>...|:<nomeclasse>]\n\\    -disableassertions[:<nomepackage>...|:<nomeclasse>]\n\\                  disabilita le asserzioni con la granularit\u00E0 specificata\n\\    -esa | -enablesystemassertions\n\\                  abilita le asserzioni di sistema\n\\    -dsa | -disablesystemassertions\n\\                  disabilita le asserzioni di sistema\n\\    -agentlib:<nomelib>[=<opzioni>]\n\\                  carica la libreria agenti nativa <nomelib>, ad esempio -agentlib:hprof\n\\                  vedere anche, -agentlib:jdwp=help and -agentlib:hprof=help\n\\    -agentpath:<nomepercorso>[=<opzioni>]\n\\                  carica la libreria agenti nativa con il percorso completo\n\\    -javaagent:<percorsojar>[=<opzioni>]\n\\                  carica l''agente del linguaggio di programmazione Java. Vedere java.lang.instrument\n\\    -splash:<percorsoimmagine>\n\\                  mostra la schermata iniziale con l''immagine specificata\nPer ulteriori dettagli, vedere http://www.oracle.com/technetwork/java/javase/documentation/index.html.
+
+# Translators please note do not translate the options themselves
+java.launcher.X.usage=\    -Xmixed           esecuzione in modalit\u00E0 mista (impostazione predefinita)\n    -Xint             esecuzione solo in modalit\u00E0 convertita\n    -Xbootclasspath:<directory e file zip/jar separati da {0}>\n                      imposta il percorso di ricerca per le classi e le risorse di bootstrap\n    -Xbootclasspath/a:<directory e file zip/jar separati da {0}>\n                      aggiunge alla fine del classpath di bootstrap\n    -Xbootclasspath/p:<directory e file zip/jar separati da {0}>\n                      antepone al classpath di bootstrap\n    -Xdiag            mostra messaggi di diagnostica aggiuntivi\n    -Xnoclassgc       disabilita la garbage collection della classe\n    -Xincgc           abilita la garbage collection incrementale\n    -Xloggc:<file>    registra lo stato GC in un file di log con indicatori orari\n    -Xbatch           disabilita la compilazione in background\n    -Xms<dimensione>        imposta la dimensione heap Java iniziale\n    -Xmx<dimensione>        imposta la dimensione heap Java massima\n    -Xss<dimensione>        imposta la dimensione dello stack di thread Java\n    -Xprof            visualizza i dati di profilo della CPU\n    -Xfuture          abilita i controlli pi\u00F9 limitativi anticipando le impostazioni predefinite future\n    -Xrs              riduce l''uso di segnali del sistema operativo da Java/VM (vedere la documentazione)\n    -Xcheck:jni       esegue controlli aggiuntivi per le funzioni JNI\n    -Xshare:off       non tenta di utilizzare i dati della classe condivisi\n    -Xshare:auto      utilizza i dati di classe condivisi se possibile (impostazione predefinita)\n    -Xshare:on        richiede l''uso dei dati di classe condivisi, altrimenti l''esecuzione non riesce.\n    -XshowSettings    mostra tutte le impostazioni e continua\n    -XshowSettings:all\n                      mostra tutte le impostazioni e continua\n    -XshowSettings:vm mostra tutte le impostazioni correlate alla VM e continua\n    -XshowSettings:properties\n                      mostra tutte le impostazioni delle propriet\u00E0 e continua\n    -XshowSettings:locale\n                      mostra tutte le impostazioni correlate alle impostazioni nazionali e continua\n\nLe opzioni -X non sono opzioni standard e sono soggette a modifiche senza preavviso.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\    -Xmixed           esecuzione in modalit\u00E0 mista (impostazione predefinita)\n\    -Xint             esecuzione solo in modalit\u00E0 convertita\n\    -Xbootclasspath:<directory e file zip/jar separati da {0}>\n\                      imposta il percorso di ricerca per le classi e le risorse di bootstrap\n\    -Xbootclasspath/a:<directory e file zip/jar separati da {0}>\n\                      aggiunge alla fine del classpath di bootstrap\n\    -Xbootclasspath/p:<directory e file zip/jar separati da {0}>\n\                      antepone al classpath di bootstrap\n\    -Xdiag            mostra messaggi di diagnostica aggiuntivi\n\    -Xnoclassgc       disabilita la garbage collection della classe\n\    -Xincgc           abilita la garbage collection incrementale\n\    -Xloggc:<file>    registra lo stato GC in un file di log con indicatori orari\n\    -Xbatch           disabilita la compilazione in background\n\    -Xms<dimensione>        imposta la dimensione heap Java iniziale\n\    -Xmx<dimensione>        imposta la dimensione heap Java massima\n\    -Xss<dimensione>        imposta la dimensione dello stack di thread Java\n\    -Xprof            visualizza i dati di profilo della CPU\n\    -Xfuture          abilita i controlli pi\u00F9 limitativi anticipando le impostazioni predefinite future\n\    -Xrs              riduce l''uso di segnali del sistema operativo da Java/VM (vedere la documentazione)\n\    -Xcheck:jni       esegue controlli aggiuntivi per le funzioni JNI\n\    -Xshare:off       non tenta di utilizzare i dati della classe condivisi\n\    -Xshare:auto      utilizza i dati di classe condivisi se possibile (impostazione predefinita)\n\    -Xshare:on        richiede l''uso dei dati di classe condivisi, altrimenti l''esecuzione non riesce.\n\    -XshowSettings    mostra tutte le impostazioni e continua\n\    -XshowSettings:all\n\                      mostra tutte le impostazioni e continua\n\    -XshowSettings:vm mostra tutte le impostazioni correlate alla VM e continua\n\    -XshowSettings:properties\n\                      mostra tutte le impostazioni delle propriet\u00E0 e continua\n\    -XshowSettings:locale\n\                      mostra tutte le impostazioni correlate alle impostazioni nazionali e continua\n\nLe opzioni -X non sono opzioni standard e sono soggette a modifiche senza preavviso.\n
+java.launcher.X.macosx.usage=\nLe opzioni riportate di seguito sono specifiche del sistema operativo Mac OS X:\n    -XstartOnFirstThread\n                      Esegue il metodo main() sul primo thread (AppKit).\n    -Xdock:name=<nome applicazione>"\n                      Sostituisce il nome applicazione predefinito visualizzato nel dock\n    -Xdock:icon=<percorso file icona>\n                      Sostituisce l'icona predefinita visualizzata nel dock\n\n
 
 java.launcher.cls.error1=Errore: impossibile trovare o caricare la classe principale {0}
-java.launcher.cls.error2=Errore: il metodo principale non \u00E8 {0} nella classe {1}. Definire il metodo principale come:\n\   public static void main(String[] args)
-java.launcher.cls.error3=Errore: il metodo principale deve restituire un valore di tipo void nella classe {0}. \nDefinire il metodo principale come:\n\   public static void main(String[] args)
-java.launcher.cls.error4=Errore: il metodo principale non \u00E8 stato trovato nella classe {0}. Definire il metodo principale come:\n\   public static void main(String[] args)
+java.launcher.cls.error2=Errore: il metodo principale non \u00E8 {0} nella classe {1}. Definire il metodo principale come:\n   public static void main(String[] args)
+java.launcher.cls.error3=Errore: il metodo principale deve restituire un valore di tipo void nella classe {0}. \nDefinire il metodo principale come:\n   public static void main(String[] args)
+java.launcher.cls.error4=Errore: il metodo principale non \u00E8 stato trovato nella classe {0}. Definire il metodo principale come:\n   public static void main(String[] args)\naltrimenti una classe applicazione JavaFX deve estendere {1}
+java.launcher.cls.error5=Errore: non sono presenti i componenti runtime di JavaFX necessari per eseguire questa applicazione
 java.launcher.jar.error1=Errore: si \u00E8 verificato un errore imprevisto durante il tentativo di aprire il file {0}
 java.launcher.jar.error2=manifest non trovato in {0}
 java.launcher.jar.error3=nessun attributo manifest principale in {0}
+java.launcher.init.error=errore di inizializzazione
+java.launcher.javafx.error1=Errore: il metodo JavaFX launchApplication dispone di una firma errata, \nla firma deve essere dichiarata static e restituire un valore di tipo void
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   \u4F7F\u7528\u65B9\u6CD5: {0} [-options] class [args...]\n\           (\u30AF\u30E9\u30B9\u3092\u5B9F\u884C\u3059\u308B\u5834\u5408)\n   \u307E\u305F\u306F  {0} [-options] -jar jarfile [args...]\n\           (jar\u30D5\u30A1\u30A4\u30EB\u3092\u5B9F\u884C\u3059\u308B\u5834\u5408)\noptions\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059\u3002\n
+java.launcher.opt.header  =   \u4F7F\u7528\u65B9\u6CD5: {0} [-options] class [args...]\n           (\u30AF\u30E9\u30B9\u3092\u5B9F\u884C\u3059\u308B\u5834\u5408)\n   \u307E\u305F\u306F  {0} [-options] -jar jarfile [args...]\n           (jar\u30D5\u30A1\u30A4\u30EB\u3092\u5B9F\u884C\u3059\u308B\u5834\u5408)\noptions\u306B\u306F\u6B21\u306E\u3082\u306E\u304C\u3042\u308A\u307E\u3059\u3002\n
 
 java.launcher.opt.datamodel  =\    -d{0}\t  \u4F7F\u7528\u53EF\u80FD\u306A\u5834\u5408\u306F{0}\u30D3\u30C3\u30C8\u306E\u30C7\u30FC\u30BF\u30FB\u30E2\u30C7\u30EB\u3092\u4F7F\u7528\u3059\u308B\n
 java.launcher.opt.vmselect   =\    {0}\t  "{1}" VM\u3092\u9078\u629E\u3059\u308B\u5834\u5408\n
@@ -34,15 +34,21 @@
 java.launcher.ergo.message2  =\                  \u3053\u308C\u306F\u30B5\u30FC\u30D0\u30FC\u30AF\u30E9\u30B9\u306E\u30DE\u30B7\u30F3\u3067\u5B9F\u884C\u3057\u3066\u3044\u308B\u305F\u3081\u3067\u3059\u3002\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer     =\    -cp <class search path of directories and zip/jar files>\n\    -classpath <class search path of directories and zip/jar files>\n\                  \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001\n\                  JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u304A\u3088\u3073ZIP\u30A2\u30FC\u30AB\u30A4\u30D6\u306E{0}\u3067\u533A\u5207\u3089\u308C\u305F\u30EA\u30B9\u30C8\u3067\u3059\u3002\n\    -D<name>=<value>\n\                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3059\u308B\n\    -verbose[:class|gc|jni]\n\                  \u8A73\u7D30\u306A\u51FA\u529B\u3092\u884C\u3046\n\    -version      \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3059\u308B\n\    -version:<value>\n\                  \u6307\u5B9A\u3057\u305F\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u5B9F\u884C\u306B\u5FC5\u9808\u306B\u3059\u308B\n\    -showversion  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3059\u308B\n\    -jre-restrict-search | -no-jre-restrict-search\n\                  \u30E6\u30FC\u30B6\u30FC\u306E\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8JRE\u3092\u30D0\u30FC\u30B8\u30E7\u30F3\u691C\u7D22\u306B\u542B\u3081\u308B/\u9664\u5916\u3059\u308B\n\    -? -help      \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B\n\    -X            \u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u95A2\u3059\u308B\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3059\u308B\n\    -ea[:<packagename>...|:<classname>]\n\    -enableassertions[:<packagename>...|:<classname>]\n\                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n\    -da[:<packagename>...|:<classname>]\n\    -disableassertions[:<packagename>...|:<classname>]\n\                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n\    -esa | -enablesystemassertions\n\                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n\    -dsa | -disablesystemassertions\n\                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n\    -agentlib:<libname>[=<options>]\n\                  \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3059\u308B\u3002\u4F8B: -agentlib:hprof\n\                  -agentlib:jdwp=help\u3068-agentlib:hprof=help\u3082\u53C2\u7167\n\    -agentpath:<pathname>[=<options>]\n\                  \u30D5\u30EB\u30D1\u30B9\u540D\u3067\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3059\u308B\n\    -javaagent:<jarpath>[=<options>]\n\                  Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3059\u308B\u3002java.lang.instrument\u3092\u53C2\u7167\n\    -splash:<imagepath>\n\                  \u6307\u5B9A\u3057\u305F\u30A4\u30E1\u30FC\u30B8\u3067\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3059\u308B\n\u8A73\u7D30\u306Fhttp://java.sun.com/javase/reference\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+java.launcher.opt.footer     =\    -cp <class search path of directories and zip/jar files>\n    -classpath <class search path of directories and zip/jar files>\n                  \u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3001\n                  JAR\u30A2\u30FC\u30AB\u30A4\u30D6\u304A\u3088\u3073ZIP\u30A2\u30FC\u30AB\u30A4\u30D6\u306E{0}\u3067\u533A\u5207\u3089\u308C\u305F\u30EA\u30B9\u30C8\u3067\u3059\u3002\n    -D<name>=<value>\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u8A2D\u5B9A\u3059\u308B\n    -verbose:[class|gc|jni]\n                  \u8A73\u7D30\u306A\u51FA\u529B\u3092\u884C\u3046\n    -version      \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3059\u308B\n    -version:<value>\n                  \u6307\u5B9A\u3057\u305F\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u5B9F\u884C\u306B\u5FC5\u9808\u306B\u3059\u308B\n    -showversion  \u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u3066\u7D9A\u884C\u3059\u308B\n    -jre-restrict-search | -no-jre-restrict-search\n                  \u30E6\u30FC\u30B6\u30FC\u306E\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8JRE\u3092\u30D0\u30FC\u30B8\u30E7\u30F3\u691C\u7D22\u306B\u542B\u3081\u308B/\u9664\u5916\u3059\u308B\n    -? -help      \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3059\u308B\n    -X            \u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u95A2\u3059\u308B\u30D8\u30EB\u30D7\u3092\u51FA\u529B\u3059\u308B\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  \u6307\u5B9A\u3057\u305F\u7C92\u5EA6\u3067\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n    -esa | -enablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n    -dsa | -disablesystemassertions\n                  \u30B7\u30B9\u30C6\u30E0\u30FB\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n    -agentlib:<libname>[=<options>]\n                  \u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA<libname>\u3092\u30ED\u30FC\u30C9\u3059\u308B\u3002\u4F8B: -agentlib:hprof\n                  -agentlib:jdwp=help\u3068-agentlib:hprof=help\u3082\u53C2\u7167\n    -agentpath:<pathname>[=<options>]\n                  \u30D5\u30EB\u30D1\u30B9\u540D\u3067\u30CD\u30A4\u30C6\u30A3\u30D6\u30FB\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30ED\u30FC\u30C9\u3059\u308B\n    -javaagent:<jarpath>[=<options>]\n                  Java\u30D7\u30ED\u30B0\u30E9\u30DF\u30F3\u30B0\u8A00\u8A9E\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3059\u308B\u3002java.lang.instrument\u3092\u53C2\u7167\n    -splash:<imagepath>\n                  \u6307\u5B9A\u3057\u305F\u30A4\u30E1\u30FC\u30B8\u3067\u30B9\u30D7\u30E9\u30C3\u30B7\u30E5\u753B\u9762\u3092\u8868\u793A\u3059\u308B\n\u8A73\u7D30\u306Fhttp://www.oracle.com/technetwork/java/javase/documentation/index.html\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+
+# Translators please note do not translate the options themselves
+java.launcher.X.usage=\    -Xmixed           \u6DF7\u5408\u30E2\u30FC\u30C9\u306E\u5B9F\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8)\n    -Xint             \u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u30FB\u30E2\u30FC\u30C9\u306E\u5B9F\u884C\u306E\u307F\n    -Xbootclasspath:<directories and zip/jar files separated by {0}>\n                      \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u306E\u30AF\u30E9\u30B9\u3068\u30EA\u30BD\u30FC\u30B9\u306E\u691C\u7D22\u30D1\u30B9\u3092\u8A2D\u5B9A\u3059\u308B\n    -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n                      \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u6700\u5F8C\u306B\u8FFD\u52A0\u3059\u308B\n    -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n                      \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u524D\u306B\u4ED8\u52A0\u3059\u308B\n    -Xdiag            \u8FFD\u52A0\u306E\u8A3A\u65AD\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3059\u308B\n    -Xnoclassgc       \u30AF\u30E9\u30B9\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n    -Xincgc           \u5897\u5206\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n    -Xloggc:<file>    \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u306BGC\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30ED\u30B0\u3092\u8A18\u9332\u3059\u308B\n    -Xbatch           \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7121\u52B9\u306B\u3059\u308B\n    -Xms<size>        Java\u306E\u521D\u671F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n    -Xmx<size>        Java\u306E\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n    -Xss<size>        Java\u306E\u30B9\u30EC\u30C3\u30C9\u30FB\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n    -Xprof            CPU\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u30FB\u30C7\u30FC\u30BF\u3092\u51FA\u529B\u3059\u308B\n    -Xfuture          \u5C06\u6765\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u898B\u8D8A\u3057\u3066\u3001\u6700\u3082\u53B3\u5BC6\u306A\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3059\u308B\n    -Xrs              Java/VM\u306B\u3088\u308BOS\u30B7\u30B0\u30CA\u30EB\u306E\u4F7F\u7528\u3092\u524A\u6E1B\u3059\u308B(\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167)\n    -Xcheck:jni       JNI\u95A2\u6570\u306B\u5BFE\u3059\u308B\u8FFD\u52A0\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3059\u308B\n    -Xshare:off       \u5171\u6709\u30AF\u30E9\u30B9\u306E\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u306A\u3044\n    -Xshare:auto      \u53EF\u80FD\u3067\u3042\u308C\u3070\u5171\u6709\u30AF\u30E9\u30B9\u306E\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8)\n    -Xshare:on        \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3059\u308B\u3002\n    -XshowSettings    \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n    -XshowSettings:all\n                      \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n    -XshowSettings:vm \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n    -XshowSettings:properties\n                      \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n    -XshowSettings:locale\n                      \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n\n-X\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u6A19\u6E96\u306A\u306E\u3067\u3001\u4E88\u544A\u306A\u304F\u5909\u66F4\u3055\u308C\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\    -Xmixed           \u6DF7\u5408\u30E2\u30FC\u30C9\u306E\u5B9F\u884C(\u30C7\u30D5\u30A9\u30EB\u30C8)\n\    -Xint             \u30A4\u30F3\u30BF\u30D7\u30EA\u30BF\u30FB\u30E2\u30FC\u30C9\u306E\u5B9F\u884C\u306E\u307F\n\    -Xbootclasspath:<directories and zip/jar files separated by {0}>\n\                      \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u306E\u30AF\u30E9\u30B9\u3068\u30EA\u30BD\u30FC\u30B9\u306E\u691C\u7D22\u30D1\u30B9\u3092\u8A2D\u5B9A\u3059\u308B\n\    -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n\                      \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u6700\u5F8C\u306B\u8FFD\u52A0\u3059\u308B\n\    -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n\                      \u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u524D\u306B\u4ED8\u52A0\u3059\u308B\n\    -Xdiag            \u8FFD\u52A0\u306E\u8A3A\u65AD\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3059\u308B\n\    -Xnoclassgc       \u30AF\u30E9\u30B9\u306E\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u7121\u52B9\u306B\u3059\u308B\n\    -Xincgc           \u5897\u5206\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\n\    -Xloggc:<file>    \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u306BGC\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u30ED\u30B0\u3092\u8A18\u9332\u3059\u308B\n\    -Xbatch           \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u7121\u52B9\u306B\u3059\u308B\n\    -Xms<size>        Java\u306E\u521D\u671F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n\    -Xmx<size>        Java\u306E\u6700\u5C0F\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n\    -Xss<size>        Java\u306E\u30B9\u30EC\u30C3\u30C9\u30FB\u30B9\u30BF\u30C3\u30AF\u30FB\u30B5\u30A4\u30BA\u3092\u8A2D\u5B9A\u3059\u308B\n\    -Xprof            CPU\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u30FB\u30C7\u30FC\u30BF\u3092\u51FA\u529B\u3059\u308B\n\    -Xfuture          \u5C06\u6765\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u3092\u898B\u8D8A\u3057\u3066\u3001\u6700\u3082\u53B3\u5BC6\u306A\u30C1\u30A7\u30C3\u30AF\u3092\u6709\u52B9\u306B\u3059\u308B\n\    -Xrs              Java/VM\u306B\u3088\u308BOS\u30B7\u30B0\u30CA\u30EB\u306E\u4F7F\u7528\u3092\u524A\u6E1B\u3059\u308B(\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3092\u53C2\u7167)\n\    -Xcheck:jni       JNI\u95A2\u6570\u306B\u5BFE\u3059\u308B\u8FFD\u52A0\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u5B9F\u884C\u3059\u308B\n\    -Xshare:off       \u5171\u6709\u30AF\u30E9\u30B9\u306E\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u306A\u3044\n\    -Xshare:auto      \u53EF\u80FD\u3067\u3042\u308C\u3070\u5171\u6709\u30AF\u30E9\u30B9\u306E\u30C7\u30FC\u30BF\u3092\u4F7F\u7528\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8)\n\    -Xshare:on        \u5171\u6709\u30AF\u30E9\u30B9\u30FB\u30C7\u30FC\u30BF\u306E\u4F7F\u7528\u3092\u5FC5\u9808\u306B\u3057\u3001\u3067\u304D\u306A\u3051\u308C\u3070\u5931\u6557\u3059\u308B\u3002\n\    -XshowSettings    \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n\    -XshowSettings:all\n\                      \u3059\u3079\u3066\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n\    -XshowSettings:vm \u3059\u3079\u3066\u306EVM\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n\    -XshowSettings:properties\n\                      \u3059\u3079\u3066\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n\    -XshowSettings:locale\n\                      \u3059\u3079\u3066\u306E\u30ED\u30B1\u30FC\u30EB\u95A2\u9023\u306E\u8A2D\u5B9A\u3092\u8868\u793A\u3057\u3066\u7D9A\u884C\u3059\u308B\n\n-X\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u975E\u6A19\u6E96\u306A\u306E\u3067\u3001\u4E88\u544A\u306A\u304F\u5909\u66F4\u3055\u308C\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002\n
+java.launcher.X.macosx.usage=\n\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306FMac OS X\u56FA\u6709\u3067\u3059\u3002\n    -XstartOnFirstThread\n                      main()\u30E1\u30BD\u30C3\u30C9\u3092\u6700\u521D(AppKit)\u306E\u30B9\u30EC\u30C3\u30C9\u3067\u5B9F\u884C\u3059\u308B\n    -Xdock:name=<application name>"\n                      Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n    -Xdock:icon=<path to icon file>\n                      Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n\n
 
 java.launcher.cls.error1=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u3089\u306A\u304B\u3063\u305F\u304B\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
-java.launcher.cls.error2=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u304C\u30AF\u30E9\u30B9{1}\u306E{0}\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u6B21\u306E\u3088\u3046\u306B\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\   public static void main(String[] args)
-java.launcher.cls.error3=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u30AF\u30E9\u30B9{0}\u306Evoid\u578B\u306E\u5024\u3092\u8FD4\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\u6B21\u306E\u3088\u3046\u306B\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\   public static void main(String[] args)
-java.launcher.cls.error4=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u304C\u30AF\u30E9\u30B9{0}\u3067\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u6B21\u306E\u3088\u3046\u306B\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n\   public static void main(String[] args)
+java.launcher.cls.error2=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u304C\u30AF\u30E9\u30B9{1}\u306E{0}\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u6B21\u306E\u3088\u3046\u306B\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n   public static void main(String[] args)
+java.launcher.cls.error3=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u306F\u30AF\u30E9\u30B9{0}\u306Evoid\u578B\u306E\u5024\u3092\u8FD4\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\u6B21\u306E\u3088\u3046\u306B\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n   public static void main(String[] args)
+java.launcher.cls.error4=\u30A8\u30E9\u30FC: \u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u304C\u30AF\u30E9\u30B9{0}\u3067\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u6B21\u306E\u3088\u3046\u306B\u30E1\u30A4\u30F3\u30FB\u30E1\u30BD\u30C3\u30C9\u3092\u5B9A\u7FA9\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n   public static void main(String[] args)\n\u307E\u305F\u306FJavaFX\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30FB\u30AF\u30E9\u30B9\u306F{1}\u3092\u62E1\u5F35\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
+java.launcher.cls.error5=\u30A8\u30E9\u30FC: JavaFX\u30E9\u30F3\u30BF\u30A4\u30E0\u30FB\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u4E0D\u8DB3\u3057\u3066\u304A\u308A\u3001\u3053\u306E\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u5B9F\u884C\u306B\u5FC5\u8981\u3067\u3059
 java.launcher.jar.error1=\u30A8\u30E9\u30FC: \u30D5\u30A1\u30A4\u30EB{0}\u3092\u958B\u3053\u3046\u3068\u3057\u3066\u3044\u308B\u3068\u304D\u306B\u3001\u4E88\u671F\u3057\u306A\u3044\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 java.launcher.jar.error2={0}\u306B\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 java.launcher.jar.error3={0}\u306B\u30E1\u30A4\u30F3\u30FB\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u5C5E\u6027\u304C\u3042\u308A\u307E\u305B\u3093
+java.launcher.init.error=\u521D\u671F\u5316\u30A8\u30E9\u30FC
+java.launcher.javafx.error1=\u30A8\u30E9\u30FC: JavaFX launchApplication\u30E1\u30BD\u30C3\u30C9\u306B\u8AA4\u3063\u305F\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u3042\u308A\u3001\nstatic\u3092\u5BA3\u8A00\u3057\u3066void\u578B\u306E\u5024\u3092\u8FD4\u3059\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   \uC0AC\uC6A9\uBC95: {0} [-options] class [args...]\n\           (\uD074\uB798\uC2A4 \uC2E4\uD589)\n   \uB610\uB294  {0} [-options] -jar jarfile [args...]\n\           (jar \uD30C\uC77C \uC2E4\uD589)\n\uC5EC\uAE30\uC11C options\uB294 \uB2E4\uC74C\uACFC \uAC19\uC2B5\uB2C8\uB2E4.\n
+java.launcher.opt.header  =   \uC0AC\uC6A9\uBC95: {0} [-options] class [args...]\n           (\uD074\uB798\uC2A4 \uC2E4\uD589)\n   \uB610\uB294  {0} [-options] -jar jarfile [args...]\n           (jar \uD30C\uC77C \uC2E4\uD589)\n\uC5EC\uAE30\uC11C options\uB294 \uB2E4\uC74C\uACFC \uAC19\uC2B5\uB2C8\uB2E4.\n
 
 java.launcher.opt.datamodel  =\    -d{0}\t  \uC0AC\uC6A9 \uAC00\uB2A5\uD55C \uACBD\uC6B0 {0}\uBE44\uD2B8 \uB370\uC774\uD130 \uBAA8\uB378\uC744 \uC0AC\uC6A9\uD569\uB2C8\uB2E4.\n
 java.launcher.opt.vmselect   =\    {0}\t  "{1}" VM\uC744 \uC120\uD0DD\uD569\uB2C8\uB2E4.\n
@@ -34,15 +34,21 @@
 java.launcher.ergo.message2  =\                  \uC11C\uBC84\uAE09 \uC2DC\uC2A4\uD15C\uC5D0\uC11C \uC2E4\uD589 \uC911\uC774\uAE30 \uB54C\uBB38\uC785\uB2C8\uB2E4.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer     =\    -cp <class search path of directories and zip/jar files>\n\    -classpath <class search path of directories and zip/jar files>\n\                  \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uAC80\uC0C9\uD560 {0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC,\n\                  JAR \uC544\uCE74\uC774\uBE0C \uBC0F ZIP \uC544\uCE74\uC774\uBE0C \uBAA9\uB85D\uC785\uB2C8\uB2E4.\n\    -D<name>=<value>\n\                  \uC2DC\uC2A4\uD15C \uC18D\uC131\uC744 \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -verbose[:class|gc|jni]\n\                  \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -version      \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uC885\uB8CC\uD569\uB2C8\uB2E4.\n\    -version:<value>\n\                  \uC2E4\uD589\uD560 \uBC84\uC804\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4.\n\    -showversion  \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\    -jre-restrict-search | -no-jre-restrict-search\n\                  \uBC84\uC804 \uAC80\uC0C9\uC5D0\uC11C \uC0AC\uC6A9\uC790 \uC804\uC6A9 JRE\uB97C \uD3EC\uD568/\uC81C\uC678\uD569\uB2C8\uB2E4.\n\    -? -help      \uC774 \uB3C4\uC6C0\uB9D0 \uBA54\uC2DC\uC9C0\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4.\n\    -X            \uBE44\uD45C\uC900 \uC635\uC158\uC5D0 \uB300\uD55C \uB3C4\uC6C0\uB9D0\uC744 \uC778\uC1C4\uD569\uB2C8\uB2E4.\n\    -ea[:<packagename>...|:<classname>]\n\    -enableassertions[:<packagename>...|:<classname>]\n\                  \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -da[:<packagename>...|:<classname>]\n\    -disableassertions[:<packagename>...|:<classname>]\n\                  \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -esa | -enablesystemassertions\n\                  \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -dsa | -disablesystemassertions\n\                  \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -agentlib:<libname>[=<options>]\n\                  <libname> \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4(\uC608: -agentlib:hprof).\n\                  -agentlib:jdwp=help \uBC0F -agentlib:hprof=help\uB3C4 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n\    -agentpath:<pathname>[=<options>]\n\                  \uC804\uCCB4 \uACBD\uB85C\uBA85\uC744 \uC0AC\uC6A9\uD558\uC5EC \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4.\n\    -javaagent:<jarpath>[=<options>]\n\                  Java \uD504\uB85C\uADF8\uB798\uBC0D \uC5B8\uC5B4 \uC5D0\uC774\uC804\uD2B8\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4. java.lang.instrument\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n\    -splash:<imagepath>\n\                  \uC774\uBBF8\uC9C0\uAC00 \uC9C0\uC815\uB41C \uC2A4\uD50C\uB798\uC2DC \uD654\uBA74\uC744 \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\uC790\uC138\uD55C \uB0B4\uC6A9\uC740 http://java.sun.com/javase/reference\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
+java.launcher.opt.footer     =\    -cp <class search path of directories and zip/jar files>\n\\    -classpath <class search path of directories and zip/jar files>\n\\                  \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uAC80\uC0C9\uD560 {0}(\uC73C)\uB85C \uAD6C\uBD84\uB41C \uB514\uB809\uD1A0\uB9AC,\n\\                  JAR \uC544\uCE74\uC774\uBE0C \uBC0F ZIP \uC544\uCE74\uC774\uBE0C \uBAA9\uB85D\uC785\uB2C8\uB2E4.\n\\    -D<name>=<value>\n\\                  \uC2DC\uC2A4\uD15C \uC18D\uC131\uC744 \uC124\uC815\uD569\uB2C8\uB2E4.\n\\    -verbose:[class|gc|jni]\n\\                  \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\\    -version      \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uC885\uB8CC\uD569\uB2C8\uB2E4.\n\\    -version:<value>\n\\                  \uC2E4\uD589\uD560 \uBC84\uC804\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4.\n\\    -showversion  \uC81C\uD488 \uBC84\uC804\uC744 \uC778\uC1C4\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\\    -jre-restrict-search | -no-jre-restrict-search\n\\                  \uBC84\uC804 \uAC80\uC0C9\uC5D0\uC11C \uC0AC\uC6A9\uC790 \uC804\uC6A9 JRE\uB97C \uD3EC\uD568/\uC81C\uC678\uD569\uB2C8\uB2E4.\n\\    -? -help      \uC774 \uB3C4\uC6C0\uB9D0 \uBA54\uC2DC\uC9C0\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4.\n\\    -X            \uBE44\uD45C\uC900 \uC635\uC158\uC5D0 \uB300\uD55C \uB3C4\uC6C0\uB9D0\uC744 \uC778\uC1C4\uD569\uB2C8\uB2E4.\n\\    -ea[:<packagename>...|:<classname>]\n\\    -enableassertions[:<packagename>...|:<classname>]\n\\                  \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\\    -da[:<packagename>...|:<classname>]\n\\    -disableassertions[:<packagename>...|:<classname>]\n\\                  \uC138\uBD84\uC131\uC774 \uC9C0\uC815\uB41C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\\    -esa | -enablesystemassertions\n\\                  \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\\    -dsa | -disablesystemassertions\n\\                  \uC2DC\uC2A4\uD15C \uAC80\uC99D\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\\    -agentlib:<libname>[=<options>]\n\\                  <libname> \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4(\uC608: -agentlib:hprof).\n\\                  -agentlib:jdwp=help \uBC0F -agentlib:hprof=help\uB3C4 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n\\    -agentpath:<pathname>[=<options>]\n\\                  \uC804\uCCB4 \uACBD\uB85C\uBA85\uC744 \uC0AC\uC6A9\uD558\uC5EC \uACE0\uC720 \uC5D0\uC774\uC804\uD2B8 \uB77C\uC774\uBE0C\uB7EC\uB9AC\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4.\n\\    -javaagent:<jarpath>[=<options>]\n\\                  Java \uD504\uB85C\uADF8\uB798\uBC0D \uC5B8\uC5B4 \uC5D0\uC774\uC804\uD2B8\uB97C \uB85C\uB4DC\uD569\uB2C8\uB2E4. java.lang.instrument\uB97C \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.\n\\    -splash:<imagepath>\n\\                  \uC774\uBBF8\uC9C0\uAC00 \uC9C0\uC815\uB41C \uC2A4\uD50C\uB798\uC2DC \uD654\uBA74\uC744 \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\uC790\uC138\uD55C \uB0B4\uC6A9\uC740 http://www.oracle.com/technetwork/java/javase/documentation/index.html\uC744 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624.
+
+# Translators please note do not translate the options themselves
+java.launcher.X.usage=\    -Xmixed           \uD63C\uD569 \uBAA8\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n    -Xint             \uD574\uC11D\uB41C \uBAA8\uB4DC\uB9CC \uC2E4\uD589\uD569\uB2C8\uB2E4.\n    -Xbootclasspath:<directories and zip/jar files separated by {0}>\n                      \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uBC0F \uB9AC\uC18C\uC2A4\uC5D0 \uB300\uD55C \uAC80\uC0C9 \uACBD\uB85C\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n                      \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uB05D\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n    -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n                      \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uC55E\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n    -Xdiag            \uCD94\uAC00 \uC9C4\uB2E8 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n    -Xnoclassgc       \uD074\uB798\uC2A4\uC758 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -Xincgc           \uC99D\uBD84\uC801\uC778 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -Xloggc:<file>    \uC2DC\uAC04 \uAE30\uB85D\uACFC \uD568\uAED8 \uD30C\uC77C\uC5D0 GC \uC0C1\uD0DC\uB97C \uAE30\uB85D\uD569\uB2C8\uB2E4.\n    -Xbatch           \uBC31\uADF8\uB77C\uC6B4\uB4DC \uCEF4\uD30C\uC77C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -Xms<size>        \uCD08\uAE30 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -Xmx<size>        \uCD5C\uB300 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -Xss<size>        Java \uC2A4\uB808\uB4DC \uC2A4\uD0DD \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -Xprof            CPU \uD504\uB85C\uD30C\uC77C \uC791\uC131 \uB370\uC774\uD130\uB97C \uCD9C\uB825\uD569\uB2C8\uB2E4.\n    -Xfuture          \uBBF8\uB798 \uAE30\uBCF8\uAC12\uC744 \uC608\uCE21\uD558\uC5EC \uAC00\uC7A5 \uC5C4\uACA9\uD55C \uAC80\uC0AC\uB97C \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n    -Xrs              Java/VM\uC5D0 \uC758\uD55C OS \uC2E0\uD638 \uC0AC\uC6A9\uC744 \uC904\uC785\uB2C8\uB2E4(\uC124\uBA85\uC11C \uCC38\uC870).\n    -Xcheck:jni       JNI \uD568\uC218\uC5D0 \uB300\uD55C \uCD94\uAC00 \uAC80\uC0AC\uB97C \uC218\uD589\uD569\uB2C8\uB2E4.\n    -Xshare:off       \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130 \uC0AC\uC6A9\uC744 \uC2DC\uB3C4\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n    -Xshare:auto      \uAC00\uB2A5\uD55C \uACBD\uC6B0 \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n    -Xshare:on        \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD574\uC57C \uD569\uB2C8\uB2E4. \uADF8\uB807\uC9C0 \uC54A\uC744 \uACBD\uC6B0 \uC2E4\uD328\uD569\uB2C8\uB2E4.\n    -XshowSettings    \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n    -XshowSettings:all\n                      \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n    -XshowSettings:vm \uBAA8\uB4E0 VM \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n    -XshowSettings:properties\n                      \uBAA8\uB4E0 \uC18D\uC131 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n    -XshowSettings:locale\n                      \uBAA8\uB4E0 \uB85C\uCF00\uC77C \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\n-X \uC635\uC158\uC740 \uBE44\uD45C\uC900 \uC635\uC158\uC774\uBBC0\uB85C \uD1B5\uC9C0 \uC5C6\uC774 \uBCC0\uACBD\uB420 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\    -Xmixed           \uD63C\uD569 \uBAA8\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n\    -Xint             \uD574\uC11D\uB41C \uBAA8\uB4DC\uB9CC \uC2E4\uD589\uD569\uB2C8\uB2E4.\n\    -Xbootclasspath:<directories and zip/jar files separated by {0}>\n\                      \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uBC0F \uB9AC\uC18C\uC2A4\uC5D0 \uB300\uD55C \uAC80\uC0C9 \uACBD\uB85C\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n\                      \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uB05D\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n\    -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n\                      \uBD80\uD2B8\uC2A4\uD2B8\uB7A9 \uD074\uB798\uC2A4 \uACBD\uB85C \uC55E\uC5D0 \uCD94\uAC00\uD569\uB2C8\uB2E4.\n\    -Xdiag            \uCD94\uAC00 \uC9C4\uB2E8 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\    -Xnoclassgc       \uD074\uB798\uC2A4\uC758 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -Xincgc           \uC99D\uBD84\uC801\uC778 \uBD88\uD544\uC694\uD55C \uC815\uBCF4 \uBAA8\uC74C\uC744 \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -Xloggc:<file>    \uC2DC\uAC04 \uAE30\uB85D\uACFC \uD568\uAED8 \uD30C\uC77C\uC5D0 GC \uC0C1\uD0DC\uB97C \uAE30\uB85D\uD569\uB2C8\uB2E4.\n\    -Xbatch           \uBC31\uADF8\uB77C\uC6B4\uB4DC \uCEF4\uD30C\uC77C\uC744 \uC0AC\uC6A9 \uC548\uD568\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -Xms<size>        \uCD08\uAE30 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -Xmx<size>        \uCD5C\uB300 Java \uD799 \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -Xss<size>        Java \uC2A4\uB808\uB4DC \uC2A4\uD0DD \uD06C\uAE30\uB97C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -Xprof            CPU \uD504\uB85C\uD30C\uC77C \uC791\uC131 \uB370\uC774\uD130\uB97C \uCD9C\uB825\uD569\uB2C8\uB2E4.\n\    -Xfuture          \uBBF8\uB798 \uAE30\uBCF8\uAC12\uC744 \uC608\uCE21\uD558\uC5EC \uAC00\uC7A5 \uC5C4\uACA9\uD55C \uAC80\uC0AC\uB97C \uC0AC\uC6A9\uC73C\uB85C \uC124\uC815\uD569\uB2C8\uB2E4.\n\    -Xrs              Java/VM\uC5D0 \uC758\uD55C OS \uC2E0\uD638 \uC0AC\uC6A9\uC744 \uC904\uC785\uB2C8\uB2E4(\uC124\uBA85\uC11C \uCC38\uC870).\n\    -Xcheck:jni       JNI \uD568\uC218\uC5D0 \uB300\uD55C \uCD94\uAC00 \uAC80\uC0AC\uB97C \uC218\uD589\uD569\uB2C8\uB2E4.\n\    -Xshare:off       \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130 \uC0AC\uC6A9\uC744 \uC2DC\uB3C4\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n\    -Xshare:auto      \uAC00\uB2A5\uD55C \uACBD\uC6B0 \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD569\uB2C8\uB2E4(\uAE30\uBCF8\uAC12).\n\    -Xshare:on        \uACF5\uC720 \uD074\uB798\uC2A4 \uB370\uC774\uD130\uB97C \uC0AC\uC6A9\uD574\uC57C \uD569\uB2C8\uB2E4. \uADF8\uB807\uC9C0 \uC54A\uC744 \uACBD\uC6B0 \uC2E4\uD328\uD569\uB2C8\uB2E4.\n\    -XshowSettings    \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\    -XshowSettings:all\n\                      \uBAA8\uB4E0 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\    -XshowSettings:vm \uBAA8\uB4E0 VM \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\    -XshowSettings:properties\n\                      \uBAA8\uB4E0 \uC18D\uC131 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\    -XshowSettings:locale\n\                      \uBAA8\uB4E0 \uB85C\uCF00\uC77C \uAD00\uB828 \uC124\uC815\uC744 \uD45C\uC2DC\uD55C \uD6C4 \uACC4\uC18D\uD569\uB2C8\uB2E4.\n\n-X \uC635\uC158\uC740 \uBE44\uD45C\uC900 \uC635\uC158\uC774\uBBC0\uB85C \uD1B5\uC9C0 \uC5C6\uC774 \uBCC0\uACBD\uB420 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n
+java.launcher.X.macosx.usage=\n\uB2E4\uC74C\uC740 Mac OS X\uC5D0 \uD2B9\uC815\uB41C \uC635\uC158\uC785\uB2C8\uB2E4.\n    -XstartOnFirstThread\n                      \uCCAB\uBC88\uC9F8 (AppKit) \uC2A4\uB808\uB4DC\uC5D0 main() \uBA54\uC18C\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4.\n    -Xdock:name=<application name>"\n                      \uACE0\uC815\uC73C\uB85C \uD45C\uC2DC\uB41C \uAE30\uBCF8 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8 \uC774\uB984\uC744 \uBB34\uD6A8\uD654\uD569\uB2C8\uB2E4.\n    -Xdock:icon=<path to icon file>\n                      \uACE0\uC815\uC73C\uB85C \uD45C\uC2DC\uB41C \uAE30\uBCF8 \uC544\uC774\uCF58\uC744 \uBB34\uD6A8\uD654\uD569\uB2C8\uB2E4.\n\n
 
 java.launcher.cls.error1=\uC624\uB958: \uAE30\uBCF8 \uD074\uB798\uC2A4 {0}\uC744(\uB97C) \uCC3E\uAC70\uB098 \uB85C\uB4DC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-java.launcher.cls.error2=\uC624\uB958: {1} \uD074\uB798\uC2A4\uC5D0\uC11C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uAC00 {0}\uC774(\uAC00) \uC544\uB2D9\uB2C8\uB2E4. \uB2E4\uC74C \uD615\uC2DD\uC73C\uB85C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uC815\uC758\uD558\uC2ED\uC2DC\uC624.\n\   public static void main(String[] args)
-java.launcher.cls.error3=\uC624\uB958: \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB294 {0} \uD074\uB798\uC2A4\uC5D0\uC11C void \uC720\uD615\uC758 \uAC12\uC744 \uBC18\uD658\uD574\uC57C \uD569\uB2C8\uB2E4. \n\uB2E4\uC74C \uD615\uC2DD\uC73C\uB85C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uC815\uC758\uD558\uC2ED\uC2DC\uC624.\n\   public static void main(String[] args)
-java.launcher.cls.error4=\uC624\uB958: {0} \uD074\uB798\uC2A4\uC5D0\uC11C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uB2E4\uC74C \uD615\uC2DD\uC73C\uB85C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uC815\uC758\uD558\uC2ED\uC2DC\uC624.\n\   public static void main(String[] args)
+java.launcher.cls.error2=\uC624\uB958: {1} \uD074\uB798\uC2A4\uC5D0\uC11C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uAC00 {0}\uC774(\uAC00) \uC544\uB2D9\uB2C8\uB2E4. \uB2E4\uC74C \uD615\uC2DD\uC73C\uB85C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uC815\uC758\uD558\uC2ED\uC2DC\uC624.\n   public static void main(String[] args)
+java.launcher.cls.error3=\uC624\uB958: \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB294 {0} \uD074\uB798\uC2A4\uC5D0\uC11C void \uC720\uD615\uC758 \uAC12\uC744 \uBC18\uD658\uD574\uC57C \uD569\uB2C8\uB2E4. \n\uB2E4\uC74C \uD615\uC2DD\uC73C\uB85C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uC815\uC758\uD558\uC2ED\uC2DC\uC624.\n   public static void main(String[] args)
+java.launcher.cls.error4=\uC624\uB958: {0} \uD074\uB798\uC2A4\uC5D0\uC11C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uB2E4\uC74C \uD615\uC2DD\uC73C\uB85C \uAE30\uBCF8 \uBA54\uC18C\uB4DC\uB97C \uC815\uC758\uD558\uC2ED\uC2DC\uC624.\r\n   public static void main(String[] args)\r\n\uB610\uB294 JavaFX \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8 \uD074\uB798\uC2A4\uB294 {1}\uC744(\uB97C) \uD655\uC7A5\uD574\uC57C \uD569\uB2C8\uB2E4.
+java.launcher.cls.error5=\uC624\uB958: \uC774 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC744 \uC2E4\uD589\uD558\uB294 \uB370 \uD544\uC694\uD55C JavaFX \uB7F0\uD0C0\uC784 \uAD6C\uC131 \uC694\uC18C\uAC00 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 java.launcher.jar.error1=\uC624\uB958: {0} \uD30C\uC77C\uC744 \uC5F4\uB824\uACE0 \uC2DC\uB3C4\uD558\uB294 \uC911 \uC608\uC0C1\uCE58 \uC54A\uC740 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.
 java.launcher.jar.error2={0}\uC5D0\uC11C Manifest\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
 java.launcher.jar.error3={0}\uC5D0 \uAE30\uBCF8 Manifest \uC18D\uC131\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.
+java.launcher.init.error=\uCD08\uAE30\uD654 \uC624\uB958
+java.launcher.javafx.error1=\uC624\uB958: JavaFX launchApplication \uBA54\uC18C\uB4DC\uC5D0 \uC798\uBABB\uB41C \uC11C\uBA85\uC774 \uC788\uC2B5\uB2C8\uB2E4.\\n\uB530\uB77C\uC11C static\uC73C\uB85C \uC120\uC5B8\uD558\uACE0 void \uC720\uD615\uC758 \uAC12\uC744 \uBC18\uD658\uD574\uC57C \uD569\uB2C8\uB2E4.
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   Uso: {0} [-options] class [args...]\n\           (para executar uma classe)\n   ou  {0} [-options] -jar jarfile [args...]\n\           (para executar um arquivo jar)\nem que as op\u00E7\u00F5es incluem:\n
+java.launcher.opt.header  =   Uso: {0} [-options] class [args...]\n           (para executar uma classe)\n   ou  {0} [-options] -jar jarfile [args...]\n           (para executar um arquivo jar)\nem que as op\u00E7\u00F5es incluem:\n
 
 java.launcher.opt.datamodel  =\    -d{0}\t  usar um modelo de dados de {0} bits, se estiver dispon\u00EDvel\n
 java.launcher.opt.vmselect   =\    {0}\t  para selecionar a VM "{1}"\n
@@ -34,15 +34,21 @@
 java.launcher.ergo.message2  =\                  porque a execu\u00E7\u00E3o est\u00E1 sendo feita em uma m\u00E1quina de classe de servidor.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer     =\    -cp <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n\    -classpath <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n\                  Uma lista separada por {0} de diret\u00F3rios, archives JAR\n\                  e archives ZIP nos quais ser\u00E3o procurados os arquivos de classe.\n\    -D<nome>=<valor>\n\                  define uma propriedade do sistema\n\    -verbose[:classe|gc|jni]\n\                  ativa a sa\u00EDda detalhada\n\    -version      imprime a vers\u00E3o do produto e sai do programa\n\    -version:<valor>\n\                  requer a execu\u00E7\u00E3o da vers\u00E3o especificada\n\    -showversion  imprime a vers\u00E3o do produto e continua\n\    -jre-restrict-search | -no-jre-restrict-search\n\                  inclui/exclui JREs privados do usu\u00E1rio na pesquisa de vers\u00E3o\n\    -? -help      imprime esta mensagem de ajuda\n\    -X            imprime a ajuda sobre op\u00E7\u00F5es n\u00E3o padronizadas\n\    -ea[:<nome do pacote>...|:<nome da classe>]\n\    -enableassertions[:<nome do pacote>...|:<nome da classe>]\n\                  ativa asser\u00E7\u00F5es com granularidade especificada\n\    -da[:<nome do pacote>...|:<nome da classe>]\n\    -disableassertions[:<nome do pacote>...|:<nome da classe>]\n\                  desativa asser\u00E7\u00F5es com granularidade especificada\n\    -esa | -enablesystemassertions\n\                  ativa asser\u00E7\u00F5es do sistema\n\    -dsa | -disablesystemassertions\n\                  desativa asser\u00E7\u00F5es do sistema\n\    -agentlib:<nome da biblioteca>[=<op\u00E7\u00F5es>]\n\                  carrega a biblioteca de agentes nativa <nome da biblioteca>, por exempl: -agentlib:hprof\n\                  consulte tamb\u00E9m: -agentlib:jdwp=help e -agentlib:hprof=help\n\    -agentpath:<nome do caminho>[=<op\u00E7\u00F5es>]\n\                  carrega a biblioteca de agentes nativa com base no nome do caminho completo\n\    -javaagent:<caminho do arquivo jar>[=<op\u00E7\u00F5es>]\n\                  carrega o agente da linguagem de programa\u00E7\u00E3o Java; consulte java.lang.instrument\n\    -splash:<caminho da imagem>\n\                  mostra a tela de abertura com a imagem especificada\nConsulte http://java.sun.com/javase/reference para obter mais detalhes.
+java.launcher.opt.footer     =\    -cp <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n    -classpath <caminho de pesquisa da classe dos diret\u00F3rios e arquivos zip/jar>\n                  Uma lista separada por {0} de diret\u00F3rios, archives JAR\n                  e archives ZIP nos quais ser\u00E3o procurados os arquivos de classe.\n    -D<nome>=<valor>\n                  define uma propriedade do sistema\n    -verbose[:classe|gc|jni]\n                  ativa a sa\u00EDda detalhada\n    -version      imprime a vers\u00E3o do produto e sai do programa\n    -version:<valor>\n                  requer a execu\u00E7\u00E3o da vers\u00E3o especificada\n    -showversion  imprime a vers\u00E3o do produto e continua\n    -jre-restrict-search | -no-jre-restrict-search\n                  inclui/exclui JREs privados do usu\u00E1rio na pesquisa de vers\u00E3o\n    -? -help      imprime esta mensagem de ajuda\n    -X            imprime a ajuda sobre op\u00E7\u00F5es n\u00E3o padronizadas\n    -ea[:<nome do pacote>...|:<nome da classe>]\n    -enableassertions[:<nome do pacote>...|:<nome da classe>]\n                  ativa asser\u00E7\u00F5es com granularidade especificada\n    -da[:<nome do pacote>...|:<nome da classe>]\n    -disableassertions[:<nome do pacote>...|:<nome da classe>]\n                  desativa asser\u00E7\u00F5es com granularidade especificada\n    -esa | -enablesystemassertions\n                  ativa asser\u00E7\u00F5es do sistema\n    -dsa | -disablesystemassertions\n                  desativa asser\u00E7\u00F5es do sistema\n    -agentlib:<nome da biblioteca>[=<op\u00E7\u00F5es>]\n                  carrega a biblioteca de agentes nativa <nome da biblioteca>, por exemplo: -agentlib:hprof\n                  consulte tamb\u00E9m: -agentlib:jdwp=help e -agentlib:hprof=help\n    -agentpath:<nome do caminho>[=<op\u00E7\u00F5es>]\n                  carrega a biblioteca de agentes nativa com base no nome do caminho completo\n    -javaagent:<caminho do arquivo jar>[=<op\u00E7\u00F5es>]\n                  carrega o agente da linguagem de programa\u00E7\u00E3o Java; consulte java.lang.instrument\n    -splash:<caminho da imagem>\n                  mostra a tela de abertura com a imagem especificada\nConsulte http://www.oracle.com/technetwork/java/javase/documentation/index.html para obter mais detalhes.
+
+# Translators please note do not translate the options themselves
+java.launcher.X.usage=\    -Xmixed           execu\u00E7\u00E3o no modo misto (default)\n    -Xint             execu\u00E7\u00E3o somente no modo interpretado\n    -Xbootclasspath:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n                      define o caminho de pesquisa para classes e recursos de inicializa\u00E7\u00E3o\n    -Xbootclasspath/a:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n                      anexa no final do caminho da classe de inicializa\u00E7\u00E3o\n    -Xbootclasspath/p:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n                      anexa no in\u00EDcio do caminho da classe de inicializa\u00E7\u00E3o\n    -Xdiag            mostra mensagens de diagn\u00F3stico adicionais\n    -Xnoclassgc       desativa a coleta de lixo da classe\n    -Xincgc           ativa a coleta de lixo incremental\n    -Xloggc:<arquivo>    registra o status do GC status em um arquivo com marca\u00E7\u00F5es de data e hor\u00E1rio\n    -Xbatch           desativa a compila\u00E7\u00E3o em segundo plano\n    -Xms<tamanho>        define o tamanho inicial do heap Java\n    -Xmx<tamanho>        define o tamanho m\u00E1ximo do heap Java\n    -Xss<tamanho>        define o tamanho da pilha de threads java\n    -Xprof            produz dados de perfil da cpu\n    -Xfuture          ativa verifica\u00E7\u00F5es de n\u00EDvel m\u00E1ximo de exig\u00EAncia, prevendo o valor default futuro\n    -Xrs              reduz o uso de sinais do SO pelo(a) Java/VM (consulte a documenta\u00E7\u00E3o)\n    -Xcheck:jni       executa verifica\u00E7\u00F5es adicionais de fun\u00E7\u00F5es da JNI\n    -Xshare:off       n\u00E3o tenta usar dados da classe compartilhada\n    -Xshare:auto      se poss\u00EDvel, usa dados da classe compartilhada (default)\n    -Xshare:on        requer o uso de dados da classe compartilhada, caso contr\u00E1rio haver\u00E1 falha.\n    -XshowSettings    mostra todas as defini\u00E7\u00F5es e continua\n    -XshowSettings:all\n                      mostra todas as defini\u00E7\u00F5es e continua\n    -XshowSettings:vm mostra todas as defini\u00E7\u00F5es relacionadas \u00E0 vm e continua\n    -XshowSettings:properties\n                      mostra todas as defini\u00E7\u00F5es da propriedade e continua\n    -XshowSettings:locale\n                      mostra todas as defini\u00E7\u00F5es relativas \u00E0s configura\u00E7\u00F5es regionais e continua\n\nAs -X options n\u00E3o s\u00E3o padronizadas e est\u00E3o sujeitas a altera\u00E7\u00F5es sem aviso.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\    -Xmixed           execu\u00E7\u00E3o no modo misto (default)\n\    -Xint             execu\u00E7\u00E3o somente no modo interpretado\n\    -Xbootclasspath:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n\                      define o caminho de pesquisa para classes e recursos de inicializa\u00E7\u00E3o\n\    -Xbootclasspath/a:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n\                      anexa no final do caminho da classe de inicializa\u00E7\u00E3o\n\    -Xbootclasspath/p:<diret\u00F3rios e arquivos zip/jar separados por {0}>\n\                      anexa no in\u00EDcio do caminho da classe de inicializa\u00E7\u00E3o\n\    -Xdiag            mostra mensagens de diagn\u00F3stico adicionais\n\    -Xnoclassgc       desativa a coleta de lixo da classe\n\    -Xincgc           ativa a coleta de lixo incremental\n\    -Xloggc:<arquivo>    registra o status do GC status em um arquivo com marca\u00E7\u00F5es de data e hor\u00E1rio\n\    -Xbatch           desativa a compila\u00E7\u00E3o em segundo plano\n\    -Xms<tamanho>        define o tamanho inicial do heap Java\n\    -Xmx<tamanho>        define o tamanho m\u00E1ximo do heap Java\n\    -Xss<tamanho>        define o tamanho da pilha de threads java\n\    -Xprof            produz dados de perfil da cpu\n\    -Xfuture          ativa verifica\u00E7\u00F5es de n\u00EDvel m\u00E1ximo de exig\u00EAncia, prevendo o valor default futuro\n\    -Xrs              reduz o uso de sinais do SO pelo(a) Java/VM (consulte a documenta\u00E7\u00E3o)\n\    -Xcheck:jni       executa verifica\u00E7\u00F5es adicionais de fun\u00E7\u00F5es da JNI\n\    -Xshare:off       n\u00E3o tenta usar dados da classe compartilhada\n\    -Xshare:auto      se poss\u00EDvel, usa dados da classe compartilhada (default)\n\    -Xshare:on        requer o uso de dados da classe compartilhada, caso contr\u00E1rio haver\u00E1 falha.\n\    -XshowSettings    mostra todas as defini\u00E7\u00F5es e continua\n\    -XshowSettings:all\n\                      mostra todas as defini\u00E7\u00F5es e continua\n\    -XshowSettings:vm mostra todas as defini\u00E7\u00F5es relacionadas \u00E0 vm e continua\n\    -XshowSettings:properties\n\                      mostra todas as defini\u00E7\u00F5es da propriedade e continua\n\    -XshowSettings:locale\n\                      mostra todas as defini\u00E7\u00F5es relativas \u00E0s configura\u00E7\u00F5es regionais e continua\n\nAs -X options n\u00E3o s\u00E3o padronizadas e est\u00E3o sujeitas a altera\u00E7\u00F5es sem aviso.\n
+java.launcher.X.macosx.usage=\nAs op\u00E7\u00F5es a seguir s\u00E3o espec\u00EDficas para o Mac OS X:\n    -XstartOnFirstThread\n                      executa o m\u00E9todo main() no primeiro thread (AppKit)\n    -Xdock:name=<nome da aplica\u00E7\u00E3o>"\n                      substitui o nome da aplica\u00E7\u00E3o default exibido no encaixe\n    -Xdock:icon=<caminho para o arquivo do \u00EDcone>\n                      substitui o \u00EDcone exibido no encaixe\n\n
 
 java.launcher.cls.error1=Erro: N\u00E3o foi poss\u00EDvel localizar nem carregar a classe principal {0}
-java.launcher.cls.error2=Erro: O m\u00E9todo principal n\u00E3o \u00E9 {0} na classe {1}; defina o m\u00E9todo principal como:\n\   public static void main(String[] args)
-java.launcher.cls.error3=Erro: O m\u00E9todo principal deve retornar um valor do tipo void na classe {0}; \ndefina o m\u00E9todo principal como:\n\   public static void main(String[] args)
-java.launcher.cls.error4=Erro: O m\u00E9todo principal n\u00E3o foi encontrado na classe {0}; defina o m\u00E9todo principal como:\n\   public static void main(String[] args)
+java.launcher.cls.error2=Erro: o m\u00E9todo main n\u00E3o \u00E9 {0} na classe {1}; defina o m\u00E9todo main como:\n   public static void main(String[] args)
+java.launcher.cls.error3=Erro: o m\u00E9todo main deve retornar um valor do tipo void na classe {0}; \ndefina o m\u00E9todo main como:\n   public static void main(String[] args)
+java.launcher.cls.error4=Erro: o m\u00E9todo main n\u00E3o foi encontrado na classe {0}; defina o m\u00E9todo main como:\\n   public static void main(String[] args)\\nou uma classe da aplica\u00E7\u00E3o JavaFX deve expandir {1}
+java.launcher.cls.error5=Erro: os componentes de runtime do JavaFX n\u00E3o foram encontrados. Eles s\u00E3o obrigat\u00F3rios para executar esta aplica\u00E7\u00E3o
 java.launcher.jar.error1=Erro: ocorreu um erro inesperado ao tentar abrir o arquivo {0}
 java.launcher.jar.error2=manifesto n\u00E3o encontrado em {0}
 java.launcher.jar.error3=nenhum atributo de manifesto principal em {0}
+java.launcher.init.error=erro de inicializa\u00E7\u00E3o
+java.launcher.javafx.error1=Erro: O m\u00E9todo launchApplication do JavaFX tem a assinatura errada. Ele\\ndeve ser declarado como est\u00E1tico e retornar um valor do tipo void
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_sv.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_sv.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   Syntax: {0} [-alternativ] class [argument...]\n\           (f\u00F6r att k\u00F6ra en klass)\n   eller  {0} [-alternativ] -jar jarfile [argument...]\n\           (f\u00F6r att k\u00F6ra en jar-fil)\nd\u00E4r alternativen omfattar:\n
+java.launcher.opt.header  =   Syntax: {0} [-alternativ] class [argument...]\n           (f\u00F6r att k\u00F6ra en klass)\n   eller  {0} [-alternativ] -jar jarfile [argument...]\n           (f\u00F6r att k\u00F6ra en jar-fil)\nd\u00E4r alternativen omfattar:\n
 
 java.launcher.opt.datamodel  =\    -d{0}\t  anv\u00E4nd en {0}-bitsdatamodell om det finns\n
 java.launcher.opt.vmselect   =\    {0}\t  f\u00F6r att v\u00E4lja "{1}" VM\n
@@ -34,15 +34,21 @@
 java.launcher.ergo.message2  =\                  eftersom du k\u00F6r en serverklassmaskin.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer     =\    -cp <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n\    -classpath <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n\                  En {0}-avgr\u00E4nsad lista med kataloger, JAR-arkiv,\n\                  och ZIP-arkiv f\u00F6r s\u00F6kning efter klassfiler.\n\    -D<namn>=<v\u00E4rde>\n\                  ange en systemegenskap\n\    -verbose[:class|gc|jni]\n\                  aktivera utf\u00F6rliga utdata\n\    -version      skriv ut produktversionen och avsluta\n\    -version:<v\u00E4rde>\n\                  beg\u00E4r den specifika versionen som ska k\u00F6ras\n\    -showversion  skriv ut produktversionen och forts\u00E4tt\n\    -jre-restrict-search | -no-jre-restrict-search\n\                  inkludera/exkludera anv\u00E4ndarprivata JRE:er i versions\u00F6kningen\n\    -? -help      skriv ut det h\u00E4r hj\u00E4lpmeddelandet\n\    -X            skriv ut hj\u00E4lp f\u00F6r icke-standardalternativ\n\    -ea[:<paket>...|:<klass>]\n\    -enableassertions[:<paket>...|:<klass>]\n\                  aktivera verifiering med angiven detaljgrad\n\    -da[:<packagename>...|:<klass>]\n\    -disableassertions[:<paket>...|:<klass>]\n\                  avaktivera verifiering med angiven detaljgrad\n\    -esa | -enablesystemassertions\n\                  aktivera systemverifieringar\n\    -dsa | -disablesystemassertions\n\                  avaktivera systemverifieringar\n\    -agentlib:<bibliotek>[=<alternativ>]\n\                  ladda ursprungligt agentbibliotek <bibliotek>, e.g. -agentlib:hprof\n\                  se \u00E4ven -agentlib:jdwp=help och -agentlib:hprof=help\n\    -agentpath:<s\u00F6kv\u00E4g>[=<alternativ>]\n\                  ladda ursprungligt agentbibliotek med helt s\u00F6kv\u00E4gsnamn\n\    -javaagent:<jar-s\u00F6kv\u00E4g>[=<alternativ>]\n\                  ladda Java-programspr\u00E5ksagent, se java.lang.instrument\n\    -splash:<bilds\u00F6kv\u00E4g>\n\                  visa v\u00E4lkomstsk\u00E4rm med angiven bild\nMer information finns p\u00E5 http://java.sun.com/javase/reference.
+java.launcher.opt.footer     =\    -cp <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n    -classpath <klass\u00F6kv\u00E4g f\u00F6r kataloger och zip-/jar-filer>\n                  En {0}-separerad lista med kataloger, JAR-arkiv,\n                  och ZIP-arkiv f\u00F6r s\u00F6kning efter klassfiler.\n    -D<name>=<value>\n                  ange en systemegenskap\n    -verbose:[class|gc|jni]\n                  aktivera utf\u00F6rliga utdata\n    -version      skriv ut produktversionen och avsluta\n    -version:<value>\n                  beg\u00E4r den specifika versionen som ska k\u00F6ras\n    -showversion  skriv ut produktversionen och forts\u00E4tt\n    -jre-restrict-search | -no-jre-restrict-search\n                  inkludera/exkludera anv\u00E4ndarprivata JRE:er i versions\u00F6kningen\n    -? -help      skriv ut det h\u00E4r hj\u00E4lpmeddelandet\n    -X            skriv ut hj\u00E4lp f\u00F6r icke-standardalternativ\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  aktivera verifiering med angiven detaljgrad\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  avaktivera verifiering med angiven detaljgrad\n    -esa | -enablesystemassertions\n                  aktivera systemverifieringar\n    -dsa | -disablesystemassertions\n                  avaktivera systemverifieringar\n    -agentlib:<libname>[=<options>]\n                  ladda ursprungligt agentbibliotek <libname>, e.g. -agentlib:hprof\n                  se \u00E4ven -agentlib:jdwp=help och -agentlib:hprof=help\n    -agentpath:<pathname>[=<options>]\n                  ladda ursprungligt agentbibliotek med helt s\u00F6kv\u00E4gsnamn\n    -javaagent:<jarpath>[=<options>]\n                  ladda Java-programspr\u00E5ksagent, se java.lang.instrument\n    -splash:<imagepath>\n                  visa v\u00E4lkomstsk\u00E4rm med angiven bild\nMer information finns p\u00E5 http://www.oracle.com/technetwork/java/javase/documentation/index.html.
+
+# Translators please note do not translate the options themselves
+java.launcher.X.usage=\    -Xmixed           k\u00F6rning i blandat l\u00E4ge (standard)\n    -Xint             endast k\u00F6rning i tolkat l\u00E4ge\n    -Xbootclasspath:<kataloger och zip-/jar-filer avgr\u00E4nsas med {0}>\n                      ange s\u00F6kv\u00E4g f\u00F6r programladdningsklasser och -resurser\n    -Xbootclasspath/a:<kataloger och zip-/jar-filer avgr\u00E4nsas med {0}>\n                      l\u00E4gg till i slutet av programladdningsklassens s\u00F6kv\u00E4g\n    -Xbootclasspath/p:<kataloger och zip-/jar-filer avgr\u00E4nsas med {0}>\n                      l\u00E4gg till i b\u00F6rjan av programladdningsklassens s\u00F6kv\u00E4g\n    -Xdiag            visa ytterligare diagnostiska meddelanden\n    -Xnoclassgc       avaktivera klassens skr\u00E4pinsamling\n    -Xincgc           aktivera inkrementell skr\u00E4pinsamling\n    -Xloggc:<fil>    logga GC-status till en fil med tidsst\u00E4mplar\n    -Xbatch           avaktivera bakgrundskompilering\n    -Xms<storlek>        ange ursprunglig storlek f\u00F6r Java-heap\n    -Xmx<storlek>        ange maximal storlek f\u00F6r Java-heap\n    -Xss<storlek>        ange storlek f\u00F6r java-tr\u00E5dsstack\n    -Xprof            utdata f\u00F6r processorprofilering\n    -Xfuture          aktivera str\u00E4ngaste kontroller, f\u00F6rv\u00E4ntad framtida standard\n    -Xrs              minska OS-signalanv\u00E4ndning av Java/VM (se dokumentation)\n    -Xcheck:jni       utf\u00F6r ytterligare kontroller f\u00F6r JNI-funktioner\n    -Xshare:off       anv\u00E4nd inte delade klassdata\n    -Xshare:auto      anv\u00E4nd delade klassdata om det g\u00E5r (standard)\n    -Xshare:on        kr\u00E4v att delade klassdata anv\u00E4nds, annars slutf\u00F6r inte.\n    -XshowSettings    visa alla inst\u00E4llningar och forts\u00E4tt\n    -XshowSettings:all\n                      visa alla inst\u00E4llningar och forts\u00E4tt\n    -XshowSettings:vm visa alla vm-relaterade inst\u00E4llningar och forts\u00E4tt\n    -XshowSettings:properties\n                      visa alla egenskapsinst\u00E4llningar och forts\u00E4tt\n    -XshowSettings:locale\n                      visa alla spr\u00E5krelaterade inst\u00E4llningar och forts\u00E4tt\n\n-X-alternativen \u00E4r inte standard och kan \u00E4ndras utan f\u00F6reg\u00E5ende meddelande.\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\    -Xmixed           k\u00F6rning i blandat l\u00E4ge (standard)\n\    -Xint             endast k\u00F6rning i tolkat l\u00E4ge\n\    -Xbootclasspath:<kataloger och zip-/jar-filer avgr\u00E4nsas med {0}>\n\                      ange s\u00F6kv\u00E4g f\u00F6r programladdningsklasser och -resurser\n\    -Xbootclasspath/a:<kataloger och zip-/jar-filer avgr\u00E4nsas med {0}>\n\                      l\u00E4gg till i slutet av programladdningsklassens s\u00F6kv\u00E4g\n\    -Xbootclasspath/p:<kataloger och zip-/jar-filer avgr\u00E4nsas med {0}>\n\                      l\u00E4gg till i b\u00F6rjan av programladdningsklassens s\u00F6kv\u00E4g\n\    -Xdiag            visa ytterligare diagnostiska meddelanden\n\    -Xnoclassgc       avaktivera klassens skr\u00E4pinsamling\n\    -Xincgc           aktivera inkrementell skr\u00E4pinsamling\n\    -Xloggc:<fil>    logga GC-status till en fil med tidsst\u00E4mplar\n\    -Xbatch           avaktivera bakgrundskompilering\n\    -Xms<storlek>        ange ursprunglig storlek f\u00F6r Java-heap\n\    -Xmx<storlek>        ange maximal storlek f\u00F6r Java-heap\n\    -Xss<storlek>        ange storlek f\u00F6r java-tr\u00E5dsstack\n\    -Xprof            utdata f\u00F6r processorprofilering\n\    -Xfuture          aktivera str\u00E4ngaste kontroller, f\u00F6rv\u00E4ntad framtida standard\n\    -Xrs              minska OS-signalanv\u00E4ndning av Java/VM (se dokumentation)\n\    -Xcheck:jni       utf\u00F6r ytterligare kontroller f\u00F6r JNI-funktioner\n\    -Xshare:off       anv\u00E4nd inte delade klassdata\n\    -Xshare:auto      anv\u00E4nd delade klassdata om det g\u00E5r (standard)\n\    -Xshare:on        kr\u00E4v att delade klassdata anv\u00E4nds, annars slutf\u00F6r inte.\n\    -XshowSettings    visa alla inst\u00E4llningar och forts\u00E4tt\n\    -XshowSettings:all\n\                      visa alla inst\u00E4llningar och forts\u00E4tt\n\    -XshowSettings:vm visa alla vm-relaterade inst\u00E4llningar och forts\u00E4tt\n\    -XshowSettings:properties\n\                      visa alla egenskapsinst\u00E4llningar och forts\u00E4tt\n\    -XshowSettings:locale\n\                      visa alla spr\u00E5krelaterade inst\u00E4llningar och forts\u00E4tt\n\n-X-alternativen \u00E4r inte standard och kan \u00E4ndras utan f\u00F6reg\u00E5ende meddelande.\n
+java.launcher.X.macosx.usage=\nF\u00F6ljande alternativ \u00E4r specifika f\u00F6r Mac OS X:\n    -XstartOnFirstThread\n                      k\u00F6r huvudmetoden() p\u00E5 den f\u00F6rsta (AppKit) tr\u00E5den\n    -Xdock:name=<application name>"\n                      \u00E5sidosatt standardapplikationsnamn visas i docka\n    -Xdock:icon=<path to icon file>\n                      \u00E5sidosatt standardikon visas i docka\n\n
 
 java.launcher.cls.error1=Fel: Hittar inte eller kan inte ladda huvudklassen {0}
-java.launcher.cls.error2=Fel: Huvudmetoden \u00E4r inte {0} i klassen {1}, definiera huvudmetoden som:\n\   public static void main(String[] args)
-java.launcher.cls.error3=Fel: Huvudmetoden m\u00E5ste returnera ett v\u00E4rde av typen void i klassen {0}, \ndefiniera huvudmetoden som:\n\   public static void main(String[] args)
-java.launcher.cls.error4=Fel: Huvudmetoden finns inte i klassen {0}, definiera huvudmetoden som:\n\   public static void main(String[] args)
+java.launcher.cls.error2=Fel: Huvudmetoden \u00E4r inte {0} i klassen {1}, definiera huvudmetoden som:\n   public static void main(String[] args)
+java.launcher.cls.error3=Fel: Huvudmetoden m\u00E5ste returnera ett v\u00E4rde av typen void i klassen {0}, \ndefiniera huvudmetoden som:\n   public static void main(String[] args)
+java.launcher.cls.error4=Fel: Huvudmetoden finns inte i klassen {0}, definiera huvudmetoden som:\n   public static void main(String[] args)\neller s\u00E5 m\u00E5ste en JavaFX-applikationsklass ut\u00F6ka {1}
+java.launcher.cls.error5=Fel: JavaFX-k\u00F6rningskomponenter saknas, och de kr\u00E4vs f\u00F6r att kunna k\u00F6ra den h\u00E4r applikationen
 java.launcher.jar.error1=Fel: Ett ov\u00E4ntat fel intr\u00E4ffade n\u00E4r filen {0} skulle \u00F6ppnas
 java.launcher.jar.error2=manifest finns inte i {0}
 java.launcher.jar.error3=inget huvudmanifestattribut i {0}
+java.launcher.init.error=initieringsfel
+java.launcher.javafx.error1=Fel: JavaFX launchApplication-metoden har fel signatur, den \nm\u00E5ste ha deklarerats som statisk och returnera ett v\u00E4rde av typen void
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   \u7528\u6CD5: {0} [-options] class [args...]\n\           (\u6267\u884C\u7C7B)\n   \u6216  {0} [-options] -jar jarfile [args...]\n\           (\u6267\u884C jar \u6587\u4EF6)\n\u5176\u4E2D\u9009\u9879\u5305\u62EC:\n
+java.launcher.opt.header  =   \u7528\u6CD5: {0} [-options] class [args...]\n           (\u6267\u884C\u7C7B)\n   \u6216  {0} [-options] -jar jarfile [args...]\n           (\u6267\u884C jar \u6587\u4EF6)\n\u5176\u4E2D\u9009\u9879\u5305\u62EC:\n
 
 java.launcher.opt.datamodel  =\    -d{0}\t  \u4F7F\u7528 {0} \u4F4D\u6570\u636E\u6A21\u578B (\u5982\u679C\u53EF\u7528)\n
 java.launcher.opt.vmselect   =\    {0}\t  \u9009\u62E9 "{1}" VM\n
@@ -34,15 +34,21 @@
 java.launcher.ergo.message2  =\                  \u56E0\u4E3A\u60A8\u662F\u5728\u670D\u52A1\u5668\u7C7B\u8BA1\u7B97\u673A\u4E0A\u8FD0\u884C\u3002\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer     =\    -cp <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n\    -classpath <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n\                  \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55, JAR \u6863\u6848\n\                  \u548C ZIP \u6863\u6848\u5217\u8868, \u7528\u4E8E\u641C\u7D22\u7C7B\u6587\u4EF6\u3002\n\    -D<name>=<value>\n\                  \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n\    -verbose[:class|gc|jni]\n\                  \u542F\u7528\u8BE6\u7EC6\u8F93\u51FA\n\    -version      \u8F93\u51FA\u4EA7\u54C1\u7248\u672C\u5E76\u9000\u51FA\n\    -version:<value>\n\                  \u9700\u8981\u6307\u5B9A\u7684\u7248\u672C\u624D\u80FD\u8FD0\u884C\n\    -showversion  \u8F93\u51FA\u4EA7\u54C1\u7248\u672C\u5E76\u7EE7\u7EED\n\    -jre-restrict-search | -no-jre-restrict-search\n\                  \u5728\u7248\u672C\u641C\u7D22\u4E2D\u5305\u62EC/\u6392\u9664\u7528\u6237\u4E13\u7528 JRE\n\    -? -help      \u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F\n\    -X            \u8F93\u51FA\u975E\u6807\u51C6\u9009\u9879\u7684\u5E2E\u52A9\n\    -ea[:<packagename>...|:<classname>]\n\    -enableassertions[:<packagename>...|:<classname>]\n\                  \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u542F\u7528\u65AD\u8A00\n\    -da[:<packagename>...|:<classname>]\n\    -disableassertions[:<packagename>...|:<classname>]\n\                  \u7981\u7528\u5177\u6709\u6307\u5B9A\u7C92\u5EA6\u7684\u65AD\u8A00\n\    -esa | -enablesystemassertions\n\                  \u542F\u7528\u7CFB\u7EDF\u65AD\u8A00\n\    -dsa | -disablesystemassertions\n\                  \u7981\u7528\u7CFB\u7EDF\u65AD\u8A00\n\    -agentlib:<libname>[=<options>]\n\                  \u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93 <libname>, \u4F8B\u5982 -agentlib:hprof\n\                  \u53E6\u8BF7\u53C2\u9605 -agentlib:jdwp=help \u548C -agentlib:hprof=help\n\    -agentpath:<pathname>[=<options>]\n\                  \u6309\u5B8C\u6574\u8DEF\u5F84\u540D\u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93\n\    -javaagent:<jarpath>[=<options>]\n\                  \u52A0\u8F7D Java \u7F16\u7A0B\u8BED\u8A00\u4EE3\u7406, \u8BF7\u53C2\u9605 java.lang.instrument\n\    -splash:<imagepath>\n\                  \u4F7F\u7528\u6307\u5B9A\u7684\u56FE\u50CF\u663E\u793A\u542F\u52A8\u5C4F\u5E55\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605 http://java.sun.com/javase/reference\u3002
+java.launcher.opt.footer     =\    -cp <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n\\    -classpath <\u76EE\u5F55\u548C zip/jar \u6587\u4EF6\u7684\u7C7B\u641C\u7D22\u8DEF\u5F84>\n\\                  \u7528 {0} \u5206\u9694\u7684\u76EE\u5F55, JAR \u6863\u6848\n\\                  \u548C ZIP \u6863\u6848\u5217\u8868, \u7528\u4E8E\u641C\u7D22\u7C7B\u6587\u4EF6\u3002\n\\    -D<\u540D\u79F0>=<\u503C>\n\\                  \u8BBE\u7F6E\u7CFB\u7EDF\u5C5E\u6027\n\\    -verbose:[class|gc|jni]\n\\                  \u542F\u7528\u8BE6\u7EC6\u8F93\u51FA\n\\    -version      \u8F93\u51FA\u4EA7\u54C1\u7248\u672C\u5E76\u9000\u51FA\n\\    -version:<\u503C>\n\\                  \u9700\u8981\u6307\u5B9A\u7684\u7248\u672C\u624D\u80FD\u8FD0\u884C\n\\    -showversion  \u8F93\u51FA\u4EA7\u54C1\u7248\u672C\u5E76\u7EE7\u7EED\n\\    -jre-restrict-search | -no-jre-restrict-search\n\\                  \u5728\u7248\u672C\u641C\u7D22\u4E2D\u5305\u62EC/\u6392\u9664\u7528\u6237\u4E13\u7528 JRE\n\\    -? -help      \u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F\n\\    -X            \u8F93\u51FA\u975E\u6807\u51C6\u9009\u9879\u7684\u5E2E\u52A9\n\\    -ea[:<packagename>...|:<classname>]\n\\    -enableassertions[:<packagename>...|:<classname>]\n\\                  \u6309\u6307\u5B9A\u7684\u7C92\u5EA6\u542F\u7528\u65AD\u8A00\n\\    -da[:<packagename>...|:<classname>]\n\\    -disableassertions[:<packagename>...|:<classname>]\n\\                  \u7981\u7528\u5177\u6709\u6307\u5B9A\u7C92\u5EA6\u7684\u65AD\u8A00\n\\    -esa | -enablesystemassertions\n\\                  \u542F\u7528\u7CFB\u7EDF\u65AD\u8A00\n\\    -dsa | -disablesystemassertions\n\\                  \u7981\u7528\u7CFB\u7EDF\u65AD\u8A00\n\\    -agentlib:<libname>[=<\u9009\u9879>]\n\\                  \u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93 <libname>, \u4F8B\u5982 -agentlib:hprof\n\\                  \u53E6\u8BF7\u53C2\u9605 -agentlib:jdwp=help \u548C -agentlib:hprof=help\n\\    -agentpath:<pathname>[=<\u9009\u9879>]\n\\                  \u6309\u5B8C\u6574\u8DEF\u5F84\u540D\u52A0\u8F7D\u672C\u673A\u4EE3\u7406\u5E93\n\\    -javaagent:<jarpath>[=<\u9009\u9879>]\n\\                  \u52A0\u8F7D Java \u7F16\u7A0B\u8BED\u8A00\u4EE3\u7406, \u8BF7\u53C2\u9605 java.lang.instrument\n\\    -splash:<imagepath>\n\\                  \u4F7F\u7528\u6307\u5B9A\u7684\u56FE\u50CF\u663E\u793A\u542F\u52A8\u5C4F\u5E55\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605 http://www.oracle.com/technetwork/java/javase/documentation/index.html\u3002
+
+# Translators please note do not translate the options themselves
+java.launcher.X.usage=\    -Xmixed           \u6DF7\u5408\u6A21\u5F0F\u6267\u884C (\u9ED8\u8BA4)\n    -Xint             \u4EC5\u89E3\u91CA\u6A21\u5F0F\u6267\u884C\n    -Xbootclasspath:<\u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n                      \u8BBE\u7F6E\u641C\u7D22\u8DEF\u5F84\u4EE5\u5F15\u5BFC\u7C7B\u548C\u8D44\u6E90\n    -Xbootclasspath/a:<\u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n                      \u9644\u52A0\u5728\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u672B\u5C3E\n    -Xbootclasspath/p:<\u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n                      \u7F6E\u4E8E\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u4E4B\u524D\n    -Xdiag            \u663E\u793A\u9644\u52A0\u8BCA\u65AD\u6D88\u606F\n    -Xnoclassgc       \u7981\u7528\u7C7B\u5783\u573E\u6536\u96C6\n    -Xincgc           \u542F\u7528\u589E\u91CF\u5783\u573E\u6536\u96C6\n    -Xloggc:<file>    \u5C06 GC \u72B6\u6001\u8BB0\u5F55\u5728\u6587\u4EF6\u4E2D (\u5E26\u65F6\u95F4\u6233)\n    -Xbatch           \u7981\u7528\u540E\u53F0\u7F16\u8BD1\n    -Xms<size>        \u8BBE\u7F6E\u521D\u59CB Java \u5806\u5927\u5C0F\n    -Xmx<size>        \u8BBE\u7F6E\u6700\u5927 Java \u5806\u5927\u5C0F\n    -Xss<size>        \u8BBE\u7F6E Java \u7EBF\u7A0B\u5806\u6808\u5927\u5C0F\n    -Xprof            \u8F93\u51FA cpu \u914D\u7F6E\u6587\u4EF6\u6570\u636E\n    -Xfuture          \u542F\u7528\u6700\u4E25\u683C\u7684\u68C0\u67E5, \u9884\u671F\u5C06\u6765\u7684\u9ED8\u8BA4\u503C\n    -Xrs              \u51CF\u5C11 Java/VM \u5BF9\u64CD\u4F5C\u7CFB\u7EDF\u4FE1\u53F7\u7684\u4F7F\u7528 (\u8BF7\u53C2\u9605\u6587\u6863)\n    -Xcheck:jni       \u5BF9 JNI \u51FD\u6570\u6267\u884C\u5176\u4ED6\u68C0\u67E5\n    -Xshare:off       \u4E0D\u5C1D\u8BD5\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\n    -Xshare:auto      \u5728\u53EF\u80FD\u7684\u60C5\u51B5\u4E0B\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E (\u9ED8\u8BA4)\n    -Xshare:on        \u8981\u6C42\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E, \u5426\u5219\u5C06\u5931\u8D25\u3002\n    -XshowSettings    \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:all\n                      \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:vm \u663E\u793A\u6240\u6709\u4E0E vm \u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:properties\n                      \u663E\u793A\u6240\u6709\u5C5E\u6027\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n    -XshowSettings:locale\n                      \u663E\u793A\u6240\u6709\u4E0E\u533A\u57DF\u8BBE\u7F6E\u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n\n-X \u9009\u9879\u662F\u975E\u6807\u51C6\u9009\u9879, \u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\    -Xmixed           \u6DF7\u5408\u6A21\u5F0F\u6267\u884C (\u9ED8\u8BA4)\n\    -Xint             \u4EC5\u89E3\u91CA\u6A21\u5F0F\u6267\u884C\n\    -Xbootclasspath:<\u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n\                      \u8BBE\u7F6E\u641C\u7D22\u8DEF\u5F84\u4EE5\u5F15\u5BFC\u7C7B\u548C\u8D44\u6E90\n\    -Xbootclasspath/a:<\u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n\                      \u9644\u52A0\u5728\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u672B\u5C3E\n\    -Xbootclasspath/p:<\u7528 {0} \u5206\u9694\u7684\u76EE\u5F55\u548C zip/jar \u6587\u4EF6>\n\                      \u7F6E\u4E8E\u5F15\u5BFC\u7C7B\u8DEF\u5F84\u4E4B\u524D\n\    -Xdiag            \u663E\u793A\u9644\u52A0\u8BCA\u65AD\u6D88\u606F\n\    -Xnoclassgc       \u7981\u7528\u7C7B\u5783\u573E\u6536\u96C6\n\    -Xincgc           \u542F\u7528\u589E\u91CF\u5783\u573E\u6536\u96C6\n\    -Xloggc:<file>    \u5C06 GC \u72B6\u6001\u8BB0\u5F55\u5728\u6587\u4EF6\u4E2D (\u5E26\u65F6\u95F4\u6233)\n\    -Xbatch           \u7981\u7528\u540E\u53F0\u7F16\u8BD1\n\    -Xms<size>        \u8BBE\u7F6E\u521D\u59CB Java \u5806\u5927\u5C0F\n\    -Xmx<size>        \u8BBE\u7F6E\u6700\u5927 Java \u5806\u5927\u5C0F\n\    -Xss<size>        \u8BBE\u7F6E Java \u7EBF\u7A0B\u5806\u6808\u5927\u5C0F\n\    -Xprof            \u8F93\u51FA cpu \u914D\u7F6E\u6587\u4EF6\u6570\u636E\n\    -Xfuture          \u542F\u7528\u6700\u4E25\u683C\u7684\u68C0\u67E5, \u9884\u671F\u5C06\u6765\u7684\u9ED8\u8BA4\u503C\n\    -Xrs              \u51CF\u5C11 Java/VM \u5BF9\u64CD\u4F5C\u7CFB\u7EDF\u4FE1\u53F7\u7684\u4F7F\u7528 (\u8BF7\u53C2\u9605\u6587\u6863)\n\    -Xcheck:jni       \u5BF9 JNI \u51FD\u6570\u6267\u884C\u5176\u4ED6\u68C0\u67E5\n\    -Xshare:off       \u4E0D\u5C1D\u8BD5\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E\n\    -Xshare:auto      \u5728\u53EF\u80FD\u7684\u60C5\u51B5\u4E0B\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E (\u9ED8\u8BA4)\n\    -Xshare:on        \u8981\u6C42\u4F7F\u7528\u5171\u4EAB\u7C7B\u6570\u636E, \u5426\u5219\u5C06\u5931\u8D25\u3002\n\    -XshowSettings    \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n\    -XshowSettings:all\n\                      \u663E\u793A\u6240\u6709\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n\    -XshowSettings:vm \u663E\u793A\u6240\u6709\u4E0E vm \u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n\    -XshowSettings:properties\n\                      \u663E\u793A\u6240\u6709\u5C5E\u6027\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n\    -XshowSettings:locale\n\                      \u663E\u793A\u6240\u6709\u4E0E\u533A\u57DF\u8BBE\u7F6E\u76F8\u5173\u7684\u8BBE\u7F6E\u5E76\u7EE7\u7EED\n\n-X \u9009\u9879\u662F\u975E\u6807\u51C6\u9009\u9879, \u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
+java.launcher.X.macosx.usage=\n\u4EE5\u4E0B\u9009\u9879\u4E3A Mac OS X \u7279\u5B9A\u7684\u9009\u9879:\n    -XstartOnFirstThread\n                      \u5728\u7B2C\u4E00\u4E2A (AppKit) \u7EBF\u7A0B\u4E0A\u8FD0\u884C main() \u65B9\u6CD5\n    -Xdock:name=<\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0>"\n                      \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u5E94\u7528\u7A0B\u5E8F\u540D\u79F0\n    -Xdock:icon=<\u56FE\u6807\u6587\u4EF6\u7684\u8DEF\u5F84>\n                      \u8986\u76D6\u505C\u9760\u680F\u4E2D\u663E\u793A\u7684\u9ED8\u8BA4\u56FE\u6807\n\n
 
 java.launcher.cls.error1=\u9519\u8BEF: \u627E\u4E0D\u5230\u6216\u65E0\u6CD5\u52A0\u8F7D\u4E3B\u7C7B {0}
-java.launcher.cls.error2=\u9519\u8BEF: \u4E3B\u65B9\u6CD5\u4E0D\u662F\u7C7B {1} \u4E2D\u7684{0}, \u8BF7\u5C06\u4E3B\u65B9\u6CD5\u5B9A\u4E49\u4E3A:\n\   public static void main(String[] args)
-java.launcher.cls.error3=\u9519\u8BEF: \u4E3B\u65B9\u6CD5\u5FC5\u987B\u8FD4\u56DE\u7C7B {0} \u4E2D\u7684\u7A7A\u7C7B\u578B\u503C, \u8BF7\n\u5C06\u4E3B\u65B9\u6CD5\u5B9A\u4E49\u4E3A:\n\   public static void main(String[] args)
-java.launcher.cls.error4=\u9519\u8BEF: \u5728\u7C7B {0} \u4E2D\u627E\u4E0D\u5230\u4E3B\u65B9\u6CD5, \u8BF7\u5C06\u4E3B\u65B9\u6CD5\u5B9A\u4E49\u4E3A:\n\   public static void main(String[] args)
+java.launcher.cls.error2=\u9519\u8BEF: main \u65B9\u6CD5\u4E0D\u662F\u7C7B {1} \u4E2D\u7684{0}, \u8BF7\u5C06 main \u65B9\u6CD5\u5B9A\u4E49\u4E3A:\n   public static void main(String[] args)
+java.launcher.cls.error3=\u9519\u8BEF: main \u65B9\u6CD5\u5FC5\u987B\u8FD4\u56DE\u7C7B {0} \u4E2D\u7684\u7A7A\u7C7B\u578B\u503C, \u8BF7\n\u5C06 main \u65B9\u6CD5\u5B9A\u4E49\u4E3A:\n   public static void main(String[] args)
+java.launcher.cls.error4=\u9519\u8BEF: \u5728\u7C7B {0} \u4E2D\u627E\u4E0D\u5230 main \u65B9\u6CD5, \u8BF7\u5C06 main \u65B9\u6CD5\u5B9A\u4E49\u4E3A:\n   public static void main(String[] args)\n\u5426\u5219 JavaFX \u5E94\u7528\u7A0B\u5E8F\u7C7B\u5FC5\u987B\u6269\u5C55{1}
+java.launcher.cls.error5=\u9519\u8BEF: \u7F3A\u5C11 JavaFX \u8FD0\u884C\u65F6\u7EC4\u4EF6, \u9700\u8981\u4F7F\u7528\u8BE5\u7EC4\u4EF6\u6765\u8FD0\u884C\u6B64\u5E94\u7528\u7A0B\u5E8F
 java.launcher.jar.error1=\u9519\u8BEF: \u5C1D\u8BD5\u6253\u5F00\u6587\u4EF6{0}\u65F6\u51FA\u73B0\u610F\u5916\u9519\u8BEF
 java.launcher.jar.error2=\u5728{0}\u4E2D\u627E\u4E0D\u5230\u6E05\u5355
 java.launcher.jar.error3={0}\u4E2D\u6CA1\u6709\u4E3B\u6E05\u5355\u5C5E\u6027
+java.launcher.init.error=\u521D\u59CB\u5316\u9519\u8BEF
+java.launcher.javafx.error1=\u9519\u8BEF: JavaFX launchApplication \u65B9\u6CD5\u5177\u6709\u9519\u8BEF\u7684\u7B7E\u540D, \u5FC5\u987B\n\u5C06\u65B9\u6CD5\u58F0\u660E\u4E3A\u9759\u6001\u65B9\u6CD5\u5E76\u8FD4\u56DE\u7A7A\u7C7B\u578B\u7684\u503C
--- a/jdk/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 #
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.header  =   \u7528\u6CD5: {0} [-options] class [args...]\n\           (\u57F7\u884C\u985E\u5225)\n   \u6216  {0} [-options] -jar jarfile [args...]\n\           (\u57F7\u884C jar \u6A94\u6848)\n\u9078\u9805\u5305\u62EC:\n
+java.launcher.opt.header  =   \u7528\u6CD5: {0} [-options] class [args...]\n           (\u57F7\u884C\u985E\u5225)\n   \u6216  {0} [-options] -jar jarfile [args...]\n           (\u57F7\u884C jar \u6A94\u6848)\n\u9078\u9805\u5305\u62EC:\n
 
 java.launcher.opt.datamodel  =\    -d{0}\t  \u4F7F\u7528 {0} \u4F4D\u5143\u8CC7\u6599\u6A21\u578B (\u5982\u679C\u6709\u7684\u8A71)\n
 java.launcher.opt.vmselect   =\    {0}\t  \u9078\u53D6 "{1}" VM\n
@@ -34,15 +34,21 @@
 java.launcher.ergo.message2  =\                  \u56E0\u70BA\u60A8\u6B63\u5728\u4F3A\u670D\u5668\u985E\u5225\u6A5F\u5668\u4E0A\u57F7\u884C\u3002\n
 
 # Translators please note do not translate the options themselves
-java.launcher.opt.footer     =\    -cp <class search path of directories and zip/jar files>\n\    -classpath <class search path of directories and zip/jar files>\n\                  \u641C\u5C0B\u985E\u5225\u6A94\u6848\u4E4B\u76EE\u9304\u3001JAR \u5B58\u6A94\n\                  \u548C ZIP \u5B58\u6A94\u7684\u4EE5{0}\u5206\u9694\u7684\u6E05\u55AE\u3002\n\    -D<name>=<value>\n\                  \u8A2D\u5B9A\u7CFB\u7D71\u5C6C\u6027\n\    -verbose[:class|gc|jni]\n\                  \u555F\u7528\u8A73\u7D30\u8CC7\u8A0A\u8F38\u51FA\n\    -version      \u5217\u5370\u7522\u54C1\u7248\u672C\u4E26\u7D50\u675F\n\    -version:<value>\n\                  \u9700\u8981\u6307\u5B9A\u7684\u7248\u672C\u624D\u80FD\u57F7\u884C\n\    -showversion  \u5217\u5370\u7522\u54C1\u7248\u672C\u4E26\u7E7C\u7E8C\n\    -jre-restrict-search | -no-jre-restrict-search\n\                  \u5728\u7248\u672C\u641C\u5C0B\u4E2D\u5305\u62EC/\u6392\u9664\u4F7F\u7528\u8005\u5C08\u7528 JRE\n\    -? -help      \u5217\u5370\u6B64\u8AAA\u660E\u8A0A\u606F\n\    -X            \u5217\u5370\u975E\u6A19\u6E96\u9078\u9805\u7684\u8AAA\u660E\n\    -ea[:<packagename>...|:<classname>]\n\    -enableassertions[:<packagename>...|:<classname>]\n\                  \u555F\u7528\u5177\u6709\u6307\u5B9A\u8A73\u7D30\u7A0B\u5EA6\u7684\u5BA3\u544A\n\    -da[:<packagename>...|:<classname>]\n\    -disableassertions[:<packagename>...|:<classname>]\n\                  \u505C\u7528\u5177\u6709\u6307\u5B9A\u8A73\u7D30\u7A0B\u5EA6\u7684\u5BA3\u544A\n\    -esa | -enablesystemassertions\n\                  \u555F\u7528\u7CFB\u7D71\u5BA3\u544A\n\    -dsa | -disablesystemassertions\n\                  \u505C\u7528\u7CFB\u7D71\u5BA3\u544A\n\    -agentlib:<libname>[=<options>]\n\                  \u8F09\u5165\u539F\u751F\u4EE3\u7406\u7A0B\u5F0F\u7A0B\u5F0F\u5EAB <libname>\uFF0C\u4F8B\u5982 -agentlib:hprof\n\                  \u53E6\u8ACB\u53C3\u95B1 -agentlib:jdwp=help \u8207 -agentlib:hprof=help\n\    -agentpath:<pathname>[=<options>]\n\                  \u4F7F\u7528\u5B8C\u6574\u8DEF\u5F91\u540D\u7A31\u8F09\u5165\u539F\u751F\u4EE3\u7406\u7A0B\u5F0F\u7A0B\u5F0F\u5EAB\n\    -javaagent:<jarpath>[=<options>]\n\                  \u8F09\u5165 Java \u7A0B\u5F0F\u8A9E\u8A00\u4EE3\u7406\u7A0B\u5F0F\uFF0C\u8ACB\u53C3\u95B1 java.lang.instrument\n\    -splash:<imagepath>\n\                  \u986F\u793A\u6307\u5B9A\u5F71\u50CF\u7684\u8EDF\u9AD4\u8CC7\u8A0A\u756B\u9762\n\u8ACB\u53C3\u95B1 http://java.sun.com/javase/reference\uFF0C\u66B8\u89E3\u8A73\u7D30\u8CC7\u8A0A\u3002
+java.launcher.opt.footer     =\    -cp <class search path of directories and zip/jar files>\n    -classpath <class search path of directories and zip/jar files>\n                  \u4F7F\u7528 {0} \u5340\u9694\u7684\u76EE\u9304\u3001JAR \u5B58\u6A94\u4EE5\u53CA\n                  ZIP \u5B58\u6A94\u6E05\u55AE\u4F86\u641C\u5C0B\u985E\u5225\u6A94\u6848\u3002\n    -D<name>=<value>\n                  \u8A2D\u5B9A\u7CFB\u7D71\u5C6C\u6027\n    -verbose:[class|gc|jni]\n                  \u555F\u7528\u8A73\u7D30\u8CC7\u8A0A\u8F38\u51FA\n    -version      \u5217\u5370\u7522\u54C1\u7248\u672C\u4E26\u7D50\u675F\n    -version:<value>\n                  \u9700\u8981\u6307\u5B9A\u7684\u7248\u672C\u624D\u80FD\u57F7\u884C\n    -showversion  \u5217\u5370\u7522\u54C1\u7248\u672C\u4E26\u7E7C\u7E8C\n    -jre-restrict-search | -no-jre-restrict-search\n                  \u5728\u7248\u672C\u641C\u5C0B\u4E2D\u5305\u62EC/\u6392\u9664\u4F7F\u7528\u8005\u5C08\u7528 JRE\n    -? -help      \u5217\u5370\u6B64\u8AAA\u660E\u8A0A\u606F\n    -X            \u5217\u5370\u975E\u6A19\u6E96\u9078\u9805\u7684\u8AAA\u660E\n    -ea[:<packagename>...|:<classname>]\n    -enableassertions[:<packagename>...|:<classname>]\n                  \u555F\u7528\u542B\u6307\u5B9A\u8A73\u7D30\u7A0B\u5EA6\u7684\u5BA3\u544A\n    -da[:<packagename>...|:<classname>]\n    -disableassertions[:<packagename>...|:<classname>]\n                  \u505C\u7528\u542B\u6307\u5B9A\u8A73\u7D30\u7A0B\u5EA6\u7684\u5BA3\u544A\n    -esa | -enablesystemassertions\n                  \u555F\u7528\u7CFB\u7D71\u5BA3\u544A\n    -dsa | -disablesystemassertions\n                  \u505C\u7528\u7CFB\u7D71\u5BA3\u544A\n    -agentlib:<libname>[=<options>]\n                  \u8F09\u5165\u539F\u751F\u4EE3\u7406\u7A0B\u5F0F\u7A0B\u5F0F\u5EAB <libname>\uFF0C\u4F8B\u5982 -agentlib:hprof\n                  \u53E6\u8ACB\u53C3\u95B1 -agentlib:jdwp=help \u8207 -agentlib:hprof=help\n    -agentpath:<pathname>[=<options>]\n                  \u4F7F\u7528\u5B8C\u6574\u8DEF\u5F91\u540D\u7A31\u8F09\u5165\u539F\u751F\u4EE3\u7406\u7A0B\u5F0F\u7A0B\u5F0F\u5EAB\n    -javaagent:<jarpath>[=<options>]\n                  \u8F09\u5165 Java \u7A0B\u5F0F\u8A9E\u8A00\u4EE3\u7406\u7A0B\u5F0F\uFF0C\u8ACB\u53C3\u95B1 java.lang.instrument\n    -splash:<imagepath>\n                  \u986F\u793A\u6307\u5B9A\u5F71\u50CF\u7684\u8EDF\u9AD4\u8CC7\u8A0A\u756B\u9762\n\u8ACB\u53C3\u95B1 http://www.oracle.com/technetwork/java/javase/documentation/index.html \u66B8\u89E3\u8A73\u7D30\u8CC7\u8A0A\u3002
+
+# Translators please note do not translate the options themselves
+java.launcher.X.usage=\    -Xmixed           \u6DF7\u5408\u6A21\u5F0F\u57F7\u884C (\u9810\u8A2D)\n    -Xint             \u50C5\u9650\u89E3\u8B6F\u6A21\u5F0F\u57F7\u884C\n    -Xbootclasspath:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u9304\u548C zip/jar \u6A94\u6848>\n                      \u8A2D\u5B9A\u555F\u52D5\u5B89\u88DD\u985E\u5225\u548C\u8CC7\u6E90\u7684\u641C\u5C0B\u8DEF\u5F91\n    -Xbootclasspath/a:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u9304\u548C zip/jar \u6A94\u6848>\n                      \u9644\u52A0\u5728\u555F\u52D5\u5B89\u88DD\u985E\u5225\u8DEF\u5F91\u7684\u7D50\u5C3E\n    -Xbootclasspath/p:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u9304\u548C zip/jar \u6A94\u6848>\n                      \u9644\u52A0\u5728\u555F\u52D5\u5B89\u88DD\u985E\u5225\u8DEF\u5F91\u7684\u524D\u9762\n    -Xdiag            \u986F\u793A\u5176\u4ED6\u7684\u8A3A\u65B7\u8A0A\u606F\n    -Xnoclassgc       \u505C\u7528\u985E\u5225\u8CC7\u6E90\u56DE\u6536\n    -Xincgc           \u555F\u7528\u6F38\u9032\u8CC7\u6E90\u56DE\u6536\n    -Xloggc:<file>    \u5229\u7528\u6642\u6233\u5C07 GC \u72C0\u614B\u8A18\u9304\u81F3\u6A94\u6848\u4E2D\n    -Xbatch           \u505C\u7528\u80CC\u666F\u7DE8\u8B6F\n    -Xms<size>        \u8A2D\u5B9A\u8D77\u59CB Java \u5806\u96C6\u5927\u5C0F\n    -Xmx<size>        \u8A2D\u5B9A Java \u5806\u96C6\u5927\u5C0F\u4E0A\u9650\n    -Xss<size>        \u8A2D\u5B9A Java \u57F7\u884C\u7DD2\u5806\u758A\u5927\u5C0F\n    -Xprof            \u8F38\u51FA CPU \u5206\u6790\u8CC7\u6599\n    -Xfuture          \u555F\u7528\u6700\u56B4\u683C\u7684\u6AA2\u67E5\uFF0C\u9810\u5148\u505A\u70BA\u5C07\u4F86\u7684\u9810\u8A2D\n    -Xrs              \u6E1B\u5C11 Java/VM \u4F7F\u7528\u4F5C\u696D\u7CFB\u7D71\u4FE1\u865F (\u8ACB\u53C3\u95B1\u6587\u4EF6)\n    -Xcheck:jni       \u57F7\u884C\u5176\u4ED6\u7684 JNI \u51FD\u6578\u6AA2\u67E5\n    -Xshare:off       \u4E0D\u5617\u8A66\u4F7F\u7528\u5171\u7528\u985E\u5225\u8CC7\u6599\n    -Xshare:auto      \u5118\u53EF\u80FD\u4F7F\u7528\u5171\u7528\u985E\u5225\u8CC7\u6599 (\u9810\u8A2D)\n    -Xshare:on        \u9700\u8981\u4F7F\u7528\u5171\u7528\u985E\u5225\u8CC7\u6599\uFF0C\u5426\u5247\u5931\u6557\u3002\n    -XshowSettings    \u986F\u793A\u6240\u6709\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\n    -XshowSettings:all\n                      \u986F\u793A\u6240\u6709\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\n    -XshowSettings:vm \u986F\u793A\u6240\u6709 VM \u76F8\u95DC\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\n    -XshowSettings:properties\n                      \u986F\u793A\u6240\u6709\u5C6C\u6027\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\n    -XshowSettings:locale\n                      \u986F\u793A\u6240\u6709\u5730\u5340\u8A2D\u5B9A\u76F8\u95DC\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\n\n -X \u9078\u9805\u4E0D\u662F\u6A19\u6E96\u9078\u9805\uFF0C\u82E5\u6709\u8B8A\u66F4\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
 
 # Translators please note do not translate the options themselves
-java.launcher.X.usage=\    -Xmixed           \u6DF7\u5408\u6A21\u5F0F\u57F7\u884C (\u9810\u8A2D)\n\    -Xint             \u50C5\u9650\u89E3\u8B6F\u6A21\u5F0F\u57F7\u884C\n\    -Xbootclasspath:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u9304\u548C zip/jar \u6A94\u6848>\n\                      \u8A2D\u5B9A\u555F\u52D5\u5B89\u88DD\u985E\u5225\u548C\u8CC7\u6E90\u7684\u641C\u5C0B\u8DEF\u5F91\n\    -Xbootclasspath/a:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u9304\u548C zip/jar \u6A94\u6848>\n\                      \u9644\u52A0\u5728\u555F\u52D5\u5B89\u88DD\u985E\u5225\u8DEF\u5F91\u7684\u7D50\u5C3E\n\    -Xbootclasspath/p:<\u4EE5 {0} \u5206\u9694\u7684\u76EE\u9304\u548C zip/jar \u6A94\u6848>\n\                      \u9644\u52A0\u5728\u555F\u52D5\u5B89\u88DD\u985E\u5225\u8DEF\u5F91\u7684\u524D\u9762\n\    -Xdiag            \u986F\u793A\u5176\u4ED6\u7684\u8A3A\u65B7\u8A0A\u606F\n\    -Xnoclassgc       \u505C\u7528\u985E\u5225\u8CC7\u6E90\u56DE\u6536\n\    -Xincgc           \u555F\u7528\u6F38\u9032\u8CC7\u6E90\u56DE\u6536\n\    -Xloggc:<file>    \u5229\u7528\u6642\u6233\u5C07 GC \u72C0\u614B\u8A18\u9304\u81F3\u6A94\u6848\u4E2D\n\    -Xbatch           \u505C\u7528\u80CC\u666F\u7DE8\u8B6F\n\    -Xms<size>        \u8A2D\u5B9A\u8D77\u59CB Java \u5806\u96C6\u5927\u5C0F\n\    -Xmx<size>        \u8A2D\u5B9A Java \u5806\u96C6\u5927\u5C0F\u4E0A\u9650\n\    -Xss<size>        \u8A2D\u5B9A Java \u57F7\u884C\u7DD2\u5806\u758A\u5927\u5C0F\n\    -Xprof            \u8F38\u51FA CPU \u5206\u6790\u8CC7\u6599\n\    -Xfuture          \u555F\u7528\u6700\u56B4\u683C\u7684\u6AA2\u67E5\uFF0C\u9810\u5148\u505A\u70BA\u5C07\u4F86\u7684\u9810\u8A2D\n\    -Xrs              \u6E1B\u5C11 Java/VM \u4F7F\u7528\u4F5C\u696D\u7CFB\u7D71\u4FE1\u865F (\u8ACB\u53C3\u95B1\u6587\u4EF6)\n\    -Xcheck:jni       \u57F7\u884C\u5176\u4ED6\u7684 JNI \u51FD\u6578\u6AA2\u67E5\n\    -Xshare:off       \u4E0D\u5617\u8A66\u4F7F\u7528\u5171\u7528\u985E\u5225\u8CC7\u6599\n\    -Xshare:auto      \u5118\u53EF\u80FD\u4F7F\u7528\u5171\u7528\u985E\u5225\u8CC7\u6599 (\u9810\u8A2D)\n\    -Xshare:on        \u9700\u8981\u4F7F\u7528\u5171\u7528\u985E\u5225\u8CC7\u6599\uFF0C\u5426\u5247\u5931\u6557\u3002\n\    -XshowSettings    \u986F\u793A\u6240\u6709\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\n\    -XshowSettings:all\n\                      \u986F\u793A\u6240\u6709\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\n\    -XshowSettings:vm \u986F\u793A\u6240\u6709 VM \u76F8\u95DC\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\n\    -XshowSettings:properties\n\                      \u986F\u793A\u6240\u6709\u5C6C\u6027\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\n\    -XshowSettings:locale\n\                      \u986F\u793A\u6240\u6709\u5730\u5340\u8A2D\u5B9A\u76F8\u95DC\u8A2D\u5B9A\u503C\u4E26\u7E7C\u7E8C\n\n -X \u9078\u9805\u4E0D\u662F\u6A19\u6E96\u9078\u9805\uFF0C\u82E5\u6709\u8B8A\u66F4\u4E0D\u53E6\u884C\u901A\u77E5\u3002\n
+java.launcher.X.macosx.usage=\n\u4E0B\u5217\u662F Mac OS X \u7279\u5B9A\u9078\u9805:\n    -XstartOnFirstThread\n                      \u5728\u7B2C\u4E00\u500B (AppKit) \u57F7\u884C\u7DD2\u57F7\u884C main() \u65B9\u6CD5\n    -Xdock:name=<application name>"\n                      \u8986\u5BEB\u7D50\u5408\u8AAA\u660E\u756B\u9762\u4E2D\u986F\u793A\u7684\u9810\u8A2D\u61C9\u7528\u7A0B\u5F0F\u540D\u7A31\n    -Xdock:icon=<path to icon file>\n                      \u8986\u5BEB\u7D50\u5408\u8AAA\u660E\u756B\u9762\u4E2D\u986F\u793A\u7684\u9810\u8A2D\u5716\u793A\n\n
 
 java.launcher.cls.error1=\u932F\u8AA4: \u627E\u4E0D\u5230\u6216\u7121\u6CD5\u8F09\u5165\u4E3B\u8981\u985E\u5225 {0}
-java.launcher.cls.error2=\u932F\u8AA4: \u4E3B\u8981\u65B9\u6CD5\u4E0D\u662F\u985E\u5225 {1} \u4E2D\u7684 {0}\uFF0C\u8ACB\u5B9A\u7FA9\u4E3B\u8981\u65B9\u6CD5\u70BA:\n\   public static void main(String[] args)
-java.launcher.cls.error3=\u932F\u8AA4: \u4E3B\u8981\u65B9\u6CD5\u5FC5\u9808\u50B3\u56DE\u985E\u5225 {0} \u4E2D void \u985E\u578B\u7684\u503C\uFF0C \n\u8ACB\u5B9A\u7FA9\u4E3B\u8981\u65B9\u6CD5\u70BA:\n\   public static void main(String[] args)
-java.launcher.cls.error4=\u932F\u8AA4: \u5728\u985E\u5225 {0} \u4E2D\u627E\u4E0D\u5230\u4E3B\u8981\u65B9\u6CD5\uFF0C\u8ACB\u5B9A\u7FA9\u4E3B\u8981\u65B9\u6CD5\u70BA:\n\   public static void main(String[] args)
+java.launcher.cls.error2=\u932F\u8AA4: \u4E3B\u8981\u65B9\u6CD5\u4E0D\u662F\u985E\u5225 {1} \u4E2D\u7684 {0}\uFF0C\u8ACB\u5B9A\u7FA9\u4E3B\u8981\u65B9\u6CD5\u70BA:\n   public static void main(String[] args)
+java.launcher.cls.error3=\u932F\u8AA4: \u4E3B\u8981\u65B9\u6CD5\u5FC5\u9808\u50B3\u56DE\u985E\u5225 {0} \u4E2D void \u985E\u578B\u7684\u503C\uFF0C \n\u8ACB\u5B9A\u7FA9\u4E3B\u8981\u65B9\u6CD5\u70BA:\n   public static void main(String[] args)
+java.launcher.cls.error4=\u932F\u8AA4: \u5728\u985E\u5225 {0} \u4E2D\u627E\u4E0D\u5230\u4E3B\u8981\u65B9\u6CD5\uFF0C\u8ACB\u5B9A\u7FA9\u4E3B\u8981\u65B9\u6CD5\u70BA:\n   public static void main(String[] args)\n\u6216\u8005 JavaFX \u61C9\u7528\u7A0B\u5F0F\u985E\u5225\u5FC5\u9808\u64F4\u5145 {1}
+java.launcher.cls.error5=\u932F\u8AA4: \u907A\u6F0F\u57F7\u884C\u6B64\u61C9\u7528\u7A0B\u5F0F\u6240\u9700\u7684 JavaFX \u7A0B\u5F0F\u5BE6\u969B\u57F7\u884C\u5143\u4EF6
 java.launcher.jar.error1=\u932F\u8AA4: \u5617\u8A66\u958B\u555F\u6A94\u6848 {0} \u6642\u767C\u751F\u672A\u9810\u671F\u7684\u932F\u8AA4
 java.launcher.jar.error2=\u5728 {0} \u4E2D\u627E\u4E0D\u5230\u8CC7\u8A0A\u6E05\u55AE
 java.launcher.jar.error3={0} \u4E2D\u6C92\u6709\u4E3B\u8981\u8CC7\u8A0A\u6E05\u55AE\u5C6C\u6027
+java.launcher.init.error=\u521D\u59CB\u5316\u932F\u8AA4
+java.launcher.javafx.error1=\u932F\u8AA4: JavaFX launchApplication \u65B9\u6CD5\u7684\u7C3D\u7AE0\u932F\u8AA4\uFF0C\u5B83\n\u5FC5\u9808\u5BA3\u544A\u70BA\u975C\u614B\u4E26\u50B3\u56DE void \u985E\u578B\u7684\u503C
--- a/jdk/src/share/classes/sun/management/AgentConfigurationError.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/management/AgentConfigurationError.java	Wed May 08 11:22:25 2013 +0100
@@ -128,19 +128,13 @@
     public AgentConfigurationError(String error, String... params) {
         super();
         this.error = error;
-        this.params = new String[params.length];
-        for (int i = 0; i < params.length; i++) {
-            this.params[i] = params[i];
-        }
+        this.params = params.clone();
     }
 
     public AgentConfigurationError(String error, Throwable cause, String... params) {
         super(cause);
         this.error = error;
-        this.params = new String[params.length];
-        for (int i = 0; i < params.length; i++) {
-            this.params[i] = params[i];
-        }
+        this.params = params.clone();
     }
 
     public String getError() {
@@ -148,7 +142,7 @@
     }
 
     public String[] getParams() {
-        return params;
+        return params.clone();
     }
 
     private static final long serialVersionUID = 1211605593516195475L;
--- a/jdk/src/share/classes/sun/management/resources/agent_de.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/management/resources/agent_de.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -40,11 +40,12 @@
 
 agent.err.agentclass.notfound      = Management Agent-Klasse nicht gefunden
 agent.err.agentclass.failed        = Management Agent-Klasse nicht erfolgreich
-agent.err.premain.notfound         = premain(String) ist in Agentklasse nicht vorhanden
+agent.err.premain.notfound         = premain(String) ist in Agent-Klasse nicht vorhanden
 agent.err.agentclass.access.denied = Zugriff auf premain(String) wurde abgelehnt
 agent.err.invalid.agentclass       = Ung\u00FCltiger Eigenschaftswert f\u00FCr com.sun.management.agent.class
-
+agent.err.invalid.state            = Ung\u00FCltiger Agent-Zustand
 agent.err.invalid.jmxremote.port   = Ung\u00FCltige Nummer f\u00FCr com.sun.management.jmxremote.port
+agent.err.invalid.jmxremote.rmi.port = Ung\u00FCltige Nummer f\u00FCr com.sun.management.jmxremote.rmi.port
 
 agent.err.file.not.set               = Datei nicht angegeben
 agent.err.file.not.readable          = Datei nicht lesbar
@@ -52,13 +53,13 @@
 agent.err.file.not.found             = Datei wurde nicht gefunden
 agent.err.file.access.not.restricted = Lesezugriff auf Datei muss eingeschr\u00E4nkt werden
 
-agent.err.password.file.notset     = Es wurde keine Kennwortdatei angegeben, obwohl com.sun.management.jmxremote.authenticate auf \"true\" gesetzt ist
+agent.err.password.file.notset     = Es wurde keine Kennwortdatei angegeben, obwohl com.sun.management.jmxremote.authenticate auf "true" gesetzt ist
 agent.err.password.file.not.readable = Kennwortdatei nicht lesbar
 agent.err.password.file.read.failed = Kennwortdatei konnte nicht gelesen werden
 agent.err.password.file.notfound   = Kennwortdatei nicht gefunden
 agent.err.password.file.access.notrestricted = Lesezugriff auf Kennwortdatei muss eingeschr\u00E4nkt werden
 
-agent.err.access.file.notset       = Es wurde keine Zugriffsdatei angegeben, obwohl com.sun.management.jmxremote.authenticate auf \"true\" gesetzt ist
+agent.err.access.file.notset       = Es wurde keine Zugriffsdatei angegeben, obwohl com.sun.management.jmxremote.authenticate auf "true" gesetzt ist
 agent.err.access.file.not.readable = Zugriffsdatei kann nicht gelesen werden
 agent.err.access.file.read.failed  = Zugriffsdatei konnte nicht gelesen werden
 agent.err.access.file.notfound     = Zugriffsdatei nicht gefunden
@@ -69,7 +70,7 @@
 agent.err.invalid.snmp.port        = Ung\u00FCltige Nummer f\u00FCr com.sun.management.snmp.port
 agent.err.invalid.snmp.trap.port   = Ung\u00FCltige Nummer f\u00FCr com.sun.management.snmp.trap
 agent.err.unknown.snmp.interface   = Unbekannte SNMP-Schnittstelle
-agent.err.acl.file.notset          = Es wurde keine SNMP-ACL-Datei angegeben, obwohl com.sun.management.snmp.acl auf \"true\" gesetzt ist
+agent.err.acl.file.notset          = Es wurde keine SNMP-ACL-Datei angegeben, obwohl com.sun.management.snmp.acl auf "true" gesetzt ist
 agent.err.acl.file.notfound        = SNMP-ACL-Datei konnte nicht gefunden werden
 agent.err.acl.file.not.readable    = SNMP-ACL-Datei kann nicht gelesen werden
 agent.err.acl.file.read.failed     = SNMP-ACL-Datei konnte nicht gelesen werden
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = Fehler beim Starten des SNMP-Adaptors mit Adresse
 agent.err.snmp.mib.init.failed     = Initialisierung von SNMP-MIB nicht erfolgreich mit Fehler
 
-jmxremote.ConnectorBootstrap.initialize = JMX-Connector-Server starten:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = Keine Authentifizierung
-jmxremote.ConnectorBootstrap.initialize.ready = JMX-Connector bereit unter: {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = Lesezugriff auf Kennwortdatei muss eingeschr\u00E4nkt werden: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = Lesezugriff auf Datei muss eingeschr\u00E4nkt werden: {0}
+jmxremote.ConnectorBootstrap.starting = JMX-Connector-Server starten:
+jmxremote.ConnectorBootstrap.noAuthentication = Keine Authentifizierung
+jmxremote.ConnectorBootstrap.ready = JMX-Connector bereit unter: {0}
+jmxremote.ConnectorBootstrap.password.readonly = Lesezugriff auf Kennwortdatei muss eingeschr\u00E4nkt werden: {0}
+jmxremote.ConnectorBootstrap.file.readonly = Lesezugriff auf Datei muss eingeschr\u00E4nkt werden: {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = ACL wird verarbeitet
 jmxremote.AdaptorBootstrap.getTargetList.adding = Ziel hinzuf\u00FCgen: {0}
--- a/jdk/src/share/classes/sun/management/resources/agent_es.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/management/resources/agent_es.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = premain(String) no existe en la clase del agente
 agent.err.agentclass.access.denied = Acceso denegado a premain(String)
 agent.err.invalid.agentclass       = Valor de propiedad com.sun.management.agent.class no v\u00E1lido
-
+agent.err.invalid.state            = Estado del agente no v\u00E1lido
 agent.err.invalid.jmxremote.port   = N\u00FAmero com.sun.management.jmxremote.port no v\u00E1lido
+agent.err.invalid.jmxremote.rmi.port = N\u00FAmero com.sun.management.jmxremote.rmi.port no v\u00E1lido
 
 agent.err.file.not.set               = Archivo no especificado
 agent.err.file.not.readable          = Archivo ilegible
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = Fallo al iniciar el adaptador de SNMP con la direcci\u00F3n
 agent.err.snmp.mib.init.failed     = Fallo al inicializar el MIB de SNMP con error
 
-jmxremote.ConnectorBootstrap.initialize = Iniciando servidor de conector JMX:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = Sin autenticaci\u00F3n
-jmxremote.ConnectorBootstrap.initialize.ready = Conector JMX listo en: {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = Se debe restringir el acceso de lectura al archivo de contrase\u00F1as: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = El acceso de lectura al archivo debe ser restringido: {0}
+jmxremote.ConnectorBootstrap.starting = Iniciando servidor de conector JMX:
+jmxremote.ConnectorBootstrap.noAuthentication = Sin autenticaci\u00F3n
+jmxremote.ConnectorBootstrap.ready = Conector JMX listo en: {0}
+jmxremote.ConnectorBootstrap.password.readonly = Se debe restringir el acceso de lectura al archivo de contrase\u00F1as: {0}
+jmxremote.ConnectorBootstrap.file.readonly = El acceso de lectura al archivo debe ser restringido: {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = Procesando ACL
 jmxremote.AdaptorBootstrap.getTargetList.adding = Agregando destino: {0}
--- a/jdk/src/share/classes/sun/management/resources/agent_fr.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/management/resources/agent_fr.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = premain(String) n'existe pas dans la classe d'agents
 agent.err.agentclass.access.denied = Acc\u00E8s \u00E0 premain(String) refus\u00E9
 agent.err.invalid.agentclass       = Valeur de propri\u00E9t\u00E9 com.sun.management.agent.class incorrecte
-
+agent.err.invalid.state            = Etat de l'agent non valide
 agent.err.invalid.jmxremote.port   = Num\u00E9ro com.sun.management.jmxremote.port incorrect
+agent.err.invalid.jmxremote.rmi.port = Num\u00E9ro com.sun.management.jmxremote.rmi.port non valide
 
 agent.err.file.not.set               = Fichier non sp\u00E9cifi\u00E9
 agent.err.file.not.readable          = Fichier illisible
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = Impossible de d\u00E9marrer l'adaptateur SNMP avec l'adresse
 agent.err.snmp.mib.init.failed     = Impossible d'initialiser SNMP MIB avec l'erreur
 
-jmxremote.ConnectorBootstrap.initialize = D\u00E9marrage du serveur du connecteur JMX :
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = Pas d'authentification
-jmxremote.ConnectorBootstrap.initialize.ready = Connecteur JMX pr\u00EAt \u00E0 : {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = L''acc\u00E8s en lecture au fichier de mots de passe doit \u00EAtre limit\u00E9 : {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = L''acc\u00E8s en lecture au fichier doit \u00EAtre limit\u00E9 : {0}
+jmxremote.ConnectorBootstrap.starting = D\u00E9marrage du serveur du connecteur JMX :
+jmxremote.ConnectorBootstrap.noAuthentication = Pas d'authentification
+jmxremote.ConnectorBootstrap.ready = Connecteur JMX pr\u00EAt \u00E0 : {0}
+jmxremote.ConnectorBootstrap.password.readonly = L''acc\u00E8s en lecture au fichier de mots de passe doit \u00EAtre limit\u00E9 : {0}
+jmxremote.ConnectorBootstrap.file.readonly = L''acc\u00E8s en lecture au fichier doit \u00EAtre limit\u00E9 : {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = Traitement de la liste de contr\u00F4le d'acc\u00E8s (ACL)
 jmxremote.AdaptorBootstrap.getTargetList.adding = Ajout de la cible : {0}
--- a/jdk/src/share/classes/sun/management/resources/agent_it.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/management/resources/agent_it.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = premain(String) non esiste nella classe agente
 agent.err.agentclass.access.denied = Accesso negato a premain(String)
 agent.err.invalid.agentclass       = Valore propriet\u00E0 com.sun.management.agent.class non valido
-
+agent.err.invalid.state            = Stato agente non valido
 agent.err.invalid.jmxremote.port   = Numero com.sun.management.jmxremote.port non valido
+agent.err.invalid.jmxremote.rmi.port = Numero com.sun.management.jmxremote.rmi.port non valido
 
 agent.err.file.not.set               = File non specificato
 agent.err.file.not.readable          = File non leggibile
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = Impossibile avviare l'adattatore SNMP con indirizzo
 agent.err.snmp.mib.init.failed     = Impossibile inizializzare MIB SNMP con errore
 
-jmxremote.ConnectorBootstrap.initialize = Avvio del server connettore JMX:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = Nessuna autenticazione
-jmxremote.ConnectorBootstrap.initialize.ready = Connettore JMX pronto in: {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = Limitare l''accesso in lettura al password file: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = Limitare l''accesso in lettura al file: {0}
+jmxremote.ConnectorBootstrap.starting = Avvio del server connettore JMX:
+jmxremote.ConnectorBootstrap.noAuthentication = Nessuna autenticazione
+jmxremote.ConnectorBootstrap.ready = Connettore JMX pronto in: {0}
+jmxremote.ConnectorBootstrap.password.readonly = Limitare l''accesso in lettura al password file: {0}
+jmxremote.ConnectorBootstrap.file.readonly = Limitare l''accesso in lettura al file: {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = Elaborazione ACL
 jmxremote.AdaptorBootstrap.getTargetList.adding = Aggiunta destinazione: {0}
--- a/jdk/src/share/classes/sun/management/resources/agent_ja.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/management/resources/agent_ja.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = premain(String)\u304C\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30AF\u30E9\u30B9\u306B\u5B58\u5728\u3057\u307E\u305B\u3093
 agent.err.agentclass.access.denied = premain(String)\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u304C\u62D2\u5426\u3055\u308C\u307E\u3057\u305F
 agent.err.invalid.agentclass       = com.sun.management.agent.class\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5024\u304C\u7121\u52B9\u3067\u3059
-
+agent.err.invalid.state            = \u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u306E\u72B6\u614B\u304C\u7121\u52B9\u3067\u3059
 agent.err.invalid.jmxremote.port   = com.sun.management.jmxremote.port\u306E\u756A\u53F7\u304C\u7121\u52B9\u3067\u3059
+agent.err.invalid.jmxremote.rmi.port = com.sun.management.jmxremote.rmi.port\u306E\u756A\u53F7\u304C\u7121\u52B9\u3067\u3059
 
 agent.err.file.not.set               = \u30D5\u30A1\u30A4\u30EB\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 agent.err.file.not.readable          = \u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u53D6\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = \u3053\u306E\u30A2\u30C9\u30EC\u30B9\u3067SNMP\u30A2\u30C0\u30D7\u30BF\u3092\u958B\u59CB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
 agent.err.snmp.mib.init.failed     = \u30A8\u30E9\u30FC\u3067SNMP MIB\u3092\u521D\u671F\u5316\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
 
-jmxremote.ConnectorBootstrap.initialize = JMX\u30B3\u30CD\u30AF\u30BF\u30FB\u30B5\u30FC\u30D0\u30FC\u3092\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = \u8A8D\u8A3C\u306A\u3057
-jmxremote.ConnectorBootstrap.initialize.ready = JMX\u30B3\u30CD\u30AF\u30BF\u306E\u6E96\u5099\u304C\u3067\u304D\u307E\u3057\u305F: {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = \u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u30A2\u30AF\u30BB\u30B9\u306F\u5236\u9650\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = \u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u30A2\u30AF\u30BB\u30B9\u306F\u5236\u9650\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}
+jmxremote.ConnectorBootstrap.starting = JMX\u30B3\u30CD\u30AF\u30BF\u30FB\u30B5\u30FC\u30D0\u30FC\u3092\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059:
+jmxremote.ConnectorBootstrap.noAuthentication = \u8A8D\u8A3C\u306A\u3057
+jmxremote.ConnectorBootstrap.ready = JMX\u30B3\u30CD\u30AF\u30BF\u306E\u6E96\u5099\u304C\u3067\u304D\u307E\u3057\u305F: {0}
+jmxremote.ConnectorBootstrap.password.readonly = \u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u30A2\u30AF\u30BB\u30B9\u306F\u5236\u9650\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}
+jmxremote.ConnectorBootstrap.file.readonly = \u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u53D6\u308A\u30A2\u30AF\u30BB\u30B9\u306F\u5236\u9650\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059: {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = ACL\u3092\u51E6\u7406\u3057\u3066\u3044\u307E\u3059
 jmxremote.AdaptorBootstrap.getTargetList.adding = \u30BF\u30FC\u30B2\u30C3\u30C8\u3092\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059: {0}
--- a/jdk/src/share/classes/sun/management/resources/agent_ko.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/management/resources/agent_ko.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = \uC5D0\uC774\uC804\uD2B8 \uD074\uB798\uC2A4\uC5D0 premain(\uBB38\uC790\uC5F4)\uC774 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
 agent.err.agentclass.access.denied = premain(\uBB38\uC790\uC5F4)\uC5D0 \uB300\uD55C \uC561\uC138\uC2A4\uAC00 \uAC70\uBD80\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 agent.err.invalid.agentclass       = com.sun.management.agent.class \uC18D\uC131 \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
-
+agent.err.invalid.state            = \uBD80\uC801\uD569\uD55C \uC5D0\uC774\uC804\uD2B8 \uC0C1\uD0DC
 agent.err.invalid.jmxremote.port   = com.sun.management.jmxremote.port \uBC88\uD638\uAC00 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4.
+agent.err.invalid.jmxremote.rmi.port = \uBD80\uC801\uD569\uD55C com.sun.management.jmxremote.rmi.port \uBC88\uD638
 
 agent.err.file.not.set               = \uD30C\uC77C\uC774 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
 agent.err.file.not.readable          = \uD30C\uC77C\uC744 \uC77D\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = \uC8FC\uC18C\uAC00 \uC788\uB294 SNMP \uC5B4\uB311\uD130 \uC2DC\uC791\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
 agent.err.snmp.mib.init.failed     = \uC624\uB958\uB85C \uC778\uD574 SNMP MIB \uCD08\uAE30\uD654\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
 
-jmxremote.ConnectorBootstrap.initialize = JMX \uCEE4\uB125\uD130 \uC11C\uBC84\uB97C \uC2DC\uC791\uD558\uB294 \uC911:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = \uC778\uC99D \uC5C6\uC74C
-jmxremote.ConnectorBootstrap.initialize.ready = {0}\uC5D0\uC11C JMX \uCEE4\uB125\uD130\uAC00 \uC900\uBE44\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
-jmxremote.ConnectorBootstrap.initialize.password.readonly = \uBE44\uBC00\uBC88\uD638 \uD30C\uC77C \uC77D\uAE30 \uC561\uC138\uC2A4\uB294 \uC81C\uD55C\uB418\uC5B4\uC57C \uD568: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = \uD30C\uC77C \uC77D\uAE30 \uC561\uC138\uC2A4\uB294 \uC81C\uD55C\uB418\uC5B4\uC57C \uD568: {0}
+jmxremote.ConnectorBootstrap.starting = JMX \uCEE4\uB125\uD130 \uC11C\uBC84\uB97C \uC2DC\uC791\uD558\uB294 \uC911:
+jmxremote.ConnectorBootstrap.noAuthentication = \uC778\uC99D \uC5C6\uC74C
+jmxremote.ConnectorBootstrap.ready = {0}\uC5D0\uC11C JMX \uCEE4\uB125\uD130\uAC00 \uC900\uBE44\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+jmxremote.ConnectorBootstrap.password.readonly = \uBE44\uBC00\uBC88\uD638 \uD30C\uC77C \uC77D\uAE30 \uC561\uC138\uC2A4\uB294 \uC81C\uD55C\uB418\uC5B4\uC57C \uD568: {0}
+jmxremote.ConnectorBootstrap.file.readonly = \uD30C\uC77C \uC77D\uAE30 \uC561\uC138\uC2A4\uB294 \uC81C\uD55C\uB418\uC5B4\uC57C \uD568: {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = ACL\uC744 \uCC98\uB9AC\uD558\uB294 \uC911
 jmxremote.AdaptorBootstrap.getTargetList.adding = \uB300\uC0C1\uC744 \uCD94\uAC00\uD558\uB294 \uC911: {0}
--- a/jdk/src/share/classes/sun/management/resources/agent_pt_BR.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/management/resources/agent_pt_BR.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = premain(String) n\u00E3o existe na classe do agente
 agent.err.agentclass.access.denied = Acesso negado a premain(String)
 agent.err.invalid.agentclass       = Valor inv\u00E1lido da propriedade com.sun.management.agent.class
-
+agent.err.invalid.state            = Estado de agente inv\u00E1lido
 agent.err.invalid.jmxremote.port   = N\u00FAmero inv\u00E1lido de com.sun.management.jmxremote.port
+agent.err.invalid.jmxremote.rmi.port = N\u00FAmero inv\u00E1lido do com.sun.management.jmxremote.rmi.port
 
 agent.err.file.not.set               = Arquivo n\u00E3o especificado
 agent.err.file.not.readable          = Arquivo ileg\u00EDvel
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = Falha ao iniciar o adaptador SNMP com endere\u00E7o
 agent.err.snmp.mib.init.failed     = Falha ao inicializar o MIB SNMP com erro
 
-jmxremote.ConnectorBootstrap.initialize = Iniciando o Servidor do Conector JMX:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = Sem autentica\u00E7\u00E3o
-jmxremote.ConnectorBootstrap.initialize.ready = Conector JMX pronto em: {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = O acesso de leitura do arquivo de senha deve ser limitado: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = O acesso de leitura do arquivo deve ser limitado: {0}
+jmxremote.ConnectorBootstrap.starting = Iniciando o Servidor do Conector JMX:
+jmxremote.ConnectorBootstrap.noAuthentication = Sem autentica\u00E7\u00E3o
+jmxremote.ConnectorBootstrap.ready = Conector JMX pronto em: {0}
+jmxremote.ConnectorBootstrap.password.readonly = O acesso de leitura do arquivo de senha deve ser limitado: {0}
+jmxremote.ConnectorBootstrap.file.readonly = O acesso de leitura do arquivo deve ser limitado: {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = Processando ACL
 jmxremote.AdaptorBootstrap.getTargetList.adding = Adicionando destino: {0}
--- a/jdk/src/share/classes/sun/management/resources/agent_sv.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/management/resources/agent_sv.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = premain(String) finns inte i agentklassen
 agent.err.agentclass.access.denied = \u00C5tkomst till premain(String) nekad
 agent.err.invalid.agentclass       = Ogiltigt egenskapsv\u00E4rde f\u00F6r com.sun.management.agent.class
-
+agent.err.invalid.state            = Ogiltig agentstatus
 agent.err.invalid.jmxremote.port   = Ogiltigt com.sun.management.jmxremote.port-nummer
+agent.err.invalid.jmxremote.rmi.port = Ogiltigt com.sun.management.jmxremote.rmi.port-nummer
 
 agent.err.file.not.set               = Filen \u00E4r inte angiven
 agent.err.file.not.readable          = Filen \u00E4r inte l\u00E4sbar
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = Kunde inte starta SNMP-adaptern med adressen
 agent.err.snmp.mib.init.failed     = Kunde inte initiera SNMP MIB. Returnerade felet
 
-jmxremote.ConnectorBootstrap.initialize = Startar server f\u00F6r JMX-anslutning:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = Ingen autentisering
-jmxremote.ConnectorBootstrap.initialize.ready = JMX-anslutning redo p\u00E5: {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = L\u00E4sbeh\u00F6righeten f\u00F6r l\u00F6senordsfilen m\u00E5ste begr\u00E4nsas: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = Fill\u00E4snings\u00E5tkomst m\u00E5ste begr\u00E4nsas {0}
+jmxremote.ConnectorBootstrap.starting = Startar server f\u00F6r JMX-anslutning:
+jmxremote.ConnectorBootstrap.noAuthentication = Ingen autentisering
+jmxremote.ConnectorBootstrap.ready = JMX-anslutning redo p\u00E5: {0}
+jmxremote.ConnectorBootstrap.password.readonly = L\u00E4sbeh\u00F6righeten f\u00F6r l\u00F6senordsfilen m\u00E5ste begr\u00E4nsas: {0}
+jmxremote.ConnectorBootstrap.file.readonly = Fill\u00E4snings\u00E5tkomst m\u00E5ste begr\u00E4nsas {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = ACL bearbetas
 jmxremote.AdaptorBootstrap.getTargetList.adding = M\u00E5l l\u00E4ggs till: {0}
--- a/jdk/src/share/classes/sun/management/resources/agent_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/management/resources/agent_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = \u4EE3\u7406\u7C7B\u4E2D\u4E0D\u5B58\u5728 premain(String)
 agent.err.agentclass.access.denied = \u62D2\u7EDD\u8BBF\u95EE premain(String)
 agent.err.invalid.agentclass       = com.sun.management.agent.class \u5C5E\u6027\u503C\u65E0\u6548
-
+agent.err.invalid.state            = \u4EE3\u7406\u72B6\u6001\u65E0\u6548
 agent.err.invalid.jmxremote.port   = com.sun.management.jmxremote.port \u7F16\u53F7\u65E0\u6548
+agent.err.invalid.jmxremote.rmi.port = com.sun.management.jmxremote.rmi.port \u7F16\u53F7\u65E0\u6548
 
 agent.err.file.not.set               = \u672A\u6307\u5B9A\u6587\u4EF6
 agent.err.file.not.readable          = \u6587\u4EF6\u4E0D\u53EF\u8BFB\u53D6
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = \u65E0\u6CD5\u542F\u52A8\u5E26\u6709\u5730\u5740\u7684 SNMP \u9002\u914D\u5668
 agent.err.snmp.mib.init.failed     = \u65E0\u6CD5\u521D\u59CB\u5316\u5E26\u6709\u9519\u8BEF\u7684 SNMP MIB
 
-jmxremote.ConnectorBootstrap.initialize = \u6B63\u5728\u542F\u52A8 JMX \u8FDE\u63A5\u5668\u670D\u52A1\u5668: 
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = \u65E0\u9A8C\u8BC1
-jmxremote.ConnectorBootstrap.initialize.ready = \u4F4D\u4E8E{0}\u7684 JMX \u8FDE\u63A5\u5668\u5DF2\u5C31\u7EEA
-jmxremote.ConnectorBootstrap.initialize.password.readonly = \u5FC5\u987B\u9650\u5236\u53E3\u4EE4\u6587\u4EF6\u8BFB\u53D6\u8BBF\u95EE\u6743\u9650: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = \u5FC5\u987B\u9650\u5236\u6587\u4EF6\u8BFB\u53D6\u8BBF\u95EE\u6743\u9650: {0}
+jmxremote.ConnectorBootstrap.starting = \u6B63\u5728\u542F\u52A8 JMX \u8FDE\u63A5\u5668\u670D\u52A1\u5668: 
+jmxremote.ConnectorBootstrap.noAuthentication = \u65E0\u9A8C\u8BC1
+jmxremote.ConnectorBootstrap.ready = \u4F4D\u4E8E{0}\u7684 JMX \u8FDE\u63A5\u5668\u5DF2\u5C31\u7EEA
+jmxremote.ConnectorBootstrap.password.readonly = \u5FC5\u987B\u9650\u5236\u53E3\u4EE4\u6587\u4EF6\u8BFB\u53D6\u8BBF\u95EE\u6743\u9650: {0}
+jmxremote.ConnectorBootstrap.file.readonly = \u5FC5\u987B\u9650\u5236\u6587\u4EF6\u8BFB\u53D6\u8BBF\u95EE\u6743\u9650: {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = \u6B63\u5728\u5904\u7406 ACL
 jmxremote.AdaptorBootstrap.getTargetList.adding = \u6B63\u5728\u6DFB\u52A0\u76EE\u6807: {0}
--- a/jdk/src/share/classes/sun/management/resources/agent_zh_TW.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/management/resources/agent_zh_TW.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,8 +43,9 @@
 agent.err.premain.notfound         = \u4EE3\u7406\u7A0B\u5F0F\u985E\u5225\u4E2D\u4E0D\u5B58\u5728 premain(String)
 agent.err.agentclass.access.denied = \u5B58\u53D6 premain(String) \u906D\u5230\u62D2\u7D55
 agent.err.invalid.agentclass       = com.sun.management.agent.class \u5C6C\u6027\u503C\u7121\u6548
-
+agent.err.invalid.state            = \u7121\u6548\u7684\u4EE3\u7406\u7A0B\u5F0F\u72C0\u614B
 agent.err.invalid.jmxremote.port   = com.sun.management.jmxremote.port \u865F\u78BC\u7121\u6548
+agent.err.invalid.jmxremote.rmi.port = com.sun.management.jmxremote.rmi.port \u865F\u78BC\u7121\u6548
 
 agent.err.file.not.set               = \u672A\u6307\u5B9A\u6A94\u6848
 agent.err.file.not.readable          = \u6A94\u6848\u7121\u6CD5\u8B80\u53D6
@@ -78,11 +79,11 @@
 agent.err.snmp.adaptor.start.failed = \u7121\u6CD5\u4F7F\u7528\u4F4D\u5740\u555F\u52D5 SNMP \u914D\u63A5\u5361
 agent.err.snmp.mib.init.failed     = \u7121\u6CD5\u521D\u59CB\u5316 SNMP MIB\uFF0C\u51FA\u73FE\u932F\u8AA4
 
-jmxremote.ConnectorBootstrap.initialize = \u6B63\u5728\u555F\u52D5 JMX \u9023\u63A5\u5668\u4F3A\u670D\u5668:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = \u7121\u8A8D\u8B49
-jmxremote.ConnectorBootstrap.initialize.ready = JMX \u9023\u63A5\u5668\u5C31\u7DD2\uFF0C\u4F4D\u65BC: {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = \u5FC5\u9808\u9650\u5236\u5BC6\u78BC\u6A94\u6848\u8B80\u53D6\u5B58\u53D6: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = \u5FC5\u9808\u9650\u5236\u6A94\u6848\u8B80\u53D6\u5B58\u53D6\u6B0A: {0}
+jmxremote.ConnectorBootstrap.starting = \u6B63\u5728\u555F\u52D5 JMX \u9023\u63A5\u5668\u4F3A\u670D\u5668:
+jmxremote.ConnectorBootstrap.noAuthentication = \u7121\u8A8D\u8B49
+jmxremote.ConnectorBootstrap.ready = JMX \u9023\u63A5\u5668\u5C31\u7DD2\uFF0C\u4F4D\u65BC: {0}
+jmxremote.ConnectorBootstrap.password.readonly = \u5FC5\u9808\u9650\u5236\u5BC6\u78BC\u6A94\u6848\u8B80\u53D6\u5B58\u53D6: {0}
+jmxremote.ConnectorBootstrap.file.readonly = \u5FC5\u9808\u9650\u5236\u6A94\u6848\u8B80\u53D6\u5B58\u53D6\u6B0A: {0}
 
 jmxremote.AdaptorBootstrap.getTargetList.processing = \u6B63\u5728\u8655\u7406 ACL
 jmxremote.AdaptorBootstrap.getTargetList.adding = \u6B63\u5728\u65B0\u589E\u76EE\u6A19: {0}
--- a/jdk/src/share/classes/sun/misc/resources/Messages_de.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_de.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/misc/resources/Messages_es.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_es.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/misc/resources/Messages_fr.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_fr.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/misc/resources/Messages_it.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_it.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/misc/resources/Messages_ja.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_ja.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/misc/resources/Messages_ko.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_ko.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/misc/resources/Messages_pt_BR.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_pt_BR.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/misc/resources/Messages_sv.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_sv.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/misc/resources/Messages_zh_CN.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_zh_CN.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/misc/resources/Messages_zh_TW.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/misc/resources/Messages_zh_TW.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/print/resources/serviceui_de.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_de.properties	Wed May 08 11:22:25 2013 +0100
@@ -16,9 +16,9 @@
 button.print=Drucken
 button.properties=E&igenschaften...
 #
-checkbox.collate=So&rtieren
+checkbox.collate=&Sortieren
 checkbox.jobsheets=&Bannerseite
-checkbox.printtofile=A&usgabe in Datei
+checkbox.printtofile=Ausgabe in &Datei
 #
 dialog.printtitle=Drucken
 dialog.pstitle=Seite einrichten
@@ -35,42 +35,42 @@
 label.psname=&Name:
 label.pstype=Typ:
 label.rangeto=Bis
-label.size=Gr\u00F6\u00DF&e:
-label.source=Q&uelle:
+label.size=G&r\u00F6\u00DFe:
+label.source=&Quelle:
 label.status=Status:
-label.username=Ben&utzername:
+label.username=&Benutzername:
 label.millimetres=(mm)
 label.inches=(Zoll)
 label.topmargin=&oben
-label.bottommargin=u&nten
+label.bottommargin=&unten
 label.leftmargin=&links
 label.rightmargin=&rechts
 #
 radiobutton.color=&Farbe
 radiobutton.draftq=Ent&wurf
-radiobutton.duplex=Du&plex
+radiobutton.duplex=&Duplex
 radiobutton.highq=&Hoch
 radiobutton.landscape=&Querformat
 radiobutton.monochrome=&Monochrom
 radiobutton.normalq=&Normal
 radiobutton.oneside=&Einseitig
-radiobutton.portrait=&Hochformat
+radiobutton.portrait=Hochfor&mat
 radiobutton.rangeall=A&lle
 radiobutton.rangepages=S&eiten
-radiobutton.revlandscape=U&mgekehrtes Querformat
-radiobutton.revportrait=Umge&kehrtes Hochformat
+radiobutton.revlandscape=Umgekehrtes Q&uerformat
+radiobutton.revportrait=Umgekehrtes &Hochformat
 radiobutton.tumble=&Kalenderdruck
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
 tab.appearance=&Darstellung
 tab.general=&Allgemein
-tab.pagesetup=&Seite einrichten
+tab.pagesetup=Seite &einrichten
 #
 error.pagerange=Ung\u00FCltiger Seitenbereich. Geben Sie die Werte erneut ein (Beispiel: 1-3,5,7-10)
 error.destination=Ung\u00FCltiger Dateiname. Wiederholen Sie den Vorgang
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=Kassette
 Form-Source=Formularquelle
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=Jobs annehmen
 not-accepting-jobs=Jobs nicht annehmen
-
--- a/jdk/src/share/classes/sun/print/resources/serviceui_es.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_es.properties	Wed May 08 11:22:25 2013 +0100
@@ -17,7 +17,7 @@
 button.properties=P&ropiedades...
 #
 checkbox.collate=Inter&calar
-checkbox.jobsheets=P\u00E1gina d&e R\u00F3tulo
+checkbox.jobsheets=P\u00E1gina de R\u00F3tu&lo
 checkbox.printtofile=I&mprimir en Archivo
 #
 dialog.printtitle=Imprimir
@@ -29,19 +29,19 @@
 dialog.writeerror=No se puede escribir en el archivo:
 #
 label.info=Informaci\u00F3n:
-label.jobname=Nombre del &Trabajo:
-label.numcopies=N\u00FAmer&o de Copias:
-label.priority=Pr&ioridad:
+label.jobname=&Nombre del Trabajo:
+label.numcopies=N\u00FAmero de C&opias:
+label.priority=Prior&idad:
 label.psname=&Nombre:
 label.pstype=Tipo:
 label.rangeto=A
-label.size=&Tama\u00F1o:
-label.source=Origen:
+label.size=Tama&\u00F1o:
+label.source=Ori&gen:
 label.status=Estado:
-label.username=U&suario:
+label.username=&Usuario:
 label.millimetres=(mm)
 label.inches=(pulg.)
-label.topmargin=superior
+label.topmargin=&superior
 label.bottommargin=in&ferior
 label.leftmargin=iz&quierdo
 label.rightmargin=d&erecho
@@ -49,16 +49,16 @@
 radiobutton.color=&Color
 radiobutton.draftq=Bo&rrador
 radiobutton.duplex=&D\u00FAplex
-radiobutton.highq=A&lta
+radiobutton.highq=&Alta
 radiobutton.landscape=Hori&zontal
 radiobutton.monochrome=&Monocromo
 radiobutton.normalq=&Normal
-radiobutton.oneside=&Una Cara
+radiobutton.oneside=Una Ca&ra
 radiobutton.portrait=&Vertical
 radiobutton.rangeall=&Todo
 radiobutton.rangepages=P\u00E1&ginas
 radiobutton.revlandscape=&Horizontal Inverso
-radiobutton.revportrait=Ve&rtical Inverso
+radiobutton.revportrait=Vertical Inver&so
 radiobutton.tumble=Cam&bio de Cara
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
@@ -70,7 +70,7 @@
 error.destination=Nombre de archivo no v\u00E1lido; int\u00E9ntelo de nuevo
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=Casete
 Form-Source=Origen de Formulario
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=Aceptando trabajos
 not-accepting-jobs=No aceptando trabajos
-
--- a/jdk/src/share/classes/sun/print/resources/serviceui_fr.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_fr.properties	Wed May 08 11:22:25 2013 +0100
@@ -30,7 +30,7 @@
 #
 label.info=Infos :
 label.jobname=Nom du &travail :
-label.numcopies=N&ombre de copies :
+label.numcopies=Nombre de c&opies :
 label.priority=P&riorit\u00E9 :
 label.psname=&Nom :
 label.pstype=Type :
@@ -38,7 +38,7 @@
 label.size=Tai&lle :
 label.source=Sour&ce :
 label.status=Statut :
-label.username=N&om utilisateur :
+label.username=Nom &utilisateur :
 label.millimetres=(mm)
 label.inches=(po)
 label.topmargin=&haut
@@ -46,11 +46,11 @@
 label.leftmargin=&gauche
 label.rightmargin=&droite
 #
-radiobutton.color=&Couleur
+radiobutton.color=Coule&ur
 radiobutton.draftq=Broui&llon
 radiobutton.duplex=&Duplex
 radiobutton.highq=Ma&x.
-radiobutton.landscape=Pa&ysage
+radiobutton.landscape=Pay&sage
 radiobutton.monochrome=&Monochrome
 radiobutton.normalq=&Normal
 radiobutton.oneside=&Un c\u00F4t\u00E9
@@ -58,7 +58,7 @@
 radiobutton.rangeall=&Tout
 radiobutton.rangepages=Pag&es
 radiobutton.revlandscape=Paysage i&nvers\u00E9
-radiobutton.revportrait=Portra&it invers\u00E9
+radiobutton.revportrait=Portrait &invers\u00E9
 radiobutton.tumble=&T\u00EAte-b\u00EAche
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
@@ -70,7 +70,7 @@
 error.destination=Nom de fichier non valide ; recommencez
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=Cassette
 Form-Source=Source du formulaire
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=Acceptation des t\u00E2ches
 not-accepting-jobs=Refus des t\u00E2ches
-
--- a/jdk/src/share/classes/sun/print/resources/serviceui_it.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_it.properties	Wed May 08 11:22:25 2013 +0100
@@ -17,7 +17,7 @@
 button.properties=P&ropriet\u00E0...
 #
 checkbox.collate=Fascico&la
-checkbox.jobsheets=&Pagina banner
+checkbox.jobsheets=Pagina &banner
 checkbox.printtofile=Stampa su &file
 #
 dialog.printtitle=Stampa
@@ -30,8 +30,8 @@
 #
 label.info=Informazioni:
 label.jobname=Nome &job:
-label.numcopies=Numer&o di copie:
-label.priority=Pr&iorit\u00E0:
+label.numcopies=Numero di c&opie:
+label.priority=P&riorit\u00E0:
 label.psname=&Nome:
 label.pstype=Tipo:
 label.rangeto=A
@@ -51,7 +51,7 @@
 radiobutton.duplex=F&ronte retro
 radiobutton.highq=A&lta
 radiobutton.landscape=Orizzonta&le
-radiobutton.monochrome=&Monocromatico
+radiobutton.monochrome=Monocrom&atico
 radiobutton.normalq=&Normale
 radiobutton.oneside=Un lat&o
 radiobutton.portrait=&Verticale
@@ -70,7 +70,7 @@
 error.destination=Nome file non valido; riprovare
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=Cassetta
 Form-Source=Origine modulo
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=Accettazione job
 not-accepting-jobs=Rifiuto job
-
--- a/jdk/src/share/classes/sun/print/resources/serviceui_ja.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_ja.properties	Wed May 08 11:22:25 2013 +0100
@@ -70,7 +70,7 @@
 error.destination=\u7121\u52B9\u306A\u30D5\u30A1\u30A4\u30EB\u540D\u3002\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=\u30AB\u30BB\u30C3\u30C8
 Form-Source=\u30D5\u30A9\u30FC\u30E0\u30FB\u30BD\u30FC\u30B9
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=\u30B8\u30E7\u30D6\u3092\u53D7\u3051\u4ED8\u3051\u3066\u3044\u307E\u3059
 not-accepting-jobs=\u30B8\u30E7\u30D6\u3092\u53D7\u3051\u4ED8\u3051\u307E\u305B\u3093
-
--- a/jdk/src/share/classes/sun/print/resources/serviceui_ko.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_ko.properties	Wed May 08 11:22:25 2013 +0100
@@ -70,7 +70,7 @@
 error.destination=\uBD80\uC801\uD569\uD55C \uD30C\uC77C \uC774\uB984: \uB2E4\uC2DC \uC2DC\uB3C4\uD558\uC2ED\uC2DC\uC624.
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=\uCE74\uC138\uD2B8
 Form-Source=\uC591\uC2DD \uC18C\uC2A4
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=\uC791\uC5C5 \uC2B9\uC778
 not-accepting-jobs=\uC791\uC5C5 \uC2B9\uC778 \uC548\uD568
-
--- a/jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties	Wed May 08 11:22:25 2013 +0100
@@ -14,9 +14,9 @@
 button.cancel=Cancelar
 button.ok=OK
 button.print=Imprimir
-button.properties=Proprie&dades...
+button.properties=P&ropriedades...
 #
-checkbox.collate=Ag&rupar
+checkbox.collate=&Agrupar
 checkbox.jobsheets=P\u00E1gina com &Banner
 checkbox.printtofile=&Imprimir em Arquivo
 #
@@ -31,7 +31,7 @@
 label.info=Informa\u00E7\u00F5es:
 label.jobname=Nome do &Job:
 label.numcopies=N\u00FAmer&o de c\u00F3pias:
-label.priority=&Prioridade:
+label.priority=P&rioridade:
 label.psname=&Nome:
 label.pstype=Tipo:
 label.rangeto=At\u00E9
@@ -44,33 +44,33 @@
 label.topmargin=&superior
 label.bottommargin=&inferior
 label.leftmargin=es&querda:
-label.rightmargin=&direita
+label.rightmargin=di&reita
 #
 radiobutton.color=C&or
 radiobutton.draftq=&Rascunho
 radiobutton.duplex=&Duplex
-radiobutton.highq=Al&ta
+radiobutton.highq=&Alta
 radiobutton.landscape=&Paisagem
 radiobutton.monochrome=&Monocrom\u00E1tico
 radiobutton.normalq=&Normal
-radiobutton.oneside=Um &Lado
+radiobutton.oneside=Um Lad&o
 radiobutton.portrait=&Retrato
 radiobutton.rangeall=T&udo
 radiobutton.rangepages=&P\u00E1ginas
 radiobutton.revlandscape=Paisagem I&nvertida
-radiobutton.revportrait=R&etrato Invertido
+radiobutton.revportrait=Retrato &Invertido
 radiobutton.tumble=&Virar
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
 tab.appearance=&Apar\u00EAncia
 tab.general=&Geral
-tab.pagesetup=&Configura\u00E7\u00E3o de P\u00E1gina
+tab.pagesetup=Configura\u00E7\u00E3o de &P\u00E1gina
 #
 error.pagerange=Faixa de p\u00E1ginas inv\u00E1lida; insira novamente os valores (por exemplo, 1-3,5,7-10)
 error.destination=Nome de arquivo inv\u00E1lido; tente novamente
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=Cassete
 Form-Source=Origem do Formul\u00E1rio
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=Aceitando jobs
 not-accepting-jobs=N\u00E3o aceitando jobs
-
--- a/jdk/src/share/classes/sun/print/resources/serviceui_sv.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_sv.properties	Wed May 08 11:22:25 2013 +0100
@@ -14,11 +14,11 @@
 button.cancel=Avbryt
 button.ok=OK
 button.print=Skriv ut
-button.properties=Egenskape&r...
+button.properties=&Egenskaper...
 #
-checkbox.collate=Sor&tera
-checkbox.jobsheets=F\u00F6&rs\u00E4ttsblad
-checkbox.printtofile=S&kriv ut till fil
+checkbox.collate=&Sortera
+checkbox.jobsheets=&F\u00F6rs\u00E4ttsblad
+checkbox.printtofile=Skriv ut till &fil
 #
 dialog.printtitle=Skriv ut
 dialog.pstitle=Utskriftsformat
@@ -35,42 +35,42 @@
 label.psname=&Namn:
 label.pstype=Typ:
 label.rangeto=Till
-label.size=St&orlek:
-label.source=&K\u00E4lla:
+label.size=Stor&lek:
+label.source=K\u00E4l&la:
 label.status=Status:
 label.username=A&nv\u00E4ndarnamn:
 label.millimetres=(mm)
 label.inches=(tum)
-label.topmargin=\u00F6ve&rkant
+label.topmargin=&\u00F6verkant
 label.bottommargin=&nederkant
-label.leftmargin=&v\u00E4nster
+label.leftmargin=v&\u00E4nster
 label.rightmargin=&h\u00F6ger
 #
-radiobutton.color=F\u00E4r&g
-radiobutton.draftq=Ut&kast
+radiobutton.color=&F\u00E4rg
+radiobutton.draftq=Utka&st
 radiobutton.duplex=&Dubbelsidig
 radiobutton.highq=&H\u00F6g
 radiobutton.landscape=&Liggande
 radiobutton.monochrome=&Monokrom
-radiobutton.normalq=N&ormal
+radiobutton.normalq=&Normal
 radiobutton.oneside=&Ensidig
-radiobutton.portrait=St\u00E5en&de
+radiobutton.portrait=&St\u00E5ende
 radiobutton.rangeall=A&lla
-radiobutton.rangepages=Si&dor
+radiobutton.rangepages=Sid&or
 radiobutton.revlandscape=Omv\u00E4nt li&ggande
-radiobutton.revportrait=O&mv\u00E4nt st\u00E5ende
+radiobutton.revportrait=Omv\u00E4nt st\u00E5en&de
 radiobutton.tumble=&V\u00E4nd
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
 tab.appearance=&Format
 tab.general=&Allm\u00E4nt
-tab.pagesetup=Ut&skriftsformat
+tab.pagesetup=Utskrifts&format
 #
 error.pagerange=Ogiltigt sidintervall. Skriv in v\u00E4rdena igen (t ex 1-3,5,7-10)
 error.destination=Ogiltigt filnamn. F\u00F6rs\u00F6k igen.
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=Kassett
 Form-Source=Formul\u00E4rk\u00E4lla
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=Accepterar jobb
 not-accepting-jobs=Accepterar inte jobb
-
--- a/jdk/src/share/classes/sun/print/resources/serviceui_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -28,16 +28,16 @@
 dialog.noprintermsg=\u627E\u4E0D\u5230\u6253\u5370\u670D\u52A1\u3002
 dialog.writeerror=\u65E0\u6CD5\u5199\u5165\u6587\u4EF6:
 #
-label.info=\u4FE1\u606F:
+label.info=\u4FE1\u606F: 
 label.jobname=\u4F5C\u4E1A\u540D(&J):
 label.numcopies=\u6253\u5370\u4EFD\u6570(&O):
 label.priority=\u4F18\u5148\u7EA7(&R):
 label.psname=\u540D\u79F0(&N):
-label.pstype=\u7C7B\u578B:
+label.pstype=\u7C7B\u578B: 
 label.rangeto=\u81F3
 label.size=\u5927\u5C0F(&Z):
 label.source=\u6765\u6E90(&C):
-label.status=\u72B6\u6001:
+label.status=\u72B6\u6001: 
 label.username=\u7528\u6237\u540D(&U):
 label.millimetres=(\u6BEB\u7C73)
 label.inches=(\u82F1\u5BF8)
@@ -70,7 +70,7 @@
 error.destination=\u65E0\u6548\u7684\u6587\u4EF6\u540D; \u8BF7\u91CD\u8BD5
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=\u7EB8\u76D2
 Form-Source=\u8868\u683C\u6765\u6E90
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=\u63A5\u53D7\u4F5C\u4E1A
 not-accepting-jobs=\u4E0D\u63A5\u53D7\u4F5C\u4E1A
-
--- a/jdk/src/share/classes/sun/print/resources/serviceui_zh_TW.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/print/resources/serviceui_zh_TW.properties	Wed May 08 11:22:25 2013 +0100
@@ -28,16 +28,16 @@
 dialog.noprintermsg=\u627E\u4E0D\u5230\u5217\u5370\u670D\u52D9\u3002
 dialog.writeerror=\u7121\u6CD5\u5BEB\u5165\u81F3\u6A94\u6848:
 #
-label.info=\u8CC7\u8A0A:
+label.info=\u8CC7\u8A0A: 
 label.jobname=\u5DE5\u4F5C\u540D\u7A31(&J):
-label.numcopies=\u5217\u5370\u4EFD\u6578(&O):
+label.numcopies=\u5217\u5370\u4EFD\u6578(&O): 
 label.priority=\u512A\u5148\u6B0A(&R):
 label.psname=\u540D\u7A31(&N):
-label.pstype=\u985E\u578B:
+label.pstype=\u985E\u578B: 
 label.rangeto=\u81F3
 label.size=\u5927\u5C0F(&Z):
-label.source=\u4F86\u6E90(&C):
-label.status=\u72C0\u614B:
+label.source=\u4F86\u6E90(&C): 
+label.status=\u72C0\u614B: 
 label.username=\u4F7F\u7528\u8005\u540D\u7A31(&U):
 label.millimetres=(mm)
 label.inches=(in)
@@ -70,7 +70,7 @@
 error.destination=\u7121\u6548\u7684\u6A94\u540D; \u8ACB\u518D\u8A66\u4E00\u6B21
 #
 # The following keys match the Strings returned by MediaSizeName.toString()
-# (in some cases the space character is replaced by '-' and the pound
+# (in some cases the space character is replaced by '-' and the pound 
 # character is replaced with 'n')
 #
 iso-4a0=4A0 (ISO/DIN & JIS)
@@ -175,9 +175,8 @@
 Cassette=\u5361\u5F0F\u78C1\u5E36\u6A5F
 Form-Source=\u8868\u683C\u4F86\u6E90
 #
-# The following keys match the Strings returned by
+# The following keys match the Strings returned by 
 # PrinterIsAcceptingJobs.toString()
 #
 accepting-jobs=\u63A5\u53D7\u7684\u5DE5\u4F5C
 not-accepting-jobs=\u4E0D\u63A5\u53D7\u7684\u5DE5\u4F5C
-
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,5 +24,5 @@
 # questions.
 #
 
-rmiregistry.usage=Utilizzo: {0} <opzioni> <porta>\n\ndove <opzioni> include:\n  -J<flag fase di esecuzione> Passa l''argomento all''interprete java
+rmiregistry.usage=Uso: {0} <opzioni> <porta>\n\ndove <opzioni> include:\n  -J<flag fase di esecuzione> Passa l''argomento all''interprete java
 rmiregistry.port.badnumber=l''argomento della porta, {0}, non \u00E8 un numero.
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_de.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_de.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_es.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_es.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_fr.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_fr.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_it.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_it.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -75,7 +75,7 @@
 
 # "rmid", "-port", "-log", "-stop", "-C" and "-J" should not be translated,
 # because they are syntax
-rmid.usage=Utilizzo: {0} <opzioni>\n\ndove <opzioni> include:\n  -port <porta>       Specifica la porta usata da rmid\n  -log <directory>    Specifica la directory in cui rmid scrive il log\n  -stop              Arresta l''invocazione corrente di rmid (per la porta specificata)\n  -C<flag fase di esecuzione>    Passa l''argomento a ciascun processo figlio (gruppo di attivazione)\n  -J<flag fase di esecuzione>    Passa l''argomento all''interprete java\n
+rmid.usage=Uso: {0} <opzioni>\n\ndove <opzioni> include:\n  -port <porta>       Specifica la porta usata da rmid\n  -log <directory>    Specifica la directory in cui rmid scrive il log\n  -stop              Arresta l''invocazione corrente di rmid (per la porta specificata)\n  -C<flag fase di esecuzione>    Passa l''argomento a ciascun processo figlio (gruppo di attivazione)\n  -J<flag fase di esecuzione>    Passa l''argomento all''interprete java\n
 # This means "The currently running activation daemon has been shut down,
 # and is about to exit".
 rmid.daemon.shutdown=daemon di attivazione terminato
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_ja.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_ja.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_ko.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_ko.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_sv.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_sv.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/security/ssl/KerberosClientKeyExchange.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/security/ssl/KerberosClientKeyExchange.java	Wed May 08 11:22:25 2013 +0100
@@ -86,10 +86,10 @@
 
     public KerberosClientKeyExchange(ProtocolVersion protocolVersion,
         ProtocolVersion clientVersion, SecureRandom rand,
-        HandshakeInStream input, SecretKey[] serverKeys) throws IOException {
+        HandshakeInStream input, AccessControlContext acc, Object serverKeys) throws IOException {
 
         if (impl != null) {
-            init(protocolVersion, clientVersion, rand, input, serverKeys);
+            init(protocolVersion, clientVersion, rand, input, acc, serverKeys);
         } else {
             throw new IllegalStateException("Kerberos is unavailable");
         }
@@ -126,10 +126,10 @@
 
     public void init(ProtocolVersion protocolVersion,
         ProtocolVersion clientVersion, SecureRandom rand,
-        HandshakeInStream input, SecretKey[] serverKeys) throws IOException {
+        HandshakeInStream input, AccessControlContext acc, Object ServiceCreds) throws IOException {
 
         if (impl != null) {
-            impl.init(protocolVersion, clientVersion, rand, input, serverKeys);
+            impl.init(protocolVersion, clientVersion, rand, input, acc, ServiceCreds);
         }
     }
 
--- a/jdk/src/share/classes/sun/security/ssl/Krb5Helper.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/security/ssl/Krb5Helper.java	Wed May 08 11:22:25 2013 +0100
@@ -94,18 +94,18 @@
     /**
      * Returns the KerberosKeys for the default server-side principal.
      */
-    public static SecretKey[] getServerKeys(AccessControlContext acc)
+    public static Object getServiceCreds(AccessControlContext acc)
             throws LoginException {
         ensureAvailable();
-        return proxy.getServerKeys(acc);
+        return proxy.getServiceCreds(acc);
     }
 
     /**
      * Returns the server-side principal name associated with the KerberosKey.
      */
-    public static String getServerPrincipalName(SecretKey kerberosKey) {
+    public static String getServerPrincipalName(Object serviceCreds) {
         ensureAvailable();
-        return proxy.getServerPrincipalName(kerberosKey);
+        return proxy.getServerPrincipalName(serviceCreds);
     }
 
     /**
@@ -124,4 +124,12 @@
         ensureAvailable();
         return proxy.getServicePermission(principalName, action);
     }
+
+    /**
+     * Determines if the Subject might contain creds for princ.
+     */
+    public static boolean isRelated(Subject subject, Principal princ) {
+        ensureAvailable();
+        return proxy.isRelated(subject, princ);
+    }
 }
--- a/jdk/src/share/classes/sun/security/ssl/Krb5Proxy.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/security/ssl/Krb5Proxy.java	Wed May 08 11:22:25 2013 +0100
@@ -50,14 +50,14 @@
 
 
     /**
-     * Returns the KerberosKeys for the default server-side principal.
+     * Returns the Kerberos ServiceCreds for the default server-side principal.
      */
-    SecretKey[] getServerKeys(AccessControlContext acc) throws LoginException;
+    Object getServiceCreds(AccessControlContext acc) throws LoginException;
 
     /**
      * Returns the server-side principal name associated with the KerberosKey.
      */
-    String getServerPrincipalName(SecretKey kerberosKey);
+    String getServerPrincipalName(Object serviceCreds);
 
     /**
      * Returns the hostname embedded in the principal name.
@@ -68,4 +68,9 @@
      * Returns a ServicePermission for the principal name and action.
      */
     Permission getServicePermission(String principalName, String action);
+
+    /**
+     * Determines if the Subject might contain creds for princ.
+     */
+    boolean isRelated(Subject subject, Principal princ);
 }
--- a/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java	Wed May 08 11:22:25 2013 +0100
@@ -62,7 +62,7 @@
     private X509Certificate[]   certs;
     private PrivateKey          privateKey;
 
-    private SecretKey[]       kerberosKeys;
+    private Object              serviceCreds;
 
     // flag to check for clientCertificateVerify message
     private boolean             needClientVerify = false;
@@ -200,7 +200,8 @@
                             clientRequestedVersion,
                             sslContext.getSecureRandom(),
                             input,
-                            kerberosKeys));
+                            this.getAccSE(),
+                            serviceCreds));
                     break;
                 case K_DHE_RSA:
                 case K_DHE_DSS:
@@ -543,18 +544,15 @@
 
                         if (subject != null) {
                             // Eliminate dependency on KerberosPrincipal
-                            Set<Principal> principals =
-                                subject.getPrincipals(Principal.class);
-                            if (!principals.contains(localPrincipal)) {
+                            if (Krb5Helper.isRelated(subject, localPrincipal)) {
+                                if (debug != null && Debug.isOn("session"))
+                                    System.out.println("Subject can" +
+                                            " provide creds for princ");
+                            } else {
                                 resumingSession = false;
-                                if (debug != null && Debug.isOn("session")) {
-                                    System.out.println("Subject identity" +
-                                                        " is not the same");
-                                }
-                            } else {
                                 if (debug != null && Debug.isOn("session"))
-                                    System.out.println("Subject identity" +
-                                                        " is same");
+                                    System.out.println("Subject cannot" +
+                                            " provide creds for princ");
                             }
                         } else {
                             resumingSession = false;
@@ -1316,49 +1314,51 @@
      * @return true if successful, false if not available or invalid
      */
     private boolean setupKerberosKeys() {
-        if (kerberosKeys != null) {
+        if (serviceCreds != null) {
             return true;
         }
         try {
             final AccessControlContext acc = getAccSE();
-            kerberosKeys = AccessController.doPrivileged(
+            serviceCreds = AccessController.doPrivileged(
                 // Eliminate dependency on KerberosKey
-                new PrivilegedExceptionAction<SecretKey[]>() {
+                new PrivilegedExceptionAction<Object>() {
                 @Override
-                public SecretKey[] run() throws Exception {
+                public Object run() throws Exception {
                     // get kerberos key for the default principal
-                    return Krb5Helper.getServerKeys(acc);
+                    return Krb5Helper.getServiceCreds(acc);
                         }});
 
             // check permission to access and use the secret key of the
             // Kerberized "host" service
-            if (kerberosKeys != null && kerberosKeys.length > 0) {
+            if (serviceCreds != null) {
                 if (debug != null && Debug.isOn("handshake")) {
-                    for (SecretKey k: kerberosKeys) {
-                        System.out.println("Using Kerberos key: " +
-                            k);
+                    System.out.println("Using Kerberos creds");
+                }
+                String serverPrincipal =
+                        Krb5Helper.getServerPrincipalName(serviceCreds);
+                if (serverPrincipal != null) {
+                    // When service is bound, we check ASAP. Otherwise,
+                    // will check after client request is received
+                    // in in Kerberos ClientKeyExchange
+                    SecurityManager sm = System.getSecurityManager();
+                    try {
+                        if (sm != null) {
+                            // Eliminate dependency on ServicePermission
+                            sm.checkPermission(Krb5Helper.getServicePermission(
+                                    serverPrincipal, "accept"), acc);
+                        }
+                    } catch (SecurityException se) {
+                        serviceCreds = null;
+                        // Do not destroy keys. Will affect Subject
+                        if (debug != null && Debug.isOn("handshake")) {
+                            System.out.println("Permission to access Kerberos"
+                                    + " secret key denied");
+                        }
+                        return false;
                     }
                 }
-
-                String serverPrincipal =
-                    Krb5Helper.getServerPrincipalName(kerberosKeys[0]);
-                SecurityManager sm = System.getSecurityManager();
-                try {
-                   if (sm != null) {
-                      // Eliminate dependency on ServicePermission
-                      sm.checkPermission(Krb5Helper.getServicePermission(
-                          serverPrincipal, "accept"), acc);
-                   }
-                } catch (SecurityException se) {
-                   kerberosKeys = null;
-                   // %%% destroy keys? or will that affect Subject?
-                   if (debug != null && Debug.isOn("handshake"))
-                      System.out.println("Permission to access Kerberos"
-                                + " secret key denied");
-                   return false;
-                }
             }
-            return (kerberosKeys != null && kerberosKeys.length > 0);
+            return serviceCreds != null;
         } catch (PrivilegedActionException e) {
             // Likely exception here is LoginExceptin
             if (debug != null && Debug.isOn("handshake")) {
--- a/jdk/src/share/classes/sun/security/ssl/krb5/KerberosClientKeyExchangeImpl.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/security/ssl/krb5/KerberosClientKeyExchangeImpl.java	Wed May 08 11:22:25 2013 +0100
@@ -33,8 +33,8 @@
 import java.security.PrivilegedActionException;
 import java.security.SecureRandom;
 import java.net.InetAddress;
+import java.security.PrivilegedAction;
 
-import javax.crypto.SecretKey;
 import javax.security.auth.kerberos.KerberosTicket;
 import javax.security.auth.kerberos.KerberosKey;
 import javax.security.auth.kerberos.KerberosPrincipal;
@@ -44,18 +44,19 @@
 import sun.security.krb5.EncryptionKey;
 import sun.security.krb5.EncryptedData;
 import sun.security.krb5.PrincipalName;
-import sun.security.krb5.Realm;
 import sun.security.krb5.internal.Ticket;
 import sun.security.krb5.internal.EncTicketPart;
 import sun.security.krb5.internal.crypto.KeyUsage;
 
 import sun.security.jgss.krb5.Krb5Util;
+import sun.security.jgss.krb5.ServiceCreds;
 import sun.security.krb5.KrbException;
 import sun.security.krb5.internal.Krb5;
 
 import sun.security.ssl.Debug;
 import sun.security.ssl.HandshakeInStream;
 import sun.security.ssl.HandshakeOutStream;
+import sun.security.ssl.Krb5Helper;
 import sun.security.ssl.ProtocolVersion;
 
 /**
@@ -138,16 +139,15 @@
      * @param rand random number generator used for generating random
      *          premaster secret if ticket and/or premaster verification fails
      * @param input inputstream from which to get ASN.1-encoded KerberosWrapper
-     * @param serverKey server's master secret key
+     * @param acc the AccessControlContext of the handshaker
+     * @param serviceCreds server's creds
      */
     @Override
     public void init(ProtocolVersion protocolVersion,
         ProtocolVersion clientVersion,
-        SecureRandom rand, HandshakeInStream input, SecretKey[] secretKeys)
+        SecureRandom rand, HandshakeInStream input, AccessControlContext acc, Object serviceCreds)
         throws IOException {
 
-        KerberosKey[] serverKeys = (KerberosKey[])secretKeys;
-
         // Read ticket
         encodedTicket = input.getBytes16();
 
@@ -163,9 +163,42 @@
 
             EncryptedData encPart = t.encPart;
             PrincipalName ticketSname = t.sname;
-            Realm ticketRealm = t.sname.getRealm();
+
+            final ServiceCreds creds = (ServiceCreds)serviceCreds;
+            final KerberosPrincipal princ =
+                    new KerberosPrincipal(ticketSname.toString());
 
-            String serverPrincipal = serverKeys[0].getPrincipal().getName();
+            // For bound service, permission already checked at setup
+            if (creds.getName() == null) {
+                SecurityManager sm = System.getSecurityManager();
+                try {
+                    if (sm != null) {
+                        // Eliminate dependency on ServicePermission
+                        sm.checkPermission(Krb5Helper.getServicePermission(
+                                ticketSname.toString(), "accept"), acc);
+                    }
+                } catch (SecurityException se) {
+                    serviceCreds = null;
+                    // Do not destroy keys. Will affect Subject
+                    if (debug != null && Debug.isOn("handshake")) {
+                        System.out.println("Permission to access Kerberos"
+                                + " secret key denied");
+                    }
+                    throw new IOException("Kerberos service not allowedy");
+                }
+            }
+            KerberosKey[] serverKeys = AccessController.doPrivileged(
+                    new PrivilegedAction<KerberosKey[]>() {
+                        @Override
+                        public KerberosKey[] run() {
+                            return creds.getKKeys(princ);
+                        }
+                    });
+            if (serverKeys.length == 0) {
+                throw new IOException("Found no key for " + princ +
+                        (creds.getName() == null ? "" :
+                        (", this keytab is for " + creds.getName() + " only")));
+            }
 
             /*
              * permission to access and use the secret key of the Kerberized
@@ -174,17 +207,6 @@
              * before promising the client
              */
 
-            // Check that ticket Sname matches serverPrincipal
-            String ticketPrinc = ticketSname.toString();
-            if (!ticketPrinc.equals(serverPrincipal)) {
-                if (debug != null && Debug.isOn("handshake"))
-                   System.out.println("Service principal in Ticket does not"
-                        + " match associated principal in KerberosKey");
-                throw new IOException("Server principal is " +
-                    serverPrincipal + " but ticket is for " +
-                    ticketPrinc);
-            }
-
             // See if we have the right key to decrypt the ticket to get
             // the session key.
             int encPartKeyType = encPart.getEType();
@@ -198,9 +220,8 @@
             }
             if (dkey == null) {
                 // %%% Should print string repr of etype
-                throw new IOException(
-        "Cannot find key of appropriate type to decrypt ticket - need etype " +
-                                   encPartKeyType);
+                throw new IOException("Cannot find key of appropriate type" +
+                        " to decrypt ticket - need etype " + encPartKeyType);
             }
 
             EncryptionKey secretKey = new EncryptionKey(
@@ -222,7 +243,7 @@
             sessionKey = encTicketPart.key;
 
             if (debug != null && Debug.isOn("handshake")) {
-                System.out.println("server principal: " + serverPrincipal);
+                System.out.println("server principal: " + ticketSname);
                 System.out.println("cname: " + encTicketPart.cname.toString());
             }
         } catch (IOException e) {
@@ -382,12 +403,22 @@
             KerberosKey[] keys) throws KrbException {
         int ktype;
         boolean etypeFound = false;
+
+        // When no matched kvno is found, returns tke key of the same
+        // etype with the highest kvno
+        int kvno_found = 0;
+        KerberosKey key_found = null;
+
         for (int i = 0; i < keys.length; i++) {
             ktype = keys[i].getKeyType();
             if (etype == ktype) {
+                int kv = keys[i].getVersionNumber();
                 etypeFound = true;
-                if (versionMatches(version, keys[i].getVersionNumber())) {
+                if (versionMatches(version, kv)) {
                     return keys[i];
+                } else if (kv > kvno_found) {
+                    key_found = keys[i];
+                    kvno_found = kv;
                 }
             }
         }
@@ -399,18 +430,25 @@
                 ktype = keys[i].getKeyType();
                 if (ktype == EncryptedData.ETYPE_DES_CBC_CRC ||
                         ktype == EncryptedData.ETYPE_DES_CBC_MD5) {
+                    int kv = keys[i].getVersionNumber();
                     etypeFound = true;
-                    if (versionMatches(version, keys[i].getVersionNumber())) {
+                    if (versionMatches(version, kv)) {
                         return new KerberosKey(keys[i].getPrincipal(),
                             keys[i].getEncoded(),
                             etype,
-                            keys[i].getVersionNumber());
+                            kv);
+                    } else if (kv > kvno_found) {
+                        key_found = new KerberosKey(keys[i].getPrincipal(),
+                                keys[i].getEncoded(),
+                                etype,
+                                kv);
+                        kvno_found = kv;
                     }
                 }
             }
         }
         if (etypeFound) {
-            throw new KrbException(Krb5.KRB_AP_ERR_BADKEYVER);
+            return key_found;
         }
         return null;
     }
--- a/jdk/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java	Wed May 08 11:22:25 2013 +0100
@@ -28,9 +28,11 @@
 import java.security.AccessControlContext;
 import java.security.Permission;
 import java.security.Principal;
+import java.util.Set;
 import javax.crypto.SecretKey;
 import javax.security.auth.Subject;
 import javax.security.auth.kerberos.KerberosKey;
+import javax.security.auth.kerberos.KeyTab;
 import javax.security.auth.kerberos.ServicePermission;
 import javax.security.auth.login.LoginException;
 
@@ -61,17 +63,16 @@
     }
 
     @Override
-    public SecretKey[] getServerKeys(AccessControlContext acc)
+    public Object getServiceCreds(AccessControlContext acc)
             throws LoginException {
         ServiceCreds serviceCreds =
             Krb5Util.getServiceCreds(GSSCaller.CALLER_SSL_SERVER, null, acc);
-        return serviceCreds != null ? serviceCreds.getKKeys() :
-                                        new KerberosKey[0];
+        return serviceCreds;
     }
 
     @Override
-    public String getServerPrincipalName(SecretKey kerberosKey) {
-        return ((KerberosKey)kerberosKey).getPrincipal().getName();
+    public String getServerPrincipalName(Object serviceCreds) {
+        return ((ServiceCreds)serviceCreds).getName();
     }
 
     @Override
@@ -100,4 +101,21 @@
             String action) {
         return new ServicePermission(principalName, action);
     }
+
+    @Override
+    public boolean isRelated(Subject subject, Principal princ) {
+        if (princ == null) return false;
+        Set<Principal> principals =
+                subject.getPrincipals(Principal.class);
+        if (principals.contains(princ)) {
+            // bound to this principal
+            return true;
+        }
+        for (KeyTab pc: subject.getPrivateCredentials(KeyTab.class)) {
+            if (!pc.isBound()) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
--- a/jdk/src/share/classes/sun/security/tools/jarsigner/Resources_ja.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/security/tools/jarsigner/Resources_ja.java	Wed May 08 11:22:25 2013 +0100
@@ -73,7 +73,7 @@
         {".digestalg.algorithm.name.of.digest.algorithm",
                 "[-digestalg <algorithm>]  \u30C0\u30A4\u30B8\u30A7\u30B9\u30C8\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306E\u540D\u524D"},
         {".sigalg.algorithm.name.of.signature.algorithm",
-                "[-sigalg <algorithm>]    \u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306E\u540D\u524D"},
+                "[-sigalg <algorithm>]    \u30B7\u30B0\u30CD\u30C1\u30E3\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306E\u540D\u524D"},
         {".verify.verify.a.signed.JAR.file",
                 "[-verify]            \u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u8A3C"},
         {".verbose.suboptions.verbose.output.when.signing.verifying.",
@@ -91,7 +91,7 @@
         {".altsignerpath.pathlist.location.of.an.alternative.signing.mechanism",
                 "[-altsignerpath <pathlist>]\u4EE3\u66FF\u7F72\u540D\u30E1\u30AB\u30CB\u30BA\u30E0\u306E\u4F4D\u7F6E"},
         {".internalsf.include.the.SF.file.inside.the.signature.block",
-                "[-internalsf]         \u7F72\u540D\u30D6\u30ED\u30C3\u30AF\u306B.SF\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3081\u308B"},
+                "[-internalsf]         \u30B7\u30B0\u30CD\u30C1\u30E3\u30FB\u30D6\u30ED\u30C3\u30AF\u306B.SF\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3081\u308B"},
         {".sectionsonly.don.t.compute.hash.of.entire.manifest",
                 "[-sectionsonly]        \u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u5168\u4F53\u306E\u30CF\u30C3\u30B7\u30E5\u306F\u8A08\u7B97\u3057\u306A\u3044"},
         {".protected.keystore.has.protected.authentication.path",
@@ -119,7 +119,7 @@
         {"i", "i"},
         {".and.d.more.", "(\u4ED6\u306B\u3082%d\u500B)"},
         {".s.signature.was.verified.",
-                "  s=\u7F72\u540D\u304C\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F "},
+                "  s=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F "},
         {".m.entry.is.listed.in.manifest",
                 "  m=\u30A8\u30F3\u30C8\u30EA\u304C\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u5185\u306B\u30EA\u30B9\u30C8\u3055\u308C\u307E\u3059"},
         {".k.at.least.one.certificate.was.found.in.keystore",
@@ -129,14 +129,14 @@
         {".X.not.signed.by.specified.alias.es.",
                 "  X =\u6307\u5B9A\u3057\u305F\u5225\u540D\u3067\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u305B\u3093"},
         {"no.manifest.", "\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u306F\u5B58\u5728\u3057\u307E\u305B\u3093\u3002"},
-        {".Signature.related.entries.","(\u7F72\u540D\u95A2\u9023\u30A8\u30F3\u30C8\u30EA)"},
+        {".Signature.related.entries.","(\u30B7\u30B0\u30CD\u30C1\u30E3\u95A2\u9023\u30A8\u30F3\u30C8\u30EA)"},
         {".Unsigned.entries.", "(\u672A\u7F72\u540D\u306E\u30A8\u30F3\u30C8\u30EA)"},
         {"jar.is.unsigned.signatures.missing.or.not.parsable.",
-                "jar\u306F\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002(\u7F72\u540D\u304C\u898B\u3064\u304B\u3089\u306A\u3044\u304B\u3001\u69CB\u6587\u89E3\u6790\u3067\u304D\u307E\u305B\u3093)"},
+                "jar\u306F\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002(\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u898B\u3064\u304B\u3089\u306A\u3044\u304B\u3001\u69CB\u6587\u89E3\u6790\u3067\u304D\u307E\u305B\u3093)"},
         {"jar.verified.", "jar\u304C\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F\u3002"},
         {"jarsigner.", "jarsigner: "},
         {"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.",
-                "\u7F72\u540D\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u306B\u4F7F\u7528\u3067\u304D\u308B\u6587\u5B57\u306F\u3001A-Z\u30010-9\u3001_\u3001- \u306E\u307F\u3067\u3059\u3002"},
+                "\u30B7\u30B0\u30CD\u30C1\u30E3\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u306B\u4F7F\u7528\u3067\u304D\u308B\u6587\u5B57\u306F\u3001A-Z\u30010-9\u3001_\u3001- \u306E\u307F\u3067\u3059\u3002"},
         {"unable.to.open.jar.file.", "\u6B21\u306Ejar\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093: "},
         {"unable.to.create.", "\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093: "},
         {".adding.", "   \u8FFD\u52A0\u4E2D: "},
@@ -177,7 +177,7 @@
         {"certificate.will.expire.on", "\u8A3C\u660E\u66F8\u306F{0}\u306B\u5931\u52B9\u3057\u307E\u3059"},
         {".CertPath.not.validated.", "[CertPath\u304C\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093: "},
         {"requesting.a.signature.timestamp",
-                "\u7F72\u540D\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306E\u30EA\u30AF\u30A8\u30B9\u30C8"},
+                "\u30B7\u30B0\u30CD\u30C1\u30E3\u30FB\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306E\u30EA\u30AF\u30A8\u30B9\u30C8"},
         {"TSA.location.", "TSA\u306E\u5834\u6240: "},
         {"TSA.certificate.", "TSA\u8A3C\u660E\u66F8: "},
         {"no.response.from.the.Timestamping.Authority.",
--- a/jdk/src/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java	Wed May 08 11:22:25 2013 +0100
@@ -53,9 +53,9 @@
         {"If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified",
                  "\u5982\u679C\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -storepass \u548C -keypass"},
         {"Usage.jarsigner.options.jar.file.alias",
-                "\u7528\u6CD5: jarsigner [\u9009\u9879] jar\u6587\u4EF6 \u522B\u540D"},
+                "\u7528\u6CD5: jarsigner [\u9009\u9879] jar \u6587\u4EF6\u522B\u540D"},
         {".jarsigner.verify.options.jar.file.alias.",
-                "       jarsigner -verify [\u9009\u9879] jar\u6587\u4EF6 [\u522B\u540D...]"},
+                "       jarsigner -verify [options] jar-file [alias...]"},
         {".keystore.url.keystore.location",
                 "[-keystore <url>]           \u5BC6\u94A5\u5E93\u4F4D\u7F6E"},
         {".storepass.password.password.for.keystore.integrity",
@@ -65,7 +65,7 @@
         {".keypass.password.password.for.private.key.if.different.",
                 "[-keypass <\u53E3\u4EE4>]           \u79C1\u6709\u5BC6\u94A5\u7684\u53E3\u4EE4 (\u5982\u679C\u4E0D\u540C)"},
         {".certchain.file.name.of.alternative.certchain.file",
-                "[-certchain <\u6587\u4EF6>]         \u66FF\u4EE3\u8BC1\u4E66\u94FE\u6587\u4EF6\u7684\u540D\u79F0"},
+                "[-certchain <file>]         \u66FF\u4EE3 certchain \u6587\u4EF6\u7684\u540D\u79F0"},
         {".sigfile.file.name.of.SF.DSA.file",
                 "[-sigfile <\u6587\u4EF6>]           .SF/.DSA \u6587\u4EF6\u7684\u540D\u79F0"},
         {".signedjar.file.name.of.signed.JAR.file",
@@ -77,7 +77,7 @@
         {".verify.verify.a.signed.JAR.file",
                 "[-verify]                   \u9A8C\u8BC1\u5DF2\u7B7E\u540D\u7684 JAR \u6587\u4EF6"},
         {".verbose.suboptions.verbose.output.when.signing.verifying.",
-                "[-verbose[:\u5B50\u9009\u9879]]     \u7B7E\u540D/\u9A8C\u8BC1\u65F6\u8F93\u51FA\u8BE6\u7EC6\u4FE1\u606F\u3002"},
+                "[-verbose[:suboptions]]     \u7B7E\u540D/\u9A8C\u8BC1\u65F6\u8F93\u51FA\u8BE6\u7EC6\u4FE1\u606F\u3002"},
         {".suboptions.can.be.all.grouped.or.summary",
                 "                            \u5B50\u9009\u9879\u53EF\u4EE5\u662F all, grouped \u6216 summary"},
         {".certs.display.certificates.when.verbose.and.verifying",
@@ -106,7 +106,7 @@
                 "[-strict]                   \u5C06\u8B66\u544A\u89C6\u4E3A\u9519\u8BEF"},
         {"Option.lacks.argument", "\u9009\u9879\u7F3A\u5C11\u53C2\u6570"},
         {"Please.type.jarsigner.help.for.usage", "\u8BF7\u952E\u5165 jarsigner -help \u4EE5\u4E86\u89E3\u7528\u6CD5"},
-        {"Please.specify.jarfile.name", "\u8BF7\u6307\u5B9A jar \u6587\u4EF6\u7684\u540D\u79F0"},
+        {"Please.specify.jarfile.name", "\u8BF7\u6307\u5B9A jarfile \u540D\u79F0"},
         {"Please.specify.alias.name", "\u8BF7\u6307\u5B9A\u522B\u540D"},
         {"Only.one.alias.can.be.specified", "\u53EA\u80FD\u6307\u5B9A\u4E00\u4E2A\u522B\u540D"},
         {"This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.",
@@ -153,11 +153,11 @@
         {"unable.to.instantiate.keystore.class.",
                 "\u65E0\u6CD5\u5B9E\u4F8B\u5316\u5BC6\u94A5\u5E93\u7C7B: "},
         {"Certificate.chain.not.found.for.alias.alias.must.reference.a.valid.KeyStore.key.entry.containing.a.private.key.and",
-                "\u627E\u4E0D\u5230{0}\u7684\u8BC1\u4E66\u94FE\u3002{1}\u5FC5\u987B\u5F15\u7528\u5305\u542B\u79C1\u6709\u5BC6\u94A5\u548C\u76F8\u5E94\u7684\u516C\u5171\u5BC6\u94A5\u8BC1\u4E66\u94FE\u7684\u6709\u6548 KeyStore \u5BC6\u94A5\u6761\u76EE\u3002"},
+                "\u627E\u4E0D\u5230{0}\u7684\u8BC1\u4E66\u94FE\u3002{1}\u5FC5\u987B\u5F15\u7528\u5305\u542B\u79C1\u6709\u5BC6\u94A5\u548C\u76F8\u5E94\u7684\u516C\u5171\u5BC6\u94A5\u8BC1\u4E66\u94FE\u7684\u6709\u6548\u5BC6\u94A5\u5E93\u5BC6\u94A5\u6761\u76EE\u3002"},
         {"File.specified.by.certchain.does.not.exist",
                 "\u7531 -certchain \u6307\u5B9A\u7684\u6587\u4EF6\u4E0D\u5B58\u5728"},
         {"Cannot.restore.certchain.from.file.specified",
-                "\u65E0\u6CD5\u4ECE\u6307\u5B9A\u7684\u6587\u4EF6\u8FD8\u539F\u8BC1\u4E66\u94FE"},
+                "\u65E0\u6CD5\u4ECE\u6307\u5B9A\u7684\u6587\u4EF6\u8FD8\u539F certchain"},
         {"Certificate.chain.not.found.in.the.file.specified.",
                 "\u5728\u6307\u5B9A\u7684\u6587\u4EF6\u4E2D\u627E\u4E0D\u5230\u8BC1\u4E66\u94FE\u3002"},
         {"found.non.X.509.certificate.in.signer.s.chain",
@@ -184,7 +184,7 @@
                 "\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u6CA1\u6709\u54CD\u5E94\u3002\u5982\u679C\u8981\u4ECE\u9632\u706B\u5899\u540E\u9762\u8FDE\u63A5, \u5219\u53EF\u80FD\u9700\u8981\u6307\u5B9A HTTP \u6216 HTTPS \u4EE3\u7406\u3002\u8BF7\u4E3A jarsigner \u63D0\u4F9B\u4EE5\u4E0B\u9009\u9879: "},
         {"or", "\u6216"},
         {"Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the",
-                "\u627E\u4E0D\u5230{0}\u7684\u8BC1\u4E66\u3002{1}\u5FC5\u987B\u5F15\u7528\u5305\u542B\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u7684 X.509 \u516C\u5171\u5BC6\u94A5\u8BC1\u4E66\u7684\u6709\u6548 KeyStore \u6761\u76EE\u3002"},
+                "\u627E\u4E0D\u5230{0}\u7684\u8BC1\u4E66\u3002{1}\u5FC5\u987B\u5F15\u7528\u5305\u542B\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u7684 X.509 \u516C\u5171\u5BC6\u94A5\u8BC1\u4E66\u7684\u6709\u6548\u5BC6\u94A5\u5E93\u6761\u76EE\u3002"},
         {"using.an.alternative.signing.mechanism",
                 "\u6B63\u5728\u4F7F\u7528\u66FF\u4EE3\u7684\u7B7E\u540D\u673A\u5236"},
         {"entry.was.signed.on", "\u6761\u76EE\u7684\u7B7E\u540D\u65E5\u671F\u4E3A {0}"},
@@ -229,7 +229,6 @@
         {"Cannot.find.environment.variable.",
                 "\u627E\u4E0D\u5230\u73AF\u5883\u53D8\u91CF: "},
         {"Cannot.find.file.", "\u627E\u4E0D\u5230\u6587\u4EF6: "},
-        {"Command.option.flag.needs.an.argument.", "\u547D\u4EE4\u9009\u9879{0}\u9700\u8981\u4E00\u4E2A\u53C2\u6570\u3002"},
     };
 
     /**
--- a/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java	Wed May 08 11:22:25 2013 +0100
@@ -99,7 +99,7 @@
         /***    EVERYTHING BELOW IS DEPRECATED  ***/
 
         // com.sun.security.auth.PolicyFile
-        {".error.parsing.", ": erro de parse "},
+        {".error.parsing.", ": erro de parsing "},
         {"COLON", ": "},
         {".error.adding.Permission.", ": erro ao adicionar a Permiss\u00E3o "},
         {"SPACE", " "},
--- a/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java	Wed May 08 11:22:25 2013 +0100
@@ -94,7 +94,7 @@
         {"Kerberos.username.defUsername.",
                 "Kerberos \u4F7F\u7528\u8005\u540D\u7A31 [{0}]: "},
         {"Kerberos.password.for.username.",
-                "Kerberos \u5BC6\u78BC [{0}]: "},
+                "Kerberos \u5BC6\u78BC {0}: "},
 
         /***    EVERYTHING BELOW IS DEPRECATED  ***/
 
--- a/jdk/src/share/classes/sun/security/util/Resources_es.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/security/util/Resources_es.java	Wed May 08 11:22:25 2013 +0100
@@ -146,7 +146,7 @@
 
         // sun.security.pkcs11.SunPKCS11
         {"PKCS11.Token.providerName.Password.",
-                "Contrase\u00F1a del Elemento PKCS11 [{0}]: "},
+                "Contrase\u00F1a del Token PKCS11 [{0}]: "},
 
         /* --- DEPRECATED --- */
         // javax.security.auth.Policy
--- a/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java	Wed May 08 11:22:25 2013 +0100
@@ -105,7 +105,7 @@
         // sun.security.provider.PolicyFile
 
         {"java.security.policy.error.parsing.policy.message",
-                "java.security.policy: erro durante o parse de {0}:\n\t{1}"},
+                "java.security.policy: erro durante o parsing de {0}:\n\t{1}"},
         {"java.security.policy.error.adding.Permission.perm.message",
                 "java.security.policy: erro ao adicionar a permiss\u00E3o, {0}:\n\t{1}"},
         {"java.security.policy.error.adding.Entry.message",
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_de.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_de.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,9 @@
 out.adding={0} wird hinzugef\u00FCgt
 out.deflated=({0} % verkleinert)
 out.stored=(0 % gespeichert)
-out.create=\ \ erstellt: {0}
+out.create=\  erstellt: {0}
 out.extracted=extrahiert: {0}
 out.inflated=\ \\vergr\u00F6\u00DFert: {0}
 out.size=(ein = {0}) (aus = {1})
 
-usage=Verwendung: jar-Dateien {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] ...\nOptionen:\n\ \   -c  Neues Archiv erstellen\n\ \   -t  Inhaltsverzeichnis f\u00FCr Archiv auflisten\n\ \   -x  Genannte (oder alle) Dateien aus Archiv extrahieren\n\ \   -u  Vorhandenes Archiv aktualisieren\n\ \   -v  Verbose-Ausgabe f\u00FCr Standardausgabe generieren\n\ \   -f  Namen der Archivdatei angeben\n\ \   -m  Manifest-Informationen von angegebener Manifest-Datei einschlie\u00DFen\n\ \   -e  Anwendungs-Einstiegspunkt f\u00FCr die \n\ \       in einer ausf\u00FChrbaren JAR-Datei geb\u00FCndelte Standalone-Anwendung angeben\n\ \   -0  Nur speichern (keine ZIP-Komprimierung)\n\ \   -M  Keine Manifest-Datei f\u00FCr die Eintr\u00E4ge erstellen\n\ \   -i  Indexinformationen f\u00FCr angegebenen JAR-Dateien erstellen\n\ \   -C  zum angegebenen Verzeichnis wechseln und folgende Datei einschlie\u00DFen\nFalls eine Datei ein Verzeichnis ist, wird dieses rekursiv verarbeitet.\nDer Name der Manifest-Datei, der Name der Archivdatei und der Name des Einstiegspunkts werden\nin derselben Reihenfolge wie die Kennzeichen "m", "f" und "e" angegeben.\n\nBeispiel 1: Archivieren Sie zwei Klassendateien in ein Archiv mit Namen "classes.jar": \n\ \      jar cvf classes.jar Foo.class Bar.class \nBeispiel 2: Verwenden Sie die vorhandenen Manifest-Datei "mymanifest", und archivieren Sie\n\ \          alle Dateien im Verzeichnis foo/ in "classes.jar": \n\ \      jar cvfm classes.jar mymanifest -C foo/ .\n
+usage=Verwendung: jar-Dateien {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] ...\nOptionen:\n    -c  Neues Archiv erstellen\n    -t  Inhaltsverzeichnis f\u00FCr Archiv auflisten\n    -x  Genannte (oder alle) Dateien aus Archiv extrahieren\n    -u  Vorhandenes Archiv aktualisieren\n    -v  Verbose-Ausgabe f\u00FCr Standardausgabe generieren\n    -f  Namen der Archivdatei angeben\n    -m  Manifest-Informationen von angegebener Manifest-Datei einschlie\u00DFen\n    -e  Anwendungs-Einstiegspunkt f\u00FCr die \n        in einer ausf\u00FChrbaren JAR-Datei geb\u00FCndelte Standalone-Anwendung angeben\n    -0  Nur speichern (keine ZIP-Komprimierung)\n    -M  Keine Manifest-Datei f\u00FCr die Eintr\u00E4ge erstellen\n    -i  Indexinformationen f\u00FCr angegebenen JAR-Dateien erstellen\n    -C  zum angegebenen Verzeichnis wechseln und folgende Datei einschlie\u00DFen\nFalls eine Datei ein Verzeichnis ist, wird dieses rekursiv verarbeitet.\nDer Name der Manifest-Datei, der Name der Archivdatei und der Name des Einstiegspunkts werden\nin derselben Reihenfolge wie die Kennzeichen "m", "f" und "e" angegeben.\n\nBeispiel 1: Archivieren Sie zwei Klassendateien in ein Archiv mit Namen "classes.jar": \n       jar cvf classes.jar Foo.class Bar.class \nBeispiel 2: Verwenden Sie die vorhandenen Manifest-Datei "mymanifest", und archivieren Sie\n           alle Dateien im Verzeichnis foo/ in "classes.jar": \n       jar cvfm classes.jar mymanifest -C foo/ .\n
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_es.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_es.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,9 @@
 out.adding=agregando: {0}
 out.deflated=(desinflado {0}%)
 out.stored=(almacenado 0%)
-out.create=\ \ creado: {0}
+out.create=\  creado: {0}
 out.extracted=extra\u00EDdo: {0}
 out.inflated=\ \\inflado: {0}
 out.size=(entrada = {0}) (salida = {1})
 
-usage=Sintaxis: jar {ctxui}[vfm0Me] [archive-jar] [archive-manifiesto] [punto-entrada] [-C dir] archivos...\nOpciones:\n\ \   -c  crear nuevo archivo\n\ \   -t  crear la tabla de contenido del archivo\n\ \   -x extraer el archive mencionado (o todos) del archivo\n\ \   -u  actualizar archive existente\n\ \   -v  generar salida detallada de los datos de salida est\u00E1ndar\n\ \   -f  especificar nombre de archive de almacenamiento\n\ \   -m  incluir informaci\u00F3n de manifiesto del archive de manifiesto especificado\n\ \   -e  especificar punto de entrada de la aplicaci\u00F3n para la aplicaci\u00F3n aut\u00F3noma \n\ \       que se incluye dentro de un archive jar ejecutable\n\ \   -0  s\u00F3lo almacenar; no utilizar compresi\u00F3n ZIP\n\ \   -M  no crear un archive de manifiesto para las entradas\n\ \   -i  generar informaci\u00F3n de \u00EDndice para los archives jar especificados\n\ \   -C  cambiar al directorio especificado e incluir el archivo siguiente\nSi alg\u00FAn archivo es un directorio, se procesar\u00E1 de forma recurrente.\nEl nombre del archivo de manifiesto, el nombre del archivo de almacenamiento y el nombre del punto de entrada se\nespecifican en el mismo orden que los indicadores 'm', 'f' y 'e'.\n\nEjemplo 1: para archivar archivos de dos clases en un archivo llamado classes.jar: \n\ \      jar cvf classes.jar Foo.class Bar.class \nEjemplo 2: utilice un archivo de manifiesto existente 'mymanifest' y archive todos los\n\ \          archivos del directorio foo/ en 'classes.jar': \n\ \      jar cvfm classes.jar mymanifest -C foo/ .\n
+usage=Sintaxis: jar {ctxui}[vfm0Me] [archive-jar] [archive-manifiesto] [punto-entrada] [-C dir] archivos...\nOpciones:\n    -c  crear nuevo archivo\n    -t  crear la tabla de contenido del archivo\n    -x extraer el archive mencionado (o todos) del archivo\n    -u  actualizar archive existente\n    -v  generar salida detallada de los datos de salida est\u00E1ndar\n    -f  especificar nombre de archive de almacenamiento\n    -m  incluir informaci\u00F3n de manifiesto del archive de manifiesto especificado\n    -e  especificar punto de entrada de la aplicaci\u00F3n para la aplicaci\u00F3n aut\u00F3noma \n        que se incluye dentro de un archive jar ejecutable\n    -0  s\u00F3lo almacenar; no utilizar compresi\u00F3n ZIP\n    -M  no crear un archive de manifiesto para las entradas\n    -i  generar informaci\u00F3n de \u00EDndice para los archives jar especificados\n    -C  cambiar al directorio especificado e incluir el archivo siguiente\nSi alg\u00FAn archivo es un directorio, se procesar\u00E1 de forma recurrente.\nEl nombre del archivo de manifiesto, el nombre del archivo de almacenamiento y el nombre del punto de entrada se\nespecifican en el mismo orden que los indicadores 'm', 'f' y 'e'.\n\nEjemplo 1: para archivar archivos de dos clases en un archivo llamado classes.jar: \n       jar cvf classes.jar Foo.class Bar.class \nEjemplo 2: utilice un archivo de manifiesto existente 'mymanifest' y archive todos los\n           archivos del directorio foo/ en 'classes.jar': \n       jar cvfm classes.jar mymanifest -C foo/ .\n
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_fr.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_fr.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,9 @@
 out.adding=ajout : {0}
 out.deflated=(compression : {0} %)
 out.stored=(stockage : 0 %)
-out.create=\ \ cr\u00E9\u00E9 : {0}
+out.create=\  cr\u00E9\u00E9 : {0}
 out.extracted=extrait : {0}
 out.inflated=\ \\d\u00E9compress\u00E9 : {0}
 out.size=(entr\u00E9e = {0}) (sortie = {1})
 
-usage=Syntaxe : jar {ctxui}[vfm0Me] [fichier-jar] [fichier-manifeste] [point-entr\u00E9e] [-C r\u00E9p] fichiers...\nOptions :\n\ \   -c  cr\u00E9e une archive\n\ \   -t  affiche la table des mati\u00E8res de l'archive\n\ \   -x  extrait les fichiers nomm\u00E9s (ou tous les fichiers) de l'archive\n\ \   -u  met \u00E0 jour l'archive existante\n\ \   -v  g\u00E9n\u00E8re une version d\u00E9taill\u00E9e d'une sortie standard\n\ \   -f  sp\u00E9cifie le nom du fichier archive\n\ \   -m  inclut les informations de manifeste \u00E0 partir du fichier de manifeste sp\u00E9cifi\u00E9\n\ \   -e  sp\u00E9cifie le point d'entr\u00E9e d'une application en mode autonome \n\ \       int\u00E9gr\u00E9e \u00E0 un fichier JAR ex\u00E9cutable\n\ \   -0  stockage uniquement, pas de compression ZIP\n\ \   -M  ne cr\u00E9e pas de fichier manifeste pour les entr\u00E9es\n\ \   -i  g\u00E9n\u00E8re les informations d'index des fichiers JAR sp\u00E9cifi\u00E9s\n\ \   -C  passe au r\u00E9pertoire sp\u00E9cifi\u00E9 et inclut le fichier suivant\nSi l'un des fichiers est un r\u00E9pertoire, celui-ci est trait\u00E9 r\u00E9cursivement.\nLes noms du fichier manifeste, du fichier archive et du point d'entr\u00E9e sont\nsp\u00E9cifi\u00E9s dans le m\u00EAme ordre que celui des indicateurs m, f et e.\n\nExemple 1 : pour archiver deux fichiers de classe dans une archive intitul\u00E9e classes.jar : \n\ \      jar cvf classes.jar Foo.class Bar.class \nExemple 2 : pour utiliser un fichier manifeste existant 'monmanifeste', puis archiver tous les\n\ \          fichiers du r\u00E9pertoire foo/ dans 'classes.jar' : \n\ \      jar cvfm classes.jar monmanifeste -C foo/ .\n
+usage=Syntaxe : jar {ctxui}[vfm0Me] [fichier-jar] [fichier-manifeste] [point-entr\u00E9e] [-C r\u00E9p] fichiers...\nOptions :\n    -c  cr\u00E9e une archive\n    -t  affiche la table des mati\u00E8res de l'archive\n    -x  extrait les fichiers nomm\u00E9s (ou tous les fichiers) de l'archive\n    -u  met \u00E0 jour l'archive existante\n    -v  g\u00E9n\u00E8re une version d\u00E9taill\u00E9e d'une sortie standard\n    -f  sp\u00E9cifie le nom du fichier archive\n    -m  inclut les informations de manifeste \u00E0 partir du fichier de manifeste sp\u00E9cifi\u00E9\n    -e  sp\u00E9cifie le point d'entr\u00E9e d'une application en mode autonome \n        int\u00E9gr\u00E9e \u00E0 un fichier JAR ex\u00E9cutable\n    -0  stockage uniquement, pas de compression ZIP\n    -M  ne cr\u00E9e pas de fichier manifeste pour les entr\u00E9es\n    -i  g\u00E9n\u00E8re les informations d'index des fichiers JAR sp\u00E9cifi\u00E9s\n    -C  passe au r\u00E9pertoire sp\u00E9cifi\u00E9 et inclut le fichier suivant\nSi l'un des fichiers est un r\u00E9pertoire, celui-ci est trait\u00E9 r\u00E9cursivement.\nLes noms du fichier manifeste, du fichier archive et du point d'entr\u00E9e sont\nsp\u00E9cifi\u00E9s dans le m\u00EAme ordre que celui des indicateurs m, f et e.\n\nExemple 1 : pour archiver deux fichiers de classe dans une archive intitul\u00E9e classes.jar : \n       jar cvf classes.jar Foo.class Bar.class \nExemple 2 : pour utiliser un fichier manifeste existant 'monmanifeste', puis archiver tous les\n           fichiers du r\u00E9pertoire foo/ dans 'classes.jar' : \n       jar cvfm classes.jar monmanifeste -C foo/ .\n
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_it.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_it.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,9 @@
 out.adding=aggiunta in corso di: {0}
 out.deflated=(compresso {0}%)
 out.stored=(memorizzato 0%)
-out.create=\ \ \ \ \ creato: {0}
+out.create=\     creato: {0}
 out.extracted=estratto: {0}
 out.inflated=\ \\decompresso: {0}
 out.size=(in = {0}) (out = {1})
 
-usage=Utilizzo: jar {ctxui}[vfm0Me] [file-jar] [file-manifest] [punto di ingresso] [-C dir] file ...\nOpzioni:\n\ \   -c  crea un nuovo archivio\n\ \   -t  visualizza l'indice dell'archivio\n\ \   -x  estrae i file con nome (o tutti i file) dall'archivio\n\ \   -u  aggiorna l'archivio esistente\n\ \   -v  genera output commentato dall'output standard\n\ \   -f  specifica il nome file dell'archivio\n\ \   -m  include informazioni manifest dal file manifest specificato\n\ \   -e  specifica il punto di ingresso per l'applicazione stand-alone \n\ \       inclusa nel file jar eseguibile\n\ \   -0  solo memorizzazione; senza compressione ZIP\n\ \   -M  consente di non creare un file manifest per le voci\n\ \   -i  genera informazioni sull'indice per i file jar specificati\n\ \   -C  imposta la directory specificata e include il file seguente\nSe un file \u00E8 una directory, verr\u00E0 elaborato in modo ricorsivo.\nIl nome del file manifest, del file di archivio e del punto di ingresso devono\nessere specificati nello stesso ordine dei flag 'm', 'f' ed 'e'.\n\nEsempio 1: archiviazione di due file di classe in un archivio con il nome classes.jar: \n\ \      jar cvf classes.jar Foo.class Bar.class \nEsempio 2: utilizzo del file manifest esistente 'mymanifest' e archiviazione di tutti i\n\ \          file della directory foo/ in 'classes.jar': \n\ \      jar cvfm classes.jar mymanifest -C foo/.\n
+usage=Uso: jar {ctxui}[vfm0Me] [file-jar] [file-manifest] [punto di ingresso] [-C dir] file ...\nOpzioni:\n    -c  crea un nuovo archivio\n    -t  visualizza l'indice dell'archivio\n    -x  estrae i file con nome (o tutti i file) dall'archivio\n    -u  aggiorna l'archivio esistente\n    -v  genera output commentato dall'output standard\n    -f  specifica il nome file dell'archivio\n    -m  include informazioni manifest dal file manifest specificato\n    -e  specifica il punto di ingresso per l'applicazione stand-alone \n        inclusa nel file jar eseguibile\n    -0  solo memorizzazione; senza compressione ZIP\n    -M  consente di non creare un file manifest per le voci\n    -i  genera informazioni sull'indice per i file jar specificati\n    -C  imposta la directory specificata e include il file seguente\nSe un file \u00E8 una directory, verr\u00E0 elaborato in modo ricorsivo.\nIl nome del file manifest, del file di archivio e del punto di ingresso devono\nessere specificati nello stesso ordine dei flag 'm', 'f' ed 'e'.\n\nEsempio 1: archiviazione di due file di classe in un archivio con il nome classes.jar: \n       jar cvf classes.jar Foo.class Bar.class \nEsempio 2: utilizzo del file manifest esistente 'mymanifest' e archiviazione di tutti i\n           file della directory foo/ in 'classes.jar': \n       jar cvfm classes.jar mymanifest -C foo/.\n
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_ja.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_ja.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,9 @@
 out.adding={0}\u3092\u8FFD\u52A0\u4E2D\u3067\u3059
 out.deflated=({0}%\u53CE\u7E2E\u3055\u308C\u307E\u3057\u305F)
 out.stored=(0%\u683C\u7D0D\u3055\u308C\u307E\u3057\u305F)
-out.create=\ \ {0}\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F
+out.create=\  {0}\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F
 out.extracted={0}\u304C\u62BD\u51FA\u3055\u308C\u307E\u3057\u305F
 out.inflated=\ \\{0}\u304C\u5C55\u958B\u3055\u308C\u307E\u3057\u305F
 out.size=(\u5165={0})(\u51FA={1})
 
-usage=\u4F7F\u7528\u65B9\u6CD5: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\u30AA\u30D7\u30B7\u30E7\u30F3:\n\\  -c \u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u65B0\u898F\u4F5C\u6210\u3059\u308B\n\\  -t \u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u5185\u5BB9\u3092\u4E00\u89A7\u8868\u793A\u3059\u308B\n\\  -x \u6307\u5B9A\u306E(\u307E\u305F\u306F\u3059\u3079\u3066\u306E)\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6\u304B\u3089\u62BD\u51FA\u3059\u308B\n\\  -u \u65E2\u5B58\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u66F4\u65B0\u3059\u308B\n\\  -v \u6A19\u6E96\u51FA\u529B\u306B\u8A73\u7D30\u306A\u51FA\u529B\u3092\u751F\u6210\u3059\u308B\n\\  -f \u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3059\u308B\n\\  -m \u6307\u5B9A\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u60C5\u5831\u3092\u53D6\u308A\u8FBC\u3080\n\\  -e \u5B9F\u884C\u53EF\u80FDjar\u30D5\u30A1\u30A4\u30EB\u306B\u30D0\u30F3\u30C9\u30EB\u3055\u308C\u305F\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\n\\     \u30A8\u30F3\u30C8\u30EA\u30FB\u30DD\u30A4\u30F3\u30C8\u3092\u6307\u5B9A\u3059\u308B\n\\  -0 \u683C\u7D0D\u306E\u307F\u3002ZIP\u5727\u7E2E\u3092\u4F7F\u7528\u3057\u306A\u3044\n\\  -M \u30A8\u30F3\u30C8\u30EA\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3057\u306A\u3044\n\\  -i \u6307\u5B9A\u306Ejar\u30D5\u30A1\u30A4\u30EB\u306E\u7D22\u5F15\u60C5\u5831\u3092\u751F\u6210\u3059\u308B\n\\  -C \u6307\u5B9A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u5909\u66F4\u3057\u3001\u4EE5\u4E0B\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u53D6\u308A\u8FBC\u3080\n\u30D5\u30A1\u30A4\u30EB\u304C\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u5834\u5408\u306F\u518D\u5E30\u7684\u306B\u51E6\u7406\u3055\u308C\u307E\u3059\u3002\n\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3001\u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u304A\u3088\u3073\u30A8\u30F3\u30C8\u30EA\u30FB\u30DD\u30A4\u30F3\u30C8\u540D\u306F\u3001\n\u30D5\u30E9\u30B0'm'\u3001'f'\u3001'e'\u306E\u6307\u5B9A\u3068\u540C\u3058\u9806\u756A\u3067\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\n\u4F8B1: 2\u3064\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6classes.jar\u306B\u4FDD\u5B58\u3059\u308B:\n\\    jar cvf classes.jar Foo.class Bar.class\n\u4F8B2: \u65E2\u5B58\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB'mymanifest'\u3092\u4F7F\u7528\u3057\u3001foo/\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\n\\   \u5168\u30D5\u30A1\u30A4\u30EB\u3092'classes.jar'\u306B\u30A2\u30FC\u30AB\u30A4\u30D6\u3059\u308B:\n\\    jar cvfm classes.jar mymanifest -C foo/ \n
+usage=\u4F7F\u7528\u65B9\u6CD5: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\u30AA\u30D7\u30B7\u30E7\u30F3:\n   -c \u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u65B0\u898F\u4F5C\u6210\u3059\u308B\n   -t \u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u5185\u5BB9\u3092\u4E00\u89A7\u8868\u793A\u3059\u308B\n   -x \u6307\u5B9A\u306E(\u307E\u305F\u306F\u3059\u3079\u3066\u306E)\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6\u304B\u3089\u62BD\u51FA\u3059\u308B\n   -u \u65E2\u5B58\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u66F4\u65B0\u3059\u308B\n   -v \u6A19\u6E96\u51FA\u529B\u306B\u8A73\u7D30\u306A\u51FA\u529B\u3092\u751F\u6210\u3059\u308B\n   -f \u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3059\u308B\n   -m \u6307\u5B9A\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u60C5\u5831\u3092\u53D6\u308A\u8FBC\u3080\n   -e \u5B9F\u884C\u53EF\u80FDjar\u30D5\u30A1\u30A4\u30EB\u306B\u30D0\u30F3\u30C9\u30EB\u3055\u308C\u305F\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\n      \u30A8\u30F3\u30C8\u30EA\u30FB\u30DD\u30A4\u30F3\u30C8\u3092\u6307\u5B9A\u3059\u308B\n   -0 \u683C\u7D0D\u306E\u307F\u3002ZIP\u5727\u7E2E\u3092\u4F7F\u7528\u3057\u306A\u3044\n   -M \u30A8\u30F3\u30C8\u30EA\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3057\u306A\u3044\n   -i \u6307\u5B9A\u306Ejar\u30D5\u30A1\u30A4\u30EB\u306E\u7D22\u5F15\u60C5\u5831\u3092\u751F\u6210\u3059\u308B\n   -C \u6307\u5B9A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u5909\u66F4\u3057\u3001\u4EE5\u4E0B\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u53D6\u308A\u8FBC\u3080\n\u30D5\u30A1\u30A4\u30EB\u304C\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u5834\u5408\u306F\u518D\u5E30\u7684\u306B\u51E6\u7406\u3055\u308C\u307E\u3059\u3002\n\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3001\u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u304A\u3088\u3073\u30A8\u30F3\u30C8\u30EA\u30FB\u30DD\u30A4\u30F3\u30C8\u540D\u306F\u3001\n\u30D5\u30E9\u30B0'm'\u3001'f'\u3001'e'\u306E\u6307\u5B9A\u3068\u540C\u3058\u9806\u756A\u3067\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\n\u4F8B1: 2\u3064\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6classes.jar\u306B\u4FDD\u5B58\u3059\u308B:\n     jar cvf classes.jar Foo.class Bar.class\n\u4F8B2: \u65E2\u5B58\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB'mymanifest'\u3092\u4F7F\u7528\u3057\u3001foo/\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\n    \u5168\u30D5\u30A1\u30A4\u30EB\u3092'classes.jar'\u306B\u30A2\u30FC\u30AB\u30A4\u30D6\u3059\u308B:\n     jar cvfm classes.jar mymanifest -C foo/ \n
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_ko.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_ko.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,9 @@
 out.adding=\uCD94\uAC00\uD558\uB294 \uC911: {0}
 out.deflated=({0}%\uB97C \uAC10\uC18C\uD568)
 out.stored=(0%\uB97C \uC800\uC7A5\uD568)
-out.create=\ \ \uC0DD\uC131\uB428: {0}
+out.create=\  \uC0DD\uC131\uB428: {0}
 out.extracted=\uCD94\uCD9C\uB428: {0}
 out.inflated=\ \\\uC99D\uAC00\uB428: {0}
 out.size=(\uC785\uB825 = {0}) (\uCD9C\uB825 = {1})
 
-usage=\uC0AC\uC6A9\uBC95: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\uC635\uC158:\n\ \   -c  \uC0C8 \uC544\uCE74\uC774\uBE0C\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4.\n\ \   -t  \uC544\uCE74\uC774\uBE0C\uC5D0 \uB300\uD55C \uBAA9\uCC28\uB97C \uB098\uC5F4\uD569\uB2C8\uB2E4.\n\ \   -x  \uBA85\uBA85\uB41C(\uB610\uB294 \uBAA8\uB4E0) \uD30C\uC77C\uC744 \uC544\uCE74\uC774\uBE0C\uC5D0\uC11C \uCD94\uCD9C\uD569\uB2C8\uB2E4.\n\ \   -u  \uAE30\uC874 \uC544\uCE74\uC774\uBE0C\uB97C \uAC31\uC2E0\uD569\uB2C8\uB2E4.\n\ \   -v  \uD45C\uC900 \uCD9C\uB825\uC5D0 \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4.\n\ \   -f  \uC544\uCE74\uC774\uBE0C \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \   -m  \uC9C0\uC815\uB41C Manifest \uD30C\uC77C\uC758 Manifest \uC815\uBCF4\uB97C \uD3EC\uD568\uD569\uB2C8\uB2E4.\n\ \   -e  jar \uC2E4\uD589 \uD30C\uC77C\uC5D0 \uBC88\uB4E4\uB85C \uC81C\uACF5\uB41C \uB3C5\uB9BD\uD615 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC758 \n\ \       \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8 \uC2DC\uC791 \uC9C0\uC810\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \   -0  \uC800\uC7A5 \uC804\uC6A9: ZIP \uC555\uCD95\uC744 \uC0AC\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n\ \   -M  \uD56D\uBAA9\uC5D0 \uB300\uD574 Manifest \uD30C\uC77C\uC744 \uC0DD\uC131\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n\ \   -i  \uC9C0\uC815\uB41C jar \uD30C\uC77C\uC5D0 \uB300\uD55C \uC778\uB371\uC2A4 \uC815\uBCF4\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4.\n\ \   -C  \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uB85C \uBCC0\uACBD\uD558\uACE0 \uB2E4\uC74C \uD30C\uC77C\uC744 \uD3EC\uD568\uD569\uB2C8\uB2E4.\n\uD2B9\uC815 \uD30C\uC77C\uC774 \uB514\uB809\uD1A0\uB9AC\uC77C \uACBD\uC6B0 \uC21C\uD658\uC801\uC73C\uB85C \uCC98\uB9AC\uB429\uB2C8\uB2E4.\nManifest \uD30C\uC77C \uC774\uB984, \uC544\uCE74\uC774\uBE0C \uD30C\uC77C \uC774\uB984 \uBC0F \uC2DC\uC791 \uC9C0\uC810 \uC774\uB984\uC740\n'm', 'f' \uBC0F 'e' \uD50C\uB798\uADF8\uC640 \uB3D9\uC77C\uD55C \uC21C\uC11C\uB85C \uC9C0\uC815\uB429\uB2C8\uB2E4.\n\n\uC608 1: classes.jar\uB77C\uB294 \uC544\uCE74\uC774\uBE0C\uC5D0 \uB450 \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uC544\uCE74\uC774\uBE0C\uD558\uB294 \uBC29\uBC95: \n\ \      jar cvf classes.jar Foo.class Bar.class \n\uC608 2: \uAE30\uC874 Manifest \uD30C\uC77C 'mymanifest'\uB97C \uC0AC\uC6A9\uD558\uC5EC\n\ \          foo/ \uB514\uB809\uD1A0\uB9AC\uC758 \uBAA8\uB4E0 \uD30C\uC77C\uC744 'classes.jar'\uB85C \uC544\uCE74\uC774\uBE0C\uD558\uB294 \uBC29\uBC95: \n\ \      jar cvfm classes.jar mymanifest -C foo/ .\n
+usage=\uC0AC\uC6A9\uBC95: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\uC635\uC158:\n    -c  \uC0C8 \uC544\uCE74\uC774\uBE0C\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4.\n    -t  \uC544\uCE74\uC774\uBE0C\uC5D0 \uB300\uD55C \uBAA9\uCC28\uB97C \uB098\uC5F4\uD569\uB2C8\uB2E4.\n    -x  \uBA85\uBA85\uB41C(\uB610\uB294 \uBAA8\uB4E0) \uD30C\uC77C\uC744 \uC544\uCE74\uC774\uBE0C\uC5D0\uC11C \uCD94\uCD9C\uD569\uB2C8\uB2E4.\n    -u  \uAE30\uC874 \uC544\uCE74\uC774\uBE0C\uB97C \uAC31\uC2E0\uD569\uB2C8\uB2E4.\n    -v  \uD45C\uC900 \uCD9C\uB825\uC5D0 \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4.\n    -f  \uC544\uCE74\uC774\uBE0C \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4.\n    -m  \uC9C0\uC815\uB41C Manifest \uD30C\uC77C\uC758 Manifest \uC815\uBCF4\uB97C \uD3EC\uD568\uD569\uB2C8\uB2E4.\n    -e  jar \uC2E4\uD589 \uD30C\uC77C\uC5D0 \uBC88\uB4E4\uB85C \uC81C\uACF5\uB41C \uB3C5\uB9BD\uD615 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC758 \n        \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8 \uC2DC\uC791 \uC9C0\uC810\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4.\n    -0  \uC800\uC7A5 \uC804\uC6A9: ZIP \uC555\uCD95\uC744 \uC0AC\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n    -M  \uD56D\uBAA9\uC5D0 \uB300\uD574 Manifest \uD30C\uC77C\uC744 \uC0DD\uC131\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n    -i  \uC9C0\uC815\uB41C jar \uD30C\uC77C\uC5D0 \uB300\uD55C \uC778\uB371\uC2A4 \uC815\uBCF4\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4.\n    -C  \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uB85C \uBCC0\uACBD\uD558\uACE0 \uB2E4\uC74C \uD30C\uC77C\uC744 \uD3EC\uD568\uD569\uB2C8\uB2E4.\n\uD2B9\uC815 \uD30C\uC77C\uC774 \uB514\uB809\uD1A0\uB9AC\uC77C \uACBD\uC6B0 \uC21C\uD658\uC801\uC73C\uB85C \uCC98\uB9AC\uB429\uB2C8\uB2E4.\nManifest \uD30C\uC77C \uC774\uB984, \uC544\uCE74\uC774\uBE0C \uD30C\uC77C \uC774\uB984 \uBC0F \uC2DC\uC791 \uC9C0\uC810 \uC774\uB984\uC740\n'm', 'f' \uBC0F 'e' \uD50C\uB798\uADF8\uC640 \uB3D9\uC77C\uD55C \uC21C\uC11C\uB85C \uC9C0\uC815\uB429\uB2C8\uB2E4.\n\n\uC608 1: classes.jar\uB77C\uB294 \uC544\uCE74\uC774\uBE0C\uC5D0 \uB450 \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uC544\uCE74\uC774\uBE0C\uD558\uB294 \uBC29\uBC95: \n       jar cvf classes.jar Foo.class Bar.class \n\uC608 2: \uAE30\uC874 Manifest \uD30C\uC77C 'mymanifest'\uB97C \uC0AC\uC6A9\uD558\uC5EC\n           foo/ \uB514\uB809\uD1A0\uB9AC\uC758 \uBAA8\uB4E0 \uD30C\uC77C\uC744 'classes.jar'\uB85C \uC544\uCE74\uC774\uBE0C\uD558\uB294 \uBC29\uBC95: \n       jar cvfm classes.jar mymanifest -C foo/ .\n
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,9 @@
 out.adding=adicionando: {0}
 out.deflated=(vazio {0}%)
 out.stored=(armazenado 0%)
-out.create=\ \ criado: {0}
+out.create=\  criado: {0}
 out.extracted=extra\u00EDdo: {0}
 out.inflated=\ \\cheio: {0}
 out.size=(dentro = {0}) (fora= {1})
 
-usage=Uso: arquivos jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] ...\nOp\u00E7\u00F5es:\n\ \   -c  cria novo arquivo compactado\n\ \   -t  lista o sum\u00E1rio do arquivo compactado\n\ \   -x  extrai arquivos com o nome (ou todos) do arquivo compactado\n\ \   -u  atualizar o arquivo compactado existente\n\ \   -v  gera sa\u00EDda detalhada na sa\u00EDda padr\u00E3o\n\ \   -f  especifica o nome do arquivo do arquivo compactado\n\ \   -m  inclui as informa\u00E7\u00F5es do manifesto do arquivo de manifesto especificado\n\ \   -e  especifica o ponto de entrada da aplica\u00E7\u00E3o para aplica\u00E7\u00E3o independente \n\ \       empacotando em um arquivo jar execut\u00E1vel\n\ \   -0  armazena somente; n\u00E3o usa compacta\u00E7\u00E3o ZIP\n\ \   -M  n\u00E3o cria um arquivo de manifesto para as entradas\n\ \   -i  gera informa\u00E7\u00F5es de \u00EDndice para os arquivos especificados\n\ \   -C  altera para o diret\u00F3rio e inclui o arquivo seguinte\nSe nenhum arquivo for um diret\u00F3rio, ent\u00E3o ser\u00E1 processado repetidamente.\nO nome do arquivo de manifesto, o nome do arquivo compactado e o nome do ponto de entrada s\u00E3o\nespecificados na mesma ordem dos flags  'm', 'f' e 'e'.\n\nExemplo 1: para arquivar dois arquivos de classe em um arquivo compactado com o nome classes.jar: \n\ \      jar cvf classes.jar Foo.class Bar.class \nExemplo 2: use um arquivo de manifesto existente 'mymanifest' e arquive todos os\n\ \          arquivos no diret\u00F3rio foo/ na 'classes.jar': \n\ \      jar cvfm classes.jar mymanifest -C foo/ .\n
+usage=Uso: arquivos jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] ...\nOp\u00E7\u00F5es:\n    -c  cria novo arquivo compactado\n    -t  lista o sum\u00E1rio do arquivo compactado\n    -x  extrai arquivos com o nome (ou todos) do arquivo compactado\n    -u  atualizar o arquivo compactado existente\n    -v  gera sa\u00EDda detalhada na sa\u00EDda padr\u00E3o\n    -f  especifica o nome do arquivo do arquivo compactado\n    -m  inclui as informa\u00E7\u00F5es do manifesto do arquivo de manifesto especificado\n    -e  especifica o ponto de entrada da aplica\u00E7\u00E3o para aplica\u00E7\u00E3o independente \n        empacotando em um arquivo jar execut\u00E1vel\n    -0  armazena somente; n\u00E3o usa compacta\u00E7\u00E3o ZIP\n    -M  n\u00E3o cria um arquivo de manifesto para as entradas\n    -i  gera informa\u00E7\u00F5es de \u00EDndice para os arquivos especificados\n    -C  altera para o diret\u00F3rio e inclui o arquivo seguinte\nSe nenhum arquivo for um diret\u00F3rio, ent\u00E3o ser\u00E1 processado repetidamente.\nO nome do arquivo de manifesto, o nome do arquivo compactado e o nome do ponto de entrada s\u00E3o\nespecificados na mesma ordem dos flags  'm', 'f' e 'e'.\n\nExemplo 1: para arquivar dois arquivos de classe em um arquivo compactado com o nome classes.jar: \n       jar cvf classes.jar Foo.class Bar.class \nExemplo 2: use um arquivo de manifesto existente 'mymanifest' e arquive todos os\n           arquivos no diret\u00F3rio foo/ na 'classes.jar': \n       jar cvfm classes.jar mymanifest -C foo/ .\n
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_sv.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_sv.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,9 @@
 out.adding=l\u00E4gger till: {0}
 out.deflated=({0}% packat)
 out.stored=(0% lagrat)
-out.create=\ \ skapad: {0}
+out.create=\  skapad: {0}
 out.extracted=extraherat: {0}
-out.inflated=\\uppackat: {0}
+out.inflated=\ uppackat: {0}
 out.size=(in = {0}) (ut = {1})
 
-usage=Syntax: jar-filer {ctxui}[vfm0Me] [jar-fil] [manifestfil] [startpunkt] [-C-katalog] ...\nAlternativ:\n\ \   -c  skapa nytt arkiv\n\ \   -t  lista inneh\u00E5llsf\u00F6rteckning f\u00F6r arkiv\n\ \   -x  extrahera namngivna (eller alla) filer fr\u00E5n arkiv\n\ \   -u  uppdatera befintligt arkiv\n\ \   -v  generera utf\u00F6rliga utdata vid standardutmatning\n\ \   -f  ange arkivfilens namn\n\ \   -m  inkludera manifestinformation fr\u00E5n angivet manifest\n\ \   -e  ange programstartpunkt f\u00F6r frist\u00E5ende applikation \n\ \       som medf\u00F6ljer i en jar-programfil\n\ \   -0  endast lagra  (ingen zip-komprimering)\n\ \   -M  skapa inte n\u00E5gon manifestfil f\u00F6r posterna\n\ \   -i  generera indexinformation f\u00F6r de angivna jar-filerna\n\ \   -C  \u00E4ndra till den angivna katalogen och inkludera f\u00F6ljande fil\nOm en fil \u00E4r en katalog bearbetas den rekursivt.\nNamnen p\u00E5 manifestfilen, arkivfilen och startpunkten anges i samma\nordning som m-, f- och e-flaggorna.\n\nExempel 1: S\u00E5 h\u00E4r arkiverar du tv\u00E5 klassfiler i ett arkiv med namnet classes.jar: \n\ \      jar cvf classes.jar Foo.class Bar.class \nExempel 2: Anv\u00E4nd en befintlig manifestfil (mymanifest) och arkivera alla\n\ \          filer fr\u00E5n katalogen foo/ i classes.jar: \n\ \      jar cvfm classes.jar mymanifest -C foo/ .\n
+usage=Syntax: jar-filer {ctxui}[vfm0Me] [jar-fil] [manifestfil] [startpunkt] [-C-katalog] ...\nAlternativ:\n    -c  skapa nytt arkiv\n    -t  lista inneh\u00E5llsf\u00F6rteckning f\u00F6r arkiv\n    -x  extrahera namngivna (eller alla) filer fr\u00E5n arkiv\n    -u  uppdatera befintligt arkiv\n    -v  generera utf\u00F6rliga utdata vid standardutmatning\n    -f  ange arkivfilens namn\n    -m  inkludera manifestinformation fr\u00E5n angivet manifest\n    -e  ange programstartpunkt f\u00F6r frist\u00E5ende applikation \n        som medf\u00F6ljer i en jar-programfil\n    -0  endast lagra  (ingen zip-komprimering)\n    -M  skapa inte n\u00E5gon manifestfil f\u00F6r posterna\n    -i  generera indexinformation f\u00F6r de angivna jar-filerna\n    -C  \u00E4ndra till den angivna katalogen och inkludera f\u00F6ljande fil\nOm en fil \u00E4r en katalog bearbetas den rekursivt.\nNamnen p\u00E5 manifestfilen, arkivfilen och startpunkten anges i samma\nordning som m-, f- och e-flaggorna.\n\nExempel 1: S\u00E5 h\u00E4r arkiverar du tv\u00E5 klassfiler i ett arkiv med namnet classes.jar: \n       jar cvf classes.jar Foo.class Bar.class \nExempel 2: Anv\u00E4nd en befintlig manifestfil (mymanifest) och arkivera alla\n           filer fr\u00E5n katalogen foo/ i classes.jar: \n       jar cvfm classes.jar mymanifest -C foo/ .\n
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,9 @@
 out.adding=\u6B63\u5728\u6DFB\u52A0: {0}
 out.deflated=(\u538B\u7F29\u4E86 {0}%)
 out.stored=(\u5B58\u50A8\u4E86 0%)
-out.create=\ \ \u5DF2\u521B\u5EFA: {0}
+out.create=\  \u5DF2\u521B\u5EFA: {0}
 out.extracted=\u5DF2\u63D0\u53D6: {0}
-out.inflated=\ \ \u5DF2\u89E3\u538B: {0}
+out.inflated=\  \u5DF2\u89E3\u538B: {0}
 out.size=(\u8F93\u5165 = {0}) (\u8F93\u51FA = {1})
 
-usage=\u7528\u6CD5: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\u9009\u9879\u5305\u62EC: \n\ \   -c  \u521B\u5EFA\u65B0\u7684\u5F52\u6863\u6587\u4EF6\n\ \   -t  \u5217\u51FA\u5F52\u6863\u76EE\u5F55\n\ \   -x  \u4ECE\u6863\u6848\u4E2D\u63D0\u53D6\u6307\u5B9A\u7684 (\u6216\u6240\u6709) \u6587\u4EF6\n\ \   -u  \u66F4\u65B0\u73B0\u6709\u7684\u5F52\u6863\u6587\u4EF6\n\ \   -v  \u5728\u6807\u51C6\u8F93\u51FA\u4E2D\u751F\u6210\u8BE6\u7EC6\u8F93\u51FA\n\ \   -f  \u6307\u5B9A\u5F52\u6863\u6587\u4EF6\u540D\n\ \   -m  \u5305\u542B\u6307\u5B9A\u6E05\u5355\u6587\u4EF6\u4E2D\u7684\u6E05\u5355\u4FE1\u606F\n\ \   -e  \u4E3A\u6346\u7ED1\u5230\u53EF\u6267\u884C jar \u6587\u4EF6\u7684\u72EC\u7ACB\u5E94\u7528\u7A0B\u5E8F\n\ \       \u6307\u5B9A\u5E94\u7528\u7A0B\u5E8F\u5165\u53E3\u70B9\n\ \   -0  \u4EC5\u5B58\u50A8; \u4E0D\u4F7F\u7528\u60C5\u51B5\u4EFB\u4F55 ZIP \u538B\u7F29\n\ \   -M  \u4E0D\u521B\u5EFA\u6761\u76EE\u7684\u6E05\u5355\u6587\u4EF6\n\ \   -i  \u4E3A\u6307\u5B9A\u7684 jar \u6587\u4EF6\u751F\u6210\u7D22\u5F15\u4FE1\u606F\n\ \   -C  \u66F4\u6539\u4E3A\u6307\u5B9A\u7684\u76EE\u5F55\u5E76\u5305\u542B\u5176\u4E2D\u7684\u6587\u4EF6\n\u5982\u679C\u6709\u4EFB\u4F55\u76EE\u5F55\u6587\u4EF6, \u5219\u5BF9\u5176\u8FDB\u884C\u9012\u5F52\u5904\u7406\u3002\n\u6E05\u5355\u6587\u4EF6\u540D, \u5F52\u6863\u6587\u4EF6\u540D\u548C\u5165\u53E3\u70B9\u540D\u79F0\u7684\u6307\u5B9A\u987A\u5E8F\n\u4E0E 'm', 'f' \u548C 'e' \u6807\u8BB0\u7684\u6307\u5B9A\u987A\u5E8F\u76F8\u540C\u3002\n\n\u793A\u4F8B 1: \u5C06\u4E24\u4E2A\u7C7B\u6587\u4EF6\u5F52\u6863\u5230\u4E00\u4E2A\u540D\u4E3A classes.jar \u7684\u5F52\u6863\u6587\u4EF6\u4E2D: \n\ \      jar cvf classes.jar Foo.class Bar.class \n\u793A\u4F8B 2: \u4F7F\u7528\u73B0\u6709\u7684\u6E05\u5355\u6587\u4EF6 'mymanifest' \u5E76\n\ \          \u5C06 foo/ \u76EE\u5F55\u4E2D\u7684\u6240\u6709\u6587\u4EF6\u5F52\u6863\u5230 'classes.jar' \u4E2D: \n\ \      jar cvfm classes.jar mymanifest -C foo/\u3002\n
+usage=\u7528\u6CD5: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\u9009\u9879\u5305\u62EC: \n    -c  \u521B\u5EFA\u65B0\u7684\u5F52\u6863\u6587\u4EF6\n    -t  \u5217\u51FA\u5F52\u6863\u76EE\u5F55\n    -x  \u4ECE\u6863\u6848\u4E2D\u63D0\u53D6\u6307\u5B9A\u7684 (\u6216\u6240\u6709) \u6587\u4EF6\n    -u  \u66F4\u65B0\u73B0\u6709\u7684\u5F52\u6863\u6587\u4EF6\n    -v  \u5728\u6807\u51C6\u8F93\u51FA\u4E2D\u751F\u6210\u8BE6\u7EC6\u8F93\u51FA\n    -f  \u6307\u5B9A\u5F52\u6863\u6587\u4EF6\u540D\n    -m  \u5305\u542B\u6307\u5B9A\u6E05\u5355\u6587\u4EF6\u4E2D\u7684\u6E05\u5355\u4FE1\u606F\n    -e  \u4E3A\u6346\u7ED1\u5230\u53EF\u6267\u884C jar \u6587\u4EF6\u7684\u72EC\u7ACB\u5E94\u7528\u7A0B\u5E8F\n        \u6307\u5B9A\u5E94\u7528\u7A0B\u5E8F\u5165\u53E3\u70B9\n    -0  \u4EC5\u5B58\u50A8; \u4E0D\u4F7F\u7528\u60C5\u51B5\u4EFB\u4F55 ZIP \u538B\u7F29\n    -M  \u4E0D\u521B\u5EFA\u6761\u76EE\u7684\u6E05\u5355\u6587\u4EF6\n    -i  \u4E3A\u6307\u5B9A\u7684 jar \u6587\u4EF6\u751F\u6210\u7D22\u5F15\u4FE1\u606F\n    -C  \u66F4\u6539\u4E3A\u6307\u5B9A\u7684\u76EE\u5F55\u5E76\u5305\u542B\u5176\u4E2D\u7684\u6587\u4EF6\n\u5982\u679C\u6709\u4EFB\u4F55\u76EE\u5F55\u6587\u4EF6, \u5219\u5BF9\u5176\u8FDB\u884C\u9012\u5F52\u5904\u7406\u3002\n\u6E05\u5355\u6587\u4EF6\u540D, \u5F52\u6863\u6587\u4EF6\u540D\u548C\u5165\u53E3\u70B9\u540D\u79F0\u7684\u6307\u5B9A\u987A\u5E8F\n\u4E0E 'm', 'f' \u548C 'e' \u6807\u8BB0\u7684\u6307\u5B9A\u987A\u5E8F\u76F8\u540C\u3002\n\n\u793A\u4F8B 1: \u5C06\u4E24\u4E2A\u7C7B\u6587\u4EF6\u5F52\u6863\u5230\u4E00\u4E2A\u540D\u4E3A classes.jar \u7684\u5F52\u6863\u6587\u4EF6\u4E2D: \n       jar cvf classes.jar Foo.class Bar.class \n\u793A\u4F8B 2: \u4F7F\u7528\u73B0\u6709\u7684\u6E05\u5355\u6587\u4EF6 'mymanifest' \u5E76\n           \u5C06 foo/ \u76EE\u5F55\u4E2D\u7684\u6240\u6709\u6587\u4EF6\u5F52\u6863\u5230 'classes.jar' \u4E2D: \n       jar cvfm classes.jar mymanifest -C foo/\u3002\n
--- a/jdk/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,9 +39,9 @@
 out.adding=\u65B0\u589E: {0}
 out.deflated=(\u58D3\u7E2E {0}%)
 out.stored=(\u5132\u5B58 0%)
-out.create=\ \ \u5EFA\u7ACB: {0}
+out.create=\  \u5EFA\u7ACB: {0}
 out.extracted=\u64F7\u53D6: {0}
 out.inflated=\ \\\u64F4\u5C55: {0}
 out.size=\ (\u8B80={0})(\u5BEB={1})
 
-usage=\u7528\u6CD5: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] \u6A94\u6848 ...\n\u9078\u9805:\n\ \   -c  \u5EFA\u7ACB\u65B0\u7684\u6B78\u6A94\n\ \   -t  \u5217\u51FA\u6B78\u6A94\u7684\u76EE\u9304\n\ \   -x  \u5F9E\u6B78\u6A94\u4E2D\u64F7\u53D6\u5DF2\u547D\u540D\u7684 (\u6216\u6240\u6709) \u6A94\u6848\n\ \   -u  \u66F4\u65B0\u73FE\u6709\u6B78\u6A94\n\ \   -v  \u5728\u6A19\u6E96\u8F38\u51FA\u4E2D\u7522\u751F\u8A73\u7D30\u8F38\u51FA\n\ \   -f  \u6307\u5B9A\u6B78\u6A94\u6A94\u6848\u540D\u7A31\n\ \   -m  \u5305\u542B\u6307\u5B9A\u8CC7\u8A0A\u6E05\u55AE\u4E2D\u7684\u8CC7\u8A0A\u6E05\u55AE\u8CC7\u8A0A\n\ \   -e  \u70BA\u7368\u7ACB\u61C9\u7528\u7A0B\u5F0F\u6307\u5B9A\u61C9\u7528\u7A0B\u5F0F\u9032\u5165\u9EDE\n\ \       \u5DF2\u96A8\u9644\u65BC\u53EF\u57F7\u884C jar \u6A94\u6848\u4E2D\n\ \   -0  \u50C5\u5132\u5B58; \u4E0D\u4F7F\u7528 ZIP \u58D3\u7E2E\u65B9\u5F0F\n\ \   -M  \u4E0D\u70BA\u9805\u76EE\u5EFA\u7ACB\u8CC7\u8A0A\u6E05\u55AE\u6A94\u6848\n\ \   -i  \u70BA\u6307\u5B9A\u7684 jar \u6A94\u6848\u7522\u751F\u7D22\u5F15\u8CC7\u8A0A\n\ \   -C  \u8B8A\u66F4\u81F3\u6307\u5B9A\u76EE\u9304\u4E26\u5305\u542B\u5F8C\u9762\u6240\u5217\u7684\u6A94\u6848\n\u5982\u679C\u6709\u4EFB\u4F55\u6A94\u6848\u662F\u76EE\u9304\uFF0C\u5247\u6703\u5C0D\u5176\u9032\u884C\u905E\u8FF4\u8655\u7406\u3002\n\u6E05\u55AE\u6A94\u6848\u540D\u7A31\u3001\u6B78\u6A94\u6A94\u6848\u540D\u7A31\u548C\u9032\u5165\u9EDE\u540D\u7A31\n\u7684\u6307\u5B9A\u9806\u5E8F\u8207\u6307\u5B9A 'm' \u65D7\u6A19\u3001'f' \u65D7\u6A19\u548C 'e' \u65D7\u6A19\u7684\u9806\u5E8F\u76F8\u540C\u3002\n\n\u7BC4\u4F8B 1: \u5C07\u5169\u500B\u985E\u5225\u6A94\u6848\u6B78\u6A94\u81F3\u540D\u70BA classes.jar \u7684\u6B78\u6A94\u4E2D: \n\ \      jar cvf classes.jar Foo.class Bar.class\n\u7BC4\u4F8B 2: \u4F7F\u7528\u73FE\u6709\u8CC7\u8A0A\u6E05\u55AE\u6A94\u6848 'mymanifest' \u4E26\u5C07\n\ \          foo/ \u76EE\u9304\u4E2D\u7684\u6240\u6709\u6A94\u6848\u6B78\u6A94\u81F3 'classes.jar' \u4E2D: \n\ \      jar cvfm classes.jar mymanifest -C foo/ .\n
+usage=\u7528\u6CD5: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] \u6A94\u6848 ...\n\u9078\u9805:\n    -c  \u5EFA\u7ACB\u65B0\u7684\u6B78\u6A94\n    -t  \u5217\u51FA\u6B78\u6A94\u7684\u76EE\u9304\n    -x  \u5F9E\u6B78\u6A94\u4E2D\u64F7\u53D6\u5DF2\u547D\u540D\u7684 (\u6216\u6240\u6709) \u6A94\u6848\n    -u  \u66F4\u65B0\u73FE\u6709\u6B78\u6A94\n    -v  \u5728\u6A19\u6E96\u8F38\u51FA\u4E2D\u7522\u751F\u8A73\u7D30\u8F38\u51FA\n    -f  \u6307\u5B9A\u6B78\u6A94\u6A94\u6848\u540D\u7A31\n    -m  \u5305\u542B\u6307\u5B9A\u8CC7\u8A0A\u6E05\u55AE\u4E2D\u7684\u8CC7\u8A0A\u6E05\u55AE\u8CC7\u8A0A\n    -e  \u70BA\u7368\u7ACB\u61C9\u7528\u7A0B\u5F0F\u6307\u5B9A\u61C9\u7528\u7A0B\u5F0F\u9032\u5165\u9EDE\n        \u5DF2\u96A8\u9644\u65BC\u53EF\u57F7\u884C jar \u6A94\u6848\u4E2D\n    -0  \u50C5\u5132\u5B58; \u4E0D\u4F7F\u7528 ZIP \u58D3\u7E2E\u65B9\u5F0F\n    -M  \u4E0D\u70BA\u9805\u76EE\u5EFA\u7ACB\u8CC7\u8A0A\u6E05\u55AE\u6A94\u6848\n    -i  \u70BA\u6307\u5B9A\u7684 jar \u6A94\u6848\u7522\u751F\u7D22\u5F15\u8CC7\u8A0A\n    -C  \u8B8A\u66F4\u81F3\u6307\u5B9A\u76EE\u9304\u4E26\u5305\u542B\u5F8C\u9762\u6240\u5217\u7684\u6A94\u6848\n\u5982\u679C\u6709\u4EFB\u4F55\u6A94\u6848\u662F\u76EE\u9304\uFF0C\u5247\u6703\u5C0D\u5176\u9032\u884C\u905E\u8FF4\u8655\u7406\u3002\n\u6E05\u55AE\u6A94\u6848\u540D\u7A31\u3001\u6B78\u6A94\u6A94\u6848\u540D\u7A31\u548C\u9032\u5165\u9EDE\u540D\u7A31\n\u7684\u6307\u5B9A\u9806\u5E8F\u8207\u6307\u5B9A 'm' \u65D7\u6A19\u3001'f' \u65D7\u6A19\u548C 'e' \u65D7\u6A19\u7684\u9806\u5E8F\u76F8\u540C\u3002\n\n\u7BC4\u4F8B 1: \u5C07\u5169\u500B\u985E\u5225\u6A94\u6848\u6B78\u6A94\u81F3\u540D\u70BA classes.jar \u7684\u6B78\u6A94\u4E2D: \n       jar cvf classes.jar Foo.class Bar.class\n\u7BC4\u4F8B 2: \u4F7F\u7528\u73FE\u6709\u8CC7\u8A0A\u6E05\u55AE\u6A94\u6848 'mymanifest' \u4E26\u5C07\n           foo/ \u76EE\u9304\u4E2D\u7684\u6240\u6709\u6A94\u6848\u6B78\u6A94\u81F3 'classes.jar' \u4E2D: \n       jar cvfm classes.jar mymanifest -C foo/ .\n
--- a/jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,15 +1,15 @@
-ONE_DAY=\ 1\u65e5
+ONE_DAY=\ 1\u65E5
 ONE_HOUR=\ 1\u6642\u9593
 ONE_MIN=\ 1\u5206
-ONE_MONTH=\ 1\u304b\u6708
-ONE_YEAR=\ 1\u5e74
+ONE_MONTH=\ 1\u304B\u6708
+ONE_YEAR=\ 1\u5E74
 TWO_HOURS=\ 2\u6642\u9593
 THREE_HOURS=\ 3\u6642\u9593
-THREE_MONTHS=\ 3\u304b\u6708
+THREE_MONTHS=\ 3\u304B\u6708
 FIVE_MIN=\ 5\u5206
 SIX_HOURS=\ 6\u6642\u9593
-SIX_MONTHS=\ 6\u304b\u6708
-SEVEN_DAYS=\ 7\u65e5
+SIX_MONTHS=\ 6\u304B\u6708
+SEVEN_DAYS=\ 7\u65E5
 TEN_MIN=10\u5206
 TWELVE_HOURS=12\u6642\u9593
 THIRTY_MIN=30\u5206
@@ -19,255 +19,255 @@
 ACTION_CAPITALIZED=ACTION
 ACTION_INFO_CAPITALIZED=ACTION_INFO
 ALL=\u3059\u3079\u3066
-ARCHITECTURE=\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3
-ATTRIBUTE=\u5c5e\u6027
-ATTRIBUTE_VALUE=\u5c5e\u6027\u5024
-ATTRIBUTE_VALUES=\u5c5e\u6027\u5024
-ATTRIBUTES=\u5c5e\u6027
-BLANK=\u30d6\u30e9\u30f3\u30af
-BLOCKED_COUNT_WAITED_COUNT=\u30d6\u30ed\u30c3\u30af\u6e08\u5408\u8a08: {0}  \u5f85\u6a5f\u6e08\u5408\u8a08: {1}\n
-BOOT_CLASS_PATH=\u30d6\u30fc\u30c8\u30fb\u30af\u30e9\u30b9\u30d1\u30b9
-BORDERED_COMPONENT_MORE_OR_LESS_BUTTON_TOOLTIP=\u8868\u793a\u3059\u308b\u60c5\u5831\u91cf\u3092\u5897\u6e1b\u3059\u308b\u30c8\u30b0\u30eb
-CPU_USAGE=CPU\u4f7f\u7528\u7387
-CPU_USAGE_FORMAT=CPU\u4f7f\u7528\u7387: {0}%
-CANCEL=\u53d6\u6d88
-CASCADE=\u91cd\u306d\u3066\u8868\u793a(&C)
-CHART_COLON=\u30c1\u30e3\u30fc\u30c8(&C):
-CLASS_PATH=\u30af\u30e9\u30b9\u30d1\u30b9
+ARCHITECTURE=\u30A2\u30FC\u30AD\u30C6\u30AF\u30C1\u30E3
+ATTRIBUTE=\u5C5E\u6027
+ATTRIBUTE_VALUE=\u5C5E\u6027\u5024
+ATTRIBUTE_VALUES=\u5C5E\u6027\u5024
+ATTRIBUTES=\u5C5E\u6027
+BLANK=\u30D6\u30E9\u30F3\u30AF
+BLOCKED_COUNT_WAITED_COUNT=\u30D6\u30ED\u30C3\u30AF\u6E08\u5408\u8A08: {0}  \u5F85\u6A5F\u6E08\u5408\u8A08: {1}\n
+BOOT_CLASS_PATH=\u30D6\u30FC\u30C8\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9
+BORDERED_COMPONENT_MORE_OR_LESS_BUTTON_TOOLTIP=\u8868\u793A\u3059\u308B\u60C5\u5831\u91CF\u3092\u5897\u6E1B\u3059\u308B\u30C8\u30B0\u30EB
+CPU_USAGE=CPU\u4F7F\u7528\u7387
+CPU_USAGE_FORMAT=CPU\u4F7F\u7528\u7387: {0}%
+CANCEL=\u53D6\u6D88
+CASCADE=\u91CD\u306D\u3066\u8868\u793A(&C)
+CHART_COLON=\u30C1\u30E3\u30FC\u30C8(&C):
+CLASS_PATH=\u30AF\u30E9\u30B9\u30D1\u30B9
 CLASS_NAME=ClassName
-CLASS_TAB_INFO_LABEL_FORMAT=<html>\u30ed\u30fc\u30c9\u6e08: {0}    \u672a\u30ed\u30fc\u30c9: {1}    \u5408\u8a08: {2}</html>
-CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME=\u30ed\u30fc\u30c9\u6e08\u30af\u30e9\u30b9\u306e\u30c1\u30e3\u30fc\u30c8\u3002
-CLASSES=\u30af\u30e9\u30b9
-CLOSE=\u9589\u3058\u308b
-COLUMN_NAME=\u540d\u524d
+CLASS_TAB_INFO_LABEL_FORMAT=<html>\u30ED\u30FC\u30C9\u6E08: {0}    \u672A\u30ED\u30FC\u30C9: {1}    \u5408\u8A08: {2}</html>
+CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME=\u30ED\u30FC\u30C9\u6E08\u30AF\u30E9\u30B9\u306E\u30C1\u30E3\u30FC\u30C8\u3002
+CLASSES=\u30AF\u30E9\u30B9
+CLOSE=\u9589\u3058\u308B
+COLUMN_NAME=\u540D\u524D
 COLUMN_PID=PID
-COMMITTED_MEMORY=\u30b3\u30df\u30c3\u30c8\u6e08\u30e1\u30e2\u30ea\u30fc
-COMMITTED_VIRTUAL_MEMORY=\u30b3\u30df\u30c3\u30c8\u6e08\u4eee\u60f3\u30e1\u30e2\u30ea\u30fc
-COMMITTED=\u30b3\u30df\u30c3\u30c8\u6e08
-CONNECT=\u63a5\u7d9a(&C)
-CONNECT_DIALOG_CONNECT_BUTTON_TOOLTIP=Java\u4eee\u60f3\u30de\u30b7\u30f3\u306b\u63a5\u7d9a
-CONNECT_DIALOG_ACCESSIBLE_DESCRIPTION=\u30ed\u30fc\u30ab\u30eb\u307e\u305f\u306f\u30ea\u30e2\u30fc\u30c8\u306eJava\u4eee\u60f3\u30de\u30b7\u30f3\u3078\u306e\u65b0\u898f\u63a5\u7d9a\u3092\u884c\u3046\u30c0\u30a4\u30a2\u30ed\u30b0
-CONNECT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u30de\u30b9\u30c8\u30d8\u30c3\u30c9\u56f3\u5f62
-CONNECT_DIALOG_MASTHEAD_TITLE=\u65b0\u898f\u63a5\u7d9a
-CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME=\u30b9\u30c6\u30fc\u30bf\u30b9\u30fb\u30d0\u30fc
-CONNECT_DIALOG_TITLE=JConsole: \u65b0\u898f\u63a5\u7d9a
-CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_=\u63a5\u7d9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u30af\u30ea\u30c3\u30af\u3059\u308b\u3068\u5207\u65ad\u3057\u307e\u3059\u3002
-CONNECTION_FAILED=\u63a5\u7d9a\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-CONNECTION=\u63a5\u7d9a(&C)
-CONNECTION_NAME=\u63a5\u7d9a\u540d
-CONNECTION_NAME__DISCONNECTED_={0} (\u5207\u65ad\u6e08)
-CONSTRUCTOR=\u30b3\u30f3\u30b9\u30c8\u30e9\u30af\u30bf
-CURRENT_CLASSES_LOADED=\u30ed\u30fc\u30c9\u6e08\u306e\u73fe\u5728\u306e\u30af\u30e9\u30b9
-CURRENT_HEAP_SIZE=\u73fe\u5728\u306e\u30d2\u30fc\u30d7\u30fb\u30b5\u30a4\u30ba
-CURRENT_VALUE=\u73fe\u5728\u5024: {0}
-CREATE=\u4f5c\u6210
-DAEMON_THREADS=\u30c7\u30fc\u30e2\u30f3\u30fb\u30b9\u30ec\u30c3\u30c9
-DISCONNECTED_PUNCTUATION_CLICK_TO_CONNECT_=\u5207\u65ad\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u30af\u30ea\u30c3\u30af\u3059\u308b\u3068\u63a5\u7d9a\u3057\u307e\u3059\u3002
-DOUBLE_CLICK_TO_EXPAND_FORWARD_SLASH_COLLAPSE=\u5c55\u958b\u307e\u305f\u306f\u7e2e\u5c0f\u3059\u308b\u306b\u306f\u30c0\u30d6\u30eb\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044
-DOUBLE_CLICK_TO_VISUALIZE=\u8996\u899a\u5316\u3059\u308b\u306b\u306f\u30c0\u30d6\u30eb\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044
-DESCRIPTION=\u8aac\u660e
-DESCRIPTOR=\u8a18\u8ff0\u5b50
-DETAILS=\u8a73\u7d30
-DETECT_DEADLOCK=\u30c7\u30c3\u30c9\u30ed\u30c3\u30af\u306e\u691c\u51fa(&D)
-DETECT_DEADLOCK_TOOLTIP=\u30c7\u30c3\u30c9\u30ed\u30c3\u30af\u6e08\u30b9\u30ec\u30c3\u30c9\u306e\u691c\u51fa
-DIMENSION_IS_NOT_SUPPORTED_COLON=\u6b21\u5143\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093:
-DISCARD_CHART=\u30c1\u30e3\u30fc\u30c8\u306e\u7834\u68c4
-DURATION_DAYS_HOURS_MINUTES={0,choice,1#{0,number,integer}\u65e5|1.0<{0,number,integer}\u65e5}{1,choice,0<{1,number,integer}\u6642\u9593|1#{1,number,integer}\u6642\u9593|1<{1,number,integer}\u6642\u9593}{2,choice,0<{2,number,integer}\u5206|1#{2,number,integer}\u5206|1.0<{2,number,integer}\u5206}
+COMMITTED_MEMORY=\u30B3\u30DF\u30C3\u30C8\u6E08\u30E1\u30E2\u30EA\u30FC
+COMMITTED_VIRTUAL_MEMORY=\u30B3\u30DF\u30C3\u30C8\u6E08\u4EEE\u60F3\u30E1\u30E2\u30EA\u30FC
+COMMITTED=\u30B3\u30DF\u30C3\u30C8\u6E08
+CONNECT=\u63A5\u7D9A(&C)
+CONNECT_DIALOG_CONNECT_BUTTON_TOOLTIP=Java\u4EEE\u60F3\u30DE\u30B7\u30F3\u306B\u63A5\u7D9A
+CONNECT_DIALOG_ACCESSIBLE_DESCRIPTION=\u30ED\u30FC\u30AB\u30EB\u307E\u305F\u306F\u30EA\u30E2\u30FC\u30C8\u306EJava\u4EEE\u60F3\u30DE\u30B7\u30F3\u3078\u306E\u65B0\u898F\u63A5\u7D9A\u3092\u884C\u3046\u30C0\u30A4\u30A2\u30ED\u30B0
+CONNECT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u30DE\u30B9\u30C8\u30D8\u30C3\u30C9\u56F3\u5F62
+CONNECT_DIALOG_MASTHEAD_TITLE=\u65B0\u898F\u63A5\u7D9A
+CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME=\u30B9\u30C6\u30FC\u30BF\u30B9\u30FB\u30D0\u30FC
+CONNECT_DIALOG_TITLE=JConsole: \u65B0\u898F\u63A5\u7D9A
+CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_=\u63A5\u7D9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u5207\u65AD\u3057\u307E\u3059\u3002
+CONNECTION_FAILED=\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+CONNECTION=\u63A5\u7D9A(&C)
+CONNECTION_NAME=\u63A5\u7D9A\u540D
+CONNECTION_NAME__DISCONNECTED_={0} (\u5207\u65AD\u6E08)
+CONSTRUCTOR=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
+CURRENT_CLASSES_LOADED=\u30ED\u30FC\u30C9\u6E08\u306E\u73FE\u5728\u306E\u30AF\u30E9\u30B9
+CURRENT_HEAP_SIZE=\u73FE\u5728\u306E\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA
+CURRENT_VALUE=\u73FE\u5728\u5024: {0}
+CREATE=\u4F5C\u6210
+DAEMON_THREADS=\u30C7\u30FC\u30E2\u30F3\u30FB\u30B9\u30EC\u30C3\u30C9
+DISCONNECTED_PUNCTUATION_CLICK_TO_CONNECT_=\u5207\u65AD\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u3068\u63A5\u7D9A\u3057\u307E\u3059\u3002
+DOUBLE_CLICK_TO_EXPAND_FORWARD_SLASH_COLLAPSE=\u5C55\u958B\u307E\u305F\u306F\u7E2E\u5C0F\u3059\u308B\u306B\u306F\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044
+DOUBLE_CLICK_TO_VISUALIZE=\u8996\u899A\u5316\u3059\u308B\u306B\u306F\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044
+DESCRIPTION=\u8AAC\u660E
+DESCRIPTOR=\u8A18\u8FF0\u5B50
+DETAILS=\u8A73\u7D30
+DETECT_DEADLOCK=\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF\u306E\u691C\u51FA(&D)
+DETECT_DEADLOCK_TOOLTIP=\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF\u6E08\u30B9\u30EC\u30C3\u30C9\u306E\u691C\u51FA
+DIMENSION_IS_NOT_SUPPORTED_COLON=\u6B21\u5143\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093:
+DISCARD_CHART=\u30C1\u30E3\u30FC\u30C8\u306E\u7834\u68C4
+DURATION_DAYS_HOURS_MINUTES={0,choice,1#{0,number,integer}\u65E5|1.0<{0,number,integer}\u65E5}{1,choice,0<{1,number,integer}\u6642\u9593|1#{1,number,integer}\u6642\u9593|1<{1,number,integer}\u6642\u9593}{2,choice,0<{2,number,integer}\u5206|1#{2,number,integer}\u5206|1.0<{2,number,integer}\u5206}
 DURATION_HOURS_MINUTES={0,choice,1#{0,number,integer}\u6642\u9593|1<{0,number,integer}\u6642\u9593}{1,choice,0<{1,number,integer}\u5206|1#{1,number,integer}\u5206|1.0<{1,number,integer}\u5206}
 DURATION_MINUTES={0,choice,1#{0,number,integer}\u5206|1.0<{0,number,integer}\u5206}
-DURATION_SECONDS={0}\u79d2
-EMPTY_ARRAY=\u7a7a\u306e\u914d\u5217
-ERROR=\u30a8\u30e9\u30fc
-ERROR_COLON_MBEANS_ALREADY_EXIST=\u30a8\u30e9\u30fc: MBeans\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059
-ERROR_COLON_MBEANS_DO_NOT_EXIST=\u30a8\u30e9\u30fc: MBeans\u306f\u5b58\u5728\u3057\u307e\u305b\u3093
-EVENT=\u30a4\u30d9\u30f3\u30c8
-EXIT=\u7d42\u4e86(&X)
-FAIL_TO_LOAD_PLUGIN=\u8b66\u544a: \u30d7\u30e9\u30b0\u30a4\u30f3\u306e\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0}
-FILE_CHOOSER_FILE_EXISTS_CANCEL_OPTION=\u53d6\u6d88
-FILE_CHOOSER_FILE_EXISTS_MESSAGE=<html><center>\u30d5\u30a1\u30a4\u30eb\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u3066\u3044\u307e\u3059:<br>{0}<br>\u7f6e\u63db\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b\u3002
-FILE_CHOOSER_FILE_EXISTS_OK_OPTION=\u7f6e\u63db
-FILE_CHOOSER_FILE_EXISTS_TITLE=\u30d5\u30a1\u30a4\u30eb\u304c\u5b58\u5728\u3057\u3066\u3044\u307e\u3059
-FILE_CHOOSER_SAVED_FILE=<html>\u30d5\u30a1\u30a4\u30eb\u306b\u4fdd\u5b58\u3057\u307e\u3057\u305f:<br>{0}<br>({1}\u30d0\u30a4\u30c8)
-FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>\u30d5\u30a1\u30a4\u30eb\u3078\u306e\u4fdd\u5b58\u306b\u5931\u6557\u3057\u307e\u3057\u305f:<br>{0}<br>{1}
-FILE_CHOOSER_SAVE_FAILED_TITLE=\u4fdd\u5b58\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-FREE_PHYSICAL_MEMORY=\u7a7a\u304d\u7269\u7406\u30e1\u30e2\u30ea\u30fc
-FREE_SWAP_SPACE=\u7a7a\u304d\u30b9\u30ef\u30c3\u30d7\u30fb\u30b9\u30da\u30fc\u30b9
-GARBAGE_COLLECTOR=\u30ac\u30d9\u30fc\u30b8\u30fb\u30b3\u30ec\u30af\u30bf
-GC_INFO=\u540d\u524d= ''{0}''\u3001\u30b3\u30ec\u30af\u30b7\u30e7\u30f3= {1,choice,-1#\u3042\u308a\u307e\u305b\u3093|0#{1,number,integer}\u500b}\u3001\u5408\u8a08\u6d88\u8cbb\u6642\u9593= {2}
+DURATION_SECONDS={0}\u79D2
+EMPTY_ARRAY=\u7A7A\u306E\u914D\u5217
+ERROR=\u30A8\u30E9\u30FC
+ERROR_COLON_MBEANS_ALREADY_EXIST=\u30A8\u30E9\u30FC: MBeans\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059
+ERROR_COLON_MBEANS_DO_NOT_EXIST=\u30A8\u30E9\u30FC: MBeans\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
+EVENT=\u30A4\u30D9\u30F3\u30C8
+EXIT=\u7D42\u4E86(&X)
+FAIL_TO_LOAD_PLUGIN=\u8B66\u544A: \u30D7\u30E9\u30B0\u30A4\u30F3\u306E\u30ED\u30FC\u30C9\u306B\u5931\u6557\u3057\u307E\u3057\u305F: {0}
+FILE_CHOOSER_FILE_EXISTS_CANCEL_OPTION=\u53D6\u6D88
+FILE_CHOOSER_FILE_EXISTS_MESSAGE=<html><center>\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059:<br>{0}<br>\u7F6E\u63DB\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B\u3002
+FILE_CHOOSER_FILE_EXISTS_OK_OPTION=\u7F6E\u63DB
+FILE_CHOOSER_FILE_EXISTS_TITLE=\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u3059
+FILE_CHOOSER_SAVED_FILE=<html>\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58\u3057\u307E\u3057\u305F:<br>{0}<br>({1}\u30D0\u30A4\u30C8)
+FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u4FDD\u5B58\u306B\u5931\u6557\u3057\u307E\u3057\u305F:<br>{0}<br>{1}
+FILE_CHOOSER_SAVE_FAILED_TITLE=\u4FDD\u5B58\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+FREE_PHYSICAL_MEMORY=\u7A7A\u304D\u7269\u7406\u30E1\u30E2\u30EA\u30FC
+FREE_SWAP_SPACE=\u7A7A\u304D\u30B9\u30EF\u30C3\u30D7\u30FB\u30B9\u30DA\u30FC\u30B9
+GARBAGE_COLLECTOR=\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30BF
+GC_INFO=\u540D\u524D= ''{0}''\u3001\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3= {1,choice,-1#\u3042\u308A\u307E\u305B\u3093|0#{1,number,integer}\u500B}\u3001\u5408\u8A08\u6D88\u8CBB\u6642\u9593= {2}
 GC_TIME=GC\u6642\u9593
-GC_TIME_DETAILS={1}\u3067{0} ({2}\u500b\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3)
-HEAP_MEMORY_USAGE=\u30d2\u30fc\u30d7\u30fb\u30e1\u30e2\u30ea\u30fc\u4f7f\u7528\u7387
-HEAP=\u30d2\u30fc\u30d7
-HELP_ABOUT_DIALOG_ACCESSIBLE_DESCRIPTION=JConsole\u3068JDK\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306b\u3064\u3044\u3066\u306e\u60c5\u5831\u3092\u542b\u3080\u30c0\u30a4\u30a2\u30ed\u30b0
-HELP_ABOUT_DIALOG_JCONSOLE_VERSION=JConsole\u30d0\u30fc\u30b8\u30e7\u30f3:<br>{0}
-HELP_ABOUT_DIALOG_JAVA_VERSION=Java VM\u30d0\u30fc\u30b8\u30e7\u30f3:<br>{0}
-HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u30de\u30b9\u30c8\u30d8\u30c3\u30c9\u56f3\u5f62
-HELP_ABOUT_DIALOG_MASTHEAD_TITLE=JConsole\u306b\u3064\u3044\u3066
-HELP_ABOUT_DIALOG_TITLE=JConsole: \u8a73\u7d30
-HELP_ABOUT_DIALOG_USER_GUIDE_LINK=JConsole\u30e6\u30fc\u30b6\u30fc\u30fb\u30ac\u30a4\u30c9(&U):<br>{0}
+GC_TIME_DETAILS={1}\u3067{0} ({2}\u500B\u306E\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3)
+HEAP_MEMORY_USAGE=\u30D2\u30FC\u30D7\u30FB\u30E1\u30E2\u30EA\u30FC\u4F7F\u7528\u7387
+HEAP=\u30D2\u30FC\u30D7
+HELP_ABOUT_DIALOG_ACCESSIBLE_DESCRIPTION=JConsole\u3068JDK\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u542B\u3080\u30C0\u30A4\u30A2\u30ED\u30B0
+HELP_ABOUT_DIALOG_JCONSOLE_VERSION=JConsole\u30D0\u30FC\u30B8\u30E7\u30F3:<br>{0}
+HELP_ABOUT_DIALOG_JAVA_VERSION=Java VM\u30D0\u30FC\u30B8\u30E7\u30F3:<br>{0}
+HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u30DE\u30B9\u30C8\u30D8\u30C3\u30C9\u56F3\u5F62
+HELP_ABOUT_DIALOG_MASTHEAD_TITLE=JConsole\u306B\u3064\u3044\u3066
+HELP_ABOUT_DIALOG_TITLE=JConsole: \u8A73\u7D30
+HELP_ABOUT_DIALOG_USER_GUIDE_LINK=JConsole\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(&U):<br>{0}
 HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html
-HELP_MENU_ABOUT_TITLE=JConsole\u306b\u3064\u3044\u3066(&A)
-HELP_MENU_USER_GUIDE_TITLE=\u30aa\u30f3\u30e9\u30a4\u30f3\u30fb\u30e6\u30fc\u30b6\u30fc\u30fb\u30ac\u30a4\u30c9(&U)
-HELP_MENU_TITLE=\u30d8\u30eb\u30d7(&H)
+HELP_MENU_ABOUT_TITLE=JConsole\u306B\u3064\u3044\u3066(&A)
+HELP_MENU_USER_GUIDE_TITLE=\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(&U)
+HELP_MENU_TITLE=\u30D8\u30EB\u30D7(&H)
 HOTSPOT_MBEANS_ELLIPSIS=Hotspot MBeans(&H)...
-HOTSPOT_MBEANS_DIALOG_ACCESSIBLE_DESCRIPTION=Hotspot MBeans\u306e\u7ba1\u7406\u7528\u30c0\u30a4\u30a2\u30ed\u30b0
-IMPACT=\u5f71\u97ff
-INFO=\u60c5\u5831
-INFO_CAPITALIZED=\u60c5\u5831
-INVALID_PLUGIN_PATH=\u8b66\u544a: \u7121\u52b9\u306a\u30d7\u30e9\u30b0\u30a4\u30f3\u30fb\u30d1\u30b9: {0}
-INVALID_URL=\u7121\u52b9\u306aURL: {0}
-IS=\u6b21\u306b\u4e00\u81f4\u3059\u308b
+HOTSPOT_MBEANS_DIALOG_ACCESSIBLE_DESCRIPTION=Hotspot MBeans\u306E\u7BA1\u7406\u7528\u30C0\u30A4\u30A2\u30ED\u30B0
+IMPACT=\u5F71\u97FF
+INFO=\u60C5\u5831
+INFO_CAPITALIZED=INFO
+INVALID_PLUGIN_PATH=\u8B66\u544A: \u7121\u52B9\u306A\u30D7\u30E9\u30B0\u30A4\u30F3\u30FB\u30D1\u30B9: {0}
+INVALID_URL=\u7121\u52B9\u306AURL: {0}
+IS=\u6B21\u306B\u4E00\u81F4\u3059\u308B
 JAVA_MONITORING___MANAGEMENT_CONSOLE=Java Monitoring && Management Console
 JCONSOLE_COLON_=JConsole: {0}
-JCONSOLE_VERSION=JConsole\u30d0\u30fc\u30b8\u30e7\u30f3"{0}"
+JCONSOLE_VERSION=JConsole\u30D0\u30FC\u30B8\u30E7\u30F3"{0}"
 JCONSOLE_ACCESSIBLE_DESCRIPTION=Java Monitoring && Management Console
-JIT_COMPILER=JIT\u30b3\u30f3\u30d1\u30a4\u30e9
-LIBRARY_PATH=\u30e9\u30a4\u30d6\u30e9\u30ea\u30fb\u30d1\u30b9
-LIVE_THREADS=\u5b9f\u884c\u4e2d\u306e\u30b9\u30ec\u30c3\u30c9
-LOADED=\u30ed\u30fc\u30c9\u6e08
-LOCAL_PROCESS_COLON=\u30ed\u30fc\u30ab\u30eb\u30fb\u30d7\u30ed\u30bb\u30b9(&L):
+JIT_COMPILER=JIT\u30B3\u30F3\u30D1\u30A4\u30E9
+LIBRARY_PATH=\u30E9\u30A4\u30D6\u30E9\u30EA\u30FB\u30D1\u30B9
+LIVE_THREADS=\u5B9F\u884C\u4E2D\u306E\u30B9\u30EC\u30C3\u30C9
+LOADED=\u30ED\u30FC\u30C9\u6E08
+LOCAL_PROCESS_COLON=\u30ED\u30FC\u30AB\u30EB\u30FB\u30D7\u30ED\u30BB\u30B9(&L):
 MASTHEAD_FONT=Dialog-PLAIN-25
-MANAGEMENT_NOT_ENABLED=<b>\u6ce8\u610f</b>: \u7ba1\u7406\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u306f\u3053\u306e\u30d7\u30ed\u30bb\u30b9\u3067\u306f\u6709\u52b9\u5316\u3055\u308c\u307e\u305b\u3093\u3002
-MANAGEMENT_WILL_BE_ENABLED=<b>\u6ce8\u610f</b>: \u7ba1\u7406\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u306f\u3053\u306e\u30d7\u30ed\u30bb\u30b9\u3067\u6709\u52b9\u5316\u3055\u308c\u307e\u3059\u3002
+MANAGEMENT_NOT_ENABLED=<b>\u6CE8\u610F</b>: \u7BA1\u7406\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u306F\u3053\u306E\u30D7\u30ED\u30BB\u30B9\u3067\u306F\u6709\u52B9\u5316\u3055\u308C\u307E\u305B\u3093\u3002
+MANAGEMENT_WILL_BE_ENABLED=<b>\u6CE8\u610F</b>: \u7BA1\u7406\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u306F\u3053\u306E\u30D7\u30ED\u30BB\u30B9\u3067\u6709\u52B9\u5316\u3055\u308C\u307E\u3059\u3002
 MBEAN_ATTRIBUTE_INFO=MBeanAttributeInfo
 MBEAN_INFO=MBeanInfo
 MBEAN_NOTIFICATION_INFO=MBeanNotificationInfo
 MBEAN_OPERATION_INFO=MBeanOperationInfo
 MBEANS=MBeans
-MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON=\u30af\u30ea\u30a2(&C)
-MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON_TOOLTIP=\u901a\u77e5\u306e\u30af\u30ea\u30a2
-MBEANS_TAB_COMPOSITE_NAVIGATION_MULTIPLE=\u30b3\u30f3\u30dd\u30b8\u30c3\u30c8\u30fb\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3{0}/{1}
-MBEANS_TAB_COMPOSITE_NAVIGATION_SINGLE=\u30b3\u30f3\u30dd\u30b8\u30c3\u30c8\u30fb\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
-MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5(&R)
-MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON_TOOLTIP=\u5c5e\u6027\u306e\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
-MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON=\u30b5\u30d6\u30b9\u30af\u30e9\u30a4\u30d6(&S)
-MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u901a\u77e5\u30ea\u30b9\u30cb\u30f3\u30b0\u306e\u958b\u59cb
-MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=\u30bf\u30d6\u30fb\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3{0}/{1}
-MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=\u30bf\u30d6\u30fb\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
-MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=\u30b5\u30d6\u30b9\u30af\u30e9\u30a4\u30d6\u89e3\u9664(&U)
-MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u901a\u77e5\u30ea\u30b9\u30cb\u30f3\u30b0\u306e\u505c\u6b62
-MANAGE_HOTSPOT_MBEANS_IN_COLON_=Hotspot MBeans\u306e\u7ba1\u7406:
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON=\u30AF\u30EA\u30A2(&C)
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON_TOOLTIP=\u901A\u77E5\u306E\u30AF\u30EA\u30A2
+MBEANS_TAB_COMPOSITE_NAVIGATION_MULTIPLE=\u30B3\u30F3\u30DD\u30B8\u30C3\u30C8\u30FB\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3{0}/{1}
+MBEANS_TAB_COMPOSITE_NAVIGATION_SINGLE=\u30B3\u30F3\u30DD\u30B8\u30C3\u30C8\u30FB\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
+MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5(&R)
+MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON_TOOLTIP=\u5C5E\u6027\u306E\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
+MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON=\u30B5\u30D6\u30B9\u30AF\u30E9\u30A4\u30D6(&S)
+MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u901A\u77E5\u30EA\u30B9\u30CB\u30F3\u30B0\u306E\u958B\u59CB
+MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=\u30BF\u30D6\u30FB\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3{0}/{1}
+MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=\u30BF\u30D6\u30FB\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=\u30B5\u30D6\u30B9\u30AF\u30E9\u30A4\u30D6\u89E3\u9664(&U)
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u901A\u77E5\u30EA\u30B9\u30CB\u30F3\u30B0\u306E\u505C\u6B62
+MANAGE_HOTSPOT_MBEANS_IN_COLON_=Hotspot MBeans\u306E\u7BA1\u7406:
 MAX=\u6700\u5927
-MAXIMUM_HEAP_SIZE=\u6700\u5927\u30d2\u30fc\u30d7\u30fb\u30b5\u30a4\u30ba
-MEMORY=\u30e1\u30e2\u30ea\u30fc
-MEMORY_POOL_LABEL=\u30e1\u30e2\u30ea\u30fc\u30fb\u30d7\u30fc\u30eb"{0}"
-MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME=\u30d2\u30fc\u30d7\u7528\u306e\u30e1\u30e2\u30ea\u30fc\u4f7f\u7528\u7387\u30c1\u30e3\u30fc\u30c8\u3002
-MEMORY_TAB_INFO_LABEL_FORMAT=<html>\u4f7f\u7528\u6e08: {0}    \u30b3\u30df\u30c3\u30c8\u6e08: {1}    \u6700\u5927: {2}</html>
-MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME=\u975e\u30d2\u30fc\u30d7\u7528\u306e\u30e1\u30e2\u30ea\u30fc\u4f7f\u7528\u7387\u30c1\u30e3\u30fc\u30c8\u3002
-MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD={0}\u306e\u3057\u304d\u3044\u5024\u3088\u308a\u4e0a\u3067\u3059\u3002\n
-MEMORY_TAB_POOL_CHART_ACCESSIBLE_NAME=\u30e1\u30e2\u30ea\u30fc\u30fb\u30d7\u30fc\u30eb\u4f7f\u7528\u7387\u30c1\u30e3\u30fc\u30c8\u3002
-MEMORY_TAB_POOL_CHART_BELOW_THRESHOLD={0}\u306e\u3057\u304d\u3044\u5024\u3088\u308a\u4e0b\u3067\u3059\u3002\n
-MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME={0}\u306e\u30e1\u30e2\u30ea\u30fc\u4f7f\u7528\u7387\u30c1\u30e3\u30fc\u30c8\u3002
-MESSAGE=\u30e1\u30c3\u30bb\u30fc\u30b8
-METHOD_SUCCESSFULLY_INVOKED=\u30e1\u30bd\u30c3\u30c9\u304c\u6b63\u5e38\u306b\u8d77\u52d5\u3055\u308c\u307e\u3057\u305f
-MINIMIZE_ALL=\u3059\u3079\u3066\u6700\u5c0f\u5316(&M)
-MONITOR_LOCKED=\ \ \ - \u30ed\u30c3\u30af\u6e08{0}\n
-NAME=\u540d\u524d
-NAME_AND_BUILD={0} (\u30d3\u30eb\u30c9{1})
-NAME_STATE=\u540d\u524d: {0}\n\u72b6\u614b: {1}\n
-NAME_STATE_LOCK_NAME=\u540d\u524d: {0}\n\u72b6\u614b: {2}\u306e{1}\n
-NAME_STATE_LOCK_NAME_LOCK_OWNER=\u540d\u524d: {0}\n\u72b6\u614b: {2}\u306e{1}\u3001\u6240\u6709\u8005: {3}\n
-NEW_CONNECTION_ELLIPSIS=\u65b0\u898f\u63a5\u7d9a(&N)...
-NO_DEADLOCK_DETECTED=\u30c7\u30c3\u30c9\u30ed\u30c3\u30af\u304c\u691c\u51fa\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f
-NON_HEAP_MEMORY_USAGE=\u975e\u30d2\u30fc\u30d7\u30fb\u30e1\u30e2\u30ea\u30fc\u4f7f\u7528\u7387
-NON_HEAP=\u975e\u30d2\u30fc\u30d7
-NOTIFICATION=\u901a\u77e5
-NOTIFICATION_BUFFER=\u901a\u77e5\u30d0\u30c3\u30d5\u30a1
-NOTIFICATIONS=\u901a\u77e5
+MAXIMUM_HEAP_SIZE=\u6700\u5927\u30D2\u30FC\u30D7\u30FB\u30B5\u30A4\u30BA
+MEMORY=\u30E1\u30E2\u30EA\u30FC
+MEMORY_POOL_LABEL=\u30E1\u30E2\u30EA\u30FC\u30FB\u30D7\u30FC\u30EB"{0}"
+MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME=\u30D2\u30FC\u30D7\u7528\u306E\u30E1\u30E2\u30EA\u30FC\u4F7F\u7528\u7387\u30C1\u30E3\u30FC\u30C8\u3002
+MEMORY_TAB_INFO_LABEL_FORMAT=<html>\u4F7F\u7528\u6E08: {0}    \u30B3\u30DF\u30C3\u30C8\u6E08: {1}    \u6700\u5927: {2}</html>
+MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME=\u975E\u30D2\u30FC\u30D7\u7528\u306E\u30E1\u30E2\u30EA\u30FC\u4F7F\u7528\u7387\u30C1\u30E3\u30FC\u30C8\u3002
+MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD={0}\u306E\u3057\u304D\u3044\u5024\u3088\u308A\u4E0A\u3067\u3059\u3002\n
+MEMORY_TAB_POOL_CHART_ACCESSIBLE_NAME=\u30E1\u30E2\u30EA\u30FC\u30FB\u30D7\u30FC\u30EB\u4F7F\u7528\u7387\u30C1\u30E3\u30FC\u30C8\u3002
+MEMORY_TAB_POOL_CHART_BELOW_THRESHOLD={0}\u306E\u3057\u304D\u3044\u5024\u3088\u308A\u4E0B\u3067\u3059\u3002\n
+MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME={0}\u306E\u30E1\u30E2\u30EA\u30FC\u4F7F\u7528\u7387\u30C1\u30E3\u30FC\u30C8\u3002
+MESSAGE=\u30E1\u30C3\u30BB\u30FC\u30B8
+METHOD_SUCCESSFULLY_INVOKED=\u30E1\u30BD\u30C3\u30C9\u304C\u6B63\u5E38\u306B\u8D77\u52D5\u3055\u308C\u307E\u3057\u305F
+MINIMIZE_ALL=\u3059\u3079\u3066\u6700\u5C0F\u5316(&M)
+MONITOR_LOCKED=\   - \u30ED\u30C3\u30AF\u6E08{0}\n
+NAME=\u540D\u524D
+NAME_AND_BUILD={0} (\u30D3\u30EB\u30C9{1})
+NAME_STATE=\u540D\u524D: {0}\n\u72B6\u614B: {1}\n
+NAME_STATE_LOCK_NAME=\u540D\u524D: {0}\n\u72B6\u614B: {2}\u306E{1}\n
+NAME_STATE_LOCK_NAME_LOCK_OWNER=\u540D\u524D: {0}\n\u72B6\u614B: {2}\u306E{1}\u3001\u6240\u6709\u8005: {3}\n
+NEW_CONNECTION_ELLIPSIS=\u65B0\u898F\u63A5\u7D9A(&N)...
+NO_DEADLOCK_DETECTED=\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF\u304C\u691C\u51FA\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F
+NON_HEAP_MEMORY_USAGE=\u975E\u30D2\u30FC\u30D7\u30FB\u30E1\u30E2\u30EA\u30FC\u4F7F\u7528\u7387
+NON_HEAP=\u975E\u30D2\u30FC\u30D7
+NOTIFICATION=\u901A\u77E5
+NOTIFICATION_BUFFER=\u901A\u77E5\u30D0\u30C3\u30D5\u30A1
+NOTIFICATIONS=\u901A\u77E5
 NOTIF_TYPES=NotifTypes
-NUMBER_OF_THREADS=\u30b9\u30ec\u30c3\u30c9\u6570
-NUMBER_OF_LOADED_CLASSES=\u30ed\u30fc\u30c9\u6e08\u30af\u30e9\u30b9\u6570
-NUMBER_OF_PROCESSORS=\u30d7\u30ed\u30bb\u30c3\u30b5\u6570
+NUMBER_OF_THREADS=\u30B9\u30EC\u30C3\u30C9\u6570
+NUMBER_OF_LOADED_CLASSES=\u30ED\u30FC\u30C9\u6E08\u30AF\u30E9\u30B9\u6570
+NUMBER_OF_PROCESSORS=\u30D7\u30ED\u30BB\u30C3\u30B5\u6570
 OBJECT_NAME=ObjectName
-OPERATING_SYSTEM=\u30aa\u30da\u30ec\u30fc\u30c6\u30a3\u30f3\u30b0\u30fb\u30b7\u30b9\u30c6\u30e0
-OPERATION=\u64cd\u4f5c
-OPERATION_INVOCATION=\u64cd\u4f5c\u306e\u547c\u51fa\u3057
-OPERATION_RETURN_VALUE=\u64cd\u4f5c\u306e\u623b\u308a\u5024
-OPERATIONS=\u64cd\u4f5c
+OPERATING_SYSTEM=\u30AA\u30DA\u30EC\u30FC\u30C6\u30A3\u30F3\u30B0\u30FB\u30B7\u30B9\u30C6\u30E0
+OPERATION=\u64CD\u4F5C
+OPERATION_INVOCATION=\u64CD\u4F5C\u306E\u547C\u51FA\u3057
+OPERATION_RETURN_VALUE=\u64CD\u4F5C\u306E\u623B\u308A\u5024
+OPERATIONS=\u64CD\u4F5C
 OVERVIEW=\u6982\u8981
-OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME={0}\u306e\u30c1\u30e3\u30fc\u30c8\u3002
-PARAMETER=\u30d1\u30e9\u30e1\u30fc\u30bf
-PASSWORD_ACCESSIBLE_NAME=\u30d1\u30b9\u30ef\u30fc\u30c9
-PASSWORD_COLON_=\u30d1\u30b9\u30ef\u30fc\u30c9(P):
-PEAK=\u30d4\u30fc\u30af
-PERFORM_GC=GC\u306e\u5b9f\u884c(G)
-PERFORM_GC_TOOLTIP=\u30ac\u30d9\u30fc\u30b8\u30fb\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u306e\u30ea\u30af\u30a8\u30b9\u30c8
-PLOTTER_ACCESSIBLE_NAME=\u30c1\u30e3\u30fc\u30c8
+OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME={0}\u306E\u30C1\u30E3\u30FC\u30C8\u3002
+PARAMETER=\u30D1\u30E9\u30E1\u30FC\u30BF
+PASSWORD_ACCESSIBLE_NAME=\u30D1\u30B9\u30EF\u30FC\u30C9
+PASSWORD_COLON_=\u30D1\u30B9\u30EF\u30FC\u30C9(&P):
+PEAK=\u30D4\u30FC\u30AF
+PERFORM_GC=GC\u306E\u5B9F\u884C(&G)
+PERFORM_GC_TOOLTIP=\u30AC\u30D9\u30FC\u30B8\u30FB\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u306E\u30EA\u30AF\u30A8\u30B9\u30C8
+PLOTTER_ACCESSIBLE_NAME=\u30C1\u30E3\u30FC\u30C8
 PLOTTER_ACCESSIBLE_NAME_KEY_AND_VALUE={0}={1}\n
-PLOTTER_ACCESSIBLE_NAME_NO_DATA=\u30c7\u30fc\u30bf\u304c\u30d7\u30ed\u30c3\u30c8\u3055\u308c\u307e\u305b\u3093\u3002
-PLOTTER_SAVE_AS_MENU_ITEM=\u540d\u524d\u3092\u4ed8\u3051\u3066\u30c7\u30fc\u30bf\u3092\u4fdd\u5b58(&A)...
-PLOTTER_TIME_RANGE_MENU=\u6642\u9593\u7bc4\u56f2(&T)
-PROBLEM_ADDING_LISTENER=\u30ea\u30b9\u30ca\u30fc\u8ffd\u52a0\u4e2d\u306e\u554f\u984c
-PROBLEM_DISPLAYING_MBEAN=MBean\u8868\u793a\u4e2d\u306e\u554f\u984c
-PROBLEM_INVOKING=\u547c\u51fa\u3057\u4e2d\u306e\u554f\u984c
-PROBLEM_REMOVING_LISTENER=\u30ea\u30b9\u30ca\u30fc\u524a\u9664\u4e2d\u306e\u554f\u984c
-PROBLEM_SETTING_ATTRIBUTE=\u5c5e\u6027\u8a2d\u5b9a\u4e2d\u306e\u554f\u984c
-PROCESS_CPU_TIME=\u30d7\u30ed\u30bb\u30b9CPU\u6642\u9593
-READABLE=\u8aad\u53d6\u308a\u53ef\u80fd
-RECONNECT=\u518d\u63a5\u7d9a
-REMOTE_PROCESS_COLON=\u30ea\u30e2\u30fc\u30c8\u30fb\u30d7\u30ed\u30bb\u30b9(&R):
-REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=\u30ea\u30e2\u30fc\u30c8\u30fb\u30d7\u30ed\u30bb\u30b9
-RESTORE_ALL=\u3059\u3079\u3066\u5fa9\u5143(&R)
+PLOTTER_ACCESSIBLE_NAME_NO_DATA=\u30C7\u30FC\u30BF\u304C\u30D7\u30ED\u30C3\u30C8\u3055\u308C\u307E\u305B\u3093\u3002
+PLOTTER_SAVE_AS_MENU_ITEM=\u540D\u524D\u3092\u4ED8\u3051\u3066\u30C7\u30FC\u30BF\u3092\u4FDD\u5B58(&A)...
+PLOTTER_TIME_RANGE_MENU=\u6642\u9593\u7BC4\u56F2(&T)
+PROBLEM_ADDING_LISTENER=\u30EA\u30B9\u30CA\u30FC\u8FFD\u52A0\u4E2D\u306E\u554F\u984C
+PROBLEM_DISPLAYING_MBEAN=MBean\u8868\u793A\u4E2D\u306E\u554F\u984C
+PROBLEM_INVOKING=\u547C\u51FA\u3057\u4E2D\u306E\u554F\u984C
+PROBLEM_REMOVING_LISTENER=\u30EA\u30B9\u30CA\u30FC\u524A\u9664\u4E2D\u306E\u554F\u984C
+PROBLEM_SETTING_ATTRIBUTE=\u5C5E\u6027\u8A2D\u5B9A\u4E2D\u306E\u554F\u984C
+PROCESS_CPU_TIME=\u30D7\u30ED\u30BB\u30B9CPU\u6642\u9593
+READABLE=\u8AAD\u53D6\u308A\u53EF\u80FD
+RECONNECT=\u518D\u63A5\u7D9A
+REMOTE_PROCESS_COLON=\u30EA\u30E2\u30FC\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9(&R):
+REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=\u30EA\u30E2\u30FC\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9
+RESTORE_ALL=\u3059\u3079\u3066\u5FA9\u5143(&R)
 RETURN_TYPE=ReturnType
 SEQ_NUM=SeqNum
-SIZE_BYTES={0,number,integer}\u30d0\u30a4\u30c8
+SIZE_BYTES={0,number,integer}\u30D0\u30A4\u30C8
 SIZE_GB={0} Gb
 SIZE_KB={0} Kb
 SIZE_MB={0} Mb
-SOURCE=\u30bd\u30fc\u30b9
-STACK_TRACE=\n\u30b9\u30bf\u30c3\u30af\u30fb\u30c8\u30ec\u30fc\u30b9: \n
+SOURCE=\u30BD\u30FC\u30B9
+STACK_TRACE=\n\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9: \n
 SUMMARY_TAB_HEADER_DATE_TIME_FORMAT=FULL,FULL
-SUMMARY_TAB_PENDING_FINALIZATION_LABEL=\u30d5\u30a1\u30a4\u30ca\u30e9\u30a4\u30ba\u306e\u30da\u30f3\u30c7\u30a3\u30f3\u30b0
-SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0}\u500b\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8
-SUMMARY_TAB_TAB_NAME=VM\u30b5\u30de\u30ea\u30fc
-SUMMARY_TAB_VM_VERSION={0}\u30d0\u30fc\u30b8\u30e7\u30f3{1}
-THREADS=\u30b9\u30ec\u30c3\u30c9
-THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=\u30b9\u30ec\u30c3\u30c9\u60c5\u5831
-THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=\u30b9\u30ec\u30c3\u30c9\u6570\u306e\u30c1\u30e3\u30fc\u30c8\u3002
-THRESHOLD=\u3057\u304d\u3044\u5024
-TILE=\u4e26\u3079\u3066\u8868\u793a(&T)
-TIME_RANGE_COLON=\u6642\u9593\u7bc4\u56f2(&T):
+SUMMARY_TAB_PENDING_FINALIZATION_LABEL=\u30D5\u30A1\u30A4\u30CA\u30E9\u30A4\u30BA\u306E\u30DA\u30F3\u30C7\u30A3\u30F3\u30B0
+SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0}\u500B\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8
+SUMMARY_TAB_TAB_NAME=VM\u30B5\u30DE\u30EA\u30FC
+SUMMARY_TAB_VM_VERSION={0}\u30D0\u30FC\u30B8\u30E7\u30F3{1}
+THREADS=\u30B9\u30EC\u30C3\u30C9
+THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=\u30B9\u30EC\u30C3\u30C9\u60C5\u5831
+THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=\u30B9\u30EC\u30C3\u30C9\u6570\u306E\u30C1\u30E3\u30FC\u30C8\u3002
+THRESHOLD=\u3057\u304D\u3044\u5024
+TILE=\u4E26\u3079\u3066\u8868\u793A(&T)
+TIME_RANGE_COLON=\u6642\u9593\u7BC4\u56F2(&T):
 TIME=\u6642\u9593
 TIME_STAMP=TimeStamp
-TOTAL_LOADED=\u30ed\u30fc\u30c9\u6e08\u5408\u8a08
-TOTAL_CLASSES_LOADED=\u30ed\u30fc\u30c9\u6e08\u30af\u30e9\u30b9\u5408\u8a08
-TOTAL_CLASSES_UNLOADED=\u30a2\u30f3\u30ed\u30fc\u30c9\u6e08\u30af\u30e9\u30b9\u5408\u8a08
-TOTAL_COMPILE_TIME=\u5408\u8a08\u30b3\u30f3\u30d1\u30a4\u30eb\u6642\u9593
-TOTAL_PHYSICAL_MEMORY=\u5408\u8a08\u7269\u7406\u30e1\u30e2\u30ea\u30fc
-TOTAL_THREADS_STARTED=\u958b\u59cb\u6e08\u5408\u8a08\u30b9\u30ec\u30c3\u30c9
-TOTAL_SWAP_SPACE=\u5408\u8a08\u30b9\u30ef\u30c3\u30d7\u30fb\u30b9\u30da\u30fc\u30b9
-TYPE=\u578b
-UNAVAILABLE=\u5229\u7528\u4e0d\u53ef
+TOTAL_LOADED=\u30ED\u30FC\u30C9\u6E08\u5408\u8A08
+TOTAL_CLASSES_LOADED=\u30ED\u30FC\u30C9\u6E08\u30AF\u30E9\u30B9\u5408\u8A08
+TOTAL_CLASSES_UNLOADED=\u30A2\u30F3\u30ED\u30FC\u30C9\u6E08\u30AF\u30E9\u30B9\u5408\u8A08
+TOTAL_COMPILE_TIME=\u5408\u8A08\u30B3\u30F3\u30D1\u30A4\u30EB\u6642\u9593
+TOTAL_PHYSICAL_MEMORY=\u5408\u8A08\u7269\u7406\u30E1\u30E2\u30EA\u30FC
+TOTAL_THREADS_STARTED=\u958B\u59CB\u6E08\u5408\u8A08\u30B9\u30EC\u30C3\u30C9
+TOTAL_SWAP_SPACE=\u5408\u8A08\u30B9\u30EF\u30C3\u30D7\u30FB\u30B9\u30DA\u30FC\u30B9
+TYPE=\u30BF\u30A4\u30D7
+UNAVAILABLE=\u5229\u7528\u4E0D\u53EF
 UNKNOWN_CAPITALIZED=UNKNOWN
-UNKNOWN_HOST=\u4e0d\u660e\u306a\u30db\u30b9\u30c8: {0}
-UNREGISTER=\u767b\u9332\u89e3\u9664
-UPTIME=\u7a3c\u50cd\u6642\u9593
-USAGE_THRESHOLD=\u4f7f\u7528\u3057\u304d\u3044\u5024
-REMOTE_TF_USAGE=<b>\u4f7f\u7528\u65b9\u6cd5</b>: &lt;hostname&gt;:&lt;port&gt;\u307e\u305f\u306fservice:jmx:&lt;protocol&gt;:&lt;sap&gt;
-USED=\u4f7f\u7528\u6e08
-USERNAME_COLON_=\u30e6\u30fc\u30b6\u30fc\u540d(&U):
-USERNAME_ACCESSIBLE_NAME=\u30e6\u30fc\u30b6\u30fc\u540d
+UNKNOWN_HOST=\u4E0D\u660E\u306A\u30DB\u30B9\u30C8: {0}
+UNREGISTER=\u767B\u9332\u89E3\u9664
+UPTIME=\u7A3C\u50CD\u6642\u9593
+USAGE_THRESHOLD=\u4F7F\u7528\u3057\u304D\u3044\u5024
+REMOTE_TF_USAGE=<b>\u4F7F\u7528\u65B9\u6CD5</b>: &lt;hostname&gt;:&lt;port&gt;\u307E\u305F\u306Fservice:jmx:&lt;protocol&gt;:&lt;sap&gt;
+USED=\u4F7F\u7528\u6E08
+USERNAME_COLON_=\u30E6\u30FC\u30B6\u30FC\u540D(&U):
+USERNAME_ACCESSIBLE_NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 USER_DATA=UserData
-VIRTUAL_MACHINE=\u4eee\u60f3\u30de\u30b7\u30f3
-VM_ARGUMENTS=VM\u5f15\u6570
-VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=Java\u4eee\u60f3\u30de\u30b7\u30f3\u306e\u30e2\u30cb\u30bf\u30fc\u7528\u306e\u5185\u90e8\u30d5\u30ec\u30fc\u30e0
+VIRTUAL_MACHINE=\u4EEE\u60F3\u30DE\u30B7\u30F3
+VM_ARGUMENTS=VM\u5F15\u6570
+VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=Java\u4EEE\u60F3\u30DE\u30B7\u30F3\u306E\u30E2\u30CB\u30BF\u30FC\u7528\u306E\u5185\u90E8\u30D5\u30EC\u30FC\u30E0
 VALUE=\u5024
-VENDOR=\u30d9\u30f3\u30c0\u30fc
-VERBOSE_OUTPUT=\u8a73\u7d30\u51fa\u529b
-VERBOSE_OUTPUT_TOOLTIP=\u30af\u30e9\u30b9\u8aad\u8fbc\u307f\u30b7\u30b9\u30c6\u30e0\u3067\u8a73\u7d30\u51fa\u529b\u3092\u6709\u52b9\u306b\u3059\u308b
-VIEW=\u8868\u793a
-WINDOW=\u30a6\u30a3\u30f3\u30c9\u30a6(&W)
-WINDOWS=\u30a6\u30a3\u30f3\u30c9\u30a6
-WRITABLE=\u66f8\u8fbc\u307f\u53ef\u80fd
-CONNECTION_FAILED1=\u63a5\u7d9a\u306b\u5931\u6557\u3057\u307e\u3057\u305f: \u518d\u8a66\u884c\u3057\u307e\u3059\u304b\u3002
-CONNECTION_FAILED2={0}\u3078\u306e\u63a5\u7d9a\u304c\u6210\u529f\u3057\u307e\u305b\u3093\u3067\u3057\u305f\u3002<br>\u3082\u3046\u4e00\u5ea6\u8a66\u3057\u307e\u3059\u304b\u3002
-CONNECTION_LOST1=\u63a5\u7d9a\u304c\u5931\u308f\u308c\u307e\u3057\u305f: \u518d\u63a5\u7d9a\u3057\u307e\u3059\u304b\u3002
-CONNECTING_TO1={0}\u306b\u63a5\u7d9a\u4e2d
-CONNECTING_TO2={0}\u306b\u73fe\u5728\u63a5\u7d9a\u4e2d\u3067\u3059\u3002<br>\u3053\u308c\u306b\u306f\u6570\u5206\u304b\u304b\u308a\u307e\u3059\u3002
-DEADLOCK_TAB=\u30c7\u30c3\u30c9\u30ed\u30c3\u30af
-DEADLOCK_TAB_N=\u30c7\u30c3\u30c9\u30ed\u30c3\u30af{0}
-EXPAND=\u5c55\u958b
+VENDOR=\u30D9\u30F3\u30C0\u30FC
+VERBOSE_OUTPUT=\u8A73\u7D30\u51FA\u529B
+VERBOSE_OUTPUT_TOOLTIP=\u30AF\u30E9\u30B9\u8AAD\u8FBC\u307F\u30B7\u30B9\u30C6\u30E0\u3067\u8A73\u7D30\u51FA\u529B\u3092\u6709\u52B9\u306B\u3059\u308B
+VIEW=\u8868\u793A
+WINDOW=\u30A6\u30A3\u30F3\u30C9\u30A6(&W)
+WINDOWS=\u30A6\u30A3\u30F3\u30C9\u30A6
+WRITABLE=\u66F8\u8FBC\u307F\u53EF\u80FD
+CONNECTION_FAILED1=\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F: \u518D\u8A66\u884C\u3057\u307E\u3059\u304B\u3002
+CONNECTION_FAILED2={0}\u3078\u306E\u63A5\u7D9A\u304C\u6210\u529F\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002<br>\u3082\u3046\u4E00\u5EA6\u8A66\u3057\u307E\u3059\u304B\u3002
+CONNECTION_LOST1=\u63A5\u7D9A\u304C\u5931\u308F\u308C\u307E\u3057\u305F: \u518D\u63A5\u7D9A\u3057\u307E\u3059\u304B\u3002
+CONNECTING_TO1={0}\u306B\u63A5\u7D9A\u4E2D
+CONNECTING_TO2={0}\u306B\u73FE\u5728\u63A5\u7D9A\u4E2D\u3067\u3059\u3002<br>\u3053\u308C\u306B\u306F\u6570\u5206\u304B\u304B\u308A\u307E\u3059\u3002
+DEADLOCK_TAB=\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF
+DEADLOCK_TAB_N=\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF{0}
+EXPAND=\u5C55\u958B
 KBYTES={0} KB
-PLOT=\u30d7\u30ed\u30c3\u30c8
-VISUALIZE=\u8996\u899a\u5316
-ZZ_USAGE_TEXT=\u4f7f\u7528\u65b9\u6cd5: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n  -interval   \u66f4\u65b0\u9593\u9694\u3092n\u79d2\u306b\u8a2d\u5b9a\u3059\u308b(\u30c7\u30d5\u30a9\u30eb\u30c8\u306f4\u79d2)\n  -notile     \u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u6700\u521d\u306b\u4e26\u3079\u3066\u8868\u793a\u3057\u306a\u3044(2\u3064\u4ee5\u4e0a\u306e\u63a5\u7d9a\u306b\u3064\u3044\u3066)\n  -pluginpath JConsole\u304c\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u53c2\u7167\u3059\u308b\u305f\u3081\u306b\u4f7f\u7528\u3059\u308b\u30d1\u30b9\u3092\u6307\u5b9a\u3059\u308b\n  -version    \u30d7\u30ed\u30b0\u30e9\u30e0\u30fb\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u5370\u5237\u3059\u308b\n\n  connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n  pid         \u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30d7\u30ed\u30bb\u30b9\u306e\u30d7\u30ed\u30bb\u30b9ID\n  host        \u30ea\u30e2\u30fc\u30c8\u30fb\u30db\u30b9\u30c8\u540d\u307e\u305f\u306fIP\u30a2\u30c9\u30ec\u30b9\n  port        \u30ea\u30e2\u30fc\u30c8\u63a5\u7d9a\u7528\u306e\u30dd\u30fc\u30c8\u756a\u53f7\n\n  -J          JConsole\u304c\u5b9f\u884c\u4e2d\u306eJava\u4eee\u60f3\u30de\u30b7\u30f3\u3078\u306e\n              \u5165\u529b\u5f15\u6570\u3092\u6307\u5b9a\u3059\u308b
+PLOT=\u30D7\u30ED\u30C3\u30C8
+VISUALIZE=\u8996\u899A\u5316
+ZZ_USAGE_TEXT=\u4F7F\u7528\u65B9\u6CD5: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n  -interval   \u66F4\u65B0\u9593\u9694\u3092n\u79D2\u306B\u8A2D\u5B9A\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8\u306F4\u79D2)\n  -notile     \u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u6700\u521D\u306B\u4E26\u3079\u3066\u8868\u793A\u3057\u306A\u3044(2\u3064\u4EE5\u4E0A\u306E\u63A5\u7D9A\u306B\u3064\u3044\u3066)\n  -pluginpath JConsole\u304C\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u53C2\u7167\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3059\u308B\u30D1\u30B9\u3092\u6307\u5B9A\u3059\u308B\n  -version    \u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u5370\u5237\u3059\u308B\n\n  connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n  pid         \u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9\u306E\u30D7\u30ED\u30BB\u30B9ID\n  host        \u30EA\u30E2\u30FC\u30C8\u30FB\u30DB\u30B9\u30C8\u540D\u307E\u305F\u306FIP\u30A2\u30C9\u30EC\u30B9\n  port        \u30EA\u30E2\u30FC\u30C8\u63A5\u7D9A\u7528\u306E\u30DD\u30FC\u30C8\u756A\u53F7\n\n  -J          JConsole\u304C\u5B9F\u884C\u4E2D\u306EJava\u4EEE\u60F3\u30DE\u30B7\u30F3\u3078\u306E\n              \u5165\u529B\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B
--- a/jdk/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -1,273 +1,273 @@
 ONE_DAY=\ 1 \u5929
-ONE_HOUR=\ 1 \u5c0f\u65f6
-ONE_MIN=\ 1 \u5206\u949f
-ONE_MONTH=\ 1 \u4e2a\u6708
-ONE_YEAR=\ 1 \u5e74
-TWO_HOURS=\ 2 \u5c0f\u65f6
-THREE_HOURS=\ 3 \u5c0f\u65f6
-THREE_MONTHS=\ 3 \u4e2a\u6708
-FIVE_MIN=\ 5 \u5206\u949f
-SIX_HOURS=\ 6 \u5c0f\u65f6
-SIX_MONTHS=\ 6 \u4e2a\u6708
+ONE_HOUR=\ 1 \u5C0F\u65F6
+ONE_MIN=\ 1 \u5206\u949F
+ONE_MONTH=\ 1 \u4E2A\u6708
+ONE_YEAR=\ 1 \u5E74
+TWO_HOURS=\ 2 \u5C0F\u65F6
+THREE_HOURS=\ 3 \u5C0F\u65F6
+THREE_MONTHS=\ 3 \u4E2A\u6708
+FIVE_MIN=\ 5 \u5206\u949F
+SIX_HOURS=\ 6 \u5C0F\u65F6
+SIX_MONTHS=\ 6 \u4E2A\u6708
 SEVEN_DAYS=\ 7 \u5929
-TEN_MIN=10 \u5206\u949f
-TWELVE_HOURS=12 \u5c0f\u65f6
-THIRTY_MIN=30 \u5206\u949f
+TEN_MIN=10 \u5206\u949F
+TWELVE_HOURS=12 \u5C0F\u65F6
+THIRTY_MIN=30 \u5206\u949F
 LESS_THAN=<
 A_LOT_LESS_THAN=<<
 GREATER_THAN=>
 ACTION_CAPITALIZED=ACTION
 ACTION_INFO_CAPITALIZED=ACTION_INFO
-ALL=\u5168\u90e8
-ARCHITECTURE=\u4f53\u7cfb\u7ed3\u6784
-ATTRIBUTE=\u5c5e\u6027
-ATTRIBUTE_VALUE=\u5c5e\u6027\u503c
-ATTRIBUTE_VALUES=\u5c5e\u6027\u503c
-ATTRIBUTES=\u5c5e\u6027
-BLANK=\u7a7a\u767d
-BLOCKED_COUNT_WAITED_COUNT=\u603b\u963b\u6b62\u6570: {0}, \u603b\u7b49\u5f85\u6570: {1}\n
-BOOT_CLASS_PATH=\u5f15\u5bfc\u7c7b\u8def\u5f84
-BORDERED_COMPONENT_MORE_OR_LESS_BUTTON_TOOLTIP=\u5207\u6362\u4ee5\u663e\u793a\u66f4\u591a\u6216\u66f4\u5c11\u4fe1\u606f
+ALL=\u5168\u90E8
+ARCHITECTURE=\u4F53\u7CFB\u7ED3\u6784
+ATTRIBUTE=\u5C5E\u6027
+ATTRIBUTE_VALUE=\u5C5E\u6027\u503C
+ATTRIBUTE_VALUES=\u5C5E\u6027\u503C
+ATTRIBUTES=\u5C5E\u6027
+BLANK=\u7A7A\u767D
+BLOCKED_COUNT_WAITED_COUNT=\u603B\u963B\u6B62\u6570: {0}, \u603B\u7B49\u5F85\u6570: {1}\n
+BOOT_CLASS_PATH=\u5F15\u5BFC\u7C7B\u8DEF\u5F84
+BORDERED_COMPONENT_MORE_OR_LESS_BUTTON_TOOLTIP=\u5207\u6362\u4EE5\u663E\u793A\u66F4\u591A\u6216\u66F4\u5C11\u4FE1\u606F
 CPU_USAGE=CPU \u5360\u7528\u7387
 CPU_USAGE_FORMAT=CPU \u5360\u7528\u7387: {0}%
-CANCEL=\u53d6\u6d88
-CASCADE=\u5c42\u53e0(&C)
-CHART_COLON=\u56fe\u8868(&C):
-CLASS_PATH=\u7c7b\u8def\u5f84
+CANCEL=\u53D6\u6D88
+CASCADE=\u5C42\u53E0(&C)
+CHART_COLON=\u56FE\u8868(&C):
+CLASS_PATH=\u7C7B\u8DEF\u5F84
 CLASS_NAME=ClassName
-CLASS_TAB_INFO_LABEL_FORMAT=<html>\u5df2\u52a0\u8f7d: {0}    \u5df2\u5378\u8f7d: {1}    \u603b\u8ba1: {2}</html>
-CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME=\u5df2\u52a0\u8f7d\u7c7b\u7684\u56fe\u8868\u3002
-CLASSES=\u7c7b
-CLOSE=\u5173\u95ed
-COLUMN_NAME=\u540d\u79f0
+CLASS_TAB_INFO_LABEL_FORMAT=<html>\u5DF2\u52A0\u8F7D: {0}    \u5DF2\u5378\u8F7D: {1}    \u603B\u8BA1: {2}</html>
+CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME=\u5DF2\u52A0\u8F7D\u7C7B\u7684\u56FE\u8868\u3002
+CLASSES=\u7C7B
+CLOSE=\u5173\u95ED
+COLUMN_NAME=\u540D\u79F0
 COLUMN_PID=PID
-COMMITTED_MEMORY=\u63d0\u4ea4\u7684\u5185\u5b58
-COMMITTED_VIRTUAL_MEMORY=\u63d0\u4ea4\u7684\u865a\u62df\u5185\u5b58
-COMMITTED=\u5df2\u63d0\u4ea4
-CONNECT=\u8fde\u63a5(&C)
-CONNECT_DIALOG_CONNECT_BUTTON_TOOLTIP=\u8fde\u63a5\u5230 Java \u865a\u62df\u673a
-CONNECT_DIALOG_ACCESSIBLE_DESCRIPTION=\u7528\u4e8e\u4e0e\u672c\u5730\u6216\u8fdc\u7a0b Java \u865a\u62df\u673a\u5efa\u7acb\u65b0\u8fde\u63a5\u7684\u5bf9\u8bdd\u6846
-CONNECT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u62a5\u5934\u56fe
-CONNECT_DIALOG_MASTHEAD_TITLE=\u65b0\u5efa\u8fde\u63a5
-CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME=\u72b6\u6001\u680f
-CONNECT_DIALOG_TITLE=JConsole: \u65b0\u5efa\u8fde\u63a5
-CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_=\u5df2\u8fde\u63a5\u3002\u5355\u51fb\u53ef\u65ad\u5f00\u8fde\u63a5\u3002
-CONNECTION_FAILED=\u8fde\u63a5\u5931\u8d25
-CONNECTION=\u8fde\u63a5(&C)
-CONNECTION_NAME=\u8fde\u63a5\u540d\u79f0
-CONNECTION_NAME__DISCONNECTED_={0} (\u5df2\u65ad\u5f00\u8fde\u63a5)
+COMMITTED_MEMORY=\u63D0\u4EA4\u7684\u5185\u5B58
+COMMITTED_VIRTUAL_MEMORY=\u63D0\u4EA4\u7684\u865A\u62DF\u5185\u5B58
+COMMITTED=\u5DF2\u63D0\u4EA4
+CONNECT=\u8FDE\u63A5(&C)
+CONNECT_DIALOG_CONNECT_BUTTON_TOOLTIP=\u8FDE\u63A5\u5230 Java \u865A\u62DF\u673A
+CONNECT_DIALOG_ACCESSIBLE_DESCRIPTION=\u7528\u4E8E\u4E0E\u672C\u5730\u6216\u8FDC\u7A0B Java \u865A\u62DF\u673A\u5EFA\u7ACB\u65B0\u8FDE\u63A5\u7684\u5BF9\u8BDD\u6846
+CONNECT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u62A5\u5934\u56FE
+CONNECT_DIALOG_MASTHEAD_TITLE=\u65B0\u5EFA\u8FDE\u63A5
+CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME=\u72B6\u6001\u680F
+CONNECT_DIALOG_TITLE=JConsole: \u65B0\u5EFA\u8FDE\u63A5
+CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_=\u5DF2\u8FDE\u63A5\u3002\u5355\u51FB\u53EF\u65AD\u5F00\u8FDE\u63A5\u3002
+CONNECTION_FAILED=\u8FDE\u63A5\u5931\u8D25
+CONNECTION=\u8FDE\u63A5(&C)
+CONNECTION_NAME=\u8FDE\u63A5\u540D\u79F0
+CONNECTION_NAME__DISCONNECTED_={0} (\u5DF2\u65AD\u5F00\u8FDE\u63A5)
 CONSTRUCTOR=\u6784\u9020\u5668
-CURRENT_CLASSES_LOADED=\u5df2\u52a0\u88c5\u5f53\u524d\u7c7b
-CURRENT_HEAP_SIZE=\u5f53\u524d\u5806\u5927\u5c0f
-CURRENT_VALUE=\u5f53\u524d\u503c: {0}
-CREATE=\u521b\u5efa
-DAEMON_THREADS=\u5b88\u62a4\u7a0b\u5e8f\u7ebf\u7a0b
-DISCONNECTED_PUNCTUATION_CLICK_TO_CONNECT_=\u5df2\u65ad\u5f00\u8fde\u63a5\u3002\u5355\u51fb\u53ef\u8fde\u63a5\u3002
-DOUBLE_CLICK_TO_EXPAND_FORWARD_SLASH_COLLAPSE=\u53cc\u51fb\u4ee5\u5c55\u5f00/\u9690\u85cf
-DOUBLE_CLICK_TO_VISUALIZE=\u53cc\u51fb\u4ee5\u4f7f\u5176\u53ef\u89c1
-DESCRIPTION=\u8bf4\u660e
-DESCRIPTOR=\u63cf\u8ff0\u7b26
-DETAILS=\u8be6\u7ec6\u8d44\u6599
-DETECT_DEADLOCK=\u68c0\u6d4b\u6b7b\u9501(&D)
-DETECT_DEADLOCK_TOOLTIP=\u68c0\u6d4b\u5904\u4e8e\u6b7b\u9501\u72b6\u6001\u7684\u7ebf\u7a0b
-DIMENSION_IS_NOT_SUPPORTED_COLON=\u4e0d\u652f\u6301\u7ef4:
-DISCARD_CHART=\u653e\u5f03\u56fe\u8868
-DURATION_DAYS_HOURS_MINUTES={0,choice,1#{0,number,integer} \u5929 |1.0<{0,number,integer} \u5929 }{1,choice,0<{1,number,integer} \u5c0f\u65f6 |1#{1,number,integer} \u5c0f\u65f6 |1<{1,number,integer} \u5c0f\u65f6 }{2,choice,0<{2,number,integer} \u5206\u949f|1#{2,number,integer} \u5206\u949f|1.0<{2,number,integer} \u5206\u949f}
-DURATION_HOURS_MINUTES={0,choice,1#{0,number,integer} \u5c0f\u65f6 |1<{0,number,integer} \u5c0f\u65f6 }{1,choice,0<{1,number,integer} \u5206\u949f|1#{1,number,integer} \u5206\u949f|1.0<{1,number,integer} \u5206\u949f}
-DURATION_MINUTES={0,choice,1#{0,number,integer} \u5206\u949f|1.0<{0,number,integer} \u5206\u949f}
-DURATION_SECONDS={0} \u79d2
-EMPTY_ARRAY=\u7a7a\u6570\u7ec4
-ERROR=\u9519\u8bef
-ERROR_COLON_MBEANS_ALREADY_EXIST=\u9519\u8bef: MBean \u5df2\u5b58\u5728
-ERROR_COLON_MBEANS_DO_NOT_EXIST=\u9519\u8bef: MBean \u4e0d\u5b58\u5728
-EVENT=\u4e8b\u4ef6
-EXIT=\u9000\u51fa(&X)
-FAIL_TO_LOAD_PLUGIN=\u8b66\u544a: \u65e0\u6cd5\u52a0\u8f7d\u63d2\u4ef6: {0}
-FILE_CHOOSER_FILE_EXISTS_CANCEL_OPTION=\u53d6\u6d88
-FILE_CHOOSER_FILE_EXISTS_MESSAGE=<html><center>\u6587\u4ef6\u5df2\u5b58\u5728:<br>{0}<br>\u662f\u5426\u8981\u66ff\u6362?
-FILE_CHOOSER_FILE_EXISTS_OK_OPTION=\u66ff\u6362
-FILE_CHOOSER_FILE_EXISTS_TITLE=\u6587\u4ef6\u5df2\u5b58\u5728
-FILE_CHOOSER_SAVED_FILE=<html>\u5df2\u4fdd\u5b58\u5230\u6587\u4ef6:<br>{0}<br>({1} \u5b57\u8282)
-FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>\u672a\u80fd\u4fdd\u5b58\u5230\u6587\u4ef6:<br>{0}<br>{1}
-FILE_CHOOSER_SAVE_FAILED_TITLE=\u4fdd\u5b58\u5931\u8d25
-FREE_PHYSICAL_MEMORY=\u7a7a\u95f2\u7269\u7406\u5185\u5b58
-FREE_SWAP_SPACE=\u7a7a\u95f2\u4ea4\u6362\u7a7a\u95f4
-GARBAGE_COLLECTOR=\u5783\u573e\u6536\u96c6\u5668
-GC_INFO=\u540d\u79f0 = ''{0}'', \u6536\u96c6 = {1,choice,-1#Unavailable|0#{1,number,integer}}, \u603b\u82b1\u8d39\u65f6\u95f4 = {2}
-GC_TIME=GC \u65f6\u95f4
-GC_TIME_DETAILS={1}\u4e0a\u7684{0} ({2}\u6536\u96c6)
-HEAP_MEMORY_USAGE=\u5806\u5185\u5b58\u4f7f\u7528\u91cf
+CURRENT_CLASSES_LOADED=\u5DF2\u52A0\u88C5\u5F53\u524D\u7C7B
+CURRENT_HEAP_SIZE=\u5F53\u524D\u5806\u5927\u5C0F
+CURRENT_VALUE=\u5F53\u524D\u503C: {0}
+CREATE=\u521B\u5EFA
+DAEMON_THREADS=\u5B88\u62A4\u7A0B\u5E8F\u7EBF\u7A0B
+DISCONNECTED_PUNCTUATION_CLICK_TO_CONNECT_=\u5DF2\u65AD\u5F00\u8FDE\u63A5\u3002\u5355\u51FB\u53EF\u8FDE\u63A5\u3002
+DOUBLE_CLICK_TO_EXPAND_FORWARD_SLASH_COLLAPSE=\u53CC\u51FB\u4EE5\u5C55\u5F00/\u9690\u85CF
+DOUBLE_CLICK_TO_VISUALIZE=\u53CC\u51FB\u4EE5\u4F7F\u5176\u53EF\u89C1
+DESCRIPTION=\u8BF4\u660E
+DESCRIPTOR=\u63CF\u8FF0\u7B26
+DETAILS=\u8BE6\u7EC6\u4FE1\u606F
+DETECT_DEADLOCK=\u68C0\u6D4B\u6B7B\u9501(&D)
+DETECT_DEADLOCK_TOOLTIP=\u68C0\u6D4B\u5904\u4E8E\u6B7B\u9501\u72B6\u6001\u7684\u7EBF\u7A0B
+DIMENSION_IS_NOT_SUPPORTED_COLON=\u4E0D\u652F\u6301\u7EF4:
+DISCARD_CHART=\u653E\u5F03\u56FE\u8868
+DURATION_DAYS_HOURS_MINUTES={0,choice,1#{0,number,integer} \u5929 |1.0<{0,number,integer} \u5929 }{1,choice,0<{1,number,integer} \u5C0F\u65F6 |1#{1,number,integer} \u5C0F\u65F6 |1<{1,number,integer} \u5C0F\u65F6 }{2,choice,0<{2,number,integer} \u5206\u949F|1#{2,number,integer} \u5206\u949F|1.0<{2,number,integer} \u5206\u949F}
+DURATION_HOURS_MINUTES={0,choice,1#{0,number,integer} \u5C0F\u65F6 |1<{0,number,integer} \u5C0F\u65F6 }{1,choice,0<{1,number,integer} \u5206\u949F|1#{1,number,integer} \u5206\u949F|1.0<{1,number,integer} \u5206\u949F}
+DURATION_MINUTES={0,choice,1#{0,number,integer} \u5206\u949F|1.0<{0,number,integer} \u5206\u949F}
+DURATION_SECONDS={0} \u79D2
+EMPTY_ARRAY=\u7A7A\u6570\u7EC4
+ERROR=\u9519\u8BEF
+ERROR_COLON_MBEANS_ALREADY_EXIST=\u9519\u8BEF: MBean \u5DF2\u5B58\u5728
+ERROR_COLON_MBEANS_DO_NOT_EXIST=\u9519\u8BEF: MBean \u4E0D\u5B58\u5728
+EVENT=\u4E8B\u4EF6
+EXIT=\u9000\u51FA(&X)
+FAIL_TO_LOAD_PLUGIN=\u8B66\u544A: \u65E0\u6CD5\u52A0\u8F7D\u63D2\u4EF6: {0}
+FILE_CHOOSER_FILE_EXISTS_CANCEL_OPTION=\u53D6\u6D88
+FILE_CHOOSER_FILE_EXISTS_MESSAGE=<html><center>\u6587\u4EF6\u5DF2\u5B58\u5728:<br>{0}<br>\u662F\u5426\u8981\u66FF\u6362?
+FILE_CHOOSER_FILE_EXISTS_OK_OPTION=\u66FF\u6362
+FILE_CHOOSER_FILE_EXISTS_TITLE=\u6587\u4EF6\u5DF2\u5B58\u5728
+FILE_CHOOSER_SAVED_FILE=<html>\u5DF2\u4FDD\u5B58\u5230\u6587\u4EF6:<br>{0}<br>({1} \u5B57\u8282)
+FILE_CHOOSER_SAVE_FAILED_MESSAGE=<html><center>\u672A\u80FD\u4FDD\u5B58\u5230\u6587\u4EF6:<br>{0}<br>{1}
+FILE_CHOOSER_SAVE_FAILED_TITLE=\u4FDD\u5B58\u5931\u8D25
+FREE_PHYSICAL_MEMORY=\u7A7A\u95F2\u7269\u7406\u5185\u5B58
+FREE_SWAP_SPACE=\u7A7A\u95F2\u4EA4\u6362\u7A7A\u95F4
+GARBAGE_COLLECTOR=\u5783\u573E\u6536\u96C6\u5668
+GC_INFO=\u540D\u79F0 = ''{0}'', \u6536\u96C6 = {1,choice,-1#Unavailable|0#{1,number,integer}}, \u603B\u82B1\u8D39\u65F6\u95F4 = {2}
+GC_TIME=GC \u65F6\u95F4
+GC_TIME_DETAILS={1}\u4E0A\u7684{0} ({2}\u6536\u96C6)
+HEAP_MEMORY_USAGE=\u5806\u5185\u5B58\u4F7F\u7528\u91CF
 HEAP=\u5806
-HELP_ABOUT_DIALOG_ACCESSIBLE_DESCRIPTION=\u5305\u542b\u6709\u5173 JConsole \u548c JDK \u7248\u672c\u4fe1\u606f\u7684\u5bf9\u8bdd\u6846
-HELP_ABOUT_DIALOG_JCONSOLE_VERSION=JConsole \u7248\u672c:<br>{0}
-HELP_ABOUT_DIALOG_JAVA_VERSION=Java VM \u7248\u672c:<br>{0}
-HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u62a5\u5934\u56fe
-HELP_ABOUT_DIALOG_MASTHEAD_TITLE=\u5173\u4e8e JConsole
-HELP_ABOUT_DIALOG_TITLE=JConsole: \u5173\u4e8e
+HELP_ABOUT_DIALOG_ACCESSIBLE_DESCRIPTION=\u5305\u542B\u6709\u5173 JConsole \u548C JDK \u7248\u672C\u4FE1\u606F\u7684\u5BF9\u8BDD\u6846
+HELP_ABOUT_DIALOG_JCONSOLE_VERSION=JConsole \u7248\u672C:<br>{0}
+HELP_ABOUT_DIALOG_JAVA_VERSION=Java VM \u7248\u672C:<br>{0}
+HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u62A5\u5934\u56FE
+HELP_ABOUT_DIALOG_MASTHEAD_TITLE=\u5173\u4E8E JConsole
+HELP_ABOUT_DIALOG_TITLE=JConsole: \u5173\u4E8E
 HELP_ABOUT_DIALOG_USER_GUIDE_LINK=JConsole \u7528\u6237\u6307\u5357(&U):<br>{0}
 HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html
-HELP_MENU_ABOUT_TITLE=\u5173\u4e8e JConsole(&A)
-HELP_MENU_USER_GUIDE_TITLE=\u8054\u673a\u7528\u6237\u6307\u5357(&U)
-HELP_MENU_TITLE=\u5e2e\u52a9(&H)
+HELP_MENU_ABOUT_TITLE=\u5173\u4E8E JConsole(&A)
+HELP_MENU_USER_GUIDE_TITLE=\u8054\u673A\u7528\u6237\u6307\u5357(&U)
+HELP_MENU_TITLE=\u5E2E\u52A9(&H)
 HOTSPOT_MBEANS_ELLIPSIS=HotSpot MBean(&H)...
-HOTSPOT_MBEANS_DIALOG_ACCESSIBLE_DESCRIPTION=\u7528\u4e8e\u7ba1\u7406 HotSpot MBean \u7684\u5bf9\u8bdd\u6846
-IMPACT=\u5f71\u54cd
-INFO=\u4fe1\u606f
-INFO_CAPITALIZED=INFO
-INVALID_PLUGIN_PATH=\u8b66\u544a: \u63d2\u4ef6\u8def\u5f84\u65e0\u6548: {0}
-INVALID_URL=URL \u65e0\u6548: {0}
-IS=\u662f
-JAVA_MONITORING___MANAGEMENT_CONSOLE=Java \u76d1\u89c6\u548c\u7ba1\u7406\u63a7\u5236\u53f0
+HOTSPOT_MBEANS_DIALOG_ACCESSIBLE_DESCRIPTION=\u7528\u4E8E\u7BA1\u7406 HotSpot MBean \u7684\u5BF9\u8BDD\u6846
+IMPACT=\u5F71\u54CD
+INFO=\u4FE1\u606F
+INFO_CAPITALIZED=\u4FE1\u606F
+INVALID_PLUGIN_PATH=\u8B66\u544A: \u63D2\u4EF6\u8DEF\u5F84\u65E0\u6548: {0}
+INVALID_URL=URL \u65E0\u6548: {0}
+IS=\u662F
+JAVA_MONITORING___MANAGEMENT_CONSOLE=Java \u76D1\u89C6\u548C\u7BA1\u7406\u63A7\u5236\u53F0
 JCONSOLE_COLON_=JConsole: {0}
-JCONSOLE_VERSION=JConsole \u7248\u672c "{0}"
-JCONSOLE_ACCESSIBLE_DESCRIPTION=Java \u76d1\u89c6\u548c\u7ba1\u7406\u63a7\u5236\u53f0
-JIT_COMPILER=JIT \u7f16\u8bd1\u5668
-LIBRARY_PATH=\u5e93\u8def\u5f84
-LIVE_THREADS=\u6d3b\u52a8\u7ebf\u7a0b
-LOADED=\u5df2\u52a0\u8f7d
-LOCAL_PROCESS_COLON=\u672c\u5730\u8fdb\u7a0b(&L):
+JCONSOLE_VERSION=JConsole \u7248\u672C "{0}"
+JCONSOLE_ACCESSIBLE_DESCRIPTION=Java \u76D1\u89C6\u548C\u7BA1\u7406\u63A7\u5236\u53F0
+JIT_COMPILER=JIT \u7F16\u8BD1\u5668
+LIBRARY_PATH=\u5E93\u8DEF\u5F84
+LIVE_THREADS=\u6D3B\u52A8\u7EBF\u7A0B
+LOADED=\u5DF2\u52A0\u8F7D
+LOCAL_PROCESS_COLON=\u672C\u5730\u8FDB\u7A0B(&L):
 MASTHEAD_FONT=Dialog-PLAIN-25
-MANAGEMENT_NOT_ENABLED=<b>\u6ce8</b>: \u672a\u5bf9\u6b64\u8fdb\u7a0b\u542f\u7528\u7ba1\u7406\u4ee3\u7406\u3002
-MANAGEMENT_WILL_BE_ENABLED=<b>\u6ce8</b>: \u5c06\u5bf9\u6b64\u8fdb\u7a0b\u542f\u7528\u7ba1\u7406\u4ee3\u7406\u3002
+MANAGEMENT_NOT_ENABLED=<b>\u6CE8</b>: \u672A\u5BF9\u6B64\u8FDB\u7A0B\u542F\u7528\u7BA1\u7406\u4EE3\u7406\u3002
+MANAGEMENT_WILL_BE_ENABLED=<b>\u6CE8</b>: \u5C06\u5BF9\u6B64\u8FDB\u7A0B\u542F\u7528\u7BA1\u7406\u4EE3\u7406\u3002
 MBEAN_ATTRIBUTE_INFO=MBeanAttributeInfo
 MBEAN_INFO=MBeanInfo
 MBEAN_NOTIFICATION_INFO=MBeanNotificationInfo
 MBEAN_OPERATION_INFO=MBeanOperationInfo
 MBEANS=MBean
-MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON=\u6e05\u9664(&C)
-MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON_TOOLTIP=\u6e05\u9664\u901a\u77e5
-MBEANS_TAB_COMPOSITE_NAVIGATION_MULTIPLE=\u7ec4\u5408\u5bfc\u822a{0}/{1}
-MBEANS_TAB_COMPOSITE_NAVIGATION_SINGLE=\u7ec4\u5408\u5bfc\u822a
-MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON=\u5237\u65b0(&R)
-MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON_TOOLTIP=\u5237\u65b0\u5c5e\u6027
-MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON=\u8ba2\u9605(&S)
-MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u5f00\u59cb\u76d1\u542c\u901a\u77e5
-MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=\u8868\u683c\u5f0f\u5bfc\u822a{0}/{1}
-MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=\u8868\u683c\u5f0f\u5bfc\u822a
-MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=\u53d6\u6d88\u8ba2\u9605(&U)
-MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u505c\u6b62\u76d1\u542c\u901a\u77e5
-MANAGE_HOTSPOT_MBEANS_IN_COLON_=\u7ba1\u7406\u4ee5\u4e0b\u4f4d\u7f6e\u7684 HotSpot MBean:
-MAX=\u6700\u5927\u503c
-MAXIMUM_HEAP_SIZE=\u6700\u5927\u5806\u5927\u5c0f
-MEMORY=\u5185\u5b58
-MEMORY_POOL_LABEL=\u5185\u5b58\u6c60 "{0}"
-MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME=\u5806\u7684\u5185\u5b58\u4f7f\u7528\u91cf\u56fe\u8868\u3002
-MEMORY_TAB_INFO_LABEL_FORMAT=<html>\u5df2\u7528: {0}    \u5df2\u63d0\u4ea4: {1}    \u6700\u5927: {2}</html>
-MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME=\u975e\u5806\u7684\u5185\u5b58\u4f7f\u7528\u91cf\u56fe\u8868\u3002
-MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD=\u5927\u4e8e{0}\u7684\u9608\u503c\u3002\n
-MEMORY_TAB_POOL_CHART_ACCESSIBLE_NAME=\u5185\u5b58\u6c60\u4f7f\u7528\u91cf\u56fe\u8868\u3002
-MEMORY_TAB_POOL_CHART_BELOW_THRESHOLD=\u4f4e\u4e8e{0}\u7684\u9608\u503c\u3002\n
-MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME={0}\u7684\u5185\u5b58\u4f7f\u7528\u91cf\u56fe\u8868\u3002
-MESSAGE=\u6d88\u606f
-METHOD_SUCCESSFULLY_INVOKED=\u5df2\u6210\u529f\u8c03\u7528\u65b9\u6cd5
-MINIMIZE_ALL=\u5168\u90e8\u6700\u5c0f\u5316(&M)
-MONITOR_LOCKED=\ \ \ - \u5df2\u9501\u5b9a{0}\n
-NAME=\u540d\u79f0
-NAME_AND_BUILD={0} (\u5de5\u4f5c\u7248\u672c {1})
-NAME_STATE=\u540d\u79f0: {0}\n\u72b6\u6001: {1}\n
-NAME_STATE_LOCK_NAME=\u540d\u79f0: {0}\n\u72b6\u6001: {2}\u4e0a\u7684{1}\n
-NAME_STATE_LOCK_NAME_LOCK_OWNER=\u540d\u79f0: {0}\n\u72b6\u6001: {2}\u4e0a\u7684{1}, \u62e5\u6709\u8005: {3}\n
-NEW_CONNECTION_ELLIPSIS=\u65b0\u5efa\u8fde\u63a5(&N)...
-NO_DEADLOCK_DETECTED=\u672a\u68c0\u6d4b\u5230\u6b7b\u9501
-NON_HEAP_MEMORY_USAGE=\u975e\u5806\u5185\u5b58\u4f7f\u7528\u91cf
-NON_HEAP=\u975e\u5806
-NOTIFICATION=\u901a\u77e5
-NOTIFICATION_BUFFER=\u901a\u77e5\u7f13\u51b2\u533a
-NOTIFICATIONS=\u901a\u77e5
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON=\u6E05\u9664(&C)
+MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON_TOOLTIP=\u6E05\u9664\u901A\u77E5
+MBEANS_TAB_COMPOSITE_NAVIGATION_MULTIPLE=\u7EC4\u5408\u5BFC\u822A{0}/{1}
+MBEANS_TAB_COMPOSITE_NAVIGATION_SINGLE=\u7EC4\u5408\u5BFC\u822A
+MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON=\u5237\u65B0(&R)
+MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON_TOOLTIP=\u5237\u65B0\u5C5E\u6027
+MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON=\u8BA2\u9605(&S)
+MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u5F00\u59CB\u76D1\u542C\u901A\u77E5
+MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE=\u8868\u683C\u5F0F\u5BFC\u822A{0}/{1}
+MBEANS_TAB_TABULAR_NAVIGATION_SINGLE=\u8868\u683C\u5F0F\u5BFC\u822A
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON=\u53D6\u6D88\u8BA2\u9605(&U)
+MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP=\u505C\u6B62\u76D1\u542C\u901A\u77E5
+MANAGE_HOTSPOT_MBEANS_IN_COLON_=\u7BA1\u7406\u4EE5\u4E0B\u4F4D\u7F6E\u7684 HotSpot MBean: 
+MAX=\u6700\u5927\u503C
+MAXIMUM_HEAP_SIZE=\u6700\u5927\u5806\u5927\u5C0F
+MEMORY=\u5185\u5B58
+MEMORY_POOL_LABEL=\u5185\u5B58\u6C60 "{0}"
+MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME=\u5806\u7684\u5185\u5B58\u4F7F\u7528\u91CF\u56FE\u8868\u3002
+MEMORY_TAB_INFO_LABEL_FORMAT=<html>\u5DF2\u7528: {0}    \u5DF2\u63D0\u4EA4: {1}    \u6700\u5927: {2}</html>
+MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME=\u975E\u5806\u7684\u5185\u5B58\u4F7F\u7528\u91CF\u56FE\u8868\u3002
+MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD=\u5927\u4E8E{0}\u7684\u9608\u503C\u3002\n
+MEMORY_TAB_POOL_CHART_ACCESSIBLE_NAME=\u5185\u5B58\u6C60\u4F7F\u7528\u91CF\u56FE\u8868\u3002
+MEMORY_TAB_POOL_CHART_BELOW_THRESHOLD=\u4F4E\u4E8E{0}\u7684\u9608\u503C\u3002\n
+MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME={0}\u7684\u5185\u5B58\u4F7F\u7528\u91CF\u56FE\u8868\u3002
+MESSAGE=\u6D88\u606F
+METHOD_SUCCESSFULLY_INVOKED=\u5DF2\u6210\u529F\u8C03\u7528\u65B9\u6CD5
+MINIMIZE_ALL=\u5168\u90E8\u6700\u5C0F\u5316(&M)
+MONITOR_LOCKED=\   - \u5DF2\u9501\u5B9A {0}\n
+NAME=\u540D\u79F0
+NAME_AND_BUILD={0} (\u5DE5\u4F5C\u7248\u672C {1})
+NAME_STATE=\u540D\u79F0: {0}\n\u72B6\u6001: {1}\n
+NAME_STATE_LOCK_NAME=\u540D\u79F0: {0}\n\u72B6\u6001: {2}\u4E0A\u7684{1}\n
+NAME_STATE_LOCK_NAME_LOCK_OWNER=\u540D\u79F0: {0}\n\u72B6\u6001: {2}\u4E0A\u7684{1}, \u62E5\u6709\u8005: {3}\n
+NEW_CONNECTION_ELLIPSIS=\u65B0\u5EFA\u8FDE\u63A5(&N)...
+NO_DEADLOCK_DETECTED=\u672A\u68C0\u6D4B\u5230\u6B7B\u9501
+NON_HEAP_MEMORY_USAGE=\u975E\u5806\u5185\u5B58\u4F7F\u7528\u91CF
+NON_HEAP=\u975E\u5806
+NOTIFICATION=\u901A\u77E5
+NOTIFICATION_BUFFER=\u901A\u77E5\u7F13\u51B2\u533A
+NOTIFICATIONS=\u901A\u77E5
 NOTIF_TYPES=NotifTypes
-NUMBER_OF_THREADS=\u7ebf\u7a0b\u6570
-NUMBER_OF_LOADED_CLASSES=\u5df2\u52a0\u8f7d\u7c7b\u6570
-NUMBER_OF_PROCESSORS=\u5904\u7406\u7a0b\u5e8f\u6570
+NUMBER_OF_THREADS=\u7EBF\u7A0B\u6570
+NUMBER_OF_LOADED_CLASSES=\u5DF2\u52A0\u8F7D\u7C7B\u6570
+NUMBER_OF_PROCESSORS=\u5904\u7406\u7A0B\u5E8F\u6570
 OBJECT_NAME=ObjectName
-OPERATING_SYSTEM=\u64cd\u4f5c\u7cfb\u7edf
-OPERATION=\u64cd\u4f5c
-OPERATION_INVOCATION=\u64cd\u4f5c\u8c03\u7528
-OPERATION_RETURN_VALUE=\u64cd\u4f5c\u8fd4\u56de\u503c
-OPERATIONS=\u64cd\u4f5c
-OVERVIEW=\u6982\u89c8
-OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME={0}\u7684\u56fe\u8868\u3002
-PARAMETER=\u53c2\u6570
-PASSWORD_ACCESSIBLE_NAME=\u53e3\u4ee4
-PASSWORD_COLON_=\u53e3\u4ee4(&P):
-PEAK=\u5cf0\u503c
-PERFORM_GC=\u6267\u884c &GC
-PERFORM_GC_TOOLTIP=\u8bf7\u6c42\u5783\u573e\u6536\u96c6
-PLOTTER_ACCESSIBLE_NAME=\u56fe\u8868
+OPERATING_SYSTEM=\u64CD\u4F5C\u7CFB\u7EDF
+OPERATION=\u64CD\u4F5C
+OPERATION_INVOCATION=\u64CD\u4F5C\u8C03\u7528
+OPERATION_RETURN_VALUE=\u64CD\u4F5C\u8FD4\u56DE\u503C
+OPERATIONS=\u64CD\u4F5C
+OVERVIEW=\u6982\u89C8
+OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME={0}\u7684\u56FE\u8868\u3002
+PARAMETER=\u53C2\u6570
+PASSWORD_ACCESSIBLE_NAME=\u53E3\u4EE4
+PASSWORD_COLON_=\u53E3\u4EE4(&P):
+PEAK=\u5CF0\u503C
+PERFORM_GC=\u6267\u884C GC(&G)
+PERFORM_GC_TOOLTIP=\u8BF7\u6C42\u5783\u573E\u6536\u96C6
+PLOTTER_ACCESSIBLE_NAME=\u56FE\u8868
 PLOTTER_ACCESSIBLE_NAME_KEY_AND_VALUE={0}={1}\n
-PLOTTER_ACCESSIBLE_NAME_NO_DATA=\u672a\u7ed8\u5236\u6570\u636e\u3002
-PLOTTER_SAVE_AS_MENU_ITEM=\u5c06\u6570\u636e\u53e6\u5b58\u4e3a(&A)...
-PLOTTER_TIME_RANGE_MENU=\u65f6\u95f4\u8303\u56f4(&T)
-PROBLEM_ADDING_LISTENER=\u6dfb\u52a0\u76d1\u542c\u7a0b\u5e8f\u65f6\u51fa\u73b0\u95ee\u9898
-PROBLEM_DISPLAYING_MBEAN=\u663e\u793a MBean \u65f6\u51fa\u73b0\u95ee\u9898
-PROBLEM_INVOKING=\u8c03\u7528\u65f6\u51fa\u73b0\u95ee\u9898
-PROBLEM_REMOVING_LISTENER=\u5220\u9664\u76d1\u542c\u7a0b\u5e8f\u65f6\u51fa\u73b0\u95ee\u9898
-PROBLEM_SETTING_ATTRIBUTE=\u8bbe\u7f6e\u5c5e\u6027\u65f6\u51fa\u73b0\u95ee\u9898
-PROCESS_CPU_TIME=\u8fdb\u7a0b CPU \u65f6\u95f4
-READABLE=\u53ef\u8bfb
-RECONNECT=\u91cd\u65b0\u8fde\u63a5
-REMOTE_PROCESS_COLON=\u8fdc\u7a0b\u8fdb\u7a0b(&R):
-REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=\u8fdc\u7a0b\u8fdb\u7a0b
-RESTORE_ALL=\u5168\u90e8\u8fd8\u539f(&R)
+PLOTTER_ACCESSIBLE_NAME_NO_DATA=\u672A\u7ED8\u5236\u6570\u636E\u3002
+PLOTTER_SAVE_AS_MENU_ITEM=\u5C06\u6570\u636E\u53E6\u5B58\u4E3A(&A)...
+PLOTTER_TIME_RANGE_MENU=\u65F6\u95F4\u8303\u56F4(&T)
+PROBLEM_ADDING_LISTENER=\u6DFB\u52A0\u76D1\u542C\u7A0B\u5E8F\u65F6\u51FA\u73B0\u95EE\u9898
+PROBLEM_DISPLAYING_MBEAN=\u663E\u793A MBean \u65F6\u51FA\u73B0\u95EE\u9898
+PROBLEM_INVOKING=\u8C03\u7528\u65F6\u51FA\u73B0\u95EE\u9898
+PROBLEM_REMOVING_LISTENER=\u5220\u9664\u76D1\u542C\u7A0B\u5E8F\u65F6\u51FA\u73B0\u95EE\u9898
+PROBLEM_SETTING_ATTRIBUTE=\u8BBE\u7F6E\u5C5E\u6027\u65F6\u51FA\u73B0\u95EE\u9898
+PROCESS_CPU_TIME=\u8FDB\u7A0B CPU \u65F6\u95F4
+READABLE=\u53EF\u8BFB
+RECONNECT=\u91CD\u65B0\u8FDE\u63A5
+REMOTE_PROCESS_COLON=\u8FDC\u7A0B\u8FDB\u7A0B(&R):
+REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME=\u8FDC\u7A0B\u8FDB\u7A0B
+RESTORE_ALL=\u5168\u90E8\u8FD8\u539F(&R)
 RETURN_TYPE=ReturnType
 SEQ_NUM=SeqNum
-SIZE_BYTES={0,number,integer} \u5b57\u8282
-SIZE_GB={0} GB
-SIZE_KB={0} KB
-SIZE_MB={0} MB
-SOURCE=\u6e90
-STACK_TRACE=\n\u5806\u6808\u8ddf\u8e2a: \n
+SIZE_BYTES={0,number,integer} \u5B57\u8282
+SIZE_GB={0} Gb
+SIZE_KB={0} Kb
+SIZE_MB={0} Mb
+SOURCE=\u6E90
+STACK_TRACE=\n\u5806\u6808\u8DDF\u8E2A: \n
 SUMMARY_TAB_HEADER_DATE_TIME_FORMAT=FULL,FULL
-SUMMARY_TAB_PENDING_FINALIZATION_LABEL=\u6682\u6302\u6700\u7ec8\u5904\u7406
-SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0}\u5bf9\u8c61
+SUMMARY_TAB_PENDING_FINALIZATION_LABEL=\u6682\u6302\u6700\u7EC8\u5904\u7406
+SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0}\u5BF9\u8C61
 SUMMARY_TAB_TAB_NAME=VM \u6982\u8981
-SUMMARY_TAB_VM_VERSION={0}\u7248\u672c {1}
-THREADS=\u7ebf\u7a0b
-THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=\u7ebf\u7a0b\u4fe1\u606f
-THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=\u8868\u793a\u7ebf\u7a0b\u6570\u7684\u56fe\u8868\u3002
-THRESHOLD=\u9608\u503c
-TILE=\u5e73\u94fa(&T)
-TIME_RANGE_COLON=\u65f6\u95f4\u8303\u56f4(&T):
-TIME=\u65f6\u95f4
+SUMMARY_TAB_VM_VERSION={0}\u7248\u672C {1}
+THREADS=\u7EBF\u7A0B
+THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=\u7EBF\u7A0B\u4FE1\u606F
+THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=\u8868\u793A\u7EBF\u7A0B\u6570\u7684\u56FE\u8868\u3002
+THRESHOLD=\u9608\u503C
+TILE=\u5E73\u94FA(&T)
+TIME_RANGE_COLON=\u65F6\u95F4\u8303\u56F4(&T):
+TIME=\u65F6\u95F4
 TIME_STAMP=TimeStamp
-TOTAL_LOADED=\u52a0\u8f7d\u603b\u6570
-TOTAL_CLASSES_LOADED=\u5df2\u52a0\u8f7d\u7c7b\u603b\u6570
-TOTAL_CLASSES_UNLOADED=\u5df2\u5378\u8f7d\u7c7b\u603b\u6570
-TOTAL_COMPILE_TIME=\u603b\u7f16\u8bd1\u65f6\u95f4
-TOTAL_PHYSICAL_MEMORY=\u603b\u7269\u7406\u5185\u5b58
-TOTAL_THREADS_STARTED=\u542f\u52a8\u7684\u7ebf\u7a0b\u603b\u6570
-TOTAL_SWAP_SPACE=\u603b\u4ea4\u6362\u7a7a\u95f4
-TYPE=\u7c7b\u578b
-UNAVAILABLE=\u4e0d\u53ef\u7528
+TOTAL_LOADED=\u52A0\u8F7D\u603B\u6570
+TOTAL_CLASSES_LOADED=\u5DF2\u52A0\u8F7D\u7C7B\u603B\u6570
+TOTAL_CLASSES_UNLOADED=\u5DF2\u5378\u8F7D\u7C7B\u603B\u6570
+TOTAL_COMPILE_TIME=\u603B\u7F16\u8BD1\u65F6\u95F4
+TOTAL_PHYSICAL_MEMORY=\u603B\u7269\u7406\u5185\u5B58
+TOTAL_THREADS_STARTED=\u542F\u52A8\u7684\u7EBF\u7A0B\u603B\u6570
+TOTAL_SWAP_SPACE=\u603B\u4EA4\u6362\u7A7A\u95F4
+TYPE=\u7C7B\u578B
+UNAVAILABLE=\u4E0D\u53EF\u7528
 UNKNOWN_CAPITALIZED=UNKNOWN
-UNKNOWN_HOST=\u672a\u77e5\u4e3b\u673a: {0}
-UNREGISTER=\u6ce8\u9500
-UPTIME=\u8fd0\u884c\u65f6\u95f4
-USAGE_THRESHOLD=\u7528\u6cd5\u9608\u503c
-REMOTE_TF_USAGE=<b>\u7528\u6cd5</b>: &lt;hostname&gt;:&lt;port&gt; \u6216 service:jmx:&lt;protocol&gt;:&lt;sap&gt;
-USED=\u5df2\u7528
-USERNAME_COLON_=\u7528\u6237\u540d(&U):
-USERNAME_ACCESSIBLE_NAME=\u7528\u6237\u540d
+UNKNOWN_HOST=\u672A\u77E5\u4E3B\u673A: {0}
+UNREGISTER=\u6CE8\u9500
+UPTIME=\u8FD0\u884C\u65F6\u95F4
+USAGE_THRESHOLD=\u7528\u6CD5\u9608\u503C
+REMOTE_TF_USAGE=<b>\u7528\u6CD5</b>: &lt;hostname&gt;:&lt;port&gt; \u6216 service:jmx:&lt;protocol&gt;:&lt;sap&gt;
+USED=\u5DF2\u7528
+USERNAME_COLON_=\u7528\u6237\u540D(&U):
+USERNAME_ACCESSIBLE_NAME=\u7528\u6237\u540D
 USER_DATA=UserData
-VIRTUAL_MACHINE=\u865a\u62df\u673a
-VM_ARGUMENTS=VM \u53c2\u6570
-VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=\u7528\u4e8e\u76d1\u89c6 Java \u865a\u62df\u673a\u7684\u5185\u90e8\u6846\u67b6
-VALUE=\u503c
-VENDOR=\u5382\u5546
-VERBOSE_OUTPUT=\u8be6\u7ec6\u8f93\u51fa
-VERBOSE_OUTPUT_TOOLTIP=\u4e3a\u7c7b\u52a0\u8f7d\u7cfb\u7edf\u542f\u7528\u8be6\u7ec6\u8f93\u51fa
-VIEW=\u89c6\u56fe
-WINDOW=\u7a97\u53e3(&W)
-WINDOWS=Windows
-WRITABLE=\u53ef\u5199
-CONNECTION_FAILED1=\u8fde\u63a5\u5931\u8d25: \u662f\u5426\u91cd\u8bd5?
-CONNECTION_FAILED2=\u672a\u6210\u529f\u8fde\u63a5\u5230{0}\u3002<br>\u662f\u5426\u8981\u91cd\u8bd5?
-CONNECTION_LOST1=\u8fde\u63a5\u4e22\u5931: \u662f\u5426\u91cd\u65b0\u8fde\u63a5?
-CONNECTING_TO1=\u6b63\u5728\u8fde\u63a5\u5230{0}
-CONNECTING_TO2=\u60a8\u5f53\u524d\u6b63\u5728\u8fde\u63a5\u5230{0}\u3002<br>\u8fd9\u5c06\u9700\u8981\u51e0\u5206\u949f\u7684\u65f6\u95f4\u3002
-DEADLOCK_TAB=\u6b7b\u9501
-DEADLOCK_TAB_N=\u6b7b\u9501{0}
-EXPAND=\u5c55\u5f00
+VIRTUAL_MACHINE=\u865A\u62DF\u673A
+VM_ARGUMENTS=VM \u53C2\u6570
+VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION=\u7528\u4E8E\u76D1\u89C6 Java \u865A\u62DF\u673A\u7684\u5185\u90E8\u6846\u67B6
+VALUE=\u503C
+VENDOR=\u4F9B\u5E94\u5546
+VERBOSE_OUTPUT=\u8BE6\u7EC6\u8F93\u51FA
+VERBOSE_OUTPUT_TOOLTIP=\u4E3A\u7C7B\u52A0\u8F7D\u7CFB\u7EDF\u542F\u7528\u8BE6\u7EC6\u8F93\u51FA
+VIEW=\u89C6\u56FE
+WINDOW=\u7A97\u53E3(&W)
+WINDOWS=\u7A97\u53E3
+WRITABLE=\u53EF\u5199\u5165
+CONNECTION_FAILED1=\u8FDE\u63A5\u5931\u8D25: \u662F\u5426\u91CD\u8BD5?
+CONNECTION_FAILED2=\u672A\u6210\u529F\u8FDE\u63A5\u5230{0}\u3002<br>\u662F\u5426\u8981\u91CD\u8BD5?
+CONNECTION_LOST1=\u8FDE\u63A5\u4E22\u5931: \u662F\u5426\u91CD\u65B0\u8FDE\u63A5?
+CONNECTING_TO1=\u6B63\u5728\u8FDE\u63A5\u5230{0}
+CONNECTING_TO2=\u60A8\u5F53\u524D\u6B63\u5728\u8FDE\u63A5\u5230{0}\u3002<br>\u8FD9\u5C06\u9700\u8981\u51E0\u5206\u949F\u7684\u65F6\u95F4\u3002
+DEADLOCK_TAB=\u6B7B\u9501
+DEADLOCK_TAB_N=\u6B7B\u9501{0}
+EXPAND=\u5C55\u5F00
 KBYTES={0} KB
-PLOT=\u7ed8\u56fe
-VISUALIZE=\u53ef\u89c6\u5316
-ZZ_USAGE_TEXT=\u7528\u6cd5: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n  -interval   \u5c06\u66f4\u65b0\u95f4\u9694\u8bbe\u7f6e\u4e3a n \u79d2 (\u9ed8\u8ba4\u503c\u4e3a 4 \u79d2)\n  -notile     \u521d\u59cb\u4e0d\u5e73\u94fa\u7a97\u53e3 (\u5bf9\u4e8e\u4e24\u4e2a\u6216\u591a\u4e2a\u8fde\u63a5)\n  -pluginpath \u6307\u5b9a jconsole \u7528\u4e8e\u67e5\u627e\u63d2\u4ef6\u7684\u8def\u5f84\n  -version    \u8f93\u51fa\u7a0b\u5e8f\u7248\u672c\n\n  connection = pid || host:port || JMX URL (service:jmx:<\u534f\u8bae>://...)\n  pid         \u76ee\u6807\u8fdb\u7a0b\u7684\u8fdb\u7a0b ID\n  host        \u8fdc\u7a0b\u4e3b\u673a\u540d\u6216 IP \u5730\u5740\n  port        \u8fdc\u7a0b\u8fde\u63a5\u7684\u7aef\u53e3\u53f7\n\n  -J          \u6307\u5b9a\u8fd0\u884c jconsole \u7684 Java \u865a\u62df\u673a\n              \u7684\u8f93\u5165\u53c2\u6570
+PLOT=\u7ED8\u56FE
+VISUALIZE=\u53EF\u89C6\u5316
+ZZ_USAGE_TEXT=\u7528\u6CD5: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n  -interval   \u5C06\u66F4\u65B0\u95F4\u9694\u8BBE\u7F6E\u4E3A n \u79D2 (\u9ED8\u8BA4\u503C\u4E3A 4 \u79D2)\n  -notile     \u521D\u59CB\u4E0D\u5E73\u94FA\u7A97\u53E3 (\u5BF9\u4E8E\u4E24\u4E2A\u6216\u591A\u4E2A\u8FDE\u63A5)\n  -pluginpath \u6307\u5B9A jconsole \u7528\u4E8E\u67E5\u627E\u63D2\u4EF6\u7684\u8DEF\u5F84\n  -version    \u8F93\u51FA\u7A0B\u5E8F\u7248\u672C\n\n  connection = pid || host:port || JMX URL (service:jmx:<\u534F\u8BAE>://...)\n  pid         \u76EE\u6807\u8FDB\u7A0B\u7684\u8FDB\u7A0B ID\n  host        \u8FDC\u7A0B\u4E3B\u673A\u540D\u6216 IP \u5730\u5740\n  port        \u8FDC\u7A0B\u8FDE\u63A5\u7684\u7AEF\u53E3\u53F7\n\n  -J          \u6307\u5B9A\u8FD0\u884C jconsole \u7684 Java \u865A\u62DF\u673A\n              \u7684\u8F93\u5165\u53C2\u6570
--- a/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties	Wed May 08 11:22:25 2013 +0100
@@ -3,13 +3,6 @@
 
 Title=\u30E1\u30E2\u5E33
 ElementTreeFrameTitle=\u8981\u7D20
-ViewportBackingStore=false
-
-# menubar definition
-#
-# Each of the strings that follow form a key to be 
-# used to the actual menu definition.
-menubar=file edit debug
 
 # file Menu definition
 #
@@ -20,7 +13,7 @@
 # new  ->  Notepad.newAction
 # save ->  Notepad.saveAction
 # exit ->  Notepad.exitAction
-file=new open save - exit
+
 fileLabel=\u30D5\u30A1\u30A4\u30EB
 openLabel=\u958B\u304F
 openImage=resources/open.gif
@@ -36,29 +29,23 @@
 # cut   -> JTextComponent.cutAction
 # copy  -> JTextComponent.copyAction
 # paste -> JTextComponent.pasteAction
-edit=cut copy paste - undo redo
+
 editLabel=\u7DE8\u96C6
 cutLabel=\u5207\u53D6\u308A
-cutAction=cut-to-clipboard
 cutImage=resources/cut.gif
 copyLabel=\u30B3\u30D4\u30FC
-copyAction=copy-to-clipboard
 copyImage=resources/copy.gif
 pasteLabel=\u8CBC\u4ED8\u3051
-pasteAction=paste-from-clipboard
 pasteImage=resources/paste.gif
 undoLabel=\u5143\u306B\u623B\u3059
-undoAction=Undo
-redoLabel=\u518D\u5B9F\u884C
-redoAction=Redo
+redoLabel=\u3084\u308A\u76F4\u3057
 
 #
 # debug Menu definition
 #
-debug=dump showElementTree
+
 debugLabel=\u30C7\u30D0\u30C3\u30B0
 dumpLabel=\u30E2\u30C7\u30EB\u3092System.err\u306B\u30C0\u30F3\u30D7
-dumpAction=dump-model
 showElementTreeLabel=\u8981\u7D20\u306E\u8868\u793A
 
 # toolbar definition
@@ -67,7 +54,7 @@
 # used as the basis of the tool definition.  Actions
 # are of course sharable, and in this case are shared
 # with the menu items.
-toolbar=new open save - cut copy paste
+
 newTooltip=\u30D5\u30A1\u30A4\u30EB\u3092\u65B0\u898F\u4F5C\u6210\u3059\u308B
 openTooltip=\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F
 saveTooltip=\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58
--- a/jdk/src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties	Wed May 08 11:22:25 2013 +0100
@@ -3,13 +3,6 @@
 
 Title=\u8BB0\u4E8B\u672C
 ElementTreeFrameTitle=\u5143\u7D20
-ViewportBackingStore=false
-
-# menubar definition
-#
-# Each of the strings that follow form a key to be 
-# used to the actual menu definition.
-menubar=file edit debug
 
 # file Menu definition
 #
@@ -20,7 +13,7 @@
 # new  ->  Notepad.newAction
 # save ->  Notepad.saveAction
 # exit ->  Notepad.exitAction
-file=new open save - exit
+
 fileLabel=\u6587\u4EF6
 openLabel=\u6253\u5F00
 openImage=resources/open.gif
@@ -36,29 +29,23 @@
 # cut   -> JTextComponent.cutAction
 # copy  -> JTextComponent.copyAction
 # paste -> JTextComponent.pasteAction
-edit=cut copy paste - undo redo
+
 editLabel=\u7F16\u8F91
 cutLabel=\u526A\u5207
-cutAction=cut-to-clipboard
 cutImage=resources/cut.gif
 copyLabel=\u590D\u5236
-copyAction=copy-to-clipboard
 copyImage=resources/copy.gif
 pasteLabel=\u7C98\u8D34
-pasteAction=paste-from-clipboard
 pasteImage=resources/paste.gif
 undoLabel=\u64A4\u6D88
-undoAction=Undo
 redoLabel=\u91CD\u505A
-redoAction=Redo
 
 #
 # debug Menu definition
 #
-debug=dump showElementTree
+
 debugLabel=\u8C03\u8BD5
 dumpLabel=\u5C06\u6A21\u578B\u8F6C\u50A8\u5230 System.err
-dumpAction=dump-model
 showElementTreeLabel=\u663E\u793A\u5143\u7D20
 
 # toolbar definition
@@ -67,7 +54,7 @@
 # used as the basis of the tool definition.  Actions
 # are of course sharable, and in this case are shared
 # with the menu items.
-toolbar=new open save - cut copy paste
+
 newTooltip=\u521B\u5EFA\u65B0\u6587\u4EF6
 openTooltip=\u6253\u5F00\u6587\u4EF6
 saveTooltip=\u4FDD\u5B58\u6587\u4EF6
--- a/jdk/src/solaris/bin/amd64/jvm.cfg	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/solaris/bin/amd64/jvm.cfg	Wed May 08 11:22:25 2013 +0100
@@ -1,4 +1,4 @@
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,3 @@
 #
 -server KNOWN
 -client IGNORE
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
--- a/jdk/src/solaris/bin/arm/jvm.cfg	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/solaris/bin/arm/jvm.cfg	Wed May 08 11:22:25 2013 +0100
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,4 @@
 #
 -client KNOWN
 -server KNOWN
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
 -minimal KNOWN
--- a/jdk/src/solaris/bin/i586/jvm.cfg	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/solaris/bin/i586/jvm.cfg	Wed May 08 11:22:25 2013 +0100
@@ -1,4 +1,4 @@
-# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,4 @@
 #
 -client IF_SERVER_CLASS -server
 -server KNOWN
--hotspot ALIASED_TO -client
--classic WARN
--native ERROR
--green ERROR
 -minimal KNOWN
--- a/jdk/src/solaris/bin/ia64/jvm.cfg	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/solaris/bin/ia64/jvm.cfg	Wed May 08 11:22:25 2013 +0100
@@ -1,7 +1,7 @@
 #
 # 
 # 
-# Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,4 @@
 # and may not be available in a future release.
 #
 -server KNOWN
--hotspot ERROR
--classic WARN
 -client IGNORE
--native ERROR
--green ERROR
--- a/jdk/src/solaris/bin/ppc/jvm.cfg	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/solaris/bin/ppc/jvm.cfg	Wed May 08 11:22:25 2013 +0100
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,4 @@
 #
 -client KNOWN
 -server KNOWN
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
 -minimal KNOWN
--- a/jdk/src/solaris/bin/sparc/jvm.cfg	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/solaris/bin/sparc/jvm.cfg	Wed May 08 11:22:25 2013 +0100
@@ -1,4 +1,4 @@
-# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,4 @@
 #
 -client IF_SERVER_CLASS -server
 -server KNOWN
--hotspot ALIASED_TO -client
--classic WARN
--native ERROR
--green ERROR
 -minimal KNOWN
--- a/jdk/src/solaris/bin/sparcv9/jvm.cfg	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/solaris/bin/sparcv9/jvm.cfg	Wed May 08 11:22:25 2013 +0100
@@ -1,4 +1,4 @@
-# Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,8 +31,4 @@
 # and may not be available in a future release.
 #
 -server KNOWN
--hotspot ERROR
--classic WARN
 -client IGNORE
--native ERROR
--green ERROR
--- a/jdk/src/solaris/bin/zero/jvm.cfg	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/solaris/bin/zero/jvm.cfg	Wed May 08 11:22:25 2013 +0100
@@ -1,4 +1,4 @@
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,3 @@
 #
 -server KNOWN
 -client IGNORE
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
--- a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java	Wed May 08 11:22:25 2013 +0100
@@ -1886,7 +1886,9 @@
         switch (getWindowType())
         {
             case NORMAL:
-                typeAtom = protocol.XA_NET_WM_WINDOW_TYPE_NORMAL;
+                typeAtom = (ownerPeer == null) ?
+                               protocol.XA_NET_WM_WINDOW_TYPE_NORMAL :
+                               protocol.XA_NET_WM_WINDOW_TYPE_DIALOG;
                 break;
             case UTILITY:
                 typeAtom = protocol.XA_NET_WM_WINDOW_TYPE_UTILITY;
--- a/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	Wed May 08 11:22:25 2013 +0100
@@ -372,7 +372,7 @@
     size_t fds_size;
 
     kres = pid_for_task(mach_task_self(), &my_pid);
-    if (res != KERN_SUCCESS) {
+    if (kres != KERN_SUCCESS) {
         throw_internal_error(env, "pid_for_task failed");
         return -1;
     }
--- a/jdk/src/windows/bin/amd64/jvm.cfg	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/windows/bin/amd64/jvm.cfg	Wed May 08 11:22:25 2013 +0100
@@ -1,7 +1,7 @@
 #
 # 
 # 
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,3 @@
 #
 -server KNOWN
 -client IGNORE
--hotspot ALIASED_TO -server
--classic WARN
--native ERROR
--green ERROR
--- a/jdk/src/windows/bin/i586/jvm.cfg	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/windows/bin/i586/jvm.cfg	Wed May 08 11:22:25 2013 +0100
@@ -1,4 +1,4 @@
-# Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,3 @@
 #
 -client KNOWN
 -server KNOWN
--hotspot ALIASED_TO -client
--classic WARN
--native ERROR
--green ERROR
--- a/jdk/src/windows/bin/ia64/jvm.cfg	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/windows/bin/ia64/jvm.cfg	Wed May 08 11:22:25 2013 +0100
@@ -1,7 +1,7 @@
 #
 # 
 # 
-# Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,3 @@
 #
 -server KNOWN
 -client IGNORE
--hotspot ALIASED_TO -server
--classic WARN
--native ERROR
--green ERROR
--- a/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java	Wed May 08 11:22:25 2013 +0100
@@ -759,9 +759,7 @@
     WComponentPeer(Component target) {
         this.target = target;
         this.paintArea = new RepaintArea();
-        Container parent = WToolkit.getNativeContainer(target);
-        WComponentPeer parentPeer = (WComponentPeer) WToolkit.targetToPeer(parent);
-        create(parentPeer);
+        create(getNativeParent());
         // fix for 5088782: check if window object is created successfully
         checkCreation();
 
@@ -771,6 +769,17 @@
     }
     abstract void create(WComponentPeer parent);
 
+    /**
+     * Gets the native parent of this peer. We use the term "parent" explicitly,
+     * because we override the method in top-level window peer implementations.
+     *
+     * @return the parent container/owner of this peer.
+     */
+    WComponentPeer getNativeParent() {
+        Container parent = SunToolkit.getNativeContainer((Component) target);
+        return (WComponentPeer) WToolkit.targetToPeer(parent);
+    }
+
     protected void checkCreation()
     {
         if ((hwnd == 0) || (pData == 0))
--- a/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java	Wed May 08 11:22:25 2013 +0100
@@ -215,6 +215,12 @@
         createAwtWindow(parent);
     }
 
+    @Override
+    final WComponentPeer getNativeParent() {
+        final Container owner = ((Window) target).getOwner();
+        return (WComponentPeer) WToolkit.targetToPeer(owner);
+    }
+
     // should be overriden in WDialogPeer
     protected void realShow() {
         super.show();
--- a/jdk/src/windows/native/java/net/NetworkInterface.c	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/windows/native/java/net/NetworkInterface.c	Wed May 08 11:22:25 2013 +0100
@@ -123,32 +123,44 @@
      */
     size = sizeof(MIB_IFTABLE);
     tableP = (MIB_IFTABLE *)malloc(size);
+    if(tableP == NULL)
+        return NULL;
+
     count = GetIfTable(tableP, &size, TRUE);
     if (count == ERROR_INSUFFICIENT_BUFFER || count == ERROR_BUFFER_OVERFLOW) {
-        tableP = (MIB_IFTABLE *)realloc(tableP, size);
+        MIB_IFTABLE* newTableP =  (MIB_IFTABLE *)realloc(tableP, size);
+        if (newTableP == NULL) {
+            free(tableP);
+            return NULL;
+        }
+        tableP = newTableP;
+
         count = GetIfTable(tableP, &size, TRUE);
     }
 
     if (count != NO_ERROR) {
-        if (tableP != NULL)
-            free(tableP);
+        free(tableP);
         return NULL;
     }
 
-    if (tableP != NULL) {
-      ifrowP = tableP->table;
-      for (i=0; i<tableP->dwNumEntries; i++) {
-        /*
-         * Warning the real index is obtained by GetFriendlyIfIndex()
-         */
+    {
+    ifrowP = tableP->table;
+    for (i=0; i<tableP->dwNumEntries; i++) {
+    /*
+     * Warning: the real index is obtained by GetFriendlyIfIndex()
+    */
         ifindex = GetFriendlyIfIndex(ifrowP->dwIndex);
         if (ifindex == index) {
           /*
            * Create a copy of the entry so that we can free the table.
            */
-          ret = (MIB_IFROW *) malloc(sizeof(MIB_IFROW));
-          memcpy(ret, ifrowP, sizeof(MIB_IFROW));
-          break;
+            ret = (MIB_IFROW *) malloc(sizeof(MIB_IFROW));
+            if (ret == NULL) {
+                free(tableP);
+                return NULL;
+            }
+            memcpy(ret, ifrowP, sizeof(MIB_IFROW));
+            break;
         }
 
         /* onto the next interface */
@@ -184,15 +196,25 @@
      */
     size = sizeof(MIB_IFTABLE);
     tableP = (MIB_IFTABLE *)malloc(size);
+    if (tableP == NULL) {
+        JNU_ThrowOutOfMemoryError(env, "Native heap allocation failure");
+        return -1;
+    }
+
     ret = GetIfTable(tableP, &size, TRUE);
     if (ret == ERROR_INSUFFICIENT_BUFFER || ret == ERROR_BUFFER_OVERFLOW) {
-        tableP = (MIB_IFTABLE *)realloc(tableP, size);
+        MIB_IFTABLE * newTableP = (MIB_IFTABLE *)realloc(tableP, size);
+        if (newTableP == NULL) {
+            free(tableP);
+            JNU_ThrowOutOfMemoryError(env, "Native heap allocation failure");
+            return -1;
+        }
+        tableP = newTableP;
         ret = GetIfTable(tableP, &size, TRUE);
     }
 
     if (ret != NO_ERROR) {
-        if (tableP != NULL)
-            free(tableP);
+        free(tableP);
 
         JNU_ThrowByName(env, "java/lang/Error",
                 "IP Helper Library GetIfTable function failed");
@@ -370,10 +392,21 @@
      */
     size = sizeof(MIB_IPADDRTABLE);
     tableP = (MIB_IPADDRTABLE *)malloc(size);
+    if (tableP == NULL) {
+        JNU_ThrowOutOfMemoryError(env, "Native heap allocation failure");
+        return -1;
+    }
 
     ret = GetIpAddrTable(tableP, &size, FALSE);
     if (ret == ERROR_INSUFFICIENT_BUFFER || ret == ERROR_BUFFER_OVERFLOW) {
-        tableP = (MIB_IPADDRTABLE *)realloc(tableP, size);
+        MIB_IPADDRTABLE * newTableP = (MIB_IPADDRTABLE *)realloc(tableP, size);
+        if (newTableP == NULL) {
+            free(tableP);
+            JNU_ThrowOutOfMemoryError(env, "Native heap allocation failure");
+            return -1;
+        }
+        tableP = newTableP;
+
         ret = GetIpAddrTable(tableP, &size, FALSE);
     }
     if (ret != NO_ERROR) {
--- a/jdk/src/windows/native/java/net/NetworkInterface_winXP.c	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/windows/native/java/net/NetworkInterface_winXP.c	Wed May 08 11:22:25 2013 +0100
@@ -74,7 +74,7 @@
 
 /*
  * return an array of IP_ADAPTER_ADDRESSES containing one element
- * for each apdapter on the system. Returned in *adapters.
+ * for each adapter on the system. Returned in *adapters.
  * Buffer is malloc'd and must be freed (unless error returned)
  */
 static int getAdapters (JNIEnv *env, IP_ADAPTER_ADDRESSES **adapters) {
@@ -82,22 +82,32 @@
     IP_ADAPTER_ADDRESSES *adapterInfo;
     ULONG len;
     adapterInfo = (IP_ADAPTER_ADDRESSES *)malloc (bufsize);
-    if (adapterInfo == 0) {
+
+    if (adapterInfo == NULL) {
+        JNU_ThrowByName(env, "java/lang/OutOfMemoryError", "Native heap allocation failure");
         return -1;
     }
+
     len = bufsize;
     flags = GAA_FLAG_SKIP_DNS_SERVER;
     flags |= GAA_FLAG_SKIP_MULTICAST;
     flags |= GAA_FLAG_INCLUDE_PREFIX;
     ret = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, adapterInfo, &len);
+
     if (ret == ERROR_BUFFER_OVERFLOW) {
-        adapterInfo = (IP_ADAPTER_ADDRESSES *) realloc (adapterInfo, len);
-        if (adapterInfo == 0) {
+        IP_ADAPTER_ADDRESSES * newAdapterInfo = (IP_ADAPTER_ADDRESSES *) realloc (adapterInfo, len);
+        if (newAdapterInfo == NULL) {
+            free(adapterInfo);
+            JNU_ThrowByName(env, "java/lang/OutOfMemoryError", "Native heap allocation failure");
             return -1;
         }
+
+        adapterInfo = newAdapterInfo;
+
         bufsize = len;
         ret = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, adapterInfo, &len);
     }
+
     if (ret != ERROR_SUCCESS) {
         free (adapterInfo);
         JNU_ThrowByName(env, "java/lang/Error",
@@ -110,7 +120,7 @@
 
 /*
  * return an array of IP_ADAPTER_ADDRESSES containing one element
- * for each apdapter on the system. Returned in *adapters.
+ * for each adapter on the system. Returned in *adapters.
  * Buffer is malloc'd and must be freed (unless error returned)
  */
 IP_ADAPTER_ADDRESSES *getAdapter (JNIEnv *env,  jint index) {
@@ -118,8 +128,8 @@
     IP_ADAPTER_ADDRESSES *adapterInfo, *ptr, *ret;
     ULONG len;
     adapterInfo = (IP_ADAPTER_ADDRESSES *)malloc (bufsize);
-    if (adapterInfo == 0) {
-        JNU_ThrowByName(env, "java/lang/OutOfMemoryError", 0);
+    if (adapterInfo == NULL) {
+        JNU_ThrowByName(env, "java/lang/OutOfMemoryError", "Native heap allocation failure");
         return NULL;
     }
     len = bufsize;
@@ -128,14 +138,19 @@
     flags |= GAA_FLAG_INCLUDE_PREFIX;
     val = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, adapterInfo, &len);
     if (val == ERROR_BUFFER_OVERFLOW) {
-        adapterInfo = (IP_ADAPTER_ADDRESSES *) realloc (adapterInfo, len);
-        if (adapterInfo == 0) {
-            JNU_ThrowByName(env, "java/lang/OutOfMemoryError", 0);
+        IP_ADAPTER_ADDRESSES * newAdapterInfo = (IP_ADAPTER_ADDRESSES *) realloc (adapterInfo, len);
+        if (newAdapterInfo == NULL) {
+            free(adapterInfo);
+            JNU_ThrowByName(env, "java/lang/OutOfMemoryError", "Native heap allocation failure");
             return NULL;
         }
+
+        adapterInfo = newAdapterInfo;
+
         bufsize = len;
         val = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, adapterInfo, &len);
     }
+
     if (val != ERROR_SUCCESS) {
         free (adapterInfo);
         JNU_ThrowByName(env, "java/lang/Error",
@@ -148,7 +163,15 @@
       // IPv4 interface
       if (ptr->Ipv6IfIndex == index) {
         ret = (IP_ADAPTER_ADDRESSES *) malloc(sizeof(IP_ADAPTER_ADDRESSES));
+        if (ret == NULL) {
+            free(adapterInfo);
+            JNU_ThrowByName(env, "java/lang/OutOfMemoryError", "Native heap allocation failure");
+            return NULL;
+        }
+
+        //copy the memory and break out of the while loop.
         memcpy(ret, ptr, sizeof(IP_ADAPTER_ADDRESSES));
+        break;
       }
       ptr=ptr->Next;
     }
@@ -163,12 +186,12 @@
 int getAllInterfacesAndAddresses (JNIEnv *env, netif **netifPP)
 {
     DWORD ret;
-    IP_ADAPTER_ADDRESSES *ptr, *adapters=0;
+    IP_ADAPTER_ADDRESSES *ptr, *adapters=NULL;
     ULONG len=ipinflen, count=0;
-    netif *nif=0, *dup_nif, *last=0, *loopif=0, *curr;
+    netif *nif=NULL, *dup_nif, *last=NULL, *loopif=NULL, *curr;
     int tun=0, net=0;
 
-    *netifPP = 0;
+    *netifPP = NULL;
 
    /*
     * Get the IPv4 interfaces. This information is the same
@@ -183,7 +206,7 @@
     }
 
     /* locate the loopback (and the last) interface */
-    for (nif=*netifPP, last=nif; nif!=0; nif=nif->next) {
+    for (nif=*netifPP, last=nif; nif!=NULL; nif=nif->next) {
         if (nif->ifType == MIB_IF_TYPE_LOOPBACK) {
             loopif = nif;
         }
@@ -235,7 +258,7 @@
             int index = ptr->IfIndex;
             if (index != 0) {
                 /* This entry is associated with an IPv4 interface */
-                for (nif=*netifPP; nif!=0; nif=nif->next) {
+                for (nif=*netifPP; nif!=NULL; nif=nif->next) {
                     if (nif->index == index) {
                         /* found the interface entry
                          * set the index to the IPv6 index and add the
@@ -258,7 +281,7 @@
                  * if this is a duplicate (ipv6Index is the same)
                  */
                 dup_nif = 0;
-                for (nif0=*netifPP; nif0!=0; nif0=nif0->next) {
+                for (nif0=*netifPP; nif0!=NULL; nif0=nif0->next) {
                     if (nif0->hasIpv6Address &&
                                 ptr->Ipv6IfIndex == nif0->ipv6Index) {
                         dup_nif = nif0;
@@ -267,46 +290,46 @@
                 }
                 if (dup_nif == 0) {
                     /* new interface */
-                    nif = (netif *) calloc (1, sizeof(netif));
-                    if (nif == 0) {
-                        goto err;
-                    }
-                    if (ptr->IfType == IF_TYPE_TUNNEL) {
-                        sprintf (newname, "tun%d", tun);
-                        tun ++;
-                    } else {
-                        sprintf (newname, "net%d", net);
-                        net ++;
-                    }
-                    nif->name = malloc (strlen(newname)+1);
-                    nif->displayName = malloc (wcslen(ptr->FriendlyName)*2+2);
-                    if (nif->name == 0 || nif->displayName == 0) {
-                        goto err;
-                    }
-                    strcpy (nif->name, newname);
-                    wcscpy ((PWCHAR)nif->displayName, ptr->FriendlyName);
-                    nif->dNameIsUnicode = TRUE;
-                    nif->index = ptr->Ipv6IfIndex;
-                    nif->ipv6Index = ptr->Ipv6IfIndex;
-                    nif->hasIpv6Address = TRUE;
+                        nif = (netif *) calloc (1, sizeof(netif));
+                        if (nif == 0) {
+                            goto err;
+                        }
+                        if (ptr->IfType == IF_TYPE_TUNNEL) {
+                                sprintf (newname, "tun%d", tun);
+                                tun ++;
+                        } else {
+                                sprintf (newname, "net%d", net);
+                                net ++;
+                        }
+                        nif->name = malloc (strlen(newname)+1);
+                        nif->displayName = malloc (wcslen(ptr->FriendlyName)*2+2);
+                        if (nif->name == 0 || nif->displayName == 0) {
+                                goto err;
+                        }
+                        strcpy (nif->name, newname);
+                        wcscpy ((PWCHAR)nif->displayName, ptr->FriendlyName);
+                        nif->dNameIsUnicode = TRUE;
+                        nif->index = ptr->Ipv6IfIndex;
+                        nif->ipv6Index = ptr->Ipv6IfIndex;
+                        nif->hasIpv6Address = TRUE;
 
-                    last->next = nif;
-                    last = nif;
-                    count++;
-                    c = getAddrsFromAdapter(ptr, &nif->addrs);
-                    if (c == -1) {
-                        goto err;
-                    }
-                    nif->naddrs += c;
-                } else {
-                    /* add the addresses from this adapter to the
-                     * original (dup_nif)
-                     */
-                    c = getAddrsFromAdapter(ptr, &dup_nif->addrs);
-                    if (c == -1) {
-                        goto err;
-                    }
-                    dup_nif->naddrs += c;
+                        last->next = nif;
+                        last = nif;
+                        count++;
+                        c = getAddrsFromAdapter(ptr, &nif->addrs);
+                        if (c == -1) {
+                                goto err;
+                        }
+                        nif->naddrs += c;
+                 } else {
+                        /* add the addresses from this adapter to the
+                         * original (dup_nif)
+                         */
+                        c = getAddrsFromAdapter(ptr, &dup_nif->addrs);
+                        if (c == -1) {
+                                goto err;
+                        }
+                        dup_nif->naddrs += c;
                 }
             }
         }
@@ -335,45 +358,47 @@
  */
 
 static int getAddrsFromAdapter(IP_ADAPTER_ADDRESSES *ptr, netaddr **netaddrPP) {
-    LPSOCKADDR                   sock;
-    int                          count = 0;
-    netaddr                     *curr, *start=0, *prev=0;
-    PIP_ADAPTER_UNICAST_ADDRESS uni_addr;
-    PIP_ADAPTER_ANYCAST_ADDRESS any_addr;
-    PIP_ADAPTER_PREFIX prefix;
+        LPSOCKADDR sock;
+        int        count = 0;
+        netaddr    *curr, *start = NULL, *prev = NULL;
+        PIP_ADAPTER_UNICAST_ADDRESS uni_addr;
+        PIP_ADAPTER_ANYCAST_ADDRESS any_addr;
+        PIP_ADAPTER_PREFIX prefix;
 
-    /* If chain passed in, find end */
-    if (*netaddrPP != NULL) {
-        for (start=*netaddrPP; start->next!=NULL; start=start->next) {
+        /* If chain passed in, find end */
+        if (*netaddrPP != NULL) {
+            for (start=*netaddrPP; start->next!=NULL; start=start->next)
+                ;
+
+            prev=start;
         }
-        prev=start;
-    }
 
-    prefix = ptr->FirstPrefix;
-    /* Unicast */
-    uni_addr = ptr->FirstUnicastAddress;
-    while (uni_addr != NULL) {
+        prefix = ptr->FirstPrefix;
+        /* Unicast */
+        uni_addr = ptr->FirstUnicastAddress;
+        while (uni_addr != NULL) {
         /* address is only usable if dad state is preferred or deprecated */
-        if (uni_addr->DadState == IpDadStateDeprecated ||
-                uni_addr->DadState == IpDadStatePreferred) {
-            sock = uni_addr->Address.lpSockaddr;
+                if (uni_addr->DadState == IpDadStateDeprecated ||
+                                uni_addr->DadState == IpDadStatePreferred) {
+                        sock = uni_addr->Address.lpSockaddr;
 
-            // IPv4 addresses already retrieved with enumAddresses_win
-            if (sock->sa_family == AF_INET) {
-                uni_addr = uni_addr->Next;
-                continue;
-            }
+                        // IPv4 addresses already retrieved with enumAddresses_win
+                        if (sock->sa_family == AF_INET) {
+                                uni_addr = uni_addr->Next;
+                                continue;
+                        }
 
             curr = (netaddr *)calloc (1, sizeof (netaddr));
-            if (curr == 0) {
-                return -1;
-            }
-            if (start == NULL) {
+
+            if (curr == NULL)
+                goto freeAllocatedMemory;
+
+            if (start == NULL)
                 start = curr;
-            }
-            if (prev != NULL) {
-                prev->next = curr;
-            }
+
+            if (prev != NULL)
+               prev->next = curr;
+
             prev = curr;
             SOCKETADDRESS_COPY (&curr->addr, sock);
             if (prefix != NULL) {
@@ -388,15 +413,16 @@
     any_addr = ptr->FirstAnycastAddress;
     while (any_addr != NULL) {
         curr = (netaddr *)calloc (1, sizeof (netaddr));
-        if (curr == 0) {
-            return -1;
-        }
-        if (start == NULL) {
+
+        if (curr == NULL)
+            goto freeAllocatedMemory;
+
+        if (start == NULL)
             start = curr;
-        }
-        if (prev != NULL) {
+
+        if (prev != NULL)
             prev->next = curr;
-        }
+
         prev = curr;
         sock = any_addr->Address.lpSockaddr;
         SOCKETADDRESS_COPY (&curr->addr, sock);
@@ -407,6 +433,25 @@
         *netaddrPP = start;
     }
     return count;
+
+freeAllocatedMemory:
+
+    if (*netaddrPP != NULL) {
+        //N.B. the variable "start" cannot be NULL at this point because we started with an
+        //existing list.
+        curr=start->next;
+        start->next = NULL;
+        start = curr;
+    }
+    // otherwise, "start" points to the beginning of an incomplete list that we must deallocate.
+
+    while (start != NULL) {
+        curr = start->next;
+        free(start);
+        start = curr;
+    }
+
+    return -1;
 }
 
 /*
@@ -773,10 +818,12 @@
       ptr = getAdapter(env, index);
       if (ptr != NULL) {
         len = ptr->PhysicalAddressLength;
-        ret = (*env)->NewByteArray(env, len);
-        if (!IS_NULL(ret)) {
-          (*env)->SetByteArrayRegion(env, ret, 0, len,
-                                     (jbyte*) ptr->PhysicalAddress);
+        if (len > 0) {
+          ret = (*env)->NewByteArray(env, len);
+          if (!IS_NULL(ret)) {
+            (*env)->SetByteArrayRegion(env, ret, 0, len,
+                                       (jbyte*) ptr->PhysicalAddress);
+          }
         }
         free(ptr);
       }
--- a/jdk/src/windows/native/sun/net/dns/ResolverConfigurationImpl.c	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/src/windows/native/sun/net/dns/ResolverConfigurationImpl.c	Wed May 08 11:22:25 2013 +0100
@@ -122,9 +122,18 @@
      */
     size = sizeof(IP_ADAPTER_INFO);
     adapterP = (IP_ADAPTER_INFO *)malloc(size);
+    if (adapterP == NULL) {
+        return -1;
+    }
     ret = GetAdaptersInfo(adapterP, &size);
     if (ret == ERROR_BUFFER_OVERFLOW) {
-        adapterP = (IP_ADAPTER_INFO *)realloc(adapterP, size);
+        IP_ADAPTER_INFO *newAdapterP = (IP_ADAPTER_INFO *)realloc(adapterP, size);
+        if (newAdapterP == NULL) {
+            free(adapterP);
+            return -1;
+        }
+        adapterP = newAdapterP;
+
         ret = GetAdaptersInfo(adapterP, &size);
     }
 
--- a/jdk/test/ProblemList.txt	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/ProblemList.txt	Wed May 08 11:22:25 2013 +0100
@@ -122,6 +122,9 @@
 
 # jdk_lang
 
+# 8009615
+java/lang/instrument/IsModifiableClassAgent.java                generic-all
+
 # 6944188
 java/lang/management/ThreadMXBean/ThreadStateTest.java          generic-all
 
--- a/jdk/test/java/awt/Focus/OverrideRedirectWindowActivationTest/OverrideRedirectWindowActivationTest.java	Wed May 01 12:25:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug       6385277
- * @summary   Tests that override redirect window gets activated on click.
- * @author    anton.tarasov@sun.com: area=awt.focus
- * @library   ../../regtesthelpers
- * @build     Util
- * @run       main OverrideRedirectWindowActivationTest
- */
-import java.awt.*;
-import java.awt.event.*;
-import java.util.concurrent.Callable;
-import javax.swing.SwingUtilities;
-import sun.awt.SunToolkit;
-import test.java.awt.regtesthelpers.Util;
-
-public class OverrideRedirectWindowActivationTest {
-
-    private static Frame frame;
-    private static Window window;
-    private static Button fbutton;
-    private static Button wbutton;
-    private static Label label;
-    private static Robot robot;
-    private static SunToolkit toolkit;
-
-    public static void main(String[] args) throws Exception {
-
-        if ("sun.awt.motif.MToolkit".equals(Toolkit.getDefaultToolkit().getClass().getName())) {
-            System.out.println("No testing on Motif. Test passed.");
-            return;
-        }
-
-        toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
-        robot = new Robot();
-        robot.setAutoDelay(50);
-
-        Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() {
-
-            public void eventDispatched(AWTEvent e) {
-                System.out.println(e);
-            }
-        }, FocusEvent.FOCUS_EVENT_MASK | WindowEvent.WINDOW_FOCUS_EVENT_MASK);
-
-        createAndShowWindow();
-        toolkit.realSync();
-
-        createAndShowFrame();
-        toolkit.realSync();
-
-        // click on Frame
-        clickOn(getClickPoint(frame));
-
-        if (!frame.isFocused()) {
-            throw new RuntimeException("Error: a frame couldn't be focused by click.");
-        }
-
-        //click on Label in Window
-        clickOn(getClickPoint(label));
-
-        if (!window.isFocused()) {
-            throw new RuntimeException("Test failed: the window couldn't be activated by click!");
-        }
-
-        // bring focus back to the frame
-        clickOn(getClickPoint(fbutton));
-
-        if (!frame.isFocused()) {
-            throw new RuntimeException("Error: a frame couldn't be focused by click.");
-        }
-
-        // Test 2. Verifies that clicking on a component of unfocusable Window
-        //         won't activate it.
-
-        window.setFocusableWindowState(false);
-        toolkit.realSync();
-
-
-        clickOn(getClickPoint(label));
-
-        if (window.isFocused()) {
-            throw new RuntimeException("Test failed: unfocusable window got activated by click!");
-        }
-        System.out.println("Test passed.");
-
-    }
-
-    private static void createAndShowWindow() {
-
-        frame = new Frame("Test Frame");
-        window = new Window(frame);
-        wbutton = new Button("wbutton");
-        label = new Label("label");
-
-        window.setBounds(800, 200, 200, 100);
-        window.setLayout(new FlowLayout());
-        window.add(wbutton);
-        window.add(label);
-        window.setVisible(true);
-
-    }
-
-    private static void createAndShowFrame() {
-        fbutton = new Button("fbutton");
-
-        frame.setBounds(800, 0, 200, 100);
-        frame.setLayout(new FlowLayout());
-        frame.add(fbutton);
-        frame.setVisible(true);
-
-    }
-
-    static void clickOn(Point point) {
-
-        robot.mouseMove(point.x, point.y);
-
-        robot.mousePress(InputEvent.BUTTON1_MASK);
-        robot.mouseRelease(InputEvent.BUTTON1_MASK);
-
-        toolkit.realSync();
-    }
-
-    static Point getClickPoint(Component c) {
-        Point p = c.getLocationOnScreen();
-        Dimension d = c.getSize();
-        return new Point(p.x + (int) (d.getWidth() / 2), p.y + (int) (d.getHeight() / 2));
-    }
-
-    static Point getClickPoint(Frame frame) {
-        Point p = frame.getLocationOnScreen();
-        Dimension d = frame.getSize();
-        return new Point(p.x + (int) (d.getWidth() / 2), p.y + (frame.getInsets().top / 2));
-    }
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug       6385277
+ * @summary   Tests that override redirect window gets activated on click.
+ * @author    anton.tarasov@sun.com: area=awt.focus
+ * @library   ../../regtesthelpers
+ * @build     Util
+ * @run       main SimpleWindowActivationTest
+ */
+import java.awt.*;
+import java.awt.event.*;
+import java.util.concurrent.Callable;
+import javax.swing.SwingUtilities;
+import sun.awt.SunToolkit;
+import test.java.awt.regtesthelpers.Util;
+
+public class SimpleWindowActivationTest {
+
+    private static Frame frame;
+    private static Window window;
+    private static Button fbutton;
+    private static Button wbutton;
+    private static Label label;
+    private static Robot robot;
+    private static SunToolkit toolkit;
+
+    public static void main(String[] args) throws Exception {
+
+        if ("sun.awt.motif.MToolkit".equals(Toolkit.getDefaultToolkit().getClass().getName())) {
+            System.out.println("No testing on Motif. Test passed.");
+            return;
+        }
+
+        toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+        robot = new Robot();
+        robot.setAutoDelay(50);
+
+        Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() {
+
+            public void eventDispatched(AWTEvent e) {
+                System.out.println(e);
+            }
+        }, FocusEvent.FOCUS_EVENT_MASK | WindowEvent.WINDOW_FOCUS_EVENT_MASK);
+
+        createAndShowWindow();
+        toolkit.realSync();
+
+        createAndShowFrame();
+        toolkit.realSync();
+
+        // click on Frame
+        clickOn(getClickPoint(frame));
+
+        if (!frame.isFocused()) {
+            throw new RuntimeException("Error: a frame couldn't be focused by click.");
+        }
+
+        //click on Label in Window
+        clickOn(getClickPoint(label));
+
+        if (!window.isFocused()) {
+            throw new RuntimeException("Test failed: the window couldn't be activated by click!");
+        }
+
+        // bring focus back to the frame
+        clickOn(getClickPoint(fbutton));
+
+        if (!frame.isFocused()) {
+            throw new RuntimeException("Error: a frame couldn't be focused by click.");
+        }
+
+        // Test 2. Verifies that clicking on a component of unfocusable Window
+        //         won't activate it.
+
+        window.setFocusableWindowState(false);
+        toolkit.realSync();
+
+
+        clickOn(getClickPoint(label));
+
+        if (window.isFocused()) {
+            throw new RuntimeException("Test failed: unfocusable window got activated by click!");
+        }
+        System.out.println("Test passed.");
+
+    }
+
+    private static void createAndShowWindow() {
+
+        frame = new Frame("Test Frame");
+        window = new Window(frame);
+        wbutton = new Button("wbutton");
+        label = new Label("label");
+
+        window.setBounds(800, 200, 300, 100);
+        window.setLayout(new FlowLayout());
+        window.add(wbutton);
+        window.add(label);
+        window.setVisible(true);
+
+    }
+
+    private static void createAndShowFrame() {
+        fbutton = new Button("fbutton");
+
+        frame.setBounds(800, 0, 300, 100);
+        frame.setLayout(new FlowLayout());
+        frame.add(fbutton);
+        frame.setVisible(true);
+
+    }
+
+    static void clickOn(Point point) {
+
+        robot.mouseMove(point.x, point.y);
+
+        robot.mousePress(InputEvent.BUTTON1_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_MASK);
+
+        toolkit.realSync();
+    }
+
+    static Point getClickPoint(Component c) {
+        Point p = c.getLocationOnScreen();
+        Dimension d = c.getSize();
+        return new Point(p.x + (int) (d.getWidth() / 2), p.y + (int) (d.getHeight() / 2));
+    }
+
+    static Point getClickPoint(Frame frame) {
+        Point p = frame.getLocationOnScreen();
+        Dimension d = frame.getSize();
+        return new Point(p.x + (int) (d.getWidth() / 2), p.y + (frame.getInsets().top / 2));
+    }
+}
--- a/jdk/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.sh	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.sh	Wed May 08 11:22:25 2013 +0100
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,8 @@
 ${TESTJAVA}/bin/javac -cp ${TESTSRC} -d . ${TESTSRC}/BadDisplayTest.java
 
 
-export DISPLAY=
+DISPLAY=
+export DISPLAY
 
 OS=`uname -s`
 case "$OS" in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/WMSpecificTests/Metacity/FullscreenDialogModality.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8012586
+ * @summary verify that modal dialog will appeared above fullscreen window under Metacity WM.
+ * @run main FullscreenDialogModality
+ * @run main/othervm FullscreenDialogModality
+ * @author vkravets
+ */
+
+import test.java.awt.regtesthelpers.Util;
+
+import java.awt.*;
+import java.lang.reflect.InvocationTargetException;
+
+public class FullscreenDialogModality extends Frame {
+
+    static Robot robot = null;
+
+    public void enterFS() {
+        GraphicsDevice gd = getGraphicsConfiguration().getDevice();
+        final boolean fs = gd.isFullScreenSupported();
+        System.out.println("FullscreenSupported: " + (fs ? "yes" : "no"));
+        gd.setFullScreenWindow(this);
+        try {
+            // Give the system time to set the FS window and display it
+            // properly
+            Thread.sleep(2000);
+        } catch (Exception e) {}
+    }
+
+    public void exitFS() {
+        GraphicsDevice gd = getGraphicsConfiguration().getDevice();
+        // reset window
+        gd.setFullScreenWindow(null);
+        try {
+            // Give the system time to set the FS window and display it
+            // properly
+            Thread.sleep(2000);
+        } catch (Exception e) {}
+    }
+
+    public void checkDialogModality() throws InvocationTargetException, InterruptedException {
+        // Dialog
+        final Dialog d = new Dialog(FullscreenDialogModality.this, "Modal dialog", Dialog.ModalityType.APPLICATION_MODAL);
+        d.setBounds(500, 500, 160, 160);
+        d.setModal(true);
+        d.setBackground(Color.red);
+        EventQueue.invokeLater(new Runnable()
+        {
+            public void run()
+            {
+                d.setVisible(true);
+            }
+        });
+        // Wait until the dialog is shown
+        EventQueue.invokeLater(new Runnable() {
+            public void run() {
+                // Empty
+            }
+        });
+
+        Util.waitForIdle(robot);
+        try {
+            //Check color
+            Point checkPoint = new Point(d.getX() + d.getWidth() / 2, d.getY() + d.getHeight() / 2);
+            Color actual = robot.getPixelColor(checkPoint.x, checkPoint.y);
+            System.out.println("Color = " + actual);
+            if (actual.getRGB() == Color.GREEN.getRGB()) {
+                throw new RuntimeException("Test FAILED: Modal dialog shown below fullscreen window");
+            } else if (actual.getRGB() == Color.RED.getRGB()) {
+                System.out.println("Test PASSED: Modal dialog shown above fullscreen window");
+            } else {
+                System.out.println("pixelColor " +
+                        Integer.toHexString(actual.getRGB()) +
+                        " at coordinates (" + checkPoint.x + ", " + checkPoint.y + ")");
+                throw new RuntimeException("Test FAILED: Unexpected behavior");
+            }
+
+            robot.delay(2000);
+            Util.waitForIdle(robot);
+        } finally {
+            d.dispose();
+        }
+    }
+
+    public static void main(String args[]) throws InvocationTargetException, InterruptedException {
+        if (Util.getWMID() != Util.METACITY_WM) {
+            System.out.println("This test is only useful on Metacity");
+            return;
+        }
+        robot = Util.createRobot();
+        Util.waitForIdle(robot);
+        final FullscreenDialogModality frame = new FullscreenDialogModality();
+        frame.setUndecorated(true);
+        frame.setBackground(Color.green);
+        frame.setSize(500, 500);
+        frame.setVisible(true);
+        try {
+            robot.delay(100);
+            Util.waitForIdle(robot);
+
+            EventQueue.invokeAndWait(new Runnable() {
+                public void run() {
+                    frame.enterFS();
+                }
+            });
+            robot.delay(200);
+            Util.waitForIdle(robot);
+
+            frame.checkDialogModality();
+
+            EventQueue.invokeAndWait(new Runnable() {
+                public void run() {
+                    frame.exitFS();
+                }
+            });
+        } finally {
+            frame.dispose();
+        }
+    }
+}
--- a/jdk/test/java/beans/XMLEncoder/AbstractTest.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/beans/XMLEncoder/AbstractTest.java	Wed May 08 11:22:25 2013 +0100
@@ -30,8 +30,10 @@
 
 import java.nio.charset.Charset;
 
+import java.lang.reflect.Field;
+
 abstract class AbstractTest<T> implements ExceptionListener {
-    private final BeanValidator validator = new BeanValidator();
+    final BeanValidator validator = new BeanValidator();
 
     public final void exceptionThrown(Exception exception) {
         throw new Error("unexpected exception", exception);
@@ -59,7 +61,7 @@
     }
 
     /**
-     * This method should be overriden
+     * This method should be overridden
      * if specified encoder should be initialized.
      *
      * @param encoder  the XML encoder to initialize
@@ -68,7 +70,7 @@
     }
 
     /**
-     * This method should be overriden
+     * This method should be overridden
      * if specified decoder should be initialized.
      *
      * @param decoder  the XML decoder to initialize
@@ -77,7 +79,7 @@
     }
 
     /**
-     * This method should be overriden
+     * This method should be overridden
      * for test-specific comparison.
      *
      * @param before  the object before encoding
@@ -134,6 +136,7 @@
     private byte[] writeObject(Object object) {
         ByteArrayOutputStream output = new ByteArrayOutputStream();
         XMLEncoder encoder = new XMLEncoder(output);
+        encoder.setExceptionListener(this);
         initialize(encoder);
         encoder.writeObject(object);
         encoder.close();
@@ -143,9 +146,24 @@
     private Object readObject(byte[] array) {
         ByteArrayInputStream input = new ByteArrayInputStream(array);
         XMLDecoder decoder = new XMLDecoder(input);
+        decoder.setExceptionListener(this);
         initialize(decoder);
         Object object = decoder.readObject();
         decoder.close();
         return object;
     }
+
+    static Field getField(String name) {
+        try {
+            int index = name.lastIndexOf('.');
+            String className = name.substring(0, index);
+            String fieldName = name.substring(1 + index);
+            Field field = Class.forName(className).getDeclaredField(fieldName);
+            field.setAccessible(true);
+            return field;
+        }
+        catch (Exception exception) {
+            throw new Error(exception);
+        }
+    }
 }
--- a/jdk/test/java/beans/XMLEncoder/BeanValidator.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/beans/XMLEncoder/BeanValidator.java	Wed May 08 11:22:25 2013 +0100
@@ -63,6 +63,15 @@
         }
         Class type = object1.getClass();
         if (!type.equals(object2.getClass())) {
+            // resolve different implementations of the Map.Entry interface
+            if ((object1 instanceof Map.Entry) && (object2 instanceof Map.Entry)) {
+                log("!!! special case", "Map.Entry");
+                Map.Entry entry1 = (Map.Entry) object1;
+                Map.Entry entry2 = (Map.Entry) object2;
+                validate(entry1.getKey(), entry2.getKey());
+                validate(entry1.getValue(), entry2.getValue());
+                return;
+            }
             throw new IllegalStateException("could not compare objects with different types");
         }
         // validate elements of arrays
@@ -82,10 +91,14 @@
             }
             return;
         }
+        // special case for collections: do not use equals
+        boolean ignore = Collection.class.isAssignableFrom(type)
+                || Map.Entry.class.isAssignableFrom(type)
+                || Map.class.isAssignableFrom(type);
         // validate objects using equals()
         // we assume that the method equals(Object) can be called,
         // if the class declares such method
-        if (isDefined(type, "equals", Object.class)) {
+        if (!ignore && isDefined(type, "equals", Object.class)) {
             if (object1.equals(object2)) {
                 return;
             }
@@ -205,27 +218,7 @@
     }
 
     private void validate(Map map1, Map map2, boolean sorted) {
-        if (map1.size() != map2.size()) {
-            throw new IllegalStateException("could not compare maps with different sizes");
-        }
-        if (sorted) {
-            Iterator first = map1.entrySet().iterator();
-            Iterator second = map2.entrySet().iterator();
-            int index = 0;
-            while (first.hasNext() && second.hasNext()) {
-                log("validate map entry", Integer.valueOf(index++));
-                validate(first.next(), second.next());
-            }
-            if (first.hasNext() || second.hasNext()) {
-                throw new IllegalStateException("one map contains more entries than another one");
-            }
-        } else {
-            // assume that equals() can be used for keys
-            for (Object key : map1.keySet()) {
-                log("validate map value for key", key);
-                validate(map1.get(key), map2.get(key));
-            }
-        }
+        validate(map1.entrySet(), map2.entrySet(), sorted);
     }
 
     private boolean isCyclic(Object object1, Object object2) {
--- a/jdk/test/java/beans/XMLEncoder/Test4631471.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/beans/XMLEncoder/Test4631471.java	Wed May 08 11:22:25 2013 +0100
@@ -28,7 +28,6 @@
  * @author Sergey Malenkov, Mark Davidson
  */
 
-import java.beans.XMLEncoder;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
@@ -78,10 +77,6 @@
         // do not any validation
     }
 
-    protected final void initialize(XMLEncoder encoder) {
-        encoder.setExceptionListener(this);
-    }
-
     public static TreeNode getRoot() {
         DefaultMutableTreeNode node = new DefaultMutableTreeNode("root");
         DefaultMutableTreeNode first = new DefaultMutableTreeNode("first");
--- a/jdk/test/java/beans/XMLEncoder/Test4679556.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/beans/XMLEncoder/Test4679556.java	Wed May 08 11:22:25 2013 +0100
@@ -103,7 +103,6 @@
     }
 
     protected void initialize(XMLEncoder encoder) {
-        encoder.setExceptionListener(this);
         encoder.setPersistenceDelegate(C.class, new DefaultPersistenceDelegate() {
             protected Expression instantiate(Object oldInstance, Encoder out) {
                 C c = (C) oldInstance;
--- a/jdk/test/java/beans/XMLEncoder/java_awt_BorderLayout.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/beans/XMLEncoder/java_awt_BorderLayout.java	Wed May 08 11:22:25 2013 +0100
@@ -68,11 +68,9 @@
     @Override
     protected void validate(BorderLayout before, BorderLayout after) {
         super.validate(before, after);
-
-        BeanValidator validator = new BeanValidator();
         for (String constraint : CONSTRAINTS) {
-            validator.validate(before.getLayoutComponent(constraint),
-                               after.getLayoutComponent(constraint));
+            super.validator.validate(before.getLayoutComponent(constraint),
+                                     after.getLayoutComponent(constraint));
         }
     }
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/XMLEncoder/java_awt_CardLayout.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8007458
+ * @summary Tests CardLayout encoding
+ * @author Sergey Malenkov
+ */
+
+import java.awt.CardLayout;
+import java.lang.reflect.Field;
+import java.util.Vector;
+import javax.swing.JLabel;
+
+public final class java_awt_CardLayout extends AbstractTest<CardLayout> {
+    private static final Field VECTOR = getField("java.awt.CardLayout.vector");
+    private static final Field NAME = getField("java.awt.CardLayout$Card.name");
+    private static final Field COMP = getField("java.awt.CardLayout$Card.comp");
+
+    public static void main(String[] args) throws Exception {
+        new java_awt_CardLayout().test(true);
+    }
+
+    @Override
+    protected CardLayout getObject() {
+        CardLayout layout = new CardLayout();
+        layout.addLayoutComponent(new JLabel("a"), "a");
+        layout.addLayoutComponent(new JLabel("b"), "b");
+        layout.addLayoutComponent(new JLabel("c"), "c");
+        return layout;
+    }
+
+    @Override
+    protected CardLayout getAnotherObject() {
+        CardLayout layout = new CardLayout();
+        layout.addLayoutComponent(new JLabel("a"), "a");
+        layout.addLayoutComponent(new JLabel("b"), "b");
+        layout.addLayoutComponent(new JLabel("c"), "c");
+        layout.addLayoutComponent(new JLabel("d"), "d");
+        return layout;
+    }
+
+    @Override
+    protected void validate(CardLayout before, CardLayout after) {
+        super.validate(before, after);
+        try {
+            Vector a = (Vector) VECTOR.get(after);
+            Vector b = (Vector) VECTOR.get(before);
+            int size = a.size();
+            if (size != b.size()) {
+                throw new Error("different content");
+            }
+            for (int i = 0; i < size; i++) {
+                super.validator.validate(NAME.get(a.get(i)), NAME.get(b.get(i)));
+                super.validator.validate(COMP.get(a.get(i)), COMP.get(b.get(i)));
+            }
+        }
+        catch (Exception exception) {
+            throw new Error(exception);
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/XMLEncoder/java_awt_GridBagLayout.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8007458
+ * @summary Tests GridBagLayout encoding
+ * @author Sergey Malenkov
+ */
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.lang.reflect.Field;
+import java.util.Hashtable;
+import java.util.Map;
+import javax.swing.JLabel;
+
+public final class java_awt_GridBagLayout extends AbstractTest<GridBagLayout> {
+    private static final Field HASHTABLE = getField("java.awt.GridBagLayout.comptable");
+
+    public static void main(String[] args) {
+        new java_awt_GridBagLayout().test(true);
+    }
+
+    @Override
+    protected GridBagLayout getObject() {
+        GridBagLayout layout = new GridBagLayout();
+        update(layout, "1", 1, 1);
+        update(layout, "2", 2, 2);
+        update(layout, "3", 3, 3);
+        return layout;
+    }
+
+    @Override
+    protected GridBagLayout getAnotherObject() {
+        GridBagLayout layout = new GridBagLayout();
+        update(layout, "11", 1, 1);
+        update(layout, "12", 1, 2);
+        update(layout, "21", 2, 1);
+        update(layout, "22", 2, 2);
+        return layout;
+    }
+
+    @Override
+    protected void validate(GridBagLayout before, GridBagLayout after) {
+        super.validate(before, after);
+        try {
+            Hashtable a = (Hashtable) HASHTABLE.get(after);
+            Hashtable b = (Hashtable) HASHTABLE.get(before);
+            super.validator.validate(a, b);
+
+//            for (int i = 0; i < size; i++) {
+//                validator.validate(NAME.get(a.get(i)), NAME.get(b.get(i)));
+//                validator.validate(COMP.get(a.get(i)), COMP.get(b.get(i)));
+//            }
+        }
+        catch (Exception exception) {
+            throw new Error(exception);
+        }
+
+
+
+//        for (String name : names) {
+//            validator.validate(getConstraints(before, name), getConstraints(after, name));
+//        }
+    }
+
+    private static void update(GridBagLayout layout, String id, int x, int y) {
+        GridBagConstraints gbc = new GridBagConstraints();
+        gbc.gridx = x;
+        gbc.gridy = y;
+        layout.addLayoutComponent(new JLabel(id), gbc);
+    }
+
+/*
+    private static GridBagConstraints getConstraints(GridBagLayout layout, String id) {
+        return (layout == null) ? null : ((MyGridBagLayout) layout).getConstraints(id);
+    }
+*/
+}
--- a/jdk/test/java/beans/XMLEncoder/javax_swing_DefaultCellEditor.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/beans/XMLEncoder/javax_swing_DefaultCellEditor.java	Wed May 08 11:22:25 2013 +0100
@@ -28,6 +28,7 @@
  * @author Sergey Malenkov
  */
 
+import java.beans.XMLEncoder;
 import javax.swing.DefaultCellEditor;
 import javax.swing.JTextField;
 import javax.swing.text.JTextComponent;
@@ -46,6 +47,11 @@
         // return new DefaultCellEditor(new JTextField("Second"));
     }
 
+    @Override
+    protected void initialize(XMLEncoder encoder) {
+        encoder.setExceptionListener(null); // TODO: ignore non-public listener because of 4808251
+    }
+
     protected void validate(DefaultCellEditor before, DefaultCellEditor after) {
         String text = ((JTextComponent) after.getComponent()).getText();
         if (!text.equals(((JTextComponent) before.getComponent()).getText()))
--- a/jdk/test/java/io/Serializable/accessConstants/AccessConstants.java	Wed May 01 12:25:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
-@test
-@bug 4067964
-@clean AccessConstants
-@build AccessConstants
-@summary Verify that ObjectStreamConstants is public accessible.
-         This test will not compile pre-JDK 1.2.
-*/
-
-import java.io.ObjectStreamConstants;
-
-public class AccessConstants {
-    public static void main(String[] args) {
-        byte[] ref = new byte[4];
-        ref[0] = ObjectStreamConstants.TC_BASE;
-        ref[1] = ObjectStreamConstants.TC_NULL;
-        ref[2] = ObjectStreamConstants.TC_REFERENCE;
-        ref[3] = ObjectStreamConstants.TC_CLASSDESC;
-        int version = ObjectStreamConstants.PROTOCOL_VERSION_1;
-    }
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/CharSequence/DefaultTest.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.PrimitiveIterator;
+import java.util.stream.Collectors;
+
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+/*
+ * @test
+ * @summary Unit test for CharSequence default methods
+ * @bug 8012665
+ * @run testng DefaultTest
+ */
+
+@Test(groups = "lib")
+public class DefaultTest {
+
+    @Test(expectedExceptions = NoSuchElementException.class)
+    public void testEmptyChars() {
+        PrimitiveIterator.OfInt s = "".chars().iterator();
+        assertFalse(s.hasNext());
+        int ch = s.nextInt();
+    }
+
+    public void testSimpleChars() {
+        List<Integer> list = "abc".chars().boxed().collect(Collectors.toList());
+        assertEquals(list, Arrays.asList((int) 'a', (int) 'b', (int) 'c'));
+    }
+
+    @Test(expectedExceptions = NoSuchElementException.class)
+    public void testEmptyCodePoints() {
+        PrimitiveIterator.OfInt s = "".codePoints().iterator();
+        assertFalse(s.hasNext());
+        int cp = s.nextInt();
+    }
+
+    public void testSimpleCodePoints() {
+        List<Integer> list = "abc".codePoints().boxed().collect(Collectors.toList());
+        assertEquals(list, Arrays.asList((int)'a', (int)'b', (int)'c'));
+    }
+
+    public void testUndefCodePoints() {
+        List<Integer> list = "X\ufffeY".codePoints().boxed().collect(Collectors.toList());
+        assertEquals(list, Arrays.asList((int)'X', 0xFFFE, (int)'Y'));
+    }
+
+    public void testSurrogatePairing() {
+        // U+1D11E = MUSICAL SYMBOL G CLEF
+        // equivalent to surrogate pair U+D834 U+DD1E
+        List<Integer> list;
+        final int GCLEF = 0x1d11e;
+
+        list = "\ud834\udd1e".codePoints().boxed().collect(Collectors.toList());
+        assertEquals(list, Arrays.asList(GCLEF));
+        list = "A\ud834\udd1e".codePoints().boxed().collect(Collectors.toList());
+        assertEquals(list, Arrays.asList((int)'A', GCLEF));
+        list = "\ud834\udd1eB".codePoints().boxed().collect(Collectors.toList());
+        assertEquals(list, Arrays.asList(GCLEF, (int)'B'));
+        list = "X\ud834\udd1eY".codePoints().boxed().collect(Collectors.toList());
+        assertEquals(list, Arrays.asList((int)'X', GCLEF, (int)'Y'));
+    }
+
+    public void testUndefUnpaired() {
+        List<Integer> list = "W\udd1eX\ud834Y\ufffeZ".codePoints().boxed().collect(Collectors.toList());
+        assertEquals(list, Arrays.asList(
+            (int)'W', 0xdd1e, (int)'X', 0xd834, (int)'Y', 0xfffe, (int)'Z'));
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/String/StringJoinTest.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/**
+ * @test @bug 5015163
+ * @summary test String merge/join that is the inverse of String.split()
+ * @run testng StringJoinTest
+ * @author Jim Gish
+ */
+import java.util.ArrayList;
+import java.util.List;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+@Test(groups = {"unit","string","lang","libs"})
+public class StringJoinTest {
+    private final static String DASH = "-";
+    private final static String BEGIN = "Hi there";
+    private final static String JIM = "Jim";
+    private final static String JOHN = "John";
+    private final static String AND_JOE = "and Joe";
+    private final static String BILL = "Bill";
+    private final static String BOB = "Bob";
+    private final static String AND_BO = "and Bo";
+    private final static String ZEKE = "Zeke";
+    private final static String ZACK = "Zack";
+    private final static String AND_ZOE = "and Zoe";
+
+    /**
+     * Tests the join() methods on String
+     */
+    public void testJoinStringVarargs() {
+        // check a non-null join of String array (var-args) elements
+        String expectedResult = BEGIN + DASH + JIM + DASH + JOHN + DASH + AND_JOE;
+        String result = String.join(DASH, BEGIN, JIM, JOHN, AND_JOE);
+
+        assertEquals(result, expectedResult, "BEGIN.join(DASH, JIM, JOHN, AND_JOE)");
+        // test with just one element
+        assertEquals(String.join(DASH, BEGIN), BEGIN);
+    }
+
+    public void testJoinStringArray() {
+        // check a non-null join of Object[] with String elements
+        String[] theBs = {BILL, BOB, AND_BO};
+        String result = String.join(DASH, theBs);
+        String expectedResult = BILL + DASH + BOB + DASH + AND_BO;
+        assertEquals(result, expectedResult, "String.join(DASH, theBs)");
+    }
+
+    public void testJoinEmptyStringArray() {
+        // check a non-null join of Object[] with String elements
+        String[] empties = {};
+        String result = String.join(DASH, empties);
+        assertEquals(result, "", "String.join(DASH, empties)");
+    }
+
+    @Test(expectedExceptions = {NullPointerException.class})
+    public void testJoinNullStringArray() {
+        // check a non-null join of Object[] with String elements
+        String[] empties = null;
+        String result = String.join(DASH, empties);
+    }
+
+    @Test(expectedExceptions = {NullPointerException.class})
+    public void testJoinNullIterableStringList() {
+        // check join of an Iterables
+        List<CharSequence> theZsList = null;
+        String.join(DASH, theZsList);
+    }
+
+    public void testJoinIterableStringList() {
+        // check join of an Iterables
+        List<CharSequence> theZsList = new ArrayList<>();
+        theZsList.add(ZEKE);
+        theZsList.add(ZACK);
+        theZsList.add(AND_ZOE);
+        assertEquals(String.join(DASH, theZsList), ZEKE + DASH + ZACK + DASH
+                + AND_ZOE, "String.join(DASH, theZsList))");
+    }
+
+    public void testJoinNullStringList() {
+        List<CharSequence> nullList = null;
+        try {
+            assertEquals( String.join( DASH, nullList ), "null" );
+            fail("Null container should cause NPE");
+        } catch (NullPointerException npe) {}
+        assertEquals(String.join(DASH, null, null), "null" + DASH + "null");
+    }
+
+    @Test(expectedExceptions = {NullPointerException.class})
+    public void testJoinNullDelimiter() {
+        String.join(null, JIM, JOHN);
+    }
+}
--- a/jdk/test/java/lang/StringBuffer/TestSynchronization.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/lang/StringBuffer/TestSynchronization.java	Wed May 08 11:22:25 2013 +0100
@@ -96,6 +96,10 @@
         // the right thing.
         List<Method> methods = Arrays.asList(aClass.getDeclaredMethods());
         for (Method m : methods) {
+            // skip synthetic methods, like default interface methods and lambdas
+            if (m.isSynthetic()) {
+                continue;
+            }
             int modifiers = m.getModifiers();
             if (Modifier.isPublic(modifiers)
                     && !Modifier.isSynchronized(modifiers)) {
--- a/jdk/test/java/lang/Throwable/SuppressedExceptions.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/lang/Throwable/SuppressedExceptions.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 
 /*
  * @test
- * @bug     6911258 6962571 6963622 6991528 7005628
+ * @bug     6911258 6962571 6963622 6991528 7005628 8012044
  * @summary Basic tests of suppressed exceptions
  * @author  Joseph D. Darcy
  */
@@ -40,6 +40,7 @@
         serializationTest();
         selfReference();
         noModification();
+        initCausePlumbing();
     }
 
     private static void noSelfSuppression() {
@@ -48,7 +49,9 @@
             throwable.addSuppressed(throwable);
             throw new RuntimeException("IllegalArgumentException for self-suppresion not thrown.");
         } catch (IllegalArgumentException iae) {
-            ; // Expected
+            // Expected to be here
+            if (iae.getCause() != throwable)
+                throw new RuntimeException("Bad cause after self-suppresion.");
         }
     }
 
@@ -208,4 +211,36 @@
             super("The medium.", null, enableSuppression, true);
         }
     }
+
+    private static void initCausePlumbing() {
+        Throwable t1 = new Throwable();
+        Throwable t2 = new Throwable("message", t1);
+        Throwable t3 = new Throwable();
+
+        try {
+            t2.initCause(t3);
+            throw new RuntimeException("Shouldn't reach.");
+        } catch (IllegalStateException ise) {
+            if (ise.getCause() != t2)
+                throw new RuntimeException("Unexpected cause in ISE", ise);
+            Throwable[] suppressed = ise.getSuppressed();
+            if (suppressed.length !=  0)
+                throw new RuntimeException("Bad suppression in ISE", ise);
+        }
+
+        try {
+            t2.initCause(null);
+            throw new RuntimeException("Shouldn't reach.");
+        } catch (IllegalStateException ise) {
+            ; // Expected; don't want an NPE.
+        }
+
+        try {
+            t3.initCause(t3);
+            throw new RuntimeException("Shouldn't reach.");
+        } catch (IllegalArgumentException iae) {
+            if (iae.getCause() != t3)
+                throw new RuntimeException("Unexpected cause in ISE", iae);
+        }
+    }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,1122 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.PrintStream;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.List;
+
+/**
+ * @test
+ * @bug 8007373
+ * @summary jdk7 backward compatibility serialization problem
+ */
+
+public class Inet6AddressSerializationTest {
+
+    static boolean failed;
+
+    public static final int LOOPBACK_SCOPE_ID = 0;
+
+    public static final byte[] IN6ADDR_ANY_INIT = { (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 };
+
+    public static final byte[] LOOPBACKIPV6ADDRESS = { (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01 };
+
+    // fe80::21b:24ff:febd:f29c
+    public static final byte[] E1000G0IPV6ADDRESS = { (byte) 0xfe, (byte) 0x80,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x02, (byte) 0x1b, (byte) 0x24, (byte) 0xff,
+            (byte) 0xfe, (byte) 0xbd, (byte) 0xf2, (byte) 0x9c };
+
+    public static final String E1000G0HOSTNAME = "fe80:0:0:0:21b:24ff:febd:f29c%e1000g0";
+
+    public static final String LOCALHOSTNAME = "localhost";
+
+    public static final String NETWORK_IF_E1000G0 = "e1000g0";
+
+    public static final String NETWORK_IF_LO0 = "lo0";
+
+    public static final int SCOPE_ID_E1000G0 = 2;
+
+    public static final int SCOPE_ID_LO0 = 1;
+
+    public static final int SCOPE_ID_ZERO = 0;
+
+    public static void main(String[] args) throws Exception {
+        // args[0] == generate-loopback generates serial data for loopback if
+        // args[0] == generateAll generates serial data for interfaces with an
+        // IPV6 address binding
+
+        if (args.length != 0) {
+
+            if (args[0].equals("generate-loopback")) {
+
+                generateSerializedInet6AddressData(Inet6Address.getByAddress(
+                        InetAddress.getLoopbackAddress().getHostName(),
+                        LOOPBACKIPV6ADDRESS, LOOPBACK_SCOPE_ID), System.out,
+                        true);
+
+            } else {
+                generateAllInet6AddressSerializedData();
+            }
+        } else {
+            runTests();
+        }
+    }
+
+    private static void runTests() throws UnknownHostException, Exception,
+            IOException {
+        byte[] thisHostIPV6Address = null;
+        int scope_id = LOOPBACK_SCOPE_ID;
+
+        System.out.println("Hostname: "
+                + InetAddress.getLocalHost().getHostName());
+        System.out.println("LocalHost isLoopback : "
+                + InetAddress.getLocalHost().isLoopbackAddress());
+        thisHostIPV6Address = getThisHostIPV6Address(InetAddress.getLocalHost()
+                .getHostName());
+
+        if (thisHostIPV6Address == null) {
+            thisHostIPV6Address = IN6ADDR_ANY_INIT;
+        }
+
+        // testing JDK7 generated serialized loopback against locally generated
+        // loopback address
+        testInet6AddressSerialization(Inet6Address.getByAddress(InetAddress
+                .getLoopbackAddress().getHostName(), LOOPBACKIPV6ADDRESS,
+                scope_id), JDK7Inet6AddressSerialData);
+        // testing JDK8 generated serialized loopback against locally generated
+        // loopback address
+        testInet6AddressSerialization(Inet6Address.getByAddress(InetAddress
+                .getLoopbackAddress().getHostName(), LOOPBACKIPV6ADDRESS,
+                scope_id), JDK8Inet6AddressSerialData);
+        testInet6AddressSerialization(Inet6Address.getByAddress(InetAddress
+                .getLocalHost().getHostName(), IN6ADDR_ANY_INIT, scope_id),
+                null);
+        testInet6AddressSerialization(Inet6Address.getByAddress(InetAddress
+                .getLocalHost().getHostName(), thisHostIPV6Address, scope_id),
+                null);
+        testAllNetworkInterfaces();
+
+        // test against lo0
+        testSerializedLo0Inet6Address();
+
+        testSerializedE1000gInet6Address();
+
+        if (failed)
+            throw new RuntimeException("Some tests failed, check output");
+    }
+
+    private static byte[] getThisHostIPV6Address(String hostName)
+            throws Exception {
+        InetAddress[] thisHostIPAddresses = null;
+        try {
+            thisHostIPAddresses = InetAddress.getAllByName(InetAddress
+                    .getLocalHost().getHostName());
+        } catch (UnknownHostException uhEx) {
+            uhEx.printStackTrace();
+            throw uhEx;
+        }
+        byte[] thisHostIPV6Address = null;
+        for (InetAddress inetAddress : thisHostIPAddresses) {
+            if (inetAddress instanceof Inet6Address) {
+                if (inetAddress.getHostName().equals(hostName)) {
+                    thisHostIPV6Address = inetAddress.getAddress();
+                    break;
+                }
+            }
+        }
+        // System.err.println("getThisHostIPV6Address: address is "
+        // + Arrays.toString(thisHostIPV6Address));
+        return thisHostIPV6Address;
+    }
+
+    static void testAllNetworkInterfaces() throws Exception {
+        System.err.println("\n testAllNetworkInterfaces: \n ");
+        for (Enumeration<NetworkInterface> e = NetworkInterface
+                .getNetworkInterfaces(); e.hasMoreElements();) {
+            NetworkInterface netIF = e.nextElement();
+            for (Enumeration<InetAddress> iadrs = netIF.getInetAddresses(); iadrs
+                    .hasMoreElements();) {
+                InetAddress iadr = iadrs.nextElement();
+                if (iadr instanceof Inet6Address) {
+                    System.err.println("Test NetworkInterface:  " + netIF);
+                    Inet6Address i6adr = (Inet6Address) iadr;
+                    System.err.println("Testing with " + iadr);
+                    System.err.println(" scoped iface: "
+                            + i6adr.getScopedInterface());
+                    testInet6AddressSerialization(i6adr, null);
+                }
+            }
+        }
+    }
+
+    static void displayExpectedInet6Address(Inet6Address expectedInet6Address) {
+
+        String expectedHostName = expectedInet6Address.getHostName();
+        byte[] expectedAddress = expectedInet6Address.getAddress();
+        String expectedHostAddress = expectedInet6Address.getHostAddress();
+        int expectedScopeId = expectedInet6Address.getScopeId();
+        NetworkInterface expectedNetIf = expectedInet6Address
+                .getScopedInterface();
+
+        System.err.println("Excpected HostName: " + expectedHostName);
+        System.err.println("Expected Address: "
+                + Arrays.toString(expectedAddress));
+        System.err.println("Expected HostAddress: " + expectedHostAddress);
+        System.err.println("Expected Scope Id " + expectedScopeId);
+        System.err.println("Expected NetworkInterface " + expectedNetIf);
+        System.err.println("Expected Inet6Address " + expectedInet6Address);
+    }
+
+    // test serialization deserialization of Inet6Address
+    static void testInet6AddressSerialization(
+            Inet6Address expectedInet6Address, byte[] serializedAddress)
+            throws IOException {
+        System.err.println("\n testInet6AddressSerialization:  enter \n");
+
+        // displayExpectedInet6Address(expectedInet6Address);
+
+        byte[] serialData = serializedAddress != null ? serializedAddress
+                : generateSerializedInet6AddressData(expectedInet6Address,
+                        null, false);
+        try (ByteArrayInputStream bis = new ByteArrayInputStream(serialData);
+                ObjectInputStream oin = new ObjectInputStream(bis)) {
+            Inet6Address deserializedIPV6Addr = (Inet6Address) oin.readObject();
+            System.err.println("Deserialized Inet6Address "
+                    + deserializedIPV6Addr);
+            assertHostNameEqual(expectedInet6Address.getHostName(),
+                    deserializedIPV6Addr.getHostName());
+            assertHostAddressEqual(expectedInet6Address.getHostAddress(),
+                    deserializedIPV6Addr.getHostAddress());
+            assertAddressEqual(expectedInet6Address.getAddress(),
+                    deserializedIPV6Addr.getAddress());
+            assertScopeIdEqual(expectedInet6Address.getScopeId(),
+                    deserializedIPV6Addr.getScopeId());
+            assertNetworkInterfaceEqual(
+                    expectedInet6Address.getScopedInterface(),
+                    deserializedIPV6Addr.getScopedInterface());
+        } catch (Exception e) {
+            System.err.println("Exception caught during deserialization");
+            failed = true;
+            e.printStackTrace();
+        }
+    }
+
+    static void testSerializedE1000gInet6Address() throws IOException {
+        System.err.println("\n testSerializedE1000gInet6Address:  enter \n");
+        boolean testWithNetIf = true;
+        boolean useMockInet6Address = false;
+
+        NetworkInterface testNetIf = NetworkInterface
+                .getByName(NETWORK_IF_E1000G0);
+        Inet6Address expectedInet6Address = null;
+        if (testNetIf != null) {
+            System.err
+                    .println("\n testSerializedE1000gInet6Address:  using netif \n");
+            try {
+                expectedInet6Address = Inet6Address.getByAddress(
+                        E1000G0HOSTNAME, E1000G0IPV6ADDRESS, testNetIf);
+            } catch (UnknownHostException ukhEx) {
+                ukhEx.printStackTrace();
+                testWithNetIf = true;
+                useMockInet6Address = true;
+            }
+        } else {
+            System.err
+                    .println("\n testSerializedE1000gInet6Address:  using index \n");
+            try {
+                expectedInet6Address = Inet6Address.getByAddress(
+                        E1000G0HOSTNAME, E1000G0IPV6ADDRESS, SCOPE_ID_ZERO);
+            } catch (UnknownHostException ukhEx1) {
+                ukhEx1.printStackTrace();
+                useMockInet6Address = true;
+            }
+            testWithNetIf = false;
+        }
+
+        byte[] serializedAddress = SerialData_ifname_e1000g0;
+
+        // displayExpectedInet6Address(expectedInet6Address);
+
+        try (ByteArrayInputStream bis = new ByteArrayInputStream(
+                serializedAddress);
+                ObjectInputStream oin = new ObjectInputStream(bis)) {
+            Inet6Address deserializedIPV6Addr = (Inet6Address) oin.readObject();
+            System.err.println("Deserialized Inet6Address "
+                    + deserializedIPV6Addr);
+
+            if (!useMockInet6Address) {
+                assertHostNameEqual(expectedInet6Address.getHostName(),
+                        deserializedIPV6Addr.getHostName());
+                if (testWithNetIf) {
+                    assertHostAddressEqual(
+                            expectedInet6Address.getHostAddress(),
+                            deserializedIPV6Addr.getHostAddress());
+                } else {
+                    assertHostAddressEqual(
+                            MockE1000g0Inet6Address.getBareHostAddress(),
+                            deserializedIPV6Addr.getHostAddress());
+                }
+                assertAddressEqual(expectedInet6Address.getAddress(),
+                        deserializedIPV6Addr.getAddress());
+                assertScopeIdEqual(expectedInet6Address.getScopeId(),
+                        deserializedIPV6Addr.getScopeId());
+                if (testWithNetIf) {
+                    assertNetworkInterfaceEqual(
+                            expectedInet6Address.getScopedInterface(),
+                            deserializedIPV6Addr.getScopedInterface());
+                } else {
+                    assertNetworkInterfaceEqual(null,
+                            deserializedIPV6Addr.getScopedInterface());
+                }
+            } else { // use MockLo0Inet6Address
+                assertHostNameEqual(MockE1000g0Inet6Address.getHostName(),
+                        deserializedIPV6Addr.getHostName());
+                if (testWithNetIf) {
+                    assertHostAddressEqual(
+                            MockE1000g0Inet6Address.getHostAddress(),
+                            deserializedIPV6Addr.getHostAddress());
+                } else {
+                    assertHostAddressEqual(
+                            MockE1000g0Inet6Address.getHostAddressWithIndex(),
+                            deserializedIPV6Addr.getHostAddress());
+                }
+                assertAddressEqual(MockE1000g0Inet6Address.getAddress(),
+                        deserializedIPV6Addr.getAddress());
+                if (testWithNetIf) {
+                assertScopeIdEqual(MockE1000g0Inet6Address.getScopeId(),
+                        deserializedIPV6Addr.getScopeId());
+                } else {
+                    assertScopeIdEqual(MockE1000g0Inet6Address.getScopeZero(),
+                            deserializedIPV6Addr.getScopeId());
+                }
+                assertNetworkInterfaceNameEqual(
+                        MockE1000g0Inet6Address.getScopeIfName(),
+                        deserializedIPV6Addr.getScopedInterface());
+            }
+        } catch (Exception e) {
+            System.err.println("Exception caught during deserialization");
+            failed = true;
+            e.printStackTrace();
+        }
+    }
+
+    static void testSerializedLo0Inet6Address() throws IOException {
+        System.err.println("\n testSerializedLo0Inet6Address:  enter \n");
+        boolean testWithNetIf = true;
+        boolean useMockInet6Address = false;
+
+        NetworkInterface testNetIf = NetworkInterface.getByName(NETWORK_IF_LO0);
+        Inet6Address expectedInet6Address = null;
+        if (testNetIf != null) {
+            System.err
+                    .println("\n testSerializedLo0Inet6Address:  using netif \n");
+            try {
+                expectedInet6Address = Inet6Address.getByAddress(LOCALHOSTNAME,
+                        LOOPBACKIPV6ADDRESS, testNetIf);
+            } catch (UnknownHostException ukhEx) {
+                ukhEx.printStackTrace();
+                testWithNetIf = true;
+                useMockInet6Address = true;
+            }
+        } else {
+            System.err
+                    .println("\n testSerializedLo0Inet6Address:  using index \n");
+            try {
+                expectedInet6Address = Inet6Address.getByAddress(LOCALHOSTNAME,
+                        LOOPBACKIPV6ADDRESS, SCOPE_ID_ZERO);
+            } catch (UnknownHostException ukhEx1) {
+                ukhEx1.printStackTrace();
+                useMockInet6Address = true;
+            }
+            testWithNetIf = false;
+        }
+
+        // displayExpectedInet6Address(expectedInet6Address);
+
+        byte[] serializedAddress = SerialData_ifname_lo0;
+
+        try (ByteArrayInputStream bis = new ByteArrayInputStream(
+                serializedAddress);
+                ObjectInputStream oin = new ObjectInputStream(bis)) {
+            Inet6Address deserializedIPV6Addr = (Inet6Address) oin.readObject();
+            System.err.println("Deserialized Inet6Address "
+                    + deserializedIPV6Addr);
+            if (!useMockInet6Address) {
+                assertHostNameEqual(expectedInet6Address.getHostName(),
+                        deserializedIPV6Addr.getHostName());
+                if (testWithNetIf) {
+                    assertHostAddressEqual(
+                            expectedInet6Address.getHostAddress(),
+                            deserializedIPV6Addr.getHostAddress());
+                } else {
+                    assertHostAddressEqual(
+                            MockLo0Inet6Address.getBareHostAddress(),
+                            deserializedIPV6Addr.getHostAddress());
+                }
+                assertAddressEqual(expectedInet6Address.getAddress(),
+                        deserializedIPV6Addr.getAddress());
+                assertScopeIdEqual(expectedInet6Address.getScopeId(),
+                        deserializedIPV6Addr.getScopeId());
+                if (testWithNetIf) {
+                    assertNetworkInterfaceEqual(
+                            expectedInet6Address.getScopedInterface(),
+                            deserializedIPV6Addr.getScopedInterface());
+                } else {
+                    assertNetworkInterfaceEqual(null,
+                            deserializedIPV6Addr.getScopedInterface());
+                }
+            } else { // use MockLo0Inet6Address
+                assertHostNameEqual(MockLo0Inet6Address.getHostName(),
+                        deserializedIPV6Addr.getHostName());
+                if (testWithNetIf) {
+                    assertHostAddressEqual(
+                            MockLo0Inet6Address.getHostAddress(),
+                            deserializedIPV6Addr.getHostAddress());
+                } else {
+                    assertHostAddressEqual(
+                            MockLo0Inet6Address.getHostAddressWithIndex(),
+                            deserializedIPV6Addr.getHostAddress());
+                }
+                assertAddressEqual(MockLo0Inet6Address.getAddress(),
+                        deserializedIPV6Addr.getAddress());
+                if (testWithNetIf) {
+                assertScopeIdEqual(MockLo0Inet6Address.getScopeId(),
+                        deserializedIPV6Addr.getScopeId());
+                } else {
+                    assertScopeIdEqual(MockLo0Inet6Address.getScopeZero(),
+                            deserializedIPV6Addr.getScopeId());
+                }
+                assertNetworkInterfaceNameEqual(
+                        MockLo0Inet6Address.getScopeIfName(),
+                        deserializedIPV6Addr.getScopedInterface());
+            }
+        } catch (Exception e) {
+            System.err.println("Exception caught during deserialization");
+            failed = true;
+            e.printStackTrace();
+        }
+    }
+
+    static List<Inet6Address> getAllInet6Addresses() throws Exception {
+        // System.err.println("\n getAllInet6Addresses: \n ");
+        ArrayList<Inet6Address> inet6Addresses = new ArrayList<Inet6Address>();
+        for (Enumeration<NetworkInterface> e = NetworkInterface
+                .getNetworkInterfaces(); e.hasMoreElements();) {
+            NetworkInterface netIF = e.nextElement();
+            for (Enumeration<InetAddress> iadrs = netIF.getInetAddresses(); iadrs
+                    .hasMoreElements();) {
+                InetAddress iadr = iadrs.nextElement();
+                if (iadr instanceof Inet6Address) {
+                    System.err.println("Test NetworkInterface:  " + netIF);
+                    Inet6Address i6adr = (Inet6Address) iadr;
+                    System.err.println(" address " + iadr);
+                    System.err.println(" scoped iface: "
+                            + i6adr.getScopedInterface());
+                    // using this to actually set the hostName for an
+                    // InetAddress
+                    // created through the NetworkInterface
+                    // have found that the fabricated instances has a null
+                    // hostName
+                    System.err.println(" hostName: " + i6adr.getHostName());
+                    inet6Addresses.add(i6adr);
+                }
+            }
+        }
+        return inet6Addresses;
+    }
+
+    static void assertHostNameEqual(String expectedHostName,
+            String deserializedHostName) {
+        System.err
+                .println("Inet6AddressSerializationTest.assertHostNameEqual:");
+        if (expectedHostName == null) {
+            if (deserializedHostName == null) {
+                // ok, do nothing.
+            } else {
+                System.err.println("Error checking " + " HostName, expected:"
+                        + expectedHostName + ", got :" + deserializedHostName);
+                failed = true;
+            }
+        } else if (!expectedHostName.equals(deserializedHostName)) {
+            System.err.println("Error checking "
+                    + // versionStr +
+                    " HostName, expected:" + expectedHostName + ", got :"
+                    + deserializedHostName);
+            failed = true;
+        } else {
+            System.err.println("HostName equality "
+                    + // versionStr +
+                    " HostName, expected:" + expectedHostName + ", got :"
+                    + deserializedHostName);
+        }
+    }
+
+    static void assertHostAddressEqual(String expectedHostAddress,
+            String deserializedHostAddress) {
+        System.err
+                .println("Inet6AddressSerializationTest.assertHostAddressEqual:");
+        if (expectedHostAddress == null) {
+            if (deserializedHostAddress == null) {
+                // ok, do nothing.
+            } else {
+                System.err.println("Error checking "
+                        + " HostAddress, expected: " + expectedHostAddress
+                        + ", got: " + deserializedHostAddress);
+                failed = true;
+            }
+        } else if (!expectedHostAddress.equals(deserializedHostAddress)) {
+            System.err.println("Error checking "
+                    + // versionStr +
+                    " HostAddress, expected: " + expectedHostAddress
+                    + ", got: " + deserializedHostAddress);
+            failed = true;
+        } else {
+            System.err.println("HostAddress equality "
+                    + // versionStr +
+                    " HostAddress, expected: " + expectedHostAddress
+                    + ", got: " + deserializedHostAddress);
+        }
+    }
+
+    static void assertAddressEqual(byte[] expectedAddress,
+            byte[] deserializedAddress) {
+        System.err.println("Inet6AddressSerializationTest.assertAddressEqual:");
+        if (expectedAddress == null) {
+            if (deserializedAddress == null) {
+                // ok, do nothing.
+            } else {
+                System.err.println("Error checking " + " Address, expected:"
+                        + Arrays.toString(expectedAddress) + ", got: "
+                        + Arrays.toString(deserializedAddress));
+                failed = true;
+            }
+        } else if (!Arrays.equals(expectedAddress, deserializedAddress)) {
+            System.err.println("Error checking "
+                    + // versionStr +
+                    " Address, expected: " + Arrays.toString(expectedAddress)
+                    + ", got: " + Arrays.toString(deserializedAddress));
+            failed = true;
+        } else {
+            System.err.println("Address equality "
+                    + // versionStr +
+                    " Address, expected: " + Arrays.toString(expectedAddress)
+                    + ", got: " + Arrays.toString(deserializedAddress));
+        }
+    }
+
+    static void assertScopeIdEqual(int expectedScopeId, int deserializedScopeId) {
+        System.err.println("Inet6AddressSerializationTest.assertScopeIdEqual:");
+        if (expectedScopeId != deserializedScopeId) {
+            System.err.println("Error checking " + " ScopeId, expected:"
+                    + expectedScopeId + ", got: " + deserializedScopeId);
+            failed = true;
+        } else {
+            System.err.println("ScopeId equality "
+                    + // versionStr +
+                    " ScopeId, expected: " + expectedScopeId + ", got: "
+                    + deserializedScopeId);
+        }
+    }
+
+    static void assertNetworkInterfaceNameEqual(String expectedNetworkIfName,
+            NetworkInterface deserializedNetworkInterface) {
+
+        if (deserializedNetworkInterface != null) {
+            String deserializedNetworkIfName = deserializedNetworkInterface
+                    .getName();
+            System.err
+                    .println("Inet6AddressSerializationTest.assertHostNameEqual:");
+            if (expectedNetworkIfName == null) {
+                if (deserializedNetworkIfName == null) {
+                    // ok, do nothing.
+                } else {
+                    System.err.println("Error checking "
+                            + " NetworkIfName, expected: "
+                            + expectedNetworkIfName + ", got: "
+                            + deserializedNetworkIfName);
+                    failed = true;
+                }
+            } else if (!expectedNetworkIfName.equals(deserializedNetworkIfName)) {
+                System.err.println("Error checking "
+                        + " NetworkIfName, expected: " + expectedNetworkIfName
+                        + ", got: " + deserializedNetworkIfName);
+                failed = true;
+            } else {
+                System.err.println("NetworkIfName equality "
+                        + " NetworkIfName, expected: " + expectedNetworkIfName
+                        + ", got: " + deserializedNetworkIfName);
+            }
+        } else {
+            System.err
+                    .println("Warning "
+                            + " NetworkInterface  expected, but is null - ifname not relevant on deserializing host");
+        }
+    }
+
+    static void assertNetworkInterfaceEqual(
+            NetworkInterface expectedNetworkInterface,
+            NetworkInterface deserializedNetworkInterface) {
+        System.err
+                .println("Inet6AddressSerializationTest.assertNetworkInterfaceEqual:");
+        if (expectedNetworkInterface == null) {
+            if (deserializedNetworkInterface == null) {
+                // ok, do nothing.
+                System.err.println("Network Interface equality "
+                        + " NetworkInterface, expected:"
+                        + expectedNetworkInterface + ", got :"
+                        + deserializedNetworkInterface);
+            } else {
+                System.err.println("Error checking "
+                        + " NetworkInterface, expected:"
+                        + expectedNetworkInterface + ", got :"
+                        + deserializedNetworkInterface);
+                failed = true;
+            }
+        } else if (!expectedNetworkInterface
+                .equals(deserializedNetworkInterface)) {
+            System.err.println("Error checking "
+                    + // versionStr +
+                    " NetworkInterface, expected:" + expectedNetworkInterface
+                    + ", got :" + deserializedNetworkInterface);
+            failed = true;
+        } else {
+            System.err.println("Network Interface equality "
+                    + " NetworkInterface, expected:" + expectedNetworkInterface
+                    + ", got :" + deserializedNetworkInterface);
+        }
+    }
+
+    static void equal(Object expected, Object got) {
+        if (expected == null) {
+            if (got == null) {
+                // ok, do nothing.
+            } else {
+                System.err.println("Error checking "
+                        + " serial data, expected:" + expected + ", got :"
+                        + got);
+                failed = true;
+            }
+        } else if (!expected.equals(got)) {
+            System.err.println("Error checking " + // versionStr +
+                    " serial data, expected:" + expected + ", got :" + got);
+            failed = true;
+        }
+    }
+
+    // Used to generate serialData.
+    static byte[] generateSerializedInet6AddressData(Inet6Address addr,
+            PrintStream out, boolean outputToFile) throws IOException {
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        try (ObjectOutputStream oos = new ObjectOutputStream(bos)) {
+            oos.writeObject(addr);
+        }
+
+        String ifname = getIfName(addr);
+        byte[] ba = bos.toByteArray();
+        if (out != null) {
+            out.format("static final byte[] SerialData" + ifname + " = {\n");
+            for (int i = 0; i < ba.length; i++) {
+                out.format(" (byte)0x%02X", ba[i]);
+                if (i != (ba.length - 1))
+                    out.format(",");
+                if (((i + 1) % 6) == 0)
+                    out.format("\n");
+            }
+            out.format(" };\n \n");
+        }
+        if (outputToFile) {
+            serializeInet6AddressToFile(addr);
+        }
+        return ba;
+    }
+
+    private static String getIfName(Inet6Address inet6Addr) {
+        String ifname;
+        if (inet6Addr.getScopedInterface() != null) {
+            ifname = "_ifname_" + inet6Addr.getScopedInterface().getName();
+        } else {
+            ifname = "_ifname_"
+                    + Integer.valueOf(inet6Addr.getScopeId()).toString();
+        }
+        return ifname;
+    }
+
+    static void generateAllInet6AddressSerializedData() throws IOException {
+        // System.err.println("generateAllInet6AddressSerializedData: enter ....");
+
+        List<Inet6Address> inet6Addresses;
+
+        try {
+            inet6Addresses = getAllInet6Addresses();
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new IOException(e);
+        }
+
+        for (Inet6Address inet6Address : inet6Addresses) {
+            generateSerializedInet6AddressData(inet6Address, System.out, true);
+        }
+    }
+
+    static void serializeInet6AddressToFile(Inet6Address inet6Addr) {
+
+        // System.err
+        // .println("serializeInet6AddressToIPV6AddressFile: enter ....");
+
+        FileOutputStream fOut = null;
+        String inet6AddressOutputFilename = null;
+        inet6AddressOutputFilename = createOutputFileName(inet6Addr);
+        try {
+            fOut = new FileOutputStream(inet6AddressOutputFilename);
+        } catch (FileNotFoundException fnfEx) {
+
+            fnfEx.printStackTrace();
+        }
+        ObjectOutputStream ooStream = null;
+        try {
+            if (fOut != null) {
+                ooStream = new ObjectOutputStream(fOut);
+            } else {
+                System.err.println("Problem initilising Object output stream ");
+                System.exit(-1);
+            }
+
+        } catch (IOException e) {
+            e.printStackTrace();
+            System.exit(-1);
+        }
+
+        // serialise the last Inet6Address
+        /*
+         * System.err
+         * .println("serializeInet6AddressToIPV6AddressFile scoped iface:  \n" +
+         * inet6Addr.getScopedInterface());
+         */
+        try {
+            ooStream.writeObject(inet6Addr);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            System.exit(-1);
+        }
+
+        try {
+            ooStream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static String createOutputFileName(Inet6Address inet6Addr) {
+        String inet6AddressOutputFilename;
+        if (inet6Addr.getScopedInterface() != null) {
+            inet6AddressOutputFilename = "IPV6Address_"
+                    + inet6Addr.getScopedInterface().getName() + ".out";
+        } else {
+            inet6AddressOutputFilename = "IPV6Address_"
+                    + Integer.valueOf(inet6Addr.getScopeId()).toString()
+                    + ".out";
+        }
+        return inet6AddressOutputFilename;
+    }
+
+    // --- Generated data ---
+    // JDK7 output java Inet6AddressSerializationTest generate.
+
+    // loopback lo0 interface on Solaris 10
+
+    static final byte[] JDK7Inet6AddressSerialData = { (byte) 0xAC,
+            (byte) 0xED, (byte) 0x00, (byte) 0x05, (byte) 0x73, (byte) 0x72,
+            (byte) 0x00, (byte) 0x15, (byte) 0x6A, (byte) 0x61, (byte) 0x76,
+            (byte) 0x61, (byte) 0x2E, (byte) 0x6E, (byte) 0x65, (byte) 0x74,
+            (byte) 0x2E, (byte) 0x49, (byte) 0x6E, (byte) 0x65, (byte) 0x74,
+            (byte) 0x36, (byte) 0x41, (byte) 0x64, (byte) 0x64, (byte) 0x72,
+            (byte) 0x65, (byte) 0x73, (byte) 0x73, (byte) 0x5F, (byte) 0x7C,
+            (byte) 0x20, (byte) 0x81, (byte) 0x52, (byte) 0x2C, (byte) 0x80,
+            (byte) 0x21, (byte) 0x03, (byte) 0x00, (byte) 0x05, (byte) 0x49,
+            (byte) 0x00, (byte) 0x08, (byte) 0x73, (byte) 0x63, (byte) 0x6F,
+            (byte) 0x70, (byte) 0x65, (byte) 0x5F, (byte) 0x69, (byte) 0x64,
+            (byte) 0x5A, (byte) 0x00, (byte) 0x0C, (byte) 0x73, (byte) 0x63,
+            (byte) 0x6F, (byte) 0x70, (byte) 0x65, (byte) 0x5F, (byte) 0x69,
+            (byte) 0x64, (byte) 0x5F, (byte) 0x73, (byte) 0x65, (byte) 0x74,
+            (byte) 0x5A, (byte) 0x00, (byte) 0x10, (byte) 0x73, (byte) 0x63,
+            (byte) 0x6F, (byte) 0x70, (byte) 0x65, (byte) 0x5F, (byte) 0x69,
+            (byte) 0x66, (byte) 0x6E, (byte) 0x61, (byte) 0x6D, (byte) 0x65,
+            (byte) 0x5F, (byte) 0x73, (byte) 0x65, (byte) 0x74, (byte) 0x4C,
+            (byte) 0x00, (byte) 0x06, (byte) 0x69, (byte) 0x66, (byte) 0x6E,
+            (byte) 0x61, (byte) 0x6D, (byte) 0x65, (byte) 0x74, (byte) 0x00,
+            (byte) 0x12, (byte) 0x4C, (byte) 0x6A, (byte) 0x61, (byte) 0x76,
+            (byte) 0x61, (byte) 0x2F, (byte) 0x6C, (byte) 0x61, (byte) 0x6E,
+            (byte) 0x67, (byte) 0x2F, (byte) 0x53, (byte) 0x74, (byte) 0x72,
+            (byte) 0x69, (byte) 0x6E, (byte) 0x67, (byte) 0x3B, (byte) 0x5B,
+            (byte) 0x00, (byte) 0x09, (byte) 0x69, (byte) 0x70, (byte) 0x61,
+            (byte) 0x64, (byte) 0x64, (byte) 0x72, (byte) 0x65, (byte) 0x73,
+            (byte) 0x73, (byte) 0x74, (byte) 0x00, (byte) 0x02, (byte) 0x5B,
+            (byte) 0x42, (byte) 0x78, (byte) 0x72, (byte) 0x00, (byte) 0x14,
+            (byte) 0x6A, (byte) 0x61, (byte) 0x76, (byte) 0x61, (byte) 0x2E,
+            (byte) 0x6E, (byte) 0x65, (byte) 0x74, (byte) 0x2E, (byte) 0x49,
+            (byte) 0x6E, (byte) 0x65, (byte) 0x74, (byte) 0x41, (byte) 0x64,
+            (byte) 0x64, (byte) 0x72, (byte) 0x65, (byte) 0x73, (byte) 0x73,
+            (byte) 0x2D, (byte) 0x9B, (byte) 0x57, (byte) 0xAF, (byte) 0x9F,
+            (byte) 0xE3, (byte) 0xEB, (byte) 0xDB, (byte) 0x02, (byte) 0x00,
+            (byte) 0x03, (byte) 0x49, (byte) 0x00, (byte) 0x07, (byte) 0x61,
+            (byte) 0x64, (byte) 0x64, (byte) 0x72, (byte) 0x65, (byte) 0x73,
+            (byte) 0x73, (byte) 0x49, (byte) 0x00, (byte) 0x06, (byte) 0x66,
+            (byte) 0x61, (byte) 0x6D, (byte) 0x69, (byte) 0x6C, (byte) 0x79,
+            (byte) 0x4C, (byte) 0x00, (byte) 0x08, (byte) 0x68, (byte) 0x6F,
+            (byte) 0x73, (byte) 0x74, (byte) 0x4E, (byte) 0x61, (byte) 0x6D,
+            (byte) 0x65, (byte) 0x71, (byte) 0x00, (byte) 0x7E, (byte) 0x00,
+            (byte) 0x01, (byte) 0x78, (byte) 0x70, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x02, (byte) 0x74, (byte) 0x00, (byte) 0x09, (byte) 0x6C,
+            (byte) 0x6F, (byte) 0x63, (byte) 0x61, (byte) 0x6C, (byte) 0x68,
+            (byte) 0x6F, (byte) 0x73, (byte) 0x74, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0x70,
+            (byte) 0x75, (byte) 0x72, (byte) 0x00, (byte) 0x02, (byte) 0x5B,
+            (byte) 0x42, (byte) 0xAC, (byte) 0xF3, (byte) 0x17, (byte) 0xF8,
+            (byte) 0x06, (byte) 0x08, (byte) 0x54, (byte) 0xE0, (byte) 0x02,
+            (byte) 0x00, (byte) 0x00, (byte) 0x78, (byte) 0x70, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x10, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0x78 };
+
+    // JDK8 output java Inet6AddressSerializationTest generate.
+    // loopback lo0 interface on Solaris 10
+
+    static final byte[] JDK8Inet6AddressSerialData = { (byte) 0xAC,
+            (byte) 0xED, (byte) 0x00, (byte) 0x05, (byte) 0x73, (byte) 0x72,
+            (byte) 0x00, (byte) 0x15, (byte) 0x6A, (byte) 0x61, (byte) 0x76,
+            (byte) 0x61, (byte) 0x2E, (byte) 0x6E, (byte) 0x65, (byte) 0x74,
+            (byte) 0x2E, (byte) 0x49, (byte) 0x6E, (byte) 0x65, (byte) 0x74,
+            (byte) 0x36, (byte) 0x41, (byte) 0x64, (byte) 0x64, (byte) 0x72,
+            (byte) 0x65, (byte) 0x73, (byte) 0x73, (byte) 0x5F, (byte) 0x7C,
+            (byte) 0x20, (byte) 0x81, (byte) 0x52, (byte) 0x2C, (byte) 0x80,
+            (byte) 0x21, (byte) 0x03, (byte) 0x00, (byte) 0x05, (byte) 0x49,
+            (byte) 0x00, (byte) 0x08, (byte) 0x73, (byte) 0x63, (byte) 0x6F,
+            (byte) 0x70, (byte) 0x65, (byte) 0x5F, (byte) 0x69, (byte) 0x64,
+            (byte) 0x5A, (byte) 0x00, (byte) 0x0C, (byte) 0x73, (byte) 0x63,
+            (byte) 0x6F, (byte) 0x70, (byte) 0x65, (byte) 0x5F, (byte) 0x69,
+            (byte) 0x64, (byte) 0x5F, (byte) 0x73, (byte) 0x65, (byte) 0x74,
+            (byte) 0x5A, (byte) 0x00, (byte) 0x10, (byte) 0x73, (byte) 0x63,
+            (byte) 0x6F, (byte) 0x70, (byte) 0x65, (byte) 0x5F, (byte) 0x69,
+            (byte) 0x66, (byte) 0x6E, (byte) 0x61, (byte) 0x6D, (byte) 0x65,
+            (byte) 0x5F, (byte) 0x73, (byte) 0x65, (byte) 0x74, (byte) 0x4C,
+            (byte) 0x00, (byte) 0x06, (byte) 0x69, (byte) 0x66, (byte) 0x6E,
+            (byte) 0x61, (byte) 0x6D, (byte) 0x65, (byte) 0x74, (byte) 0x00,
+            (byte) 0x12, (byte) 0x4C, (byte) 0x6A, (byte) 0x61, (byte) 0x76,
+            (byte) 0x61, (byte) 0x2F, (byte) 0x6C, (byte) 0x61, (byte) 0x6E,
+            (byte) 0x67, (byte) 0x2F, (byte) 0x53, (byte) 0x74, (byte) 0x72,
+            (byte) 0x69, (byte) 0x6E, (byte) 0x67, (byte) 0x3B, (byte) 0x5B,
+            (byte) 0x00, (byte) 0x09, (byte) 0x69, (byte) 0x70, (byte) 0x61,
+            (byte) 0x64, (byte) 0x64, (byte) 0x72, (byte) 0x65, (byte) 0x73,
+            (byte) 0x73, (byte) 0x74, (byte) 0x00, (byte) 0x02, (byte) 0x5B,
+            (byte) 0x42, (byte) 0x78, (byte) 0x72, (byte) 0x00, (byte) 0x14,
+            (byte) 0x6A, (byte) 0x61, (byte) 0x76, (byte) 0x61, (byte) 0x2E,
+            (byte) 0x6E, (byte) 0x65, (byte) 0x74, (byte) 0x2E, (byte) 0x49,
+            (byte) 0x6E, (byte) 0x65, (byte) 0x74, (byte) 0x41, (byte) 0x64,
+            (byte) 0x64, (byte) 0x72, (byte) 0x65, (byte) 0x73, (byte) 0x73,
+            (byte) 0x2D, (byte) 0x9B, (byte) 0x57, (byte) 0xAF, (byte) 0x9F,
+            (byte) 0xE3, (byte) 0xEB, (byte) 0xDB, (byte) 0x02, (byte) 0x00,
+            (byte) 0x03, (byte) 0x49, (byte) 0x00, (byte) 0x07, (byte) 0x61,
+            (byte) 0x64, (byte) 0x64, (byte) 0x72, (byte) 0x65, (byte) 0x73,
+            (byte) 0x73, (byte) 0x49, (byte) 0x00, (byte) 0x06, (byte) 0x66,
+            (byte) 0x61, (byte) 0x6D, (byte) 0x69, (byte) 0x6C, (byte) 0x79,
+            (byte) 0x4C, (byte) 0x00, (byte) 0x08, (byte) 0x68, (byte) 0x6F,
+            (byte) 0x73, (byte) 0x74, (byte) 0x4E, (byte) 0x61, (byte) 0x6D,
+            (byte) 0x65, (byte) 0x71, (byte) 0x00, (byte) 0x7E, (byte) 0x00,
+            (byte) 0x01, (byte) 0x78, (byte) 0x70, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x02, (byte) 0x74, (byte) 0x00, (byte) 0x09, (byte) 0x6C,
+            (byte) 0x6F, (byte) 0x63, (byte) 0x61, (byte) 0x6C, (byte) 0x68,
+            (byte) 0x6F, (byte) 0x73, (byte) 0x74, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0x70,
+            (byte) 0x75, (byte) 0x72, (byte) 0x00, (byte) 0x02, (byte) 0x5B,
+            (byte) 0x42, (byte) 0xAC, (byte) 0xF3, (byte) 0x17, (byte) 0xF8,
+            (byte) 0x06, (byte) 0x08, (byte) 0x54, (byte) 0xE0, (byte) 0x02,
+            (byte) 0x00, (byte) 0x00, (byte) 0x78, (byte) 0x70, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x10, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0x78 };
+
+    // java Inet6AddressSerializationTest generateAll produces this inet6address
+    // serial data
+    // jdk8 generated serialization of on address fe80:0:0:0:21b:24ff:febd:f29c
+    // net if e1000g0
+
+    static final byte[] SerialData_ifname_e1000g0 = { (byte) 0xAC, (byte) 0xED,
+            (byte) 0x00, (byte) 0x05, (byte) 0x73, (byte) 0x72, (byte) 0x00,
+            (byte) 0x15, (byte) 0x6A, (byte) 0x61, (byte) 0x76, (byte) 0x61,
+            (byte) 0x2E, (byte) 0x6E, (byte) 0x65, (byte) 0x74, (byte) 0x2E,
+            (byte) 0x49, (byte) 0x6E, (byte) 0x65, (byte) 0x74, (byte) 0x36,
+            (byte) 0x41, (byte) 0x64, (byte) 0x64, (byte) 0x72, (byte) 0x65,
+            (byte) 0x73, (byte) 0x73, (byte) 0x5F, (byte) 0x7C, (byte) 0x20,
+            (byte) 0x81, (byte) 0x52, (byte) 0x2C, (byte) 0x80, (byte) 0x21,
+            (byte) 0x03, (byte) 0x00, (byte) 0x05, (byte) 0x49, (byte) 0x00,
+            (byte) 0x08, (byte) 0x73, (byte) 0x63, (byte) 0x6F, (byte) 0x70,
+            (byte) 0x65, (byte) 0x5F, (byte) 0x69, (byte) 0x64, (byte) 0x5A,
+            (byte) 0x00, (byte) 0x0C, (byte) 0x73, (byte) 0x63, (byte) 0x6F,
+            (byte) 0x70, (byte) 0x65, (byte) 0x5F, (byte) 0x69, (byte) 0x64,
+            (byte) 0x5F, (byte) 0x73, (byte) 0x65, (byte) 0x74, (byte) 0x5A,
+            (byte) 0x00, (byte) 0x10, (byte) 0x73, (byte) 0x63, (byte) 0x6F,
+            (byte) 0x70, (byte) 0x65, (byte) 0x5F, (byte) 0x69, (byte) 0x66,
+            (byte) 0x6E, (byte) 0x61, (byte) 0x6D, (byte) 0x65, (byte) 0x5F,
+            (byte) 0x73, (byte) 0x65, (byte) 0x74, (byte) 0x4C, (byte) 0x00,
+            (byte) 0x06, (byte) 0x69, (byte) 0x66, (byte) 0x6E, (byte) 0x61,
+            (byte) 0x6D, (byte) 0x65, (byte) 0x74, (byte) 0x00, (byte) 0x12,
+            (byte) 0x4C, (byte) 0x6A, (byte) 0x61, (byte) 0x76, (byte) 0x61,
+            (byte) 0x2F, (byte) 0x6C, (byte) 0x61, (byte) 0x6E, (byte) 0x67,
+            (byte) 0x2F, (byte) 0x53, (byte) 0x74, (byte) 0x72, (byte) 0x69,
+            (byte) 0x6E, (byte) 0x67, (byte) 0x3B, (byte) 0x5B, (byte) 0x00,
+            (byte) 0x09, (byte) 0x69, (byte) 0x70, (byte) 0x61, (byte) 0x64,
+            (byte) 0x64, (byte) 0x72, (byte) 0x65, (byte) 0x73, (byte) 0x73,
+            (byte) 0x74, (byte) 0x00, (byte) 0x02, (byte) 0x5B, (byte) 0x42,
+            (byte) 0x78, (byte) 0x72, (byte) 0x00, (byte) 0x14, (byte) 0x6A,
+            (byte) 0x61, (byte) 0x76, (byte) 0x61, (byte) 0x2E, (byte) 0x6E,
+            (byte) 0x65, (byte) 0x74, (byte) 0x2E, (byte) 0x49, (byte) 0x6E,
+            (byte) 0x65, (byte) 0x74, (byte) 0x41, (byte) 0x64, (byte) 0x64,
+            (byte) 0x72, (byte) 0x65, (byte) 0x73, (byte) 0x73, (byte) 0x2D,
+            (byte) 0x9B, (byte) 0x57, (byte) 0xAF, (byte) 0x9F, (byte) 0xE3,
+            (byte) 0xEB, (byte) 0xDB, (byte) 0x02, (byte) 0x00, (byte) 0x03,
+            (byte) 0x49, (byte) 0x00, (byte) 0x07, (byte) 0x61, (byte) 0x64,
+            (byte) 0x64, (byte) 0x72, (byte) 0x65, (byte) 0x73, (byte) 0x73,
+            (byte) 0x49, (byte) 0x00, (byte) 0x06, (byte) 0x66, (byte) 0x61,
+            (byte) 0x6D, (byte) 0x69, (byte) 0x6C, (byte) 0x79, (byte) 0x4C,
+            (byte) 0x00, (byte) 0x08, (byte) 0x68, (byte) 0x6F, (byte) 0x73,
+            (byte) 0x74, (byte) 0x4E, (byte) 0x61, (byte) 0x6D, (byte) 0x65,
+            (byte) 0x71, (byte) 0x00, (byte) 0x7E, (byte) 0x00, (byte) 0x01,
+            (byte) 0x78, (byte) 0x70, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x02,
+            (byte) 0x74, (byte) 0x00, (byte) 0x25, (byte) 0x66, (byte) 0x65,
+            (byte) 0x38, (byte) 0x30, (byte) 0x3A, (byte) 0x30, (byte) 0x3A,
+            (byte) 0x30, (byte) 0x3A, (byte) 0x30, (byte) 0x3A, (byte) 0x32,
+            (byte) 0x31, (byte) 0x62, (byte) 0x3A, (byte) 0x32, (byte) 0x34,
+            (byte) 0x66, (byte) 0x66, (byte) 0x3A, (byte) 0x66, (byte) 0x65,
+            (byte) 0x62, (byte) 0x64, (byte) 0x3A, (byte) 0x66, (byte) 0x32,
+            (byte) 0x39, (byte) 0x63, (byte) 0x25, (byte) 0x65, (byte) 0x31,
+            (byte) 0x30, (byte) 0x30, (byte) 0x30, (byte) 0x67, (byte) 0x30,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x02, (byte) 0x01,
+            (byte) 0x01, (byte) 0x74, (byte) 0x00, (byte) 0x07, (byte) 0x65,
+            (byte) 0x31, (byte) 0x30, (byte) 0x30, (byte) 0x30, (byte) 0x67,
+            (byte) 0x30, (byte) 0x75, (byte) 0x72, (byte) 0x00, (byte) 0x02,
+            (byte) 0x5B, (byte) 0x42, (byte) 0xAC, (byte) 0xF3, (byte) 0x17,
+            (byte) 0xF8, (byte) 0x06, (byte) 0x08, (byte) 0x54, (byte) 0xE0,
+            (byte) 0x02, (byte) 0x00, (byte) 0x00, (byte) 0x78, (byte) 0x70,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x10, (byte) 0xFE,
+            (byte) 0x80, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x02, (byte) 0x1B, (byte) 0x24,
+            (byte) 0xFF, (byte) 0xFE, (byte) 0xBD, (byte) 0xF2, (byte) 0x9C,
+            (byte) 0x78 };
+
+    // jdk8 generated serialization of address 0::1 on net if lo0 hostname
+    // localhost scope_id 1
+
+    static final byte[] SerialData_ifname_lo0 = { (byte) 0xAC, (byte) 0xED,
+            (byte) 0x00, (byte) 0x05, (byte) 0x73, (byte) 0x72, (byte) 0x00,
+            (byte) 0x15, (byte) 0x6A, (byte) 0x61, (byte) 0x76, (byte) 0x61,
+            (byte) 0x2E, (byte) 0x6E, (byte) 0x65, (byte) 0x74, (byte) 0x2E,
+            (byte) 0x49, (byte) 0x6E, (byte) 0x65, (byte) 0x74, (byte) 0x36,
+            (byte) 0x41, (byte) 0x64, (byte) 0x64, (byte) 0x72, (byte) 0x65,
+            (byte) 0x73, (byte) 0x73, (byte) 0x5F, (byte) 0x7C, (byte) 0x20,
+            (byte) 0x81, (byte) 0x52, (byte) 0x2C, (byte) 0x80, (byte) 0x21,
+            (byte) 0x03, (byte) 0x00, (byte) 0x05, (byte) 0x49, (byte) 0x00,
+            (byte) 0x08, (byte) 0x73, (byte) 0x63, (byte) 0x6F, (byte) 0x70,
+            (byte) 0x65, (byte) 0x5F, (byte) 0x69, (byte) 0x64, (byte) 0x5A,
+            (byte) 0x00, (byte) 0x0C, (byte) 0x73, (byte) 0x63, (byte) 0x6F,
+            (byte) 0x70, (byte) 0x65, (byte) 0x5F, (byte) 0x69, (byte) 0x64,
+            (byte) 0x5F, (byte) 0x73, (byte) 0x65, (byte) 0x74, (byte) 0x5A,
+            (byte) 0x00, (byte) 0x10, (byte) 0x73, (byte) 0x63, (byte) 0x6F,
+            (byte) 0x70, (byte) 0x65, (byte) 0x5F, (byte) 0x69, (byte) 0x66,
+            (byte) 0x6E, (byte) 0x61, (byte) 0x6D, (byte) 0x65, (byte) 0x5F,
+            (byte) 0x73, (byte) 0x65, (byte) 0x74, (byte) 0x4C, (byte) 0x00,
+            (byte) 0x06, (byte) 0x69, (byte) 0x66, (byte) 0x6E, (byte) 0x61,
+            (byte) 0x6D, (byte) 0x65, (byte) 0x74, (byte) 0x00, (byte) 0x12,
+            (byte) 0x4C, (byte) 0x6A, (byte) 0x61, (byte) 0x76, (byte) 0x61,
+            (byte) 0x2F, (byte) 0x6C, (byte) 0x61, (byte) 0x6E, (byte) 0x67,
+            (byte) 0x2F, (byte) 0x53, (byte) 0x74, (byte) 0x72, (byte) 0x69,
+            (byte) 0x6E, (byte) 0x67, (byte) 0x3B, (byte) 0x5B, (byte) 0x00,
+            (byte) 0x09, (byte) 0x69, (byte) 0x70, (byte) 0x61, (byte) 0x64,
+            (byte) 0x64, (byte) 0x72, (byte) 0x65, (byte) 0x73, (byte) 0x73,
+            (byte) 0x74, (byte) 0x00, (byte) 0x02, (byte) 0x5B, (byte) 0x42,
+            (byte) 0x78, (byte) 0x72, (byte) 0x00, (byte) 0x14, (byte) 0x6A,
+            (byte) 0x61, (byte) 0x76, (byte) 0x61, (byte) 0x2E, (byte) 0x6E,
+            (byte) 0x65, (byte) 0x74, (byte) 0x2E, (byte) 0x49, (byte) 0x6E,
+            (byte) 0x65, (byte) 0x74, (byte) 0x41, (byte) 0x64, (byte) 0x64,
+            (byte) 0x72, (byte) 0x65, (byte) 0x73, (byte) 0x73, (byte) 0x2D,
+            (byte) 0x9B, (byte) 0x57, (byte) 0xAF, (byte) 0x9F, (byte) 0xE3,
+            (byte) 0xEB, (byte) 0xDB, (byte) 0x02, (byte) 0x00, (byte) 0x03,
+            (byte) 0x49, (byte) 0x00, (byte) 0x07, (byte) 0x61, (byte) 0x64,
+            (byte) 0x64, (byte) 0x72, (byte) 0x65, (byte) 0x73, (byte) 0x73,
+            (byte) 0x49, (byte) 0x00, (byte) 0x06, (byte) 0x66, (byte) 0x61,
+            (byte) 0x6D, (byte) 0x69, (byte) 0x6C, (byte) 0x79, (byte) 0x4C,
+            (byte) 0x00, (byte) 0x08, (byte) 0x68, (byte) 0x6F, (byte) 0x73,
+            (byte) 0x74, (byte) 0x4E, (byte) 0x61, (byte) 0x6D, (byte) 0x65,
+            (byte) 0x71, (byte) 0x00, (byte) 0x7E, (byte) 0x00, (byte) 0x01,
+            (byte) 0x78, (byte) 0x70, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x02,
+            (byte) 0x74, (byte) 0x00, (byte) 0x09, (byte) 0x6C, (byte) 0x6F,
+            (byte) 0x63, (byte) 0x61, (byte) 0x6C, (byte) 0x68, (byte) 0x6F,
+            (byte) 0x73, (byte) 0x74, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x74, (byte) 0x00,
+            (byte) 0x03, (byte) 0x6C, (byte) 0x6F, (byte) 0x30, (byte) 0x75,
+            (byte) 0x72, (byte) 0x00, (byte) 0x02, (byte) 0x5B, (byte) 0x42,
+            (byte) 0xAC, (byte) 0xF3, (byte) 0x17, (byte) 0xF8, (byte) 0x06,
+            (byte) 0x08, (byte) 0x54, (byte) 0xE0, (byte) 0x02, (byte) 0x00,
+            (byte) 0x00, (byte) 0x78, (byte) 0x70, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0x78 };
+
+}
+
+class MockLo0Inet6Address {
+
+    private static final byte[] LOOPBACKIPV6ADDRESS = { (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01 };
+
+    private static final String LOCALHOSTNAME = "localhost";
+
+    private static final String LO0HOSTADDRESS = "0:0:0:0:0:0:0:1%lo0";
+
+    private static final String BARE_LO0HOSTADDRESS = "0:0:0:0:0:0:0:1";
+
+    private static final String LO0HOSTADDRESS_WITHINDEX = "0:0:0:0:0:0:0:1%1";
+
+    private static final int SCOPE_ID_LO0 = 1;
+
+    private static final int SCOPE_ID_ZERO = 0;
+
+    public static final String NETWORK_IF_LO0 = "lo0";
+
+    static String getHostName() {
+        return LOCALHOSTNAME;
+    }
+
+    static String getHostAddress() {
+        return LO0HOSTADDRESS;
+    }
+
+    static String getBareHostAddress() {
+        return BARE_LO0HOSTADDRESS;
+    }
+
+    static String getHostAddressWithIndex() {
+        return LO0HOSTADDRESS_WITHINDEX;
+    }
+
+    static byte[] getAddress() {
+        return LOOPBACKIPV6ADDRESS;
+    }
+
+    static int getScopeId() {
+        return SCOPE_ID_LO0;
+    }
+
+    static int getScopeZero() {
+        return SCOPE_ID_ZERO;
+    }
+
+    static String getScopeIfName() {
+        return NETWORK_IF_LO0;
+    }
+
+}
+
+class MockE1000g0Inet6Address {
+
+    // fe80::21b:24ff:febd:f29c
+    private static final byte[] E1000G0IPV6ADDRESS = { (byte) 0xfe,
+            (byte) 0x80, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
+            (byte) 0x00, (byte) 0x00, (byte) 0x02, (byte) 0x1b, (byte) 0x24,
+            (byte) 0xff, (byte) 0xfe, (byte) 0xbd, (byte) 0xf2, (byte) 0x9c };
+
+    private static final String E1000G0HOSTNAME = "fe80:0:0:0:21b:24ff:febd:f29c%e1000g0";
+
+    private static final String BARE_E1000G0HOSTADDRESS = "fe80:0:0:0:21b:24ff:febd:f29c";
+
+    private static final String E1000G0HOSTADDRESS_WITHINDEX = "fe80:0:0:0:21b:24ff:febd:f29c%2";
+
+    private static final String E1000G0HOSTADDRESS = "fe80:0:0:0:21b:24ff:febd:f29c%e1000g0";
+
+    private static final String NETWORK_IF_E1000G0 = "e1000g0";
+
+    private static final int SCOPE_ID_E1000G0 = 2;
+
+    private static final int SCOPE_ID_ZERO = 0;
+
+    static String getHostName() {
+        return E1000G0HOSTNAME;
+    }
+
+    static String getHostAddress() {
+        return E1000G0HOSTADDRESS;
+    }
+
+    static String getHostAddressWithIndex() {
+        return E1000G0HOSTADDRESS_WITHINDEX;
+    }
+
+    static String getBareHostAddress() {
+        return BARE_E1000G0HOSTADDRESS;
+    }
+
+    static byte[] getAddress() {
+        return E1000G0IPV6ADDRESS;
+    }
+
+    static int getScopeId() {
+        return SCOPE_ID_E1000G0;
+    }
+
+    static int getScopeZero() {
+        return SCOPE_ID_ZERO;
+    }
+
+    static String getScopeIfName() {
+        return NETWORK_IF_E1000G0;
+    }
+
+}
--- a/jdk/test/java/net/NetworkInterface/Test.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/net/NetworkInterface/Test.java	Wed May 08 11:22:25 2013 +0100
@@ -21,9 +21,9 @@
  * questions.
  */
 
-/* @test 01/02/14
- * @bug 4405354
- * @summary Exercise java.net.NetworkInterface
+/* @test
+ * @bug 4405354 6594296
+ * @summary Basic tests for NetworkInterface
  */
 import java.net.NetworkInterface;
 import java.net.InetAddress;
@@ -69,6 +69,12 @@
                 throw new Exception("hashCode contract broken");
             }
             System.out.println("hashCode() test passed.");
+
+            byte[] ba = ni.getHardwareAddress();
+            if (ba != null && ba.length == 0) {
+                throw new Exception("getHardwareAddress returned 0 length byte array");
+            }
+            System.out.println("getHardwareAddress() test passed.");
         }
 
         // misc tests :-
--- a/jdk/test/java/nio/file/Files/walkFileTree/CreateFileTree.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/nio/file/Files/walkFileTree/CreateFileTree.java	Wed May 08 11:22:25 2013 +0100
@@ -32,9 +32,23 @@
 
 public class CreateFileTree {
 
-    static final Random rand = new Random();
+    private static final Random rand = new Random();
 
-    public static void main(String[] args) throws IOException {
+    private static boolean supportsLinks(Path dir) {
+        Path link = dir.resolve("testlink");
+        Path target = dir.resolve("testtarget");
+        try {
+            Files.createSymbolicLink(link, target);
+            Files.delete(link);
+            return true;
+        } catch (UnsupportedOperationException x) {
+            return false;
+        } catch (IOException x) {
+            return false;
+        }
+    }
+
+    static Path create() throws IOException {
         Path top = Files.createTempDirectory("tree");
         List<Path> dirs = new ArrayList<Path>();
 
@@ -53,7 +67,6 @@
                 dirs.add(subdir);
             }
         }
-        assert dirs.size() >= 2;
 
         // create a few regular files in the file tree
         int files = dirs.size() * 3;
@@ -64,20 +77,26 @@
         }
 
         // create a few sym links in the file tree so as to create cycles
-        int links = 1 + rand.nextInt(5);
-        for (int i=0; i<links; i++) {
-            int x = rand.nextInt(dirs.size());
-            int y;
-            do {
-                y = rand.nextInt(dirs.size());
-            } while (y != x);
-            String name = "link" + (i+1);
-            Path link = dirs.get(x).resolve(name);
-            Path target = dirs.get(y);
-            Files.createSymbolicLink(link, target);
+        if (supportsLinks(top)) {
+            int links = 1 + rand.nextInt(5);
+            for (int i=0; i<links; i++) {
+                int x = rand.nextInt(dirs.size());
+                int y;
+                do {
+                    y = rand.nextInt(dirs.size());
+                } while (y != x);
+                String name = "link" + (i+1);
+                Path link = dirs.get(x).resolve(name);
+                Path target = dirs.get(y);
+                Files.createSymbolicLink(link, target);
+            }
         }
 
-        // done
+         return top;
+    }
+
+    public static void main(String[] args) throws IOException {
+        Path top = create();
         System.out.println(top);
     }
 }
--- a/jdk/test/java/nio/file/Files/walkFileTree/MaxDepth.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/nio/file/Files/walkFileTree/MaxDepth.java	Wed May 08 11:22:25 2013 +0100
@@ -21,19 +21,30 @@
  * questions.
  */
 
+/*
+ * @test
+ * @summary Unit test for Files.walkFileTree to test maxDepth parameter
+ * @library ../..
+ * @compile MaxDepth.java CreateFileTree.java
+ * @run main MaxDepth
+ */
+
 import java.nio.file.*;
 import java.nio.file.attribute.*;
 import java.io.IOException;
 import java.util.*;
 
-/**
- * Unit test for Files.walkFileTree to test maxDepth parameter
- */
+public class MaxDepth {
+    public static void main(String[] args) throws IOException {
+        Path top = CreateFileTree.create();
+        try {
+            test(top);
+        } finally {
+            TestUtil.removeAll(top);
+        }
+    }
 
-public class MaxDepth {
-    public static void main(String[] args) throws Exception {
-        final Path top = Paths.get(args[0]);
-
+    static void test(final Path top) throws IOException {
         for (int i=0; i<5; i++) {
             Set<FileVisitOption> opts = Collections.emptySet();
             final int maxDepth = i;
--- a/jdk/test/java/nio/file/Files/walkFileTree/SkipSiblings.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/nio/file/Files/walkFileTree/SkipSiblings.java	Wed May 08 11:22:25 2013 +0100
@@ -21,15 +21,19 @@
  * questions.
  */
 
+/*
+ * @test
+ * @summary Unit test for Files.walkFileTree to test SKIP_SIBLINGS return value
+ * @library ../..
+ * @compile SkipSiblings.java CreateFileTree.java
+ * @run main SkipSiblings
+ */
+
 import java.nio.file.*;
 import java.nio.file.attribute.*;
 import java.io.IOException;
 import java.util.*;
 
-/**
- * Unit test for Files.walkFileTree to test SKIP_SIBLINGS return value.
- */
-
 public class SkipSiblings {
 
     static final Random rand = new Random();
@@ -52,9 +56,16 @@
     }
 
     public static void main(String[] args) throws Exception {
-        Path dir = Paths.get(args[0]);
+        Path top = CreateFileTree.create();
+        try {
+            test(top);
+        } finally {
+            TestUtil.removeAll(top);
+        }
+    }
 
-        Files.walkFileTree(dir, new SimpleFileVisitor<Path>() {
+    static void test(final Path start) throws IOException {
+        Files.walkFileTree(start, new SimpleFileVisitor<Path>() {
             @Override
             public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
                 check(dir);
@@ -74,7 +85,11 @@
                 if (x != null)
                     throw new RuntimeException(x);
                 check(dir);
-                return FileVisitResult.CONTINUE;
+                if (rand.nextBoolean()) {
+                    return FileVisitResult.CONTINUE;
+                } else {
+                    return FileVisitResult.SKIP_SIBLINGS;
+                }
             }
         });
     }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/nio/file/Files/walkFileTree/SkipSubtree.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Unit test for Files.walkFileTree to test SKIP_SUBTREE return value
+ * @library ../..
+ * @compile SkipSubtree.java CreateFileTree.java
+ * @run main SkipSubtree
+ */
+import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Random;
+import java.util.Set;
+
+public class SkipSubtree {
+
+    static final Random rand = new Random();
+    static final Set<Path> skipped = new HashSet<>();
+
+    // check if this path should have been skipped
+    static void check(Path path) {
+        do {
+            if (skipped.contains(path))
+                throw new RuntimeException(path + " should not have been visited");
+            path = path.getParent();
+        } while (path != null);
+    }
+
+    // indicates if the subtree should be skipped
+    static boolean skip(Path path) {
+        if (rand.nextInt(3) == 0) {
+            skipped.add(path);
+            return true;
+        }
+        return false;
+    }
+
+    public static void main(String[] args) throws Exception {
+        Path top = CreateFileTree.create();
+        try {
+            test(top);
+        } finally {
+            TestUtil.removeAll(top);
+        }
+    }
+
+    static void test(final Path start) throws IOException {
+        Files.walkFileTree(start, new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
+                check(dir);
+                if (skip(dir))
+                    return FileVisitResult.SKIP_SUBTREE;
+                return FileVisitResult.CONTINUE;
+            }
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
+                check(file);
+                return FileVisitResult.CONTINUE;
+            }
+            @Override
+            public FileVisitResult postVisitDirectory(Path dir, IOException x) {
+                if (x != null)
+                    throw new RuntimeException(x);
+                check(dir);
+                return FileVisitResult.CONTINUE;
+            }
+        });
+    }
+}
--- a/jdk/test/java/nio/file/Files/walkFileTree/TerminateWalk.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/nio/file/Files/walkFileTree/TerminateWalk.java	Wed May 08 11:22:25 2013 +0100
@@ -21,15 +21,19 @@
  * questions.
  */
 
+/*
+ * @test
+ * @summary Unit test for Files.walkFileTree to test TERMINATE return value
+ * @library ../..
+ * @compile TerminateWalk.java CreateFileTree.java
+ * @run main TerminateWalk
+ */
+
 import java.nio.file.*;
 import java.nio.file.attribute.*;
 import java.io.IOException;
 import java.util.*;
 
-/**
- * Unit test for Files.walkFileTree to test TERMINATE return value
- */
-
 public class TerminateWalk {
 
     static final Random rand = new Random();
@@ -47,9 +51,16 @@
     }
 
     public static void main(String[] args) throws Exception {
-        Path dir = Paths.get(args[0]);
+        Path top = CreateFileTree.create();
+        try {
+            test(top);
+        } finally {
+            TestUtil.removeAll(top);
+        }
+    }
 
-        Files.walkFileTree(dir, new SimpleFileVisitor<Path>() {
+    static void test(Path start) throws IOException {
+        Files.walkFileTree(start, new SimpleFileVisitor<Path>() {
             @Override
             public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
                 return maybeTerminate();
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/nio/file/Files/walkFileTree/find.sh	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,86 @@
+#
+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# @test
+# @bug 4313887 6907737
+# @summary Tests that walkFileTree is consistent with the native find program
+# @build CreateFileTree PrintFileTree
+# @run shell find.sh
+
+# if TESTJAVA isn't set then we assume an interactive run.
+
+if [ -z "$TESTJAVA" ]; then
+    TESTSRC=.
+    TESTCLASSES=.
+    JAVA=java
+else
+    JAVA="${TESTJAVA}/bin/java"
+fi
+
+OS=`uname -s`
+case "$OS" in
+    Windows_* | CYGWIN* )
+        echo "This test does not run on Windows" 
+        exit 0
+        ;;
+    * )
+        CLASSPATH=${TESTCLASSES}:${TESTSRC}
+        ;;
+esac
+export CLASSPATH
+
+# create the file tree
+ROOT=`$JAVA CreateFileTree`
+if [ $? != 0 ]; then exit 1; fi
+
+failures=0
+
+# print the file tree and compare output with find(1)
+$JAVA ${TESTVMOPTS} PrintFileTree "$ROOT" > out1
+find "$ROOT" > out2
+diff out1 out2
+if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
+
+# repeat test following links. Some versions of find(1) output
+# cycles (sym links to ancestor directories), other versions do
+# not. For that reason we run PrintFileTree with the -printCycles
+# option when the output without this option differs to find(1).
+find "$ROOT" -follow > out1
+$JAVA ${TESTVMOPTS} PrintFileTree -follow "$ROOT" > out2
+diff out1 out2
+if [ $? != 0 ];
+  then 
+    # re-run printing cycles to stdout
+    $JAVA ${TESTVMOPTS} PrintFileTree -follow -printCycles "$ROOT" > out2
+    diff out1 out2
+    if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
+  fi
+
+# clean-up
+rm -r "$ROOT"
+
+echo ''
+if [ $failures -gt 0 ];
+  then echo "$failures test(s) failed";
+  else echo "Test passed"; fi
+exit $failures
--- a/jdk/test/java/nio/file/Files/walkFileTree/walk_file_tree.sh	Wed May 01 12:25:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-#
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @bug 4313887 6907737
-# @summary Unit test for walkFileTree method
-# @build CreateFileTree PrintFileTree SkipSiblings TerminateWalk MaxDepth
-# @run shell walk_file_tree.sh
-
-# if TESTJAVA isn't set then we assume an interactive run.
-
-if [ -z "$TESTJAVA" ]; then
-    TESTSRC=.
-    TESTCLASSES=.
-    JAVA=java
-else
-    JAVA="${TESTJAVA}/bin/java"
-fi
-
-OS=`uname -s`
-case "$OS" in
-    Windows_* | CYGWIN* )
-        echo "This test does not run on Windows" 
-        exit 0
-        ;;
-    * )
-        CLASSPATH=${TESTCLASSES}:${TESTSRC}
-        ;;
-esac
-export CLASSPATH
-
-# create the file tree
-ROOT=`$JAVA CreateFileTree`
-if [ $? != 0 ]; then exit 1; fi
-
-failures=0
-
-# print the file tree and compare output with find(1)
-$JAVA ${TESTVMOPTS} PrintFileTree "$ROOT" > out1
-find "$ROOT" > out2
-diff out1 out2
-if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
-
-# repeat test following links. Some versions of find(1) output
-# cycles (sym links to ancestor directories), other versions do
-# not. For that reason we run PrintFileTree with the -printCycles
-# option when the output without this option differs to find(1).
-find "$ROOT" -follow > out1
-$JAVA ${TESTVMOPTS} PrintFileTree -follow "$ROOT" > out2
-diff out1 out2
-if [ $? != 0 ];
-  then 
-    # re-run printing cycles to stdout
-    $JAVA ${TESTVMOPTS} PrintFileTree -follow -printCycles "$ROOT" > out2
-    diff out1 out2
-    if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
-  fi
-
-# test SKIP_SIBLINGS
-$JAVA ${TESTVMOPTS} SkipSiblings "$ROOT"
-if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
-
-# test TERMINATE
-$JAVA ${TESTVMOPTS} TerminateWalk "$ROOT"
-if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
-
-# test maxDepth
-$JAVA ${TESTVMOPTS} MaxDepth "$ROOT"
-if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
-
-# clean-up
-rm -r "$ROOT"
-
-echo ''
-if [ $failures -gt 0 ];
-  then echo "$failures test(s) failed";
-  else echo "Test passed"; fi
-exit $failures
--- a/jdk/test/java/text/Format/DateFormat/Bug7130335.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/text/Format/DateFormat/Bug7130335.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,34 +23,47 @@
 
 /**
  * @test
- * @bug 7130335
+ * @bug 7130335 7130335
  * @summary Make sure that round-trip conversion (format/parse) works
- *          with old timestamps in Europe/Moscow.
+ *          with old timestamps in Europe/Moscow and with multiple time zone letters.
  */
 import java.text.*;
 import java.util.*;
+import static java.util.GregorianCalendar.*;
 
 public class Bug7130335 {
     private static final TimeZone MOSCOW = TimeZone.getTimeZone("Europe/Moscow");
+    private static final TimeZone LONDON = TimeZone.getTimeZone("Europe/London");
+    private static final TimeZone LA = TimeZone.getTimeZone("America/Los_Angeles");
+    private static final TimeZone[] ZONES = {
+        MOSCOW, LONDON, LA
+    };
 
     public static void main(String[] args) throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS z", Locale.US);
         sdf.setTimeZone(MOSCOW);
-        Calendar cal = new GregorianCalendar(MOSCOW);
+        Calendar cal = new GregorianCalendar(MOSCOW, Locale.US);
         cal.clear();
         // Try both +03:00 and +02:00
-        cal.set(1922, Calendar.SEPTEMBER, 30);
+        cal.set(1922, SEPTEMBER, 30);
         test(sdf, cal);
-        cal.add(Calendar.DAY_OF_YEAR, 1);
+        cal.add(DAY_OF_YEAR, 1);
         test(sdf, cal);
-        cal.set(1991, Calendar.MARCH, 31);
+        cal.set(1991, MARCH, 31);
         // in daylight saving time
         test(sdf, cal);
-        cal.add(Calendar.DAY_OF_YEAR, 1);
+        cal.add(DAY_OF_YEAR, 1);
         test(sdf, cal);
         // Try the current timestamp
         cal.setTimeInMillis(System.currentTimeMillis());
         test(sdf, cal);
+
+        // tests for multiple time zone letters (8000529)
+        test8000529("yyyy-MM-dd HH:mm:ss.SSS Z (z)");
+        test8000529("yyyy-MM-dd HH:mm:ss.SSS Z (zzzz)");
+        test8000529("yyyy-MM-dd HH:mm:ss.SSS z (Z)");
+        test8000529("yyyy-MM-dd HH:mm:ss.SSS zzzz (Z)");
+
     }
 
     private static void test(SimpleDateFormat sdf, Calendar cal) throws Exception {
@@ -63,4 +76,19 @@
             throw new RuntimeException("format: " + f + ", parse: " + p);
         }
     }
+
+    private static void test8000529(String fmt) throws Exception {
+        for (TimeZone tz : ZONES) {
+            SimpleDateFormat sdf = new SimpleDateFormat(fmt, Locale.US);
+            sdf.setTimeZone(tz);
+            Calendar cal = new GregorianCalendar(tz, Locale.US);
+            cal.clear();
+            cal.set(2012, JUNE, 22);
+            test(sdf, cal);
+            cal.set(2012, DECEMBER, 22);
+            test(sdf, cal);
+            cal.setTimeInMillis(System.currentTimeMillis());
+            test(sdf, cal);
+        }
+    }
 }
--- a/jdk/test/java/time/test/java/util/TestFormatter.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/time/test/java/util/TestFormatter.java	Wed May 08 11:22:25 2013 +0100
@@ -25,6 +25,7 @@
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZonedDateTime;
+import java.time.ZoneId;
 import java.time.temporal.ChronoField;
 
 import java.util.*;
@@ -34,6 +35,7 @@
 
 /* @test
  * @summary Unit test for j.u.Formatter threeten date/time support
+ * @bug 8003680 8012638
  */
 @Test
 public class TestFormatter {
@@ -64,25 +66,33 @@
         //locales = Locale.getAvailableLocales();
         Locale[] locales = new Locale[] {
            Locale.ENGLISH, Locale.FRENCH, Locale.JAPANESE, Locale.CHINESE};
-
         Random r = new Random();
-        ZonedDateTime  zdt = ZonedDateTime.now();
-        while (N-- > 0) {
-            zdt = zdt.withDayOfYear(r.nextInt(365) + 1)
-                     .with(ChronoField.SECOND_OF_DAY, r.nextInt(86400));
-            Instant instant = zdt.toInstant();
-            Calendar cal = Calendar.getInstance();
-            cal.setTimeInMillis(instant.toEpochMilli());
+        ZonedDateTime  zdt0 = ZonedDateTime.now();
+        ZonedDateTime[] zdts = new ZonedDateTime[] {
+            zdt0,
+            zdt0.withZoneSameLocal(ZoneId.of("UTC")),
+            zdt0.withZoneSameLocal(ZoneId.of("GMT")),
+            zdt0.withZoneSameLocal(ZoneId.of("UT")),
+        };
 
-            for (Locale locale : locales) {
+        while (N-- > 0) {
+            for (ZonedDateTime zdt : zdts) {
+                zdt = zdt.withDayOfYear(r.nextInt(365) + 1)
+                         .with(ChronoField.SECOND_OF_DAY, r.nextInt(86400));
+                Instant instant = zdt.toInstant();
+                Calendar cal = Calendar.getInstance();
+                cal.setTimeInMillis(instant.toEpochMilli());
+                cal.setTimeZone(TimeZone.getTimeZone(zdt.getZone()));
+                for (Locale locale : locales) {
                     for (String fmtStr : fmtStrDate) {
-                    testDate(fmtStr, locale, zdt, cal);
+                        testDate(fmtStr, locale, zdt, cal);
+                    }
+                    for (String fmtStr : fmtStrTime) {
+                        testTime(fmtStr, locale, zdt, cal);
+                    }
+                    testZoneId(locale, zdt, cal);
+                    testInstant(locale, instant, zdt, cal);
                 }
-                for (String fmtStr : fmtStrTime) {
-                    testTime(fmtStr, locale, zdt, cal);
-                }
-                testZoneId(locale, zdt, cal);
-                testInstant(locale, instant, zdt, cal);
             }
         }
         if (verbose) {
@@ -146,6 +156,10 @@
     }
 
     private String toZoneIdStr(String expected) {
+        return expected.replaceAll("(?:GMT|UTC)(?<off>[+\\-]?[0-9]{2}:[0-9]{2})", "${off}");
+    }
+
+    private String toZoneOffsetStr(String expected) {
         return expected.replaceAll("(?:GMT|UTC)(?<off>[+\\-]?[0-9]{2}:[0-9]{2})", "${off}")
                        .replaceAll("GMT|UTC|UT", "Z");
     }
@@ -159,7 +173,7 @@
         Calendar cal0 = Calendar.getInstance();
         cal0.setTimeInMillis(zdt.toInstant().toEpochMilli());
         cal0.setTimeZone(TimeZone.getTimeZone("GMT" + zdt.getOffset().getId()));
-        expected = toZoneIdStr(test(fmtStr, locale, null, cal0));
+        expected = toZoneOffsetStr(test(fmtStr, locale, null, cal0));
         test(fmtStr, locale, expected, zdt.toOffsetDateTime());
         test(fmtStr, locale, expected, zdt.toOffsetDateTime().toOffsetTime());
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/Arrays/SetAllTest.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,281 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8012650
+ * @summary Unit test for setAll, parallelSetAll variants
+ * @run testng SetAllTest
+ */
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.Arrays;
+import java.util.function.IntFunction;
+import java.util.function.IntToDoubleFunction;
+import java.util.function.IntToLongFunction;
+import java.util.function.IntUnaryOperator;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.assertSame;
+import static org.testng.Assert.fail;
+
+@Test
+public class SetAllTest {
+    private static final IntFunction<String> toString = i -> "N" + Integer.valueOf(i);
+    private static final IntFunction<String> fillString = i -> "X";
+    private static final String[] r0 = {};
+    private static final String[] r1 = { "N0" };
+    private static final String[] r10 = { "N0", "N1", "N2", "N3", "N4", "N5", "N6", "N7", "N8", "N9" };
+
+    private Object[][] stringData = new Object[][] {
+        { "empty", 0, toString, r0 },
+        { "one", 1, toString, r1 },
+        { "ten", 10, toString, r10 },
+        { "fill", 3, fillString, new String[] { "X", "X", "X" }}
+    };
+
+    private static final IntUnaryOperator toInt = i -> i << 1;
+    private static final IntUnaryOperator fillInt = i -> 99;
+    private static final int[] ir0 = {};
+    private static final int[] ir1 = { 0 };
+    private static final int[] ir10 = { 0, 2, 4, 6, 8, 10, 12, 14, 16, 18 };
+    private Object[][] intData = new Object[][] {
+        { "empty", 0, toInt, ir0 },
+        { "one", 1, toInt, ir1 },
+        { "ten", 10, toInt, ir10 },
+        { "fill", 3, fillInt, new int[] { 99, 99, 99 }}
+    };
+
+    private static final IntToLongFunction toLong = i -> i << 1;
+    private static final IntToLongFunction fillLong = i -> 9999L;
+    private static final long[] lr0 = {};
+    private static final long[] lr1 = { 0L };
+    private static final long[] lr10 = { 0L, 2L, 4L, 6L, 8L, 10L, 12L, 14L, 16L, 18L };
+    private Object[][] longData = new Object[][] {
+        { "empty", 0, toLong, lr0 },
+        { "one", 1, toLong, lr1 },
+        { "ten", 10, toLong, lr10 },
+        { "fill", 3, fillLong, new long[] { 9999L, 9999L, 9999L }}
+    };
+
+    private static final IntToDoubleFunction toDouble = i -> i * 1.1;
+    private static final IntToDoubleFunction fillDouble = i -> 3.14;
+    private static final double[] dr0 = {};
+    private static final double[] dr1 = { 0.0 };
+    private static final double[] dr10 = { 0.0, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9 };
+    private Object[][] doubleData = new Object[][] {
+        { "empty", 0, toDouble, dr0 },
+        { "one", 1, toDouble, dr1 },
+        { "ten", 10, toDouble, dr10 },
+        { "fill", 3, fillDouble, new double[] { 3.14, 3.14, 3.14 }}
+    };
+
+    @DataProvider(name="string")
+    public Object[][] stringTests() { return stringData; }
+
+    @DataProvider(name="int")
+    public Object[][] intTests() { return intData; }
+
+    @DataProvider(name="long")
+    public Object[][] longTests() { return longData; }
+
+    @DataProvider(name="double")
+    public Object[][] doubleTests() { return doubleData; }
+
+    @Test(dataProvider = "string")
+    public void testSetAllString(String name, int size, IntFunction<String> generator, String[] expected) {
+        String[] result = new String[size];
+        Arrays.setAll(result, generator);
+        assertEquals(result, expected, "setAll(String[], IntFunction<String>) case " + name + " failed.");
+
+        // ensure fresh array
+        result = new String[size];
+        Arrays.parallelSetAll(result, generator);
+        assertEquals(result, expected, "parallelSetAll(String[], IntFunction<String>) case " + name + " failed.");
+    }
+
+    @Test(dataProvider = "int")
+    public void testSetAllInt(String name, int size, IntUnaryOperator generator, int[] expected) {
+        int[] result = new int[size];
+        Arrays.setAll(result, generator);
+        assertEquals(result, expected, "setAll(int[], IntUnaryOperator) case " + name + " failed.");
+
+        // ensure fresh array
+        result = new int[size];
+        Arrays.parallelSetAll(result, generator);
+        assertEquals(result, expected, "parallelSetAll(int[], IntUnaryOperator) case " + name + " failed.");
+    }
+
+    @Test(dataProvider = "long")
+    public void testSetAllLong(String name, int size, IntToLongFunction generator, long[] expected) {
+        long[] result = new long[size];
+        Arrays.setAll(result, generator);
+        assertEquals(result, expected, "setAll(long[], IntToLongFunction) case " + name + " failed.");
+
+        // ensure fresh array
+        result = new long[size];
+        Arrays.parallelSetAll(result, generator);
+        assertEquals(result, expected, "parallelSetAll(long[], IntToLongFunction) case " + name + " failed.");
+    }
+
+    private void assertDoubleArrayEquals(double[] actual, double[] expected, double delta, String msg) {
+        if (actual.length != expected.length) {
+            fail(msg + ": length mismatch, expected " + expected.length + ", got " + actual.length);
+        }
+
+        for (int i = 0; i < actual.length; i++) {
+            assertEquals(actual[i], expected[i], delta, msg + "(mismatch at index " + i + ")");
+        }
+    }
+
+    @Test(dataProvider = "double")
+    public void testSetAllDouble(String name, int size, IntToDoubleFunction generator, double[] expected) {
+        double[] result = new double[size];
+        Arrays.setAll(result, generator);
+        assertDoubleArrayEquals(result, expected, 0.05, "setAll(double[], IntToDoubleFunction) case " + name + " failed.");
+
+        // ensure fresh array
+        result = new double[size];
+        Arrays.parallelSetAll(result, generator);
+        assertDoubleArrayEquals(result, expected, 0.05, "setAll(double[], IntToDoubleFunction) case " + name + " failed.");
+    }
+
+    @Test
+    public void testStringSetNulls() {
+        String[] ar = new String[2];
+        try {
+            Arrays.setAll(null, i -> "X");
+            fail("Arrays.setAll(null, foo) should throw NPE");
+        } catch (NullPointerException npe) {
+            // expected
+        }
+        try {
+            Arrays.parallelSetAll(null, i -> "X");
+            fail("Arrays.parallelSetAll(null, foo) should throw NPE");
+        } catch (NullPointerException npe) {
+            // expected
+        }
+        try {
+            Arrays.setAll(ar, null);
+            fail("Arrays.setAll(array, null) should throw NPE");
+        } catch (NullPointerException npe) {
+            // expected
+        }
+        try {
+            Arrays.parallelSetAll(ar, null);
+            fail("Arrays.parallelSetAll(array, null) should throw NPE");
+        } catch (NullPointerException npe) {
+            // expected
+        }
+    }
+
+    @Test
+    public void testIntSetNulls() {
+        int[] ar = new int[2];
+        try {
+            Arrays.setAll(null, (IntUnaryOperator) i -> i);
+            fail("Arrays.setAll(null, foo) should throw NPE");
+        } catch (NullPointerException npe) {
+            // expected
+        }
+        try {
+            Arrays.parallelSetAll(null, (IntUnaryOperator) i -> i);
+            fail("Arrays.parallelSetAll(null, foo) should throw NPE");
+        } catch (NullPointerException npe) {
+            // expected
+        }
+        try {
+            Arrays.setAll(ar, null);
+            fail("Arrays.setAll(array, null) should throw NPE");
+        } catch (NullPointerException npe) {
+            // expected
+        }
+        try {
+            Arrays.parallelSetAll(ar, null);
+            fail("Arrays.parallelSetAll(array, null) should throw NPE");
+        } catch (NullPointerException npe) {
+            // expected
+        }
+    }
+
+    @Test
+    public void testLongSetNulls() {
+        long[] ar = new long[2];
+        try {
+            Arrays.setAll(null, (IntToLongFunction) i -> Long.MAX_VALUE);
+            fail("Arrays.setAll(null, foo) should throw NPE");
+        } catch (NullPointerException npe) {
+            // expected
+        }
+        try {
+            Arrays.parallelSetAll(null, (IntToLongFunction) i -> Long.MAX_VALUE);
+            fail("Arrays.parallelSetAll(null, foo) should throw NPE");
+        } catch (NullPointerException npe) {
+            // expected
+        }
+        try {
+            Arrays.setAll(ar, null);
+            fail("Arrays.setAll(array, null) should throw NPE");
+        } catch (NullPointerException npe) {
+            // expected
+        }
+        try {
+            Arrays.parallelSetAll(ar, null);
+            fail("Arrays.parallelSetAll(array, null) should throw NPE");
+        } catch (NullPointerException npe) {
+            // expected
+        }
+    }
+
+    @Test
+    public void testDoubleSetNulls() {
+        double[] ar = new double[2];
+        try {
+            Arrays.setAll(null, (IntToDoubleFunction) i -> Math.E);
+            fail("Arrays.setAll(null, foo) should throw NPE");
+        } catch (NullPointerException npe) {
+            // expected
+        }
+        try {
+            Arrays.parallelSetAll(null, (IntToDoubleFunction) i -> Math.E);
+            fail("Arrays.parallelSetAll(null, foo) should throw NPE");
+        } catch (NullPointerException npe) {
+            // expected
+        }
+        try {
+            Arrays.setAll(ar, null);
+            fail("Arrays.setAll(array, null) should throw NPE");
+        } catch (NullPointerException npe) {
+            // expected
+        }
+        try {
+            Arrays.parallelSetAll(ar, null);
+            fail("Arrays.parallelSetAll(array, null) should throw NPE");
+        } catch (NullPointerException npe) {
+            // expected
+        }
+    }
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/Base64/Base64GetEncoderTest.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+
+import java.util.Base64;
+
+import static java.nio.charset.StandardCharsets.US_ASCII;
+
+/**
+ * @test
+ * @bug 8007799
+ * @summary test Encoder with linemax == 0, line separator should not appear in encoded data
+ */
+
+public class Base64GetEncoderTest {
+
+    public static void main(String args[]) throws Throwable {
+        final Base64.Encoder encoder = Base64.getEncoder(0, "$$$".getBytes(US_ASCII));
+
+        testEncodeToString(encoder);
+
+        testWrapEncode1(encoder);
+
+        testEncodeToStringWithLongInputData(encoder);
+
+        testWrapEncode2(encoder);
+
+        testEncodeWithByteBuffer(encoder);
+
+    }
+
+    private static void testEncodeWithByteBuffer(final Base64.Encoder encoder) {
+        System.err.println("\n\nEncoder.encode with ByteBuffer test  ");
+        final byte[] secondTestBuffer =
+                "api/java_util/Base64/index.html#GetEncoderMimeCustom[noLineSeparatorInEncodedString]"
+                .getBytes(US_ASCII);
+        String base64EncodedString;
+        ByteBuffer srcData = ByteBuffer.wrap(secondTestBuffer);
+        ByteBuffer dstData = ByteBuffer.allocate(secondTestBuffer.length * 2);
+
+        encoder.encode(srcData, dstData, 0);
+        dstData.flip();
+        if (dstData.hasArray()) {
+            System.err.println("\nByteBuffer test dstData is Base64 encoding = "
+                    + new String(dstData.array(), US_ASCII) + "\n");
+        }
+
+        base64EncodedString = new String(dstData.array(), US_ASCII);
+        if (base64EncodedString.contains("$$$")) {
+            throw new RuntimeException("Base64 encoding contains line separator after Encoder.encode ByteBuffer ... \n");
+        }
+    }
+
+    private static void testWrapEncode2(final Base64.Encoder encoder)
+            throws IOException {
+        System.err.println("\nEncoder.wrap test II ");
+        final byte[] secondTestBuffer =
+                "api/java_util/Base64/index.html#GetEncoderMimeCustom[noLineSeparatorInEncodedString]"
+                .getBytes(US_ASCII);
+        String base64EncodedString;
+        ByteArrayOutputStream secondEncodingStream = new ByteArrayOutputStream();
+        OutputStream base64EncodingStream = encoder.wrap(secondEncodingStream);
+        base64EncodingStream.write(secondTestBuffer);
+        base64EncodingStream.close();
+
+        final byte[] encodedByteArray = secondEncodingStream.toByteArray();
+
+        System.err.print("result = " + new String(encodedByteArray, US_ASCII)
+                + "  after wrap Base64 encoding of string");
+
+        base64EncodedString = new String(encodedByteArray, US_ASCII);
+
+        if (base64EncodedString.contains("$$$")) {
+            throw new RuntimeException(
+                    "Base64 encoding contains line separator after wrap 2 invoked  ... \n");
+        }
+    }
+
+    private static void testEncodeToStringWithLongInputData(
+            final Base64.Encoder encoder) {
+        System.err.println("\n\nEncoder.encodeToStringWithLongInputData test  ");
+
+        final byte[] secondTestBuffer =
+                "api/java_util/Base64/index.html#GetEncoderMimeCustom[noLineSeparatorInEncodedString]"
+                .getBytes(US_ASCII);
+        String base64EncodedString;
+        base64EncodedString = encoder.encodeToString(secondTestBuffer);
+
+        System.err.println("Second Base64 encoded string is "
+                + base64EncodedString);
+
+        if (base64EncodedString.contains("$$$")) {
+            throw new RuntimeException(
+                    "Base64 encoding contains line separator after encodeToString invoked  ... \n");
+        }
+    }
+
+    private static void testWrapEncode1(final Base64.Encoder encoder)
+            throws IOException {
+        System.err.println("\nEncoder.wrap test I ");
+
+        final byte[] bytesIn = "fo".getBytes(US_ASCII);
+        String base64EncodedString;
+        ByteArrayOutputStream encodingStream = new ByteArrayOutputStream();
+        OutputStream encoding = encoder.wrap(encodingStream);
+        encoding.write(bytesIn);
+        encoding.close();
+
+        final byte[] encodedBytes = encodingStream.toByteArray();
+
+        System.err.print("result = " + new String(encodedBytes, US_ASCII)
+                + "  after the Base64 encoding \n");
+
+        base64EncodedString = new String(encodedBytes, US_ASCII);
+
+        if (base64EncodedString.contains("$$$")) {
+            throw new RuntimeException(
+                    "Base64 encoding contains line separator after wrap I test ... \n");
+        }
+    }
+
+    private static void testEncodeToString(final Base64.Encoder encoder) {
+        final byte[] bytesIn = "fo".getBytes(US_ASCII);
+
+        System.err.println("\nEncoder.encodeToString test  ");
+
+        String base64EncodedString = encoder.encodeToString(bytesIn);
+
+        System.err.println("Base64 encoded string is " + base64EncodedString);
+
+        if (base64EncodedString.contains("$$$")) {
+            throw new RuntimeException("Base64 encoding contains line separator after Encoder.encodeToString invoked ... \n");
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/StringJoiner/StringJoinerTest.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,336 @@
+/*
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/**
+ * @test
+ * @bug 5015163 7172553
+ * @summary tests StringJoinerTest
+ * @run testng StringJoinerTest
+ * @author Jim Gish
+ */
+import java.util.StringJoiner;
+import org.testng.annotations.Test;
+import static org.testng.Assert.assertEquals;
+
+@Test(groups = {"unit","string","util","libs"})
+public class StringJoinerTest {
+
+    private static final String EMPTY = "EMPTY";
+    private static final String ONE = "One";
+    private static final int ONE_LEN = ONE.length();
+    private static final String TWO = "Two";
+    private static final int TWO_LEN = TWO.length();
+    private static final String THREE = "Three";
+    private static final String FOUR = "Four";
+    private static final String FIVE = "Five";
+    private static final String DASH = "-";
+
+    /* Uncomment when we have streams
+    public void addAddAll() {
+        StringJoiner sj = new StringJoiner(DASH, "{", "}");
+        sj.add(ONE);
+
+        ArrayList<String> nextOne = new ArrayList<>();
+        nextOne.add(TWO);
+        nextOne.add(THREE);
+        nextOne.stream().forEach(sj::add);
+
+        String expected = "{"+ONE+DASH+TWO+DASH+THREE+"}";
+        assertEquals(sj.toString(), expected);
+    }
+
+    void addAlladd() {
+        StringJoiner sj = new StringJoiner(DASH, "{", "}");
+
+        ArrayList<String> firstOne = new ArrayList<>();
+        firstOne.add(ONE);
+        firstOne.add(TWO);
+        firstOne.stream().forEach(sj::add);
+
+        sj.add(THREE);
+
+        String expected = "{"+ONE+DASH+TWO+DASH+THREE+"}";
+        assertEquals(sj.toString(), expected);
+    }
+
+    // The following tests do two successive adds of different types
+    public void addAlladdAll() {
+        StringJoiner sj = new StringJoiner(DASH, "{", "}");
+        ArrayList<String> firstOne = new ArrayList<>();
+        firstOne.add(ONE);
+        firstOne.add(TWO);
+        firstOne.add(THREE);
+        firstOne.stream().forEach(sj::add);
+
+        ArrayList<String> nextOne = new ArrayList<>();
+        nextOne.add(FOUR);
+        nextOne.add(FIVE);
+        nextOne.stream().forEach(sj::add);
+
+        String expected = "{"+ONE+DASH+TWO+DASH+THREE+DASH+FOUR+DASH+FIVE+"}";
+        assertEquals(sj.toString(), expected);
+    }
+
+    public void testInto() {
+        ArrayList<String> list = new ArrayList<>();
+        list.add(ONE);
+        list.add(TWO);
+        list.add(THREE);
+
+        StringJoiner target = new StringJoiner(",", "{", "}");
+        assertEquals(target.toString(), "{" + ONE + "," + TWO + "," + THREE +
+            "}");
+    }
+    */
+
+    public void addCharSequence() {
+        StringJoiner sj = new StringJoiner(",");
+        CharSequence cs_one = ONE;
+        CharSequence cs_two = TWO;
+
+        sj.add(cs_one);
+        sj.add(cs_two);
+
+        assertEquals(sj.toString(), ONE + "," + TWO);
+
+        sj = new StringJoiner(DASH, "{", "}");
+        sj.add(cs_one);
+        sj.add(cs_two);
+
+        assertEquals(sj.toString(), "{" + ONE + DASH + TWO + "}");
+
+        StringBuilder builder = new StringBuilder(ONE);
+        StringBuffer buffer = new StringBuffer(THREE);
+        sj = new StringJoiner(", ", "{ ", " }");
+        sj.add(builder).add(buffer);
+        builder.append(TWO);
+        buffer.append(FOUR);
+        assertEquals(sj.toString(), "{ " + ONE + ", " + THREE + " }",
+                "CharSequence is copied when add");
+        sj.add(builder);
+        assertEquals(sj.toString(), "{ " + ONE + ", " + THREE + ", " + ONE +
+                TWO + " }");
+    }
+
+    public void addCharSequenceWithEmptyValue() {
+        StringJoiner sj = new StringJoiner(",").setEmptyValue(EMPTY);
+        CharSequence cs_one = ONE;
+        CharSequence cs_two = TWO;
+
+        sj.add(cs_one);
+        sj.add(cs_two);
+
+        assertEquals(sj.toString(), ONE + "," + TWO);
+
+        sj = new StringJoiner(DASH, "{", "}");
+        sj.add(cs_one);
+        sj.add(cs_two);
+        assertEquals(sj.toString(), "{" + ONE + DASH + TWO + "}");
+
+        sj = new StringJoiner(DASH, "{", "}");
+        assertEquals(sj.toString(), "{}");
+
+        sj = new StringJoiner("=", "{", "}").setEmptyValue("");
+        assertEquals(sj.toString(), "");
+
+        sj = new StringJoiner(DASH, "{", "}").setEmptyValue(EMPTY);
+        assertEquals(sj.toString(), EMPTY);
+
+        sj.add(cs_one);
+        sj.add(cs_two);
+        assertEquals(sj.toString(), "{" + ONE + DASH + TWO + "}");
+    }
+
+    public void addString() {
+        StringJoiner sj = new StringJoiner(DASH);
+        sj.add(ONE);
+        assertEquals(sj.toString(), ONE);
+
+        sj = new StringJoiner(DASH, "{", "}");
+        sj.add(ONE);
+        assertEquals(sj.toString(), "{" + ONE + "}");
+
+        sj.add(TWO);
+        assertEquals(sj.toString(), "{" + ONE + DASH + TWO + "}");
+    }
+
+    public void lengthWithCustomEmptyValue() {
+        StringJoiner sj = new StringJoiner(DASH, "<", ">").setEmptyValue(EMPTY);
+        assertEquals(sj.length(), EMPTY.length());
+        sj.add("");
+        assertEquals(sj.length(), "<>".length());
+        sj.add("");
+        assertEquals(sj.length(), "<->".length());
+        sj.add(ONE);
+        assertEquals(sj.length(), 4 + ONE_LEN);
+        assertEquals(sj.toString().length(), sj.length());
+        sj.add(TWO);
+        assertEquals(sj.length(), 5 + ONE_LEN + TWO_LEN);
+        assertEquals(sj.toString().length(), sj.length());
+        sj = new StringJoiner("||", "<", "-->");
+        assertEquals(sj.length(), 4);
+        assertEquals(sj.toString().length(), sj.length());
+        sj.add("abcdef");
+        assertEquals(sj.length(), 10);
+        assertEquals(sj.toString().length(), sj.length());
+        sj.add("xyz");
+        assertEquals(sj.length(), 15);
+        assertEquals(sj.toString().length(), sj.length());
+    }
+
+    public void noAddAndEmptyValue() {
+        StringJoiner sj = new StringJoiner(DASH, "", "").setEmptyValue(EMPTY);
+        assertEquals(sj.toString(), EMPTY);
+
+        sj = new StringJoiner(DASH, "<..", "");
+        assertEquals(sj.toString(), "<..");
+
+        sj = new StringJoiner(DASH, "<..", "");
+        assertEquals(sj.toString(), "<..");
+
+        sj = new StringJoiner(DASH, "", "==>");
+        assertEquals(sj.toString(), "==>");
+
+        sj = new StringJoiner(DASH, "{", "}");
+        assertEquals(sj.toString(), "{}");
+    }
+
+    @Test(expectedExceptions = {NullPointerException.class})
+    public void setEmptyValueNull() {
+        new StringJoiner(DASH, "{", "}").setEmptyValue(null);
+    }
+
+    @Test(expectedExceptions = {NullPointerException.class})
+    public void setDelimiterNull() {
+        new StringJoiner(null);
+    }
+
+    @Test(expectedExceptions = {NullPointerException.class})
+    public void setPrefixNull() {
+        new StringJoiner(DASH, null, "}");
+    }
+
+    @Test(expectedExceptions = {NullPointerException.class})
+    public void setSuffixNull() {
+        new StringJoiner(DASH, "{", null);
+    }
+
+    public void stringFromtoString() {
+        StringJoiner sj = new StringJoiner(", ");
+        assertEquals(sj.toString(), "");
+        sj = new StringJoiner(",", "{", "}");
+        assertEquals(sj.toString(), "{}");
+
+        sj = new StringJoiner(",");
+        sj.add(ONE);
+        assertEquals(sj.toString(), ONE);
+
+        sj.add(TWO);
+        assertEquals(sj.toString(), ONE + "," + TWO);
+
+        sj = new StringJoiner(",", "{--", "--}");
+        sj.add(ONE);
+        sj.add(TWO);
+        assertEquals(sj.toString(), "{--" + ONE + "," + TWO + "--}");
+
+    }
+
+    public void stringFromtoStringWithEmptyValue() {
+        StringJoiner sj = new StringJoiner(" ", "", "");
+        assertEquals(sj.toString(), "");
+        sj = new StringJoiner(", ");
+        assertEquals(sj.toString(), "");
+        sj = new StringJoiner(",", "{", "}");
+        assertEquals(sj.toString(), "{}");
+
+        sj = new StringJoiner(",", "{", "}").setEmptyValue("");
+        assertEquals(sj.toString(), "");
+
+        sj = new StringJoiner(",");
+        sj.add(ONE);
+        assertEquals(sj.toString(), ONE);
+
+        sj.add(TWO);
+        assertEquals(sj.toString(), ONE + "," + TWO);
+
+        sj = new StringJoiner(",", "{--", "--}");
+        sj.add(ONE);
+        assertEquals(sj.toString(), "{--" + ONE + "--}" );
+
+        sj.add(TWO);
+        assertEquals(sj.toString(), "{--" + ONE + "," + TWO + "--}");
+
+    }
+
+    public void toStringWithCustomEmptyValue() {
+        StringJoiner sj = new StringJoiner(DASH, "<", ">").setEmptyValue(EMPTY);
+        assertEquals(sj.toString(), EMPTY);
+        sj.add("");
+        assertEquals(sj.toString(), "<>");
+        sj.add("");
+        assertEquals(sj.toString(), "<->");
+    }
+
+    private void testCombos(String infix, String prefix, String suffix) {
+        StringJoiner sj = new StringJoiner(infix, prefix, suffix);
+        assertEquals(sj.toString(), prefix + suffix);
+        assertEquals(sj.toString().length(), sj.length());
+        // EmptyValue
+        sj = new StringJoiner(infix, prefix, suffix).setEmptyValue("<NONE>");
+        assertEquals(sj.toString(), "<NONE>");
+        assertEquals(sj.toString().length(), sj.length());
+
+        // empty in front
+        sj.add("");
+        assertEquals(sj.toString(), prefix + suffix);
+        // empty in middle
+        sj.add("");
+        assertEquals(sj.toString(), prefix + infix + suffix);
+        sj.add("1");
+        assertEquals(sj.toString(), prefix + infix + infix + "1" + suffix);
+        // empty at end
+        sj.add("");
+        assertEquals(sj.toString(), prefix + infix + infix + "1" + infix + suffix);
+
+        sj = new StringJoiner(infix, prefix, suffix).setEmptyValue("<NONE>");
+        sj.add("1");
+        assertEquals(sj.toString(), prefix + "1" + suffix);
+        sj.add("2");
+        assertEquals(sj.toString(), prefix + "1" + infix + "2" + suffix);
+        sj.add("");
+        assertEquals(sj.toString(), prefix + "1" + infix + "2" +infix + suffix);
+        sj.add("3");
+        assertEquals(sj.toString(), prefix + "1" + infix + "2" +infix + infix + "3" + suffix);
+    }
+
+    public void testDelimiterCombinations() {
+        testCombos("", "", "");
+        testCombos("", "<", "");
+        testCombos("", "", ">");
+        testCombos("", "<", ">");
+        testCombos(",", "", "");
+        testCombos(",", "<", "");
+        testCombos(",", "", ">");
+        testCombos(",", "<", ">");
+    }
+}
+
--- a/jdk/test/java/util/regex/RegExTest.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/java/util/regex/RegExTest.java	Wed May 08 11:22:25 2013 +0100
@@ -33,7 +33,7 @@
  * 5013885 5003322 4988891 5098443 5110268 6173522 4829857 5027748 6376940
  * 6358731 6178785 6284152 6231989 6497148 6486934 6233084 6504326 6635133
  * 6350801 6676425 6878475 6919132 6931676 6948903 6990617 7014645 7039066
- * 7067045 7014640 7189363
+ * 7067045 7014640 7189363 8007395
  */
 
 import java.util.regex.*;
@@ -144,6 +144,7 @@
         horizontalAndVerticalWSTest();
         linebreakTest();
         branchTest();
+        groupCurlyNotFoundSuppTest();
         if (failure) {
             throw new
                 RuntimeException("RegExTest failed, 1st failure: " +
@@ -3947,4 +3948,27 @@
         report("branchTest");
     }
 
+    // This test is for 8007395
+    private static void groupCurlyNotFoundSuppTest() throws Exception {
+        String input = "test this as \ud83d\ude0d";
+        for (String pStr : new String[] { "test(.)+(@[a-zA-Z.]+)",
+                                          "test(.)*(@[a-zA-Z.]+)",
+                                          "test([^B])+(@[a-zA-Z.]+)",
+                                          "test([^B])*(@[a-zA-Z.]+)",
+                                          "test(\\P{IsControl})+(@[a-zA-Z.]+)",
+                                          "test(\\P{IsControl})*(@[a-zA-Z.]+)",
+                                        }) {
+            Matcher m = Pattern.compile(pStr, Pattern.CASE_INSENSITIVE)
+                               .matcher(input);
+            try {
+                if (m.find()) {
+                    failCount++;
+                }
+            } catch (Exception x) {
+                failCount++;
+            }
+        }
+        report("GroupCurly NotFoundSupp");
+    }
+
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+ /* @test
+    @bug 8012004
+    @summary JINTERNALFRAME NOT BEING FINALIZED AFTER CLOSING
+    @author mcherkas
+    @run main InternalFrameIsNotCollectedTest
+ */
+
+import sun.awt.SunToolkit;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.KeyEvent;
+import java.beans.PropertyVetoException;
+import java.util.Date;
+
+public class InternalFrameIsNotCollectedTest {
+
+    public static final int waitTime = 10000;
+    private static Robot robot;
+
+    public static void sync() {
+
+        SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+        toolkit.realSync();
+    }
+
+    public static void main(String[] args) throws Exception {
+        initRobot();
+        SwingUtilities.invokeAndWait(new Runnable() {
+            @Override
+            public void run() {
+                initUI();
+                try {
+                    closeInternalFrame();
+                } catch (PropertyVetoException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+        sync();
+        invokeGC();
+        Thread.sleep(1000); // it's better to wait 1 sec now then 10 sec later
+        Date startWaiting = new Date();
+        synchronized (CustomInternalFrame.waiter) {
+            // Sync with finalization thread.
+            Date now = new Date();
+            while (now.getTime() - startWaiting.getTime() < waitTime && !CustomInternalFrame.finalized) {
+                CustomInternalFrame.waiter.wait(waitTime);
+                now = new Date();
+            }
+        }
+        if (!CustomInternalFrame.finalized) {
+            throw new RuntimeException("Closed internal frame wasn't collected");
+        }
+    }
+
+    private static void initRobot() throws AWTException {
+        robot = new Robot();
+        robot.setAutoDelay(100);
+    }
+
+    private static void closeInternalFrame() throws PropertyVetoException {
+        robot.keyPress(KeyEvent.VK_CONTROL);
+        robot.keyPress(KeyEvent.VK_F4);
+        robot.keyRelease(KeyEvent.VK_F4);
+        robot.keyRelease(KeyEvent.VK_CONTROL);
+    }
+
+    private static void initUI() {
+        JFrame frame = new JFrame("Internal Frame Test");
+        frame.getContentPane().setLayout(new BorderLayout());
+        JDesktopPane desktopPane = new JDesktopPane();
+        desktopPane.setDesktopManager(new DefaultDesktopManager());
+        frame.getContentPane().add(desktopPane, BorderLayout.CENTER);
+
+        CustomInternalFrame iFrame = new CustomInternalFrame("Dummy Frame");
+
+        iFrame.setSize(200, 200);
+        iFrame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        desktopPane.add(iFrame);
+
+        frame.setSize(800, 600);
+        frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        frame.setVisible(true);
+        iFrame.setVisible(true);
+    }
+
+    private static void invokeGC() {
+        System.out.println("Firing garbage collection!");
+        try {
+            StringBuilder sb = new StringBuilder();
+            while (true) {
+                sb.append("any string. some test. a little bit more text." + sb.toString());
+            }
+        } catch (Throwable e) {
+            // do nothing
+        }
+    }
+
+
+    public static class CustomInternalFrame extends JInternalFrame {
+        public static volatile boolean finalized = false;
+        public static Object waiter = new Object();
+
+        public CustomInternalFrame(String title) {
+            super(title, true, true, true, true);
+        }
+
+        protected void finalize() {
+            System.out.println("Finalized!");
+            finalized = true;
+            waiter.notifyAll();
+        }
+    }
+}
\ No newline at end of file
--- a/jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java	Wed May 08 11:22:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,43 +35,72 @@
 import javax.swing.*;
 
 public class ActionListenerCalledTwiceTest {
+    static String menuItems[] = { "Item1", "Item2" };
+    static KeyStroke keyStrokes[] = {
+        KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.META_MASK),
+        KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0)
+    };
+
     static volatile int listenerCallCounter = 0;
     public static void main(String[] args) throws Exception {
         if (sun.awt.OSInfo.getOSType() != sun.awt.OSInfo.OSType.MACOSX) {
             System.out.println("This test is for MacOS only. Automatically passed on other platforms.");
             return;
         }
+
         System.setProperty("apple.laf.useScreenMenuBar", "true");
         SwingUtilities.invokeAndWait(new Runnable() {
             public void run() {
                 createAndShowGUI();
             }
         });
+
         SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
         Robot robot = new Robot();
         robot.setAutoDelay(100);
-        robot.keyPress(KeyEvent.VK_META);
-        robot.keyPress(KeyEvent.VK_E);
-        robot.keyRelease(KeyEvent.VK_E);
-        robot.keyRelease(KeyEvent.VK_META);
-        toolkit.realSync();
-        if (listenerCallCounter != 1) {
-            throw new Exception("Test failed: ActionListener called " + listenerCallCounter + " times instead of 1!");
+
+        for (int i = 0; i < menuItems.length; ++i) {
+            KeyStroke ks = keyStrokes[i];
+            int modKeyCode = getModKeyCode(ks.getModifiers());
+
+            if (modKeyCode != 0) {
+                robot.keyPress(modKeyCode);
+            }
+
+            robot.keyPress(ks.getKeyCode());
+            robot.keyRelease(ks.getKeyCode());
+
+            if (modKeyCode != 0) {
+                robot.keyRelease(modKeyCode);
+            }
+
+            toolkit.realSync();
+
+            if (listenerCallCounter != 1) {
+                throw new Exception("Test failed: ActionListener for " + menuItems[i] +
+                    " called " + listenerCallCounter + " times instead of 1!");
+            }
+
+            listenerCallCounter = 0;
         }
     }
 
     private static void createAndShowGUI() {
-        JMenuItem newItem = new JMenuItem("Exit");
-        newItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.META_MASK));
-        newItem.addActionListener(
-            new ActionListener(){
-                public void actionPerformed(ActionEvent e) {
-                    listenerCallCounter++;
+        JMenu menu = new JMenu("Menu");
+
+        for (int i = 0; i < menuItems.length; ++i) {
+            JMenuItem newItem = new JMenuItem(menuItems[i]);
+            newItem.setAccelerator(keyStrokes[i]);
+            newItem.addActionListener(
+                new ActionListener(){
+                    public void actionPerformed(ActionEvent e) {
+                        listenerCallCounter++;
+                    }
                 }
-            }
-        );
-        JMenu menu = new JMenu("Menu");
-        menu.add(newItem);
+            );
+            menu.add(newItem);
+        }
+
         JMenuBar bar = new JMenuBar();
         bar.add(menu);
         JFrame frame = new JFrame("Test");
@@ -80,4 +109,24 @@
         frame.pack();
         frame.setVisible(true);
     }
+
+    private static int getModKeyCode(int mod) {
+        if ((mod & (InputEvent.SHIFT_DOWN_MASK | InputEvent.SHIFT_MASK)) != 0) {
+            return KeyEvent.VK_SHIFT;
+        }
+
+        if ((mod & (InputEvent.CTRL_DOWN_MASK | InputEvent.CTRL_MASK)) != 0) {
+            return KeyEvent.VK_CONTROL;
+        }
+
+        if ((mod & (InputEvent.ALT_DOWN_MASK | InputEvent.ALT_MASK)) != 0) {
+            return KeyEvent.VK_ALT;
+        }
+
+        if ((mod & (InputEvent.META_DOWN_MASK | InputEvent.META_MASK)) != 0) {
+            return KeyEvent.VK_META;
+        }
+
+        return 0;
+    }
 }
--- a/jdk/test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java	Wed May 08 11:22:25 2013 +0100
@@ -46,10 +46,10 @@
  * @bug 8010117
  * @summary Verify if CallerSensitive methods are annotated with
  *          sun.reflect.CallerSensitive annotation
- * @build CallerSensitiveFinder MethodFinder
+ * @build CallerSensitiveFinder
  * @run main/othervm/timeout=900 -mx600m CallerSensitiveFinder
  */
-public class CallerSensitiveFinder extends MethodFinder {
+public class CallerSensitiveFinder {
     private static int numThreads = 3;
     private static boolean verbose = false;
     public static void main(String[] args) throws Exception {
@@ -71,8 +71,7 @@
         if (classes.isEmpty()) {
             classes.addAll(PlatformClassPath.getJREClasses());
         }
-        final String method = "sun/reflect/Reflection.getCallerClass";
-        CallerSensitiveFinder csfinder = new CallerSensitiveFinder(method);
+        CallerSensitiveFinder csfinder = new CallerSensitiveFinder();
 
         List<String> errors = csfinder.run(classes);
         if (!errors.isEmpty()) {
@@ -82,8 +81,46 @@
     }
 
     private final List<String> csMethodsMissingAnnotation = new ArrayList<>();
-    public CallerSensitiveFinder(String... methods) {
-        super(methods);
+    private final ReferenceFinder finder;
+    public CallerSensitiveFinder() {
+        this.finder = new ReferenceFinder(getFilter(), getVisitor());
+    }
+
+    private ReferenceFinder.Filter getFilter() {
+        final String classname = "sun/reflect/Reflection";
+        final String method = "getCallerClass";
+        return new ReferenceFinder.Filter() {
+            public boolean accept(ConstantPool cpool, CPRefInfo cpref) {
+                try {
+                    CONSTANT_NameAndType_info nat = cpref.getNameAndTypeInfo();
+                    return cpref.getClassName().equals(classname) && nat.getName().equals(method);
+                } catch (ConstantPoolException ex) {
+                    throw new RuntimeException(ex);
+                }
+            }
+        };
+    }
+
+    private ReferenceFinder.Visitor getVisitor() {
+        return new ReferenceFinder.Visitor() {
+            public void visit(ClassFile cf, Method m,  List<CPRefInfo> refs) {
+                try {
+                    String name = String.format("%s#%s %s", cf.getName(),
+                                                m.getName(cf.constant_pool),
+                                                m.descriptor.getValue(cf.constant_pool));
+                    if (!CallerSensitiveFinder.isCallerSensitive(m, cf.constant_pool)) {
+                        csMethodsMissingAnnotation.add(name);
+                        System.err.println("Missing @CallerSensitive: " + name);
+                    } else {
+                        if (verbose) {
+                            System.out.format("@CS  %s%n", name);
+                        }
+                    }
+                } catch (ConstantPoolException ex) {
+                    throw new RuntimeException(ex);
+                }
+            }
+        };
     }
 
     public List<String> run(List<Path> classes) throws IOException, InterruptedException,
@@ -125,27 +162,12 @@
         return false;
     }
 
-    public void referenceFound(ClassFile cf, Method m, Set<Integer> refs)
-            throws ConstantPoolException
-    {
-        String name = String.format("%s#%s %s", cf.getName(),
-                                    m.getName(cf.constant_pool),
-                                    m.descriptor.getValue(cf.constant_pool));
-        if (!CallerSensitiveFinder.isCallerSensitive(m, cf.constant_pool)) {
-            csMethodsMissingAnnotation.add(name);
-            System.err.println("Missing @CallerSensitive: " + name);
-        } else {
-            if (verbose) {
-                System.out.format("@CS  %s%n", name);
-            }
-        }
-    }
-
-    private final List<FutureTask<String>> tasks = new ArrayList<FutureTask<String>>();
-    private FutureTask<String> getTask(final ClassFile cf) {
-        FutureTask<String> task = new FutureTask<String>(new Callable<String>() {
-            public String call() throws Exception {
-                return parse(cf);
+    private final List<FutureTask<Void>> tasks = new ArrayList<FutureTask<Void>>();
+    private FutureTask<Void> getTask(final ClassFile cf) {
+        FutureTask<Void> task = new FutureTask<Void>(new Callable<Void>() {
+            public Void call() throws Exception {
+                finder.parse(cf);
+                return null;
             }
         });
         tasks.add(task);
@@ -153,8 +175,8 @@
     }
 
     private void waitForCompletion() throws InterruptedException, ExecutionException {
-        for (FutureTask<String> t : tasks) {
-            String s = t.get();
+        for (FutureTask<Void> t : tasks) {
+            t.get();
         }
         System.out.println("Parsed " + tasks.size() + " classfiles");
     }
--- a/jdk/test/sun/reflect/CallerSensitive/MethodFinder.java	Wed May 01 12:25:43 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.util.*;
-import com.sun.tools.classfile.*;
-import static com.sun.tools.classfile.ConstantPool.*;
-import com.sun.tools.classfile.Instruction.TypeKind;
-
-/**
- * MethodFinder utility class to find references to the given methods.
- */
-public abstract class MethodFinder {
-    final List<String> methods;
-    public MethodFinder(String... methods) {
-        this.methods = Arrays.asList(methods);
-    }
-
-    /**
-     * A callback method will be invoked when a method referencing
-     * any of the lookup methods.
-     *
-     * @param cf ClassFile
-     * @param m Method
-     * @param refs Set of constant pool indices that reference the methods
-     *             matching the given lookup method names
-     */
-    public abstract void referenceFound(ClassFile cf, Method m, Set<Integer> refs)
-            throws ConstantPoolException;
-
-    public String parse(ClassFile cf) throws ConstantPoolException {
-        List<Integer> cprefs = new ArrayList<Integer>();
-        int index = 1;
-        for (ConstantPool.CPInfo cpInfo : cf.constant_pool.entries()) {
-            if (cpInfo.accept(cpVisitor, null)) {
-                cprefs.add(index);
-            }
-            index += cpInfo.size();
-        }
-
-        if (!cprefs.isEmpty()) {
-            for (Method m : cf.methods) {
-                Set<Integer> refs = new HashSet<Integer>();
-                Code_attribute c_attr = (Code_attribute) m.attributes.get(Attribute.Code);
-                if (c_attr != null) {
-                    for (Instruction instr : c_attr.getInstructions()) {
-                        int idx = instr.accept(codeVisitor, cprefs);
-                        if (idx > 0) {
-                            refs.add(idx);
-                        }
-                    }
-                }
-                if (refs.size() > 0) {
-                    referenceFound(cf, m, refs);
-                }
-            }
-        }
-        return cprefs.isEmpty() ? "" : cf.getName();
-    }
-
-    private ConstantPool.Visitor<Boolean,Void> cpVisitor =
-            new ConstantPool.Visitor<Boolean,Void>()
-    {
-        private boolean matches(CPRefInfo info) {
-            try {
-                CONSTANT_NameAndType_info nat = info.getNameAndTypeInfo();
-                return matches(info.getClassName(), nat.getName(), nat.getType());
-            } catch (ConstantPoolException ex) {
-                return false;
-            }
-        }
-
-        private boolean matches(String cn, String name, String type) {
-            return methods.contains(cn + "." + name);
-        }
-
-        public Boolean visitClass(CONSTANT_Class_info info, Void p) {
-            return false;
-        }
-
-        public Boolean visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, Void p) {
-            return matches(info);
-        }
-
-        public Boolean visitMethodref(CONSTANT_Methodref_info info, Void p) {
-            return matches(info);
-        }
-
-        public Boolean visitDouble(CONSTANT_Double_info info, Void p) {
-            return false;
-        }
-
-        public Boolean visitFieldref(CONSTANT_Fieldref_info info, Void p) {
-            return false;
-        }
-
-        public Boolean visitFloat(CONSTANT_Float_info info, Void p) {
-            return false;
-        }
-
-        public Boolean visitInteger(CONSTANT_Integer_info info, Void p) {
-            return false;
-        }
-
-        public Boolean visitInvokeDynamic(CONSTANT_InvokeDynamic_info info, Void p) {
-            return false;
-        }
-
-        public Boolean visitLong(CONSTANT_Long_info info, Void p) {
-            return false;
-        }
-
-        public Boolean visitNameAndType(CONSTANT_NameAndType_info info, Void p) {
-            return false;
-        }
-
-        public Boolean visitMethodHandle(CONSTANT_MethodHandle_info info, Void p) {
-            return false;
-        }
-
-        public Boolean visitMethodType(CONSTANT_MethodType_info info, Void p) {
-            return false;
-        }
-
-        public Boolean visitString(CONSTANT_String_info info, Void p) {
-            return false;
-        }
-
-        public Boolean visitUtf8(CONSTANT_Utf8_info info, Void p) {
-            return false;
-        }
-    };
-
-    private Instruction.KindVisitor<Integer, List<Integer>> codeVisitor =
-            new Instruction.KindVisitor<Integer, List<Integer>>()
-    {
-        public Integer visitNoOperands(Instruction instr, List<Integer> p) {
-            return 0;
-        }
-
-        public Integer visitArrayType(Instruction instr, TypeKind kind, List<Integer> p) {
-            return 0;
-        }
-
-        public Integer visitBranch(Instruction instr, int offset, List<Integer> p) {
-            return 0;
-        }
-
-        public Integer visitConstantPoolRef(Instruction instr, int index, List<Integer> p) {
-            return p.contains(index) ? index : 0;
-        }
-
-        public Integer visitConstantPoolRefAndValue(Instruction instr, int index, int value, List<Integer> p) {
-            return p.contains(index) ? index : 0;
-        }
-
-        public Integer visitLocal(Instruction instr, int index, List<Integer> p) {
-            return 0;
-        }
-
-        public Integer visitLocalAndValue(Instruction instr, int index, int value, List<Integer> p) {
-            return 0;
-        }
-
-        public Integer visitLookupSwitch(Instruction instr, int default_, int npairs, int[] matches, int[] offsets, List<Integer> p) {
-            return 0;
-        }
-
-        public Integer visitTableSwitch(Instruction instr, int default_, int low, int high, int[] offsets, List<Integer> p) {
-            return 0;
-        }
-
-        public Integer visitValue(Instruction instr, int value, List<Integer> p) {
-            return 0;
-        }
-
-        public Integer visitUnknown(Instruction instr, List<Integer> p) {
-            return 0;
-        }
-    };
-}
-
--- a/jdk/test/sun/reflect/CallerSensitive/MissingCallerSensitive.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/sun/reflect/CallerSensitive/MissingCallerSensitive.java	Wed May 08 11:22:25 2013 +0100
@@ -27,7 +27,7 @@
  * @bug 8010117
  * @summary Test CallerSensitiveFinder to find missing annotation
  * @compile -XDignore.symbol.file MissingCallerSensitive.java
- * @build CallerSensitiveFinder MethodFinder
+ * @build CallerSensitiveFinder
  * @run main MissingCallerSensitive
  */
 
@@ -40,8 +40,7 @@
         List<Path> classes = new ArrayList<>();
         classes.add(Paths.get(testclasses, "MissingCallerSensitive.class"));
 
-        final String method = "sun/reflect/Reflection.getCallerClass";
-        CallerSensitiveFinder csfinder = new CallerSensitiveFinder(method);
+        CallerSensitiveFinder csfinder = new CallerSensitiveFinder();
         List<String> errors = csfinder.run(classes);
         if (errors.size() != 1) {
             throw new RuntimeException("Unexpected number of methods found: " + errors.size());
--- a/jdk/test/sun/security/krb5/auto/SSL.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/sun/security/krb5/auto/SSL.java	Wed May 08 11:22:25 2013 +0100
@@ -23,10 +23,11 @@
 
 /*
  * @test
- * @bug 6894643 6913636
+ * @bug 6894643 6913636 8005523
  * @summary Test JSSE Kerberos ciphersuite
+
  * @run main/othervm SSL TLS_KRB5_WITH_RC4_128_SHA
- * @run main/othervm SSL TLS_KRB5_WITH_RC4_128_MD5
+ * @run main/othervm SSL TLS_KRB5_WITH_RC4_128_SHA unbound
  * @run main/othervm SSL TLS_KRB5_WITH_3DES_EDE_CBC_SHA
  * @run main/othervm SSL TLS_KRB5_WITH_3DES_EDE_CBC_MD5
  * @run main/othervm SSL TLS_KRB5_WITH_DES_CBC_SHA
@@ -38,14 +39,17 @@
  */
 import java.io.*;
 import java.net.InetAddress;
+import java.security.AccessControlException;
+import java.security.Permission;
 import javax.net.ssl.*;
 import java.security.Principal;
 import java.util.Date;
+import javax.security.auth.kerberos.ServicePermission;
 import sun.security.jgss.GSSUtil;
 import sun.security.krb5.PrincipalName;
 import sun.security.krb5.internal.ktab.KeyTab;
 
-public class SSL {
+public class SSL extends SecurityManager {
 
     private static String krb5Cipher;
     private static final int LOOP_LIMIT = 3;
@@ -53,13 +57,32 @@
     private static volatile String server;
     private static volatile int port;
 
+    private static String permChecks = "";
+
     // 0-Not started, 1-Start OK, 2-Failure
     private static volatile int serverState = 0;
 
+    @Override
+    public void checkPermission(Permission perm, Object context) {
+        checkPermission(perm);
+    }
+
+    public void checkPermission(Permission perm) {
+        if (!(perm instanceof ServicePermission)) {
+            return;
+        }
+        ServicePermission p = (ServicePermission)perm;
+        permChecks = permChecks + p.getActions().toUpperCase().charAt(0);
+    }
+
     public static void main(String[] args) throws Exception {
 
         krb5Cipher = args[0];
 
+        boolean unbound = args.length > 1;
+
+        System.setSecurityManager(new SSL());
+
         KDC kdc = KDC.create(OneKDC.REALM);
         // Run this after KDC, so our own DNS service can be started
         try {
@@ -85,6 +108,7 @@
         // and use the middle one as the real key
         kdc.addPrincipal("host/" + server, "pass2".toCharArray());
 
+
         // JAAS config entry name ssl
         System.setProperty("java.security.auth.login.config", OneKDC.JAAS_CONF);
         File f = new File(OneKDC.JAAS_CONF);
@@ -92,7 +116,9 @@
         fos.write((
                 "ssl {\n" +
                 "    com.sun.security.auth.module.Krb5LoginModule required\n" +
-                "    principal=\"host/" + server + "\"\n" +
+                (unbound ?
+                    "    principal=*\n" :
+                    "    principal=\"host/" + server + "\"\n") +
                 "    useKeyTab=true\n" +
                 "    keyTab=" + OneKDC.KTAB + "\n" +
                 "    isInitiator=false\n" +
@@ -103,7 +129,6 @@
         Context c;
         final Context s = Context.fromJAAS("ssl");
 
-        // There's no keytab file when server starts.
         s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID);
 
         Thread server = new Thread(new Runnable() {
@@ -127,21 +152,6 @@
             throw new Exception("Server already failed");
         }
 
-        // Now create the keytab
-
-        /*
-        // Add 3 versions of keys into keytab
-        KeyTab ktab = KeyTab.create(OneKDC.KTAB);
-        PrincipalName service = new PrincipalName(
-                "host/" + server, PrincipalName.KRB_NT_SRV_HST);
-        ktab.addEntry(service, "pass1".toCharArray(), 1);
-        ktab.addEntry(service, "pass2".toCharArray(), 2);
-        ktab.addEntry(service, "pass3".toCharArray(), 3);
-        ktab.save();
-
-        // and use the middle one as the  real key
-        kdc.addPrincipal("host/" + server, "pass2".toCharArray());
-         */
         c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false);
         c.startAsClient("host/" + server, GSSUtil.GSS_KRB5_MECH_OID);
         c.doAs(new JsseClientAction(), null);
@@ -157,20 +167,22 @@
         c.startAsClient("host/" + server, GSSUtil.GSS_KRB5_MECH_OID);
         c.doAs(new JsseClientAction(), null);
 
-        // Revoke the old key
-        /*Thread.sleep(2000);
-        ktab = KeyTab.create(OneKDC.KTAB);
-        ktab.addEntry(service, "pass5".toCharArray(), 5, false);
-        ktab.save();
-
-        c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false);
-        c.startAsClient("host/" + server, GSSUtil.GSS_KRB5_MECH_OID);
-        try {
-            c.doAs(new JsseClientAction(), null);
-            throw new Exception("Should fail this time.");
-        } catch (SSLException e) {
-            // Correct behavior.
-        }*/
+        // Permission checking check. Please note this is highly
+        // implementation related.
+        if (unbound) {
+            // For unbound, server does not know what name to check.
+            // Client checks "initiate", then server gets the name
+            // and checks "accept". Second connection resume.
+            if (!permChecks.equals("IA")) {
+                throw new Exception();
+            }
+        } else {
+            // For bound, JAAS checks "accept" once. Server checks again,
+            // client then checks "initiate". Second connection resume.
+            if (!permChecks.equals("AAI")) {
+                throw new Exception();
+            }
+        }
     }
 
     // Following codes copied from
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/krb5/auto/SaslGSS.java	Wed May 08 11:22:25 2013 +0100
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8012082
+ * @summary SASL: auth-conf negotiated, but unencrypted data is accepted,
+  *         reset to unencrypt
+ * @compile -XDignore.symbol.file SaslGSS.java
+ * @run main/othervm SaslGSS
+ */
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.sasl.AuthorizeCallback;
+import javax.security.sasl.RealmCallback;
+import javax.security.sasl.Sasl;
+import javax.security.sasl.SaslServer;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Locale;
+import org.ietf.jgss.*;
+import sun.security.jgss.GSSUtil;
+
+public class SaslGSS {
+
+    public static void main(String[] args) throws Exception {
+
+        String name = "host." + OneKDC.REALM.toLowerCase(Locale.US);
+
+        new OneKDC(null).writeJAASConf();
+        System.setProperty("javax.security.auth.useSubjectCredsOnly", "false");
+
+        // Client in JGSS so that it can control wrap privacy mode
+        GSSManager m = GSSManager.getInstance();
+        GSSContext sc = m.createContext(
+                        m.createName(OneKDC.SERVER, GSSUtil.NT_GSS_KRB5_PRINCIPAL),
+                        GSSUtil.GSS_KRB5_MECH_OID,
+                        null,
+                        GSSContext.DEFAULT_LIFETIME);
+        sc.requestMutualAuth(false);
+
+        // Server in SASL
+        final HashMap props = new HashMap();
+        props.put(Sasl.QOP, "auth-conf");
+        SaslServer ss = Sasl.createSaslServer("GSSAPI", "server",
+                name, props,
+                new CallbackHandler() {
+                    public void handle(Callback[] callbacks)
+                            throws IOException, UnsupportedCallbackException {
+                        for (Callback cb : callbacks) {
+                            if (cb instanceof RealmCallback) {
+                                ((RealmCallback) cb).setText(OneKDC.REALM);
+                            } else if (cb instanceof AuthorizeCallback) {
+                                ((AuthorizeCallback) cb).setAuthorized(true);
+                            }
+                        }
+                    }
+                });
+
+        // Handshake
+        byte[] token = new byte[0];
+        token = sc.initSecContext(token, 0, token.length);
+        token = ss.evaluateResponse(token);
+        token = sc.unwrap(token, 0, token.length, new MessageProp(0, false));
+        token[0] = (byte)(((token[0] & 4) != 0) ? 4 : 2);
+        token = sc.wrap(token, 0, token.length, new MessageProp(0, false));
+        ss.evaluateResponse(token);
+
+        // Talk
+        // 1. Client sends a auth-int message
+        byte[] hello = "hello".getBytes();
+        MessageProp qop = new MessageProp(0, false);
+        token = sc.wrap(hello, 0, hello.length, qop);
+        // 2. Server accepts it anyway
+        ss.unwrap(token, 0, token.length);
+        // 3. Server sends a message
+        token = ss.wrap(hello, 0, hello.length);
+        // 4. Client accepts, should be auth-conf
+        sc.unwrap(token, 0, token.length, qop);
+        if (!qop.getPrivacy()) {
+            throw new Exception();
+        }
+    }
+}
--- a/jdk/test/sun/security/provider/SecureRandom/StrongSeedReader.java	Wed May 01 12:25:43 2013 +0100
+++ b/jdk/test/sun/security/provider/SecureRandom/StrongSeedReader.java	Wed May 08 11:22:25 2013 +0100
@@ -49,7 +49,7 @@
 
         File file = null;
         try {
-            file = new File(System.getProperty("java.io.tmpdir") +
+            file = new File(System.getProperty("java.io.tmpdir"),
                     "StrongSeedReader.tmpdata");
 
             // write a bunch of 0's to the file.
--- a/langtools/.hgtags	Wed May 01 12:25:43 2013 +0100
+++ b/langtools/.hgtags	Wed May 08 11:22:25 2013 +0100
@@ -208,3 +208,4 @@
 cfb65ca92082b2412aed66c8422c2466bde544ef jdk8-b84
 4a48f31735349782ad13980267358c97076adc66 jdk8-b85
 6ab578e141dfd17c4dc03869bb204aafa490c9f4 jdk8-b86
+1329f9c38d93c8caf339d7687df8371d06fe9e56 jdk8-b87
--- a/nashorn/.hgtags	Wed May 01 12:25:43 2013 +0100
+++ b/nashorn/.hgtags	Wed May 08 11:22:25 2013 +0100
@@ -196,3 +196,4 @@
 999cc1bf55203f51b2985feae6378932667ecff2 jdk8-b84
 e0378f0a50dafdcfb7b04f6401d320f89884baa1 jdk8-b85
 002ad9d6735f36d1204e133324c73058c8abb1b0 jdk8-b86
+774aeaa89bc15f4365e3c2fc36f6a3a0da70ba28 jdk8-b87
jdk-sandbox