. Update to 8u172.

6 files changed, 745 insertions, 753 deletions

diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index e2ecc8712b1a..38958d084747 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=	2
 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 \
@@ -32,7 +31,8 @@ PATCHFILES=	patch-8u05-b13.xz \
 		patch-8u131-b11.xz \
 		patch-8u144-b01.xz \
 		patch-8u152-b16.xz \
-		patch-8u162-b12.xz
+		patch-8u162-b12.xz \
+		patch-8u172-b11.xz
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT?=	Java Development Kit ${JDK_MAJOR_VERSION}
@@ -205,8 +205,8 @@ NO_CCACHE=		yes
 NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	8
-JDK_UPDATE_VERSION=	162
-JDK_BUILD_NUMBER=	12
+JDK_UPDATE_VERSION=	172
+JDK_BUILD_NUMBER=	11
 DIST_BUILD_NUMBER=	132
 JTREG_VERSION=		4.1
 JTREG_BUILD_NUMBER=	b08
diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo
index af4ba657cc2c..f882f000f46a 100644
--- a/java/openjdk8/distinfo
+++ b/java/openjdk8/distinfo
@@ -45,3 +45,5 @@ SHA256 (patch-8u152-b16.xz) = 51c57b8d60b8f71758fe03c45c70ab60d0423bf4699e71b21b
 SIZE (patch-8u152-b16.xz) = 454236
 SHA256 (patch-8u162-b12.xz) = 9f083cde406ead14e38f5423a6dcc0f0b0a3f7ef69fdc4c83a32b8fea4c3ddcb
 SIZE (patch-8u162-b12.xz) = 337248
+SHA256 (patch-8u172-b11.xz) = e338a1dc63cc08f9227d685e350e60609e43612f18773213b882d78c7c559934
+SIZE (patch-8u172-b11.xz) = 146716
diff --git a/java/openjdk8/files/patch-bsd b/java/openjdk8/files/patch-bsd
index 5fb3730c84ba..5f403e335da9 100644
--- a/java/openjdk8/files/patch-bsd
+++ b/java/openjdk8/files/patch-bsd
@@ -1,5 +1,5 @@
---- ./common/autoconf/build-performance.m4	Fri Dec 15 08:56:46 2017 -0800
-+++ ./common/autoconf/build-performance.m4	Thu Jan 25 22:36:11 2018 -0800
+--- ./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
 @@ -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	Fri Dec 15 08:56:46 2017 -0800
-+++ ./common/autoconf/generated-configure.sh	Thu Jan 25 22:36:11 2018 -0800
+--- ./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
 @@ -646,6 +646,8 @@
  LIBM
  LIBZIP_CAN_USE_MMAP
@@ -675,8 +675,8 @@
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
  $as_echo "no, disabling ccache" >&6; }
        CCACHE=
---- ./common/autoconf/jdk-options.m4	Fri Dec 15 08:56:46 2017 -0800
-+++ ./common/autoconf/jdk-options.m4	Thu Jan 25 22:36:11 2018 -0800
+--- ./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
 @@ -159,7 +159,7 @@
      INCLUDE_SA=false
    fi
@@ -707,8 +707,8 @@
    # Enable or disable the elliptic curve crypto implementation
    #
    AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
---- ./common/autoconf/libraries.m4	Fri Dec 15 08:56:46 2017 -0800
-+++ ./common/autoconf/libraries.m4	Thu Jan 25 22:36:11 2018 -0800
+--- ./common/autoconf/libraries.m4	Mon Mar 19 11:56:10 2018 -0700
++++ ./common/autoconf/libraries.m4	Sat May 19 22:20:07 2018 -0700
 @@ -69,9 +69,15 @@
    fi
  
@@ -846,8 +846,8 @@
 +
    AC_SUBST(LIBCXX)
  ])
