Merge

.hgtags-top-repo

@@ -294,3 +294,4 @@ b6cca3e6175a69f39e5799b7349ddb0176630291 jdk9-b47
 d91ed1951b948210590ce1394bea5515357246ba jdk9-b49
 d1f37d39ff2421f956a6ddf316cf763807bc3363 jdk9-b50
 6207b4b8731ca75c51b031c47daa813ab92ef558 jdk9-b51
+1822e59f17121b09e7899cf338cfb6e37fe5fceb jdk9-b52

common/autoconf/basics.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, 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
@@ -77,26 +77,30 @@ AC_DEFUN([BASIC_PREPEND_TO_PATH],
 # $1: The name of the variable to fix
 AC_DEFUN([BASIC_FIXUP_PATH],
 [
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+  # Only process if variable expands to non-empty
-    BASIC_FIXUP_PATH_CYGWIN($1)
+  
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+  if test "x[$]$1" != x; then
-    BASIC_FIXUP_PATH_MSYS($1)
+    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-  else
+      BASIC_FIXUP_PATH_CYGWIN($1)
-    # We're on a unix platform. Hooray! :)
+    elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    path="[$]$1"
+      BASIC_FIXUP_PATH_MSYS($1)
-    has_space=`$ECHO "$path" | $GREP " "`
+    else
-    if test "x$has_space" != x; then
+      # We're on a unix platform. Hooray! :)
-      AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.])
+      path="[$]$1"
-      AC_MSG_ERROR([Spaces are not allowed in this path.])
+      has_space=`$ECHO "$path" | $GREP " "`
-    fi
+      if test "x$has_space" != x; then
+        AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.])
+        AC_MSG_ERROR([Spaces are not allowed in this path.])
+      fi
 
-    # Use eval to expand a potential ~
+      # Use eval to expand a potential ~
-    eval path="$path"
+      eval path="$path"
-    if test ! -f "$path" && test ! -d "$path"; then
+      if test ! -f "$path" && test ! -d "$path"; then
-      AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.])
+        AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.])
-    fi
+      fi
 
-    $1="`cd "$path"; $THEPWDCMD -L`"
+      $1="`cd "$path"; $THEPWDCMD -L`"
+    fi
   fi
 ])
 
@@ -113,57 +117,61 @@ AC_DEFUN([BASIC_FIXUP_PATH],
 # $1: The name of the variable to fix
 AC_DEFUN([BASIC_FIXUP_EXECUTABLE],
 [
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+  # Only process if variable expands to non-empty
-    BASIC_FIXUP_EXECUTABLE_CYGWIN($1)
+  
-  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+  if test "x[$]$1" != x; then
-    BASIC_FIXUP_EXECUTABLE_MSYS($1)
+    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-  else
+      BASIC_FIXUP_EXECUTABLE_CYGWIN($1)
-    # We're on a unix platform. Hooray! :)
+    elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-    # First separate the path from the arguments. This will split at the first
+      BASIC_FIXUP_EXECUTABLE_MSYS($1)
-    # space.
-    complete="[$]$1"
-    path="${complete%% *}"
-    tmp="$complete EOL"
-    arguments="${tmp#* }"
-
-    # Cannot rely on the command "which" here since it doesn't always work.
-    is_absolute_path=`$ECHO "$path" | $GREP ^/`
-    if test -z "$is_absolute_path"; then
-      # Path to executable is not absolute. Find it.
-      IFS_save="$IFS"
-      IFS=:
-      for p in $PATH; do
-        if test -f "$p/$path" && test -x "$p/$path"; then
-          new_path="$p/$path"
-          break
-        fi
-      done
-      IFS="$IFS_save"
     else
-      # This is an absolute path, we can use it without further modifications.
+      # We're on a unix platform. Hooray! :)
-      new_path="$path"
+      # First separate the path from the arguments. This will split at the first
-    fi
+      # space.
+      complete="[$]$1"
+      path="${complete%% *}"
+      tmp="$complete EOL"
+      arguments="${tmp#* }"
 
-    if test "x$new_path" = x; then
+      # Cannot rely on the command "which" here since it doesn't always work.
-      AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.])
+      is_absolute_path=`$ECHO "$path" | $GREP ^/`
-      has_space=`$ECHO "$complete" | $GREP " "`
+      if test -z "$is_absolute_path"; then
-      if test "x$has_space" != x; then
+        # Path to executable is not absolute. Find it.
-        AC_MSG_NOTICE([This might be caused by spaces in the path, which is not allowed.])
+        IFS_save="$IFS"
+        IFS=:
+        for p in $PATH; do
+          if test -f "$p/$path" && test -x "$p/$path"; then
+            new_path="$p/$path"
+            break
+          fi
+        done
+        IFS="$IFS_save"
+      else
+        # This is an absolute path, we can use it without further modifications.
+        new_path="$path"
+      fi
+
+      if test "x$new_path" = x; then
+        AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.])
+        has_space=`$ECHO "$complete" | $GREP " "`
+        if test "x$has_space" != x; then
+          AC_MSG_NOTICE([This might be caused by spaces in the path, which is not allowed.])
+        fi
+        AC_MSG_ERROR([Cannot locate the the path of $1])
       fi
