changeset 84:be72adae7866

rebase to current hsx/hotspot-comp
author jrose
date Thu, 01 Mar 2012 00:18:30 -0800
parents 55b0cb070030
children b5ed41bbffb4
files jdk7-b147-to-bsd-port.patch macosx-7113349.patch series
diffstat 3 files changed, 465 insertions(+), 409 deletions(-) [+]
line wrap: on
line diff
--- a/jdk7-b147-to-bsd-port.patch	Fri Sep 09 16:44:34 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,406 +0,0 @@
-Diff between these two repositories:
-  hg clone -r jdk7-b147 http://hg.openjdk.java.net/hsx/hotspot-comp/langtools
-  hg clone -r 23aadf169f08 http://hg.openjdk.java.net/bsd-port/bsd-port/langtools #7/14/2011
-
-diff --git a/make/build.xml b/make/build.xml
---- a/make/build.xml
-+++ b/make/build.xml
-@@ -169,10 +169,10 @@
-         in the build-bootstrap-classes macro. -->
- 
-     <available property="import.jdk.src.dir" value="${import.jdk}/src/share/classes"
--        filepath="${import.jdk}/src/share/classes" file="java/nio/file/Path.java"/>
-+        filepath="${import.jdk}/src/share/classes" file="java/nio/file/StandardWatchEventKinds.java"/>
-     <available property="import.jdk.jar" value="${import.jdk}/jre/lib/rt.jar"
-         ignoresystemclasses="true"
--        classpath="${import.jdk}/jre/lib/rt.jar" classname="java.nio.file.Path"/>
-+        classpath="${import.jdk}/jre/lib/rt.jar" classname="java.nio.file.StandardWatchEventKinds"/>
- 
-     <!-- Set the default bootclasspath option used for javac.
-         Note that different variants of the option are used, meaning we can't just
-@@ -188,7 +188,7 @@
-     <condition property="boot.java.provides.latest.jdk">
-         <available
-             ignoresystemclasses="true"
--            classpath="${boot.java.home}/jre/lib/rt.jar" classname="java.nio.file.Path"/>
-+            classpath="${boot.java.home}/jre/lib/rt.jar" classname="java.nio.file.StandardWatchEventKinds"/>
-     </condition>
- 
-     <condition property="bootstrap.exclude.files" value="" else="${require.latest.jdk.files}">
-diff --git a/test/Makefile b/test/Makefile
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -34,6 +34,22 @@
-     ARCH=i586
-   endif
- endif
-+ifeq ($(OSNAME), Darwin)
-+  PLATFORM = bsd
-+  JT_PLATFORM = linux
-+  ARCH = $(shell uname -m)
-+  ifeq ($(ARCH), i386)
-+    ARCH=i586
-+  endif
-+endif
-+ifeq ($(findstring BSD,$(OSNAME)), BSD)
-+  PLATFORM = bsd
-+  JT_PLATFORM = linux
-+  ARCH = $(shell uname -m)
-+  ifeq ($(ARCH), i386)
-+    ARCH=i586
-+  endif
-+endif
- ifeq ($(OSNAME), Windows_NT)
-   PLATFORM = windows
-   JT_PLATFORM = win32
-@@ -93,7 +109,7 @@
- ifdef JPRT_JAVA_HOME
-   JT_JAVA = $(JPRT_JAVA_HOME)
- else
--  JT_JAVA = $(SLASH_JAVA)/re/jdk/1.6.0/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
-+  JT_JAVA = $(TEST_ROOT)/../../build/$(PLATFORM)-$(ARCH)
- endif
- 
- # Default JDK to test
-@@ -188,7 +204,9 @@
- 
- # The test directories to run
- DEFAULT_TESTDIRS = .
--TESTDIRS = $(DEFAULT_TESTDIRS)
-+ifndef TESTDIRS
-+  TESTDIRS = $(DEFAULT_TESTDIRS)
-+endif
- 
- # Root of all test results
- TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools
-diff --git a/test/jprt.config b/test/jprt.config
---- a/test/jprt.config
-+++ b/test/jprt.config
-@@ -71,8 +71,8 @@
- 
- # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
- osname=`uname -s`
--if [ "${osname}" = SunOS ] ; then
--   
-+case "${osname}" in
-+  SunOS)
-     # SOLARIS: Sparc or X86
-     osarch=`uname -p`
-     if [ "${osarch}" = sparc ] ; then
-@@ -96,9 +96,9 @@
- 
-     # File creation mask
-     umask 002
-+    ;;
- 
--elif [ "${osname}" = Linux ] ; then
--   
-+  Linux | Darwin )
-     # Add basic paths
-     path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
- 
-@@ -107,9 +107,31 @@
-     fileMustExist "${make}" make
- 
-     umask 002
-+    ;;
- 
--else
-+  FreeBSD | OpenBSD )
-+    # Add basic paths
-+    path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
- 
-+    # Find GNU make
-+    make=/usr/local/bin/gmake
-+    fileMustExist "${make}" make
-+
-+    umask 002
-+    ;;
-+
-+  NetBSD )
-+    # Add basic paths
-+    path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
-+
-+    # Find GNU make
-+    make=/usr/pkg/bin/gmake
-+    fileMustExist "${make}" make
-+
-+    umask 002
-+    ;;
-+
-+  *)
-     # Windows: Differs on CYGWIN vs. MKS.
-    
-     # We need to determine if we are running a CYGWIN shell or an MKS shell
-@@ -150,8 +172,8 @@
-     if [ "${unix_toolset}" = CYGWIN ] ; then
- 	path4sdk="`/usr/bin/cygpath -p ${path4sdk}`"
-     fi
--
--fi
-+    ;;
-+esac
- 
- # Export PATH setting
- PATH="${path4sdk}"
-diff --git a/test/tools/javac/4846262/Test.sh b/test/tools/javac/4846262/Test.sh
---- a/test/tools/javac/4846262/Test.sh
-+++ b/test/tools/javac/4846262/Test.sh
-@@ -44,7 +44,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux )
-+  SunOS | Linux | *BSD | Darwin )
-     FS="/"
-     ;;
-   CYGWIN* )
-diff --git a/test/tools/javac/6302184/T6302184.sh b/test/tools/javac/6302184/T6302184.sh
---- a/test/tools/javac/6302184/T6302184.sh
-+++ b/test/tools/javac/6302184/T6302184.sh
-@@ -41,7 +41,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux )
-+  SunOS | Linux | *BSD | Darwin )
-     FS="/"
-     ;;
-   CYGWIN* )
-diff --git a/test/tools/javac/ClassPathTest/ClassPathTest.sh b/test/tools/javac/ClassPathTest/ClassPathTest.sh
---- a/test/tools/javac/ClassPathTest/ClassPathTest.sh
-+++ b/test/tools/javac/ClassPathTest/ClassPathTest.sh
-@@ -56,7 +56,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux | CYGWIN* )
-+  SunOS | Linux | *BSD | Darwin )
-     FS="/"
-     ;;
-   Windows* )
-diff --git a/test/tools/javac/ExtDirs/ExtDirs.sh b/test/tools/javac/ExtDirs/ExtDirs.sh
---- a/test/tools/javac/ExtDirs/ExtDirs.sh
-+++ b/test/tools/javac/ExtDirs/ExtDirs.sh
-@@ -54,7 +54,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux )
-+  SunOS | Linux | *BSD | Darwin )
-     PS=":"
-     FS="/"
-     ;;
-diff --git a/test/tools/javac/MissingInclude.sh b/test/tools/javac/MissingInclude.sh
---- a/test/tools/javac/MissingInclude.sh
-+++ b/test/tools/javac/MissingInclude.sh
-@@ -47,7 +47,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux | CYGWIN* )
-+  SunOS | Linux | CYGWIN* | *BSD | Darwin )
-     FS="/"
-     ;;
-   Windows* )
-diff --git a/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh b/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh
---- a/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh
-+++ b/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh
-@@ -52,7 +52,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux )
-+  SunOS | Linux | *BSD | Darwin )
-     PS=":"
-     FS="/"
-     ;;
-diff --git a/test/tools/javac/T5090006/compiler.sh b/test/tools/javac/T5090006/compiler.sh
---- a/test/tools/javac/T5090006/compiler.sh
-+++ b/test/tools/javac/T5090006/compiler.sh
-@@ -47,7 +47,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux | CYGWIN* )
-+  SunOS | Linux | CYGWIN* | *BSD | Darwin )
-     FS="/"
-     ;;
-   Windows* )
-diff --git a/test/tools/javac/apt.sh b/test/tools/javac/apt.sh
---- a/test/tools/javac/apt.sh
-+++ b/test/tools/javac/apt.sh
-@@ -38,7 +38,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux )
-+  SunOS | Linux | *BSD | Darwin )
-     NULL=/dev/null
-     PS=":"
-     FS="/"
-diff --git a/test/tools/javac/constDebug/ConstDebug.sh b/test/tools/javac/constDebug/ConstDebug.sh
---- a/test/tools/javac/constDebug/ConstDebug.sh
-+++ b/test/tools/javac/constDebug/ConstDebug.sh
-@@ -47,7 +47,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux )
-+  SunOS | Linux | *BSD | Darwin )
-     PS=":"
-     FS="/"
-     ;;
-diff --git a/test/tools/javac/fatalErrors/NoJavaLang.sh b/test/tools/javac/fatalErrors/NoJavaLang.sh
---- a/test/tools/javac/fatalErrors/NoJavaLang.sh
-+++ b/test/tools/javac/fatalErrors/NoJavaLang.sh
-@@ -48,7 +48,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux )
-+  SunOS | Linux | *BSD | Darwin )
-     FS="/"
-     ;;
-   CYGWIN* )
-diff --git a/test/tools/javac/innerClassFile/Driver.sh b/test/tools/javac/innerClassFile/Driver.sh
---- a/test/tools/javac/innerClassFile/Driver.sh
-+++ b/test/tools/javac/innerClassFile/Driver.sh
-@@ -53,7 +53,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux | CYGWIN* )
-+  SunOS | Linux | CYGWIN* | *BSD | Darwin )
-     FS="/"
-     ;;
-   Windows* )
-diff --git a/test/tools/javac/javazip/Test.sh b/test/tools/javac/javazip/Test.sh
---- a/test/tools/javac/javazip/Test.sh
-+++ b/test/tools/javac/javazip/Test.sh
-@@ -41,7 +41,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux )
-+  SunOS | Linux | *BSD | Darwin )
-     FS="/"
-     SCR=`pwd`
-     ;;
-diff --git a/test/tools/javac/links/links.sh b/test/tools/javac/links/links.sh
---- a/test/tools/javac/links/links.sh
-+++ b/test/tools/javac/links/links.sh
-@@ -53,7 +53,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux )
-+  SunOS | Linux | *BSD | Darwin )
-     NULL=/dev/null
-     PS=":"
-     FS="/"
-diff --git a/test/tools/javac/newlines/Newlines.sh b/test/tools/javac/newlines/Newlines.sh
---- a/test/tools/javac/newlines/Newlines.sh
-+++ b/test/tools/javac/newlines/Newlines.sh
-@@ -50,7 +50,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux | CYGWIN* )
-+  SunOS | Linux | CYGWIN* | *BSD | Darwin )
-     FS="/"
-     ;;
-   Windows* )
-diff --git a/test/tools/javac/stackmap/T4955930.sh b/test/tools/javac/stackmap/T4955930.sh
---- a/test/tools/javac/stackmap/T4955930.sh
-+++ b/test/tools/javac/stackmap/T4955930.sh
-@@ -41,7 +41,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux | CYGWIN* )
-+  SunOS | Linux | CYGWIN* | *BSD | Darwin )
-     FS="/"
-     ;;
-   Windows_95 | Windows_98 | Windows_NT )
-diff --git a/test/tools/javac/unicode/SupplementaryJavaID6.sh b/test/tools/javac/unicode/SupplementaryJavaID6.sh
---- a/test/tools/javac/unicode/SupplementaryJavaID6.sh
-+++ b/test/tools/javac/unicode/SupplementaryJavaID6.sh
-@@ -66,6 +66,17 @@
-         exit 0;
-     fi
-     ;;
-+  *BSD | Darwin )
-+    if [ -d /usr/share/locale/en_US.UTF-8 -o -d /usr/share/locale/en_US.utf8 ]
-+    then
-+        ENV="env LANG=en_US.UTF-8"
-+        PS=":"
-+        FS="/"
-+    else
-+        echo "As there is no en_US.UTF-8 locale available on this system, the compilation of the test case may or may not fail.  Ignoring this test."
-+        exit 0;
-+    fi
-+    ;;
-   Windows_98 | Windows_ME )
-     echo "As Windows 98/Me do not provide Unicode-aware file system, the compilation of the test case is expected to fail on these platforms.  Ignoring this test."
-     exit 0;
-diff --git a/test/tools/javah/6257087/foo.sh b/test/tools/javah/6257087/foo.sh
---- a/test/tools/javah/6257087/foo.sh
-+++ b/test/tools/javah/6257087/foo.sh
-@@ -41,7 +41,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux )
-+  SunOS | Linux | *BSD | Darwin )
-     PS=":"
-     FS="/"
-     ;;
-diff --git a/test/tools/javah/ConstMacroTest.sh b/test/tools/javah/ConstMacroTest.sh
---- a/test/tools/javah/ConstMacroTest.sh
-+++ b/test/tools/javah/ConstMacroTest.sh
-@@ -56,7 +56,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux )
-+  SunOS | Linux | *BSD | Darwin )
-     PS=":"
-     FS="/"
-     ;;
-diff --git a/test/tools/javah/MissingParamClassTest.sh b/test/tools/javah/MissingParamClassTest.sh
---- a/test/tools/javah/MissingParamClassTest.sh
-+++ b/test/tools/javah/MissingParamClassTest.sh
-@@ -58,7 +58,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux | CYGWIN* )
-+  SunOS | Linux | CYGWIN* | *BSD | Darwin )
-     PS=":"
-     FS="/"
-     ;;
-diff --git a/test/tools/javah/ReadOldClass.sh b/test/tools/javah/ReadOldClass.sh
---- a/test/tools/javah/ReadOldClass.sh
-+++ b/test/tools/javah/ReadOldClass.sh
-@@ -43,7 +43,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux | CYGWIN* )
-+  SunOS | Linux | CYGWIN* | *BSD | Darwin )
-     PS=":"
-     FS="/"
-     ;;
-diff --git a/test/tools/javap/pathsep.sh b/test/tools/javap/pathsep.sh
---- a/test/tools/javap/pathsep.sh
-+++ b/test/tools/javap/pathsep.sh
-@@ -40,7 +40,7 @@
- # set platform-dependent variables
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux | CYGWIN* )
-+  SunOS | Linux | CYGWIN* | *BSD | Darwin )
-     FS="/"
-     ;;
-   Windows* )
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/macosx-7113349.patch	Thu Mar 01 00:18:30 2012 -0800
@@ -0,0 +1,462 @@
+--- old/.hgignore	2012-02-27 17:38:23.000000000 +0000
++++ new/.hgignore	2012-02-27 17:38:23.000000000 +0000
+@@ -2,3 +2,4 @@
+ ^dist/
+ /nbproject/private/
+ ^.hgtip
++.DS_Store
+--- old/make/jprt.properties	2012-02-27 17:38:24.000000000 +0000
++++ new/make/jprt.properties	2012-02-27 17:38:24.000000000 +0000
+@@ -39,6 +39,7 @@
+     solaris_x64_5.10-{product|fastdebug},                       \
+     linux_i586_2.6-{product|fastdebug},                         \
+     linux_x64_2.6-{product|fastdebug},                          \
++    macosx_x64_10.7-{product|fastdebug},                        \
+     windows_i586_5.1-{product|fastdebug},                       \
+     windows_x64_5.2-{product|fastdebug}
+ 
+@@ -50,6 +51,7 @@
+     solaris_x64_5.10-product-c2-TESTNAME,                       \
+     linux_i586_2.6-product-{c1|c2}-TESTNAME,                    \
+     linux_x64_2.6-product-c2-TESTNAME,                          \
++    macosx_x64_10.7-product-c2-TESTNAME,                        \
+     windows_i586_5.1-product-c1-TESTNAME,                       \
+     windows_x64_5.2-product-c2-TESTNAME
+ 
+@@ -60,3 +62,18 @@
+ # Directories to be excluded from the source bundles
+ jprt.bundle.exclude.src.dirs=build dist webrev
+ 
++# Test target list (no fastdebug & limited c2 testing)
++jprt.my.test.target.set= 					\
++    solaris_sparc_5.10-product-c1-TESTNAME,                     \
++    solaris_sparcv9_5.10-product-c2-TESTNAME,                   \
++    solaris_i586_5.10-product-c1-TESTNAME,                      \
++    solaris_x64_5.10-product-c2-TESTNAME,                       \
++    linux_i586_2.6-product-{c1|c2}-TESTNAME,                    \
++    linux_x64_2.6-product-c2-TESTNAME,                          \
++    macosx_x64_10.7-product-c2-TESTNAME,                        \
++    windows_i586_5.1-product-c1-TESTNAME,                       \
++    windows_x64_5.2-product-c2-TESTNAME
++
++# Default test targets
++jprt.make.rule.test.targets=					\
++    ${jprt.my.test.target.set:TESTNAME=jtreg}
+--- old/test/Makefile	2012-02-27 17:38:24.000000000 +0000
++++ new/test/Makefile	2012-02-27 17:38:24.000000000 +0000
+@@ -36,6 +36,14 @@
+     ARCH=i586
+   endif
+ endif
++ifeq ($(OSNAME), Darwin)
++  PLATFORM = bsd
++  JT_PLATFORM = linux
++  ARCH = $(shell uname -m)
++  ifeq ($(ARCH), i386)
++    ARCH=i586
++  endif
++endif
+ ifeq ($(OSNAME), Windows_NT)
+   # MKS
+   PLATFORM=windows
+@@ -251,6 +259,7 @@
+ # JTREG_REFERENCE
+ #	(Optional) reference results (e.g. work, report or summary.txt)
+ #
++jtreg_tests: jtreg-tests
+ jtreg-tests: check-jtreg FRC
+ 	@rm -f -r $(JTREG_OUTPUT_DIR)/JTwork $(JTREG_OUTPUT_DIR)/JTreport \
+ 	    $(JTREG_OUTPUT_DIR)/diff.html $(JTREG_OUTPUT_DIR)/status.txt
+--- old/test/tools/javac/4846262/Test.sh	2012-02-27 17:38:25.000000000 +0000
++++ new/test/tools/javac/4846262/Test.sh	2012-02-27 17:38:25.000000000 +0000
+@@ -44,7 +44,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux )
++  SunOS | Linux | Darwin )
+     FS="/"
+     ;;
+   CYGWIN* )
+--- old/test/tools/javac/6302184/T6302184.sh	2012-02-27 17:38:25.000000000 +0000
++++ new/test/tools/javac/6302184/T6302184.sh	2012-02-27 17:38:25.000000000 +0000
+@@ -41,7 +41,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux )
++  SunOS | Linux | Darwin )
+     FS="/"
+     ;;
+   CYGWIN* )
+--- old/test/tools/javac/ClassPathTest/ClassPathTest.sh	2012-02-27 17:38:26.000000000 +0000
++++ new/test/tools/javac/ClassPathTest/ClassPathTest.sh	2012-02-27 17:38:26.000000000 +0000
+@@ -56,7 +56,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux | CYGWIN* )
++  SunOS | Linux | Darwin | CYGWIN* )
+     FS="/"
+     ;;
+   Windows* )
+--- old/test/tools/javac/ExtDirs/ExtDirs.sh	2012-02-27 17:38:26.000000000 +0000
++++ new/test/tools/javac/ExtDirs/ExtDirs.sh	2012-02-27 17:38:26.000000000 +0000
+@@ -54,7 +54,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux )
++  SunOS | Linux | Darwin )
+     PS=":"
+     FS="/"
+     ;;
+--- old/test/tools/javac/MissingInclude.sh	2012-02-27 17:38:27.000000000 +0000
++++ new/test/tools/javac/MissingInclude.sh	2012-02-27 17:38:27.000000000 +0000
+@@ -47,7 +47,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux | CYGWIN* )
++  SunOS | Linux | Darwin | CYGWIN* )
+     FS="/"
+     ;;
+   Windows* )
+--- old/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	2012-02-27 17:38:27.000000000 +0000
++++ new/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	2012-02-27 17:38:27.000000000 +0000
+@@ -52,7 +52,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux )
++  SunOS | Linux | Darwin )
+     PS=":"
+     FS="/"
+     ;;
+--- old/test/tools/javac/T5090006/compiler.sh	2012-02-27 17:38:28.000000000 +0000
++++ new/test/tools/javac/T5090006/compiler.sh	2012-02-27 17:38:28.000000000 +0000
+@@ -47,7 +47,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux | CYGWIN* )
++  SunOS | Linux | Darwin | CYGWIN* )
+     FS="/"
+     ;;
+   Windows* )
+--- old/test/tools/javac/apt.sh	2012-02-27 17:38:29.000000000 +0000
++++ new/test/tools/javac/apt.sh	2012-02-27 17:38:28.000000000 +0000
+@@ -38,7 +38,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux )
++  SunOS | Linux | Darwin )
+     NULL=/dev/null
+     PS=":"
+     FS="/"
+--- old/test/tools/javac/constDebug/ConstDebug.sh	2012-02-27 17:38:29.000000000 +0000
++++ new/test/tools/javac/constDebug/ConstDebug.sh	2012-02-27 17:38:29.000000000 +0000
+@@ -47,7 +47,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux )
++  SunOS | Linux | Darwin )
+     PS=":"
+     FS="/"
+     ;;
+--- old/test/tools/javac/fatalErrors/NoJavaLang.sh	2012-02-27 17:38:30.000000000 +0000
++++ new/test/tools/javac/fatalErrors/NoJavaLang.sh	2012-02-27 17:38:29.000000000 +0000
+@@ -48,7 +48,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux )
++  SunOS | Linux | Darwin )
+     FS="/"
+     ;;
+   CYGWIN* )
+--- old/test/tools/javac/innerClassFile/Driver.sh	2012-02-27 17:38:30.000000000 +0000
++++ new/test/tools/javac/innerClassFile/Driver.sh	2012-02-27 17:38:30.000000000 +0000
+@@ -53,7 +53,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux | CYGWIN* )
++  SunOS | Linux | Darwin | CYGWIN* )
+     FS="/"
+     ;;
+   Windows* )
+--- old/test/tools/javac/javazip/Test.sh	2012-02-27 17:38:31.000000000 +0000
++++ new/test/tools/javac/javazip/Test.sh	2012-02-27 17:38:31.000000000 +0000
+@@ -41,7 +41,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux )
++  SunOS | Linux | Darwin )
+     FS="/"
+     SCR=`pwd`
+     ;;
+--- old/test/tools/javac/links/links.sh	2012-02-27 17:38:31.000000000 +0000
++++ new/test/tools/javac/links/links.sh	2012-02-27 17:38:31.000000000 +0000
+@@ -53,7 +53,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux )
++  SunOS | Linux | Darwin )
+     NULL=/dev/null
+     PS=":"
+     FS="/"
+--- old/test/tools/javac/newlines/Newlines.sh	2012-02-27 17:38:32.000000000 +0000
++++ new/test/tools/javac/newlines/Newlines.sh	2012-02-27 17:38:32.000000000 +0000
+@@ -50,7 +50,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux | CYGWIN* )
++  SunOS | Linux | Darwin | CYGWIN* )
+     FS="/"
+     ;;
+   Windows* )
+--- old/test/tools/javac/stackmap/T4955930.sh	2012-02-27 17:38:32.000000000 +0000
++++ new/test/tools/javac/stackmap/T4955930.sh	2012-02-27 17:38:32.000000000 +0000
+@@ -41,7 +41,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux | CYGWIN* )
++  SunOS | Linux | Darwin | CYGWIN* )
+     FS="/"
+     ;;
+   Windows_95 | Windows_98 | Windows_NT )
+--- old/test/tools/javac/unicode/SupplementaryJavaID6.sh	2012-02-27 17:38:33.000000000 +0000
++++ new/test/tools/javac/unicode/SupplementaryJavaID6.sh	2012-02-27 17:38:33.000000000 +0000
+@@ -55,7 +55,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux )
++  SunOS | Linux | Darwin )
+     if [ -d /usr/lib/locale/en_US.UTF-8 -o -d /usr/lib/locale/en_US.utf8 ]
+     then
+         ENV="env LANG=en_US.UTF-8"
+--- old/test/tools/javah/6257087/foo.sh	2012-02-27 17:38:33.000000000 +0000
++++ new/test/tools/javah/6257087/foo.sh	2012-02-27 17:38:33.000000000 +0000
+@@ -41,7 +41,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux )
++  SunOS | Linux | Darwin )
+     PS=":"
+     FS="/"
+     ;;
+--- old/test/tools/javah/ConstMacroTest.sh	2012-02-27 17:38:34.000000000 +0000
++++ new/test/tools/javah/ConstMacroTest.sh	2012-02-27 17:38:34.000000000 +0000
+@@ -56,7 +56,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux )
++  SunOS | Linux | Darwin )
+     PS=":"
+     FS="/"
+     ;;
+--- old/test/tools/javah/MissingParamClassTest.sh	2012-02-27 17:38:34.000000000 +0000
++++ new/test/tools/javah/MissingParamClassTest.sh	2012-02-27 17:38:34.000000000 +0000
+@@ -58,7 +58,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux | CYGWIN* )
++  SunOS | Linux | Darwin | CYGWIN* )
+     PS=":"
+     FS="/"
+     ;;
+--- old/test/tools/javah/ReadOldClass.sh	2012-02-27 17:38:35.000000000 +0000
++++ new/test/tools/javah/ReadOldClass.sh	2012-02-27 17:38:35.000000000 +0000
+@@ -43,7 +43,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux | CYGWIN* )
++  SunOS | Linux | Darwin | CYGWIN* )
+     PS=":"
+     FS="/"
+     ;;
+--- old/test/tools/javap/pathsep.sh	2012-02-27 17:38:35.000000000 +0000
++++ new/test/tools/javap/pathsep.sh	2012-02-27 17:38:35.000000000 +0000
+@@ -40,7 +40,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+-  SunOS | Linux | CYGWIN* )
++  SunOS | Linux | Darwin | CYGWIN* )
+     FS="/"
+     ;;
+   Windows* )
+--- old/test/jprt.config	2012-02-27 17:38:36.000000000 +0000
++++ /dev/null	2012-02-27 17:38:36.000000000 +0000
+@@ -1,159 +0,0 @@
+-#!echo "This is not a shell script"
+-#############################################################################
+-# Copyright (c) 2006, 2007, 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.
+-#############################################################################
+-#
+-# JPRT shell configuration for testing.
+-#
+-# Input environment variables:
+-#    Windows Only:
+-#      PATH
+-#      ROOTDIR
+-#
+-# Output variable settings:
+-#    make    Full path to GNU make
+-#
+-# Output environment variables:
+-#    PATH
+-#
+-#############################################################################
+-
+-#############################################################################
+-# Error
+-error() # message
+-{
+-  echo "ERROR: $1"
+-  exit 6
+-}
+-# Directory must exist
+-dirMustExist() # dir name
+-{
+-  if [ ! -d "$1" ] ; then
+-    error "Directory for $2 does not exist: $1"
+-  fi
+-}
+-# File must exist
+-fileMustExist() # dir name
+-{
+-  if [ ! -f "$1" ] ; then
+-    error "File for $2 does not exist: $1"
+-  fi
+-}
+-#############################################################################
+-
+-# Should be set by JPRT as the 3 basic inputs
+-slashjava="${ALT_SLASH_JAVA}"
+-if [ "${slashjava}" = "" ] ; then
+-  slashjava=/java
+-fi
+-
+-# Check input
+-dirMustExist "${slashjava}"  ALT_SLASH_JAVA
+-
+-# Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
+-osname=`uname -s`
+-if [ "${osname}" = SunOS ] ; then
+-   
+-    # SOLARIS: Sparc or X86
+-    osarch=`uname -p`
+-    if [ "${osarch}" = sparc ] ; then
+-	solaris_arch=sparc
+-    else
+-	solaris_arch=i386
+-    fi
+-
+-    # Add basic solaris system paths
+-    path4sdk=/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin
+-
+-    # Find GNU make
+-    make=/usr/sfw/bin/gmake
+-    if [ ! -f ${make} ] ; then
+-	make=/opt/sfw/bin/gmake
+-	if [ ! -f ${make} ] ; then
+-	    make=${slashjava}/devtools/${solaris_arch}/bin/gnumake
+-        fi 
+-    fi
+-    fileMustExist "${make}" make
+-
+-    # File creation mask
+-    umask 002
+-
+-elif [ "${osname}" = Linux ] ; then
+-   
+-    # Add basic paths
+-    path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
+-
+-    # Find GNU make
+-    make=/usr/bin/make
+-    fileMustExist "${make}" make
+-
+-    umask 002
+-
+-else
+-
+-    # Windows: Differs on CYGWIN vs. MKS.
+-   
+-    # We need to determine if we are running a CYGWIN shell or an MKS shell
+-    #    (if uname isn't available, then it will be unix_toolset=unknown)
+-    unix_toolset=unknown
+-    if [ "`uname -a | fgrep Cygwin`" = "" -a -d "${ROOTDIR}" ] ; then
+-        # We kind of assume ROOTDIR is where MKS is and it's ok
+-        unix_toolset=MKS
+-        mkshome=`dosname -s "${ROOTDIR}"`
+-        # Most unix utilities are in the mksnt directory of ROOTDIR
+-        unixcommand_path="${mkshome}/mksnt"
+-        path4sdk="${unixcommand_path}"
+-	devtools_path="${slashjava}/devtools/win32/bin"
+-	path4sdk="${devtools_path};${path4sdk}"
+-        # Find GNU make
+-        make="${devtools_path}/gnumake.exe"
+-        fileMustExist "${make}" make
+-    elif [ "`uname -a | fgrep Cygwin`" != "" -a -f /bin/cygpath ] ; then
+-        # For CYGWIN, uname will have "Cygwin" in it, and /bin/cygpath should exist
+-        unix_toolset=CYGWIN
+-        # Most unix utilities are in the /usr/bin
+-        unixcommand_path="/usr/bin"
+-        path4sdk="${unixcommand_path}"
+-        # Find GNU make
+-        make="${unixcommand_path}/make.exe"
+-        fileMustExist "${make}" make
+-    else
+-      echo "WARNING: Cannot figure out if this is MKS or CYGWIN"
+-    fi
+-
+-    
+-    # For windows, it's hard to know where the system is, so we just add this
+-    #    to PATH.
+-    slash_path="`echo ${path4sdk} | sed -e 's@\\\\@/@g' -e 's@//@/@g' -e 's@/$@@' -e 's@/;@;@g'`"
+-    path4sdk="${slash_path};${PATH}"
+-    
+-    # Convert path4sdk to cygwin style
+-    if [ "${unix_toolset}" = CYGWIN ] ; then
+-	path4sdk="`/usr/bin/cygpath -p ${path4sdk}`"
+-    fi
+-
+-fi
+-
+-# Export PATH setting
+-PATH="${path4sdk}"
+-export PATH
+-
--- a/series	Fri Sep 09 16:44:34 2011 -0700
+++ b/series	Thu Mar 01 00:18:30 2012 -0800
@@ -1,13 +1,13 @@
-# base = 5df63fd8fa64 in http://hg.openjdk.java.net/hsx/hotspot-comp/langtools [2011-09-01]
+# base = fba3cbee0fa3 in http://hg.openjdk.java.net/hsx/hotspot-comp/langtools [2012-02-16]
 
-jdk7-b147-to-bsd-port.patch     #+bsd-port #+5df63fd8fa64
+macosx-7113349.patch            #-/macosx #+fba3cbee0fa3
 
 compile-error-tweak.patch       #+compile-error-tweak
 netbeans-project.patch          #+netbeans-project
 dump-stack-on-error.patch       #+dump-stack-on-error
 
 # non-pushed files are under review or development, or merely experimental:
-#meth.patch                     #-/meth #+5df63fd8fa64
+#meth.patch                     #-/meth #+fba3cbee0fa3
 indy-bsm-6964498.patch          #-/meth #+cfc480e5499d #-/experimental #-testable
 indy-args-6984311.patch         #-/indy #+cfc480e5499d #-/experimental #-testable
 meth-ldc-6939203.patch          #-/meth #+cfc480e5499d #-/experimental #-testable