---- ./common/autoconf/platform.m4	Fri Dec 15 08:56:46 2017 -0800
-+++ ./common/autoconf/platform.m4	Thu Jan 25 22:36:11 2018 -0800
+--- ./common/autoconf/platform.m4	Mon Mar 19 11:56:10 2018 -0700
++++ ./common/autoconf/platform.m4	Sat May 19 22:20:07 2018 -0700
 @@ -30,7 +30,7 @@
  [
    # First argument is the cpu name from the trip/quad
@@ -907,8 +907,8 @@
      OPENJDK_TARGET_CPU_OSARCH="i386"
    elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
      # On all platforms except macosx, we replace x86_64 with amd64.
---- ./common/autoconf/spec.gmk.in	Fri Dec 15 08:56:46 2017 -0800
-+++ ./common/autoconf/spec.gmk.in	Thu Jan 25 22:36:11 2018 -0800
+--- ./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
 @@ -76,6 +76,7 @@
  OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@
  OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@
@@ -945,8 +945,8 @@
  USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
  LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
  MSVCR_DLL:=@MSVCR_DLL@
---- ./common/autoconf/toolchain.m4	Fri Dec 15 08:56:46 2017 -0800
-+++ ./common/autoconf/toolchain.m4	Thu Jan 25 22:36:11 2018 -0800
+--- ./common/autoconf/toolchain.m4	Mon Mar 19 11:56:10 2018 -0700
++++ ./common/autoconf/toolchain.m4	Sat May 19 22:20:07 2018 -0700
 @@ -122,7 +122,7 @@
    else
      COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
@@ -1064,16 +1064,16 @@
    fi
    if test "x$DEBUG_LEVEL" = xrelease; then
      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DNDEBUG"
---- ./configure	Fri Dec 15 08:56:46 2017 -0800
-+++ ./configure	Thu Jan 25 22:36:11 2018 -0800
+--- ./configure	Mon Mar 19 11:56:10 2018 -0700
++++ ./configure	Sat May 19 22:20:07 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	Fri Dec 15 08:56:46 2017 -0800
-+++ ./make/Javadoc.gmk	Thu Jan 25 22:36:11 2018 -0800
+--- ./make/Javadoc.gmk	Mon Mar 19 11:56:10 2018 -0700
++++ ./make/Javadoc.gmk	Sat May 19 22:20:07 2018 -0700
 @@ -46,8 +46,18 @@
  
  BUILD_NUMBER=$(JDK_BUILD_NUMBER)
@@ -1094,8 +1094,8 @@
      -Djava.awt.headless=true \
      $(NEW_JAVADOC) \
      -bootclasspath $(JDK_OUTPUTDIR)/classes
---- ./make/Main.gmk	Fri Dec 15 08:56:46 2017 -0800
-+++ ./make/Main.gmk	Thu Jan 25 22:36:11 2018 -0800
+--- ./make/Main.gmk	Mon Mar 19 11:56:10 2018 -0700
++++ ./make/Main.gmk	Sat May 19 22:20:07 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 +1108,8 @@
  
  ### Main targets
  
---- ./make/common/MakeBase.gmk	Fri Dec 15 08:56:46 2017 -0800
-+++ ./make/common/MakeBase.gmk	Thu Jan 25 22:36:11 2018 -0800
+--- ./make/common/MakeBase.gmk	Mon Mar 19 11:56:10 2018 -0700
++++ ./make/common/MakeBase.gmk	Sat May 19 22:20:07 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 +1130,8 @@
  endef
  
  # Make directory without forking mkdir if not needed
---- ./make/common/NativeCompilation.gmk	Fri Dec 15 08:56:46 2017 -0800
-+++ ./make/common/NativeCompilation.gmk	Thu Jan 25 22:36:11 2018 -0800
+--- ./make/common/NativeCompilation.gmk	Mon Mar 19 11:56:10 2018 -0700
++++ ./make/common/NativeCompilation.gmk	Sat May 19 22:20:07 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 +1145,8 @@
  
    ifneq (,$$($1_BIN))
      $$(error BIN has been replaced with OBJECT_DIR)
---- ./hotspot/agent/make/Makefile	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/agent/make/Makefile	Thu Jan 25 22:36:25 2018 -0800
+--- ./hotspot/agent/make/Makefile	Mon Mar 19 11:59:32 2018 -0700
++++ ./hotspot/agent/make/Makefile	Sat May 19 23:14:15 2018 -0700
 @@ -50,6 +50,7 @@
  sun.jvm.hotspot.debugger.amd64 \
  sun.jvm.hotspot.debugger.bsd \
@@ -1225,8 +1225,8 @@
  sun/jvm/hotspot/runtime/solaris_amd64/*.java \
  sun/jvm/hotspot/runtime/solaris_sparc/*.java \
  sun/jvm/hotspot/runtime/solaris_x86/*.java \
---- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -42,6 +42,10 @@
  #include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h"
  #endif
@@ -1295,8 +1295,8 @@
  
    (*env)->ReleaseLongArrayElements(env, array, regs, JNI_COMMIT);
    return array;
---- ./hotspot/agent/src/os/bsd/elfmacros.h	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/agent/src/os/bsd/elfmacros.h	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -34,6 +34,7 @@
  #define ELF_SYM         Elf64_Sym
  #define ELF_DYN         Elf64_Dyn
@@ -1313,8 +1313,8 @@
  
  #ifndef ELF_ST_TYPE
  #define ELF_ST_TYPE     ELF32_ST_TYPE
---- ./hotspot/agent/src/os/bsd/ps_core.c	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/agent/src/os/bsd/ps_core.c	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -1091,6 +1091,18 @@
          if (core_handle_prstatus(ph, descdata, notep->n_descsz) != true) {
            return false;
@@ -1361,8 +1361,8 @@
      goto err;
    }
  
---- ./hotspot/agent/src/os/bsd/symtab.c	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/agent/src/os/bsd/symtab.c	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -211,6 +211,10 @@
  
    // Reading of elf header
@@ -1403,8 +1403,8 @@
  
          key.data = sym_name;
          key.size = strlen(sym_name) + 1;
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -33,6 +33,7 @@
  import sun.jvm.hotspot.debugger.JVMDebugger;
  import sun.jvm.hotspot.debugger.MachineDescription;
@@ -1423,7 +1423,7 @@
              if (LinuxDebuggerLocal.getAddressSize()==8) {
                      machDesc = new MachineDescriptionSPARC64Bit();
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,43 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1468,8 +1468,8 @@
 +      return false;
 +  }
 +}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -30,8 +30,10 @@
  import sun.jvm.hotspot.debugger.cdbg.*;
  import sun.jvm.hotspot.debugger.x86.*;
@@ -1495,8 +1495,8 @@
      } else {
         throw new DebuggerException(cpu + " is not yet supported");
      }
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -27,6 +27,7 @@
  import sun.jvm.hotspot.debugger.*;
  import sun.jvm.hotspot.debugger.bsd.amd64.*;
@@ -1515,7 +1515,7 @@
           throw new RuntimeException("cpu " + cpu + " is not yet supported");
        }
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,79 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1597,7 +1597,7 @@
 +  private BsdDebugger dbg;
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,46 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1646,7 +1646,7 @@
 +  }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,123 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1771,8 +1771,8 @@
 +  public abstract Address getRegisterAsAddress(int index);
 +
 +}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -32,7 +32,9 @@
  import sun.jvm.hotspot.debugger.cdbg.*;
  import sun.jvm.hotspot.debugger.proc.amd64.*;
@@ -1795,7 +1795,7 @@
            try {
              Class tfc = Class.forName("sun.jvm.hotspot.debugger.proc." +
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,86 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1884,7 +1884,7 @@
 +  }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,46 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1933,7 +1933,7 @@
 +  }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,44 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1979,8 +1979,8 @@
 +    return new ProcPPC64Thread(debugger, id);
 +  }
 +}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -33,6 +33,7 @@
  import sun.jvm.hotspot.debugger.remote.sparc.*;
  import sun.jvm.hotspot.debugger.remote.x86.*;
@@ -2002,7 +2002,7 @@
          try {
            Class tf = Class.forName("sun.jvm.hotspot.debugger.remote." +
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,53 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2058,7 +2058,7 @@
 +  }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,50 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2111,7 +2111,7 @@
 +  }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,44 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2157,8 +2157,8 @@
 +    return new RemotePPC64Thread(debugger, id);
 +  }
 +}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -37,6 +37,7 @@
  import sun.jvm.hotspot.runtime.linux_sparc.LinuxSPARCJavaThreadPDAccess;
  import sun.jvm.hotspot.runtime.bsd_x86.BsdX86JavaThreadPDAccess;
@@ -2177,7 +2177,7 @@
          } else if (os.equals("darwin")) {
              if (cpu.equals("amd64") || cpu.equals("x86_64")) {
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ppc64/BsdPPC64JavaThreadPDAccess.java	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ppc64/BsdPPC64JavaThreadPDAccess.java	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,132 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2312,7 +2312,7 @@
 +  }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,176 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2491,7 +2491,7 @@
 +  }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,508 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -3002,7 +3002,7 @@
 +  }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,43 @@
 +/*
 + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -3048,7 +3048,7 @@
 +
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,51 @@
 +/*
 + * Copyright (c) 20014, Oracle and/or its affiliates. All rights reserved.
@@ -3101,8 +3101,8 @@
 +  protected void initializeFromPD(RegisterMap map) {}
 +  protected Address getLocationPD(VMReg reg) { return null; }
 +}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -61,7 +61,7 @@
        return "x86";
      } else if (cpu.equals("sparc") || cpu.equals("sparcv9")) {
@@ -3112,8 +3112,8 @@
        return cpu;
      } else {
        try {
---- ./hotspot/make/bsd/Makefile	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/make/bsd/Makefile	Thu Jan 25 22:36:25 2018 -0800
+--- ./hotspot/make/bsd/Makefile	Mon Mar 19 11:59:32 2018 -0700
++++ ./hotspot/make/bsd/Makefile	Sat May 19 23:14:15 2018 -0700
 @@ -66,6 +66,10 @@
      FORCE_TIERED=1
    endif
@@ -3125,8 +3125,8 @@
  
  ifdef LP64
    ifeq ("$(filter $(LP64_ARCH),$(BUILDARCH))","")
---- ./hotspot/make/bsd/makefiles/build_vm_def.sh	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -1,12 +1,28 @@
  #!/bin/sh
  
@@ -3162,8 +3162,8 @@
 +        if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";"
 +    }' | sort -u ;;
 +esac
---- ./hotspot/make/bsd/makefiles/debug.make	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/make/bsd/makefiles/debug.make	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -35,7 +35,10 @@
  # to inhibit the effect of the previous line on CFLAGS.
  
@@ -3176,8 +3176,8 @@
  
  VERSION = debug
  SYSDEFS += -DASSERT
---- ./hotspot/make/bsd/makefiles/defs.make	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/make/bsd/makefiles/defs.make	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -29,7 +29,15 @@
  SLASH_JAVA ?= /java
  
@@ -3276,8 +3276,8 @@
  ADD_SA_BINARIES/ia64  =
  ADD_SA_BINARIES/arm   =
  ADD_SA_BINARIES/zero  =
---- ./hotspot/make/bsd/makefiles/fastdebug.make	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/make/bsd/makefiles/fastdebug.make	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -56,7 +56,10 @@
  # to inhibit the effect of the previous line on CFLAGS.
  
@@ -3290,8 +3290,8 @@
  
  VERSION = fastdebug
  SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS
---- ./hotspot/make/bsd/makefiles/gcc.make	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/make/bsd/makefiles/gcc.make	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -168,6 +168,9 @@
    CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
  endif
@@ -3324,7 +3324,18 @@
    endif
  endif
  
-@@ -265,7 +271,7 @@
+@@ -258,6 +264,10 @@
+ #  WARNINGS_ARE_ERRORS += -Wno-tautological-constant-out-of-range-compare
+   WARNINGS_ARE_ERRORS += -Wno-delete-non-virtual-dtor -Wno-deprecated -Wno-format -Wno-dynamic-class-memaccess
+   WARNINGS_ARE_ERRORS += -Wno-empty-body
++  ifneq "$(shell expr \( $(CC_VER_MAJOR) \>= 6 \))" "0"
++    WARNINGS_ARE_ERRORS += -Wno-undefined-bool-conversion -Wno-expansion-to-defined
++    WARNINGS_ARE_ERRORS += -Wno-undefined-var-template
++  endif
+ endif
+ 
+ WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef
+@@ -265,7 +275,7 @@
  ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
    # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
    # conversions which might affect the values. Only enable it in earlier versions.
@@ -3333,7 +3344,7 @@
    ifeq ($(USE_CLANG),)
      WARNING_FLAGS += -Wconversion
    endif
-@@ -421,53 +427,44 @@
+@@ -421,53 +431,44 @@
    CFLAGS += -flimit-debug-info
  endif
  
@@ -3419,7 +3430,7 @@
  endif
  
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/makefiles/launcher.make	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/make/bsd/makefiles/launcher.make	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,117 @@
 +#
 +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -3538,8 +3549,8 @@
 +	$(QUIETLY) sed -e 's/@@LIBARCH@@/$(LIBARCH)/g' $< > $@
 +	$(QUIETLY) chmod +x $@
 +
---- ./hotspot/make/bsd/makefiles/mapfile-vers-debug	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -21,246 +21,254 @@
  # questions.
  #
@@ -4027,7 +4038,7 @@
 +                *;
 +};
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,266 @@
 +#
 +# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
@@ -4295,8 +4306,8 @@
 +
 +                # INSERT VTABLE SYMBOLS HERE
 +
---- ./hotspot/make/bsd/makefiles/mapfile-vers-product	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -21,241 +21,249 @@
  # questions.
  #
@@ -4775,7 +4786,7 @@
 +                *;
 +};
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,261 @@
 +#
 +# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
@@ -5038,8 +5049,8 @@
 +
 +                # INSERT VTABLE SYMBOLS HERE
 +
---- ./hotspot/make/bsd/makefiles/optimized.make	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/make/bsd/makefiles/optimized.make	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -38,6 +38,9 @@
  # to inhibit the effect of the previous line on CFLAGS.
  
@@ -5052,7 +5063,7 @@
  
  VERSION = optimized
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/makefiles/ppc64.make	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/make/bsd/makefiles/ppc64.make	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,51 @@
 +#
 +# Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -5105,8 +5116,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	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/make/bsd/makefiles/product.make	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -38,7 +38,10 @@
  # to inhibit the effect of the previous line on CFLAGS.
  
@@ -5119,8 +5130,8 @@
  
  SYSDEFS += -DPRODUCT
  VERSION = optimized
---- ./hotspot/make/bsd/makefiles/rules.make	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/make/bsd/makefiles/rules.make	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -34,7 +34,7 @@
  CC_COMPILE       = $(CC) $(CXXFLAGS) $(CFLAGS)
  CXX_COMPILE      = $(CXX) $(CXXFLAGS) $(CFLAGS)
@@ -5130,8 +5141,8 @@
  
  COMPILE.CC       = $(CC_COMPILE) -c
  GENASM.CC        = $(CC_COMPILE) -S
---- ./hotspot/make/bsd/makefiles/sa.make	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/make/bsd/makefiles/sa.make	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -1,5 +1,5 @@
  #
 -# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
@@ -5246,8 +5257,8 @@
  	rm -rf $(AGENT_FILES_LIST)
 +
 +-include $(HS_ALT_MAKE)/bsd/makefiles/sa-rules.make
---- ./hotspot/make/bsd/makefiles/saproc.make	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/make/bsd/makefiles/saproc.make	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -99,10 +99,10 @@
  endif
  
@@ -5287,8 +5298,8 @@
 +	 cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"
  
  .PHONY: install_saproc
---- ./hotspot/make/bsd/makefiles/vm.make	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/make/bsd/makefiles/vm.make	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -107,7 +107,7 @@
  # File specific flags
  CXXFLAGS += $(CXXFLAGS/BYFILE)
@@ -5299,7 +5310,7 @@
  endif
  
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/platform_ppc64	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/make/bsd/platform_ppc64	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,17 @@
 +os_family = bsd
 +
@@ -5318,8 +5329,8 @@
 +gnu_dis_arch = ppc64
 +
 +sysdefs = -DBSD -D_ALLBSD_SOURCE -D_GNU_SOURCE -DPPC64
---- ./hotspot/make/sa.files	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/make/sa.files	Thu Jan 25 22:36:25 2018 -0800
+--- ./hotspot/make/sa.files	Mon Mar 19 11:59:32 2018 -0700
++++ ./hotspot/make/sa.files	Sat May 19 23:14:15 2018 -0700
 @@ -45,6 +45,7 @@
  $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/amd64/*.java \
  $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/*.java \
@@ -5360,8 +5371,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	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -277,5 +277,9 @@
  #if defined(TARGET_OS_ARCH_linux_ppc)
  #include "bytes_linux_ppc.inline.hpp"
@@ -5372,8 +5383,8 @@
 +
  
  #endif // CPU_PPC_VM_BYTES_PPC_HPP
---- ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -307,6 +307,8 @@
    // Although AIX runs on big endian CPU, float is in most significant
    // word of an argument slot.
@@ -5383,8 +5394,8 @@
  #else
  #error "unknown OS"
  #endif
---- ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -780,6 +780,8 @@
        // Although AIX runs on big endian CPU, float is in the most
        // significant word of an argument slot.
@@ -5394,8 +5405,8 @@
  #else
  #error "unknown OS"
  #endif
---- ./hotspot/src/cpu/x86/vm/jni_x86.h	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/cpu/x86/vm/jni_x86.h	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -34,7 +34,7 @@
  #ifndef __has_attribute
    #define __has_attribute(x) 0
@@ -5405,8 +5416,8 @@
    #define JNIEXPORT     __attribute__((visibility("default")))
    #define JNIIMPORT     __attribute__((visibility("default")))
  #else
---- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -2266,7 +2266,7 @@
    if (!is_critical_native) {
      // reset handle block
@@ -5416,8 +5427,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	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -23,9 +23,12 @@
   */
  
@@ -5432,8 +5443,8 @@
  #include "asm/macroAssembler.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "code/debugInfoRec.hpp"
---- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -1293,7 +1293,7 @@
  
    // reset handle block
@@ -5443,8 +5454,8 @@
  
    // If result was an oop then unbox and save it in the frame
    { Label L;
---- ./hotspot/src/cpu/x86/vm/x86_32.ad	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/cpu/x86/vm/x86_32.ad	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -1250,6 +1250,7 @@
  
  
@@ -5453,8 +5464,8 @@
  }
  
  #ifndef PRODUCT
---- ./hotspot/src/os/aix/vm/os_aix.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/os/aix/vm/os_aix.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -5236,6 +5236,10 @@
      return 0;
    }
@@ -5467,7 +5478,7 @@
  }
  
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,53 @@
 +/*
 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -5522,8 +5533,8 @@
 +  return false;
 +}
 +#endif
---- ./hotspot/src/os/bsd/vm/jsig.c	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/os/bsd/vm/jsig.c	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -165,9 +165,8 @@
  }
  
@@ -5536,8 +5547,8 @@
  
  static int call_os_sigaction(int sig, const struct sigaction  *act,
                               struct sigaction *oact) {
---- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -50,6 +50,7 @@
      case INTERRUPT_SIGNAL:
      case SIGFPE:
@@ -5647,8 +5658,8 @@
 +  jio_snprintf(buf, len, "SIG%s", signame);
 +  return true;
  }
---- ./hotspot/src/os/bsd/vm/jvm_bsd.h	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -112,20 +112,6 @@
  #define SHUTDOWN2_SIGNAL SIGINT
  #define SHUTDOWN3_SIGNAL SIGTERM
@@ -5670,8 +5681,8 @@
  #endif /* JVM_MD_H */
  
  #endif // OS_BSD_VM_JVM_BSD_H
---- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -30,7 +30,7 @@
  
  void OSThread::pd_initialize() {
@@ -5681,8 +5692,8 @@
    _thread_id        = 0;
  #else
    _thread_id        = NULL;
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -97,16 +97,31 @@
  # include <sys/shm.h>
  #ifndef __APPLE__
@@ -5904,7 +5915,7 @@
  #else
    return (intx)::pthread_self();
  #endif
-@@ -1696,14 +1764,14 @@
+@@ -1691,14 +1759,14 @@
  }
  
  void os::print_os_info_brief(outputStream* st) {
@@ -5921,7 +5932,7 @@
  
    os::Posix::print_uname_info(st);
  
-@@ -1716,6 +1784,29 @@
+@@ -1711,6 +1779,29 @@
    // Nothing to do for now.
  }
  
@@ -5951,7 +5962,7 @@
  void os::print_memory_info(outputStream* st) {
  
    st->print("Memory:");
-@@ -1725,11 +1816,14 @@
+@@ -1720,11 +1811,14 @@
              os::physical_memory() >> 10);
    st->print("(" UINT64_FORMAT "k free)",
              os::available_memory() >> 10);
@@ -5971,7 +5982,7 @@
    st->cr();
  }
  
-@@ -1768,6 +1862,9 @@
+@@ -1763,6 +1857,9 @@
    print_signal_handler(st, SHUTDOWN2_SIGNAL , buf, buflen);
    print_signal_handler(st, SHUTDOWN3_SIGNAL , buf, buflen);
    print_signal_handler(st, BREAK_SIGNAL, buf, buflen);
@@ -5981,7 +5992,7 @@
  }
  
  static char saved_jvm_path[MAXPATHLEN] = {0};
