diff options
author | glewis <glewis@FreeBSD.org> | 2017-11-19 13:14:20 +0800 |
---|---|---|
committer | glewis <glewis@FreeBSD.org> | 2017-11-19 13:14:20 +0800 |
commit | fe3e442f685e77587c3858220b2a0e303b55066f (patch) | |
tree | 28030ccfa6212f673a392545ceb69cf603ca5c7a /java | |
parent | f19086b3e318bb02df3f07e12aa423fb0d733f94 (diff) | |
download | freebsd-ports-gnome-fe3e442f685e77587c3858220b2a0e303b55066f.tar.gz freebsd-ports-gnome-fe3e442f685e77587c3858220b2a0e303b55066f.tar.zst freebsd-ports-gnome-fe3e442f685e77587c3858220b2a0e303b55066f.zip |
. Update to 8u152.
Diffstat (limited to 'java')
-rw-r--r-- | java/openjdk8/Makefile | 7 | ||||
-rw-r--r-- | java/openjdk8/distinfo | 2 | ||||
-rw-r--r-- | java/openjdk8/files/patch-bsd | 1147 | ||||
-rw-r--r-- | java/openjdk8/files/patch-bsd-test | 475 |
4 files changed, 865 insertions, 766 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index ff01d070ca50..e4d143acb27f 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -29,7 +29,8 @@ PATCHFILES= patch-8u05-b13.xz \ patch-8u112-b16.xz \ patch-8u121-b13.xz \ patch-8u131-b11.xz \ - patch-8u144-b01.xz + patch-8u144-b01.xz \ + patch-8u152-b16.xz MAINTAINER= java@FreeBSD.org COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} @@ -202,8 +203,8 @@ NO_CCACHE= yes NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 144 -JDK_BUILD_NUMBER= 01 +JDK_UPDATE_VERSION= 152 +JDK_BUILD_NUMBER= 16 DIST_BUILD_NUMBER= 132 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo index c718dbe102a3..ae2cb90f6773 100644 --- a/java/openjdk8/distinfo +++ b/java/openjdk8/distinfo @@ -41,3 +41,5 @@ SHA256 (patch-8u131-b11.xz) = c0953d79f7e1b02ed75e6757ff170a144527af9b44f44cb36f SIZE (patch-8u131-b11.xz) = 88068 SHA256 (patch-8u144-b01.xz) = 4b4b73a345bc69085b712213ff55831e739cf43c9d0b87e77da91283e7c3520f SIZE (patch-8u144-b01.xz) = 239460 +SHA256 (patch-8u152-b16.xz) = 51c57b8d60b8f71758fe03c45c70ab60d0423bf4699e71b21ba4148f80497852 +SIZE (patch-8u152-b16.xz) = 454236 diff --git a/java/openjdk8/files/patch-bsd b/java/openjdk8/files/patch-bsd index 3d335920feaa..62fe84e63342 100644 --- a/java/openjdk8/files/patch-bsd +++ b/java/openjdk8/files/patch-bsd @@ -1,5 +1,5 @@ ---- ./common/autoconf/build-performance.m4 Tue Jul 11 23:50:55 2017 -0700 -+++ ./common/autoconf/build-performance.m4 Sat Aug 26 21:38:11 2017 -0700 +--- ./common/autoconf/build-performance.m4 Tue Sep 05 10:26:42 2017 -0700 ++++ ./common/autoconf/build-performance.m4 Sat Nov 18 14:38:54 2017 -0800 @@ -41,6 +41,10 @@ # Looks like a MacOSX system NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'` @@ -38,8 +38,8 @@ AC_MSG_RESULT([no, disabling ccache]) CCACHE= else ---- ./common/autoconf/generated-configure.sh Tue Jul 11 23:50:55 2017 -0700 -+++ ./common/autoconf/generated-configure.sh Sat Aug 26 21:38:11 2017 -0700 +--- ./common/autoconf/generated-configure.sh Tue Sep 05 10:26:42 2017 -0700 ++++ ./common/autoconf/generated-configure.sh Sat Nov 18 14:38:54 2017 -0800 @@ -646,6 +646,8 @@ LIBM LIBZIP_CAN_USE_MMAP @@ -49,7 +49,7 @@ USE_EXTERNAL_LIBGIF USE_EXTERNAL_LIBJPEG ALSA_LIBS -@@ -819,6 +821,7 @@ +@@ -824,6 +826,7 @@ JDK_MAJOR_VERSION USER_RELEASE_SUFFIX COMPRESS_JARS @@ -57,7 +57,7 @@ UNLIMITED_CRYPTO CACERTS_FILE TEST_IN_BUILD -@@ -895,6 +898,7 @@ +@@ -900,6 +903,7 @@ OPENJDK_TARGET_CPU_ARCH OPENJDK_TARGET_CPU OPENJDK_TARGET_OS_API @@ -65,7 +65,7 @@ OPENJDK_TARGET_OS OPENJDK_BUILD_CPU_ENDIAN OPENJDK_BUILD_CPU_BITS -@@ -1027,6 +1031,7 @@ +@@ -1032,6 +1036,7 @@ enable_hotspot_test_in_build with_cacerts_file enable_unlimited_crypto @@ -73,7 +73,7 @@ with_milestone with_update_version with_user_release_suffix -@@ -1053,6 +1058,7 @@ +@@ -1058,6 +1063,7 @@ with_extra_cflags with_extra_cxxflags with_extra_ldflags @@ -81,7 +81,7 @@ enable_debug_symbols enable_zip_debug_info enable_macosx_runtime_support -@@ -1729,6 +1735,7 @@ +@@ -1734,6 +1740,7 @@ run the Queens test after Hotspot build [disabled] --enable-unlimited-crypto Enable unlimited crypto policy [disabled] @@ -89,7 +89,7 @@ --disable-debug-symbols disable generation of debug symbols [enabled] --disable-zip-debug-info disable zipping of debug-info files [enabled] -@@ -1825,6 +1832,8 @@ +@@ -1830,6 +1837,8 @@ --with-extra-cflags extra flags to be used when compiling jdk c-files --with-extra-cxxflags extra flags to be used when compiling jdk c++-files --with-extra-ldflags extra flags to be used when linking jdk @@ -98,7 +98,7 @@ --with-x use the X Window System --with-cups specify prefix directory for the cups package (expecting the headers under PATH/include) -@@ -3672,7 +3681,7 @@ +@@ -3744,7 +3753,7 @@ # @@ -107,16 +107,7 @@ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it -@@ -3880,7 +3889,7 @@ - #CUSTOM_AUTOCONF_INCLUDE - - # Do not change or remove the following line, it is needed for consistency checks: --DATE_WHEN_GENERATED=1449096260 -+DATE_WHEN_GENERATED=1482096439 - - ############################################################################### - # -@@ -6808,11 +6817,27 @@ +@@ -6840,11 +6849,27 @@ as_fn_error $? "unsupported operating system $build_os" "$LINENO" 5 ;; esac @@ -145,7 +136,7 @@ VAR_CPU=x86_64 VAR_CPU_ARCH=x86 VAR_CPU_BITS=64 -@@ -6945,11 +6970,27 @@ +@@ -6977,11 +7002,27 @@ as_fn_error $? "unsupported operating system $host_os" "$LINENO" 5 ;; esac @@ -174,7 +165,7 @@ VAR_CPU=x86_64 VAR_CPU_ARCH=x86 VAR_CPU_BITS=64 -@@ -7022,6 +7063,7 @@ +@@ -7054,6 +7095,7 @@ # ... and setup our own variables. (Do this explicitely to facilitate searching) OPENJDK_TARGET_OS="$VAR_OS" @@ -182,7 +173,7 @@ OPENJDK_TARGET_OS_API="$VAR_OS_API" OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV" OPENJDK_TARGET_CPU="$VAR_CPU" -@@ -7035,6 +7077,7 @@ +@@ -7067,6 +7109,7 @@ @@ -190,7 +181,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target os-cpu" >&5 $as_echo_n "checking openjdk-target os-cpu... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&5 -@@ -7163,8 +7206,8 @@ +@@ -7195,8 +7238,8 @@ # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU" @@ -201,7 +192,7 @@ OPENJDK_TARGET_CPU_OSARCH="i386" elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then # On all platforms except macosx, we replace x86_64 with amd64. -@@ -7985,7 +8028,7 @@ +@@ -8017,7 +8060,7 @@ INCLUDE_SA=false fi if test "x$VAR_CPU" = xppc64 ; then @@ -210,7 +201,7 @@ fi if test "x$OPENJDK_TARGET_CPU" = xaarch64; then INCLUDE_SA=false -@@ -11174,6 +11217,24 @@ +@@ -11206,6 +11249,24 @@ ############################################################################### # @@ -235,7 +226,7 @@ # Enable or disable the elliptic curve crypto implementation # -@@ -19397,6 +19458,8 @@ +@@ -19429,6 +19490,8 @@ elif test "x$OPENJDK_TARGET_OS" = "xaix"; then # Do not probe for cc on AIX. COMPILER_CHECK_LIST="xlc_r" @@ -244,7 +235,7 @@ else COMPILER_CHECK_LIST="gcc cc" fi -@@ -20357,7 +20420,7 @@ +@@ -20389,7 +20452,7 @@ else COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1` # Check that this is likely to be GCC. @@ -253,7 +244,7 @@ if test $? -ne 0; then { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&5 $as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&6;} -@@ -21958,7 +22021,7 @@ +@@ -21991,7 +22054,7 @@ else COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1` # Check that this is likely to be GCC. @@ -262,7 +253,7 @@ if test $? -ne 0; then { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&5 $as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler." >&6;} -@@ -27965,7 +28028,7 @@ +@@ -28026,7 +28089,7 @@ # objcopy is used for moving debug symbols to separate files when # full debug symbols are enabled. @@ -271,7 +262,7 @@ if test -n "$ac_tool_prefix"; then for ac_prog in gobjcopy objcopy do -@@ -29322,8 +29385,10 @@ +@@ -29383,8 +29446,10 @@ SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1' SET_SHARED_LIBRARY_MAPFILE='' SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.' @@ -283,17 +274,17 @@ fi else if test "x$OPENJDK_TARGET_OS" = xsolaris; then -@@ -29667,7 +29732,7 @@ +@@ -29731,7 +29796,7 @@ # case $COMPILER_NAME in gcc ) -- CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \ -+ CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare \ +- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \ ++ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare \ -pipe \ -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" - case $OPENJDK_TARGET_CPU_ARCH in -@@ -29749,22 +29814,37 @@ - CCXXFLAGS_JDK="$CCXXFLAGS_JDK $ADD_LP64" + CXXSTD_CXXFLAG="-std=gnu++98" +@@ -30073,22 +30138,36 @@ + COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK $ADD_LP64" # The package path is used only on macosx? - PACKAGE_PATH=/opt/local @@ -321,7 +312,6 @@ + PACKAGE_PATH=/usr/local + fi + fi -+ if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then @@ -331,22 +321,22 @@ - # Note: -Dmacro is the same as #define macro 1 - # -Dmacro= is the same as #define macro - if test "x$OPENJDK_TARGET_OS" = xsolaris; then -- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN=" +- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN=" - else -- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN" +- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN" - fi - else -- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN" -+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_LITTLE_ENDIAN" +- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN" ++ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DVM_LITTLE_ENDIAN" + else -+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_BIG_ENDIAN" ++ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DVM_BIG_ENDIAN" fi if test "x$OPENJDK_TARGET_OS" = xlinux; then - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DLINUX" -@@ -29794,6 +29874,38 @@ + COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX" +@@ -30118,6 +30197,38 @@ fi if test "x$OPENJDK_TARGET_OS" = xbsd; then - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE" + COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE" + if test "`uname -s`" = "OpenBSD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld requires -z wxneeded" >&5 +$as_echo_n "checking if ld requires -z wxneeded... " >&6; } @@ -381,8 +371,8 @@ + fi fi if test "x$DEBUG_LEVEL" = xrelease; then - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DNDEBUG" -@@ -30261,11 +30373,18 @@ + COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DNDEBUG" +@@ -30640,11 +30751,18 @@ fi if test "x$OPENJDK_TARGET_OS" = xbsd; then @@ -406,7 +396,7 @@ fi if test "x$OPENJDK" = "xfalse"; then -@@ -30301,14 +30420,18 @@ +@@ -30680,14 +30798,18 @@ # --x-libraries for the sysroot, if that seems to be correct. if test "x$SYS_ROOT" != "x/"; then if test "x$x_includes" = xNONE; then @@ -427,7 +417,7 @@ x_libraries="$SYS_ROOT/usr/X11R6/lib" elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then x_libraries="$SYS_ROOT/usr/lib64" -@@ -31355,6 +31478,10 @@ +@@ -31734,6 +31856,10 @@ # A CSW package seems to be installed! CUPS_FOUND=yes CUPS_CFLAGS="-I/opt/csw/include" @@ -438,7 +428,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5 $as_echo "$CUPS_FOUND" >&6; } -@@ -34520,7 +34647,7 @@ +@@ -34899,7 +35025,7 @@ ############################################################################### # @@ -447,7 +437,7 @@ # # Check whether --with-alsa was given. -@@ -34928,15 +35055,66 @@ +@@ -35307,15 +35433,66 @@ if test "x${with_giflib}" = "xbundled"; then USE_EXTERNAL_LIBGIF=false @@ -519,7 +509,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifGetCode in -lgif" >&5 $as_echo_n "checking for DGifGetCode in -lgif... " >&6; } if ${ac_cv_lib_gif_DGifGetCode+:} false; then : -@@ -34974,16 +35152,96 @@ +@@ -35353,16 +35530,96 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_DGifGetCode" >&5 $as_echo "$ac_cv_lib_gif_DGifGetCode" >&6; } if test "x$ac_cv_lib_gif_DGifGetCode" = xyes; then : @@ -626,7 +616,7 @@ USE_EXTERNAL_LIBGIF=true else -@@ -34991,6 +35249,8 @@ +@@ -35370,6 +35627,8 @@ fi @@ -635,7 +625,7 @@ ############################################################################### # # Check for the zlib library -@@ -35558,6 +35818,11 @@ +@@ -35937,6 +36196,11 @@ LIBCXX="-lstdc++" fi @@ -647,7 +637,7 @@ -@@ -35631,6 +35896,10 @@ +@@ -36010,6 +36274,10 @@ # Looks like a MacOSX system NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print $5}'` FOUND_CORES=yes @@ -658,7 +648,7 @@ elif test "x$OPENJDK_BUILD_OS" = xaix ; then NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print $4 }'` FOUND_CORES=yes -@@ -35686,6 +35955,15 @@ +@@ -36065,6 +36333,15 @@ MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print $2}'` MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024` FOUND_MEM=yes @@ -674,7 +664,7 @@ elif test "x$OPENJDK_BUILD_OS" = xwindows; then # Windows, but without cygwin MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-` -@@ -36093,8 +36371,8 @@ +@@ -36472,8 +36749,8 @@ # precompiled headers. { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5 $as_echo_n "checking if ccache supports precompiled headers... " >&6; } @@ -685,8 +675,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5 $as_echo "no, disabling ccache" >&6; } CCACHE= ---- ./common/autoconf/jdk-options.m4 Tue Jul 11 23:50:55 2017 -0700 -+++ ./common/autoconf/jdk-options.m4 Sat Aug 26 21:38:11 2017 -0700 +--- ./common/autoconf/jdk-options.m4 Tue Sep 05 10:26:42 2017 -0700 ++++ ./common/autoconf/jdk-options.m4 Sat Nov 18 14:38:54 2017 -0800 @@ -159,7 +159,7 @@ INCLUDE_SA=false fi @@ -717,8 +707,8 @@ # Enable or disable the elliptic curve crypto implementation # AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC], ---- ./common/autoconf/libraries.m4 Tue Jul 11 23:50:55 2017 -0700 -+++ ./common/autoconf/libraries.m4 Sat Aug 26 21:38:11 2017 -0700 +--- ./common/autoconf/libraries.m4 Tue Sep 05 10:26:42 2017 -0700 ++++ ./common/autoconf/libraries.m4 Sat Nov 18 14:38:54 2017 -0800 @@ -69,9 +69,15 @@ fi @@ -856,8 +846,8 @@ + AC_SUBST(LIBCXX) ]) ---- ./common/autoconf/platform.m4 Tue Jul 11 23:50:55 2017 -0700 -+++ ./common/autoconf/platform.m4 Sat Aug 26 21:38:11 2017 -0700 +--- ./common/autoconf/platform.m4 Tue Sep 05 10:26:42 2017 -0700 ++++ ./common/autoconf/platform.m4 Sat Nov 18 14:38:54 2017 -0800 @@ -30,7 +30,7 @@ [ # First argument is the cpu name from the trip/quad @@ -917,8 +907,8 @@ OPENJDK_TARGET_CPU_OSARCH="i386" elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then # On all platforms except macosx, we replace x86_64 with amd64. ---- ./common/autoconf/spec.gmk.in Tue Jul 11 23:50:55 2017 -0700 -+++ ./common/autoconf/spec.gmk.in Sat Aug 26 21:38:11 2017 -0700 +--- ./common/autoconf/spec.gmk.in Tue Sep 05 10:26:42 2017 -0700 ++++ ./common/autoconf/spec.gmk.in Sat Nov 18 14:38:54 2017 -0800 @@ -76,6 +76,7 @@ OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@ OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@ @@ -946,7 +936,7 @@ # Necessary additional compiler flags to compile X11 X_CFLAGS:=@X_CFLAGS@ X_LIBS:=@X_LIBS@ -@@ -564,6 +568,8 @@ +@@ -568,6 +572,8 @@ ENABLE_INTREE_EC=@ENABLE_INTREE_EC@ USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@ USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@ @@ -955,9 +945,9 @@ USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@ LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@ MSVCR_DLL:=@MSVCR_DLL@ ---- ./common/autoconf/toolchain.m4 Tue Jul 11 23:50:55 2017 -0700 -+++ ./common/autoconf/toolchain.m4 Sat Aug 26 21:38:11 2017 -0700 -@@ -72,7 +72,7 @@ +--- ./common/autoconf/toolchain.m4 Tue Sep 05 10:26:42 2017 -0700 ++++ ./common/autoconf/toolchain.m4 Sat Nov 18 14:38:54 2017 -0800 +@@ -122,7 +122,7 @@ else COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1` # Check that this is likely to be GCC. @@ -966,7 +956,7 @@ if test $? -ne 0; then AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required GCC compiler.]) AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION_TEST"]) -@@ -350,6 +350,8 @@ +@@ -401,6 +401,8 @@ elif test "x$OPENJDK_TARGET_OS" = "xaix"; then # Do not probe for cc on AIX. COMPILER_CHECK_LIST="xlc_r" @@ -975,7 +965,7 @@ else COMPILER_CHECK_LIST="gcc cc" fi -@@ -571,7 +573,7 @@ +@@ -629,7 +631,7 @@ # objcopy is used for moving debug symbols to separate files when # full debug symbols are enabled. @@ -984,7 +974,7 @@ AC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy]) # Only call fixup if objcopy was found. if test -n "$OBJCOPY"; then -@@ -634,8 +636,10 @@ +@@ -692,8 +694,10 @@ SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/[$]1' SET_SHARED_LIBRARY_MAPFILE='' SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.' @@ -996,17 +986,17 @@ fi else if test "x$OPENJDK_TARGET_OS" = xsolaris; then -@@ -957,7 +961,7 @@ +@@ -1018,7 +1022,7 @@ # case $COMPILER_NAME in gcc ) -- CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \ -+ CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare \ +- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \ ++ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare \ -pipe \ -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" - case $OPENJDK_TARGET_CPU_ARCH in -@@ -1039,22 +1043,33 @@ - CCXXFLAGS_JDK="$CCXXFLAGS_JDK $ADD_LP64" + CXXSTD_CXXFLAG="-std=gnu++98" +@@ -1106,22 +1110,33 @@ + COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK $ADD_LP64" # The package path is used only on macosx? - PACKAGE_PATH=/opt/local @@ -1040,21 +1030,21 @@ - # Note: -Dmacro is the same as #define macro 1 - # -Dmacro= is the same as #define macro - if test "x$OPENJDK_TARGET_OS" = xsolaris; then -- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN=" +- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN=" - else -- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN" +- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_LITTLE_ENDIAN" - fi -+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_LITTLE_ENDIAN" ++ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DVM_LITTLE_ENDIAN" else -- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN" -+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_BIG_ENDIAN" +- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN" ++ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DVM_BIG_ENDIAN" fi if test "x$OPENJDK_TARGET_OS" = xlinux; then - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DLINUX" -@@ -1084,6 +1099,22 @@ + COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX" +@@ -1151,6 +1166,22 @@ fi if test "x$OPENJDK_TARGET_OS" = xbsd; then - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE" + COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE" + if test "`uname -s`" = "OpenBSD"; then + AC_MSG_CHECKING([if ld requires -z wxneeded]) + AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/mman.h> @@ -1073,17 +1063,17 @@ + fi fi if test "x$DEBUG_LEVEL" = xrelease; then - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DNDEBUG" ---- ./configure Tue Jul 11 23:50:55 2017 -0700 -+++ ./configure Sat Aug 26 21:38:11 2017 -0700 + COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DNDEBUG" +--- ./configure Tue Sep 05 10:26:42 2017 -0700 ++++ ./configure Sat Nov 18 14:38:54 2017 -0800 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ---- ./make/Javadoc.gmk Tue Jul 11 23:50:55 2017 -0700 -+++ ./make/Javadoc.gmk Sat Aug 26 21:38:11 2017 -0700 +--- ./make/Javadoc.gmk Tue Sep 05 10:26:42 2017 -0700 ++++ ./make/Javadoc.gmk Sat Nov 18 14:38:54 2017 -0800 @@ -46,8 +46,18 @@ BUILD_NUMBER=$(JDK_BUILD_NUMBER) @@ -1104,8 +1094,8 @@ -Djava.awt.headless=true \ $(NEW_JAVADOC) \ -bootclasspath $(JDK_OUTPUTDIR)/classes ---- ./make/Main.gmk Tue Jul 11 23:50:55 2017 -0700 -+++ ./make/Main.gmk Sat Aug 26 21:38:11 2017 -0700 +--- ./make/Main.gmk Tue Sep 05 10:26:42 2017 -0700 ++++ ./make/Main.gmk Sat Nov 18 14:38:54 2017 -0800 @@ -58,7 +58,11 @@ # Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line, @@ -1118,8 +1108,8 @@ ### Main targets ---- ./make/common/MakeBase.gmk Tue Jul 11 23:50:55 2017 -0700 -+++ ./make/common/MakeBase.gmk Sat Aug 26 21:38:11 2017 -0700 +--- ./make/common/MakeBase.gmk Tue Sep 05 10:26:42 2017 -0700 ++++ ./make/common/MakeBase.gmk Sat Nov 18 14:38:54 2017 -0800 @@ -338,7 +338,7 @@ # (and causing a crash on Cygwin). # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris. @@ -1140,8 +1130,8 @@ endef # Make directory without forking mkdir if not needed ---- ./make/common/NativeCompilation.gmk Tue Jul 11 23:50:55 2017 -0700 -+++ ./make/common/NativeCompilation.gmk Sat Aug 26 21:38:11 2017 -0700 +--- ./make/common/NativeCompilation.gmk Tue Sep 05 10:26:42 2017 -0700 ++++ ./make/common/NativeCompilation.gmk Sat Nov 18 14:38:54 2017 -0800 @@ -151,9 +151,9 @@ # CC the compiler to use, default is $(CC) # LDEXE the linker to use for linking executables, default is $(LDEXE) @@ -1155,8 +1145,8 @@ ifneq (,$$($1_BIN)) $$(error BIN has been replaced with OBJECT_DIR) ---- ./hotspot/agent/make/Makefile Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/agent/make/Makefile Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/agent/make/Makefile Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/agent/make/Makefile Sat Nov 18 14:40:44 2017 -0800 @@ -50,6 +50,7 @@ sun.jvm.hotspot.debugger.amd64 \ sun.jvm.hotspot.debugger.bsd \ @@ -1235,8 +1225,8 @@ sun/jvm/hotspot/runtime/solaris_amd64/*.java \ sun/jvm/hotspot/runtime/solaris_sparc/*.java \ sun/jvm/hotspot/runtime/solaris_x86/*.java \ ---- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Sat Nov 18 14:40:44 2017 -0800 @@ -42,6 +42,10 @@ #include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h" #endif @@ -1305,8 +1295,74 @@ (*env)->ReleaseLongArrayElements(env, array, regs, JNI_COMMIT); return array; ---- ./hotspot/agent/src/os/bsd/symtab.c Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/agent/src/os/bsd/symtab.c Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/agent/src/os/bsd/elfmacros.h Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/agent/src/os/bsd/elfmacros.h Sat Nov 18 14:40:44 2017 -0800 +@@ -34,6 +34,7 @@ + #define ELF_SYM Elf64_Sym + #define ELF_DYN Elf64_Dyn + #define ELF_ADDR Elf64_Addr ++#define ELF_AUXV Elf64_Auxinfo + + #ifndef ELF_ST_TYPE + #define ELF_ST_TYPE ELF64_ST_TYPE +@@ -47,6 +48,7 @@ + #define ELF_SYM Elf32_Sym + #define ELF_DYN Elf32_Dyn + #define ELF_ADDR Elf32_Addr ++#define ELF_AUXV Elf32_Auxinfo + + #ifndef ELF_ST_TYPE + #define ELF_ST_TYPE ELF32_ST_TYPE +--- ./hotspot/agent/src/os/bsd/ps_core.c Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/agent/src/os/bsd/ps_core.c Sat Nov 18 14:40:44 2017 -0800 +@@ -1091,6 +1091,18 @@ + if (core_handle_prstatus(ph, descdata, notep->n_descsz) != true) { + return false; + } ++ } else if (notep->n_type == NT_PROCSTAT_AUXV) { ++ // Get first segment from entry point ++ ELF_AUXV *auxv = (ELF_AUXV *)descdata; ++ while (auxv->a_type != AT_NULL) { ++ if (auxv->a_type == AT_ENTRY) { ++ // Set entry point address to address of dynamic section. ++ // We will adjust it in read_exec_segments(). ++ ph->core->dynamic_addr = auxv->a_un.a_val; ++ break; ++ } ++ auxv++; ++ } + } + p = descdata + ROUNDUP(notep->n_descsz, 4); + } +@@ -1272,7 +1284,13 @@ + + // from PT_DYNAMIC we want to read address of first link_map addr + case PT_DYNAMIC: { +- ph->core->dynamic_addr = exec_php->p_vaddr; ++ if (exec_ehdr->e_type == ET_EXEC) { ++ ph->core->dynamic_addr = exec_php->p_vaddr; ++ } else { // ET_DYN ++ // dynamic_addr has entry point of executable. ++ // Thus we should substract it. ++ ph->core->dynamic_addr += exec_php->p_vaddr - exec_ehdr->e_entry; ++ } + print_debug("address of _DYNAMIC is 0x%lx\n", ph->core->dynamic_addr); + break; + } +@@ -1472,8 +1490,9 @@ + goto err; + } + +- if (read_elf_header(ph->core->exec_fd, &exec_ehdr) != true || exec_ehdr.e_type != ET_EXEC) { +- print_debug("executable file is not a valid ELF ET_EXEC file\n"); ++ if (read_elf_header(ph->core->exec_fd, &exec_ehdr) != true || ++ ((exec_ehdr.e_type != ET_EXEC) && (exec_ehdr.e_type != ET_DYN))) { ++ print_debug("executable file is not a valid ELF file\n"); + goto err; + } + +--- ./hotspot/agent/src/os/bsd/symtab.c Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/agent/src/os/bsd/symtab.c Sat Nov 18 14:40:44 2017 -0800 @@ -211,6 +211,10 @@ // Reading of elf header @@ -1347,8 +1403,8 @@ key.data = sym_name; key.size = strlen(sym_name) + 1; ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sat Nov 18 14:40:44 2017 -0800 @@ -33,6 +33,7 @@ import sun.jvm.hotspot.debugger.JVMDebugger; import sun.jvm.hotspot.debugger.MachineDescription; @@ -1367,7 +1423,7 @@ if (LinuxDebuggerLocal.getAddressSize()==8) { machDesc = new MachineDescriptionSPARC64Bit(); --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1412,8 +1468,8 @@ + return false; + } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Sat Nov 18 14:40:44 2017 -0800 @@ -30,8 +30,10 @@ import sun.jvm.hotspot.debugger.cdbg.*; import sun.jvm.hotspot.debugger.x86.*; @@ -1439,8 +1495,8 @@ } else { throw new DebuggerException(cpu + " is not yet supported"); } ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Sat Nov 18 14:40:44 2017 -0800 @@ -27,6 +27,7 @@ import sun.jvm.hotspot.debugger.*; import sun.jvm.hotspot.debugger.bsd.amd64.*; @@ -1459,7 +1515,7 @@ throw new RuntimeException("cpu " + cpu + " is not yet supported"); } --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1541,7 +1597,7 @@ + private BsdDebugger dbg; +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1590,7 +1646,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1715,8 +1771,8 @@ + public abstract Address getRegisterAsAddress(int index); + +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Sat Nov 18 14:40:44 2017 -0800 @@ -32,7 +32,9 @@ import sun.jvm.hotspot.debugger.cdbg.*; import sun.jvm.hotspot.debugger.proc.amd64.*; @@ -1739,7 +1795,7 @@ try { Class tfc = Class.forName("sun.jvm.hotspot.debugger.proc." + --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1828,7 +1884,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1877,7 +1933,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1923,8 +1979,8 @@ + return new ProcPPC64Thread(debugger, id); + } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Sat Nov 18 14:40:44 2017 -0800 @@ -33,6 +33,7 @@ import sun.jvm.hotspot.debugger.remote.sparc.*; import sun.jvm.hotspot.debugger.remote.x86.*; @@ -1946,7 +2002,7 @@ try { Class tf = Class.forName("sun.jvm.hotspot.debugger.remote." + --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2002,7 +2058,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2055,7 +2111,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2101,8 +2157,8 @@ + return new RemotePPC64Thread(debugger, id); + } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Sat Nov 18 14:40:44 2017 -0800 @@ -37,6 +37,7 @@ import sun.jvm.hotspot.runtime.linux_sparc.LinuxSPARCJavaThreadPDAccess; import sun.jvm.hotspot.runtime.bsd_x86.BsdX86JavaThreadPDAccess; @@ -2121,7 +2177,7 @@ } else if (os.equals("darwin")) { if (cpu.equals("amd64") || cpu.equals("x86_64")) { --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ppc64/BsdPPC64JavaThreadPDAccess.java Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ppc64/BsdPPC64JavaThreadPDAccess.java Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2256,7 +2312,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,176 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2435,7 +2491,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,508 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2946,7 +3002,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2992,7 +3048,7 @@ + +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,51 @@ +/* + * Copyright (c) 20014, Oracle and/or its affiliates. All rights reserved. @@ -3045,8 +3101,8 @@ + protected void initializeFromPD(RegisterMap map) {} + protected Address getLocationPD(VMReg reg) { return null; } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Sat Nov 18 14:40:44 2017 -0800 @@ -61,7 +61,7 @@ return "x86"; } else if (cpu.equals("sparc") || cpu.equals("sparcv9")) { @@ -3056,8 +3112,8 @@ return cpu; } else { try { ---- ./hotspot/make/bsd/Makefile Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/make/bsd/Makefile Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/make/bsd/Makefile Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/make/bsd/Makefile Sat Nov 18 14:40:44 2017 -0800 @@ -66,6 +66,10 @@ FORCE_TIERED=1 endif @@ -3069,8 +3125,8 @@ ifdef LP64 ifeq ("$(filter $(LP64_ARCH),$(BUILDARCH))","") ---- ./hotspot/make/bsd/makefiles/build_vm_def.sh Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/make/bsd/makefiles/build_vm_def.sh Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sat Nov 18 14:40:44 2017 -0800 @@ -1,12 +1,28 @@ #!/bin/sh @@ -3106,8 +3162,8 @@ + if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";" + }' | sort -u ;; +esac ---- ./hotspot/make/bsd/makefiles/debug.make Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/make/bsd/makefiles/debug.make Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/make/bsd/makefiles/debug.make Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/debug.make Sat Nov 18 14:40:44 2017 -0800 @@ -35,7 +35,10 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -3120,8 +3176,8 @@ VERSION = debug SYSDEFS += -DASSERT ---- ./hotspot/make/bsd/makefiles/defs.make Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/make/bsd/makefiles/defs.make Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/make/bsd/makefiles/defs.make Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/defs.make Sat Nov 18 14:40:44 2017 -0800 @@ -29,7 +29,15 @@ SLASH_JAVA ?= /java @@ -3220,8 +3276,8 @@ ADD_SA_BINARIES/ia64 = ADD_SA_BINARIES/arm = ADD_SA_BINARIES/zero = ---- ./hotspot/make/bsd/makefiles/fastdebug.make Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/make/bsd/makefiles/fastdebug.make Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/make/bsd/makefiles/fastdebug.make Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/fastdebug.make Sat Nov 18 14:40:44 2017 -0800 @@ -56,7 +56,10 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -3234,8 +3290,8 @@ VERSION = fastdebug SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS ---- ./hotspot/make/bsd/makefiles/gcc.make Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/make/bsd/makefiles/gcc.make Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/make/bsd/makefiles/gcc.make Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/gcc.make Sat Nov 18 14:40:44 2017 -0800 @@ -168,6 +168,9 @@ CFLAGS += -DDONT_USE_PRECOMPILED_HEADER endif @@ -3363,7 +3419,7 @@ endif --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/makefiles/launcher.make Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/launcher.make Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,117 @@ +# +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. @@ -3482,8 +3538,8 @@ + $(QUIETLY) sed -e 's/@@LIBARCH@@/$(LIBARCH)/g' $< > $@ + $(QUIETLY) chmod +x $@ + ---- ./hotspot/make/bsd/makefiles/mapfile-vers-debug Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/make/bsd/makefiles/mapfile-vers-debug Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug Sat Nov 18 14:40:44 2017 -0800 @@ -21,246 +21,254 @@ # questions. # @@ -3971,7 +4027,7 @@ + *; +}; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,266 @@ +# +# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. @@ -4239,8 +4295,8 @@ + + # INSERT VTABLE SYMBOLS HERE + ---- ./hotspot/make/bsd/makefiles/mapfile-vers-product Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/make/bsd/makefiles/mapfile-vers-product Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sat Nov 18 14:40:44 2017 -0800 @@ -21,241 +21,249 @@ # questions. # @@ -4719,7 +4775,7 @@ + *; +}; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,261 @@ +# +# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. @@ -4982,8 +5038,8 @@ + + # INSERT VTABLE SYMBOLS HERE + ---- ./hotspot/make/bsd/makefiles/optimized.make Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/make/bsd/makefiles/optimized.make Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/make/bsd/makefiles/optimized.make Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/optimized.make Sat Nov 18 14:40:44 2017 -0800 @@ -38,6 +38,9 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -4996,7 +5052,7 @@ VERSION = optimized --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/makefiles/ppc64.make Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/ppc64.make Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,51 @@ +# +# Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. @@ -5049,8 +5105,8 @@ + # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI. + CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string +endif ---- ./hotspot/make/bsd/makefiles/product.make Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/make/bsd/makefiles/product.make Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/make/bsd/makefiles/product.make Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/product.make Sat Nov 18 14:40:44 2017 -0800 @@ -38,7 +38,10 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -5063,8 +5119,8 @@ SYSDEFS += -DPRODUCT VERSION = optimized ---- ./hotspot/make/bsd/makefiles/rules.make Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/make/bsd/makefiles/rules.make Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/make/bsd/makefiles/rules.make Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/rules.make Sat Nov 18 14:40:44 2017 -0800 @@ -34,7 +34,7 @@ CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS) CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS) @@ -5074,8 +5130,8 @@ COMPILE.CC = $(CC_COMPILE) -c GENASM.CC = $(CC_COMPILE) -S ---- ./hotspot/make/bsd/makefiles/sa.make Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/make/bsd/makefiles/sa.make Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/make/bsd/makefiles/sa.make Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/sa.make Sat Nov 18 14:40:44 2017 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. @@ -5190,8 +5246,8 @@ rm -rf $(AGENT_FILES_LIST) + +-include $(HS_ALT_MAKE)/bsd/makefiles/sa-rules.make ---- ./hotspot/make/bsd/makefiles/saproc.make Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/make/bsd/makefiles/saproc.make Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/make/bsd/makefiles/saproc.make Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/saproc.make Sat Nov 18 14:40:44 2017 -0800 @@ -99,10 +99,10 @@ endif @@ -5231,8 +5287,8 @@ + cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done" .PHONY: install_saproc ---- ./hotspot/make/bsd/makefiles/vm.make Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/make/bsd/makefiles/vm.make Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/make/bsd/makefiles/vm.make Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/make/bsd/makefiles/vm.make Sat Nov 18 14:40:44 2017 -0800 @@ -107,7 +107,7 @@ # File specific flags CXXFLAGS += $(CXXFLAGS/BYFILE) @@ -5243,7 +5299,7 @@ endif --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/platform_ppc64 Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/make/bsd/platform_ppc64 Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,17 @@ +os_family = bsd + @@ -5262,8 +5318,8 @@ +gnu_dis_arch = ppc64 + +sysdefs = -DBSD -D_ALLBSD_SOURCE -D_GNU_SOURCE -DPPC64 ---- ./hotspot/make/sa.files Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/make/sa.files Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/make/sa.files Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/make/sa.files Sat Nov 18 14:40:44 2017 -0800 @@ -45,6 +45,7 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/amd64/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/*.java \ @@ -5304,8 +5360,8 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/jcore/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/soql/*.java \ ---- ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -277,5 +277,9 @@ #if defined(TARGET_OS_ARCH_linux_ppc) #include "bytes_linux_ppc.inline.hpp" @@ -5316,8 +5372,8 @@ + #endif // CPU_PPC_VM_BYTES_PPC_HPP ---- ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -307,6 +307,8 @@ // Although AIX runs on big endian CPU, float is in most significant // word of an argument slot. @@ -5327,8 +5383,8 @@ #else #error "unknown OS" #endif ---- ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -778,6 +778,8 @@ // Although AIX runs on big endian CPU, float is in the most // significant word of an argument slot. @@ -5338,8 +5394,8 @@ #else #error "unknown OS" #endif ---- ./hotspot/src/cpu/x86/vm/jni_x86.h Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/cpu/x86/vm/jni_x86.h Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/cpu/x86/vm/jni_x86.h Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/cpu/x86/vm/jni_x86.h Sat Nov 18 14:40:44 2017 -0800 @@ -34,7 +34,7 @@ #ifndef __has_attribute #define __has_attribute(x) 0 @@ -5349,8 +5405,8 @@ #define JNIEXPORT __attribute__((visibility("default"))) #define JNIIMPORT __attribute__((visibility("default"))) #else ---- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -2266,7 +2266,7 @@ if (!is_critical_native) { // reset handle block @@ -5360,8 +5416,8 @@ // Any exception pending? __ cmpptr(Address(thread, in_bytes(Thread::pending_exception_offset())), (int32_t)NULL_WORD); ---- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -23,9 +23,12 @@ */ @@ -5376,8 +5432,8 @@ #include "asm/macroAssembler.hpp" #include "asm/macroAssembler.inline.hpp" #include "code/debugInfoRec.hpp" ---- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -1293,7 +1293,7 @@ // reset handle block @@ -5387,8 +5443,8 @@ // If result was an oop then unbox and save it in the frame { Label L; ---- ./hotspot/src/cpu/x86/vm/x86_32.ad Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/cpu/x86/vm/x86_32.ad Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/cpu/x86/vm/x86_32.ad Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/cpu/x86/vm/x86_32.ad Sat Nov 18 14:40:44 2017 -0800 @@ -1250,6 +1250,7 @@ @@ -5397,8 +5453,8 @@ } #ifndef PRODUCT ---- ./hotspot/src/os/aix/vm/os_aix.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/os/aix/vm/os_aix.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/os/aix/vm/os_aix.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/os/aix/vm/os_aix.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -5236,6 +5236,10 @@ return 0; } @@ -5411,7 +5467,7 @@ } --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. @@ -5466,8 +5522,8 @@ + return false; +} +#endif ---- ./hotspot/src/os/bsd/vm/jsig.c Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/os/bsd/vm/jsig.c Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/os/bsd/vm/jsig.c Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/os/bsd/vm/jsig.c Sat Nov 18 14:40:44 2017 -0800 @@ -165,9 +165,8 @@ } @@ -5480,8 +5536,8 @@ static int call_os_sigaction(int sig, const struct sigaction *act, struct sigaction *oact) { ---- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -50,6 +50,7 @@ case INTERRUPT_SIGNAL: case SIGFPE: @@ -5591,8 +5647,8 @@ + jio_snprintf(buf, len, "SIG%s", signame); + return true; } ---- ./hotspot/src/os/bsd/vm/jvm_bsd.h Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/os/bsd/vm/jvm_bsd.h Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/os/bsd/vm/jvm_bsd.h Sat Nov 18 14:40:44 2017 -0800 @@ -112,20 +112,6 @@ #define SHUTDOWN2_SIGNAL SIGINT #define SHUTDOWN3_SIGNAL SIGTERM @@ -5614,8 +5670,8 @@ #endif /* JVM_MD_H */ #endif // OS_BSD_VM_JVM_BSD_H ---- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -30,7 +30,7 @@ void OSThread::pd_initialize() { @@ -5625,8 +5681,8 @@ _thread_id = 0; #else _thread_id = NULL; ---- ./hotspot/src/os/bsd/vm/os_bsd.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/os/bsd/vm/os_bsd.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -97,16 +97,31 @@ # include <sys/shm.h> #ifndef __APPLE__ @@ -6430,8 +6486,8 @@ } #ifndef PRODUCT ---- ./hotspot/src/os/bsd/vm/os_bsd.hpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/os/bsd/vm/os_bsd.hpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -58,12 +58,16 @@ // For signal flags diagnostics static int sigflags[MAXSIGNUM]; @@ -6520,8 +6576,8 @@ } }; ---- ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -33,30 +33,50 @@ #include <sys/syscall.h> #include <unistd.h> @@ -6583,9 +6639,9 @@ os::fork_and_exec(buf); yes = false; } ---- ./hotspot/src/os/linux/vm/os_linux.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/os/linux/vm/os_linux.cpp Sat Aug 26 21:38:23 2017 -0700 -@@ -6199,6 +6199,10 @@ +--- ./hotspot/src/os/linux/vm/os_linux.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/os/linux/vm/os_linux.cpp Sat Nov 18 14:40:44 2017 -0800 +@@ -6279,6 +6279,10 @@ return 0; } @@ -6596,8 +6652,8 @@ return strlen(buffer); } ---- ./hotspot/src/os/posix/vm/os_posix.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/os/posix/vm/os_posix.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/os/posix/vm/os_posix.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/os/posix/vm/os_posix.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -53,12 +53,11 @@ n = get_core_path(buffer, bufferSize); @@ -6660,8 +6716,8 @@ // Linux specific #ifdef SI_TKILL { SI_TKILL, "SI_TKILL", "Signal sent by tkill (pthread_kill)" }, ---- ./hotspot/src/os/solaris/vm/os_solaris.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/os/solaris/vm/os_solaris.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/os/solaris/vm/os_solaris.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/os/solaris/vm/os_solaris.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -6375,6 +6375,10 @@ return 0; } @@ -6674,7 +6730,7 @@ } --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/atomic_bsd_ppc.inline.hpp Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/atomic_bsd_ppc.inline.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,400 @@ +/* + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7077,7 +7133,7 @@ + +#endif // OS_CPU_BSD_PPC_VM_ATOMIC_BSD_PPC_INLINE_HPP --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/bytes_bsd_ppc.inline.hpp Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/bytes_bsd_ppc.inline.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7119,7 +7175,7 @@ + +#endif // OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/globals_bsd_ppc.hpp Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/globals_bsd_ppc.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7176,7 +7232,7 @@ + +#endif // OS_CPU_BSD_PPC_VM_GLOBALS_BSD_PPC_HPP --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/orderAccess_bsd_ppc.inline.hpp Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/orderAccess_bsd_ppc.inline.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,149 @@ +/* + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7328,7 +7384,7 @@ + +#endif // OS_CPU_BSD_PPC_VM_ORDERACCESS_BSD_PPC_INLINE_HPP --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.cpp Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,666 @@ +/* + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7997,7 +8053,7 @@ +} +#endif --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.hpp Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8035,7 +8091,7 @@ + +#endif // OS_CPU_BSD_PPC_VM_OS_BSD_PPC_HPP --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/prefetch_bsd_ppc.inline.hpp Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/prefetch_bsd_ppc.inline.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8088,7 +8144,7 @@ + +#endif // OS_CPU_BSD_PPC_VM_PREFETCH_BSD_PPC_INLINE_HPP --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.cpp Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8130,7 +8186,7 @@ + os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread); +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.hpp Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8169,7 +8225,7 @@ + +#endif // OS_CPU_BSD_PPC_VM_THREADLS_BSD_PPC_HPP --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,36 @@ +/* + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8208,7 +8264,7 @@ + +void JavaThread::cache_global_variables() { } --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.hpp Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8294,7 +8350,7 @@ + +#endif // OS_CPU_BSD_PPC_VM_THREAD_BSD_PPC_HPP --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/vmStructs_bsd_ppc.hpp Sat Aug 26 21:38:23 2017 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/vmStructs_bsd_ppc.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8351,8 +8407,8 @@ +#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) + +#endif // OS_CPU_BSD_PPC_VM_VMSTRUCTS_BSD_PPC_HPP ---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -594,7 +594,11 @@ stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL); } @@ -8365,8 +8421,8 @@ thread->doing_unsafe_access()) { stub = StubRoutines::handler_for_unsafe_access(); } ---- ./hotspot/src/share/vm/opto/lcm.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/share/vm/opto/lcm.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/share/vm/opto/lcm.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/share/vm/opto/lcm.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -49,7 +49,7 @@ // Check whether val is not-null-decoded compressed oop, // i.e. will grab into the base of the heap if it represents NULL. @@ -8376,8 +8432,8 @@ if (val && val->is_Mach()) { if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) { // This assumes all Decodes with TypePtr::NotNull are matched to nodes that ---- ./hotspot/src/share/vm/opto/loopPredicate.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/share/vm/opto/loopPredicate.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/share/vm/opto/loopPredicate.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/share/vm/opto/loopPredicate.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -869,7 +869,7 @@ Node* idx = cmp->in(1); assert(!invar.is_invariant(idx), "index is variant"); @@ -8387,8 +8443,8 @@ assert(invar.is_invariant(rng), "range must be invariant"); int scale = 1; Node* offset = zero; ---- ./hotspot/src/share/vm/opto/node.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/share/vm/opto/node.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/share/vm/opto/node.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/share/vm/opto/node.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -286,6 +286,10 @@ #ifdef _MSC_VER // the IDX_INIT hack falls foul of warning C4355 #pragma warning( disable:4355 ) // 'this' : used in base member initializer list @@ -8411,8 +8467,8 @@ //------------------------------clone------------------------------------------ // Clone a Node. ---- ./hotspot/src/share/vm/runtime/atomic.inline.hpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/share/vm/runtime/atomic.inline.hpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/share/vm/runtime/atomic.inline.hpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/share/vm/runtime/atomic.inline.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -63,6 +63,9 @@ #endif @@ -8423,8 +8479,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "atomic_bsd_x86.inline.hpp" #endif ---- ./hotspot/src/share/vm/runtime/globals.hpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/share/vm/runtime/globals.hpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/share/vm/runtime/globals.hpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/share/vm/runtime/globals.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -94,6 +94,9 @@ #ifdef TARGET_OS_ARCH_aix_ppc # include "globals_aix_ppc.hpp" @@ -8435,8 +8491,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "globals_bsd_x86.hpp" #endif ---- ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -64,6 +64,9 @@ #endif @@ -8447,8 +8503,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "orderAccess_bsd_x86.inline.hpp" #endif ---- ./hotspot/src/share/vm/runtime/os.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/share/vm/runtime/os.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/share/vm/runtime/os.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/share/vm/runtime/os.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -426,15 +426,6 @@ if (_native_java_library == NULL) { vm_exit_during_initialization("Unable to load native library", ebuf); @@ -8465,8 +8521,8 @@ } static jboolean onLoaded = JNI_FALSE; if (onLoaded) { ---- ./hotspot/src/share/vm/runtime/os.hpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/share/vm/runtime/os.hpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/share/vm/runtime/os.hpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/share/vm/runtime/os.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -843,6 +843,9 @@ #ifdef TARGET_OS_ARCH_aix_ppc # include "os_aix_ppc.hpp" @@ -8477,8 +8533,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "os_bsd_x86.hpp" #endif ---- ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -63,6 +63,9 @@ #endif @@ -8489,8 +8545,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "prefetch_bsd_x86.inline.hpp" #endif ---- ./hotspot/src/share/vm/runtime/thread.hpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/share/vm/runtime/thread.hpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/share/vm/runtime/thread.hpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/share/vm/runtime/thread.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -1732,6 +1732,9 @@ #ifdef TARGET_OS_ARCH_aix_ppc # include "thread_aix_ppc.hpp" @@ -8501,8 +8557,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "thread_bsd_x86.hpp" #endif ---- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -75,6 +75,9 @@ #ifdef TARGET_OS_ARCH_aix_ppc # include "threadLS_aix_ppc.hpp" @@ -8513,8 +8569,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "threadLS_bsd_x86.hpp" #endif ---- ./hotspot/src/share/vm/runtime/virtualspace.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/share/vm/runtime/virtualspace.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/share/vm/runtime/virtualspace.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/share/vm/runtime/virtualspace.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -342,7 +342,7 @@ (UseCompressedOops && (Universe::narrow_oop_base() != NULL) && Universe::narrow_oop_use_implicit_null_checks()) ? @@ -8524,8 +8580,8 @@ MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); } ---- ./hotspot/src/share/vm/runtime/vmStructs.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/share/vm/runtime/vmStructs.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/share/vm/runtime/vmStructs.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/share/vm/runtime/vmStructs.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -146,6 +146,9 @@ #ifdef TARGET_OS_ARCH_aix_ppc # include "vmStructs_aix_ppc.hpp" @@ -8545,8 +8601,8 @@ \ NOT_ZERO(X86_ONLY(declare_constant(frame::entry_frame_call_wrapper_offset))) \ declare_constant(frame::pc_return_offset) \ ---- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Sat Nov 18 14:40:44 2017 -0800 @@ -30,6 +30,11 @@ // This file holds compiler-dependent includes, // globally used constants & types, class (forward) @@ -8578,8 +8634,8 @@ #define CAN_USE_NAN_DEFINE 1 #endif ---- ./hotspot/src/share/vm/utilities/vmError.cpp Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/src/share/vm/utilities/vmError.cpp Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/src/share/vm/utilities/vmError.cpp Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/src/share/vm/utilities/vmError.cpp Sat Nov 18 14:40:44 2017 -0800 @@ -22,7 +22,6 @@ * */ @@ -8588,8 +8644,8 @@ #include "precompiled.hpp" #include "compiler/compileBroker.hpp" #include "gc_interface/collectedHeap.hpp" ---- ./jdk/make/CompileDemos.gmk Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/CompileDemos.gmk Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/CompileDemos.gmk Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/CompileDemos.gmk Sat Nov 18 14:41:06 2017 -0800 @@ -323,7 +323,7 @@ $(eval $(call SetupJVMTIDemo,hprof, java_crw_demo, \ -I$(JDK_TOPDIR)/src/share/npt -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \ @@ -8599,8 +8655,8 @@ $(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo)) $(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo)) ---- ./jdk/make/CompileJavaClasses.gmk Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/CompileJavaClasses.gmk Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/CompileJavaClasses.gmk Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/CompileJavaClasses.gmk Sat Nov 18 14:41:06 2017 -0800 @@ -128,23 +128,32 @@ sun/nio/fs/LinuxFileStore.java \ sun/nio/fs/LinuxFileSystem.java \ @@ -8702,8 +8758,8 @@ $(CLOSED_SRC_DIRS), \ INCLUDES := $(SECURITY_PKGS), \ EXCLUDES := $(EXCLUDES), \ ---- ./jdk/make/CompileLaunchers.gmk Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/CompileLaunchers.gmk Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/CompileLaunchers.gmk Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/CompileLaunchers.gmk Sat Nov 18 14:41:06 2017 -0800 @@ -49,7 +49,7 @@ ORIGIN_ROOT := /.. endif @@ -8808,8 +8864,8 @@ BUILD_JSPAWNHELPER := 1 endif ---- ./jdk/make/CopyFiles.gmk Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/CopyFiles.gmk Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/CopyFiles.gmk Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/CopyFiles.gmk Sat Nov 18 14:41:06 2017 -0800 @@ -29,6 +29,8 @@ ifeq ($(OPENJDK_TARGET_OS), windows) @@ -8852,8 +8908,8 @@ endif endif endif ---- ./jdk/make/Images.gmk Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/Images.gmk Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/Images.gmk Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/Images.gmk Sat Nov 18 14:41:06 2017 -0800 @@ -236,11 +236,11 @@ endif @@ -8924,7 +8980,7 @@ ################################################################################ --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/make/data/classlist/classlist.bsd Sat Aug 26 22:08:20 2017 -0700 ++++ ./jdk/make/data/classlist/classlist.bsd Sat Nov 18 14:41:06 2017 -0800 @@ -0,0 +1,2559 @@ +java/lang/Object +java/lang/String @@ -11485,8 +11541,8 @@ +java/awt/MenuBar +sun/awt/X11/XErrorEvent +# eea35d9d56e0006e ---- ./jdk/make/gendata/GendataFontConfig.gmk Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/gendata/GendataFontConfig.gmk Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/gendata/GendataFontConfig.gmk Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/gendata/GendataFontConfig.gmk Sat Nov 18 14:41:06 2017 -0800 @@ -73,6 +73,13 @@ GENDATA_FONT_CONFIG_SRC_PREFIX := aix. endif @@ -11501,8 +11557,8 @@ ### $(GENDATA_FONT_CONFIG_DST)/%.src: \ ---- ./jdk/make/lib/Awt2dLibraries.gmk Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/lib/Awt2dLibraries.gmk Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/lib/Awt2dLibraries.gmk Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/lib/Awt2dLibraries.gmk Sat Nov 18 14:41:06 2017 -0800 @@ -309,7 +309,7 @@ debug_trace.c \ debug_util.c @@ -11627,9 +11683,9 @@ else # .. all other Unixes can use X_LIBS LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread endif ---- ./jdk/make/lib/CoreLibraries.gmk Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/lib/CoreLibraries.gmk Sat Aug 26 22:08:20 2017 -0700 -@@ -82,7 +82,7 @@ +--- ./jdk/make/lib/CoreLibraries.gmk Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/lib/CoreLibraries.gmk Sat Nov 18 14:41:06 2017 -0800 +@@ -100,7 +100,7 @@ endif LIBVERIFY_OPTIMIZATION := HIGH @@ -11638,7 +11694,7 @@ ifeq ($(ENABLE_DEBUG_SYMBOLS), true) LIBVERIFY_OPTIMIZATION := LOW endif -@@ -200,6 +200,7 @@ +@@ -222,6 +222,7 @@ LDFLAGS_SUFFIX_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \ LDFLAGS_SUFFIX_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \ LDFLAGS_SUFFIX_aix := $(LIBDL) $(BUILD_LIBFDLIBM) -lm,\ @@ -11646,7 +11702,7 @@ LDFLAGS_SUFFIX_macosx := -L$(JDK_OUTPUTDIR)/objs/ -lfdlibm \ -framework CoreFoundation \ -framework Foundation \ -@@ -270,6 +271,7 @@ +@@ -292,6 +293,7 @@ LDFLAGS_SUFFIX_linux := -ljvm -ljava $(LIBZ), \ LDFLAGS_SUFFIX_solaris := -ljvm -ljava $(LIBZ) -lc, \ LDFLAGS_SUFFIX_aix := -ljvm -ljava $(LIBZ),\ @@ -11654,7 +11710,7 @@ LDFLAGS_SUFFIX_macosx := $(LIBZ) -ljava -ljvm, \ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ -@@ -380,7 +382,7 @@ +@@ -402,7 +404,7 @@ # Append defines depending on target platform LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS) @@ -11663,7 +11719,7 @@ LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" endif -@@ -415,11 +417,13 @@ +@@ -437,11 +439,13 @@ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ @@ -11677,7 +11733,7 @@ LDFLAGS_SUFFIX_windows := \ -export:JLI_Launch \ -export:JLI_ManifestIterate \ -@@ -463,9 +467,9 @@ +@@ -485,9 +489,9 @@ BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC) @@ -11689,7 +11745,7 @@ # code it here...rather than add support to NativeCompilation # as this is first time I see it $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \ -@@ -504,6 +508,13 @@ +@@ -526,6 +530,13 @@ ########################################################################################## @@ -11703,7 +11759,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNPT, \ LIBRARY := npt, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ -@@ -513,9 +524,11 @@ +@@ -535,9 +546,11 @@ CFLAGS := $(CFLAGS_JDKLIB) \ -I$(JDK_TOPDIR)/src/share/npt \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \ @@ -11715,8 +11771,8 @@ LDFLAGS_macosx := -liconv, \ LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \ LDFLAGS_SUFFIX_solaris := -lc, \ ---- ./jdk/make/lib/NetworkingLibraries.gmk Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/lib/NetworkingLibraries.gmk Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/lib/NetworkingLibraries.gmk Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/lib/NetworkingLibraries.gmk Sat Nov 18 14:41:06 2017 -0800 @@ -42,7 +42,7 @@ LIBNET_EXCLUDE_FILES += linux_close.c endif @@ -11745,8 +11801,8 @@ LDFLAGS_SUFFIX_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \ delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \ -DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \ ---- ./jdk/make/lib/NioLibraries.gmk Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/lib/NioLibraries.gmk Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/lib/NioLibraries.gmk Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/lib/NioLibraries.gmk Sat Nov 18 14:41:06 2017 -0800 @@ -77,9 +77,28 @@ UnixNativeDispatcher.c endif @@ -11807,8 +11863,8 @@ endif + endif endif ---- ./jdk/make/lib/ServiceabilityLibraries.gmk Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/lib/ServiceabilityLibraries.gmk Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/lib/ServiceabilityLibraries.gmk Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/lib/ServiceabilityLibraries.gmk Sat Nov 18 14:41:06 2017 -0800 @@ -34,7 +34,7 @@ ifneq ($(OPENJDK_TARGET_OS), linux) LIBATTACH_EXCLUDE_FILES += LinuxVirtualMachine.c @@ -11898,8 +11954,8 @@ ifeq ($(ENABLE_DEBUG_SYMBOLS), true) LIBHPROF_OPTIMIZATION := LOW endif ---- ./jdk/make/lib/SoundLibraries.gmk Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/lib/SoundLibraries.gmk Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/lib/SoundLibraries.gmk Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/lib/SoundLibraries.gmk Sat Nov 18 14:41:06 2017 -0800 @@ -75,6 +75,13 @@ LIBJSOUND_CFLAGS += -DX_PLATFORM=X_AIX endif # OPENJDK_TARGET_OS aix @@ -11931,8 +11987,8 @@ LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundalsa, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) ---- ./jdk/make/mapfiles/launchers/mapfile-ppc64 Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/mapfiles/launchers/mapfile-ppc64 Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/mapfiles/launchers/mapfile-ppc64 Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/mapfiles/launchers/mapfile-ppc64 Sat Nov 18 14:41:06 2017 -0800 @@ -33,6 +33,7 @@ environ; # Public symbols and required by Java run time _environ; @@ -11941,8 +11997,8 @@ local: *; ---- ./jdk/make/mapfiles/launchers/mapfile-x86 Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/mapfiles/launchers/mapfile-x86 Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/mapfiles/launchers/mapfile-x86 Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/mapfiles/launchers/mapfile-x86 Sat Nov 18 14:41:06 2017 -0800 @@ -33,6 +33,7 @@ environ; # Public symbols and required by Java run time _environ; @@ -11951,8 +12007,8 @@ ___Argv; # The following are private, but as they are _start; # exported from ctr1/crtn, the clever hacker _init; # might know about them. However note, that ---- ./jdk/make/mapfiles/launchers/mapfile-x86_64 Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/mapfiles/launchers/mapfile-x86_64 Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/mapfiles/launchers/mapfile-x86_64 Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/mapfiles/launchers/mapfile-x86_64 Sat Nov 18 14:41:06 2017 -0800 @@ -33,6 +33,7 @@ environ; # Public symbols and required by Java run time _environ; @@ -11962,7 +12018,7 @@ local: *; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/make/mapfiles/libattach/mapfile-bsd Sat Aug 26 22:08:20 2017 -0700 ++++ ./jdk/make/mapfiles/libattach/mapfile-bsd Sat Nov 18 14:41:06 2017 -0800 @@ -0,0 +1,42 @@ +# +# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. @@ -12007,7 +12063,7 @@ + *; +}; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/make/mapfiles/libnio/mapfile-bsd Sat Aug 26 22:08:20 2017 -0700 ++++ ./jdk/make/mapfiles/libnio/mapfile-bsd Sat Nov 18 14:41:06 2017 -0800 @@ -0,0 +1,195 @@ +# +# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. @@ -12204,8 +12260,8 @@ + local: + *; +}; ---- ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Sat Nov 18 14:41:06 2017 -0800 @@ -26,6 +26,9 @@ # Define library interface. @@ -12217,7 +12273,7 @@ *; }; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/make/netbeans/common/bsd-sources.ent Sat Aug 26 22:08:20 2017 -0700 ++++ ./jdk/make/netbeans/common/bsd-sources.ent Sat Nov 18 14:41:06 2017 -0800 @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> + @@ -12265,7 +12321,7 @@ + <location>${root}/src/bsd/classes</location> +</source-folder> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/make/netbeans/common/bsd-view.ent Sat Aug 26 22:08:20 2017 -0700 ++++ ./jdk/make/netbeans/common/bsd-view.ent Sat Nov 18 14:41:06 2017 -0800 @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + @@ -12306,8 +12362,8 @@ + <includes>${includes}</includes> + <excludes>${excludes}</excludes> +</source-folder> ---- ./jdk/make/netbeans/common/java-data-native.ent Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/netbeans/common/java-data-native.ent Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/netbeans/common/java-data-native.ent Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/netbeans/common/java-data-native.ent Sat Nov 18 14:41:06 2017 -0800 @@ -34,6 +34,7 @@ <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4"> <compilation-unit> @@ -12316,8 +12372,8 @@ <package-root>${root}/src/macosx/classes</package-root> <package-root>${root}/src/solaris/classes</package-root> <package-root>${root}/src/windows/classes</package-root> ---- ./jdk/make/netbeans/common/make.xml Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/netbeans/common/make.xml Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/netbeans/common/make.xml Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/netbeans/common/make.xml Sat Nov 18 14:41:06 2017 -0800 @@ -32,16 +32,21 @@ --> @@ -12352,8 +12408,8 @@ <macrodef name="make-run"> <attribute name="target"/> <attribute name="dir"/> ---- ./jdk/make/netbeans/j2se/nbproject/project.xml Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/netbeans/j2se/nbproject/project.xml Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/netbeans/j2se/nbproject/project.xml Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/netbeans/j2se/nbproject/project.xml Sat Nov 18 14:41:06 2017 -0800 @@ -34,6 +34,7 @@ <!DOCTYPE project [ <!ENTITY properties SYSTEM "../../common/properties.ent"> @@ -12386,8 +12442,8 @@ &macosx-view; &unix-view; &windows-view; ---- ./jdk/make/netbeans/world/nbproject/project.xml Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/make/netbeans/world/nbproject/project.xml Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/make/netbeans/world/nbproject/project.xml Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/make/netbeans/world/nbproject/project.xml Sat Nov 18 14:41:06 2017 -0800 @@ -34,12 +34,14 @@ <!DOCTYPE project [ <!ENTITY properties SYSTEM "../../common/properties.ent"> @@ -12420,7 +12476,7 @@ &unix-view; &windows-view; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/bsd/classes/java/net/DefaultInterface.java Sat Aug 26 22:08:20 2017 -0700 ++++ ./jdk/src/bsd/classes/java/net/DefaultInterface.java Sat Nov 18 14:41:06 2017 -0800 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. @@ -12520,7 +12576,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/bsd/classes/sun/nio/ch/DefaultSelectorProvider.java Sat Aug 26 22:08:20 2017 -0700 ++++ ./jdk/src/bsd/classes/sun/nio/ch/DefaultSelectorProvider.java Sat Nov 18 14:41:06 2017 -0800 @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. @@ -12571,7 +12627,7 @@ + +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueArrayWrapper.java Sat Aug 26 22:08:20 2017 -0700 ++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueArrayWrapper.java Sat Nov 18 14:41:06 2017 -0800 @@ -0,0 +1,213 @@ +/* + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. @@ -12787,7 +12843,7 @@ + private static native void interrupt(int fd); +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorImpl.java Sat Aug 26 22:08:20 2017 -0700 ++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorImpl.java Sat Nov 18 14:41:06 2017 -0800 @@ -0,0 +1,263 @@ +/* + * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. @@ -13053,7 +13109,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorProvider.java Sat Aug 26 22:08:20 2017 -0700 ++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorProvider.java Sat Nov 18 14:41:06 2017 -0800 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. @@ -13099,8 +13155,8 @@ + return new KQueueSelectorImpl(this); + } +} ---- ./jdk/src/bsd/doc/man/javah.1 Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/bsd/doc/man/javah.1 Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/bsd/doc/man/javah.1 Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/bsd/doc/man/javah.1 Sat Nov 18 14:41:06 2017 -0800 @@ -8,7 +8,7 @@ .\" .\" This code is distributed in the hope that it will be useful, but WITHOUT @@ -13119,8 +13175,8 @@ \fIWindows\fR: ---- ./jdk/src/bsd/doc/man/rmic.1 Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/bsd/doc/man/rmic.1 Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/bsd/doc/man/rmic.1 Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/bsd/doc/man/rmic.1 Sat Nov 18 14:41:06 2017 -0800 @@ -8,7 +8,7 @@ .\" .\" This code is distributed in the hope that it will be useful, but WITHOUT @@ -13148,8 +13204,8 @@ .SH SEE\ ALSO .TP 0.2i \(bu ---- ./jdk/src/bsd/doc/man/rmid.1 Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/bsd/doc/man/rmid.1 Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/bsd/doc/man/rmid.1 Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/bsd/doc/man/rmid.1 Sat Nov 18 14:41:06 2017 -0800 @@ -8,7 +8,7 @@ .\" .\" This code is distributed in the hope that it will be useful, but WITHOUT @@ -13169,7 +13225,7 @@ .TP 0.2i \(bu --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/bsd/native/sun/nio/ch/KQueueArrayWrapper.c Sat Aug 26 22:08:20 2017 -0700 ++++ ./jdk/src/bsd/native/sun/nio/ch/KQueueArrayWrapper.c Sat Nov 18 14:41:06 2017 -0800 @@ -0,0 +1,171 @@ +/* + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. @@ -13342,7 +13398,7 @@ + } +} + ---- ./jdk/src/macosx/classes/java/net/DefaultInterface.java Tue Jul 11 23:52:06 2017 -0700 +--- ./jdk/src/macosx/classes/java/net/DefaultInterface.java Tue Sep 05 18:56:11 2017 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +0,0 @@ -/* @@ -13442,7 +13498,7 @@ - return (ppp != null) ? ppp : loopback; - } -} ---- ./jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java Tue Jul 11 23:52:06 2017 -0700 +--- ./jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java Tue Sep 05 18:56:11 2017 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/* @@ -13493,7 +13549,7 @@ - } - -} ---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java Tue Jul 11 23:52:06 2017 -0700 +--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java Tue Sep 05 18:56:11 2017 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,213 +0,0 @@ -/* @@ -13709,7 +13765,7 @@ - long timeout); - private static native void interrupt(int fd); -} ---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java Tue Jul 11 23:52:06 2017 -0700 +--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java Tue Sep 05 18:56:11 2017 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,263 +0,0 @@ -/* @@ -13975,7 +14031,7 @@ - return this; - } -} ---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java Tue Jul 11 23:52:06 2017 -0700 +--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java Tue Sep 05 18:56:11 2017 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -/* @@ -14022,7 +14078,7 @@ - return new KQueueSelectorImpl(this); - } -} ---- ./jdk/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c Tue Jul 11 23:52:06 2017 -0700 +--- ./jdk/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c Tue Sep 05 18:56:11 2017 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,171 +0,0 @@ -/* @@ -14196,8 +14252,8 @@ - } -} - ---- ./jdk/src/share/bin/jli_util.h Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/bin/jli_util.h Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/bin/jli_util.h Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/bin/jli_util.h Sat Nov 18 14:41:06 2017 -0800 @@ -87,7 +87,7 @@ #define _LARGFILE64_SOURCE #define JLI_Lseek lseek64 @@ -14207,8 +14263,8 @@ #define JLI_Lseek lseek #endif #ifdef _AIX ---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java Sat Nov 18 14:41:06 2017 -0800 @@ -1146,7 +1146,7 @@ */ HashMap<String, Boolean> existsMap; @@ -14218,8 +14274,8 @@ return false; } else if (existsMap == null) { existsMap = new HashMap<String, Boolean>(); ---- ./jdk/src/share/classes/sun/awt/OSInfo.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/classes/sun/awt/OSInfo.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/classes/sun/awt/OSInfo.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/classes/sun/awt/OSInfo.java Sat Nov 18 14:41:06 2017 -0800 @@ -39,6 +39,7 @@ WINDOWS, LINUX, @@ -14239,8 +14295,8 @@ if (osName.contains("OS X")) { return MACOSX; } ---- ./jdk/src/share/classes/sun/font/FontUtilities.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/classes/sun/font/FontUtilities.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/classes/sun/font/FontUtilities.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/classes/sun/font/FontUtilities.java Sat Nov 18 14:41:06 2017 -0800 @@ -48,6 +48,8 @@ public static boolean isLinux; @@ -14259,8 +14315,8 @@ isMacOSX = osName.contains("OS X"); // TODO: MacOSX String t2kStr = System.getProperty("sun.java2d.font.scaler"); ---- ./jdk/src/share/classes/sun/font/SunFontManager.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/classes/sun/font/SunFontManager.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/classes/sun/font/SunFontManager.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/classes/sun/font/SunFontManager.java Sat Nov 18 14:41:06 2017 -0800 @@ -418,7 +418,7 @@ * registerFonts method as on-screen these JRE fonts * always go through the T2K rasteriser. @@ -14270,8 +14326,8 @@ /* Linux font configuration uses these fonts */ registerFontDir(jreFontDirName); } ---- ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Sat Nov 18 14:41:06 2017 -0800 @@ -1306,7 +1306,7 @@ String osName = AccessController.doPrivileged( new GetPropertyAction("os.name")); @@ -14281,8 +14337,8 @@ charset("x-COMPOUND_TEXT", "COMPOUND_TEXT", new String[] { "COMPOUND_TEXT", // JDK historical ---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java Sat Nov 18 14:41:06 2017 -0800 @@ -1587,9 +1587,31 @@ } @@ -14317,8 +14373,8 @@ if ((pFlags & PRINTER) != 0) { execCmd[n++] = "-P" + printer; } ---- ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Sat Nov 18 14:41:06 2017 -0800 @@ -48,6 +48,7 @@ public Boolean run() { String osname = System.getProperty("os.name"); @@ -14327,8 +14383,8 @@ osname.contains("OS X") || osname.startsWith("Linux")) { return new Boolean(System.getProperty ---- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Sat Nov 18 14:41:06 2017 -0800 @@ -90,6 +90,12 @@ "libgssapi_krb5.so", "libgssapi_krb5.so.2", @@ -14342,8 +14398,8 @@ } else if (osname.contains("OS X")) { gssLibs = new String[]{ "libgssapi_krb5.dylib", ---- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Sat Nov 18 14:41:06 2017 -0800 @@ -31,4 +31,5 @@ #[windows]sun.tools.attach.WindowsAttachProvider #[linux]sun.tools.attach.LinuxAttachProvider @@ -14351,8 +14407,8 @@ +#[bsd]sun.tools.attach.BsdAttachProvider #[aix]sun.tools.attach.AixAttachProvider --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/share/lib/security/java.security-bsd Sat Aug 26 22:08:20 2017 -0700 -@@ -0,0 +1,845 @@ ++++ ./jdk/src/share/lib/security/java.security-bsd Sat Nov 18 14:41:06 2017 -0800 +@@ -0,0 +1,911 @@ +# +# This is the "master security properties file". +# @@ -15090,6 +15146,71 @@ +# EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE65381 \ +# FFFFFFFF FFFFFFFF, 2} + ++# Cryptographic Jurisdiction Policy defaults ++# ++# Due to the import control restrictions of some countries, the default ++# JCE policy files allow for strong but "limited" cryptographic key ++# lengths to be used. If your country's cryptographic regulations allow, ++# the "unlimited" strength policy files can be used instead, which contain ++# no restrictions on cryptographic strengths. ++# ++# YOU ARE ADVISED TO CONSULT YOUR EXPORT/IMPORT CONTROL COUNSEL OR ATTORNEY ++# TO DETERMINE THE EXACT REQUIREMENTS. ++# ++# <java-home> (below) refers to the directory where the JRE was ++# installed. It is determined based on whether you are running JCE ++# on a JRE or a JRE contained within the Java Development Kit, or ++# JDK(TM). The JDK contains the JRE, but at a different level in the ++# file hierarchy. For example, if the JDK is installed in ++# /home/user1/jdk1.8.0 on Unix or in C:\jdk1.8.0 on Windows, then ++# <java-home> is: ++# ++# /home/user1/jdk1.8.0/jre [Unix] ++# C:\jdk1.8.0\jre [Windows] ++# ++# If on the other hand the JRE is installed in /home/user1/jre1.8.0 ++# on Unix or in C:\jre1.8.0 on Windows, and the JDK is not ++# installed, then <java-home> is: ++# ++# /home/user1/jre1.8.0 [Unix] ++# C:\jre1.8.0 [Windows] ++# ++# On Windows, for each JDK installation, there may be additional ++# JREs installed under the "Program Files" directory. Please make ++# sure that you install the unlimited strength policy JAR files ++# for all JREs that you plan to use. ++# ++# The policy files are jar files organized into subdirectories of ++# <java-home>/lib/security/policy. Each directory contains a complete ++# set of policy files. ++# ++# The "crypto.policy" Security property controls the directory selection, ++# and thus the effective cryptographic policy. ++# ++# The default set of directories is: ++# ++# limited | unlimited ++# ++# however other directories can be created and configured. ++# ++# To support older JDK Update releases, the crypto.policy property ++# is not defined by default. When the property is not defined, an ++# update release binary aware of the new property will use the following ++# logic to decide what crypto policy files get used : ++# ++# * If the US_export_policy.jar and local_policy.jar files are located ++# in the (legacy) <java-home>/lib/security directory, then the rules ++# embedded in those jar files will be used. This helps preserve compatibility ++# for users upgrading from an older installation. ++# ++# * If crypto.policy is not defined and no such jar files are present in ++# the legacy locations, then the JDK will use the limited settings ++# (equivalent to crypto.policy=limited) ++# ++# Please see the JCA documentation for additional information on these ++# files and formats. ++#crypto.policy=unlimited ++ +# +# The policy for the XML Signature secure validation mode. The mode is +# enabled by setting the property "org.jcp.xml.dsig.secureValidation" to @@ -15198,8 +15319,9 @@ +# java.rmi.dgc.VMID;\ +# java.rmi.dgc.Lease;\ +# maxdepth=5;maxarray=10000 ---- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Sat Aug 26 22:08:20 2017 -0700 ++ +--- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Sat Nov 18 14:41:06 2017 -0800 @@ -62,7 +62,7 @@ #endif // End of ZLIB @@ -15209,8 +15331,8 @@ #define SWAP_BYTES(a) \ ((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00) #else ---- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Sat Nov 18 14:41:06 2017 -0800 @@ -121,7 +121,7 @@ } @@ -15238,8 +15360,8 @@ #define MAP_NATIVE2LE16(a) (a) #define MAP_NATIVE2BE16(a) MAP_SWAP16_impl(a) #define MAP_NATIVE2LE32(a) (a) ---- ./jdk/src/share/native/com/sun/media/sound/Utilities.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/com/sun/media/sound/Utilities.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/com/sun/media/sound/Utilities.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/com/sun/media/sound/Utilities.c Sat Nov 18 14:41:06 2017 -0800 @@ -28,7 +28,7 @@ @@ -15249,8 +15371,8 @@ return 0; #else return 1; ---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Sat Nov 18 14:41:06 2017 -0800 @@ -40,7 +40,7 @@ #endif #endif @@ -15260,8 +15382,8 @@ #define __HI(x) *(1+(int*)&x) #define __LO(x) *(int*)&x #define __HIp(x) *(1+(int*)x) ---- ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Sat Nov 18 14:41:06 2017 -0800 @@ -624,7 +624,7 @@ switch(type) { case java_awt_image_BufferedImage_TYPE_INT_ARGB: @@ -15289,9 +15411,9 @@ colorOrder[0] = 2; colorOrder[1] = 1; colorOrder[2] = 0; ---- ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Sat Aug 26 22:08:20 2017 -0700 -@@ -1176,7 +1176,7 @@ +--- ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Sat Nov 18 14:41:06 2017 -0800 +@@ -1198,7 +1198,7 @@ #define NLUT 8 @@ -15300,8 +15422,8 @@ #define INDEXES { 3, 2, 1, 0, 7, 6, 5, 4 } #else #define INDEXES { 0, 1, 2, 3, 4, 5, 6, 7 } ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Sat Nov 18 14:41:06 2017 -0800 @@ -86,7 +86,7 @@ #endif /* MLIB_USE_FTOI_CLAMPING */ @@ -15341,8 +15463,8 @@ #endif /* _NO_LONGLONG */ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Sat Nov 18 14:41:06 2017 -0800 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15382,8 +15504,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Sat Nov 18 14:41:06 2017 -0800 @@ -94,7 +94,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15423,8 +15545,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Sat Nov 18 14:41:06 2017 -0800 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15464,8 +15586,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Sat Nov 18 14:41:06 2017 -0800 @@ -95,7 +95,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15505,8 +15627,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Sat Nov 18 14:41:06 2017 -0800 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15546,8 +15668,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Sat Nov 18 14:41:06 2017 -0800 @@ -94,7 +94,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15587,8 +15709,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Sat Nov 18 14:41:06 2017 -0800 @@ -95,7 +95,7 @@ dst = dp[0]; if (ld_offset + size < 32) { @@ -15808,8 +15930,8 @@ } #else /* _LONGLONG */ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Sat Nov 18 14:41:06 2017 -0800 @@ -168,7 +168,7 @@ } @@ -16090,8 +16212,8 @@ dp[12] = t0; dp[13] = t1; dp[14] = t2; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Sat Nov 18 14:41:06 2017 -0800 @@ -88,7 +88,7 @@ } d64_2_f32; @@ -16243,8 +16365,8 @@ ((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l; ((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Sat Nov 18 14:41:06 2017 -0800 @@ -30,7 +30,7 @@ typedef union { mlib_d64 db; @@ -16254,8 +16376,8 @@ mlib_s32 int1, int0; #else mlib_s32 int0, int1; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Sat Nov 18 14:41:06 2017 -0800 @@ -275,11 +275,11 @@ for (i = 0; j <= (b_size - 4); j += 4, i++) { src0 = src1; @@ -16354,8 +16476,8 @@ s0 = s1; dp += SIZE; sp += SIZE; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Sat Nov 18 14:41:06 2017 -0800 @@ -120,7 +120,7 @@ } \ } @@ -17588,8 +17710,8 @@ dp[12] = t0; dp[13] = t1; dp[14] = t2; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Sat Nov 18 14:41:06 2017 -0800 @@ -27,9 +27,6 @@ #ifndef MLIB_IMAGE_H #define MLIB_IMAGE_H @@ -17600,8 +17722,8 @@ #include <mlib_types.h> #include <mlib_status.h> #include <mlib_sys.h> ---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Sat Nov 18 14:41:06 2017 -0800 @@ -29,7 +29,7 @@ #ifdef MACOSX #include <unistd.h> @@ -17621,8 +17743,8 @@ #else return (void *) memalign(8, size); #endif /* _MSC_VER */ ---- ./jdk/src/share/native/sun/font/layout/LEStandalone.h Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/font/layout/LEStandalone.h Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/font/layout/LEStandalone.h Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/font/layout/LEStandalone.h Sat Nov 18 14:41:06 2017 -0800 @@ -136,7 +136,7 @@ #define U_CAPI extern "C" @@ -17632,8 +17754,8 @@ #define U_IS_BIG_ENDIAN 0 #endif #endif ---- ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Sat Nov 18 14:41:06 2017 -0800 @@ -182,7 +182,7 @@ return 0L; } @@ -17643,8 +17765,8 @@ /* Reversing data packed into int for LE archs */ if (isInIntPacked) { inFormatter ^= DOSWAP_SH(1); ---- ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Sat Nov 18 14:41:06 2017 -0800 @@ -27,6 +27,7 @@ #include <jni.h> #include "management.h" @@ -17653,8 +17775,8 @@ JNIEXPORT void JNICALL Java_sun_management_DiagnosticCommandImpl_setNotificationEnabled (JNIEnv *env, jobject dummy, jboolean enabled) { ---- ./jdk/src/solaris/back/util_md.h Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/back/util_md.h Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/back/util_md.h Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/back/util_md.h Sat Nov 18 14:41:06 2017 -0800 @@ -51,7 +51,7 @@ /* On little endian machines, convert java big endian numbers. */ @@ -17664,8 +17786,8 @@ #define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff))) #define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff))) ---- ./jdk/src/solaris/bin/ergo_i586.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/bin/ergo_i586.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/bin/ergo_i586.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/bin/ergo_i586.c Sat Nov 18 14:41:06 2017 -0800 @@ -106,7 +106,7 @@ #endif /* __solaris__ */ @@ -17684,8 +17806,8 @@ /* * Routines shared by solaris-i586 and linux-i586. ---- ./jdk/src/solaris/bin/java_md_solinux.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/bin/java_md_solinux.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/bin/java_md_solinux.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/bin/java_md_solinux.c Sat Nov 18 14:41:06 2017 -0800 @@ -35,6 +35,9 @@ #include <sys/stat.h> #include <unistd.h> @@ -17777,8 +17899,8 @@ } int ---- ./jdk/src/solaris/bin/java_md_solinux.h Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/bin/java_md_solinux.h Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/bin/java_md_solinux.h Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/bin/java_md_solinux.h Sat Nov 18 14:41:06 2017 -0800 @@ -26,17 +26,26 @@ #ifndef JAVA_MD_SOLINUX_H #define JAVA_MD_SOLINUX_H @@ -17819,8 +17941,8 @@ #else /* !__solaris__, i.e. Linux, AIX,.. */ static const char *system_dir = "/usr/java"; static const char *user_dir = "/java"; ---- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Sat Nov 18 14:41:06 2017 -0800 @@ -82,6 +82,8 @@ LINUX(LaunchMechanism.VFORK, LaunchMechanism.FORK), @@ -17868,8 +17990,8 @@ case BSD: case AIX: // There is a risk that pid will be recycled, causing us to ---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Sat Nov 18 14:41:06 2017 -0800 @@ -234,7 +234,7 @@ if (fontID != null) { fileName = (String)fontNameMap.get(fontID); @@ -17897,8 +18019,8 @@ (!mFontConfig.foundOsSpecificFile() || !mFontConfig.fontFilesArePresent()) || (FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) { ---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Sat Nov 18 14:41:06 2017 -0800 @@ -26,134 +26,134 @@ # Version @@ -18161,8 +18283,8 @@ +filename.NanumGothic_Bold=/usr/local/lib/X11/fonts/nanum-ttf/NanumGothicBold.ttf +filename.NanumMyeongjo=/usr/local/lib/X11/fonts/nanum-ttf/NanumMyeongjo.ttf +filename.NanumMyeongjo_Bold=/usr/local/lib/X11/fonts/nanum-ttf/NanumMyeongjoBold.ttf ---- ./jdk/src/solaris/classes/sun/net/PortConfig.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/classes/sun/net/PortConfig.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/classes/sun/net/PortConfig.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/classes/sun/net/PortConfig.java Sat Nov 18 14:41:06 2017 -0800 @@ -52,7 +52,7 @@ } else if (os.startsWith("SunOS")) { defaultLower = 32768; @@ -18172,8 +18294,8 @@ defaultLower = 49152; defaultUpper = 65535; } else if (os.startsWith("AIX")) { ---- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Sat Nov 18 14:41:06 2017 -0800 @@ -66,7 +66,7 @@ return createProvider("sun.nio.ch.SolarisAsynchronousChannelProvider"); if (osname.equals("Linux")) @@ -18183,8 +18305,8 @@ return createProvider("sun.nio.ch.BsdAsynchronousChannelProvider"); if (osname.equals("AIX")) return createProvider("sun.nio.ch.AixAsynchronousChannelProvider"); ---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Sat Nov 18 14:41:06 2017 -0800 @@ -25,10 +25,14 @@ package sun.nio.fs; @@ -18218,8 +18340,8 @@ + new MagicFileTypeDetector()); + } } ---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sat Nov 18 14:41:06 2017 -0800 @@ -61,6 +61,8 @@ return createProvider("sun.nio.fs.SolarisFileSystemProvider"); if (osname.equals("Linux")) @@ -18229,8 +18351,8 @@ if (osname.contains("OS X")) return createProvider("sun.nio.fs.MacOSXFileSystemProvider"); if (osname.equals("AIX")) ---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Sat Nov 18 14:41:06 2017 -0800 @@ -161,6 +161,7 @@ static boolean isBSD() { @@ -18254,8 +18376,8 @@ "/usr/sbin/lpc status all | grep -E '^[ 0-9a-zA-Z_-]*@' | awk -F'@' '{print $1}' | sort" }; ---- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Sat Nov 18 14:41:06 2017 -0800 @@ -273,7 +273,7 @@ try { b = s.getBytes("UTF-8"); @@ -18265,8 +18387,8 @@ } BsdVirtualMachine.write(fd, b, 0, b.length); } ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Sat Nov 18 14:41:06 2017 -0800 @@ -675,6 +675,7 @@ return -1; } @@ -18283,8 +18405,8 @@ } else if (err == -EAGAIN) { TRACE0("xrun_recovery: EAGAIN try again flag.\n"); return 0; ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Sat Nov 18 14:41:06 2017 -0800 @@ -140,7 +140,7 @@ (float) ((int) sr->samp_rates[s]), DAUDIO_PCM, /* encoding - let's only do PCM */ @@ -18294,8 +18416,8 @@ FALSE /* little endian */ #else (bits[b] > 8)?TRUE:FALSE /* big endian */ ---- ./jdk/src/solaris/native/common/jni_util_md.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/common/jni_util_md.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/common/jni_util_md.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/common/jni_util_md.c Sat Nov 18 14:41:06 2017 -0800 @@ -28,6 +28,7 @@ #include "jni.h" #include "jni_util.h" @@ -18304,9 +18426,9 @@ jstring nativeNewStringPlatform(JNIEnv *env, const char *str) { return NULL; ---- ./jdk/src/solaris/native/java/lang/java_props_md.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/java/lang/java_props_md.c Sat Aug 26 22:08:20 2017 -0700 -@@ -151,7 +151,7 @@ +--- ./jdk/src/solaris/native/java/lang/java_props_md.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/java/lang/java_props_md.c Sat Nov 18 14:41:06 2017 -0800 +@@ -111,7 +111,7 @@ lc = setlocale(cat, NULL); #endif @@ -18315,7 +18437,7 @@ if (lc == NULL) { return 0; } -@@ -552,23 +552,11 @@ +@@ -515,23 +515,11 @@ sprops.sun_jnu_encoding = sprops.encoding; #endif @@ -18340,8 +18462,8 @@ /* user properties */ { ---- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Sat Nov 18 14:41:06 2017 -0800 @@ -36,20 +36,13 @@ #include <stdlib.h> #include <ctype.h> @@ -18362,9 +18484,9 @@ -#endif +extern jobjectArray lookupIfLocalhost(JNIEnv *env, const char *hostname, jboolean includeV6); - static jclass ni_iacls; - static jclass ni_ia4cls; -@@ -436,6 +429,17 @@ + + #if defined(_ALLBSD_SOURCE) && !defined(HAS_GLIBC_GETHOSTBY_R) +@@ -413,6 +406,17 @@ } #endif @@ -18382,8 +18504,8 @@ error = getaddrinfo(hostname, NULL, &hints, &res); if (error) { ---- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Sat Nov 18 14:41:06 2017 -0800 @@ -33,7 +33,7 @@ #include <strings.h> #include <stdlib.h> @@ -18393,8 +18515,8 @@ #include <ifaddrs.h> #include <net/if.h> #include <unistd.h> /* gethostname */ -@@ -155,9 +155,9 @@ - return JNI_TRUE; +@@ -112,9 +112,9 @@ + return (*env)->NewStringUTF(env, hostname); } -#ifdef MACOSX @@ -18405,7 +18527,7 @@ lookupIfLocalhost(JNIEnv *env, const char *hostname, jboolean includeV6) { jobjectArray result = NULL; -@@ -311,6 +311,19 @@ +@@ -267,6 +267,19 @@ hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE); CHECK_NULL_RETURN(hostname, NULL); @@ -18425,9 +18547,9 @@ #ifdef AF_INET6 /* Try once, with our static buffer. */ memset(&hints, 0, sizeof(hints)); ---- ./jdk/src/solaris/native/java/net/NetworkInterface.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c Sat Aug 26 22:08:20 2017 -0700 -@@ -62,14 +62,19 @@ +--- ./jdk/src/solaris/native/java/net/NetworkInterface.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c Sat Nov 18 14:41:06 2017 -0800 +@@ -58,14 +58,19 @@ #include <sys/param.h> #include <sys/ioctl.h> #include <sys/sockio.h> @@ -18449,9 +18571,9 @@ #include "jvm.h" #include "jni_util.h" ---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Sat Aug 26 22:08:20 2017 -0700 -@@ -2222,7 +2222,7 @@ +--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Sat Nov 18 14:41:06 2017 -0800 +@@ -2221,7 +2221,7 @@ } } #endif @@ -18460,9 +18582,9 @@ if (family == AF_INET6 && index == 0) { index = getDefaultScopeID(env); } ---- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Sat Aug 26 22:08:20 2017 -0700 -@@ -212,6 +212,7 @@ +--- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Sat Nov 18 14:41:06 2017 -0800 +@@ -215,6 +215,7 @@ } #ifdef AF_INET6 @@ -18470,7 +18592,7 @@ /* Disable IPV6_V6ONLY to ensure dual-socket support */ if (domain == AF_INET6) { int arg = 0; -@@ -222,6 +223,7 @@ +@@ -225,6 +226,7 @@ return; } } @@ -18478,9 +18600,9 @@ #endif /* AF_INET6 */ /* ---- ./jdk/src/solaris/native/java/net/bsd_close.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/java/net/bsd_close.c Sat Aug 26 22:08:20 2017 -0700 -@@ -316,11 +316,8 @@ +--- ./jdk/src/solaris/native/java/net/bsd_close.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/java/net/bsd_close.c Sat Nov 18 14:41:06 2017 -0800 +@@ -320,11 +320,8 @@ } int NET_Accept(int s, struct sockaddr *addr, int *addrlen) { @@ -18494,10 +18616,10 @@ } int NET_Connect(int s, struct sockaddr *addr, int addrlen) { -@@ -345,6 +342,76 @@ +@@ -349,6 +346,68 @@ * signal other than our wakeup signal. */ - int NET_Timeout(int s, long timeout) { + int NET_Timeout0(int s, long timeout, long currentTime) { +/* + * On MacOS X, poll(2) is not working correctly, so a select(2) based + * implementation is preferred. See @@ -18512,7 +18634,7 @@ + * Other *BSD will use poll(2) for now, but please adjust as appropriate. + */ +#ifndef __APPLE__ -+ long prevtime = 0, newtime; ++ long prevtime = currentTime, newtime; + struct timeval t; + fdEntry_t *fdEntry = getFdEntry(s); + @@ -18524,14 +18646,6 @@ + return -1; + } + -+ /* -+ * Pick up current time as may need to adjust timeout -+ */ -+ if (timeout > 0) { -+ gettimeofday(&t, NULL); -+ prevtime = t.tv_sec * 1000 + t.tv_usec / 1000; -+ } -+ + for(;;) { + struct pollfd pfd; + int rv; @@ -18568,18 +18682,18 @@ + + } +#else - long prevtime = 0, newtime; + long prevtime = currentTime, newtime; struct timeval t, *tp = &t; fd_set fds; -@@ -431,4 +498,5 @@ +@@ -432,4 +491,5 @@ } } +#endif } ---- ./jdk/src/solaris/native/java/net/net_util_md.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/java/net/net_util_md.c Sat Aug 26 22:08:20 2017 -0700 -@@ -45,6 +45,10 @@ +--- ./jdk/src/solaris/native/java/net/net_util_md.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/java/net/net_util_md.c Sat Nov 18 14:41:06 2017 -0800 +@@ -46,6 +46,10 @@ #endif #endif @@ -18590,7 +18704,7 @@ #ifdef __solaris__ #include <sys/sockio.h> #include <stropts.h> -@@ -80,7 +84,7 @@ +@@ -81,7 +85,7 @@ void setDefaultScopeID(JNIEnv *env, struct sockaddr *him) { @@ -18599,19 +18713,8 @@ static jclass ni_class = NULL; static jfieldID ni_defaultIndexID; if (ni_class == NULL) { ---- ./jdk/src/solaris/native/java/net/net_util_md.h Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/java/net/net_util_md.h Sat Aug 26 22:08:20 2017 -0700 -@@ -47,7 +47,7 @@ - close subroutine does not return until the select call returns. - ... - */ --#if defined(__linux__) || defined(MACOSX) || defined (_AIX) -+#if defined(__linux__) || defined(_ALLBSD_SOURCE) || defined (_AIX) - extern int NET_Timeout(int s, long timeout); - extern int NET_Read(int s, void* buf, size_t len); - extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags, ---- ./jdk/src/solaris/native/java/util/TimeZone_md.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/java/util/TimeZone_md.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c Sat Nov 18 14:41:06 2017 -0800 @@ -56,7 +56,11 @@ #endif @@ -18675,8 +18778,8 @@ } -#endif /* MACOSX */ +#endif /* _ALLBSD_SOURCE */ ---- ./jdk/src/solaris/native/sun/awt/awt_Font.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_Font.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_Font.c Sat Nov 18 14:41:06 2017 -0800 @@ -255,7 +255,7 @@ if (strcmp(style, "regular") == 0) { altstyle = "roman"; @@ -18686,8 +18789,8 @@ if (!strcmp(family, "lucidasans")) { family = "lucida"; } ---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Sat Nov 18 14:41:06 2017 -0800 @@ -121,7 +121,7 @@ */ @@ -18772,8 +18875,8 @@ #endif /* HEADLESS */ return point; } ---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Sat Nov 18 14:41:06 2017 -0800 @@ -52,7 +52,7 @@ XIMPreeditDrawCallbackStruct *); static void PreeditCaretCallback(XIC, XPointer, @@ -18993,8 +19096,8 @@ AWT_LOCK(); adjustStatusWindow(window); AWT_UNLOCK(); ---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c Sat Nov 18 14:41:06 2017 -0800 @@ -45,7 +45,7 @@ #include "wsutils.h" #include "list.h" @@ -19004,8 +19107,8 @@ #include <sys/socket.h> #endif ---- ./jdk/src/solaris/native/sun/awt/extutil.h Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/awt/extutil.h Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/awt/extutil.h Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/awt/extutil.h Sat Nov 18 14:41:06 2017 -0800 @@ -58,7 +58,7 @@ */ /* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */ @@ -19021,8 +19124,8 @@ -#endif /* __linux__ || MACOSX */ +#endif /* __linux__ || _ALLBSD_SOURCE */ ---- ./jdk/src/solaris/native/sun/awt/fontpath.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/awt/fontpath.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/awt/fontpath.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/awt/fontpath.c Sat Nov 18 14:41:06 2017 -0800 @@ -23,9 +23,9 @@ * questions. */ @@ -19102,7 +19205,7 @@ } #endif } -@@ -1231,7 +1246,7 @@ +@@ -1237,7 +1252,7 @@ */ if (fontformat != NULL && (strcmp((char*)fontformat, "TrueType") != 0) @@ -19111,8 +19214,8 @@ && (strcmp((char*)fontformat, "Type 1") != 0) #endif ) { ---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h Sat Nov 18 14:41:06 2017 -0800 @@ -28,11 +28,11 @@ #include <sys/types.h> @@ -19128,8 +19231,8 @@ typedef unsigned char jubyte; typedef unsigned short jushort; ---- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Sat Nov 18 14:41:06 2017 -0800 @@ -63,9 +63,6 @@ * MLIB_EDGE_SRC_PADDED */ @@ -19234,8 +19337,8 @@ LOGIC(da[0], dtmp, dtmp1, |); } else { /* aligned */ ---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Sat Nov 18 14:41:06 2017 -0800 @@ -804,7 +804,7 @@ static int initialized; static int usevis = JNI_TRUE; @@ -19246,7 +19349,7 @@ #else # define ULTRA_CHIP "sun4u" --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/solaris/native/sun/management/BsdOperatingSystem.c Sat Aug 26 22:08:20 2017 -0700 ++++ ./jdk/src/solaris/native/sun/management/BsdOperatingSystem.c Sat Nov 18 14:41:06 2017 -0800 @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. @@ -19290,8 +19393,8 @@ +{ + return (jdouble) -1; +} ---- ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Sat Nov 18 14:41:06 2017 -0800 @@ -56,6 +56,9 @@ #include <limits.h> #include <stdlib.h> @@ -19456,8 +19559,8 @@ return -1; } ---- ./jdk/src/solaris/native/sun/net/portconfig.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/net/portconfig.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/net/portconfig.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/net/portconfig.c Sat Nov 18 14:41:06 2017 -0800 @@ -67,6 +67,24 @@ range->lower = net_getParam("/dev/tcp", "tcp_smallest_anon_port"); return 0; @@ -19483,8 +19586,8 @@ #elif defined(_ALLBSD_SOURCE) { int ret; ---- ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Sat Nov 18 14:41:06 2017 -0800 @@ -67,7 +67,7 @@ @@ -19533,8 +19636,8 @@ jboolean loadSocketExtensionFuncs(JNIEnv* env); #endif /* !SUN_NIO_CH_SCTP_H */ ---- ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Sat Nov 18 14:41:06 2017 -0800 @@ -58,6 +58,7 @@ */ jboolean loadSocketExtensionFuncs @@ -19551,8 +19654,8 @@ funcsLoaded = JNI_TRUE; return JNI_TRUE; ---- ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Sat Nov 18 14:41:06 2017 -0800 @@ -31,6 +31,12 @@ #include <dlfcn.h> #include <string.h> @@ -19575,8 +19678,8 @@ if (magic_handle == NULL) { return JNI_FALSE; } ---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Sat Nov 18 14:41:06 2017 -0800 @@ -54,7 +54,7 @@ } @@ -19586,8 +19689,8 @@ void *hModule = dlopen(libName, RTLD_LAZY); #else void *hModule = dlopen(libName, RTLD_NOLOAD); ---- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Sat Nov 18 14:41:06 2017 -0800 @@ -37,7 +37,9 @@ #include <sys/types.h> #include <sys/socket.h> @@ -19598,8 +19701,8 @@ #include <sys/un.h> #include <fcntl.h> ---- ./jdk/src/solaris/native/sun/xawt/XWindow.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/solaris/native/sun/xawt/XWindow.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c Sat Nov 18 14:41:06 2017 -0800 @@ -886,7 +886,7 @@ { KeySym originalKeysym = *keysym; @@ -19609,8 +19712,8 @@ /* The following code on Linux will cause the keypad keys * not to echo on JTextField when the NumLock is on. The * keysyms will be 0, because the last parameter 2 is not defined. ---- ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Sat Nov 18 14:41:06 2017 -0800 @@ -308,7 +308,7 @@ DAUDIO_PCM, (bitsArray[bitIndex]==8)?FALSE:TRUE, /* signed */ diff --git a/java/openjdk8/files/patch-bsd-test b/java/openjdk8/files/patch-bsd-test index 38e77602e310..47ffd8941b1c 100644 --- a/java/openjdk8/files/patch-bsd-test +++ b/java/openjdk8/files/patch-bsd-test @@ -1,5 +1,5 @@ ---- ./hotspot/test/compiler/5091921/Test7005594.sh Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/test/compiler/5091921/Test7005594.sh Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/test/compiler/5091921/Test7005594.sh Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/test/compiler/5091921/Test7005594.sh Sat Nov 18 14:40:44 2017 -0800 @@ -60,6 +60,15 @@ # Windows/MKS MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'` @@ -16,8 +16,8 @@ else echo "Unable to determine amount of physical memory on the machine" fi ---- ./hotspot/test/compiler/6894807/Test6894807.sh Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/test/compiler/6894807/Test6894807.sh Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/test/compiler/6894807/Test6894807.sh Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/test/compiler/6894807/Test6894807.sh Sat Nov 18 14:40:44 2017 -0800 @@ -21,7 +21,7 @@ # set platform-dependent variables OS=`uname -s` @@ -27,8 +27,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./hotspot/test/runtime/7110720/Test7110720.sh Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/test/runtime/7110720/Test7110720.sh Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/test/runtime/7110720/Test7110720.sh Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/test/runtime/7110720/Test7110720.sh Sat Nov 18 14:40:44 2017 -0800 @@ -28,7 +28,7 @@ # set platform-dependent variables OS=`uname -s` @@ -38,8 +38,8 @@ FS="/" RM=/bin/rm CP=/bin/cp ---- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Sat Nov 18 14:40:44 2017 -0800 @@ -37,8 +37,8 @@ public static void main(String args[]) throws Throwable { @@ -51,8 +51,8 @@ return; } ---- ./hotspot/test/test_env.sh Tue Jul 11 23:51:17 2017 -0700 -+++ ./hotspot/test/test_env.sh Sat Aug 26 21:38:23 2017 -0700 +--- ./hotspot/test/test_env.sh Tue Sep 05 18:34:11 2017 -0700 ++++ ./hotspot/test/test_env.sh Sat Nov 18 14:40:44 2017 -0800 @@ -53,7 +53,7 @@ # set platform-dependent variables OS=`uname -s` @@ -62,8 +62,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Sat Nov 18 14:41:06 2017 -0800 @@ -48,7 +48,7 @@ # set platform-dependent variables OS=`uname -s` @@ -73,8 +73,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Sat Nov 18 14:41:06 2017 -0800 @@ -31,7 +31,7 @@ OS=`uname -s` @@ -84,8 +84,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -56,7 +56,7 @@ OS=`uname -s` @@ -95,8 +95,8 @@ PATHSEP=":" ;; ---- ./jdk/test/com/sun/jdi/JITDebug.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/com/sun/jdi/JITDebug.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/com/sun/jdi/JITDebug.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/com/sun/jdi/JITDebug.sh Sat Nov 18 14:41:06 2017 -0800 @@ -63,7 +63,7 @@ OS=`uname -s` export TRANSPORT_METHOD @@ -106,8 +106,8 @@ PATHSEP=":" TRANSPORT_METHOD=dt_socket ;; ---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -106,7 +106,7 @@ xx=`find ${jreloc}/lib -name libdt_socket.so` libloc=`dirname ${xx}` @@ -117,8 +117,8 @@ libloc=${jreloc}/lib ;; Windows*) ---- ./jdk/test/com/sun/jdi/ShellScaffold.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/com/sun/jdi/ShellScaffold.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/com/sun/jdi/ShellScaffold.sh Sat Nov 18 14:41:06 2017 -0800 @@ -284,7 +284,7 @@ psCmd=ps jstack=jstack.exe @@ -128,8 +128,8 @@ transport=dt_socket address= devnull=/dev/null ---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Sat Nov 18 14:41:06 2017 -0800 @@ -45,7 +45,7 @@ OS=`uname -s` @@ -139,8 +139,8 @@ PS=":" ;; Windows* | CYGWIN*) ---- ./jdk/test/java/awt/JAWT/JAWT.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/awt/JAWT/JAWT.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/awt/JAWT/JAWT.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/awt/JAWT/JAWT.sh Sat Nov 18 14:41:06 2017 -0800 @@ -62,6 +62,23 @@ MAKE="make" LD_LIBRARY_PATH="." @@ -174,8 +174,8 @@ exit 0; ;; * ) ---- ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -86,6 +86,14 @@ TMP="/tmp" ;; @@ -191,8 +191,8 @@ Windows* ) VAR="A different value for Win32" DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0" ---- ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -59,7 +59,7 @@ # Checking for proper OS OS=`uname -s` @@ -202,8 +202,8 @@ FILESEP="/" ;; ---- ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -119,6 +119,14 @@ TMP="/tmp" ;; @@ -219,8 +219,8 @@ Windows* ) VAR="A different value for Win32" DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0" ---- ./jdk/test/java/io/File/GetXSpace.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/io/File/GetXSpace.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/io/File/GetXSpace.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/io/File/GetXSpace.java Sat Nov 18 14:41:06 2017 -0800 @@ -51,7 +51,7 @@ private static final String dfFormat; static { @@ -230,8 +230,8 @@ // FileSystem Total Used Available Use% MountedOn dfFormat = "([^\\s]+)\\s+(\\d+)\\s+\\d+\\s+(\\d+)\\s+\\d+%\\s+([^\\s]+)"; } else if (name.startsWith("Windows")) { ---- ./jdk/test/java/io/File/GetXSpace.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/io/File/GetXSpace.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/io/File/GetXSpace.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/io/File/GetXSpace.sh Sat Nov 18 14:41:06 2017 -0800 @@ -26,7 +26,7 @@ # set platform-dependent variable OS=`uname -s` @@ -241,8 +241,8 @@ Windows_98 ) return ;; Windows* ) SID=`sid`; TMP="c:/temp" ;; * ) ---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Sat Nov 18 14:41:06 2017 -0800 @@ -45,7 +45,7 @@ # Need to determine the classpath separator and filepath separator based on the # operating system. @@ -252,8 +252,8 @@ PS=":" ;; Windows* | CYGWIN* ) PS=";" ;; ---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Sat Nov 18 14:41:06 2017 -0800 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -263,8 +263,8 @@ PS=":" ;; Windows* | CYGWIN* ) PS=";" ;; ---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh Sat Nov 18 14:41:06 2017 -0800 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -274,8 +274,8 @@ PS=":" ;; Windows* | CYGWIN* ) PS=";" ;; ---- ./jdk/test/java/lang/ClassLoader/Assert.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/lang/ClassLoader/Assert.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/lang/ClassLoader/Assert.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/lang/ClassLoader/Assert.sh Sat Nov 18 14:41:06 2017 -0800 @@ -25,7 +25,7 @@ OS=`uname -s` @@ -285,8 +285,8 @@ FS="/" CHMOD="${FS}bin${FS}chmod" ;; ---- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Sat Nov 18 14:41:06 2017 -0800 @@ -55,7 +55,7 @@ Linux ) FS="/" @@ -296,8 +296,8 @@ FS="/" ;; AIX ) ---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Sat Nov 18 14:41:06 2017 -0800 @@ -60,7 +60,7 @@ Linux ) FS="/" @@ -307,8 +307,8 @@ FS="/" ;; AIX ) ---- ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Sat Nov 18 14:41:06 2017 -0800 @@ -148,6 +148,9 @@ } else if (osName.startsWith("Linux") == true) { return new UnixTest( @@ -319,8 +319,8 @@ } else if (osName.startsWith("Mac OS")) { return new MacTest( File.createTempFile("ProcessTrap-", ".sh",null)); ---- ./jdk/test/java/lang/ProcessBuilder/Zombies.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/lang/ProcessBuilder/Zombies.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/lang/ProcessBuilder/Zombies.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/lang/ProcessBuilder/Zombies.java Sat Nov 18 14:41:06 2017 -0800 @@ -34,7 +34,7 @@ static final String os = System.getProperty("os.name"); @@ -330,8 +330,8 @@ "/usr/bin/true" : "/bin/true"; public static void main(String[] args) throws Throwable { ---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Sat Nov 18 14:41:06 2017 -0800 @@ -30,7 +30,7 @@ # set platform-dependent variables OS=`uname -s` @@ -341,8 +341,8 @@ Windows* | CYGWIN* ) echo "Passed"; exit 0 ;; * ) echo "Unrecognized system!" ; exit 1 ;; ---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Sat Nov 18 14:41:06 2017 -0800 @@ -48,7 +48,7 @@ # set platform-dependent variables OS=`uname -s` @@ -352,8 +352,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/java/lang/instrument/MakeJAR2.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/lang/instrument/MakeJAR2.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/lang/instrument/MakeJAR2.sh Sat Nov 18 14:41:06 2017 -0800 @@ -55,7 +55,7 @@ OS=`uname -s` @@ -363,8 +363,8 @@ PATHSEP=":" ;; ---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Sat Nov 18 14:41:06 2017 -0800 @@ -43,7 +43,7 @@ PS=":" FS="/" @@ -374,8 +374,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Sat Nov 18 14:41:06 2017 -0800 @@ -79,8 +79,10 @@ System.out.println("Test passed."); } @@ -397,8 +397,8 @@ ? output.split(" ") : output.split(","); double expected = Double.parseDouble(lavg[0]); ---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Sat Nov 18 14:41:06 2017 -0800 @@ -61,7 +61,7 @@ while true; do echo "Run $i: TestSystemLoadAvg" @@ -408,8 +408,8 @@ runOne GetSystemLoadAverage ;; * ) ---- ./jdk/test/java/net/Authenticator/B4933582.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/net/Authenticator/B4933582.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/net/Authenticator/B4933582.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/net/Authenticator/B4933582.sh Sat Nov 18 14:41:06 2017 -0800 @@ -26,7 +26,7 @@ OS=`uname -s` @@ -419,8 +419,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/DatagramSocket/Send12k.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/net/DatagramSocket/Send12k.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/net/DatagramSocket/Send12k.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/net/DatagramSocket/Send12k.java Sat Nov 18 14:41:06 2017 -0800 @@ -36,9 +36,10 @@ public static void main(String args[]) throws Exception { @@ -434,8 +434,8 @@ SEND_SIZE = 16 * 576; } else { SEND_SIZE = 16 * 1024; ---- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Sat Nov 18 14:41:06 2017 -0800 @@ -45,6 +45,8 @@ return (true); if (p.getProperty ("os.name").equals ("Linux")) @@ -445,8 +445,8 @@ if (p.getProperty ("os.name").startsWith ("Mac OS")) return (true); // Check for specific Solaris version from here ---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Sat Nov 18 14:41:06 2017 -0800 @@ -27,11 +27,7 @@ # set platform-dependent variables OS=`uname -s` @@ -460,8 +460,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/net/Socket/OldSocketImpl.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/net/Socket/OldSocketImpl.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/net/Socket/OldSocketImpl.sh Sat Nov 18 14:41:06 2017 -0800 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -471,8 +471,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URL/B5086147.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/net/URL/B5086147.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/net/URL/B5086147.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/net/URL/B5086147.sh Sat Nov 18 14:41:06 2017 -0800 @@ -26,7 +26,7 @@ OS=`uname -s` @@ -482,8 +482,8 @@ exit 0 ;; CYGWIN* ) ---- ./jdk/test/java/net/URLClassLoader/B5077773.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/net/URLClassLoader/B5077773.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/net/URLClassLoader/B5077773.sh Sat Nov 18 14:41:06 2017 -0800 @@ -34,11 +34,7 @@ OS=`uname -s` @@ -497,8 +497,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Sat Nov 18 14:41:06 2017 -0800 @@ -27,11 +27,7 @@ OS=`uname -s` @@ -512,8 +512,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URLConnection/6212146/test.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/net/URLConnection/6212146/test.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/net/URLConnection/6212146/test.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/net/URLConnection/6212146/test.sh Sat Nov 18 14:41:06 2017 -0800 @@ -33,11 +33,7 @@ OS=`uname -s` @@ -527,8 +527,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/nio/channels/FileChannel/Transfer.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/nio/channels/FileChannel/Transfer.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/nio/channels/FileChannel/Transfer.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/nio/channels/FileChannel/Transfer.java Sat Nov 18 14:41:06 2017 -0800 @@ -228,7 +228,7 @@ // Windows and Linux can't handle the really large file sizes for a // truncate or a positional write required by the test for 4563125 @@ -538,8 +538,8 @@ return; File source = File.createTempFile("blah", null); source.deleteOnExit(); ---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Sat Nov 18 14:41:06 2017 -0800 @@ -17,6 +17,12 @@ #include "Launcher.h" @@ -562,8 +562,8 @@ _exit(-1); } ---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Sat Nov 18 14:41:06 2017 -0800 @@ -34,7 +34,7 @@ OS=`uname -s` @@ -573,8 +573,8 @@ # Skip locale test for Windows Windows* | CYGWIN* ) echo "Passed"; exit 0 ;; ---- ./jdk/test/java/nio/charset/spi/basic.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/nio/charset/spi/basic.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/nio/charset/spi/basic.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/nio/charset/spi/basic.sh Sat Nov 18 14:41:06 2017 -0800 @@ -48,7 +48,7 @@ DIR=`pwd` @@ -584,8 +584,8 @@ Windows* ) CPS=';' ;; CYGWIN* ) DIR=`/usr/bin/cygpath -a -s -m $DIR` ---- ./jdk/test/java/nio/file/FileSystem/Basic.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/nio/file/FileSystem/Basic.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/nio/file/FileSystem/Basic.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/nio/file/FileSystem/Basic.java Sat Nov 18 14:41:06 2017 -0800 @@ -76,7 +76,7 @@ checkSupported(fs, "posix", "unix", "owner", "acl", "user"); if (os.equals("Linux")) @@ -595,8 +595,8 @@ checkSupported(fs, "posix", "unix", "owner"); if (os.equals("Windows")) checkSupported(fs, "owner", "dos", "acl", "user"); ---- ./jdk/test/java/nio/file/Files/CopyAndMove.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/nio/file/Files/CopyAndMove.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/nio/file/Files/CopyAndMove.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/nio/file/Files/CopyAndMove.java Sat Nov 18 14:41:06 2017 -0800 @@ -651,7 +651,7 @@ // check POSIX attributes are copied @@ -615,8 +615,8 @@ boolean isDirectory = isDirectory(file, NOFOLLOW_LINKS); if (isUnix) { ---- ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Sat Nov 18 14:41:06 2017 -0800 @@ -33,7 +33,7 @@ OS=`uname -s` @@ -626,8 +626,8 @@ PS=":" ;; Windows* | CYGWIN* ) ---- ./jdk/test/java/rmi/registry/readTest/readTest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/rmi/registry/readTest/readTest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/rmi/registry/readTest/readTest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/rmi/registry/readTest/readTest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -34,7 +34,7 @@ REGARGS="" @@ -637,8 +637,8 @@ PS=":" FS="/" CHMOD="${FS}bin${FS}chmod" ---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Sat Nov 18 14:41:06 2017 -0800 @@ -58,7 +58,7 @@ PATHSEP=":" FILESEP="/" @@ -648,8 +648,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Sat Nov 18 14:41:06 2017 -0800 @@ -42,7 +42,7 @@ PATHSEP=":" FILESEP="/" @@ -659,8 +659,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Sat Nov 18 14:41:06 2017 -0800 @@ -66,7 +66,7 @@ PATHSEP=";" FILESEP="/" @@ -670,8 +670,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh Sat Nov 18 14:41:06 2017 -0800 @@ -58,7 +58,7 @@ PATHSEP=":" FILESEP="/" @@ -681,8 +681,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/signedfirst/Static.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/security/Security/signedfirst/Static.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/security/Security/signedfirst/Static.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/security/Security/signedfirst/Static.sh Sat Nov 18 14:41:06 2017 -0800 @@ -58,7 +58,7 @@ PATHSEP=":" FILESEP="/" @@ -692,8 +692,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/util/Currency/PropertiesTest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/util/Currency/PropertiesTest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/util/Currency/PropertiesTest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/util/Currency/PropertiesTest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -52,7 +52,7 @@ # set platform-dependent variables OS=`uname -s` @@ -703,8 +703,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -62,7 +62,7 @@ # set platform-dependent variables OS=`uname -s` @@ -714,8 +714,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Sat Nov 18 14:41:06 2017 -0800 @@ -31,7 +31,7 @@ # set platform-dependent variables OS=`uname -s` @@ -725,8 +725,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/util/ServiceLoader/basic.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/util/ServiceLoader/basic.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/util/ServiceLoader/basic.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/util/ServiceLoader/basic.sh Sat Nov 18 14:41:06 2017 -0800 @@ -43,9 +43,7 @@ OS=`uname -s` @@ -738,8 +738,8 @@ SEP=':' ;; * ) SEP='\;' ;; ---- ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Sat Nov 18 14:41:06 2017 -0800 @@ -31,7 +31,7 @@ OS=`uname -s` @@ -749,8 +749,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -56,7 +56,7 @@ # set platform-dependent variables OS=`uname -s` @@ -760,8 +760,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -89,7 +89,7 @@ FILESEP="/" ;; @@ -771,8 +771,8 @@ VAR="A different value for Linux" DEFAULT_JDK=/none #DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386 ---- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -90,7 +90,7 @@ FILESEP="/" ;; @@ -782,8 +782,8 @@ VAR="A different value for Linux" DEFAULT_JDK=/none #DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386 ---- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Sat Nov 18 14:41:06 2017 -0800 @@ -108,6 +108,14 @@ TMP="/tmp" ;; @@ -799,8 +799,8 @@ Windows* ) VAR="A different value for Win32" DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0" ---- ./jdk/test/javax/script/CommonSetup.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/javax/script/CommonSetup.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/javax/script/CommonSetup.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/javax/script/CommonSetup.sh Sat Nov 18 14:41:06 2017 -0800 @@ -36,7 +36,7 @@ OS=`uname -s` @@ -810,8 +810,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Sat Nov 18 14:41:06 2017 -0800 @@ -43,7 +43,7 @@ FS="/" RM="/bin/rm -f" @@ -821,8 +821,8 @@ PS=":" FS="/" RM="/bin/rm -f" ---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Sat Nov 18 14:41:06 2017 -0800 @@ -53,7 +53,7 @@ # set platform-dependent variables OS=`uname -s` @@ -832,8 +832,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Sat Nov 18 14:41:06 2017 -0800 @@ -53,8 +53,13 @@ return isOs("linux"); } @@ -849,8 +849,8 @@ } public static String getOsName() { ---- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Sat Nov 18 14:41:06 2017 -0800 @@ -107,8 +107,8 @@ public static void main(String[] args) throws AWTException, InvocationTargetException, InterruptedException { @@ -862,8 +862,8 @@ "skipping!"); return; } ---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Sat Nov 18 14:41:06 2017 -0800 @@ -42,7 +42,7 @@ fi @@ -873,8 +873,8 @@ PATHSEP=":" FILESEP="/" DFILESEP=$FILESEP ---- ./jdk/test/sun/net/ftp/MarkResetTest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/net/ftp/MarkResetTest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/net/ftp/MarkResetTest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/net/ftp/MarkResetTest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -884,8 +884,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Sat Nov 18 14:41:06 2017 -0800 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -895,8 +895,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Sat Nov 18 14:41:06 2017 -0800 @@ -31,7 +31,7 @@ OS=`uname -s` @@ -906,8 +906,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Sat Nov 18 14:41:06 2017 -0800 @@ -31,7 +31,7 @@ OS=`uname -s` @@ -917,8 +917,8 @@ PS=":" FS="/" CHMOD="${FS}bin${FS}chmod" ---- ./jdk/test/sun/nio/ch/SelProvider.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/nio/ch/SelProvider.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/nio/ch/SelProvider.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/nio/ch/SelProvider.java Sat Nov 18 14:41:06 2017 -0800 @@ -39,7 +39,7 @@ expected = "sun.nio.ch.DevPollSelectorProvider"; } else if ("Linux".equals(osname)) { @@ -928,8 +928,8 @@ expected = "sun.nio.ch.KQueueSelectorProvider"; } else { return; ---- ./jdk/test/sun/security/krb5/runNameEquals.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/krb5/runNameEquals.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/krb5/runNameEquals.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/krb5/runNameEquals.sh Sat Nov 18 14:41:06 2017 -0800 @@ -52,7 +52,7 @@ # set platform-dependent variables OS=`uname -s` @@ -939,8 +939,8 @@ PATHSEP=":" FILESEP="/" NATIVE=true ---- ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Sat Nov 18 14:41:06 2017 -0800 @@ -50,7 +50,7 @@ OS=`uname -s` @@ -950,8 +950,8 @@ FS="/" ;; Windows_* ) ---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Sat Nov 18 14:41:06 2017 -0800 @@ -66,7 +66,7 @@ CP="${FS}bin${FS}cp" CHMOD="${FS}bin${FS}chmod" @@ -961,8 +961,8 @@ FS="/" PS=":" CP="${FS}bin${FS}cp" ---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh Sat Nov 18 14:41:06 2017 -0800 @@ -67,7 +67,7 @@ CP="${FS}bin${FS}cp" CHMOD="${FS}bin${FS}chmod" @@ -972,8 +972,8 @@ FS="/" PS=":" CP="${FS}bin${FS}cp" ---- ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -50,7 +50,7 @@ # set platform-dependent variables OS=`uname -s` @@ -983,8 +983,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Sat Nov 18 14:41:06 2017 -0800 @@ -52,7 +52,7 @@ PATHSEP=":" FILESEP="/" @@ -994,8 +994,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Sat Nov 18 14:41:06 2017 -0800 @@ -59,7 +59,7 @@ PS=":" FS="/" @@ -1005,8 +1005,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Sat Nov 18 14:41:06 2017 -0800 @@ -33,7 +33,7 @@ OS=`uname -s` @@ -1016,8 +1016,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -46,7 +46,7 @@ OS=`uname -s` @@ -1027,8 +1027,8 @@ FILESEP="/" PATHSEP=":" ;; ---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Sat Nov 18 14:41:06 2017 -0800 @@ -32,7 +32,7 @@ HOSTNAME=`uname -n` OS=`uname -s` @@ -1038,8 +1038,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Sat Nov 18 14:41:06 2017 -0800 @@ -32,7 +32,7 @@ HOSTNAME=`uname -n` OS=`uname -s` @@ -1049,8 +1049,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Sat Nov 18 14:41:06 2017 -0800 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1060,8 +1060,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Sat Nov 18 14:41:06 2017 -0800 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1071,8 +1071,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/jarsigner/diffend.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/jarsigner/diffend.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh Sat Nov 18 14:41:06 2017 -0800 @@ -47,6 +47,13 @@ FS="/" CP="${FS}bin${FS}cp -f" @@ -1087,8 +1087,8 @@ CYGWIN* ) NULL=/dev/null PS=";" ---- ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -39,6 +39,11 @@ Windows_* ) FS="\\" @@ -1101,8 +1101,8 @@ * ) FS="/" ;; ---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Sat Nov 18 14:41:06 2017 -0800 @@ -42,7 +42,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1112,8 +1112,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Sat Nov 18 14:41:06 2017 -0800 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1123,8 +1123,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Sat Nov 18 14:41:06 2017 -0800 @@ -55,7 +55,7 @@ PATHSEP=":" FILESEP="/" @@ -1134,8 +1134,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Sat Nov 18 14:41:06 2017 -0800 @@ -48,7 +48,7 @@ Linux ) FILESEP="/" @@ -1145,8 +1145,8 @@ FILESEP="/" ;; AIX ) ---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Sat Nov 18 14:41:06 2017 -0800 @@ -45,7 +45,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1156,8 +1156,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Sat Nov 18 14:41:06 2017 -0800 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1167,8 +1167,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Sat Nov 18 14:41:06 2017 -0800 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1178,8 +1178,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/sun/security/tools/keytool/i18n.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/keytool/i18n.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/keytool/i18n.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/keytool/i18n.sh Sat Nov 18 14:41:06 2017 -0800 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1189,8 +1189,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/printssl.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/keytool/printssl.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/keytool/printssl.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/keytool/printssl.sh Sat Nov 18 14:41:06 2017 -0800 @@ -40,7 +40,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1200,8 +1200,8 @@ FS="/" ;; CYGWIN* ) ---- ./jdk/test/sun/security/tools/keytool/resource.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/keytool/resource.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/keytool/resource.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/keytool/resource.sh Sat Nov 18 14:41:06 2017 -0800 @@ -43,7 +43,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1211,8 +1211,8 @@ NULL=/dev/null FS="/" ;; ---- ./jdk/test/sun/security/tools/keytool/standard.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/keytool/standard.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/keytool/standard.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/keytool/standard.sh Sat Nov 18 14:41:06 2017 -0800 @@ -45,7 +45,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1222,8 +1222,8 @@ FS="/" ;; Windows_* ) ---- ./jdk/test/sun/security/tools/policytool/Alias.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/policytool/Alias.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/policytool/Alias.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/policytool/Alias.sh Sat Nov 18 14:41:06 2017 -0800 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1233,8 +1233,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Sat Nov 18 14:41:06 2017 -0800 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1244,8 +1244,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Sat Nov 18 14:41:06 2017 -0800 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1255,8 +1255,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh Sat Nov 18 14:41:06 2017 -0800 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1266,8 +1266,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Sat Nov 18 14:41:06 2017 -0800 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1277,8 +1277,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Sat Nov 18 14:41:06 2017 -0800 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1288,8 +1288,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/i18n.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/security/tools/policytool/i18n.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/security/tools/policytool/i18n.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/security/tools/policytool/i18n.sh Sat Nov 18 14:41:06 2017 -0800 @@ -49,7 +49,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1299,8 +1299,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/tools/common/CommonSetup.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/tools/common/CommonSetup.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/tools/common/CommonSetup.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/tools/common/CommonSetup.sh Sat Nov 18 14:41:06 2017 -0800 @@ -47,6 +47,7 @@ # isLinux - true if OS is Linux # isSolaris - true if OS is Solaris @@ -1328,8 +1328,8 @@ Darwin ) OS="Mac OS X" isMacos=true ---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -54,7 +54,7 @@ OS=`uname -s` @@ -1339,8 +1339,8 @@ PATHSEP=":" ;; ---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Sat Nov 18 14:41:06 2017 -0800 @@ -56,7 +56,7 @@ OS=`uname -s` @@ -1350,8 +1350,8 @@ PATHSEP=":" ;; ---- ./jdk/test/tools/launcher/ExecutionEnvironment.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/tools/launcher/ExecutionEnvironment.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/tools/launcher/ExecutionEnvironment.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/tools/launcher/ExecutionEnvironment.java Sat Nov 18 14:41:06 2017 -0800 @@ -194,7 +194,7 @@ Map<String, String> env = new HashMap<>(); @@ -1361,8 +1361,8 @@ for (String x : LD_PATH_STRINGS) { String pairs[] = x.split("="); env.put(pairs[0], pairs[1]); ---- ./jdk/test/tools/launcher/RunpathTest.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/tools/launcher/RunpathTest.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/tools/launcher/RunpathTest.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/tools/launcher/RunpathTest.java Sat Nov 18 14:41:06 2017 -0800 @@ -69,7 +69,7 @@ } @@ -1372,8 +1372,8 @@ RunpathTest rp = new RunpathTest(); rp.testRpath(); } ---- ./jdk/test/tools/launcher/Test7029048.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/tools/launcher/Test7029048.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/tools/launcher/Test7029048.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/tools/launcher/Test7029048.java Sat Nov 18 14:41:06 2017 -0800 @@ -223,7 +223,7 @@ } else if (isSolaris && passes < 9) { throw new Exception("Test7029048: FAIL: " + @@ -1383,8 +1383,8 @@ throw new Exception("Test7029048: FAIL: " + "all tests did not run, expected " + 6 + " got " + passes); } else { ---- ./jdk/test/tools/launcher/TestHelper.java Tue Jul 11 23:52:06 2017 -0700 -+++ ./jdk/test/tools/launcher/TestHelper.java Sat Aug 26 22:08:20 2017 -0700 +--- ./jdk/test/tools/launcher/TestHelper.java Tue Sep 05 18:56:11 2017 -0700 ++++ ./jdk/test/tools/launcher/TestHelper.java Sat Nov 18 14:41:06 2017 -0800 @@ -94,6 +94,8 @@ System.getProperty("os.name", "unknown").startsWith("Linux"); static final boolean isAIX = @@ -1394,15 +1394,8 @@ static final String LIBJVM = isWindows ? "jvm.dll" : "libjvm" + (isMacOSX ? ".dylib" : ".so"); ---- ./langtools/.hgtags Tue Jul 11 23:52:44 2017 -0700 -+++ ./langtools/.hgtags Sat Aug 26 21:38:16 2017 -0700 -@@ -710,3 +710,4 @@ - 9a5ddb594b491ec32e9fafa7008631291ab66d6e jdk8u141-b13 - 553043f3a2319af6fd6bc704bc8fd7fa4500ee80 jdk8u141-b14 - 027f6df9fe82624fb7d489ffd848a26796de4868 jdk8u141-b15 -+4c355f7002c36bb626b42d5c1d42ea91d77ba5d6 jdk8u144-b00 ---- ./langtools/test/Makefile Tue Jul 11 23:52:44 2017 -0700 -+++ ./langtools/test/Makefile Sat Aug 26 21:38:16 2017 -0700 +--- ./langtools/test/Makefile Tue Sep 05 19:22:39 2017 -0700 ++++ ./langtools/test/Makefile Sat Nov 18 08:32:29 2017 -0800 @@ -34,6 +34,14 @@ ARCH=i586 endif @@ -1418,8 +1411,8 @@ ifeq ($(OSNAME), Darwin) PLATFORM = bsd ARCH = $(shell uname -m) ---- ./langtools/test/tools/javah/ReadOldClass.sh Tue Jul 11 23:52:44 2017 -0700 -+++ ./langtools/test/tools/javah/ReadOldClass.sh Sat Aug 26 21:38:16 2017 -0700 +--- ./langtools/test/tools/javah/ReadOldClass.sh Tue Sep 05 19:22:39 2017 -0700 ++++ ./langtools/test/tools/javah/ReadOldClass.sh Sat Nov 18 08:32:29 2017 -0800 @@ -43,7 +43,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1429,8 +1422,8 @@ PS=":" FS="/" ;; ---- ./nashorn/test/script/jfx.js Tue Jul 11 23:52:52 2017 -0700 -+++ ./nashorn/test/script/jfx.js Sat Aug 26 21:38:18 2017 -0700 +--- ./nashorn/test/script/jfx.js Tue Sep 05 19:25:16 2017 -0700 ++++ ./nashorn/test/script/jfx.js Sat Nov 18 08:32:58 2017 -0800 @@ -93,6 +93,8 @@ f2 = new File(sb.append(fsep + "linux.png").toString()); } else if (OSInfo.getOSType() == OSType.MACOSX) { |