changeset 86:f4da9aff1281

rebase to current hsx/hotspot-comp; remove preview for 7113349
author jrose
date Mon, 26 Mar 2012 17:30:34 -0700
parents b5ed41bbffb4
children 23fbf92fa564
files compile-error-tweak.patch macosx-7113349.patch series
diffstat 3 files changed, 2 insertions(+), 485 deletions(-) [+]
line wrap: on
line diff
--- a/compile-error-tweak.patch	Thu Mar 01 01:08:21 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-There is a recurrent problem building javac in some environments.
-It is an import ambiguity, apparently due to small differences in compile-time classpath.
-Here is what the error looks like:
-|----------
-|.../langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java:896: reference to Version is ambiguous,
-|    both class com.sun.tools.javac.jvm.ClassFile.Version in com.sun.tools.javac.jvm.ClassFile
-|    and class com.sun.tools.javac.util.Version in com.sun.tools.javac.util match
-|        AttributeReader(Name name, Version version, Set<AttributeKind> kinds) {
-|                                   ^
-|.../langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java:909: reference to Version is ambiguous,
-|    both class com.sun.tools.javac.jvm.ClassFile.Version in com.sun.tools.javac.jvm.ClassFile
-|    and class com.sun.tools.javac.util.Version in com.sun.tools.javac.util match
-|        final Version version;
-|              ^
-|2 errors
-|----------
-This patch may be a useful workaround.
-
-diff --git a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
---- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
-+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
-@@ -54,6 +54,7 @@
- import static com.sun.tools.javac.code.TypeTags.*;
- import static com.sun.tools.javac.jvm.ClassFile.*;
- import static com.sun.tools.javac.jvm.ClassFile.Version.*;
-+import static com.sun.tools.javac.jvm.ClassFile.Version; // TEMPORARY
- 
- /** This class provides operations to read a classfile into an internal
-  *  representation. The internal representation is anchored in a
--- a/macosx-7113349.patch	Thu Mar 01 01:08:21 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,451 +0,0 @@
---- old/.hgignore	2012-02-29 22:11:38.000000000 +0000
-+++ new/.hgignore	2012-02-29 22:11:38.000000000 +0000
-@@ -2,3 +2,4 @@
- ^dist/
- /nbproject/private/
- ^.hgtip
-+.DS_Store
---- old/make/jprt.properties	2012-02-29 22:11:38.000000000 +0000
-+++ new/make/jprt.properties	2012-02-29 22:11:38.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-29 22:11:39.000000000 +0000
-+++ new/test/Makefile	2012-02-29 22:11:39.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-29 22:11:39.000000000 +0000
-+++ new/test/tools/javac/4846262/Test.sh	2012-02-29 22:11:39.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-29 22:11:40.000000000 +0000
-+++ new/test/tools/javac/6302184/T6302184.sh	2012-02-29 22:11:40.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-29 22:11:40.000000000 +0000
-+++ new/test/tools/javac/ClassPathTest/ClassPathTest.sh	2012-02-29 22:11:40.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-29 22:11:41.000000000 +0000
-+++ new/test/tools/javac/ExtDirs/ExtDirs.sh	2012-02-29 22:11:40.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-29 22:11:41.000000000 +0000
-+++ new/test/tools/javac/MissingInclude.sh	2012-02-29 22:11:41.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-29 22:11:42.000000000 +0000
-+++ new/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	2012-02-29 22:11:42.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-29 22:11:43.000000000 +0000
-+++ new/test/tools/javac/T5090006/compiler.sh	2012-02-29 22:11:42.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/constDebug/ConstDebug.sh	2012-02-29 22:11:43.000000000 +0000
-+++ new/test/tools/javac/constDebug/ConstDebug.sh	2012-02-29 22:11:43.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-29 22:11:44.000000000 +0000
-+++ new/test/tools/javac/fatalErrors/NoJavaLang.sh	2012-02-29 22:11:43.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-29 22:11:44.000000000 +0000
-+++ new/test/tools/javac/innerClassFile/Driver.sh	2012-02-29 22:11:44.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-29 22:11:45.000000000 +0000
-+++ new/test/tools/javac/javazip/Test.sh	2012-02-29 22:11:44.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-29 22:11:45.000000000 +0000
-+++ new/test/tools/javac/links/links.sh	2012-02-29 22:11:45.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-29 22:11:45.000000000 +0000
-+++ new/test/tools/javac/newlines/Newlines.sh	2012-02-29 22:11:45.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-29 22:11:46.000000000 +0000
-+++ new/test/tools/javac/stackmap/T4955930.sh	2012-02-29 22:11:46.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-29 22:11:46.000000000 +0000
-+++ new/test/tools/javac/unicode/SupplementaryJavaID6.sh	2012-02-29 22:11:46.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-29 22:11:47.000000000 +0000
-+++ new/test/tools/javah/6257087/foo.sh	2012-02-29 22:11:47.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-29 22:11:47.000000000 +0000
-+++ new/test/tools/javah/ConstMacroTest.sh	2012-02-29 22:11:47.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-29 22:11:48.000000000 +0000
-+++ new/test/tools/javah/MissingParamClassTest.sh	2012-02-29 22:11:48.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-29 22:11:48.000000000 +0000
-+++ new/test/tools/javah/ReadOldClass.sh	2012-02-29 22:11:48.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-29 22:11:49.000000000 +0000
-+++ new/test/tools/javap/pathsep.sh	2012-02-29 22:11:49.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-29 22:11:50.000000000 +0000
-+++ /dev/null	2012-02-29 22:11:50.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	Thu Mar 01 01:08:21 2012 -0800
+++ b/series	Mon Mar 26 17:30:34 2012 -0700
@@ -1,13 +1,10 @@
-# base = fba3cbee0fa3 in http://hg.openjdk.java.net/hsx/hotspot-comp/langtools [2012-02-16]
+# base = ebfe9b8ce039 in http://hg.openjdk.java.net/hsx/hotspot-comp/langtools [2012-03-22]
 
-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 #+fba3cbee0fa3
+#meth.patch                     #-/meth #+ebfe9b8ce039
 indy-bsm-6964498.patch          #-/meth #+cfc480e5499d #-/experimental #-testable
 indy-args-6984311.patch         #-/indy #+cfc480e5499d #-/experimental #-testable
 meth-ldc-6939203.patch          #-/meth #+cfc480e5499d #-/experimental #-testable