-@@ -1965,7 +2062,7 @@
+@@ -1960,7 +2057,7 @@
      os_semaphore_t _semaphore;
  };
  
@@ -5990,7 +6001,7 @@
    SEM_INIT(_semaphore, 0);
  }
  
-@@ -2153,7 +2250,7 @@
+@@ -2148,7 +2245,7 @@
        if (::write(fd, "", 1) == 1) {
          mmap(base, size,
               PROT_READ|PROT_WRITE|PROT_EXEC,
@@ -5999,7 +6010,7 @@
        }
      }
      ::close(fd);
-@@ -2263,7 +2360,7 @@
+@@ -2258,7 +2355,7 @@
    return ::mprotect(addr, size, PROT_NONE) == 0;
  #else
    uintptr_t res = (uintptr_t) ::mmap(addr, size, PROT_NONE,
@@ -6008,7 +6019,7 @@
    return res  != (uintptr_t) MAP_FAILED;
  #endif
  }
-@@ -2290,7 +2387,7 @@
+@@ -2285,7 +2382,7 @@
    char * addr;
    int flags;
  
@@ -6017,7 +6028,7 @@
    if (fixed) {
      assert((uintptr_t)requested_addr % os::Bsd::page_size() == 0, "unaligned address");
      flags |= MAP_FIXED;
-@@ -2779,6 +2876,7 @@
+@@ -2774,6 +2871,7 @@
    return OS_OK;
  #elif defined(__FreeBSD__)
    int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
@@ -6025,7 +6036,7 @@
  #elif defined(__APPLE__) || defined(__NetBSD__)
    struct sched_param sp;
    int policy;
-@@ -3325,6 +3423,9 @@
+@@ -3320,6 +3418,9 @@
      set_signal_handler(SIGBUS, true);
      set_signal_handler(SIGILL, true);
      set_signal_handler(SIGFPE, true);
@@ -6035,7 +6046,7 @@
      set_signal_handler(SIGXFSZ, true);
  
  #if defined(__APPLE__)
-@@ -3373,18 +3474,6 @@
+@@ -3368,18 +3469,6 @@
    }
  }
  
@@ -6054,7 +6065,7 @@
  static const char* get_signal_handler_name(address handler,
                                             char* buf, int buflen) {
    int offset;
-@@ -3408,9 +3497,6 @@
+@@ -3403,9 +3492,6 @@
  
    sigaction(sig, NULL, &sa);
  
@@ -6064,7 +6075,7 @@
    st->print("%s: ", os::exception_name(sig, buf, buflen));
  
    address handler = (sa.sa_flags & SA_SIGINFO)
-@@ -3432,7 +3518,7 @@
+@@ -3427,7 +3513,7 @@
    // May be, handler was resetted by VMError?
    if(rh != NULL) {
      handler = rh;
@@ -6073,7 +6084,7 @@
    }
  
    st->print(", sa_flags=");
-@@ -3474,6 +3560,9 @@
+@@ -3469,6 +3555,9 @@
    DO_SIGNAL_CHECK(SIGBUS);
    DO_SIGNAL_CHECK(SIGPIPE);
    DO_SIGNAL_CHECK(SIGXFSZ);
@@ -6083,7 +6094,7 @@
  
  
    // ReduceSignalUsage allows the user to override these handlers
-@@ -3508,8 +3597,6 @@
+@@ -3503,8 +3592,6 @@
    os_sigaction(sig, (struct sigaction*)NULL, &act);
  
  
@@ -6092,7 +6103,7 @@
    address thisHandler = (act.sa_flags & SA_SIGINFO)
      ? CAST_FROM_FN_PTR(address, act.sa_sigaction)
      : CAST_FROM_FN_PTR(address, act.sa_handler) ;
-@@ -3574,6 +3661,14 @@
+@@ -3569,6 +3656,14 @@
  
  extern bool signal_name(int signo, char* buf, size_t len);
  
@@ -6107,7 +6118,7 @@
  const char* os::exception_name(int exception_code, char* buf, size_t size) {
    if (0 < exception_code && exception_code <= SIGRTMAX) {
      // signal
-@@ -3622,6 +3717,25 @@
+@@ -3617,6 +3712,25 @@
    Bsd::clock_init();
    initial_time_count = javaTimeNanos();
  
@@ -6133,7 +6144,7 @@
  #ifdef __APPLE__
    // XXXDARWIN
    // Work around the unaligned VM callbacks in hotspot's
-@@ -3770,6 +3884,19 @@
+@@ -3765,6 +3879,19 @@
  };
  
  int os::active_processor_count() {
@@ -6153,7 +6164,7 @@
    return _processor_count;
  }
  
-@@ -3981,7 +4108,10 @@
+@@ -3976,7 +4103,10 @@
    }
    int fd;
    int o_delete = (oflag & O_DELETE);
@@ -6165,7 +6176,7 @@
  
    fd = ::open(path, oflag, mode);
    if (fd == -1) return -1;
-@@ -4026,7 +4156,7 @@
+@@ -4021,7 +4151,7 @@
       * 4843136: (process) pipe file descriptor from Runtime.exec not being closed
       * 6339493: (process) Runtime.exec does not close all file descriptors on Solaris 9
       */
@@ -6174,7 +6185,7 @@
      {
          int flags = ::fcntl(fd, F_GETFD);
          if (flags != -1)
-@@ -4166,8 +4296,9 @@
+@@ -4161,8 +4291,9 @@
  #ifdef __APPLE__
    return os::thread_cpu_time(Thread::current(), true /* user + sys */);
  #else
@@ -6186,7 +6197,7 @@
  #endif
  }
  
-@@ -4175,8 +4306,9 @@
+@@ -4170,8 +4301,9 @@
  #ifdef __APPLE__
    return os::thread_cpu_time(thread, true /* user + sys */);
  #else
@@ -6198,7 +6209,7 @@
  #endif
  }
  
-@@ -4184,8 +4316,9 @@
+@@ -4179,8 +4311,9 @@
  #ifdef __APPLE__
    return os::thread_cpu_time(Thread::current(), user_sys_cpu_time);
  #else
@@ -6210,7 +6221,7 @@
  #endif
  }
  
-@@ -4210,8 +4343,41 @@
+@@ -4205,8 +4338,41 @@
      return ((jlong)tinfo.user_time.seconds * 1000000000) + ((jlong)tinfo.user_time.microseconds * (jlong)1000);
    }
  #else
@@ -6254,7 +6265,7 @@
  #endif
  }
  
-@@ -4234,7 +4400,7 @@
+@@ -4229,7 +4395,7 @@
  #ifdef __APPLE__
    return true;
  #else
@@ -6263,7 +6274,7 @@
  #endif
  }
  
-@@ -4332,21 +4498,36 @@
+@@ -4327,21 +4493,36 @@
  
  static struct timespec* compute_abstime(struct timespec* abstime, jlong millis) {
    if (millis < 0)  millis = 0;
@@ -6309,7 +6320,7 @@
    return abstime;
  }
  
-@@ -4438,7 +4619,7 @@
+@@ -4433,7 +4614,7 @@
      status = os::Bsd::safe_cond_timedwait(_cond, _mutex, &abst);
      if (status != 0 && WorkAroundNPTLTimedWaitHang) {
        pthread_cond_destroy (_cond);
@@ -6318,7 +6329,7 @@
      }
      assert_status(status == 0 || status == EINTR ||
                    status == ETIMEDOUT,
-@@ -4539,32 +4720,50 @@
+@@ -4534,32 +4715,50 @@
  
  static void unpackTime(struct timespec* absTime, bool isAbsolute, jlong time) {
    assert (time > 0, "convertTime");
@@ -6389,7 +6400,7 @@
        if (absTime->tv_nsec >= NANOSECS_PER_SEC) {
          absTime->tv_nsec -= NANOSECS_PER_SEC;
          ++absTime->tv_sec; // note: this must be <= max_secs
-@@ -4644,15 +4843,19 @@
+@@ -4639,15 +4838,19 @@
    jt->set_suspend_equivalent();
    // cleared by handle_special_suspend_equivalent_condition() or java_suspend_self()
  
@@ -6413,7 +6424,7 @@
    assert_status(status == 0 || status == EINTR ||
                  status == ETIMEDOUT,
                  status, "cond_timedwait");
-@@ -4681,17 +4884,26 @@
+@@ -4676,17 +4879,26 @@
    s = _counter;
    _counter = 1;
    if (s < 1) {
@@ -6449,7 +6460,7 @@
    } else {
      pthread_mutex_unlock(_mutex);
      assert (status == 0, "invariant") ;
-@@ -4822,13 +5034,29 @@
+@@ -4817,13 +5029,29 @@
  
  // Get the default path to the core file
  // Returns the length of the string
@@ -6486,8 +6497,8 @@
  }
  
  #ifndef PRODUCT
---- ./hotspot/src/os/bsd/vm/os_bsd.hpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -58,12 +58,16 @@
    // For signal flags diagnostics
    static int sigflags[MAXSIGNUM];
@@ -6576,8 +6587,8 @@
      }
  };
  
---- ./hotspot/src/os/bsd/vm/vmError_bsd.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/os/bsd/vm/vmError_bsd.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -33,30 +33,50 @@
  #include <sys/syscall.h>
  #include <unistd.h>
@@ -6639,8 +6650,8 @@
        os::fork_and_exec(buf);
        yes = false;
      }
---- ./hotspot/src/os/linux/vm/os_linux.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/os/linux/vm/os_linux.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -6285,6 +6285,10 @@
      return 0;
    }
@@ -6652,8 +6663,8 @@
    return strlen(buffer);
  }
  
---- ./hotspot/src/os/posix/vm/os_posix.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/os/posix/vm/os_posix.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -53,12 +53,11 @@
    n = get_core_path(buffer, bufferSize);
  
@@ -6716,8 +6727,8 @@
      // Linux specific
  #ifdef SI_TKILL
      { SI_TKILL,     "SI_TKILL",    "Signal sent by tkill (pthread_kill)" },
---- ./hotspot/src/os/solaris/vm/os_solaris.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/os/solaris/vm/os_solaris.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -6375,6 +6375,10 @@
      return 0;
    }