-      AC_MSG_ERROR([Cannot locate the the path of $1])
     fi
-  fi
 
-  # Now join together the path and the arguments once again
+    # Now join together the path and the arguments once again
-  if test "x$arguments" != xEOL; then
+    if test "x$arguments" != xEOL; then
-    new_complete="$new_path ${arguments% *}"
+      new_complete="$new_path ${arguments% *}"
-  else
+    else
-    new_complete="$new_path"
+      new_complete="$new_path"
-  fi
+    fi
 
-  if test "x$complete" != "x$new_complete"; then
+    if test "x$complete" != "x$new_complete"; then
-    $1="$new_complete"
+      $1="$new_complete"
-    AC_MSG_NOTICE([Rewriting $1 to "$new_complete"])
+      AC_MSG_NOTICE([Rewriting $1 to "$new_complete"])
+    fi
   fi
 ])
 

common/autoconf/toolchain_windows.m4

@@ -351,18 +351,34 @@ AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
       IFS=";"
       for i in $VS_INCLUDE; do
         ipath=$i
-	IFS="$OLDIFS"
+        # Only process non-empty elements
-        BASIC_FIXUP_PATH([ipath])
+        if test "x$ipath" != x; then
-	IFS=";"
+          IFS="$OLDIFS"
-      	SYSROOT_CFLAGS="$SYSROOT_CFLAGS -I$ipath"
+          # Check that directory exists before calling fixup_path
+          testpath=$ipath
+          BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
+          if test -d "$testpath"; then
+            BASIC_FIXUP_PATH([ipath])
+            SYSROOT_CFLAGS="$SYSROOT_CFLAGS -I$ipath"
+          fi
+          IFS=";"
+        fi
       done
       # Convert VS_LIB into SYSROOT_LDFLAGS
       for i in $VS_LIB; do
         libpath=$i
-	IFS="$OLDIFS"
+        # Only process non-empty elements
-        BASIC_FIXUP_PATH([libpath])
+        if test "x$libpath" != x; then
-	IFS=";"
+          IFS="$OLDIFS"
-      	SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS -libpath:$libpath"
+          # Check that directory exists before calling fixup_path
+          testpath=$libpath
+          BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
+          if test -d "$testpath"; then
+            BASIC_FIXUP_PATH([libpath])
+            SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS -libpath:$libpath"
+          fi
+          IFS=";"
+        fi
       done
       IFS="$OLDIFS"
     fi

common/bin/unshuffle_list.txt

@@ -180,7 +180,6 @@ jdk/src/java.base/share/classes/sun/nio/ch : jdk/src/share/classes/sun/nio/ch
 jdk/src/java.base/share/classes/sun/nio/cs : jdk/src/share/classes/sun/nio/cs
 jdk/src/java.base/share/classes/sun/nio/fs : jdk/src/share/classes/sun/nio/fs
 jdk/src/java.base/share/classes/sun/reflect : jdk/src/share/classes/sun/reflect
-jdk/src/java.base/share/classes/sun/security/acl : jdk/src/share/classes/sun/security/acl
 jdk/src/java.base/share/classes/sun/security/action : jdk/src/share/classes/sun/security/action
 jdk/src/java.base/share/classes/sun/security/internal : jdk/src/share/classes/sun/security/internal
 jdk/src/java.base/share/classes/sun/security/jca : jdk/src/share/classes/sun/security/jca

make/MakeHelpers.gmk

@@ -382,7 +382,7 @@ define DeclareRecipeForModuleMakefile
 	    && $(MAKE) $(MAKE_ARGS) \
 	          -f $$($1_FILE_PREFIX)-$2.gmk \
 	          $$(addprefix -I, $$(wildcard $$(addprefix $3/, $(MAKE_MAKEDIR_LIST)) \
-	          $$(addsuffix /$3, $$(addprefix $3/, $(MAKE_MAKEDIR_LIST))))) \
+	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(addprefix $3/, $(MAKE_MAKEDIR_LIST))))) \
 	          MODULE=$2)
         endif
 

make/common/CORE_PKGS.gmk

@@ -103,6 +103,7 @@ CORE_PKGS = \
     java.lang.reflect \
     java.math \
     java.net \
+    java.net.spi \
     java.nio \
     java.nio.channels \
     java.nio.channels.spi \

make/jprt.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2015, 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
@@ -86,7 +86,8 @@ jprt.build.configure.args=						\
     --with-output-sync=recurse 						\
     --with-boot-jdk=$ALT_BOOTDIR 					\
     --with-jobs=$ALT_PARALLEL_COMPILE_JOBS 				\
-    ${my.additional.build.configure.args.${jprt.test.set}}
+    ${my.additional.build.configure.args.${jprt.test.set}}		\
+    ${my.custom.build.configure.args}
 
 # i586 is often cross-compiled from 64-bit machines, so need to set target bits explicitly
 jprt.i586.build.configure.args=						\