changeset 81:c427d2032b13

rebase mlvm to hsx/hotspot-comp
author jrose
date Fri, 02 Sep 2011 00:52:32 -0700
parents 91e0550326a8
children 67de663d4ecb
files jdk7-b147-to-bsd-port.patch series
diffstat 2 files changed, 410 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk7-b147-to-bsd-port.patch	Fri Sep 02 00:52:32 2011 -0700
@@ -0,0 +1,406 @@
+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* )
--- a/series	Tue Jun 28 09:08:46 2011 -0700
+++ b/series	Fri Sep 02 00:52:32 2011 -0700
@@ -1,4 +1,6 @@
-# base = c6bbd2dc1701 in http://hg.openjdk.java.net/bsd-port/bsd-port/langtools [2011-06-27]
+# base = 469e3bec9b27 in http://hg.openjdk.java.net/hsx/hotspot-comp/langtools [2011-06-30]
+
+jdk7-b147-to-bsd-port.patch     #+bsd-port
 
 compile-error-tweak.patch       #+compile-error-tweak
 netbeans-project.patch          #+netbeans-project
@@ -7,7 +9,7 @@
 # pushed to jdk7/tl; will be deleted when they get to bsd-port:
 
 # non-pushed files are under review or development, or merely experimental:
-#meth.patch                     #-/meth #+c6bbd2dc1701
+#meth.patch                     #-/meth #+469e3bec9b27
 indy-bsm-6964498.patch          #-/meth #+cfc480e5499d #-/experimental #-testable
 indy-args-6984311.patch         #-/indy #+cfc480e5499d #-/experimental #-testable
 meth-ldc-6939203.patch          #-/meth #+cfc480e5499d #-/experimental #-testable