@@ -6730,7 +6741,7 @@
  }
  
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/atomic_bsd_ppc.inline.hpp	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/atomic_bsd_ppc.inline.hpp	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,400 @@
 +/*
 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -7133,7 +7144,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	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/bytes_bsd_ppc.inline.hpp	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,39 @@
 +/*
 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -7175,7 +7186,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	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/globals_bsd_ppc.hpp	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,54 @@
 +/*
 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -7232,7 +7243,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	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/orderAccess_bsd_ppc.inline.hpp	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,149 @@
 +/*
 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -7384,7 +7395,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	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.cpp	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,666 @@
 +/*
 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8053,7 +8064,7 @@
 +}
 +#endif
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.hpp	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.hpp	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,35 @@
 +/*
 + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8091,7 +8102,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	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/prefetch_bsd_ppc.inline.hpp	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,50 @@
 +/*
 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8144,7 +8155,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	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.cpp	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,39 @@
 +/*
 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8186,7 +8197,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	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.hpp	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,36 @@
 +/*
 + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8225,7 +8236,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	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,36 @@
 +/*
 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8264,7 +8275,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	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.hpp	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,83 @@
 +/*
 + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8350,7 +8361,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	Thu Jan 25 22:36:25 2018 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/vmStructs_bsd_ppc.hpp	Sat May 19 23:14:15 2018 -0700
 @@ -0,0 +1,55 @@
 +/*
 + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8407,8 +8418,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	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -594,7 +594,11 @@
            stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
        }
@@ -8421,8 +8432,8 @@
                 thread->doing_unsafe_access()) {
          stub = StubRoutines::handler_for_unsafe_access();
      }
---- ./hotspot/src/share/vm/opto/lcm.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/share/vm/opto/lcm.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -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.
@@ -8432,8 +8443,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	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/share/vm/opto/loopPredicate.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -869,7 +869,7 @@
        Node*          idx    = cmp->in(1);
        assert(!invar.is_invariant(idx), "index is variant");
@@ -8443,8 +8454,8 @@
        assert(invar.is_invariant(rng), "range must be invariant");
        int scale    = 1;
        Node* offset = zero;
---- ./hotspot/src/share/vm/opto/node.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/share/vm/opto/node.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -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
@@ -8467,8 +8478,8 @@
  
  //------------------------------clone------------------------------------------
  // Clone a Node.
---- ./hotspot/src/share/vm/runtime/atomic.inline.hpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/share/vm/runtime/atomic.inline.hpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -63,6 +63,9 @@
  #endif
  
@@ -8479,8 +8490,8 @@
  #ifdef TARGET_OS_ARCH_bsd_x86
  # include "atomic_bsd_x86.inline.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/globals.hpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/share/vm/runtime/globals.hpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -94,6 +94,9 @@
  #ifdef TARGET_OS_ARCH_aix_ppc
  # include "globals_aix_ppc.hpp"
@@ -8491,8 +8502,8 @@
  #ifdef TARGET_OS_ARCH_bsd_x86
  # include "globals_bsd_x86.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -64,6 +64,9 @@
  #endif
  
@@ -8503,8 +8514,8 @@
  #ifdef TARGET_OS_ARCH_bsd_x86
  # include "orderAccess_bsd_x86.inline.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/os.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/share/vm/runtime/os.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -426,15 +426,6 @@
      if (_native_java_library == NULL) {
        vm_exit_during_initialization("Unable to load native library", ebuf);
@@ -8521,8 +8532,8 @@
    }
    static jboolean onLoaded = JNI_FALSE;
    if (onLoaded) {
---- ./hotspot/src/share/vm/runtime/os.hpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/share/vm/runtime/os.hpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -843,6 +843,9 @@
  #ifdef TARGET_OS_ARCH_aix_ppc
  # include "os_aix_ppc.hpp"
@@ -8533,8 +8544,8 @@
  #ifdef TARGET_OS_ARCH_bsd_x86
  # include "os_bsd_x86.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/prefetch.inline.hpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/share/vm/runtime/prefetch.inline.hpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -63,6 +63,9 @@
  #endif
  
@@ -8545,8 +8556,8 @@
  #ifdef TARGET_OS_ARCH_bsd_x86
  # include "prefetch_bsd_x86.inline.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/thread.hpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/share/vm/runtime/thread.hpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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 @@
  #ifdef TARGET_OS_ARCH_aix_ppc
  # include "thread_aix_ppc.hpp"
@@ -8557,8 +8568,8 @@
  #ifdef TARGET_OS_ARCH_bsd_x86
  # include "thread_bsd_x86.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -75,6 +75,9 @@
  #ifdef TARGET_OS_ARCH_aix_ppc
  # include "threadLS_aix_ppc.hpp"
@@ -8569,8 +8580,8 @@
  #ifdef TARGET_OS_ARCH_bsd_x86
  # include "threadLS_bsd_x86.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/virtualspace.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/share/vm/runtime/virtualspace.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -342,7 +342,7 @@
                  (UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
                   Universe::narrow_oop_use_implicit_null_checks()) ?
@@ -8580,8 +8591,8 @@
      MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
    }
  
---- ./hotspot/src/share/vm/runtime/vmStructs.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/share/vm/runtime/vmStructs.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -146,6 +146,9 @@
  #ifdef TARGET_OS_ARCH_aix_ppc
  # include "vmStructs_aix_ppc.hpp"
@@ -8601,8 +8612,8 @@
                                                                            \
    NOT_ZERO(X86_ONLY(declare_constant(frame::entry_frame_call_wrapper_offset)))      \
    declare_constant(frame::pc_return_offset)                               \
---- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -30,6 +30,11 @@
  // This file holds compiler-dependent includes,
  // globally used constants & types, class (forward)
@@ -8634,8 +8645,8 @@
  #define CAN_USE_NAN_DEFINE 1
  #endif
  
---- ./hotspot/src/share/vm/utilities/vmError.cpp	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/src/share/vm/utilities/vmError.cpp	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -22,7 +22,6 @@
   *
   */
@@ -8644,8 +8655,8 @@
  #include "precompiled.hpp"
  #include "compiler/compileBroker.hpp"
  #include "gc_interface/collectedHeap.hpp"
---- ./jdk/make/CompileDemos.gmk	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/CompileDemos.gmk	Fri Feb 02 18:25:39 2018 -0800
+--- ./jdk/make/CompileDemos.gmk	Mon Mar 19 12:06:18 2018 -0700
++++ ./jdk/make/CompileDemos.gmk	Sat May 19 23:14:35 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 \
@@ -8655,8 +8666,8 @@
  
  $(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo))
  $(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo))
---- ./jdk/make/CompileJavaClasses.gmk	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/CompileJavaClasses.gmk	Fri Feb 02 18:25:39 2018 -0800
+--- ./jdk/make/CompileJavaClasses.gmk	Mon Mar 19 12:06:18 2018 -0700
++++ ./jdk/make/CompileJavaClasses.gmk	Sat May 19 23:14:35 2018 -0700
 @@ -128,23 +128,32 @@
        sun/nio/fs/LinuxFileStore.java \
        sun/nio/fs/LinuxFileSystem.java \
@@ -8758,8 +8769,8 @@
          $(CLOSED_SRC_DIRS), \
      INCLUDES := $(SECURITY_PKGS), \
      EXCLUDES := $(EXCLUDES), \
---- ./jdk/make/CompileLaunchers.gmk	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/CompileLaunchers.gmk	Fri Feb 02 18:25:39 2018 -0800
+--- ./jdk/make/CompileLaunchers.gmk	Mon Mar 19 12:06:18 2018 -0700
++++ ./jdk/make/CompileLaunchers.gmk	Sat May 19 23:14:35 2018 -0700
 @@ -49,7 +49,7 @@
    ORIGIN_ROOT := /..
  endif
@@ -8864,8 +8875,8 @@
    BUILD_JSPAWNHELPER := 1
  endif
  
---- ./jdk/make/CopyFiles.gmk	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/CopyFiles.gmk	Fri Feb 02 18:25:39 2018 -0800
+--- ./jdk/make/CopyFiles.gmk	Mon Mar 19 12:06:18 2018 -0700
++++ ./jdk/make/CopyFiles.gmk	Sat May 19 23:14:35 2018 -0700
 @@ -29,6 +29,8 @@
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
@@ -8908,8 +8919,8 @@
              endif
            endif
          endif
---- ./jdk/make/Images.gmk	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/Images.gmk	Fri Feb 02 18:25:39 2018 -0800
+--- ./jdk/make/Images.gmk	Mon Mar 19 12:06:18 2018 -0700
++++ ./jdk/make/Images.gmk	Sat May 19 23:14:35 2018 -0700
 @@ -236,11 +236,11 @@
  endif
  
@@ -8980,7 +8991,7 @@
  
  ################################################################################
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/data/classlist/classlist.bsd	Fri Feb 02 18:25:39 2018 -0800
++++ ./jdk/make/data/classlist/classlist.bsd	Sat May 19 23:14:35 2018 -0700
 @@ -0,0 +1,2559 @@
 +java/lang/Object
 +java/lang/String
@@ -11541,8 +11552,8 @@
 +java/awt/MenuBar
 +sun/awt/X11/XErrorEvent
 +# eea35d9d56e0006e
---- ./jdk/make/gendata/GendataFontConfig.gmk	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/gendata/GendataFontConfig.gmk	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -73,6 +73,13 @@
    GENDATA_FONT_CONFIG_SRC_PREFIX := aix.
  endif
@@ -11557,8 +11568,8 @@
  ###
  
  $(GENDATA_FONT_CONFIG_DST)/%.src: \
---- ./jdk/make/lib/Awt2dLibraries.gmk	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/lib/Awt2dLibraries.gmk	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -309,7 +309,7 @@
      debug_trace.c \
      debug_util.c
@@ -11683,8 +11694,8 @@
    else	# .. all other Unixes can use X_LIBS
      LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
    endif
---- ./jdk/make/lib/CoreLibraries.gmk	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/lib/CoreLibraries.gmk	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -100,7 +100,7 @@
  endif
  
@@ -11771,8 +11782,8 @@
      LDFLAGS_macosx := -liconv, \
      LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
      LDFLAGS_SUFFIX_solaris := -lc, \
---- ./jdk/make/lib/NetworkingLibraries.gmk	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/lib/NetworkingLibraries.gmk	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -42,7 +42,7 @@
    LIBNET_EXCLUDE_FILES += linux_close.c
  endif
@@ -11801,8 +11812,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/lib/NioLibraries.gmk	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -77,9 +77,28 @@
        UnixNativeDispatcher.c
  endif
@@ -11863,8 +11874,8 @@
    endif
 +  endif
  endif
---- ./jdk/make/lib/ServiceabilityLibraries.gmk	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/lib/ServiceabilityLibraries.gmk	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -34,7 +34,7 @@
  ifneq ($(OPENJDK_TARGET_OS), linux)
    LIBATTACH_EXCLUDE_FILES += LinuxVirtualMachine.c
@@ -11882,16 +11893,18 @@
      LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) -export:jdwpTransport_OnLoad ws2_32.lib, \
      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
      RC_FLAGS := $(RC_FLAGS) \
-@@ -245,6 +246,19 @@
+@@ -245,6 +246,21 @@
    LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp
  endif
  
 +ifeq ($(OPENJDK_TARGET_OS), bsd)
++  LIBINSTRUMENT_LDFLAGS_SUFFIX += -L$(PACKAGE_PATH)/lib -liconv $(LIBZ)
 +  ifeq ($(BSD_STATIC_LIBJLI), bsd)
 +    LIBINSTRUMENT_LDFLAGS += -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
-+        -Xlinker --no-whole-archive 
++        -Xlinker --no-whole-archive
 +  else
 +    LIBINSTRUMENT_LDFLAGS += $(call SET_SHARED_LIBRARY_ORIGIN,/jli)
++    LIBINSTRUMENT_LDFLAGS_SUFFIX += -L$(INSTALL_LIBRARIES_HERE)/jli -ljli
 +  endif
 +  BSD_ICONV_CFLAGS:= -I$(PACKAGE_PATH)/include
 +  ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
@@ -11902,7 +11915,7 @@
  $(eval $(call SetupNativeCompilation,BUILD_LIBINSTRUMENT, \
      LIBRARY := instrument, \
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-@@ -255,6 +269,7 @@
+@@ -255,6 +271,7 @@
      CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
      CFLAGS_debug := -DJPLIS_LOGGING, \
      CFLAGS_release := -DNO_JPLIS_LOGGING, \
@@ -11910,15 +11923,7 @@
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN) \
-@@ -268,6 +283,7 @@
-     LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \
-     LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \
-     LDFLAGS_SUFFIX_aix := $(LIBZ) -L$(JDK_OUTPUTDIR)/objs -ljli_static $(LIBDL),\
-+    LDFLAGS_SUFFIX_bsd := -L$(PACKAGE_PATH)/lib -liconv $(LIBZ), \
-     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
-     RC_FLAGS := $(RC_FLAGS) \
-         -D "JDK_FNAME=instrument.dll" \
-@@ -276,7 +292,7 @@
+@@ -276,7 +293,7 @@
      OBJECT_DIR := $(LIBINSTRUMENT_DIR), \
      DEBUG_SYMBOLS := true))
  
@@ -11927,7 +11932,7 @@
    $(BUILD_LIBINSTRUMENT): $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX)
  else
    $(BUILD_LIBINSTRUMENT): $(INSTALL_LIBRARIES_HERE)/jli/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX)
-@@ -302,12 +318,16 @@
+@@ -306,12 +323,16 @@
    BUILD_LIBMANAGEMENT_EXCLUDES += LinuxOperatingSystem.c
  endif
  
@@ -11945,7 +11950,7 @@
    ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
      LIBMANAGEMENT_OPTIMIZATION := LOW
    endif
-@@ -359,7 +379,7 @@
+@@ -363,7 +384,7 @@
  BUILD_LIBHPROF_LDFLAGS :=
  
  LIBHPROF_OPTIMIZATION := HIGHEST
@@ -11954,8 +11959,8 @@
    ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
      LIBHPROF_OPTIMIZATION := LOW
    endif
---- ./jdk/make/lib/SoundLibraries.gmk	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/lib/SoundLibraries.gmk	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -75,6 +75,13 @@
    LIBJSOUND_CFLAGS += -DX_PLATFORM=X_AIX
  endif # OPENJDK_TARGET_OS aix
@@ -11987,8 +11992,8 @@
        LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \
        OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundalsa, \
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
---- ./jdk/make/mapfiles/launchers/mapfile-ppc64	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/mapfiles/launchers/mapfile-ppc64	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -33,6 +33,7 @@
  		environ;	# Public symbols and required by Java run time
  		_environ;
@@ -11997,8 +12002,8 @@
  
  	local:
  		*;
---- ./jdk/make/mapfiles/launchers/mapfile-x86	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/mapfiles/launchers/mapfile-x86	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -33,6 +33,7 @@
  		environ;	# Public symbols and required by Java run time
  		_environ;
@@ -12007,8 +12012,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/mapfiles/launchers/mapfile-x86_64	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -33,6 +33,7 @@
  		environ;	# Public symbols and required by Java run time
  		_environ;
