diff options
author | Greg Lewis <glewis@FreeBSD.org> | 2018-09-08 20:53:33 +0000 |
---|---|---|
committer | Greg Lewis <glewis@FreeBSD.org> | 2018-09-08 20:53:33 +0000 |
commit | 1e0bab92eb8624c72267a87b99b876b02d1c7b1c (patch) | |
tree | a29775e5ef27c2ba4daaeeb66dc755d674379542 /java | |
parent | 214f9536562d673169982e8f5ee2f1db6eab8803 (diff) |
. Update to 8u181.
Notes
Notes:
svn path=/head/; revision=479258
Diffstat (limited to 'java')
-rw-r--r-- | java/openjdk8/Makefile | 8 | ||||
-rw-r--r-- | java/openjdk8/distinfo | 4 | ||||
-rw-r--r-- | java/openjdk8/files/patch-bsd | 1022 | ||||
-rw-r--r-- | java/openjdk8/files/patch-bsd-test | 483 | ||||
-rw-r--r-- | java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp | 13 |
5 files changed, 849 insertions, 681 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index d87fc43c16a6..e552b803077d 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -2,7 +2,6 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} -PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \ @@ -33,7 +32,8 @@ PATCHFILES= patch-8u05-b13.xz \ patch-8u144-b01.xz \ patch-8u152-b16.xz \ patch-8u162-b12.xz \ - patch-8u172-b11.xz + patch-8u172-b11.xz \ + patch-8u181-b13.xz MAINTAINER= java@FreeBSD.org COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} @@ -206,8 +206,8 @@ NO_CCACHE= yes NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 172 -JDK_BUILD_NUMBER= 11 +JDK_UPDATE_VERSION= 181 +JDK_BUILD_NUMBER= 13 DIST_BUILD_NUMBER= 132 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo index f882f000f46a..539bcf388347 100644 --- a/java/openjdk8/distinfo +++ b/java/openjdk8/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1517683323 +TIMESTAMP = 1536423017 SHA256 (openjdk-8-src-b132-03_mar_2014.zip) = ba651f9aa68fdc823b2ef55510710a013ab9f78fff291d5dc1c4d166f3e1e589 SIZE (openjdk-8-src-b132-03_mar_2014.zip) = 124099402 SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c @@ -47,3 +47,5 @@ SHA256 (patch-8u162-b12.xz) = 9f083cde406ead14e38f5423a6dcc0f0b0a3f7ef69fdc4c83a SIZE (patch-8u162-b12.xz) = 337248 SHA256 (patch-8u172-b11.xz) = e338a1dc63cc08f9227d685e350e60609e43612f18773213b882d78c7c559934 SIZE (patch-8u172-b11.xz) = 146716 +SHA256 (patch-8u181-b13.xz) = 4cd0f5a04b72ad6c4ef73807d6a42e141394f5c38cee8ce11c0159a080073839 +SIZE (patch-8u181-b13.xz) = 69096 diff --git a/java/openjdk8/files/patch-bsd b/java/openjdk8/files/patch-bsd index 5f403e335da9..42f1e3399663 100644 --- a/java/openjdk8/files/patch-bsd +++ b/java/openjdk8/files/patch-bsd @@ -1,5 +1,5 @@ ---- ./common/autoconf/build-performance.m4 Mon Mar 19 11:56:10 2018 -0700 -+++ ./common/autoconf/build-performance.m4 Sat May 19 22:20:07 2018 -0700 +--- ./common/autoconf/build-performance.m4 Sat Jun 23 21:01:22 2018 -0700 ++++ ./common/autoconf/build-performance.m4 Mon Sep 03 11:10:31 2018 -0700 @@ -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 Mon Mar 19 11:56:10 2018 -0700 -+++ ./common/autoconf/generated-configure.sh Sat May 19 22:20:07 2018 -0700 +--- ./common/autoconf/generated-configure.sh Sat Jun 23 21:01:22 2018 -0700 ++++ ./common/autoconf/generated-configure.sh Mon Sep 03 11:10:31 2018 -0700 @@ -646,6 +646,8 @@ LIBM LIBZIP_CAN_USE_MMAP @@ -372,7 +372,23 @@ fi if test "x$DEBUG_LEVEL" = xrelease; then COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DNDEBUG" -@@ -30640,11 +30751,18 @@ +@@ -30187,6 +30298,15 @@ + # Should this be supplied to the OSS linker as well? + LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1" + fi ++ elif test "x$OPENJDK_TARGET_OS" = xbsd; then ++ # And since we now know that the linker is gnu, then add: ++ # -z noexecstack, to mark stack regions as non-executable ++ LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker noexecstack" ++ if test "x$DEBUG_LEVEL" = "xrelease"; then ++ # When building release libraries, tell the linker optimize them. ++ # Should this be supplied to the OSS linker as well? ++ LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1" ++ fi + fi + fi + LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \ +@@ -30641,11 +30761,18 @@ fi if test "x$OPENJDK_TARGET_OS" = xbsd; then @@ -396,7 +412,7 @@ fi if test "x$OPENJDK" = "xfalse"; then -@@ -30680,14 +30798,18 @@ +@@ -30681,14 +30808,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 @@ -417,7 +433,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" -@@ -31734,6 +31856,10 @@ +@@ -31735,6 +31866,10 @@ # A CSW package seems to be installed! CUPS_FOUND=yes CUPS_CFLAGS="-I/opt/csw/include" @@ -428,7 +444,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5 $as_echo "$CUPS_FOUND" >&6; } -@@ -34899,7 +35025,7 @@ +@@ -34900,7 +35035,7 @@ ############################################################################### # @@ -437,7 +453,7 @@ # # Check whether --with-alsa was given. -@@ -35307,15 +35433,66 @@ +@@ -35308,15 +35443,66 @@ if test "x${with_giflib}" = "xbundled"; then USE_EXTERNAL_LIBGIF=false @@ -509,7 +525,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 : -@@ -35353,16 +35530,96 @@ +@@ -35354,16 +35540,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 : @@ -616,7 +632,7 @@ USE_EXTERNAL_LIBGIF=true else -@@ -35370,6 +35627,8 @@ +@@ -35371,6 +35637,8 @@ fi @@ -625,7 +641,7 @@ ############################################################################### # # Check for the zlib library -@@ -35937,6 +36196,11 @@ +@@ -35938,6 +36206,11 @@ LIBCXX="-lstdc++" fi @@ -637,7 +653,7 @@ -@@ -36010,6 +36274,10 @@ +@@ -36011,6 +36284,10 @@ # Looks like a MacOSX system NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print $5}'` FOUND_CORES=yes @@ -648,7 +664,7 @@ elif test "x$OPENJDK_BUILD_OS" = xaix ; then NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print $4 }'` FOUND_CORES=yes -@@ -36065,6 +36333,15 @@ +@@ -36066,6 +36343,15 @@ MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print $2}'` MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024` FOUND_MEM=yes @@ -664,7 +680,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-` -@@ -36472,8 +36749,8 @@ +@@ -36473,8 +36759,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; } @@ -675,8 +691,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 Mon Mar 19 11:56:10 2018 -0700 -+++ ./common/autoconf/jdk-options.m4 Sat May 19 22:20:07 2018 -0700 +--- ./common/autoconf/jdk-options.m4 Sat Jun 23 21:01:22 2018 -0700 ++++ ./common/autoconf/jdk-options.m4 Mon Sep 03 11:10:31 2018 -0700 @@ -159,7 +159,7 @@ INCLUDE_SA=false fi @@ -707,8 +723,8 @@ # Enable or disable the elliptic curve crypto implementation # AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC], ---- ./common/autoconf/libraries.m4 Mon Mar 19 11:56:10 2018 -0700 -+++ ./common/autoconf/libraries.m4 Sat May 19 22:20:07 2018 -0700 +--- ./common/autoconf/libraries.m4 Sat Jun 23 21:01:22 2018 -0700 ++++ ./common/autoconf/libraries.m4 Mon Sep 03 11:10:31 2018 -0700 @@ -69,9 +69,15 @@ fi @@ -846,8 +862,8 @@ + AC_SUBST(LIBCXX) ]) ---- ./common/autoconf/platform.m4 Mon Mar 19 11:56:10 2018 -0700 -+++ ./common/autoconf/platform.m4 Sat May 19 22:20:07 2018 -0700 +--- ./common/autoconf/platform.m4 Sat Jun 23 21:01:22 2018 -0700 ++++ ./common/autoconf/platform.m4 Mon Sep 03 11:10:31 2018 -0700 @@ -30,7 +30,7 @@ [ # First argument is the cpu name from the trip/quad @@ -907,8 +923,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 Mon Mar 19 11:56:10 2018 -0700 -+++ ./common/autoconf/spec.gmk.in Sat May 19 22:20:07 2018 -0700 +--- ./common/autoconf/spec.gmk.in Sat Jun 23 21:01:22 2018 -0700 ++++ ./common/autoconf/spec.gmk.in Mon Sep 03 11:10:31 2018 -0700 @@ -76,6 +76,7 @@ OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@ OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@ @@ -945,8 +961,8 @@ USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@ LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@ MSVCR_DLL:=@MSVCR_DLL@ ---- ./common/autoconf/toolchain.m4 Mon Mar 19 11:56:10 2018 -0700 -+++ ./common/autoconf/toolchain.m4 Sat May 19 22:20:07 2018 -0700 +--- ./common/autoconf/toolchain.m4 Sat Jun 23 21:01:22 2018 -0700 ++++ ./common/autoconf/toolchain.m4 Mon Sep 03 11:10:31 2018 -0700 @@ -122,7 +122,7 @@ else COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1` @@ -1064,16 +1080,32 @@ fi if test "x$DEBUG_LEVEL" = xrelease; then COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DNDEBUG" ---- ./configure Mon Mar 19 11:56:10 2018 -0700 -+++ ./configure Sat May 19 22:20:07 2018 -0700 +@@ -1220,6 +1251,15 @@ + # Should this be supplied to the OSS linker as well? + LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1" + fi ++ elif test "x$OPENJDK_TARGET_OS" = xbsd; then ++ # And since we now know that the linker is gnu, then add: ++ # -z noexecstack, to mark stack regions as non-executable ++ LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker noexecstack" ++ if test "x$DEBUG_LEVEL" = "xrelease"; then ++ # When building release libraries, tell the linker optimize them. ++ # Should this be supplied to the OSS linker as well? ++ LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1" ++ fi + fi + fi + LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \ +--- ./configure Sat Jun 23 21:01:22 2018 -0700 ++++ ./configure Mon Sep 03 11:10:31 2018 -0700 @@ -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 Mon Mar 19 11:56:10 2018 -0700 -+++ ./make/Javadoc.gmk Sat May 19 22:20:07 2018 -0700 +--- ./make/Javadoc.gmk Sat Jun 23 21:01:22 2018 -0700 ++++ ./make/Javadoc.gmk Mon Sep 03 11:10:31 2018 -0700 @@ -46,8 +46,18 @@ BUILD_NUMBER=$(JDK_BUILD_NUMBER) @@ -1094,8 +1126,8 @@ -Djava.awt.headless=true \ $(NEW_JAVADOC) \ -bootclasspath $(JDK_OUTPUTDIR)/classes ---- ./make/Main.gmk Mon Mar 19 11:56:10 2018 -0700 -+++ ./make/Main.gmk Sat May 19 22:20:07 2018 -0700 +--- ./make/Main.gmk Sat Jun 23 21:01:22 2018 -0700 ++++ ./make/Main.gmk Mon Sep 03 11:10:31 2018 -0700 @@ -58,7 +58,11 @@ # Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line, @@ -1108,8 +1140,8 @@ ### Main targets ---- ./make/common/MakeBase.gmk Mon Mar 19 11:56:10 2018 -0700 -+++ ./make/common/MakeBase.gmk Sat May 19 22:20:07 2018 -0700 +--- ./make/common/MakeBase.gmk Sat Jun 23 21:01:22 2018 -0700 ++++ ./make/common/MakeBase.gmk Mon Sep 03 11:10:31 2018 -0700 @@ -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. @@ -1130,8 +1162,8 @@ endef # Make directory without forking mkdir if not needed ---- ./make/common/NativeCompilation.gmk Mon Mar 19 11:56:10 2018 -0700 -+++ ./make/common/NativeCompilation.gmk Sat May 19 22:20:07 2018 -0700 +--- ./make/common/NativeCompilation.gmk Sat Jun 23 21:01:22 2018 -0700 ++++ ./make/common/NativeCompilation.gmk Mon Sep 03 11:10:31 2018 -0700 @@ -151,9 +151,9 @@ # CC the compiler to use, default is $(CC) # LDEXE the linker to use for linking executables, default is $(LDEXE) @@ -1145,8 +1177,8 @@ ifneq (,$$($1_BIN)) $$(error BIN has been replaced with OBJECT_DIR) ---- ./hotspot/agent/make/Makefile Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/agent/make/Makefile Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/agent/make/Makefile Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/agent/make/Makefile Mon Sep 03 11:13:04 2018 -0700 @@ -50,6 +50,7 @@ sun.jvm.hotspot.debugger.amd64 \ sun.jvm.hotspot.debugger.bsd \ @@ -1225,8 +1257,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 Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Mon Sep 03 11:13:04 2018 -0700 @@ -42,6 +42,10 @@ #include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h" #endif @@ -1295,8 +1327,20 @@ (*env)->ReleaseLongArrayElements(env, array, regs, JNI_COMMIT); return array; ---- ./hotspot/agent/src/os/bsd/elfmacros.h Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/agent/src/os/bsd/elfmacros.h Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/agent/src/os/bsd/Makefile Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/agent/src/os/bsd/Makefile Mon Sep 03 11:13:04 2018 -0700 +@@ -85,6 +85,9 @@ + LFLAGS_LIBSA = -Xlinker --version-script=mapfile + endif + ++LDFLAGS_NO_EXEC_STACK="-Wl,-z,noexecstack" ++LFLAGS_LIBSA += $(LDFLAGS_NO_EXEC_STACK) ++ + $(LIBSA): $(OBJSPLUS) mapfile + if [ ! -d $(ARCH) ] ; then mkdir $(ARCH) ; fi + $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(FOUNDATIONFLAGS) $(OBJSPLUS) $(LIBS) $(SALIBS) +--- ./hotspot/agent/src/os/bsd/elfmacros.h Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/agent/src/os/bsd/elfmacros.h Mon Sep 03 11:13:04 2018 -0700 @@ -34,6 +34,7 @@ #define ELF_SYM Elf64_Sym #define ELF_DYN Elf64_Dyn @@ -1313,8 +1357,8 @@ #ifndef ELF_ST_TYPE #define ELF_ST_TYPE ELF32_ST_TYPE ---- ./hotspot/agent/src/os/bsd/ps_core.c Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/agent/src/os/bsd/ps_core.c Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/agent/src/os/bsd/ps_core.c Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/agent/src/os/bsd/ps_core.c Mon Sep 03 11:13:04 2018 -0700 @@ -1091,6 +1091,18 @@ if (core_handle_prstatus(ph, descdata, notep->n_descsz) != true) { return false; @@ -1361,8 +1405,8 @@ goto err; } ---- ./hotspot/agent/src/os/bsd/symtab.c Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/agent/src/os/bsd/symtab.c Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/agent/src/os/bsd/symtab.c Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/agent/src/os/bsd/symtab.c Mon Sep 03 11:13:04 2018 -0700 @@ -211,6 +211,10 @@ // Reading of elf header @@ -1403,8 +1447,8 @@ key.data = sym_name; key.size = strlen(sym_name) + 1; ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Mon Sep 03 11:13:04 2018 -0700 @@ -33,6 +33,7 @@ import sun.jvm.hotspot.debugger.JVMDebugger; import sun.jvm.hotspot.debugger.MachineDescription; @@ -1423,7 +1467,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1468,8 +1512,8 @@ + return false; + } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Mon Sep 03 11:13:04 2018 -0700 @@ -30,8 +30,10 @@ import sun.jvm.hotspot.debugger.cdbg.*; import sun.jvm.hotspot.debugger.x86.*; @@ -1495,8 +1539,8 @@ } else { throw new DebuggerException(cpu + " is not yet supported"); } ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Mon Sep 03 11:13:04 2018 -0700 @@ -27,6 +27,7 @@ import sun.jvm.hotspot.debugger.*; import sun.jvm.hotspot.debugger.bsd.amd64.*; @@ -1515,7 +1559,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1597,7 +1641,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1646,7 +1690,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java Sat May 19 23:14:15 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1771,8 +1815,8 @@ + public abstract Address getRegisterAsAddress(int index); + +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Mon Sep 03 11:13:04 2018 -0700 @@ -32,7 +32,9 @@ import sun.jvm.hotspot.debugger.cdbg.*; import sun.jvm.hotspot.debugger.proc.amd64.*; @@ -1795,7 +1839,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1884,7 +1928,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1933,7 +1977,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1979,8 +2023,8 @@ + return new ProcPPC64Thread(debugger, id); + } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Mon Sep 03 11:13:04 2018 -0700 @@ -33,6 +33,7 @@ import sun.jvm.hotspot.debugger.remote.sparc.*; import sun.jvm.hotspot.debugger.remote.x86.*; @@ -2002,7 +2046,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2058,7 +2102,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2111,7 +2155,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2157,8 +2201,8 @@ + return new RemotePPC64Thread(debugger, id); + } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Mon Sep 03 11:13:04 2018 -0700 @@ -37,6 +37,7 @@ import sun.jvm.hotspot.runtime.linux_sparc.LinuxSPARCJavaThreadPDAccess; import sun.jvm.hotspot.runtime.bsd_x86.BsdX86JavaThreadPDAccess; @@ -2177,7 +2221,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ppc64/BsdPPC64JavaThreadPDAccess.java Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2312,7 +2356,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java Sat May 19 23:14:15 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,176 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2491,7 +2535,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java Sat May 19 23:14:15 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,508 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -3002,7 +3046,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java Sat May 19 23:14:15 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -3048,7 +3092,7 @@ + +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java Sat May 19 23:14:15 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,51 @@ +/* + * Copyright (c) 20014, Oracle and/or its affiliates. All rights reserved. @@ -3101,8 +3145,8 @@ + protected void initializeFromPD(RegisterMap map) {} + protected Address getLocationPD(VMReg reg) { return null; } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Mon Sep 03 11:13:04 2018 -0700 @@ -61,7 +61,7 @@ return "x86"; } else if (cpu.equals("sparc") || cpu.equals("sparcv9")) { @@ -3112,8 +3156,8 @@ return cpu; } else { try { ---- ./hotspot/make/bsd/Makefile Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/make/bsd/Makefile Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/make/bsd/Makefile Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/make/bsd/Makefile Mon Sep 03 11:13:04 2018 -0700 @@ -66,6 +66,10 @@ FORCE_TIERED=1 endif @@ -3125,8 +3169,8 @@ ifdef LP64 ifeq ("$(filter $(LP64_ARCH),$(BUILDARCH))","") ---- ./hotspot/make/bsd/makefiles/build_vm_def.sh Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/make/bsd/makefiles/build_vm_def.sh Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Mon Sep 03 11:13:04 2018 -0700 @@ -1,12 +1,28 @@ #!/bin/sh @@ -3162,8 +3206,8 @@ + if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";" + }' | sort -u ;; +esac ---- ./hotspot/make/bsd/makefiles/debug.make Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/make/bsd/makefiles/debug.make Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/make/bsd/makefiles/debug.make Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/debug.make Mon Sep 03 11:13:04 2018 -0700 @@ -35,7 +35,10 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -3176,8 +3220,8 @@ VERSION = debug SYSDEFS += -DASSERT ---- ./hotspot/make/bsd/makefiles/defs.make Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/make/bsd/makefiles/defs.make Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/make/bsd/makefiles/defs.make Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/defs.make Mon Sep 03 11:13:04 2018 -0700 @@ -29,7 +29,15 @@ SLASH_JAVA ?= /java @@ -3276,8 +3320,8 @@ ADD_SA_BINARIES/ia64 = ADD_SA_BINARIES/arm = ADD_SA_BINARIES/zero = ---- ./hotspot/make/bsd/makefiles/fastdebug.make Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/make/bsd/makefiles/fastdebug.make Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/make/bsd/makefiles/fastdebug.make Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/fastdebug.make Mon Sep 03 11:13:04 2018 -0700 @@ -56,7 +56,10 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -3290,8 +3334,8 @@ VERSION = fastdebug SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS ---- ./hotspot/make/bsd/makefiles/gcc.make Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/make/bsd/makefiles/gcc.make Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/make/bsd/makefiles/gcc.make Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/gcc.make Mon Sep 03 11:13:04 2018 -0700 @@ -168,6 +168,9 @@ CFLAGS += -DDONT_USE_PRECOMPILED_HEADER endif @@ -3344,7 +3388,26 @@ ifeq ($(USE_CLANG),) WARNING_FLAGS += -Wconversion endif -@@ -421,53 +431,44 @@ +@@ -318,6 +328,9 @@ + OPT_CFLAGS/loopTransform.o += $(OPT_CFLAGS/NOOPT) + OPT_CFLAGS/unsafe.o += -O1 + endif ++ ifeq ($(shell expr $(CC_VER_MAJOR) = 6 \& $(CC_VER_MINOR) = 0), 1) ++ OPT_CFLAGS/unsafe.o += -O1 ++ endif + else + # 6835796. Problem in GCC 4.3.0 with mulnode.o optimized compilation. + ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 3), 1) +@@ -379,6 +392,8 @@ + # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file. + MAPFLAG = -Xlinker --version-script=FILENAME + ++LDFLAGS_NO_EXEC_STACK="-Wl,-z,noexecstack" ++ + # + # Shared Library + # +@@ -421,53 +436,44 @@ CFLAGS += -flimit-debug-info endif @@ -3429,8 +3492,19 @@ endif endif +--- ./hotspot/make/bsd/makefiles/jsig.make Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/jsig.make Mon Sep 03 11:13:04 2018 -0700 +@@ -52,7 +52,7 @@ + # cause problems with interposing. See CR: 6466665 + # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE)) + +-LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) ++LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK) + + # DEBUG_BINARIES overrides everything, use full -g debug information + ifeq ($(DEBUG_BINARIES), true) --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/makefiles/launcher.make Sat May 19 23:14:15 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/launcher.make Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,117 @@ +# +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. @@ -3549,8 +3623,8 @@ + $(QUIETLY) sed -e 's/@@LIBARCH@@/$(LIBARCH)/g' $< > $@ + $(QUIETLY) chmod +x $@ + ---- ./hotspot/make/bsd/makefiles/mapfile-vers-debug Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/make/bsd/makefiles/mapfile-vers-debug Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug Mon Sep 03 11:13:04 2018 -0700 @@ -21,246 +21,254 @@ # questions. # @@ -4038,7 +4112,7 @@ + *; +}; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx Sat May 19 23:14:15 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,266 @@ +# +# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. @@ -4306,8 +4380,8 @@ + + # INSERT VTABLE SYMBOLS HERE + ---- ./hotspot/make/bsd/makefiles/mapfile-vers-product Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/make/bsd/makefiles/mapfile-vers-product Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Mon Sep 03 11:13:04 2018 -0700 @@ -21,241 +21,249 @@ # questions. # @@ -4786,7 +4860,7 @@ + *; +}; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx Sat May 19 23:14:15 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,261 @@ +# +# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. @@ -5049,8 +5123,8 @@ + + # INSERT VTABLE SYMBOLS HERE + ---- ./hotspot/make/bsd/makefiles/optimized.make Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/make/bsd/makefiles/optimized.make Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/make/bsd/makefiles/optimized.make Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/optimized.make Mon Sep 03 11:13:04 2018 -0700 @@ -38,6 +38,9 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -5063,7 +5137,7 @@ VERSION = optimized --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/makefiles/ppc64.make Sat May 19 23:14:15 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/ppc64.make Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,51 @@ +# +# Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. @@ -5116,8 +5190,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 Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/make/bsd/makefiles/product.make Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/make/bsd/makefiles/product.make Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/product.make Mon Sep 03 11:13:04 2018 -0700 @@ -38,7 +38,10 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -5130,8 +5204,8 @@ SYSDEFS += -DPRODUCT VERSION = optimized ---- ./hotspot/make/bsd/makefiles/rules.make Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/make/bsd/makefiles/rules.make Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/make/bsd/makefiles/rules.make Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/rules.make Mon Sep 03 11:13:04 2018 -0700 @@ -34,7 +34,7 @@ CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS) CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS) @@ -5141,8 +5215,8 @@ COMPILE.CC = $(CC_COMPILE) -c GENASM.CC = $(CC_COMPILE) -S ---- ./hotspot/make/bsd/makefiles/sa.make Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/make/bsd/makefiles/sa.make Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/make/bsd/makefiles/sa.make Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/sa.make Mon Sep 03 11:13:04 2018 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. @@ -5257,8 +5331,8 @@ rm -rf $(AGENT_FILES_LIST) + +-include $(HS_ALT_MAKE)/bsd/makefiles/sa-rules.make ---- ./hotspot/make/bsd/makefiles/saproc.make Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/make/bsd/makefiles/saproc.make Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/make/bsd/makefiles/saproc.make Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/saproc.make Mon Sep 03 11:13:04 2018 -0700 @@ -99,10 +99,10 @@ endif @@ -5298,8 +5372,8 @@ + cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done" .PHONY: install_saproc ---- ./hotspot/make/bsd/makefiles/vm.make Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/make/bsd/makefiles/vm.make Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/make/bsd/makefiles/vm.make Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/make/bsd/makefiles/vm.make Mon Sep 03 11:13:04 2018 -0700 @@ -107,7 +107,7 @@ # File specific flags CXXFLAGS += $(CXXFLAGS/BYFILE) @@ -5310,7 +5384,7 @@ endif --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/platform_ppc64 Sat May 19 23:14:15 2018 -0700 ++++ ./hotspot/make/bsd/platform_ppc64 Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,17 @@ +os_family = bsd + @@ -5329,8 +5403,8 @@ +gnu_dis_arch = ppc64 + +sysdefs = -DBSD -D_ALLBSD_SOURCE -D_GNU_SOURCE -DPPC64 ---- ./hotspot/make/sa.files Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/make/sa.files Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/make/sa.files Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/make/sa.files Mon Sep 03 11:13:04 2018 -0700 @@ -45,6 +45,7 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/amd64/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/*.java \ @@ -5371,8 +5445,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 Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -277,5 +277,9 @@ #if defined(TARGET_OS_ARCH_linux_ppc) #include "bytes_linux_ppc.inline.hpp" @@ -5383,8 +5457,8 @@ + #endif // CPU_PPC_VM_BYTES_PPC_HPP ---- ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -307,6 +307,8 @@ // Although AIX runs on big endian CPU, float is in most significant // word of an argument slot. @@ -5394,8 +5468,8 @@ #else #error "unknown OS" #endif ---- ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -780,6 +780,8 @@ // Although AIX runs on big endian CPU, float is in the most // significant word of an argument slot. @@ -5405,8 +5479,8 @@ #else #error "unknown OS" #endif ---- ./hotspot/src/cpu/x86/vm/jni_x86.h Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/cpu/x86/vm/jni_x86.h Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/cpu/x86/vm/jni_x86.h Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/cpu/x86/vm/jni_x86.h Mon Sep 03 11:13:04 2018 -0700 @@ -34,7 +34,7 @@ #ifndef __has_attribute #define __has_attribute(x) 0 @@ -5416,8 +5490,8 @@ #define JNIEXPORT __attribute__((visibility("default"))) #define JNIIMPORT __attribute__((visibility("default"))) #else ---- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -2266,7 +2266,7 @@ if (!is_critical_native) { // reset handle block @@ -5427,8 +5501,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 Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -23,9 +23,12 @@ */ @@ -5443,8 +5517,8 @@ #include "asm/macroAssembler.hpp" #include "asm/macroAssembler.inline.hpp" #include "code/debugInfoRec.hpp" ---- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -1293,7 +1293,7 @@ // reset handle block @@ -5454,8 +5528,8 @@ // If result was an oop then unbox and save it in the frame { Label L; ---- ./hotspot/src/cpu/x86/vm/x86_32.ad Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/cpu/x86/vm/x86_32.ad Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/cpu/x86/vm/x86_32.ad Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/cpu/x86/vm/x86_32.ad Mon Sep 03 11:13:04 2018 -0700 @@ -1250,6 +1250,7 @@ @@ -5464,8 +5538,8 @@ } #ifndef PRODUCT ---- ./hotspot/src/os/aix/vm/os_aix.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/os/aix/vm/os_aix.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/os/aix/vm/os_aix.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/os/aix/vm/os_aix.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -5236,6 +5236,10 @@ return 0; } @@ -5478,7 +5552,7 @@ } --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Sat May 19 23:14:15 2018 -0700 ++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. @@ -5533,8 +5607,8 @@ + return false; +} +#endif ---- ./hotspot/src/os/bsd/vm/jsig.c Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/os/bsd/vm/jsig.c Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/os/bsd/vm/jsig.c Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/os/bsd/vm/jsig.c Mon Sep 03 11:13:04 2018 -0700 @@ -165,9 +165,8 @@ } @@ -5547,8 +5621,8 @@ static int call_os_sigaction(int sig, const struct sigaction *act, struct sigaction *oact) { ---- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -50,6 +50,7 @@ case INTERRUPT_SIGNAL: case SIGFPE: @@ -5658,8 +5732,8 @@ + jio_snprintf(buf, len, "SIG%s", signame); + return true; } ---- ./hotspot/src/os/bsd/vm/jvm_bsd.h Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/os/bsd/vm/jvm_bsd.h Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/os/bsd/vm/jvm_bsd.h Mon Sep 03 11:13:04 2018 -0700 @@ -112,20 +112,6 @@ #define SHUTDOWN2_SIGNAL SIGINT #define SHUTDOWN3_SIGNAL SIGTERM @@ -5681,8 +5755,8 @@ #endif /* JVM_MD_H */ #endif // OS_BSD_VM_JVM_BSD_H ---- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -30,7 +30,7 @@ void OSThread::pd_initialize() { @@ -5692,8 +5766,8 @@ _thread_id = 0; #else _thread_id = NULL; ---- ./hotspot/src/os/bsd/vm/os_bsd.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/os/bsd/vm/os_bsd.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -97,16 +97,31 @@ # include <sys/shm.h> #ifndef __APPLE__ @@ -6497,8 +6571,8 @@ } #ifndef PRODUCT ---- ./hotspot/src/os/bsd/vm/os_bsd.hpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/os/bsd/vm/os_bsd.hpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -58,12 +58,16 @@ // For signal flags diagnostics static int sigflags[MAXSIGNUM]; @@ -6587,8 +6661,8 @@ } }; ---- ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -33,30 +33,50 @@ #include <sys/syscall.h> #include <unistd.h> @@ -6650,8 +6724,8 @@ os::fork_and_exec(buf); yes = false; } ---- ./hotspot/src/os/linux/vm/os_linux.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/os/linux/vm/os_linux.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/os/linux/vm/os_linux.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/os/linux/vm/os_linux.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -6285,6 +6285,10 @@ return 0; } @@ -6663,8 +6737,8 @@ return strlen(buffer); } ---- ./hotspot/src/os/posix/vm/os_posix.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/os/posix/vm/os_posix.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/os/posix/vm/os_posix.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/os/posix/vm/os_posix.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -53,12 +53,11 @@ n = get_core_path(buffer, bufferSize); @@ -6727,8 +6801,8 @@ // Linux specific #ifdef SI_TKILL { SI_TKILL, "SI_TKILL", "Signal sent by tkill (pthread_kill)" }, ---- ./hotspot/src/os/solaris/vm/os_solaris.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/os/solaris/vm/os_solaris.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/os/solaris/vm/os_solaris.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/os/solaris/vm/os_solaris.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -6375,6 +6375,10 @@ return 0; } @@ -6741,7 +6815,7 @@ } --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/atomic_bsd_ppc.inline.hpp Sat May 19 23:14:15 2018 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/atomic_bsd_ppc.inline.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,400 @@ +/* + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7144,7 +7218,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/bytes_bsd_ppc.inline.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7186,7 +7260,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/globals_bsd_ppc.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7243,7 +7317,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/orderAccess_bsd_ppc.inline.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,149 @@ +/* + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7395,7 +7469,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,666 @@ +/* + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8064,7 +8138,7 @@ +} +#endif --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.hpp Sat May 19 23:14:15 2018 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8102,7 +8176,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/prefetch_bsd_ppc.inline.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8155,7 +8229,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8197,7 +8271,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8236,7 +8310,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,36 @@ +/* + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8275,7 +8349,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8361,7 +8435,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 May 19 23:14:15 2018 -0700 ++++ ./hotspot/src/os_cpu/bsd_ppc/vm/vmStructs_bsd_ppc.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8418,8 +8492,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 Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -594,7 +594,11 @@ stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL); } @@ -8432,8 +8506,8 @@ thread->doing_unsafe_access()) { stub = StubRoutines::handler_for_unsafe_access(); } ---- ./hotspot/src/share/vm/opto/lcm.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/share/vm/opto/lcm.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/share/vm/opto/lcm.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/opto/lcm.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -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. @@ -8443,8 +8517,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 Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/share/vm/opto/loopPredicate.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/share/vm/opto/loopPredicate.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/opto/loopPredicate.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -869,7 +869,7 @@ Node* idx = cmp->in(1); assert(!invar.is_invariant(idx), "index is variant"); @@ -8454,8 +8528,8 @@ assert(invar.is_invariant(rng), "range must be invariant"); int scale = 1; Node* offset = zero; ---- ./hotspot/src/share/vm/opto/node.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/share/vm/opto/node.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/share/vm/opto/node.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/opto/node.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -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 @@ -8478,8 +8552,28 @@ //------------------------------clone------------------------------------------ // Clone a Node. ---- ./hotspot/src/share/vm/runtime/atomic.inline.hpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/share/vm/runtime/atomic.inline.hpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/share/vm/prims/whitebox.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/prims/whitebox.cpp Mon Sep 03 11:13:04 2018 -0700 +@@ -158,7 +158,7 @@ + } + WB_END + +-#ifdef LINUX ++#if defined(LINUX) || defined(_ALLBSD_SOURCE) + #include "utilities/elfFile.hpp" + #endif + +@@ -1016,7 +1016,7 @@ + // Checks that the library libfile has the noexecstack bit set. + WB_ENTRY(jboolean, WB_CheckLibSpecifiesNoexecstack(JNIEnv* env, jobject o, jstring libfile)) + jboolean ret = false; +-#ifdef LINUX ++#if defined(LINUX) || defined(_ALLBSD_SOURCE) + // Can't be in VM when we call JNI. + ThreadToNativeFromVM ttnfv(thread); + const char* lf = env->GetStringUTFChars(libfile, NULL); +--- ./hotspot/src/share/vm/runtime/atomic.inline.hpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/atomic.inline.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -63,6 +63,9 @@ #endif @@ -8490,8 +8584,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "atomic_bsd_x86.inline.hpp" #endif ---- ./hotspot/src/share/vm/runtime/globals.hpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/share/vm/runtime/globals.hpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/share/vm/runtime/globals.hpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/globals.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -94,6 +94,9 @@ #ifdef TARGET_OS_ARCH_aix_ppc # include "globals_aix_ppc.hpp" @@ -8502,8 +8596,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "globals_bsd_x86.hpp" #endif ---- ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -64,6 +64,9 @@ #endif @@ -8514,8 +8608,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "orderAccess_bsd_x86.inline.hpp" #endif ---- ./hotspot/src/share/vm/runtime/os.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/share/vm/runtime/os.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/share/vm/runtime/os.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/os.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -426,15 +426,6 @@ if (_native_java_library == NULL) { vm_exit_during_initialization("Unable to load native library", ebuf); @@ -8532,8 +8626,8 @@ } static jboolean onLoaded = JNI_FALSE; if (onLoaded) { ---- ./hotspot/src/share/vm/runtime/os.hpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/share/vm/runtime/os.hpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/share/vm/runtime/os.hpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/os.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -843,6 +843,9 @@ #ifdef TARGET_OS_ARCH_aix_ppc # include "os_aix_ppc.hpp" @@ -8544,8 +8638,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "os_bsd_x86.hpp" #endif ---- ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -63,6 +63,9 @@ #endif @@ -8556,9 +8650,9 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "prefetch_bsd_x86.inline.hpp" #endif ---- ./hotspot/src/share/vm/runtime/thread.hpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/share/vm/runtime/thread.hpp Sat May 19 23:14:15 2018 -0700 -@@ -1732,6 +1732,9 @@ +--- ./hotspot/src/share/vm/runtime/thread.hpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/thread.hpp Mon Sep 03 11:13:04 2018 -0700 +@@ -1730,6 +1730,9 @@ #ifdef TARGET_OS_ARCH_aix_ppc # include "thread_aix_ppc.hpp" #endif @@ -8568,8 +8662,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "thread_bsd_x86.hpp" #endif ---- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -75,6 +75,9 @@ #ifdef TARGET_OS_ARCH_aix_ppc # include "threadLS_aix_ppc.hpp" @@ -8580,8 +8674,8 @@ #ifdef TARGET_OS_ARCH_bsd_x86 # include "threadLS_bsd_x86.hpp" #endif ---- ./hotspot/src/share/vm/runtime/virtualspace.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/share/vm/runtime/virtualspace.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/share/vm/runtime/virtualspace.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/virtualspace.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -342,7 +342,7 @@ (UseCompressedOops && (Universe::narrow_oop_base() != NULL) && Universe::narrow_oop_use_implicit_null_checks()) ? @@ -8591,8 +8685,8 @@ MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); } ---- ./hotspot/src/share/vm/runtime/vmStructs.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/share/vm/runtime/vmStructs.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/share/vm/runtime/vmStructs.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/runtime/vmStructs.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -146,6 +146,9 @@ #ifdef TARGET_OS_ARCH_aix_ppc # include "vmStructs_aix_ppc.hpp" @@ -8612,8 +8706,79 @@ \ 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 Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/share/vm/services/mallocSiteTable.hpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/services/mallocSiteTable.hpp Mon Sep 03 11:13:04 2018 -0700 +@@ -42,7 +42,7 @@ + + public: + MallocSite() : +- AllocationSite<MemoryCounter>(NativeCallStack::EMPTY_STACK), _flags(mtNone) {} ++ AllocationSite<MemoryCounter>(NativeCallStack::EMPTY_STACK()), _flags(mtNone) {} + + MallocSite(const NativeCallStack& stack, MEMFLAGS flags) : + AllocationSite<MemoryCounter>(stack), _flags(flags) {} +--- ./hotspot/src/share/vm/services/memTracker.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/services/memTracker.cpp Mon Sep 03 11:13:04 2018 -0700 +@@ -67,10 +67,6 @@ + os::unsetenv(buf); + } + +- // Construct NativeCallStack::EMPTY_STACK. It may get constructed twice, +- // but it is benign, the results are the same. +- ::new ((void*)&NativeCallStack::EMPTY_STACK) NativeCallStack(0, false); +- + if (!MallocTracker::initialize(level) || + !VirtualMemoryTracker::initialize(level)) { + level = NMT_off; +--- ./hotspot/src/share/vm/services/memTracker.hpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/services/memTracker.hpp Mon Sep 03 11:13:04 2018 -0700 +@@ -31,8 +31,8 @@ + + #if !INCLUDE_NMT + +-#define CURRENT_PC NativeCallStack::EMPTY_STACK +-#define CALLER_PC NativeCallStack::EMPTY_STACK ++#define CURRENT_PC NativeCallStack::EMPTY_STACK() ++#define CALLER_PC NativeCallStack::EMPTY_STACK() + + class Tracker : public StackObj { + public: +@@ -83,9 +83,9 @@ + extern volatile bool NMT_stack_walkable; + + #define CURRENT_PC ((MemTracker::tracking_level() == NMT_detail && NMT_stack_walkable) ? \ +- NativeCallStack(0, true) : NativeCallStack::EMPTY_STACK) ++ NativeCallStack(0, true) : NativeCallStack::EMPTY_STACK()) + #define CALLER_PC ((MemTracker::tracking_level() == NMT_detail && NMT_stack_walkable) ? \ +- NativeCallStack(1, true) : NativeCallStack::EMPTY_STACK) ++ NativeCallStack(1, true) : NativeCallStack::EMPTY_STACK()) + + class MemBaseline; + class Mutex; +--- ./hotspot/src/share/vm/services/virtualMemoryTracker.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/services/virtualMemoryTracker.cpp Mon Sep 03 11:13:04 2018 -0700 +@@ -167,7 +167,7 @@ + // higher part + address high_base = addr + sz; + size_t high_size = top - high_base; +- CommittedMemoryRegion high_rgn(high_base, high_size, NativeCallStack::EMPTY_STACK); ++ CommittedMemoryRegion high_rgn(high_base, high_size, NativeCallStack::EMPTY_STACK()); + return add_committed_region(high_rgn); + } else { + return false; +--- ./hotspot/src/share/vm/services/virtualMemoryTracker.hpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/services/virtualMemoryTracker.hpp Mon Sep 03 11:13:04 2018 -0700 +@@ -305,7 +305,7 @@ + + + ReservedMemoryRegion(address base, size_t size) : +- VirtualMemoryRegion(base, size), _stack(NativeCallStack::EMPTY_STACK), _flag(mtNone), ++ VirtualMemoryRegion(base, size), _stack(NativeCallStack::EMPTY_STACK()), _flag(mtNone), + _all_committed(false) { } + + // Copy constructor +--- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Mon Sep 03 11:13:04 2018 -0700 @@ -30,6 +30,11 @@ // This file holds compiler-dependent includes, // globally used constants & types, class (forward) @@ -8645,8 +8810,33 @@ #define CAN_USE_NAN_DEFINE 1 #endif ---- ./hotspot/src/share/vm/utilities/vmError.cpp Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/src/share/vm/utilities/vmError.cpp Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/src/share/vm/utilities/nativeCallStack.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/utilities/nativeCallStack.cpp Mon Sep 03 11:13:04 2018 -0700 +@@ -27,7 +27,10 @@ + #include "utilities/globalDefinitions.hpp" + #include "utilities/nativeCallStack.hpp" + +-const NativeCallStack NativeCallStack::EMPTY_STACK(0, false); ++const NativeCallStack& NativeCallStack::EMPTY_STACK() { ++ static const NativeCallStack empty(0, false); ++ return empty; ++} + + NativeCallStack::NativeCallStack(int toSkip, bool fillStack) : + _hash_value(0) { +--- ./hotspot/src/share/vm/utilities/nativeCallStack.hpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/utilities/nativeCallStack.hpp Mon Sep 03 11:13:04 2018 -0700 +@@ -53,7 +53,7 @@ + */ + class NativeCallStack : public StackObj { + public: +- static const NativeCallStack EMPTY_STACK; ++ static const NativeCallStack& EMPTY_STACK(); + + private: + address _stack[NMT_TrackingStackDepth]; +--- ./hotspot/src/share/vm/utilities/vmError.cpp Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/src/share/vm/utilities/vmError.cpp Mon Sep 03 11:13:04 2018 -0700 @@ -22,7 +22,6 @@ * */ @@ -8655,8 +8845,8 @@ #include "precompiled.hpp" #include "compiler/compileBroker.hpp" #include "gc_interface/collectedHeap.hpp" ---- ./jdk/make/CompileDemos.gmk Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/CompileDemos.gmk Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/CompileDemos.gmk Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/CompileDemos.gmk Sun Sep 02 07:33:40 2018 -0700 @@ -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 \ @@ -8666,8 +8856,8 @@ $(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo)) $(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo)) ---- ./jdk/make/CompileJavaClasses.gmk Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/CompileJavaClasses.gmk Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/CompileJavaClasses.gmk Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/CompileJavaClasses.gmk Sun Sep 02 07:33:40 2018 -0700 @@ -128,23 +128,32 @@ sun/nio/fs/LinuxFileStore.java \ sun/nio/fs/LinuxFileSystem.java \ @@ -8769,8 +8959,8 @@ $(CLOSED_SRC_DIRS), \ INCLUDES := $(SECURITY_PKGS), \ EXCLUDES := $(EXCLUDES), \ ---- ./jdk/make/CompileLaunchers.gmk Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/CompileLaunchers.gmk Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/CompileLaunchers.gmk Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/CompileLaunchers.gmk Sun Sep 02 07:33:40 2018 -0700 @@ -49,7 +49,7 @@ ORIGIN_ROOT := /.. endif @@ -8875,8 +9065,8 @@ BUILD_JSPAWNHELPER := 1 endif ---- ./jdk/make/CopyFiles.gmk Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/CopyFiles.gmk Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/CopyFiles.gmk Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/CopyFiles.gmk Sun Sep 02 07:33:40 2018 -0700 @@ -29,6 +29,8 @@ ifeq ($(OPENJDK_TARGET_OS), windows) @@ -8919,8 +9109,8 @@ endif endif endif ---- ./jdk/make/Images.gmk Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/Images.gmk Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/Images.gmk Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/Images.gmk Sun Sep 02 07:33:40 2018 -0700 @@ -236,11 +236,11 @@ endif @@ -8991,7 +9181,7 @@ ################################################################################ --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/make/data/classlist/classlist.bsd Sat May 19 23:14:35 2018 -0700 ++++ ./jdk/make/data/classlist/classlist.bsd Sun Sep 02 07:33:40 2018 -0700 @@ -0,0 +1,2559 @@ +java/lang/Object +java/lang/String @@ -11552,8 +11742,8 @@ +java/awt/MenuBar +sun/awt/X11/XErrorEvent +# eea35d9d56e0006e ---- ./jdk/make/gendata/GendataFontConfig.gmk Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/gendata/GendataFontConfig.gmk Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/gendata/GendataFontConfig.gmk Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/gendata/GendataFontConfig.gmk Sun Sep 02 07:33:40 2018 -0700 @@ -73,6 +73,13 @@ GENDATA_FONT_CONFIG_SRC_PREFIX := aix. endif @@ -11568,8 +11758,8 @@ ### $(GENDATA_FONT_CONFIG_DST)/%.src: \ ---- ./jdk/make/lib/Awt2dLibraries.gmk Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/lib/Awt2dLibraries.gmk Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/lib/Awt2dLibraries.gmk Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/lib/Awt2dLibraries.gmk Sun Sep 02 07:33:40 2018 -0700 @@ -309,7 +309,7 @@ debug_trace.c \ debug_util.c @@ -11694,8 +11884,8 @@ else # .. all other Unixes can use X_LIBS LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread endif ---- ./jdk/make/lib/CoreLibraries.gmk Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/lib/CoreLibraries.gmk Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/lib/CoreLibraries.gmk Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/lib/CoreLibraries.gmk Sun Sep 02 07:33:40 2018 -0700 @@ -100,7 +100,7 @@ endif @@ -11782,8 +11972,8 @@ LDFLAGS_macosx := -liconv, \ LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \ LDFLAGS_SUFFIX_solaris := -lc, \ ---- ./jdk/make/lib/NetworkingLibraries.gmk Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/lib/NetworkingLibraries.gmk Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/lib/NetworkingLibraries.gmk Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/lib/NetworkingLibraries.gmk Sun Sep 02 07:33:40 2018 -0700 @@ -42,7 +42,7 @@ LIBNET_EXCLUDE_FILES += linux_close.c endif @@ -11812,8 +12002,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/lib/NioLibraries.gmk Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/lib/NioLibraries.gmk Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/lib/NioLibraries.gmk Sun Sep 02 07:33:40 2018 -0700 @@ -77,9 +77,28 @@ UnixNativeDispatcher.c endif @@ -11874,8 +12064,8 @@ endif + endif endif ---- ./jdk/make/lib/ServiceabilityLibraries.gmk Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/lib/ServiceabilityLibraries.gmk Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/lib/ServiceabilityLibraries.gmk Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/lib/ServiceabilityLibraries.gmk Sun Sep 02 07:33:40 2018 -0700 @@ -34,7 +34,7 @@ ifneq ($(OPENJDK_TARGET_OS), linux) LIBATTACH_EXCLUDE_FILES += LinuxVirtualMachine.c @@ -11959,8 +12149,8 @@ ifeq ($(ENABLE_DEBUG_SYMBOLS), true) LIBHPROF_OPTIMIZATION := LOW endif ---- ./jdk/make/lib/SoundLibraries.gmk Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/lib/SoundLibraries.gmk Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/lib/SoundLibraries.gmk Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/lib/SoundLibraries.gmk Sun Sep 02 07:33:40 2018 -0700 @@ -75,6 +75,13 @@ LIBJSOUND_CFLAGS += -DX_PLATFORM=X_AIX endif # OPENJDK_TARGET_OS aix @@ -11992,8 +12182,8 @@ LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundalsa, \ DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) ---- ./jdk/make/mapfiles/launchers/mapfile-ppc64 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/mapfiles/launchers/mapfile-ppc64 Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/mapfiles/launchers/mapfile-ppc64 Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/mapfiles/launchers/mapfile-ppc64 Sun Sep 02 07:33:40 2018 -0700 @@ -33,6 +33,7 @@ environ; # Public symbols and required by Java run time _environ; @@ -12002,8 +12192,8 @@ local: *; ---- ./jdk/make/mapfiles/launchers/mapfile-x86 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/mapfiles/launchers/mapfile-x86 Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/mapfiles/launchers/mapfile-x86 Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/mapfiles/launchers/mapfile-x86 Sun Sep 02 07:33:40 2018 -0700 @@ -33,6 +33,7 @@ environ; # Public symbols and required by Java run time _environ; @@ -12012,8 +12202,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/mapfiles/launchers/mapfile-x86_64 Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/mapfiles/launchers/mapfile-x86_64 Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/mapfiles/launchers/mapfile-x86_64 Sun Sep 02 07:33:40 2018 -0700 @@ -33,6 +33,7 @@ environ; # Public symbols and required by Java run time _environ; @@ -12023,7 +12213,7 @@ local: *; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/make/mapfiles/libattach/mapfile-bsd Sat May 19 23:14:35 2018 -0700 ++++ ./jdk/make/mapfiles/libattach/mapfile-bsd Sun Sep 02 07:33:40 2018 -0700 @@ -0,0 +1,42 @@ +# +# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. @@ -12068,7 +12258,7 @@ + *; +}; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/make/mapfiles/libnio/mapfile-bsd Sat May 19 23:14:35 2018 -0700 ++++ ./jdk/make/mapfiles/libnio/mapfile-bsd Sun Sep 02 07:33:40 2018 -0700 @@ -0,0 +1,195 @@ +# +# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. @@ -12265,8 +12455,8 @@ + local: + *; +}; ---- ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Sun Sep 02 07:33:40 2018 -0700 @@ -26,6 +26,9 @@ # Define library interface. @@ -12278,7 +12468,7 @@ *; }; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/make/netbeans/common/bsd-sources.ent Sat May 19 23:14:35 2018 -0700 ++++ ./jdk/make/netbeans/common/bsd-sources.ent Sun Sep 02 07:33:40 2018 -0700 @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> + @@ -12326,7 +12516,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 May 19 23:14:35 2018 -0700 ++++ ./jdk/make/netbeans/common/bsd-view.ent Sun Sep 02 07:33:40 2018 -0700 @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + @@ -12367,8 +12557,8 @@ + <includes>${includes}</includes> + <excludes>${excludes}</excludes> +</source-folder> ---- ./jdk/make/netbeans/common/java-data-native.ent Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/netbeans/common/java-data-native.ent Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/netbeans/common/java-data-native.ent Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/netbeans/common/java-data-native.ent Sun Sep 02 07:33:40 2018 -0700 @@ -34,6 +34,7 @@ <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4"> <compilation-unit> @@ -12377,8 +12567,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/netbeans/common/make.xml Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/netbeans/common/make.xml Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/netbeans/common/make.xml Sun Sep 02 07:33:40 2018 -0700 @@ -32,16 +32,21 @@ --> @@ -12413,8 +12603,8 @@ <macrodef name="make-run"> <attribute name="target"/> <attribute name="dir"/> ---- ./jdk/make/netbeans/j2se/nbproject/project.xml Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/netbeans/j2se/nbproject/project.xml Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/netbeans/j2se/nbproject/project.xml Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/netbeans/j2se/nbproject/project.xml Sun Sep 02 07:33:40 2018 -0700 @@ -34,6 +34,7 @@ <!DOCTYPE project [ <!ENTITY properties SYSTEM "../../common/properties.ent"> @@ -12447,8 +12637,8 @@ &macosx-view; &unix-view; &windows-view; ---- ./jdk/make/netbeans/world/nbproject/project.xml Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/make/netbeans/world/nbproject/project.xml Sat May 19 23:14:35 2018 -0700 +--- ./jdk/make/netbeans/world/nbproject/project.xml Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/make/netbeans/world/nbproject/project.xml Sun Sep 02 07:33:40 2018 -0700 @@ -34,12 +34,14 @@ <!DOCTYPE project [ <!ENTITY properties SYSTEM "../../common/properties.ent"> @@ -12481,7 +12671,7 @@ &unix-view; &windows-view; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/bsd/classes/java/net/DefaultInterface.java Sat May 19 23:14:35 2018 -0700 ++++ ./jdk/src/bsd/classes/java/net/DefaultInterface.java Sun Sep 02 07:33:40 2018 -0700 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. @@ -12581,7 +12771,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/bsd/classes/sun/nio/ch/DefaultSelectorProvider.java Sat May 19 23:14:35 2018 -0700 ++++ ./jdk/src/bsd/classes/sun/nio/ch/DefaultSelectorProvider.java Sun Sep 02 07:33:40 2018 -0700 @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. @@ -12632,7 +12822,7 @@ + +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueArrayWrapper.java Sat May 19 23:14:35 2018 -0700 ++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueArrayWrapper.java Sun Sep 02 07:33:40 2018 -0700 @@ -0,0 +1,213 @@ +/* + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. @@ -12848,7 +13038,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 May 19 23:14:35 2018 -0700 ++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorImpl.java Sun Sep 02 07:33:40 2018 -0700 @@ -0,0 +1,263 @@ +/* + * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. @@ -13114,7 +13304,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorProvider.java Sat May 19 23:14:35 2018 -0700 ++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorProvider.java Sun Sep 02 07:33:40 2018 -0700 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. @@ -13160,8 +13350,8 @@ + return new KQueueSelectorImpl(this); + } +} ---- ./jdk/src/bsd/doc/man/javah.1 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/bsd/doc/man/javah.1 Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/bsd/doc/man/javah.1 Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/bsd/doc/man/javah.1 Sun Sep 02 07:33:40 2018 -0700 @@ -8,7 +8,7 @@ .\" .\" This code is distributed in the hope that it will be useful, but WITHOUT @@ -13180,8 +13370,8 @@ \fIWindows\fR: ---- ./jdk/src/bsd/doc/man/rmic.1 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/bsd/doc/man/rmic.1 Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/bsd/doc/man/rmic.1 Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/bsd/doc/man/rmic.1 Sun Sep 02 07:33:40 2018 -0700 @@ -8,7 +8,7 @@ .\" .\" This code is distributed in the hope that it will be useful, but WITHOUT @@ -13209,8 +13399,8 @@ .SH SEE\ ALSO .TP 0.2i \(bu ---- ./jdk/src/bsd/doc/man/rmid.1 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/bsd/doc/man/rmid.1 Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/bsd/doc/man/rmid.1 Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/bsd/doc/man/rmid.1 Sun Sep 02 07:33:40 2018 -0700 @@ -8,7 +8,7 @@ .\" .\" This code is distributed in the hope that it will be useful, but WITHOUT @@ -13230,7 +13420,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 May 19 23:14:35 2018 -0700 ++++ ./jdk/src/bsd/native/sun/nio/ch/KQueueArrayWrapper.c Sun Sep 02 07:33:40 2018 -0700 @@ -0,0 +1,171 @@ +/* + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. @@ -13403,7 +13593,7 @@ + } +} + ---- ./jdk/src/macosx/classes/java/net/DefaultInterface.java Mon Mar 19 12:06:18 2018 -0700 +--- ./jdk/src/macosx/classes/java/net/DefaultInterface.java Sat Jun 23 21:02:10 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +0,0 @@ -/* @@ -13503,7 +13693,7 @@ - return (ppp != null) ? ppp : loopback; - } -} ---- ./jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java Mon Mar 19 12:06:18 2018 -0700 +--- ./jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java Sat Jun 23 21:02:10 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/* @@ -13554,7 +13744,7 @@ - } - -} ---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java Mon Mar 19 12:06:18 2018 -0700 +--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java Sat Jun 23 21:02:10 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,213 +0,0 @@ -/* @@ -13770,7 +13960,7 @@ - long timeout); - private static native void interrupt(int fd); -} ---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java Mon Mar 19 12:06:18 2018 -0700 +--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java Sat Jun 23 21:02:10 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,263 +0,0 @@ -/* @@ -14036,7 +14226,7 @@ - return this; - } -} ---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java Mon Mar 19 12:06:18 2018 -0700 +--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java Sat Jun 23 21:02:10 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -/* @@ -14083,7 +14273,7 @@ - return new KQueueSelectorImpl(this); - } -} ---- ./jdk/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c Mon Mar 19 12:06:18 2018 -0700 +--- ./jdk/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c Sat Jun 23 21:02:10 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,171 +0,0 @@ -/* @@ -14257,8 +14447,8 @@ - } -} - ---- ./jdk/src/share/bin/jli_util.h Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/bin/jli_util.h Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/bin/jli_util.h Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/bin/jli_util.h Sun Sep 02 07:33:40 2018 -0700 @@ -87,7 +87,7 @@ #define _LARGFILE64_SOURCE #define JLI_Lseek lseek64 @@ -14268,8 +14458,8 @@ #define JLI_Lseek lseek #endif #ifdef _AIX ---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java Sun Sep 02 07:33:40 2018 -0700 @@ -1146,7 +1146,7 @@ */ HashMap<String, Boolean> existsMap; @@ -14279,8 +14469,8 @@ return false; } else if (existsMap == null) { existsMap = new HashMap<String, Boolean>(); ---- ./jdk/src/share/classes/sun/awt/OSInfo.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/classes/sun/awt/OSInfo.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/classes/sun/awt/OSInfo.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/classes/sun/awt/OSInfo.java Sun Sep 02 07:33:40 2018 -0700 @@ -39,6 +39,7 @@ WINDOWS, LINUX, @@ -14300,8 +14490,8 @@ if (osName.contains("OS X")) { return MACOSX; } ---- ./jdk/src/share/classes/sun/font/FontUtilities.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/classes/sun/font/FontUtilities.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/classes/sun/font/FontUtilities.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/classes/sun/font/FontUtilities.java Sun Sep 02 07:33:40 2018 -0700 @@ -48,6 +48,8 @@ public static boolean isLinux; @@ -14320,8 +14510,8 @@ isMacOSX = osName.contains("OS X"); // TODO: MacOSX String t2kStr = System.getProperty("sun.java2d.font.scaler"); ---- ./jdk/src/share/classes/sun/font/SunFontManager.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/classes/sun/font/SunFontManager.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/classes/sun/font/SunFontManager.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/classes/sun/font/SunFontManager.java Sun Sep 02 07:33:40 2018 -0700 @@ -418,7 +418,7 @@ * registerFonts method as on-screen these JRE fonts * always go through the T2K rasteriser. @@ -14331,8 +14521,8 @@ /* Linux font configuration uses these fonts */ registerFontDir(jreFontDirName); } ---- ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Sun Sep 02 07:33:40 2018 -0700 @@ -1306,7 +1306,7 @@ String osName = AccessController.doPrivileged( new GetPropertyAction("os.name")); @@ -14342,8 +14532,8 @@ charset("x-COMPOUND_TEXT", "COMPOUND_TEXT", new String[] { "COMPOUND_TEXT", // JDK historical ---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java Sun Sep 02 07:33:40 2018 -0700 @@ -1587,9 +1587,31 @@ } @@ -14378,8 +14568,8 @@ if ((pFlags & PRINTER) != 0) { execCmd[n++] = "-P" + printer; } ---- ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Sun Sep 02 07:33:40 2018 -0700 @@ -48,6 +48,7 @@ public Boolean run() { String osname = System.getProperty("os.name"); @@ -14388,8 +14578,8 @@ osname.contains("OS X") || osname.startsWith("Linux")) { return new Boolean(System.getProperty ---- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Sun Sep 02 07:33:40 2018 -0700 @@ -90,6 +90,12 @@ "libgssapi_krb5.so", "libgssapi_krb5.so.2", @@ -14403,8 +14593,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Sun Sep 02 07:33:40 2018 -0700 @@ -31,4 +31,5 @@ #[windows]sun.tools.attach.WindowsAttachProvider #[linux]sun.tools.attach.LinuxAttachProvider @@ -14412,7 +14602,7 @@ +#[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 May 19 23:14:35 2018 -0700 ++++ ./jdk/src/share/lib/security/java.security-bsd Sun Sep 02 07:33:40 2018 -0700 @@ -0,0 +1,983 @@ +# +# This is the "master security properties file". @@ -15397,8 +15587,8 @@ +# and javax.crypto.spec.SecretKeySpec and rejects all the others. +jceks.key.serialFilter = java.lang.Enum;java.security.KeyRep;\ + java.security.KeyRep$Type;javax.crypto.spec.SecretKeySpec;!* ---- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Sun Sep 02 07:33:40 2018 -0700 @@ -62,7 +62,7 @@ #endif // End of ZLIB @@ -15408,8 +15598,8 @@ #define SWAP_BYTES(a) \ ((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00) #else ---- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Sun Sep 02 07:33:40 2018 -0700 @@ -121,7 +121,7 @@ } @@ -15437,8 +15627,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/com/sun/media/sound/Utilities.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/com/sun/media/sound/Utilities.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/com/sun/media/sound/Utilities.c Sun Sep 02 07:33:40 2018 -0700 @@ -28,7 +28,7 @@ @@ -15448,8 +15638,8 @@ return 0; #else return 1; ---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Sun Sep 02 07:33:40 2018 -0700 @@ -40,7 +40,7 @@ #endif #endif @@ -15459,8 +15649,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Sun Sep 02 07:33:40 2018 -0700 @@ -624,7 +624,7 @@ switch(type) { case java_awt_image_BufferedImage_TYPE_INT_ARGB: @@ -15488,8 +15678,8 @@ colorOrder[0] = 2; colorOrder[1] = 1; colorOrder[2] = 0; ---- ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Sun Sep 02 07:33:40 2018 -0700 @@ -1198,7 +1198,7 @@ #define NLUT 8 @@ -15499,8 +15689,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Sun Sep 02 07:33:40 2018 -0700 @@ -86,7 +86,7 @@ #endif /* MLIB_USE_FTOI_CLAMPING */ @@ -15540,8 +15730,8 @@ #endif /* _NO_LONGLONG */ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Sun Sep 02 07:33:40 2018 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15581,8 +15771,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Sun Sep 02 07:33:40 2018 -0700 @@ -94,7 +94,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15622,8 +15812,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Sun Sep 02 07:33:40 2018 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15663,8 +15853,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Sun Sep 02 07:33:40 2018 -0700 @@ -95,7 +95,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15704,8 +15894,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Sun Sep 02 07:33:40 2018 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15745,8 +15935,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Sun Sep 02 07:33:40 2018 -0700 @@ -94,7 +94,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -15786,8 +15976,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Sun Sep 02 07:33:40 2018 -0700 @@ -95,7 +95,7 @@ dst = dp[0]; if (ld_offset + size < 32) { @@ -16007,8 +16197,8 @@ } #else /* _LONGLONG */ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Sun Sep 02 07:33:40 2018 -0700 @@ -168,7 +168,7 @@ } @@ -16289,8 +16479,8 @@ dp[12] = t0; dp[13] = t1; dp[14] = t2; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Sun Sep 02 07:33:40 2018 -0700 @@ -88,7 +88,7 @@ } d64_2_f32; @@ -16442,8 +16632,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Sun Sep 02 07:33:40 2018 -0700 @@ -30,7 +30,7 @@ typedef union { mlib_d64 db; @@ -16453,8 +16643,8 @@ mlib_s32 int1, int0; #else mlib_s32 int0, int1; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Sun Sep 02 07:33:40 2018 -0700 @@ -275,11 +275,11 @@ for (i = 0; j <= (b_size - 4); j += 4, i++) { src0 = src1; @@ -16553,8 +16743,8 @@ s0 = s1; dp += SIZE; sp += SIZE; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Sun Sep 02 07:33:40 2018 -0700 @@ -120,7 +120,7 @@ } \ } @@ -17787,8 +17977,8 @@ dp[12] = t0; dp[13] = t1; dp[14] = t2; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Sun Sep 02 07:33:40 2018 -0700 @@ -27,9 +27,6 @@ #ifndef MLIB_IMAGE_H #define MLIB_IMAGE_H @@ -17799,8 +17989,8 @@ #include <mlib_types.h> #include <mlib_status.h> #include <mlib_sys.h> ---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Sun Sep 02 07:33:40 2018 -0700 @@ -29,7 +29,7 @@ #ifdef MACOSX #include <unistd.h> @@ -17820,8 +18010,8 @@ #else return (void *) memalign(8, size); #endif /* _MSC_VER */ ---- ./jdk/src/share/native/sun/font/layout/LEStandalone.h Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/font/layout/LEStandalone.h Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/font/layout/LEStandalone.h Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/font/layout/LEStandalone.h Sun Sep 02 07:33:40 2018 -0700 @@ -136,7 +136,7 @@ #define U_CAPI extern "C" @@ -17831,8 +18021,8 @@ #define U_IS_BIG_ENDIAN 0 #endif #endif ---- ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Sun Sep 02 07:33:40 2018 -0700 @@ -182,7 +182,7 @@ return 0L; } @@ -17842,8 +18032,8 @@ /* Reversing data packed into int for LE archs */ if (isInIntPacked) { inFormatter ^= DOSWAP_SH(1); ---- ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Sun Sep 02 07:33:40 2018 -0700 @@ -27,6 +27,7 @@ #include <jni.h> #include "management.h" @@ -17852,8 +18042,8 @@ JNIEXPORT void JNICALL Java_sun_management_DiagnosticCommandImpl_setNotificationEnabled (JNIEnv *env, jobject dummy, jboolean enabled) { ---- ./jdk/src/solaris/back/util_md.h Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/back/util_md.h Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/back/util_md.h Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/back/util_md.h Sun Sep 02 07:33:40 2018 -0700 @@ -51,7 +51,7 @@ /* On little endian machines, convert java big endian numbers. */ @@ -17863,8 +18053,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/bin/ergo_i586.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/bin/ergo_i586.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/bin/ergo_i586.c Sun Sep 02 07:33:40 2018 -0700 @@ -106,7 +106,7 @@ #endif /* __solaris__ */ @@ -17883,8 +18073,8 @@ /* * Routines shared by solaris-i586 and linux-i586. ---- ./jdk/src/solaris/bin/java_md_solinux.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/bin/java_md_solinux.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/bin/java_md_solinux.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/bin/java_md_solinux.c Sun Sep 02 07:33:40 2018 -0700 @@ -35,6 +35,9 @@ #include <sys/stat.h> #include <unistd.h> @@ -17976,8 +18166,8 @@ } int ---- ./jdk/src/solaris/bin/java_md_solinux.h Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/bin/java_md_solinux.h Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/bin/java_md_solinux.h Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/bin/java_md_solinux.h Sun Sep 02 07:33:40 2018 -0700 @@ -26,17 +26,26 @@ #ifndef JAVA_MD_SOLINUX_H #define JAVA_MD_SOLINUX_H @@ -18018,8 +18208,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Sun Sep 02 07:33:40 2018 -0700 @@ -82,6 +82,8 @@ LINUX(LaunchMechanism.VFORK, LaunchMechanism.FORK), @@ -18067,8 +18257,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Sun Sep 02 07:33:40 2018 -0700 @@ -234,7 +234,7 @@ if (fontID != null) { fileName = (String)fontNameMap.get(fontID); @@ -18096,8 +18286,8 @@ (!mFontConfig.foundOsSpecificFile() || !mFontConfig.fontFilesArePresent()) || (FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) { ---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Sun Sep 02 07:33:40 2018 -0700 @@ -26,134 +26,134 @@ # Version @@ -18360,8 +18550,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/classes/sun/net/PortConfig.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/classes/sun/net/PortConfig.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/classes/sun/net/PortConfig.java Sun Sep 02 07:33:40 2018 -0700 @@ -52,7 +52,7 @@ } else if (os.startsWith("SunOS")) { defaultLower = 32768; @@ -18371,8 +18561,8 @@ defaultLower = 49152; defaultUpper = 65535; } else if (os.startsWith("AIX")) { ---- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Sun Sep 02 07:33:40 2018 -0700 @@ -66,7 +66,7 @@ return createProvider("sun.nio.ch.SolarisAsynchronousChannelProvider"); if (osname.equals("Linux")) @@ -18382,8 +18572,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Sun Sep 02 07:33:40 2018 -0700 @@ -25,10 +25,14 @@ package sun.nio.fs; @@ -18417,8 +18607,8 @@ + new MagicFileTypeDetector()); + } } ---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sun Sep 02 07:33:40 2018 -0700 @@ -61,6 +61,8 @@ return createProvider("sun.nio.fs.SolarisFileSystemProvider"); if (osname.equals("Linux")) @@ -18428,8 +18618,8 @@ if (osname.contains("OS X")) return createProvider("sun.nio.fs.MacOSXFileSystemProvider"); if (osname.equals("AIX")) ---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Sun Sep 02 07:33:40 2018 -0700 @@ -161,6 +161,7 @@ static boolean isBSD() { @@ -18453,8 +18643,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Sun Sep 02 07:33:40 2018 -0700 @@ -273,7 +273,7 @@ try { b = s.getBytes("UTF-8"); @@ -18464,8 +18654,8 @@ } BsdVirtualMachine.write(fd, b, 0, b.length); } ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Sun Sep 02 07:33:40 2018 -0700 @@ -675,6 +675,7 @@ return -1; } @@ -18482,8 +18672,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Sun Sep 02 07:33:40 2018 -0700 @@ -140,7 +140,7 @@ (float) ((int) sr->samp_rates[s]), DAUDIO_PCM, /* encoding - let's only do PCM */ @@ -18493,8 +18683,8 @@ FALSE /* little endian */ #else (bits[b] > 8)?TRUE:FALSE /* big endian */ ---- ./jdk/src/solaris/native/common/jni_util_md.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/common/jni_util_md.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/common/jni_util_md.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/common/jni_util_md.c Sun Sep 02 07:33:40 2018 -0700 @@ -28,6 +28,7 @@ #include "jni.h" #include "jni_util.h" @@ -18503,8 +18693,8 @@ jstring nativeNewStringPlatform(JNIEnv *env, const char *str) { return NULL; ---- ./jdk/src/solaris/native/java/lang/java_props_md.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/java/lang/java_props_md.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/java/lang/java_props_md.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/java/lang/java_props_md.c Sun Sep 02 07:33:40 2018 -0700 @@ -111,7 +111,7 @@ lc = setlocale(cat, NULL); #endif @@ -18539,8 +18729,8 @@ /* user properties */ { ---- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Sun Sep 02 07:33:40 2018 -0700 @@ -36,20 +36,13 @@ #include <stdlib.h> #include <ctype.h> @@ -18563,7 +18753,7 @@ #if defined(_ALLBSD_SOURCE) && !defined(HAS_GLIBC_GETHOSTBY_R) -@@ -413,6 +406,17 @@ +@@ -417,6 +410,17 @@ } #endif @@ -18581,8 +18771,8 @@ error = getaddrinfo(hostname, NULL, &hints, &res); if (error) { ---- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Sun Sep 02 07:33:40 2018 -0700 @@ -33,7 +33,7 @@ #include <strings.h> #include <stdlib.h> @@ -18604,7 +18794,7 @@ lookupIfLocalhost(JNIEnv *env, const char *hostname, jboolean includeV6) { jobjectArray result = NULL; -@@ -267,6 +267,19 @@ +@@ -269,6 +269,19 @@ hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE); CHECK_NULL_RETURN(hostname, NULL); @@ -18624,8 +18814,8 @@ #ifdef AF_INET6 /* Try once, with our static buffer. */ memset(&hints, 0, sizeof(hints)); ---- ./jdk/src/solaris/native/java/net/NetworkInterface.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/java/net/NetworkInterface.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c Sun Sep 02 07:33:40 2018 -0700 @@ -58,14 +58,19 @@ #include <sys/param.h> #include <sys/ioctl.h> @@ -18648,9 +18838,9 @@ #include "jvm.h" #include "jni_util.h" ---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Sat May 19 23:14:35 2018 -0700 -@@ -2221,7 +2221,7 @@ +--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Sun Sep 02 07:33:40 2018 -0700 +@@ -2243,7 +2243,7 @@ } } #endif @@ -18659,8 +18849,8 @@ if (family == AF_INET6 && index == 0) { index = getDefaultScopeID(env); } ---- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Sun Sep 02 07:33:40 2018 -0700 @@ -215,6 +215,7 @@ } @@ -18677,8 +18867,8 @@ #endif /* AF_INET6 */ /* ---- ./jdk/src/solaris/native/java/net/bsd_close.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/java/net/bsd_close.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/java/net/bsd_close.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/java/net/bsd_close.c Sun Sep 02 07:33:40 2018 -0700 @@ -320,11 +320,8 @@ } @@ -18768,8 +18958,8 @@ } +#endif } ---- ./jdk/src/solaris/native/java/net/net_util_md.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/java/net/net_util_md.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/java/net/net_util_md.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/java/net/net_util_md.c Sun Sep 02 07:33:40 2018 -0700 @@ -46,6 +46,10 @@ #endif #endif @@ -18790,8 +18980,8 @@ static jclass ni_class = NULL; static jfieldID ni_defaultIndexID; if (ni_class == NULL) { ---- ./jdk/src/solaris/native/java/util/TimeZone_md.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/java/util/TimeZone_md.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c Sun Sep 02 07:33:40 2018 -0700 @@ -56,7 +56,11 @@ #endif @@ -18855,8 +19045,8 @@ } -#endif /* MACOSX */ +#endif /* _ALLBSD_SOURCE */ ---- ./jdk/src/solaris/native/sun/awt/awt_Font.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_Font.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_Font.c Sun Sep 02 07:33:40 2018 -0700 @@ -255,7 +255,7 @@ if (strcmp(style, "regular") == 0) { altstyle = "roman"; @@ -18866,8 +19056,8 @@ if (!strcmp(family, "lucidasans")) { family = "lucida"; } ---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Sun Sep 02 07:33:40 2018 -0700 @@ -121,7 +121,7 @@ */ @@ -18952,8 +19142,8 @@ #endif /* HEADLESS */ return point; } ---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Sun Sep 02 07:33:40 2018 -0700 @@ -52,7 +52,7 @@ XIMPreeditDrawCallbackStruct *); static void PreeditCaretCallback(XIC, XPointer, @@ -19173,8 +19363,8 @@ AWT_LOCK(); adjustStatusWindow(window); AWT_UNLOCK(); ---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c Sun Sep 02 07:33:40 2018 -0700 @@ -45,7 +45,7 @@ #include "wsutils.h" #include "list.h" @@ -19184,8 +19374,8 @@ #include <sys/socket.h> #endif ---- ./jdk/src/solaris/native/sun/awt/extutil.h Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/awt/extutil.h Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/awt/extutil.h Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/awt/extutil.h Sun Sep 02 07:33:40 2018 -0700 @@ -58,7 +58,7 @@ */ /* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */ @@ -19201,8 +19391,8 @@ -#endif /* __linux__ || MACOSX */ +#endif /* __linux__ || _ALLBSD_SOURCE */ ---- ./jdk/src/solaris/native/sun/awt/fontpath.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/awt/fontpath.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/awt/fontpath.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/awt/fontpath.c Sun Sep 02 07:33:40 2018 -0700 @@ -23,9 +23,9 @@ * questions. */ @@ -19291,8 +19481,8 @@ && (strcmp((char*)fontformat, "Type 1") != 0) #endif ) { ---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h Sun Sep 02 07:33:40 2018 -0700 @@ -28,11 +28,11 @@ #include <sys/types.h> @@ -19308,8 +19498,8 @@ typedef unsigned char jubyte; typedef unsigned short jushort; ---- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Sun Sep 02 07:33:40 2018 -0700 @@ -63,9 +63,6 @@ * MLIB_EDGE_SRC_PADDED */ @@ -19414,8 +19604,8 @@ LOGIC(da[0], dtmp, dtmp1, |); } else { /* aligned */ ---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Sun Sep 02 07:33:40 2018 -0700 @@ -804,7 +804,7 @@ static int initialized; static int usevis = JNI_TRUE; @@ -19426,7 +19616,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 May 19 23:14:35 2018 -0700 ++++ ./jdk/src/solaris/native/sun/management/BsdOperatingSystem.c Sun Sep 02 07:33:40 2018 -0700 @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. @@ -19470,8 +19660,8 @@ +{ + return (jdouble) -1; +} ---- ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Sun Sep 02 07:33:40 2018 -0700 @@ -56,6 +56,9 @@ #include <limits.h> #include <stdlib.h> @@ -19636,8 +19826,8 @@ return -1; } ---- ./jdk/src/solaris/native/sun/net/portconfig.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/net/portconfig.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/net/portconfig.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/net/portconfig.c Sun Sep 02 07:33:40 2018 -0700 @@ -67,6 +67,24 @@ range->lower = net_getParam("/dev/tcp", "tcp_smallest_anon_port"); return 0; @@ -19663,8 +19853,8 @@ #elif defined(_ALLBSD_SOURCE) { int ret; ---- ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Sun Sep 02 07:33:40 2018 -0700 @@ -67,7 +67,7 @@ @@ -19713,8 +19903,8 @@ jboolean loadSocketExtensionFuncs(JNIEnv* env); #endif /* !SUN_NIO_CH_SCTP_H */ ---- ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Sun Sep 02 07:33:40 2018 -0700 @@ -58,6 +58,7 @@ */ jboolean loadSocketExtensionFuncs @@ -19731,8 +19921,8 @@ funcsLoaded = JNI_TRUE; return JNI_TRUE; ---- ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Sun Sep 02 07:33:40 2018 -0700 @@ -31,6 +31,12 @@ #include <dlfcn.h> #include <string.h> @@ -19755,8 +19945,8 @@ if (magic_handle == NULL) { return JNI_FALSE; } ---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Sun Sep 02 07:33:40 2018 -0700 @@ -54,7 +54,7 @@ } @@ -19766,8 +19956,8 @@ void *hModule = dlopen(libName, RTLD_LAZY); #else void *hModule = dlopen(libName, RTLD_NOLOAD); ---- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Sun Sep 02 07:33:40 2018 -0700 @@ -38,7 +38,9 @@ #include <sys/types.h> #include <sys/socket.h> @@ -19778,8 +19968,8 @@ #include <sys/un.h> #include <fcntl.h> ---- ./jdk/src/solaris/native/sun/xawt/XWindow.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/solaris/native/sun/xawt/XWindow.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c Sun Sep 02 07:33:40 2018 -0700 @@ -886,7 +886,7 @@ { KeySym originalKeysym = *keysym; @@ -19789,8 +19979,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Sat May 19 23:14:35 2018 -0700 +--- ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Sun Sep 02 07:33:40 2018 -0700 @@ -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 fb90c771d755..4a24011dbde4 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 Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/test/compiler/5091921/Test7005594.sh Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/test/compiler/5091921/Test7005594.sh Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/test/compiler/5091921/Test7005594.sh Mon Sep 03 11:13:04 2018 -0700 @@ -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 Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/test/compiler/6894807/Test6894807.sh Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/test/compiler/6894807/Test6894807.sh Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/test/compiler/6894807/Test6894807.sh Mon Sep 03 11:13:04 2018 -0700 @@ -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 Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/test/runtime/7110720/Test7110720.sh Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/test/runtime/7110720/Test7110720.sh Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/test/runtime/7110720/Test7110720.sh Mon Sep 03 11:13:04 2018 -0700 @@ -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 Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Mon Sep 03 11:13:04 2018 -0700 @@ -37,8 +37,8 @@ public static void main(String args[]) throws Throwable { @@ -51,8 +51,8 @@ return; } ---- ./hotspot/test/serviceability/dcmd/DynLibDcmdTest.java Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/test/serviceability/dcmd/DynLibDcmdTest.java Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/test/serviceability/dcmd/DynLibDcmdTest.java Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/test/serviceability/dcmd/DynLibDcmdTest.java Mon Sep 03 11:13:04 2018 -0700 @@ -47,6 +47,8 @@ osDependentBaseString = "lib%s.dylib"; } else if (Platform.isLinux()) { @@ -62,8 +62,8 @@ } if (osDependentBaseString == null) { ---- ./hotspot/test/test_env.sh Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/test/test_env.sh Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/test/test_env.sh Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/test/test_env.sh Mon Sep 03 11:13:04 2018 -0700 @@ -53,7 +53,7 @@ # set platform-dependent variables OS=`uname -s` @@ -73,8 +73,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java Mon Mar 19 11:59:32 2018 -0700 -+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java Sat May 19 23:14:15 2018 -0700 +--- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java Sat Jun 23 21:01:40 2018 -0700 ++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java Mon Sep 03 11:13:04 2018 -0700 @@ -67,6 +67,10 @@ return isOs("aix"); } @@ -86,8 +86,8 @@ public static boolean isLinux() { return isOs("linux"); } ---- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Sun Sep 02 07:33:40 2018 -0700 @@ -48,7 +48,7 @@ # set platform-dependent variables OS=`uname -s` @@ -97,8 +97,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Sun Sep 02 07:33:40 2018 -0700 @@ -31,7 +31,7 @@ OS=`uname -s` @@ -108,8 +108,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -56,7 +56,7 @@ OS=`uname -s` @@ -119,8 +119,8 @@ PATHSEP=":" ;; ---- ./jdk/test/com/sun/jdi/JITDebug.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/com/sun/jdi/JITDebug.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/com/sun/jdi/JITDebug.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/com/sun/jdi/JITDebug.sh Sun Sep 02 07:33:40 2018 -0700 @@ -63,7 +63,7 @@ OS=`uname -s` export TRANSPORT_METHOD @@ -130,8 +130,8 @@ PATHSEP=":" TRANSPORT_METHOD=dt_socket ;; ---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -106,7 +106,7 @@ xx=`find ${jreloc}/lib -name libdt_socket.so` libloc=`dirname ${xx}` @@ -141,8 +141,8 @@ libloc=${jreloc}/lib ;; Windows*) ---- ./jdk/test/com/sun/jdi/ShellScaffold.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/com/sun/jdi/ShellScaffold.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/com/sun/jdi/ShellScaffold.sh Sun Sep 02 07:33:40 2018 -0700 @@ -284,7 +284,7 @@ psCmd=ps jstack=jstack.exe @@ -152,8 +152,8 @@ transport=dt_socket address= devnull=/dev/null ---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Sun Sep 02 07:33:40 2018 -0700 @@ -45,7 +45,7 @@ OS=`uname -s` @@ -163,8 +163,8 @@ PS=":" ;; Windows* | CYGWIN*) ---- ./jdk/test/java/awt/JAWT/JAWT.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/awt/JAWT/JAWT.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/awt/JAWT/JAWT.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/awt/JAWT/JAWT.sh Sun Sep 02 07:33:40 2018 -0700 @@ -62,6 +62,23 @@ MAKE="make" LD_LIBRARY_PATH="." @@ -198,8 +198,8 @@ exit 0; ;; * ) ---- ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -86,6 +86,14 @@ TMP="/tmp" ;; @@ -215,8 +215,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -59,7 +59,7 @@ # Checking for proper OS OS=`uname -s` @@ -226,8 +226,8 @@ FILESEP="/" ;; ---- ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -119,6 +119,14 @@ TMP="/tmp" ;; @@ -243,8 +243,8 @@ Windows* ) VAR="A different value for Win32" DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0" ---- ./jdk/test/java/io/File/GetXSpace.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/io/File/GetXSpace.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/io/File/GetXSpace.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/io/File/GetXSpace.java Sun Sep 02 07:33:40 2018 -0700 @@ -51,7 +51,7 @@ private static final String dfFormat; static { @@ -254,8 +254,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/io/File/GetXSpace.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/io/File/GetXSpace.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/io/File/GetXSpace.sh Sun Sep 02 07:33:40 2018 -0700 @@ -26,7 +26,7 @@ # set platform-dependent variable OS=`uname -s` @@ -265,8 +265,8 @@ Windows_98 ) return ;; Windows* ) SID=`sid`; TMP="c:/temp" ;; * ) ---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Sun Sep 02 07:33:40 2018 -0700 @@ -45,7 +45,7 @@ # Need to determine the classpath separator and filepath separator based on the # operating system. @@ -276,8 +276,8 @@ PS=":" ;; Windows* | CYGWIN* ) PS=";" ;; ---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Sun Sep 02 07:33:40 2018 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -287,8 +287,8 @@ PS=":" ;; Windows* | CYGWIN* ) PS=";" ;; ---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh Sun Sep 02 07:33:40 2018 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -298,8 +298,8 @@ PS=":" ;; Windows* | CYGWIN* ) PS=";" ;; ---- ./jdk/test/java/lang/ClassLoader/Assert.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/lang/ClassLoader/Assert.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/lang/ClassLoader/Assert.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/lang/ClassLoader/Assert.sh Sun Sep 02 07:33:40 2018 -0700 @@ -25,7 +25,7 @@ OS=`uname -s` @@ -309,8 +309,8 @@ FS="/" CHMOD="${FS}bin${FS}chmod" ;; ---- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Sun Sep 02 07:33:40 2018 -0700 @@ -55,7 +55,7 @@ Linux ) FS="/" @@ -320,8 +320,8 @@ FS="/" ;; AIX ) ---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Sun Sep 02 07:33:40 2018 -0700 @@ -60,7 +60,7 @@ Linux ) FS="/" @@ -331,8 +331,8 @@ FS="/" ;; AIX ) ---- ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Sun Sep 02 07:33:40 2018 -0700 @@ -148,6 +148,9 @@ } else if (osName.startsWith("Linux") == true) { return new UnixTest( @@ -343,8 +343,8 @@ } else if (osName.startsWith("Mac OS")) { return new MacTest( File.createTempFile("ProcessTrap-", ".sh",null)); ---- ./jdk/test/java/lang/ProcessBuilder/Zombies.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/lang/ProcessBuilder/Zombies.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/lang/ProcessBuilder/Zombies.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/lang/ProcessBuilder/Zombies.java Sun Sep 02 07:33:40 2018 -0700 @@ -34,7 +34,7 @@ static final String os = System.getProperty("os.name"); @@ -354,8 +354,8 @@ "/usr/bin/true" : "/bin/true"; public static void main(String[] args) throws Throwable { ---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Sun Sep 02 07:33:40 2018 -0700 @@ -30,7 +30,7 @@ # set platform-dependent variables OS=`uname -s` @@ -365,8 +365,8 @@ Windows* | CYGWIN* ) echo "Passed"; exit 0 ;; * ) echo "Unrecognized system!" ; exit 1 ;; ---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Sun Sep 02 07:33:40 2018 -0700 @@ -48,7 +48,7 @@ # set platform-dependent variables OS=`uname -s` @@ -376,8 +376,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/java/lang/instrument/MakeJAR2.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/lang/instrument/MakeJAR2.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/lang/instrument/MakeJAR2.sh Sun Sep 02 07:33:40 2018 -0700 @@ -55,7 +55,7 @@ OS=`uname -s` @@ -387,8 +387,8 @@ PATHSEP=":" ;; ---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Sun Sep 02 07:33:40 2018 -0700 @@ -43,7 +43,7 @@ PS=":" FS="/" @@ -398,8 +398,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Sun Sep 02 07:33:40 2018 -0700 @@ -79,8 +79,10 @@ System.out.println("Test passed."); } @@ -421,8 +421,8 @@ ? output.split(" ") : output.split(","); double expected = Double.parseDouble(lavg[0]); ---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Sun Sep 02 07:33:40 2018 -0700 @@ -61,7 +61,7 @@ while true; do echo "Run $i: TestSystemLoadAvg" @@ -432,8 +432,8 @@ runOne GetSystemLoadAverage ;; * ) ---- ./jdk/test/java/net/Authenticator/B4933582.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/net/Authenticator/B4933582.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/net/Authenticator/B4933582.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/net/Authenticator/B4933582.sh Sun Sep 02 07:33:40 2018 -0700 @@ -26,7 +26,7 @@ OS=`uname -s` @@ -443,8 +443,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/DatagramSocket/Send12k.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/net/DatagramSocket/Send12k.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/net/DatagramSocket/Send12k.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/net/DatagramSocket/Send12k.java Sun Sep 02 07:33:40 2018 -0700 @@ -36,9 +36,10 @@ public static void main(String args[]) throws Exception { @@ -458,8 +458,8 @@ SEND_SIZE = 16 * 576; } else { SEND_SIZE = 16 * 1024; ---- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Sun Sep 02 07:33:40 2018 -0700 @@ -45,6 +45,8 @@ return (true); if (p.getProperty ("os.name").equals ("Linux")) @@ -469,8 +469,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Sun Sep 02 07:33:40 2018 -0700 @@ -27,11 +27,7 @@ # set platform-dependent variables OS=`uname -s` @@ -484,8 +484,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/net/Socket/OldSocketImpl.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/net/Socket/OldSocketImpl.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/net/Socket/OldSocketImpl.sh Sun Sep 02 07:33:40 2018 -0700 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -495,8 +495,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URL/B5086147.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/net/URL/B5086147.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/net/URL/B5086147.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/net/URL/B5086147.sh Sun Sep 02 07:33:40 2018 -0700 @@ -26,7 +26,7 @@ OS=`uname -s` @@ -506,8 +506,8 @@ exit 0 ;; CYGWIN* ) ---- ./jdk/test/java/net/URLClassLoader/B5077773.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/net/URLClassLoader/B5077773.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/net/URLClassLoader/B5077773.sh Sun Sep 02 07:33:40 2018 -0700 @@ -34,11 +34,7 @@ OS=`uname -s` @@ -521,8 +521,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Sun Sep 02 07:33:40 2018 -0700 @@ -27,11 +27,7 @@ OS=`uname -s` @@ -536,8 +536,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URLConnection/6212146/test.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/net/URLConnection/6212146/test.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/net/URLConnection/6212146/test.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/net/URLConnection/6212146/test.sh Sun Sep 02 07:33:40 2018 -0700 @@ -33,11 +33,7 @@ OS=`uname -s` @@ -551,8 +551,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/nio/channels/FileChannel/Transfer.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/nio/channels/FileChannel/Transfer.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/nio/channels/FileChannel/Transfer.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/nio/channels/FileChannel/Transfer.java Sun Sep 02 07:33:40 2018 -0700 @@ -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 @@ -562,8 +562,8 @@ return; File source = File.createTempFile("blah", null); source.deleteOnExit(); ---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Sun Sep 02 07:33:40 2018 -0700 @@ -17,6 +17,12 @@ #include "Launcher.h" @@ -586,8 +586,8 @@ _exit(-1); } ---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Sun Sep 02 07:33:40 2018 -0700 @@ -34,7 +34,7 @@ OS=`uname -s` @@ -597,8 +597,8 @@ # Skip locale test for Windows Windows* | CYGWIN* ) echo "Passed"; exit 0 ;; ---- ./jdk/test/java/nio/charset/spi/basic.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/nio/charset/spi/basic.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/nio/charset/spi/basic.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/nio/charset/spi/basic.sh Sun Sep 02 07:33:40 2018 -0700 @@ -48,7 +48,7 @@ DIR=`pwd` @@ -608,8 +608,8 @@ Windows* ) CPS=';' ;; CYGWIN* ) DIR=`/usr/bin/cygpath -a -s -m $DIR` ---- ./jdk/test/java/nio/file/FileSystem/Basic.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/nio/file/FileSystem/Basic.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/nio/file/FileSystem/Basic.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/nio/file/FileSystem/Basic.java Sun Sep 02 07:33:40 2018 -0700 @@ -76,7 +76,7 @@ checkSupported(fs, "posix", "unix", "owner", "acl", "user"); if (os.equals("Linux")) @@ -619,8 +619,8 @@ checkSupported(fs, "posix", "unix", "owner"); if (os.equals("Windows")) checkSupported(fs, "owner", "dos", "acl", "user"); ---- ./jdk/test/java/nio/file/Files/CopyAndMove.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/nio/file/Files/CopyAndMove.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/nio/file/Files/CopyAndMove.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/nio/file/Files/CopyAndMove.java Sun Sep 02 07:33:40 2018 -0700 @@ -651,7 +651,7 @@ // check POSIX attributes are copied @@ -639,8 +639,8 @@ boolean isDirectory = isDirectory(file, NOFOLLOW_LINKS); if (isUnix) { ---- ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Sun Sep 02 07:33:40 2018 -0700 @@ -33,7 +33,7 @@ OS=`uname -s` @@ -650,8 +650,8 @@ PS=":" ;; Windows* | CYGWIN* ) ---- ./jdk/test/java/rmi/registry/readTest/readTest.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/rmi/registry/readTest/readTest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/rmi/registry/readTest/readTest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/rmi/registry/readTest/readTest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -34,7 +34,7 @@ REGARGS="" @@ -661,8 +661,8 @@ PS=":" FS="/" CHMOD="${FS}bin${FS}chmod" ---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Sun Sep 02 07:33:40 2018 -0700 @@ -58,7 +58,7 @@ PATHSEP=":" FILESEP="/" @@ -672,8 +672,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Sun Sep 02 07:33:40 2018 -0700 @@ -42,7 +42,7 @@ PATHSEP=":" FILESEP="/" @@ -683,8 +683,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Sun Sep 02 07:33:40 2018 -0700 @@ -66,7 +66,7 @@ PATHSEP=";" FILESEP="/" @@ -694,8 +694,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh Sun Sep 02 07:33:40 2018 -0700 @@ -58,7 +58,7 @@ PATHSEP=":" FILESEP="/" @@ -705,8 +705,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/signedfirst/Static.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/security/Security/signedfirst/Static.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/security/Security/signedfirst/Static.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/security/Security/signedfirst/Static.sh Sun Sep 02 07:33:40 2018 -0700 @@ -58,7 +58,7 @@ PATHSEP=":" FILESEP="/" @@ -716,8 +716,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/util/Currency/PropertiesTest.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/util/Currency/PropertiesTest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/util/Currency/PropertiesTest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/util/Currency/PropertiesTest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -52,7 +52,7 @@ # set platform-dependent variables OS=`uname -s` @@ -727,8 +727,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -62,7 +62,7 @@ # set platform-dependent variables OS=`uname -s` @@ -738,8 +738,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Sun Sep 02 07:33:40 2018 -0700 @@ -31,7 +31,7 @@ # set platform-dependent variables OS=`uname -s` @@ -749,8 +749,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/util/ServiceLoader/basic.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/util/ServiceLoader/basic.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/util/ServiceLoader/basic.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/util/ServiceLoader/basic.sh Sun Sep 02 07:33:40 2018 -0700 @@ -43,9 +43,7 @@ OS=`uname -s` @@ -762,8 +762,8 @@ SEP=':' ;; * ) SEP='\;' ;; ---- ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Sun Sep 02 07:33:40 2018 -0700 @@ -31,7 +31,7 @@ OS=`uname -s` @@ -773,8 +773,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -56,7 +56,7 @@ # set platform-dependent variables OS=`uname -s` @@ -784,8 +784,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -89,7 +89,7 @@ FILESEP="/" ;; @@ -795,8 +795,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -90,7 +90,7 @@ FILESEP="/" ;; @@ -806,8 +806,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 Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Sun Sep 02 07:33:40 2018 -0700 @@ -108,6 +108,14 @@ TMP="/tmp" ;; @@ -823,8 +823,8 @@ Windows* ) VAR="A different value for Win32" DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0" ---- ./jdk/test/javax/script/CommonSetup.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/javax/script/CommonSetup.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/javax/script/CommonSetup.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/javax/script/CommonSetup.sh Sun Sep 02 07:33:40 2018 -0700 @@ -36,7 +36,7 @@ OS=`uname -s` @@ -834,8 +834,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Sun Sep 02 07:33:40 2018 -0700 @@ -43,7 +43,7 @@ FS="/" RM="/bin/rm -f" @@ -845,8 +845,8 @@ PS=":" FS="/" RM="/bin/rm -f" ---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Sun Sep 02 07:33:40 2018 -0700 @@ -53,7 +53,7 @@ # set platform-dependent variables OS=`uname -s` @@ -856,8 +856,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Sun Sep 02 07:33:40 2018 -0700 @@ -53,8 +53,13 @@ return isOs("linux"); } @@ -873,8 +873,8 @@ } public static String getOsName() { ---- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Sun Sep 02 07:33:40 2018 -0700 @@ -107,8 +107,8 @@ public static void main(String[] args) throws AWTException, InvocationTargetException, InterruptedException { @@ -886,8 +886,8 @@ "skipping!"); return; } ---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Sun Sep 02 07:33:40 2018 -0700 @@ -42,7 +42,7 @@ fi @@ -897,8 +897,8 @@ PATHSEP=":" FILESEP="/" DFILESEP=$FILESEP ---- ./jdk/test/sun/net/ftp/MarkResetTest.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/net/ftp/MarkResetTest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/net/ftp/MarkResetTest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/net/ftp/MarkResetTest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -908,8 +908,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Sun Sep 02 07:33:40 2018 -0700 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -919,8 +919,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Sun Sep 02 07:33:40 2018 -0700 @@ -31,7 +31,7 @@ OS=`uname -s` @@ -930,8 +930,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Sun Sep 02 07:33:40 2018 -0700 @@ -31,7 +31,7 @@ OS=`uname -s` @@ -941,8 +941,8 @@ PS=":" FS="/" CHMOD="${FS}bin${FS}chmod" ---- ./jdk/test/sun/nio/ch/SelProvider.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/nio/ch/SelProvider.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/nio/ch/SelProvider.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/nio/ch/SelProvider.java Sun Sep 02 07:33:40 2018 -0700 @@ -39,7 +39,7 @@ expected = "sun.nio.ch.DevPollSelectorProvider"; } else if ("Linux".equals(osname)) { @@ -952,8 +952,8 @@ expected = "sun.nio.ch.KQueueSelectorProvider"; } else { return; ---- ./jdk/test/sun/security/krb5/runNameEquals.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/krb5/runNameEquals.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/krb5/runNameEquals.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/krb5/runNameEquals.sh Sun Sep 02 07:33:40 2018 -0700 @@ -52,7 +52,7 @@ # set platform-dependent variables OS=`uname -s` @@ -963,8 +963,8 @@ PATHSEP=":" FILESEP="/" NATIVE=true ---- ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Sun Sep 02 07:33:40 2018 -0700 @@ -50,7 +50,7 @@ OS=`uname -s` @@ -974,8 +974,8 @@ FS="/" ;; Windows_* ) ---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Sun Sep 02 07:33:40 2018 -0700 @@ -66,7 +66,7 @@ CP="${FS}bin${FS}cp" CHMOD="${FS}bin${FS}chmod" @@ -985,8 +985,8 @@ FS="/" PS=":" CP="${FS}bin${FS}cp" ---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh Sun Sep 02 07:33:40 2018 -0700 @@ -67,7 +67,7 @@ CP="${FS}bin${FS}cp" CHMOD="${FS}bin${FS}chmod" @@ -996,8 +996,8 @@ FS="/" PS=":" CP="${FS}bin${FS}cp" ---- ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -50,7 +50,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1007,8 +1007,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Sun Sep 02 07:33:40 2018 -0700 @@ -52,7 +52,7 @@ PATHSEP=":" FILESEP="/" @@ -1018,8 +1018,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Sun Sep 02 07:33:40 2018 -0700 @@ -59,7 +59,7 @@ PS=":" FS="/" @@ -1029,8 +1029,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Sun Sep 02 07:33:40 2018 -0700 @@ -33,7 +33,7 @@ OS=`uname -s` @@ -1040,8 +1040,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -46,7 +46,7 @@ OS=`uname -s` @@ -1051,8 +1051,8 @@ FILESEP="/" PATHSEP=":" ;; ---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Sun Sep 02 07:33:40 2018 -0700 @@ -32,7 +32,7 @@ HOSTNAME=`uname -n` OS=`uname -s` @@ -1062,8 +1062,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Sun Sep 02 07:33:40 2018 -0700 @@ -32,7 +32,7 @@ HOSTNAME=`uname -n` OS=`uname -s` @@ -1073,8 +1073,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Sun Sep 02 07:33:40 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1084,8 +1084,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Sun Sep 02 07:33:40 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1095,8 +1095,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/jarsigner/diffend.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/jarsigner/diffend.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh Sun Sep 02 07:33:40 2018 -0700 @@ -47,6 +47,13 @@ FS="/" CP="${FS}bin${FS}cp -f" @@ -1111,8 +1111,8 @@ CYGWIN* ) NULL=/dev/null PS=";" ---- ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -39,6 +39,11 @@ Windows_* ) FS="\\" @@ -1125,8 +1125,8 @@ * ) FS="/" ;; ---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Sun Sep 02 07:33:40 2018 -0700 @@ -42,7 +42,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1136,8 +1136,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Sun Sep 02 07:33:40 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1147,8 +1147,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Sun Sep 02 07:33:40 2018 -0700 @@ -55,7 +55,7 @@ PATHSEP=":" FILESEP="/" @@ -1158,8 +1158,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Sun Sep 02 07:33:40 2018 -0700 @@ -48,7 +48,7 @@ Linux ) FILESEP="/" @@ -1169,8 +1169,8 @@ FILESEP="/" ;; AIX ) ---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Sun Sep 02 07:33:40 2018 -0700 @@ -45,7 +45,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1180,8 +1180,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Sun Sep 02 07:33:40 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1191,8 +1191,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Sun Sep 02 07:33:40 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1202,8 +1202,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/sun/security/tools/keytool/i18n.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/keytool/i18n.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/keytool/i18n.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/i18n.sh Sun Sep 02 07:33:40 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1213,8 +1213,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/printssl.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/keytool/printssl.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/keytool/printssl.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/printssl.sh Sun Sep 02 07:33:40 2018 -0700 @@ -40,7 +40,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1224,8 +1224,8 @@ FS="/" ;; CYGWIN* ) ---- ./jdk/test/sun/security/tools/keytool/resource.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/keytool/resource.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/keytool/resource.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/resource.sh Sun Sep 02 07:33:40 2018 -0700 @@ -43,7 +43,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1235,8 +1235,8 @@ NULL=/dev/null FS="/" ;; ---- ./jdk/test/sun/security/tools/keytool/standard.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/keytool/standard.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/keytool/standard.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/keytool/standard.sh Sun Sep 02 07:33:40 2018 -0700 @@ -45,7 +45,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1246,8 +1246,8 @@ FS="/" ;; Windows_* ) ---- ./jdk/test/sun/security/tools/policytool/Alias.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/policytool/Alias.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/policytool/Alias.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/policytool/Alias.sh Sun Sep 02 07:33:40 2018 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1257,8 +1257,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Sun Sep 02 07:33:40 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1268,8 +1268,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Sun Sep 02 07:33:40 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1279,8 +1279,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh Sun Sep 02 07:33:40 2018 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1290,8 +1290,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Sun Sep 02 07:33:40 2018 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1301,8 +1301,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Sun Sep 02 07:33:40 2018 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1312,8 +1312,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/i18n.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/security/tools/policytool/i18n.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/security/tools/policytool/i18n.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/security/tools/policytool/i18n.sh Sun Sep 02 07:33:40 2018 -0700 @@ -49,7 +49,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1323,8 +1323,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/tools/common/CommonSetup.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/tools/common/CommonSetup.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/tools/common/CommonSetup.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/tools/common/CommonSetup.sh Sun Sep 02 07:33:40 2018 -0700 @@ -47,6 +47,7 @@ # isLinux - true if OS is Linux # isSolaris - true if OS is Solaris @@ -1352,8 +1352,8 @@ Darwin ) OS="Mac OS X" isMacos=true ---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -54,7 +54,7 @@ OS=`uname -s` @@ -1363,8 +1363,8 @@ PATHSEP=":" ;; ---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Sun Sep 02 07:33:40 2018 -0700 @@ -56,7 +56,7 @@ OS=`uname -s` @@ -1374,8 +1374,8 @@ PATHSEP=":" ;; ---- ./jdk/test/tools/launcher/ExecutionEnvironment.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/tools/launcher/ExecutionEnvironment.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/tools/launcher/ExecutionEnvironment.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/tools/launcher/ExecutionEnvironment.java Sun Sep 02 07:33:40 2018 -0700 @@ -194,7 +194,7 @@ Map<String, String> env = new HashMap<>(); @@ -1385,8 +1385,8 @@ for (String x : LD_PATH_STRINGS) { String pairs[] = x.split("="); env.put(pairs[0], pairs[1]); ---- ./jdk/test/tools/launcher/RunpathTest.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/tools/launcher/RunpathTest.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/tools/launcher/RunpathTest.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/tools/launcher/RunpathTest.java Sun Sep 02 07:33:40 2018 -0700 @@ -69,7 +69,7 @@ } @@ -1396,8 +1396,8 @@ RunpathTest rp = new RunpathTest(); rp.testRpath(); } ---- ./jdk/test/tools/launcher/Test7029048.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/tools/launcher/Test7029048.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/tools/launcher/Test7029048.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/tools/launcher/Test7029048.java Sun Sep 02 07:33:40 2018 -0700 @@ -223,7 +223,7 @@ } else if (isSolaris && passes < 9) { throw new Exception("Test7029048: FAIL: " + @@ -1407,8 +1407,8 @@ throw new Exception("Test7029048: FAIL: " + "all tests did not run, expected " + 6 + " got " + passes); } else { ---- ./jdk/test/tools/launcher/TestHelper.java Mon Mar 19 12:06:18 2018 -0700 -+++ ./jdk/test/tools/launcher/TestHelper.java Sat May 19 23:14:35 2018 -0700 +--- ./jdk/test/tools/launcher/TestHelper.java Sat Jun 23 21:02:10 2018 -0700 ++++ ./jdk/test/tools/launcher/TestHelper.java Sun Sep 02 07:33:40 2018 -0700 @@ -94,6 +94,8 @@ System.getProperty("os.name", "unknown").startsWith("Linux"); static final boolean isAIX = @@ -1418,8 +1418,8 @@ static final String LIBJVM = isWindows ? "jvm.dll" : "libjvm" + (isMacOSX ? ".dylib" : ".so"); ---- ./langtools/test/Makefile Mon Mar 19 12:09:33 2018 -0700 -+++ ./langtools/test/Makefile Sat May 19 22:20:16 2018 -0700 +--- ./langtools/test/Makefile Sat Jun 23 21:02:19 2018 -0700 ++++ ./langtools/test/Makefile Sun Sep 02 07:33:26 2018 -0700 @@ -34,6 +34,14 @@ ARCH=i586 endif @@ -1435,8 +1435,8 @@ ifeq ($(OSNAME), Darwin) PLATFORM = bsd ARCH = $(shell uname -m) ---- ./langtools/test/tools/javah/ReadOldClass.sh Mon Mar 19 12:09:33 2018 -0700 -+++ ./langtools/test/tools/javah/ReadOldClass.sh Sat May 19 22:20:16 2018 -0700 +--- ./langtools/test/tools/javah/ReadOldClass.sh Sat Jun 23 21:02:19 2018 -0700 ++++ ./langtools/test/tools/javah/ReadOldClass.sh Sun Sep 02 07:33:26 2018 -0700 @@ -43,7 +43,7 @@ # set platform-dependent variables OS=`uname -s` @@ -1446,14 +1446,3 @@ PS=":" FS="/" ;; ---- ./nashorn/test/script/jfx.js Mon Mar 19 12:10:22 2018 -0700 -+++ ./nashorn/test/script/jfx.js Sat May 19 22:20:19 2018 -0700 -@@ -93,6 +93,8 @@ - f2 = new File(sb.append(fsep + "linux.png").toString()); - } else if (OSInfo.getOSType() == OSType.MACOSX) { - f2 = new File(sb.append(fsep + "macosx.png").toString()); -+ } else if (OSInfo.getOSType() == OSType.BSD) { -+ f2 = new File(sb.append(fsep + "bsd.png").toString()); - } - if (f1.exists() && f2.exists()) { - var image1 = new AWTImage(PNGDecoder.decode(f1.getAbsolutePath())); diff --git a/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp b/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp deleted file mode 100644 index ac002a41f888..000000000000 --- a/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- hotspot/src/share/vm/services/memTracker.cpp.orig -+++ hotspot/src/share/vm/services/memTracker.cpp -@@ -67,10 +67,6 @@ NMT_TrackingLevel MemTracker::init_tracking_level() { - os::unsetenv(buf); - } - -- // Construct NativeCallStack::EMPTY_STACK. It may get constructed twice, -- // but it is benign, the results are the same. -- ::new ((void*)&NativeCallStack::EMPTY_STACK) NativeCallStack(0, false); -- - if (!MallocTracker::initialize(level) || - !VirtualMemoryTracker::initialize(level)) { - level = NMT_off; |