# HG changeset patch
# User Greg Lewis <glewis@eyesbeyond.com>
# Date 1429475054 25200
# Node ID b31a9466cb2f4e7cea31e3c61eebff622c19ca08
# Parent  f1ffea3bd4a4df0f74ce0c127aeacf6bd11ee612# Parent  2c69e29c3a800db609360097fa6215915dc5fb08
Merge from main OpenJDK repository

diff -r f1ffea3bd4a4 -r b31a9466cb2f .hgtags
--- a/.hgtags	Fri Apr 10 09:22:56 2015 -0700
+++ b/.hgtags	Sun Apr 19 13:24:14 2015 -0700
@@ -123,6 +123,7 @@
 9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
 d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01
 58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147
+23aadf169f085b180803bcdc53baad4ae870f75b 7u0
 cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02
 82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03
 baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04
diff -r f1ffea3bd4a4 -r b31a9466cb2f make/build.xml
diff -r f1ffea3bd4a4 -r b31a9466cb2f src/share/classes/com/sun/tools/javah/Util.java
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/Makefile
--- a/test/Makefile	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/Makefile	Sun Apr 19 13:24:14 2015 -0700
@@ -42,6 +42,14 @@
     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
@@ -101,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
@@ -196,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 -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javac/4846262/Test.sh
--- a/test/tools/javac/4846262/Test.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javac/4846262/Test.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -44,7 +44,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | *BSD | Darwin )
     FS="/"
     ;;
   CYGWIN* )
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javac/6302184/T6302184.sh
--- a/test/tools/javac/6302184/T6302184.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javac/6302184/T6302184.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -41,7 +41,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | *BSD | Darwin )
     FS="/"
     ;;
   CYGWIN* )
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javac/ClassPathTest/ClassPathTest.sh
--- a/test/tools/javac/ClassPathTest/ClassPathTest.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javac/ClassPathTest/ClassPathTest.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -56,7 +56,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | *BSD | Darwin )
     FS="/"
     CHMOD="${FS}bin${FS}chmod"
     ;;
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javac/ExtDirs/ExtDirs.sh
--- a/test/tools/javac/ExtDirs/ExtDirs.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javac/ExtDirs/ExtDirs.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -54,7 +54,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | *BSD | Darwin )
     PS=":"
     FS="/"
     ;;
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javac/MissingInclude.sh
--- a/test/tools/javac/MissingInclude.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javac/MissingInclude.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -47,7 +47,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin | CYGWIN* )
+  SunOS | Linux | *BSD | Darwin | CYGWIN* )
     FS="/"
     ;;
   Windows* )
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh
--- a/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -52,7 +52,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | *BSD | Darwin )
     PS=":"
     FS="/"
     ;;
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javac/T5090006/compiler.sh
--- a/test/tools/javac/T5090006/compiler.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javac/T5090006/compiler.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -47,7 +47,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin | CYGWIN* )
+  SunOS | Linux | *BSD | Darwin | CYGWIN* )
     FS="/"
     ;;
   Windows* )
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javac/apt.sh
--- a/test/tools/javac/apt.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javac/apt.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -38,7 +38,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | *BSD | Darwin )
     NULL=/dev/null
     PS=":"
     FS="/"
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javac/constDebug/ConstDebug.sh
--- a/test/tools/javac/constDebug/ConstDebug.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javac/constDebug/ConstDebug.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -47,7 +47,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | *BSD | Darwin )
     PS=":"
     FS="/"
     ;;
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javac/fatalErrors/NoJavaLang.sh
--- a/test/tools/javac/fatalErrors/NoJavaLang.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javac/fatalErrors/NoJavaLang.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -48,7 +48,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | *BSD | Darwin )
     FS="/"
     ;;
   CYGWIN* )
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javac/innerClassFile/Driver.sh
--- a/test/tools/javac/innerClassFile/Driver.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javac/innerClassFile/Driver.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -53,7 +53,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin | CYGWIN* )
+  SunOS | Linux | *BSD | Darwin | CYGWIN* )
     FS="/"
     ;;
   Windows* )
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javac/javazip/Test.sh
--- a/test/tools/javac/javazip/Test.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javac/javazip/Test.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -41,7 +41,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | *BSD | Darwin )
     FS="/"
     SCR=`pwd`
     ;;
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javac/links/links.sh
--- a/test/tools/javac/links/links.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javac/links/links.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -53,7 +53,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | *BSD | Darwin )
     NULL=/dev/null
     PS=":"
     FS="/"
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javac/newlines/Newlines.sh
--- a/test/tools/javac/newlines/Newlines.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javac/newlines/Newlines.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -50,7 +50,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin | CYGWIN* )
+  SunOS | Linux | *BSD | Darwin | CYGWIN* )
     FS="/"
     ;;
   Windows* )
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javac/stackmap/T4955930.sh
--- a/test/tools/javac/stackmap/T4955930.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javac/stackmap/T4955930.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -41,7 +41,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin | CYGWIN* )
+  SunOS | Linux | *BSD | Darwin | CYGWIN* )
     FS="/"
     ;;
   Windows_95 | Windows_98 | Windows_NT )
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javac/unicode/SupplementaryJavaID6.sh
--- a/test/tools/javac/unicode/SupplementaryJavaID6.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javac/unicode/SupplementaryJavaID6.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -55,7 +55,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | *BSD )
     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"
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javah/6257087/foo.sh
--- a/test/tools/javah/6257087/foo.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javah/6257087/foo.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -41,7 +41,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | *BSD | Darwin )
     PS=":"
     FS="/"
     ;;
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javah/ConstMacroTest.sh
--- a/test/tools/javah/ConstMacroTest.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javah/ConstMacroTest.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -56,7 +56,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | *BSD | Darwin )
     PS=":"
     FS="/"
     ;;
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javah/MissingParamClassTest.sh
--- a/test/tools/javah/MissingParamClassTest.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javah/MissingParamClassTest.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -58,7 +58,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin | CYGWIN* )
+  SunOS | Linux | *BSD | Darwin | CYGWIN* )
     PS=":"
     FS="/"
     ;;
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javah/ReadOldClass.sh
--- a/test/tools/javah/ReadOldClass.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javah/ReadOldClass.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -43,7 +43,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin | CYGWIN* )
+  SunOS | Linux | *BSD | Darwin | CYGWIN* )
     PS=":"
     FS="/"
     ;;
diff -r f1ffea3bd4a4 -r b31a9466cb2f test/tools/javap/pathsep.sh
--- a/test/tools/javap/pathsep.sh	Fri Apr 10 09:22:56 2015 -0700
+++ b/test/tools/javap/pathsep.sh	Sun Apr 19 13:24:14 2015 -0700
@@ -40,7 +40,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin | CYGWIN* )
+  SunOS | Linux | *BSD | Darwin | CYGWIN* )
     FS="/"
     ;;
   Windows* )