@@ -12018,7 +12023,7 @@
  	local:
  		*;
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/mapfiles/libattach/mapfile-bsd	Fri Feb 02 18:25:39 2018 -0800
++++ ./jdk/make/mapfiles/libattach/mapfile-bsd	Sat May 19 23:14:35 2018 -0700
 @@ -0,0 +1,42 @@
 +#
 +# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
@@ -12063,7 +12068,7 @@
 +		*;
 +};
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/mapfiles/libnio/mapfile-bsd	Fri Feb 02 18:25:39 2018 -0800
++++ ./jdk/make/mapfiles/libnio/mapfile-bsd	Sat May 19 23:14:35 2018 -0700
 @@ -0,0 +1,195 @@
 +#
 +# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -12260,8 +12265,8 @@
 +	local:
 +		*;
 +};
---- ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -26,6 +26,9 @@
  # Define library interface.
  
@@ -12273,7 +12278,7 @@
  	    *;
  };
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/netbeans/common/bsd-sources.ent	Fri Feb 02 18:25:39 2018 -0800
++++ ./jdk/make/netbeans/common/bsd-sources.ent	Sat May 19 23:14:35 2018 -0700
 @@ -0,0 +1,45 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +
@@ -12321,7 +12326,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	Fri Feb 02 18:25:39 2018 -0800
++++ ./jdk/make/netbeans/common/bsd-view.ent	Sat May 19 23:14:35 2018 -0700
 @@ -0,0 +1,39 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +
@@ -12362,8 +12367,8 @@
 +    <includes>${includes}</includes>
 +    <excludes>${excludes}</excludes>
 +</source-folder>
---- ./jdk/make/netbeans/common/java-data-native.ent	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/netbeans/common/java-data-native.ent	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -34,6 +34,7 @@
  <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4">
      <compilation-unit>
@@ -12372,8 +12377,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/netbeans/common/make.xml	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -32,16 +32,21 @@
  -->
  
@@ -12408,8 +12413,8 @@
      <macrodef name="make-run">
              <attribute name="target"/>
              <attribute name="dir"/>
---- ./jdk/make/netbeans/j2se/nbproject/project.xml	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/netbeans/j2se/nbproject/project.xml	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -34,6 +34,7 @@
  <!DOCTYPE project [
      <!ENTITY properties SYSTEM "../../common/properties.ent">
@@ -12442,8 +12447,8 @@
                      &macosx-view;
                      &unix-view;
                      &windows-view;
---- ./jdk/make/netbeans/world/nbproject/project.xml	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/make/netbeans/world/nbproject/project.xml	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -34,12 +34,14 @@
  <!DOCTYPE project [
      <!ENTITY properties SYSTEM "../../common/properties.ent">
@@ -12476,7 +12481,7 @@
                      &unix-view;
                      &windows-view;
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/classes/java/net/DefaultInterface.java	Fri Feb 02 18:25:39 2018 -0800
++++ ./jdk/src/bsd/classes/java/net/DefaultInterface.java	Sat May 19 23:14:35 2018 -0700
 @@ -0,0 +1,97 @@
 +/*
 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -12576,7 +12581,7 @@
 +    }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/classes/sun/nio/ch/DefaultSelectorProvider.java	Fri Feb 02 18:25:39 2018 -0800
++++ ./jdk/src/bsd/classes/sun/nio/ch/DefaultSelectorProvider.java	Sat May 19 23:14:35 2018 -0700
 @@ -0,0 +1,48 @@
 +/*
 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -12627,7 +12632,7 @@
 +
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueArrayWrapper.java	Fri Feb 02 18:25:39 2018 -0800
++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueArrayWrapper.java	Sat May 19 23:14:35 2018 -0700
 @@ -0,0 +1,213 @@
 +/*
 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -12843,7 +12848,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	Fri Feb 02 18:25:39 2018 -0800
++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorImpl.java	Sat May 19 23:14:35 2018 -0700
 @@ -0,0 +1,263 @@
 +/*
 + * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
@@ -13109,7 +13114,7 @@
 +    }
 +}
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorProvider.java	Fri Feb 02 18:25:39 2018 -0800
++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorProvider.java	Sat May 19 23:14:35 2018 -0700
 @@ -0,0 +1,44 @@
 +/*
 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -13155,8 +13160,8 @@
 +        return new KQueueSelectorImpl(this);
 +    }
 +}
---- ./jdk/src/bsd/doc/man/javah.1	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/bsd/doc/man/javah.1	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -8,7 +8,7 @@
  .\"
  .\" This code is distributed in the hope that it will be useful, but WITHOUT
@@ -13175,8 +13180,8 @@
  
  \fIWindows\fR:
  
---- ./jdk/src/bsd/doc/man/rmic.1	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/bsd/doc/man/rmic.1	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -8,7 +8,7 @@
  .\"
  .\" This code is distributed in the hope that it will be useful, but WITHOUT
@@ -13204,8 +13209,8 @@
  .SH SEE\ ALSO    
  .TP 0.2i    
  \(bu
---- ./jdk/src/bsd/doc/man/rmid.1	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/bsd/doc/man/rmid.1	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -8,7 +8,7 @@
  .\"
  .\" This code is distributed in the hope that it will be useful, but WITHOUT
@@ -13225,7 +13230,7 @@
  .TP 0.2i    
  \(bu
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/native/sun/nio/ch/KQueueArrayWrapper.c	Fri Feb 02 18:25:39 2018 -0800
++++ ./jdk/src/bsd/native/sun/nio/ch/KQueueArrayWrapper.c	Sat May 19 23:14:35 2018 -0700
 @@ -0,0 +1,171 @@
 +/*
 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -13398,7 +13403,7 @@
 +    }
 +}
 +
---- ./jdk/src/macosx/classes/java/net/DefaultInterface.java	Fri Dec 15 09:05:18 2017 -0800
+--- ./jdk/src/macosx/classes/java/net/DefaultInterface.java	Mon Mar 19 12:06:18 2018 -0700
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,97 +0,0 @@
 -/*
@@ -13498,7 +13503,7 @@
 -        return (ppp != null) ? ppp : loopback;
 -    }
 -}
---- ./jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java	Fri Dec 15 09:05:18 2017 -0800
+--- ./jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java	Mon Mar 19 12:06:18 2018 -0700
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,48 +0,0 @@
 -/*
@@ -13549,7 +13554,7 @@
 -    }
 -
 -}
---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java	Fri Dec 15 09:05:18 2017 -0800
+--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java	Mon Mar 19 12:06:18 2018 -0700
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,213 +0,0 @@
 -/*
@@ -13765,7 +13770,7 @@
 -                               long timeout);
 -    private static native void interrupt(int fd);
 -}
---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java	Fri Dec 15 09:05:18 2017 -0800
+--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java	Mon Mar 19 12:06:18 2018 -0700
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,263 +0,0 @@
 -/*
@@ -14031,7 +14036,7 @@
 -        return this;
 -    }
 -}
---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java	Fri Dec 15 09:05:18 2017 -0800
+--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java	Mon Mar 19 12:06:18 2018 -0700
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,44 +0,0 @@
 -/*
@@ -14078,7 +14083,7 @@
 -        return new KQueueSelectorImpl(this);
 -    }
 -}
---- ./jdk/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c	Fri Dec 15 09:05:18 2017 -0800
+--- ./jdk/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c	Mon Mar 19 12:06:18 2018 -0700
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,171 +0,0 @@
 -/*
@@ -14252,8 +14257,8 @@
 -    }
 -}
 -
---- ./jdk/src/share/bin/jli_util.h	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/bin/jli_util.h	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -87,7 +87,7 @@
  #define _LARGFILE64_SOURCE
  #define JLI_Lseek                       lseek64
@@ -14263,8 +14268,8 @@
  #define JLI_Lseek                       lseek
  #endif
  #ifdef _AIX
---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -1146,7 +1146,7 @@
       */
      HashMap<String, Boolean> existsMap;
@@ -14274,8 +14279,8 @@
              return false;
          } else if (existsMap == null) {
             existsMap = new HashMap<String, Boolean>();
---- ./jdk/src/share/classes/sun/awt/OSInfo.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/classes/sun/awt/OSInfo.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -39,6 +39,7 @@
          WINDOWS,
          LINUX,
@@ -14295,8 +14300,8 @@
              if (osName.contains("OS X")) {
                  return MACOSX;
              }
---- ./jdk/src/share/classes/sun/font/FontUtilities.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/classes/sun/font/FontUtilities.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -48,6 +48,8 @@
  
      public static boolean isLinux;
@@ -14315,8 +14320,8 @@
                  isMacOSX = osName.contains("OS X"); // TODO: MacOSX
  
                  String t2kStr = System.getProperty("sun.java2d.font.scaler");
---- ./jdk/src/share/classes/sun/font/SunFontManager.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/classes/sun/font/SunFontManager.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -418,7 +418,7 @@
                           * registerFonts method as on-screen these JRE fonts
                           * always go through the T2K rasteriser.
@@ -14326,8 +14331,8 @@
                              /* Linux font configuration uses these fonts */
                              registerFontDir(jreFontDirName);
                          }
---- ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -1306,7 +1306,7 @@
          String osName = AccessController.doPrivileged(
              new GetPropertyAction("os.name"));
@@ -14337,8 +14342,8 @@
              charset("x-COMPOUND_TEXT", "COMPOUND_TEXT",
                      new String[] {
                          "COMPOUND_TEXT",        // JDK historical
---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -1587,9 +1587,31 @@
          }
  
@@ -14373,8 +14378,8 @@
              if ((pFlags & PRINTER) != 0) {
                  execCmd[n++] = "-P" + printer;
              }
---- ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -48,6 +48,7 @@
                      public Boolean run() {
                              String osname = System.getProperty("os.name");
@@ -14383,8 +14388,8 @@
                                  osname.contains("OS X") ||
                                  osname.startsWith("Linux")) {
                                  return new Boolean(System.getProperty
---- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -90,6 +90,12 @@
                                      "libgssapi_krb5.so",
                                      "libgssapi_krb5.so.2",
@@ -14398,8 +14403,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -31,4 +31,5 @@
  #[windows]sun.tools.attach.WindowsAttachProvider
  #[linux]sun.tools.attach.LinuxAttachProvider
@@ -14407,8 +14412,8 @@
 +#[bsd]sun.tools.attach.BsdAttachProvider
  #[aix]sun.tools.attach.AixAttachProvider
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/lib/security/java.security-bsd	Fri Feb 02 18:25:39 2018 -0800
-@@ -0,0 +1,962 @@
++++ ./jdk/src/share/lib/security/java.security-bsd	Sat May 19 23:14:35 2018 -0700
+@@ -0,0 +1,983 @@
 +#
 +# This is the "master security properties file".
 +#
@@ -15031,7 +15036,7 @@
 +# Example:
 +#   jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048
 +jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 1024, \
-+    EC keySize < 224, DES40_CBC, RC4_40
++    EC keySize < 224, DES40_CBC, RC4_40, 3DES_EDE_CBC
 +
 +# Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS)
 +# processing in JSSE implementation.
@@ -15258,6 +15263,7 @@
 +    disallowReferenceUriSchemes file http https,\
 +    minKeySize RSA 1024,\
 +    minKeySize DSA 1024,\
++    minKeySize EC 224,\
 +    noDuplicateIds,\
 +    noRetrievalMethodLoops
 +
@@ -15271,6 +15277,9 @@
 +# Patterns are separated by ";" (semicolon).
 +# Whitespace is significant and is considered part of the pattern.
 +#
++# If the system property jdk.serialFilter is also specified, it supersedes
++# the security property value defined here.
++#
 +# If a pattern includes a "=", it sets a limit.
 +# If a limit appears more than once the last value is used.
 +# Limits are checked before classes regardless of the order in the sequence of patterns.
@@ -15371,8 +15380,25 @@
 +# It is not guaranteed to be examined and used by other implementations.
 +#
 +#com.sun.CORBA.ORBIorTypeCheckRegistryFilter=binary_class_name;binary_class_name
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Fri Feb 02 18:25:39 2018 -0800
++
++#
++# JCEKS Encrypted Key Serial Filter
++#
++# This filter, if configured, is used by the JCEKS KeyStore during the
++# deserialization of the encrypted Key object stored inside a key entry.
++# If not configured or the filter result is UNDECIDED (i.e. none of the patterns
++# matches), the filter configured by jdk.serialFilter will be consulted.
++#
++# If the system property jceks.key.serialFilter is also specified, it supersedes
++# the security property value defined here.
++#
++# The filter pattern uses the same format as jdk.serialFilter. The default
++# pattern allows java.lang.Enum, java.security.KeyRep, java.security.KeyRep$Type,
++# 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
 @@ -62,7 +62,7 @@
  
  #endif // End of ZLIB
@@ -15382,8 +15408,8 @@
  #define SWAP_BYTES(a) \
      ((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00)
  #else
---- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -121,7 +121,7 @@
  }
  
@@ -15411,8 +15437,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/com/sun/media/sound/Utilities.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -28,7 +28,7 @@
  
  
@@ -15422,8 +15448,8 @@
      return 0;
  #else
      return 1;
---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -40,7 +40,7 @@
  #endif
  #endif
@@ -15433,8 +15459,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -624,7 +624,7 @@
      switch(type) {
          case java_awt_image_BufferedImage_TYPE_INT_ARGB:
@@ -15462,8 +15488,8 @@
              colorOrder[0] = 2;
              colorOrder[1] = 1;
              colorOrder[2] = 0;
---- ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -1198,7 +1198,7 @@
  
  #define NLUT 8
@@ -15473,8 +15499,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -86,7 +86,7 @@
  #endif /* MLIB_USE_FTOI_CLAMPING */
  
@@ -15514,8 +15540,8 @@
  
  #endif /* _NO_LONGLONG */
  
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -15555,8 +15581,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -94,7 +94,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -15596,8 +15622,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -15637,8 +15663,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -95,7 +95,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -15678,8 +15704,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -15719,8 +15745,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -94,7 +94,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -15760,8 +15786,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -95,7 +95,7 @@
      dst = dp[0];
      if (ld_offset + size < 32) {
@@ -15981,8 +16007,8 @@
    }
  
  #else  /* _LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -168,7 +168,7 @@
  }
  
@@ -16263,8 +16289,8 @@
        dp[12] = t0;
        dp[13] = t1;
        dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -88,7 +88,7 @@
  } d64_2_f32;
  
@@ -16416,8 +16442,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -30,7 +30,7 @@
  typedef union {
    mlib_d64 db;
@@ -16427,8 +16453,8 @@
      mlib_s32 int1, int0;
  #else
      mlib_s32 int0, int1;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -275,11 +275,11 @@
        for (i = 0; j <= (b_size - 4); j += 4, i++) {
          src0 = src1;
@@ -16527,8 +16553,8 @@
          s0 = s1;
          dp += SIZE;
          sp += SIZE;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -120,7 +120,7 @@
    }                                                               \
  }
@@ -17761,8 +17787,8 @@
        dp[12] = t0;
        dp[13] = t1;
        dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -27,9 +27,6 @@
  #ifndef MLIB_IMAGE_H
  #define MLIB_IMAGE_H
@@ -17773,8 +17799,8 @@
  #include <mlib_types.h>
  #include <mlib_status.h>
  #include <mlib_sys.h>
---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -29,7 +29,7 @@
  #ifdef MACOSX
  #include <unistd.h>
@@ -17794,8 +17820,8 @@
  #else
    return (void *) memalign(8, size);
  #endif /* _MSC_VER */
---- ./jdk/src/share/native/sun/font/layout/LEStandalone.h	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/font/layout/LEStandalone.h	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -136,7 +136,7 @@
  #define U_CAPI extern "C"
  
@@ -17805,8 +17831,8 @@
          #define U_IS_BIG_ENDIAN 0
      #endif
  #endif
---- ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -182,7 +182,7 @@
          return 0L;
      }
@@ -17816,8 +17842,8 @@
      /* Reversing data packed into int for LE archs */
      if (isInIntPacked) {
          inFormatter ^= DOSWAP_SH(1);
---- ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -27,6 +27,7 @@
  #include <jni.h>
  #include "management.h"
@@ -17826,8 +17852,8 @@
  
  JNIEXPORT void JNICALL Java_sun_management_DiagnosticCommandImpl_setNotificationEnabled
  (JNIEnv *env, jobject dummy, jboolean enabled) {
---- ./jdk/src/solaris/back/util_md.h	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/back/util_md.h	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -51,7 +51,7 @@
  
  /* On little endian machines, convert java big endian numbers. */
@@ -17837,8 +17863,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/bin/ergo_i586.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -106,7 +106,7 @@
  
  #endif /* __solaris__ */
@@ -17857,8 +17883,8 @@
  
  /*
   * Routines shared by solaris-i586 and linux-i586.
---- ./jdk/src/solaris/bin/java_md_solinux.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/bin/java_md_solinux.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -35,6 +35,9 @@
  #include <sys/stat.h>
  #include <unistd.h>
@@ -17950,8 +17976,8 @@
  }
  
  int
---- ./jdk/src/solaris/bin/java_md_solinux.h	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/bin/java_md_solinux.h	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -26,17 +26,26 @@
  #ifndef JAVA_MD_SOLINUX_H
  #define JAVA_MD_SOLINUX_H
@@ -17992,8 +18018,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -82,6 +82,8 @@
  
          LINUX(LaunchMechanism.VFORK, LaunchMechanism.FORK),
@@ -18041,8 +18067,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -234,7 +234,7 @@
          if (fontID != null) {
              fileName = (String)fontNameMap.get(fontID);
@@ -18070,8 +18096,8 @@
               (!mFontConfig.foundOsSpecificFile() ||
                !mFontConfig.fontFilesArePresent()) ||
               (FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -26,134 +26,134 @@
  
  # Version
@@ -18334,8 +18360,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/classes/sun/net/PortConfig.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -52,7 +52,7 @@
                      } else if (os.startsWith("SunOS")) {
                          defaultLower = 32768;
@@ -18345,8 +18371,8 @@
                          defaultLower = 49152;
                          defaultUpper = 65535;
                      } else if (os.startsWith("AIX")) {
---- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -66,7 +66,7 @@
              return createProvider("sun.nio.ch.SolarisAsynchronousChannelProvider");
          if (osname.equals("Linux"))
@@ -18356,8 +18382,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -25,10 +25,14 @@
  
  package sun.nio.fs;
@@ -18391,8 +18417,8 @@
 +                     new MagicFileTypeDetector());
 +    }
  }
---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -61,6 +61,8 @@
              return createProvider("sun.nio.fs.SolarisFileSystemProvider");
          if (osname.equals("Linux"))
@@ -18402,8 +18428,8 @@
          if (osname.contains("OS X"))
              return createProvider("sun.nio.fs.MacOSXFileSystemProvider");
          if (osname.equals("AIX"))
---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -161,6 +161,7 @@
  
      static boolean isBSD() {
@@ -18427,8 +18453,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -273,7 +273,7 @@
              try {
                  b = s.getBytes("UTF-8");
@@ -18438,8 +18464,8 @@
              }
              BsdVirtualMachine.write(fd, b, 0, b.length);
          }
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -675,6 +675,7 @@
              return -1;
          }
@@ -18456,8 +18482,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -140,7 +140,7 @@
                                        (float) ((int) sr->samp_rates[s]),
                                        DAUDIO_PCM, /* encoding - let's only do PCM */
@@ -18467,8 +18493,8 @@
                                        FALSE /* little endian */
  #else
                                        (bits[b] > 8)?TRUE:FALSE  /* big endian */
---- ./jdk/src/solaris/native/common/jni_util_md.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/common/jni_util_md.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -28,6 +28,7 @@
  #include "jni.h"
  #include "jni_util.h"
@@ -18477,8 +18503,8 @@
  
  jstring nativeNewStringPlatform(JNIEnv *env, const char *str) {
      return NULL;
---- ./jdk/src/solaris/native/java/lang/java_props_md.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/java/lang/java_props_md.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -111,7 +111,7 @@
      lc = setlocale(cat, NULL);
  #endif
@@ -18513,8 +18539,8 @@
  
      /* user properties */
      {
---- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -36,20 +36,13 @@
  #include <stdlib.h>
  #include <ctype.h>
@@ -18555,8 +18581,8 @@
      error = getaddrinfo(hostname, NULL, &hints, &res);
  
      if (error) {
---- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -33,7 +33,7 @@
  #include <strings.h>
  #include <stdlib.h>
@@ -18598,8 +18624,8 @@
  #ifdef AF_INET6
      /* Try once, with our static buffer. */
      memset(&hints, 0, sizeof(hints));
---- ./jdk/src/solaris/native/java/net/NetworkInterface.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -58,14 +58,19 @@
  #include <sys/param.h>
  #include <sys/ioctl.h>
@@ -18622,8 +18648,8 @@
  
  #include "jvm.h"
  #include "jni_util.h"
---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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 @@
                  }
              }
@@ -18633,8 +18659,8 @@
              if (family == AF_INET6 && index == 0) {
                  index = getDefaultScopeID(env);
              }
---- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -215,6 +215,7 @@
      }
  
@@ -18651,8 +18677,8 @@
  #endif /* AF_INET6 */
  
      /*
---- ./jdk/src/solaris/native/java/net/bsd_close.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/java/net/bsd_close.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -320,11 +320,8 @@
  }
  
@@ -18742,8 +18768,8 @@
      }
 +#endif
  }
---- ./jdk/src/solaris/native/java/net/net_util_md.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/java/net/net_util_md.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -46,6 +46,10 @@
  #endif
  #endif
@@ -18764,8 +18790,8 @@
      static jclass ni_class = NULL;
      static jfieldID ni_defaultIndexID;
      if (ni_class == NULL) {
---- ./jdk/src/solaris/native/java/util/TimeZone_md.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -56,7 +56,11 @@
  #endif
  
@@ -18829,8 +18855,8 @@
  }
 -#endif /* MACOSX */
 +#endif /* _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/awt_Font.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -255,7 +255,7 @@
              if (strcmp(style, "regular") == 0) {
                  altstyle = "roman";
@@ -18840,8 +18866,8 @@
              if (!strcmp(family, "lucidasans")) {
                  family = "lucida";
              }
---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -121,7 +121,7 @@
   */
  
@@ -18926,8 +18952,8 @@
  #endif /* HEADLESS */
      return point;
  }
---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -52,7 +52,7 @@
                                  XIMPreeditDrawCallbackStruct *);
  static void PreeditCaretCallback(XIC, XPointer,
@@ -19147,8 +19173,8 @@
      AWT_LOCK();
      adjustStatusWindow(window);
      AWT_UNLOCK();
---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -45,7 +45,7 @@
  #include "wsutils.h"
  #include "list.h"
@@ -19158,8 +19184,8 @@
  #include <sys/socket.h>
  #endif
  
---- ./jdk/src/solaris/native/sun/awt/extutil.h	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/awt/extutil.h	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -58,7 +58,7 @@
   */
  /* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
@@ -19175,8 +19201,8 @@
  
 -#endif /* __linux__ || MACOSX */
 +#endif /* __linux__ || _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/fontpath.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/awt/fontpath.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -23,9 +23,9 @@
   * questions.
   */
@@ -19265,8 +19291,8 @@
                  && (strcmp((char*)fontformat, "Type 1") != 0)
  #endif
               ) {
---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -28,11 +28,11 @@
  #include <sys/types.h>
  
@@ -19282,8 +19308,8 @@
  
  typedef unsigned char   jubyte;
  typedef unsigned short  jushort;
---- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -63,9 +63,6 @@
   *    MLIB_EDGE_SRC_PADDED
   */
@@ -19388,8 +19414,8 @@
          LOGIC(da[0], dtmp, dtmp1, |);
        }
        else {                                               /* aligned */
---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -804,7 +804,7 @@
  static int initialized;
  static int usevis = JNI_TRUE;
@@ -19400,7 +19426,7 @@
  #else
  #   define ULTRA_CHIP   "sun4u"
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/solaris/native/sun/management/BsdOperatingSystem.c	Fri Feb 02 18:25:39 2018 -0800
++++ ./jdk/src/solaris/native/sun/management/BsdOperatingSystem.c	Sat May 19 23:14:35 2018 -0700
 @@ -0,0 +1,42 @@
 +/*
 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -19444,8 +19470,8 @@
 +{
 +    return (jdouble) -1;
 +}
---- ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -56,6 +56,9 @@
  #include <limits.h>
  #include <stdlib.h>
@@ -19610,8 +19636,8 @@
          return -1;
      }
  
---- ./jdk/src/solaris/native/sun/net/portconfig.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/net/portconfig.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -67,6 +67,24 @@
          range->lower = net_getParam("/dev/tcp", "tcp_smallest_anon_port");
          return 0;
@@ -19637,8 +19663,8 @@
  #elif defined(_ALLBSD_SOURCE)
      {
          int ret;
---- ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -67,7 +67,7 @@
  
  
@@ -19687,8 +19713,8 @@
  jboolean loadSocketExtensionFuncs(JNIEnv* env);
  
  #endif /* !SUN_NIO_CH_SCTP_H */
---- ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -58,6 +58,7 @@
   */
  jboolean loadSocketExtensionFuncs
@@ -19705,8 +19731,8 @@
  
      funcsLoaded = JNI_TRUE;
      return JNI_TRUE;
---- ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -31,6 +31,12 @@
  #include <dlfcn.h>
  #include <string.h>
@@ -19729,8 +19755,8 @@
          if (magic_handle == NULL) {
              return JNI_FALSE;
          }
---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -54,7 +54,7 @@
      }
  
@@ -19740,8 +19766,8 @@
      void *hModule = dlopen(libName, RTLD_LAZY);
  #else
      void *hModule = dlopen(libName, RTLD_NOLOAD);
---- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -38,7 +38,9 @@
  #include <sys/types.h>
  #include <sys/socket.h>
@@ -19752,8 +19778,8 @@
  #include <sys/un.h>
  #include <fcntl.h>
  
---- ./jdk/src/solaris/native/sun/xawt/XWindow.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -886,7 +886,7 @@
  {
      KeySym originalKeysym = *keysym;
@@ -19763,8 +19789,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -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 2aae46487050..fb90c771d755 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	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/test/compiler/5091921/Test7005594.sh	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -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	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/test/compiler/6894807/Test6894807.sh	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -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	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/test/runtime/7110720/Test7110720.sh	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -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	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
 @@ -37,8 +37,8 @@
      public static void main(String args[]) throws Throwable {
  
@@ -51,8 +51,19 @@
              return;
          }
  
---- ./hotspot/test/test_env.sh	Fri Dec 15 08:58:26 2017 -0800
-+++ ./hotspot/test/test_env.sh	Thu Jan 25 22:36:25 2018 -0800
+--- ./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
+@@ -47,6 +47,8 @@
+             osDependentBaseString = "lib%s.dylib";
+         } else if (Platform.isLinux()) {
+             osDependentBaseString = "lib%s.so";
++        } else if (Platform.isBSD()) {
++            osDependentBaseString = "lib%s.so";
+         }
+ 
+         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
 @@ -53,7 +53,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -62,8 +73,21 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
+@@ -67,6 +67,10 @@
+         return isOs("aix");
+     }
+ 
++    public static boolean isBSD() {
++        return osName.toLowerCase().endsWith("bsd");
++    }
++
+     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
 @@ -48,7 +48,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -73,8 +97,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/com/sun/corba/cachedSocket/7056731.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/com/sun/corba/cachedSocket/7056731.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -31,7 +31,7 @@
  
  OS=`uname -s`
@@ -84,8 +108,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -56,7 +56,7 @@
  
  OS=`uname -s`
@@ -95,8 +119,8 @@
        PATHSEP=":"
        ;;
  
---- ./jdk/test/com/sun/jdi/JITDebug.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/com/sun/jdi/JITDebug.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -63,7 +63,7 @@
  OS=`uname -s`
  export TRANSPORT_METHOD
@@ -106,8 +130,8 @@
        PATHSEP=":"
        TRANSPORT_METHOD=dt_socket
        ;;
---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -106,7 +106,7 @@
      xx=`find ${jreloc}/lib -name libdt_socket.so`
      libloc=`dirname ${xx}`
@@ -117,8 +141,8 @@
      libloc=${jreloc}/lib
      ;;
    Windows*)
---- ./jdk/test/com/sun/jdi/ShellScaffold.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -284,7 +284,7 @@
           psCmd=ps
           jstack=jstack.exe
@@ -128,8 +152,8 @@
           transport=dt_socket
           address=
           devnull=/dev/null
---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -45,7 +45,7 @@
  
  OS=`uname -s`
@@ -139,8 +163,8 @@
      PS=":"
      ;;
    Windows* | CYGWIN*)
---- ./jdk/test/java/awt/JAWT/JAWT.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/awt/JAWT/JAWT.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -62,6 +62,23 @@
  	MAKE="make"
  	LD_LIBRARY_PATH="."
@@ -174,8 +198,8 @@
      exit 0;
      ;;
    * )
---- ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -86,6 +86,14 @@
        TMP="/tmp"
        ;;
@@ -191,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -59,7 +59,7 @@
  # Checking for proper OS
  OS=`uname -s`
@@ -202,8 +226,8 @@
        FILESEP="/"
        ;;
      
---- ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -119,6 +119,14 @@
        TMP="/tmp"
        ;;
@@ -219,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/io/File/GetXSpace.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -51,7 +51,7 @@
      private static final String dfFormat;
      static {
@@ -230,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/io/File/GetXSpace.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -26,7 +26,7 @@
  # set platform-dependent variable
  OS=`uname -s`
@@ -241,8 +265,8 @@
    Windows_98 )    return    ;;
    Windows* )      SID=`sid`; TMP="c:/temp"  ;;
    * )
---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -45,7 +45,7 @@
  # Need to determine the classpath separator and filepath separator based on the
  # operating system.
@@ -252,8 +276,8 @@
    PS=":"  ;;
  Windows* | CYGWIN* )
    PS=";"  ;;
---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -263,8 +287,8 @@
      PS=":"    ;;
    Windows* | CYGWIN* )
      PS=";"    ;;
---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -274,8 +298,8 @@
      PS=":"    ;;
    Windows* | CYGWIN* )
      PS=";"    ;;
---- ./jdk/test/java/lang/ClassLoader/Assert.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/lang/ClassLoader/Assert.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -25,7 +25,7 @@
  
  OS=`uname -s`
@@ -285,8 +309,8 @@
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
      ;;
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -55,7 +55,7 @@
    Linux )
      FS="/"
@@ -296,8 +320,8 @@
      FS="/"
      ;;
    AIX )
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -60,7 +60,7 @@
    Linux )
      FS="/"
@@ -307,8 +331,8 @@
      FS="/"
      ;;
    AIX )
---- ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -148,6 +148,9 @@
          } else if (osName.startsWith("Linux") == true) {
              return new UnixTest(
@@ -319,8 +343,8 @@
          } else if (osName.startsWith("Mac OS")) {
              return new MacTest(
                  File.createTempFile("ProcessTrap-", ".sh",null));
---- ./jdk/test/java/lang/ProcessBuilder/Zombies.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/lang/ProcessBuilder/Zombies.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -34,7 +34,7 @@
  
      static final String os = System.getProperty("os.name");
@@ -330,8 +354,8 @@
          "/usr/bin/true" : "/bin/true";
  
      public static void main(String[] args) throws Throwable {
---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -30,7 +30,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -341,8 +365,8 @@
    Windows* | CYGWIN* )
      echo "Passed"; exit 0 ;;
    * ) echo "Unrecognized system!" ;  exit 1 ;;
---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -48,7 +48,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -352,8 +376,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/java/lang/instrument/MakeJAR2.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -55,7 +55,7 @@
  
  OS=`uname -s`
@@ -363,8 +387,8 @@
        PATHSEP=":"
        ;;
  
---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -43,7 +43,7 @@
      PS=":"
      FS="/"
@@ -374,8 +398,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -79,8 +79,10 @@
          System.out.println("Test passed.");
      }
@@ -397,8 +421,8 @@
                  ? output.split(" ")
                  : output.split(",");
          double expected = Double.parseDouble(lavg[0]);
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -61,7 +61,7 @@
  while true; do
    echo "Run $i: TestSystemLoadAvg"
@@ -408,8 +432,8 @@
           runOne GetSystemLoadAverage
           ;;
        * )
---- ./jdk/test/java/net/Authenticator/B4933582.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/net/Authenticator/B4933582.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -26,7 +26,7 @@
  
  OS=`uname -s`
@@ -419,8 +443,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/DatagramSocket/Send12k.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/net/DatagramSocket/Send12k.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -36,9 +36,10 @@
  
      public static void main(String args[]) throws Exception {
@@ -434,8 +458,8 @@
               SEND_SIZE = 16 * 576;
           } else {
               SEND_SIZE = 16 * 1024;
---- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -45,6 +45,8 @@
              return (true);
          if (p.getProperty ("os.name").equals ("Linux"))
@@ -445,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -27,11 +27,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -460,8 +484,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/net/Socket/OldSocketImpl.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -28,7 +28,7 @@
  
  OS=`uname -s`
@@ -471,8 +495,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URL/B5086147.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/net/URL/B5086147.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -26,7 +26,7 @@
  
  OS=`uname -s`
@@ -482,8 +506,8 @@
      exit 0
      ;;
    CYGWIN* )
---- ./jdk/test/java/net/URLClassLoader/B5077773.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -34,11 +34,7 @@
  
  OS=`uname -s`
@@ -497,8 +521,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -27,11 +27,7 @@
  
  OS=`uname -s`
@@ -512,8 +536,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URLConnection/6212146/test.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/net/URLConnection/6212146/test.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -33,11 +33,7 @@
  
  OS=`uname -s`
@@ -527,8 +551,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/nio/channels/FileChannel/Transfer.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/nio/channels/FileChannel/Transfer.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -228,7 +228,7 @@
          // Windows and Linux can't handle the really large file sizes for a
          // truncate or a positional write required by the test for 4563125
@@ -538,8 +562,8 @@
              return;
          File source = File.createTempFile("blah", null);
          source.deleteOnExit();
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -17,6 +17,12 @@
  
  #include "Launcher.h"
@@ -562,8 +586,8 @@
          _exit(-1);
      }
  
---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -34,7 +34,7 @@
  
  OS=`uname -s`
@@ -573,8 +597,8 @@
    # Skip locale test for Windows
    Windows* | CYGWIN* )
      echo "Passed"; exit 0 ;;
---- ./jdk/test/java/nio/charset/spi/basic.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/nio/charset/spi/basic.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -48,7 +48,7 @@
  
  DIR=`pwd`
@@ -584,8 +608,8 @@
    Windows* )      CPS=';' ;;
    CYGWIN*  )
      DIR=`/usr/bin/cygpath -a -s -m $DIR`
---- ./jdk/test/java/nio/file/FileSystem/Basic.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/nio/file/FileSystem/Basic.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -76,7 +76,7 @@
              checkSupported(fs, "posix", "unix", "owner", "acl", "user");
          if (os.equals("Linux"))
@@ -595,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/nio/file/Files/CopyAndMove.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -651,7 +651,7 @@
  
                  // check POSIX attributes are copied
@@ -615,8 +639,8 @@
          boolean isDirectory = isDirectory(file, NOFOLLOW_LINKS);
  
          if (isUnix) {
---- ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -33,7 +33,7 @@
  
  OS=`uname -s`
@@ -626,8 +650,8 @@
      PS=":"
      ;;
    Windows* | CYGWIN* )
---- ./jdk/test/java/rmi/registry/readTest/readTest.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/rmi/registry/readTest/readTest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -34,7 +34,7 @@
  REGARGS=""
  
@@ -637,8 +661,8 @@
      PS=":"
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -58,7 +58,7 @@
      PATHSEP=":"
      FILESEP="/"
@@ -648,8 +672,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -42,7 +42,7 @@
      PATHSEP=":"
      FILESEP="/"
@@ -659,8 +683,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -66,7 +66,7 @@
      PATHSEP=";"
      FILESEP="/"
@@ -670,8 +694,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -58,7 +58,7 @@
      PATHSEP=":"
      FILESEP="/"
@@ -681,8 +705,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/signedfirst/Static.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/security/Security/signedfirst/Static.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -58,7 +58,7 @@
      PATHSEP=":"
      FILESEP="/"
@@ -692,8 +716,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/util/Currency/PropertiesTest.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/util/Currency/PropertiesTest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -52,7 +52,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -703,8 +727,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -62,7 +62,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -714,8 +738,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -31,7 +31,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -725,8 +749,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/util/ServiceLoader/basic.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/util/ServiceLoader/basic.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -43,9 +43,7 @@
  
  OS=`uname -s`
@@ -738,8 +762,8 @@
        SEP=':' ;;
      * )
        SEP='\;' ;;
---- ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -31,7 +31,7 @@
  
  OS=`uname -s`
@@ -749,8 +773,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -56,7 +56,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -760,8 +784,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -89,7 +89,7 @@
        FILESEP="/"
        ;;
@@ -771,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -90,7 +90,7 @@
        FILESEP="/"
        ;;
@@ -782,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -108,6 +108,14 @@
        TMP="/tmp"
        ;;
@@ -799,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/javax/script/CommonSetup.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -36,7 +36,7 @@
  
  OS=`uname -s`
@@ -810,8 +834,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -43,7 +43,7 @@
      FS="/"
      RM="/bin/rm -f"
@@ -821,8 +845,8 @@
      PS=":"
      FS="/"
      RM="/bin/rm -f"
---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -53,7 +53,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -832,8 +856,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -53,8 +53,13 @@
          return isOs("linux");
      }
@@ -849,8 +873,8 @@
      }
  
      public static String getOsName() {
---- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -107,8 +107,8 @@
  
      public static void main(String[] args) throws AWTException, InvocationTargetException, InterruptedException {
@@ -862,8 +886,8 @@
                                 "skipping!");
              return;
          }
---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -42,7 +42,7 @@
  fi
  
@@ -873,8 +897,8 @@
      PATHSEP=":"
      FILESEP="/"
      DFILESEP=$FILESEP
---- ./jdk/test/sun/net/ftp/MarkResetTest.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/net/ftp/MarkResetTest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -28,7 +28,7 @@
  
  OS=`uname -s`
@@ -884,8 +908,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -28,7 +28,7 @@
  
  OS=`uname -s`
@@ -895,8 +919,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -31,7 +31,7 @@
  
  OS=`uname -s`
@@ -906,8 +930,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -31,7 +31,7 @@
  
  OS=`uname -s`
@@ -917,8 +941,8 @@
      PS=":"
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
---- ./jdk/test/sun/nio/ch/SelProvider.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/nio/ch/SelProvider.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -39,7 +39,7 @@
                  expected = "sun.nio.ch.DevPollSelectorProvider";
              } else if ("Linux".equals(osname)) {
@@ -928,8 +952,8 @@
                  expected = "sun.nio.ch.KQueueSelectorProvider";
              } else {
                  return;
---- ./jdk/test/sun/security/krb5/runNameEquals.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/krb5/runNameEquals.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -52,7 +52,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -939,8 +963,8 @@
      PATHSEP=":"
      FILESEP="/"
      NATIVE=true
---- ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -50,7 +50,7 @@
  
  OS=`uname -s`
@@ -950,8 +974,8 @@
      FS="/"
      ;;
    Windows_* )
---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -66,7 +66,7 @@
      CP="${FS}bin${FS}cp"
      CHMOD="${FS}bin${FS}chmod"
@@ -961,8 +985,8 @@
      FS="/"
      PS=":"
      CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -67,7 +67,7 @@
      CP="${FS}bin${FS}cp"
      CHMOD="${FS}bin${FS}chmod"
@@ -972,8 +996,8 @@
      FS="/"
      PS=":"
      CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -50,7 +50,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -983,8 +1007,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -52,7 +52,7 @@
      PATHSEP=":"
      FILESEP="/"
@@ -994,8 +1018,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -59,7 +59,7 @@
      PS=":"
      FS="/"
@@ -1005,8 +1029,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -33,7 +33,7 @@
  
  OS=`uname -s`
@@ -1016,8 +1040,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -46,7 +46,7 @@
  
  OS=`uname -s`
@@ -1027,8 +1051,8 @@
          FILESEP="/"
          PATHSEP=":"
          ;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -32,7 +32,7 @@
  HOSTNAME=`uname -n`
  OS=`uname -s`
@@ -1038,8 +1062,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -32,7 +32,7 @@
  HOSTNAME=`uname -n`
  OS=`uname -s`
@@ -1049,8 +1073,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1060,8 +1084,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1071,8 +1095,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -47,6 +47,13 @@
      FS="/"
      CP="${FS}bin${FS}cp -f"
@@ -1087,8 +1111,8 @@
    CYGWIN* )
      NULL=/dev/null
      PS=";"
---- ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -39,6 +39,11 @@
    Windows_* )
      FS="\\"
@@ -1101,8 +1125,8 @@
    * )
      FS="/"
      ;;
---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -42,7 +42,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1112,8 +1136,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1123,8 +1147,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -55,7 +55,7 @@
      PATHSEP=":"
      FILESEP="/"
@@ -1134,8 +1158,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -48,7 +48,7 @@
    Linux )
      FILESEP="/"
@@ -1145,8 +1169,8 @@
      FILESEP="/"
      ;;
    AIX )
---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -45,7 +45,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1156,8 +1180,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1167,8 +1191,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1178,8 +1202,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/sun/security/tools/keytool/i18n.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/keytool/i18n.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1189,8 +1213,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/printssl.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/keytool/printssl.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -40,7 +40,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1200,8 +1224,8 @@
      FS="/"
      ;;
    CYGWIN* )
---- ./jdk/test/sun/security/tools/keytool/resource.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/keytool/resource.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -43,7 +43,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1211,8 +1235,8 @@
      NULL=/dev/null
      FS="/"
      ;;
---- ./jdk/test/sun/security/tools/keytool/standard.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/keytool/standard.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -45,7 +45,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1222,8 +1246,8 @@
      FS="/"
      ;;
    Windows_* )
---- ./jdk/test/sun/security/tools/policytool/Alias.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/policytool/Alias.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1233,8 +1257,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1244,8 +1268,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1255,8 +1279,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1266,8 +1290,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1277,8 +1301,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1288,8 +1312,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/i18n.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/security/tools/policytool/i18n.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -49,7 +49,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1299,8 +1323,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/tools/common/CommonSetup.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/tools/common/CommonSetup.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -47,6 +47,7 @@
  #   isLinux   - true if OS is Linux
  #   isSolaris - true if OS is Solaris
@@ -1328,8 +1352,8 @@
    Darwin )
      OS="Mac OS X"
      isMacos=true
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -54,7 +54,7 @@
  
  OS=`uname -s`
@@ -1339,8 +1363,8 @@
        PATHSEP=":"
        ;;
  
---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -56,7 +56,7 @@
  
  OS=`uname -s`
@@ -1350,8 +1374,8 @@
        PATHSEP=":"
        ;;
  
---- ./jdk/test/tools/launcher/ExecutionEnvironment.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/tools/launcher/ExecutionEnvironment.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -194,7 +194,7 @@
  
          Map<String, String> env = new HashMap<>();
@@ -1361,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	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/tools/launcher/RunpathTest.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -69,7 +69,7 @@
      }
  
@@ -1372,8 +1396,8 @@
              RunpathTest rp = new RunpathTest();
              rp.testRpath();
          }
---- ./jdk/test/tools/launcher/Test7029048.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/tools/launcher/Test7029048.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -223,7 +223,7 @@
          } else if (isSolaris && passes < 9) {
              throw new Exception("Test7029048: FAIL: " +
@@ -1383,8 +1407,8 @@
               throw new Exception("Test7029048: FAIL: " +
                      "all tests did not run, expected " + 6 + " got " + passes);
          } else {
---- ./jdk/test/tools/launcher/TestHelper.java	Fri Dec 15 09:05:18 2017 -0800
-+++ ./jdk/test/tools/launcher/TestHelper.java	Fri Feb 02 18:25:39 2018 -0800
+--- ./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
 @@ -94,6 +94,8 @@
              System.getProperty("os.name", "unknown").startsWith("Linux");
      static final boolean isAIX =
@@ -1394,8 +1418,8 @@
      static final String LIBJVM = isWindows
                          ? "jvm.dll"
                          : "libjvm" + (isMacOSX ? ".dylib" : ".so");
---- ./langtools/test/Makefile	Fri Dec 15 09:20:16 2017 -0800
-+++ ./langtools/test/Makefile	Thu Jan 25 22:36:17 2018 -0800
+--- ./langtools/test/Makefile	Mon Mar 19 12:09:33 2018 -0700
++++ ./langtools/test/Makefile	Sat May 19 22:20:16 2018 -0700
 @@ -34,6 +34,14 @@
      ARCH=i586
    endif
@@ -1411,8 +1435,8 @@
  ifeq ($(OSNAME), Darwin)
    PLATFORM = bsd
    ARCH = $(shell uname -m)
---- ./langtools/test/tools/javah/ReadOldClass.sh	Fri Dec 15 09:20:16 2017 -0800
-+++ ./langtools/test/tools/javah/ReadOldClass.sh	Thu Jan 25 22:36:17 2018 -0800
+--- ./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
 @@ -43,7 +43,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1422,8 +1446,8 @@
      PS=":"
      FS="/"
      ;;
---- ./nashorn/test/script/jfx.js	Fri Dec 15 09:23:48 2017 -0800
-+++ ./nashorn/test/script/jfx.js	Thu Jan 25 22:36:19 2018 -0800
+--- ./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) {
diff --git a/java/openjdk8/files/patch-hotspot_src_share_vm_interpreter_bytecodeInterpreter.cpp b/java/openjdk8/files/patch-hotspot_src_share_vm_interpreter_bytecodeInterpreter.cpp
deleted file mode 100644
index a6bfa31d5dd0..000000000000
--- a/java/openjdk8/files/patch-hotspot_src_share_vm_interpreter_bytecodeInterpreter.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
---- hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp.orig
-+++ hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
-@@ -2569,13 +2569,35 @@ run:
- 
-         // this could definitely be cleaned up QQQ
-         Method* callee;
--        Klass* iclass = cache->f1_as_klass();
--        // InstanceKlass* interface = (InstanceKlass*) iclass;
-+        Method *interface_method = cache->f2_as_interface_method();
-+        InstanceKlass* iclass = interface_method->method_holder();
-+
-         // get receiver
-         int parms = cache->parameter_size();
-         oop rcvr = STACK_OBJECT(-parms);
-         CHECK_NULL(rcvr);
-         InstanceKlass* int2 = (InstanceKlass*) rcvr->klass();
-+
-+        // Receiver subtype check against resolved interface klass (REFC).
-+        {
-+          Klass* refc = cache->f1_as_klass();
-+          itableOffsetEntry* scan;
-+          for (scan = (itableOffsetEntry*) int2->start_of_itable();
-+               scan->interface_klass() != NULL;
-+               scan++) {
-+            if (scan->interface_klass() == refc) {
-+              break;
-+            }
-+          }
-+          // Check that the entry is non-null.  A null entry means
-+          // that the receiver class doesn't implement the
-+          // interface, and wasn't the same as when the caller was
-+          // compiled.
-+          if (scan->interface_klass() == NULL) {
-+            VM_JAVA_ERROR(vmSymbols::java_lang_IncompatibleClassChangeError(), "", note_no_trap);
-+          }
-+        }
-+
-         itableOffsetEntry* ki = (itableOffsetEntry*) int2->start_of_itable();
-         int i;
-         for ( i = 0 ; i < int2->itable_length() ; i++, ki++ ) {
-@@ -2587,7 +2609,8 @@ run:
-         if (i == int2->itable_length()) {
-           VM_JAVA_ERROR(vmSymbols::java_lang_IncompatibleClassChangeError(), "", note_no_trap);
-         }
--        int mindex = cache->f2_as_index();
-+        int mindex = interface_method->itable_index();
-+
-         itableMethodEntry* im = ki->first_method_entry(rcvr->klass());
-         callee = im[mindex].method();
-         if (callee == NULL) {
diff --git a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk
index b62ab2248051..e7d8afbd424f 100644
--- a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk
+++ b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk
@@ -1,17 +1,15 @@
---- jdk/make/lib/ServiceabilityLibraries.gmk.orig	2015-07-18 14:43:00.000000000 -0700
-+++ jdk/make/lib/ServiceabilityLibraries.gmk	2015-07-18 14:44:25.000000000 -0700
-@@ -247,15 +247,17 @@
+--- jdk/make/lib/ServiceabilityLibraries.gmk.orig	2018-05-20 12:20:24.536007000 -0700
++++ jdk/make/lib/ServiceabilityLibraries.gmk	2018-05-20 12:22:29.309856000 -0700
+@@ -247,7 +247,7 @@
  endif
  
  ifeq ($(OPENJDK_TARGET_OS), bsd)
+-  LIBINSTRUMENT_LDFLAGS_SUFFIX += -L$(PACKAGE_PATH)/lib -liconv $(LIBZ)
 +  LIBINSTRUMENT_LDFLAGS_SUFFIX += %%ICONV_LDFLAGS%% $(LIBZ)
    ifeq ($(BSD_STATIC_LIBJLI), bsd)
      LIBINSTRUMENT_LDFLAGS += -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
--        -Xlinker --no-whole-archive 
-+        -Xlinker --no-whole-archive
-   else
-     LIBINSTRUMENT_LDFLAGS += $(call SET_SHARED_LIBRARY_ORIGIN,/jli)
-+    LIBINSTRUMENT_LDFLAGS_SUFFIX += -L$(INSTALL_LIBRARIES_HERE)/jli -ljli
+         -Xlinker --no-whole-archive
+@@ -257,7 +257,7 @@
    endif
    BSD_ICONV_CFLAGS:= -I$(PACKAGE_PATH)/include
    ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
@@ -20,11 +18,3 @@
    endif
  endif
  
-@@ -283,7 +284,6 @@
-     LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \
-     LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \
-     LDFLAGS_SUFFIX_aix := $(LIBZ) -L$(JDK_OUTPUTDIR)/objs -ljli_static $(LIBDL),\
--    LDFLAGS_SUFFIX_bsd := -L$(PACKAGE_PATH)/lib -liconv $(LIBZ), \
-     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
-     RC_FLAGS := $(RC_FLAGS) \
-         -D "JDK_FNAME=instrument.dll" \