3 files changed, 808 insertions, 927 deletions

diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 4a866bcf370a..6e8208377f34 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -32,7 +32,8 @@ PATCHFILES=	patch-7u45-b30.xz \
 		patch-7u101-b00.xz \
 		patch-7u111-b01.xz \
 		patch-7u121-b00.xz \
-		patch-7u131-b00.xz
+		patch-7u131-b00.xz \
+		patch-7u141-b02.xz
 
 MAINTAINER?=	glewis@FreeBSD.org
 COMMENT?=	Java Development Kit 7
@@ -75,8 +76,8 @@ JAVAVMS_COMMENT+=	JRE
 INSTALLDIR=	${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}-jre
 .endif
 
-PORT_MINOR_VERSION=	131
-PORT_BUILD_NUMBER=	00
+PORT_MINOR_VERSION=	141
+PORT_BUILD_NUMBER=	02
 JDK_MAJOR_VERSION=	7
 JDK_MINOR_VERSION=	40
 JDK_BUILD_NUMBER=	43
diff --git a/java/openjdk7/distinfo b/java/openjdk7/distinfo
index 69afb980fc09..9acae7ea1337 100644
--- a/java/openjdk7/distinfo
+++ b/java/openjdk7/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1496029291
+TIMESTAMP = 1496080874
 SHA256 (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 00f8ea561876cbcad174ba3ca7a9ae10b50df46a782ac64c2ac57ac357b50596
 SIZE (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 104575196
 SHA256 (apache-ant-1.9.7-bin.zip) = b28c5ea0b5ea90bb4ad6bab229b6a56ac4461760a251a12567803a69259cd9de
@@ -33,3 +33,5 @@ SHA256 (patch-7u121-b00.xz) = e8cba92ab639210471db536fb316593eef300d67bbf3614692
 SIZE (patch-7u121-b00.xz) = 670484
 SHA256 (patch-7u131-b00.xz) = 5c7b4f9be1d7bc3336ba19c288c882ff5cbd1b1b0ee403f84229cd8807452024
 SIZE (patch-7u131-b00.xz) = 769172
+SHA256 (patch-7u141-b02.xz) = 721db525f519417c30d37bcfa80ff715a1e2858e0882e75759b4eaedd6a20510
+SIZE (patch-7u141-b02.xz) = 165488
diff --git a/java/openjdk7/files/patch-bsd b/java/openjdk7/files/patch-bsd
index 58e59cabad83..30a9423e4b7d 100644
--- a/java/openjdk7/files/patch-bsd
+++ b/java/openjdk7/files/patch-bsd
@@ -1,5 +1,5 @@
---- ./.hgtags	Fri Oct 28 03:35:31 2016 +0100
-+++ ./.hgtags	Sun May 21 11:12:34 2017 -0700
+--- ./.hgtags	Thu Apr 27 06:11:36 2017 +0100
++++ ./.hgtags	Sun May 28 21:31:34 2017 -0700
 @@ -123,6 +123,7 @@
  2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
  3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
@@ -8,13 +8,13 @@
  34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02
  bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03
  f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04
-@@ -607,3 +608,4 @@
- bade1889699bab14082e84de3b40901964b52483 jdk7u111-b00
- 9b95c1ef81fe7bb010a6938d1cb97843b9a1fc68 jdk7u111-b01
- 974935f4e21dae1170b5247a8af362617d105e1c jdk7u121-b00
-+259e6ca7faf17e2b96fb0733f30e62327a7acdfa jdk7u131-b00
---- ./corba/.hgtags	Fri Oct 28 03:35:33 2016 +0100
-+++ ./corba/.hgtags	Sun May 21 11:12:35 2017 -0700
+@@ -610,3 +611,4 @@
+ 259e6ca7faf17e2b96fb0733f30e62327a7acdfa jdk7u131-b00
+ e3b3add63d287cd07398949308308135ded4197e jdk7u141-b00
+ b21d7bc25e0f96c6ed9b19e1ea0ea6253c34d7fe jdk7u141-b01
++db8fe12e5e508b18dd0aeb166099406a774b0d04 jdk7u141-b02
+--- ./corba/.hgtags	Thu Apr 27 06:11:37 2017 +0100
++++ ./corba/.hgtags	Sun May 28 21:31:35 2017 -0700
 @@ -123,6 +123,7 @@
  770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
  36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
@@ -23,13 +23,13 @@
  9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
  dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
  eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
-@@ -609,3 +610,4 @@
- c1def4cc27fb92914168a5f65658eba4a1754dfe jdk7u111-b00
- 36715cc029596f86e977d486e547f62bb07eed74 jdk7u111-b01
- ad3a33a23c69608ae140d4564d045b62533f45a3 jdk7u121-b00
-+d93d13bcb01d7b635d0e021877e1102e34bae8fb jdk7u131-b00
---- ./hotspot/.hgtags	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/.hgtags	Sun May 21 11:12:48 2017 -0700
+@@ -612,3 +613,4 @@
+ d93d13bcb01d7b635d0e021877e1102e34bae8fb jdk7u131-b00
+ 61c10a1eaa7b6f77e63f90e624a82a664a451d42 jdk7u141-b00
+ caa46a309b1195a0301956e7416633b717553925 jdk7u141-b01
++39240de9d27767c8bad74e34f83f0a4902a9ef85 jdk7u141-b02
+--- ./hotspot/.hgtags	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/.hgtags	Sun May 28 21:31:42 2017 -0700
 @@ -182,6 +182,7 @@
  38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16
  81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147
@@ -38,13 +38,13 @@
  9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01
  0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
  31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
-@@ -841,3 +842,4 @@
- 14d0f4da4a74897fc3274f8f549f41544bb4625a jdk7u111-b00
- 9efa3fae3c278a7f48badec775d7f9b2d5320b6d jdk7u111-b01
- 17b40d99ea3665de2bfffe163b68f2dfcf675cba jdk7u121-b00
-+95e4ea3d479ebdab9d78725776b6b11d4add6b0e jdk7u131-b00
---- ./hotspot/agent/src/os/bsd/ps_proc.c	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/agent/src/os/bsd/ps_proc.c	Sun May 21 11:12:48 2017 -0700
+@@ -844,3 +845,4 @@
+ 95e4ea3d479ebdab9d78725776b6b11d4add6b0e jdk7u131-b00
+ be8da42894af5f7d11b4bad83e166186f01ce1b4 jdk7u141-b00
+ 22c5a6ca09e35b63baf51bad4cb3d8f0cf326705 jdk7u141-b01
++56ad25be7d88c2c2da562fe1e8879c8723d01da1 jdk7u141-b02
+--- ./hotspot/agent/src/os/bsd/ps_proc.c	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/agent/src/os/bsd/ps_proc.c	Sun May 28 21:31:42 2017 -0700
 @@ -131,7 +131,7 @@
  
  static bool ptrace_continue(pid_t pid, int signal) {
@@ -54,8 +54,8 @@
      print_debug("ptrace(PTRACE_CONT, ..) failed for %d\n", pid);
      return false;
    }
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	Sun May 28 21:31:42 2017 -0700
 @@ -33,6 +33,7 @@
  import sun.jvm.hotspot.debugger.remote.*;
  import sun.jvm.hotspot.debugger.windbg.*;
@@ -64,8 +64,8 @@
  import sun.jvm.hotspot.memory.*;
  import sun.jvm.hotspot.oops.*;
  import sun.jvm.hotspot.runtime.*;
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java	Sun May 28 21:31:42 2017 -0700
 @@ -35,6 +35,7 @@
  import sun.jvm.hotspot.debugger.windbg.*;
  import sun.jvm.hotspot.debugger.linux.*;
@@ -74,8 +74,8 @@
  import sun.jvm.hotspot.debugger.remote.*;
  import sun.jvm.hotspot.livejvm.*;
  import sun.jvm.hotspot.memory.*;
---- ./hotspot/make/bsd/Makefile	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/Makefile	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/Makefile	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/Makefile	Sun May 28 21:31:42 2017 -0700
 @@ -1,5 +1,5 @@
  #
 -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -105,8 +105,8 @@
  
  # Synonyms for win32-like targets.
  compiler2:  jvmg product
---- ./hotspot/make/bsd/makefiles/build_vm_def.sh	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/makefiles/build_vm_def.sh	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh	Sun May 28 21:31:42 2017 -0700
 @@ -1,12 +1,28 @@
  #!/bin/sh
  
@@ -142,8 +142,8 @@
 +        if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";"
 +    }' | sort -u ;;
 +esac
---- ./hotspot/make/bsd/makefiles/buildtree.make	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/makefiles/buildtree.make	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/makefiles/buildtree.make	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/makefiles/buildtree.make	Sun May 28 21:31:42 2017 -0700
 @@ -255,6 +255,16 @@
  	echo "$(call gamma-path,commonsrc,os/posix/vm)"; \
  	[ -n "$(CFLAGS_BROWSE)" ] && \
@@ -170,8 +170,8 @@
  
  .dbxrc:  $(BUILDTREE_MAKE)
  	@echo Creating $@ ...
---- ./hotspot/make/bsd/makefiles/gcc.make	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/makefiles/gcc.make	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/makefiles/gcc.make	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/makefiles/gcc.make	Sun May 28 21:31:42 2017 -0700
 @@ -117,7 +117,10 @@
  CFLAGS += -fno-rtti
  CFLAGS += -fno-exceptions
@@ -197,8 +197,8 @@
  endif
  
  # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
---- ./hotspot/make/bsd/makefiles/jsig.make	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/makefiles/jsig.make	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/makefiles/jsig.make	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/makefiles/jsig.make	Sun May 28 21:31:42 2017 -0700
 @@ -36,9 +36,16 @@
    LIBJSIG_G = lib$(JSIG_G).so
  endif
@@ -251,8 +251,8 @@
  	$(QUIETLY) cp -f $(LIBJSIG) $(DEST_JSIG) && echo "Done"
  
  .PHONY: install_jsig
---- ./hotspot/make/bsd/makefiles/launcher.make	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/makefiles/launcher.make	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/makefiles/launcher.make	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/makefiles/launcher.make	Sun May 28 21:31:42 2017 -0700
 @@ -50,7 +50,7 @@
    LIBS_LAUNCHER             += $(STATIC_STDCXX) $(LIBS)
  else
@@ -262,8 +262,8 @@
  
    # The gamma launcher runs the JDK from $JAVA_HOME, overriding the JVM with a
    # freshly built JVM at ./libjvm.{so|dylib}.  This is accomplished by setting 
---- ./hotspot/make/bsd/makefiles/mapfile-vers-product	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-product	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product	Sun May 28 21:31:42 2017 -0700
 @@ -19,237 +19,248 @@
  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  # or visit www.oracle.com if you need additional information or have any
@@ -738,8 +738,8 @@
 +        local:
 +                *;
 +};
---- ./hotspot/make/bsd/makefiles/ppc.make	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/makefiles/ppc.make	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/makefiles/ppc.make	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/makefiles/ppc.make	Sun May 28 21:31:42 2017 -0700
 @@ -28,3 +28,6 @@
  # Must also specify if CPU is big endian
  CFLAGS += -DVM_BIG_ENDIAN
@@ -747,8 +747,8 @@
 +ifdef E500V2
 +ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1 
 +endif
---- ./hotspot/make/bsd/makefiles/saproc.make	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/makefiles/saproc.make	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/makefiles/saproc.make	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/makefiles/saproc.make	Sun May 28 21:31:42 2017 -0700
 @@ -36,6 +36,11 @@
    LIBSAPROC_G = lib$(SAPROC_G).so
  endif
@@ -805,8 +805,8 @@
  	  cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done";  \
  	fi
  
---- ./hotspot/make/solaris/makefiles/defs.make	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/solaris/makefiles/defs.make	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/solaris/makefiles/defs.make	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/solaris/makefiles/defs.make	Sun May 28 21:31:42 2017 -0700
 @@ -221,8 +221,8 @@
  endif
  ifeq ($(JVM_VARIANT_CLIENT),true)
@@ -818,8 +818,8 @@
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
    ifeq ($(ARCH_DATA_MODEL),32)
      EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
---- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp	Sun May 28 21:31:42 2017 -0700
 @@ -71,7 +71,11 @@
  define_pd_global(bool, RewriteBytecodes,     true);
  define_pd_global(bool, RewriteFrequentPairs, true);
@@ -833,7 +833,7 @@
  // GC Ergo Flags
  define_pd_global(intx, CMSYoungGenPerWorker, 16*M);  // default max size of CMS young gen, per GC worker thread
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp	Sun May 21 11:12:48 2017 -0700
++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp	Sun May 28 21:31:42 2017 -0700
 @@ -0,0 +1,46 @@
 +/*
 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -881,8 +881,8 @@
 +  return false;
 +}
 +
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp	Sun May 28 21:31:42 2017 -0700
 @@ -163,6 +163,7 @@
  #endif
  pthread_t os::Bsd::_main_thread;
@@ -900,7 +900,7 @@
  
  ////////////////////////////////////////////////////////////////////////////////
  // utility functions
-@@ -355,7 +358,13 @@
+@@ -341,7 +344,13 @@
     * since it returns a 64 bit value)
     */
    mib[0] = CTL_HW;
@@ -914,7 +914,7 @@
    len = sizeof(mem_val);
    if (sysctl(mib, 2, &mem_val, &len, NULL, 0) != -1) {
         assert(len == sizeof(mem_val), "unexpected data size");
-@@ -1625,7 +1634,10 @@
+@@ -1611,7 +1620,10 @@
        ::clock_gettime(CLOCK_MONOTONIC, &tp)  == 0) {
      // yes, monotonic clock is supported
      _clock_gettime = ::clock_gettime;
@@ -926,7 +926,7 @@
  }
  #else
  void os::Bsd::clock_init() {
-@@ -1711,7 +1723,7 @@
+@@ -1697,7 +1709,7 @@
  jlong os::javaTimeNanos() {
    if (Bsd::supports_monotonic_clock()) {
      struct timespec tp;
@@ -935,7 +935,7 @@
      assert(status == 0, "gettime error");
      jlong result = jlong(tp.tv_sec) * (1000 * 1000 * 1000) + jlong(tp.tv_nsec);
      return result;
-@@ -1848,9 +1860,15 @@
+@@ -1834,9 +1846,15 @@
    return n;
  }
  
@@ -951,7 +951,7 @@
  #else
    return (intx)::pthread_self();
  #endif
-@@ -2401,14 +2419,14 @@
+@@ -2387,14 +2405,14 @@
  }
  
  void os::print_os_info_brief(outputStream* st) {
@@ -968,7 +968,7 @@
  
    os::Posix::print_uname_info(st);
  
-@@ -2417,10 +2435,6 @@
+@@ -2403,10 +2421,6 @@
    os::Posix::print_load_average(st);
  }
  
@@ -979,7 +979,7 @@
  void os::print_memory_info(outputStream* st) {
  
    st->print("Memory:");
-@@ -2437,6 +2451,7 @@
+@@ -2423,6 +2437,7 @@
    st->print("(" UINT64_FORMAT "k free)",
              os::available_memory() >> 10);
  #ifndef _ALLBSD_SOURCE
@@ -987,7 +987,7 @@
    st->print(", swap " UINT64_FORMAT "k",
              ((jlong)si.totalswap * si.mem_unit) >> 10);
    st->print("(" UINT64_FORMAT "k free)",
-@@ -2444,12 +2459,22 @@
+@@ -2430,12 +2445,22 @@
  #endif
    st->cr();
  
@@ -1010,7 +1010,7 @@
  // Taken from /usr/include/bits/siginfo.h  Supposed to be architecture specific
  // but they're the same for all the bsd arch that we support
  // and they're the same for solaris but there's no common place to put this.
-@@ -2596,6 +2621,25 @@
+@@ -2582,6 +2607,25 @@
          assert(len < buflen, "Ran out of buffer space");
          jrelib_p = buf + len;
  
@@ -1036,7 +1036,7 @@
          // Add the appropriate library subdir
          snprintf(jrelib_p, buflen-len, "/jre/lib");
          if (0 != access(buf, F_OK)) {
-@@ -2625,6 +2669,7 @@
+@@ -2611,6 +2655,7 @@
            if (rp == NULL)
              return;
          }
@@ -1044,7 +1044,7 @@
        }
      }
    }
-@@ -2728,10 +2773,14 @@
+@@ -2714,10 +2759,14 @@
      bool timedwait(unsigned int sec, int nsec);
    private:
      jlong currenttime() const;
@@ -1060,7 +1060,7 @@
    SEM_INIT(_semaphore, 0);
  }
  
-@@ -2796,7 +2845,7 @@
+@@ -2782,7 +2831,7 @@
  
  bool Semaphore::timedwait(unsigned int sec, int nsec) {
    struct timespec ts;
@@ -1069,7 +1069,7 @@
  
    while (1) {
      int result = sem_timedwait(&_semaphore, &ts);
-@@ -3017,7 +3066,11 @@
+@@ -3003,7 +3052,11 @@
  }
  
  void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) {
@@ -1081,7 +1081,7 @@
  }
  
  void os::numa_make_global(char *addr, size_t bytes) {
-@@ -3864,6 +3917,7 @@
+@@ -3850,6 +3903,7 @@
    return OS_OK;
  #elif defined(__FreeBSD__)
    int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
@@ -1089,7 +1089,7 @@
  #elif defined(__APPLE__) || defined(__NetBSD__)
    struct sched_param sp;
    int policy;
-@@ -4718,6 +4772,25 @@
+@@ -4704,6 +4758,25 @@
    Bsd::clock_init();
    initial_time_count = os::elapsed_counter();
  
@@ -1115,7 +1115,7 @@
  #ifdef __APPLE__
    // XXXDARWIN
    // Work around the unaligned VM callbacks in hotspot's
-@@ -5638,21 +5711,36 @@
+@@ -5622,21 +5695,36 @@
  
  static struct timespec* compute_abstime(struct timespec* abstime, jlong millis) {
    if (millis < 0)  millis = 0;
@@ -1162,7 +1162,7 @@
    return abstime;
  }
  
-@@ -5744,7 +5832,7 @@
+@@ -5728,7 +5816,7 @@
      status = os::Bsd::safe_cond_timedwait(_cond, _mutex, &abst);
      if (status != 0 && WorkAroundNPTLTimedWaitHang) {
        pthread_cond_destroy (_cond);
@@ -1171,7 +1171,7 @@
      }
      assert_status(status == 0 || status == EINTR ||
                    status == ETIMEDOUT,
-@@ -5845,32 +5933,50 @@
+@@ -5829,32 +5917,50 @@
  
  static void unpackTime(struct timespec* absTime, bool isAbsolute, jlong time) {
    assert (time > 0, "convertTime");
@@ -1242,7 +1242,7 @@
        if (absTime->tv_nsec >= NANOSECS_PER_SEC) {
          absTime->tv_nsec -= NANOSECS_PER_SEC;
          ++absTime->tv_sec; // note: this must be <= max_secs
-@@ -5950,15 +6056,19 @@
+@@ -5934,15 +6040,19 @@
    jt->set_suspend_equivalent();
    // cleared by handle_special_suspend_equivalent_condition() or java_suspend_self()
  
@@ -1266,7 +1266,7 @@
    assert_status(status == 0 || status == EINTR ||
                  status == ETIMEDOUT,
                  status, "cond_timedwait");
-@@ -5987,17 +6097,26 @@
+@@ -5971,17 +6081,26 @@
    s = _counter;
    _counter = 1;
    if (s < 1) {
@@ -1302,26 +1302,9 @@
    } else {
      pthread_mutex_unlock(_mutex);
      assert (status == 0, "invariant") ;
---- ./hotspot/src/os/bsd/vm/os_bsd.hpp	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp	Sun May 21 11:12:48 2017 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -27,6 +27,9 @@
- 
- // Bsd_OS defines the interface to Bsd operating systems
- 
-+// Information about the protection of the page at address '0' on this os.
-+static bool zero_page_read_protected() { return true; }
-+
- /* pthread_getattr_np comes with BsdThreads-0.9-7 on RedHat 7.1 */
- typedef int (*pthread_getattr_func_type) (pthread_t, pthread_attr_t *);
- 
-@@ -103,6 +106,12 @@
+--- ./hotspot/src/os/bsd/vm/os_bsd.hpp	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp	Sun May 28 21:31:42 2017 -0700
+@@ -106,6 +106,12 @@
  
    static bool hugetlbfs_sanity_check(bool warn, size_t page_size);
  
@@ -1334,7 +1317,7 @@
   public:
  
    static void init_thread_fpu_state();
-@@ -222,6 +231,13 @@
+@@ -225,6 +231,13 @@
    static jlong fast_thread_cpu_time(clockid_t clockid);
  #endif
  
@@ -1348,7 +1331,7 @@
    // Stack repair handling
  
    // none present
-@@ -287,7 +303,7 @@
+@@ -290,7 +303,7 @@
    public:
      PlatformEvent() {
        int status;
@@ -1357,7 +1340,7 @@
        assert_status(status == 0, status, "cond_init");
        status = pthread_mutex_init (_mutex, NULL);
        assert_status(status == 0, status, "mutex_init");
-@@ -302,14 +318,19 @@
+@@ -305,14 +318,19 @@
      void park () ;
      void unpark () ;
      int  TryPark () ;
@@ -1379,7 +1362,7 @@
  
    public:       // TODO-FIXME: make dtor private
      ~PlatformParker() { guarantee (0, "invariant") ; }
-@@ -317,10 +338,13 @@
+@@ -320,10 +338,13 @@
    public:
      PlatformParker() {
        int status;
@@ -1395,8 +1378,8 @@
      }
  };
  
---- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp	Sun May 28 21:31:42 2017 -0700
 @@ -31,10 +31,22 @@
  # include "atomic_bsd_x86.inline.hpp"
  # include "orderAccess_bsd_x86.inline.hpp"
@@ -1420,8 +1403,8 @@
  
  // System includes
  
---- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp	Sun May 28 21:31:42 2017 -0700
 @@ -34,11 +34,26 @@
  # include "orderAccess_bsd_x86.inline.hpp"
  # include "prefetch_bsd_x86.inline.hpp"
@@ -1449,8 +1432,8 @@
  
  // Contains inlined functions for class Thread and ThreadLocalStorage
  
---- ./hotspot/src/os/posix/vm/os_posix.cpp	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/os/posix/vm/os_posix.cpp	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/os/posix/vm/os_posix.cpp	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/os/posix/vm/os_posix.cpp	Sun May 28 21:31:42 2017 -0700
 @@ -183,11 +183,19 @@
    if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
    else st->print("%d", rlim.rlim_cur);
@@ -1471,8 +1454,8 @@
  }
  
  void os::Posix::print_uname_info(outputStream* st) {
---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Sun May 28 21:31:42 2017 -0700
 @@ -945,7 +945,7 @@
    if (rslt != 0)
      fatal(err_msg("pthread_stackseg_np failed with err = %d", rslt));
@@ -1482,8 +1465,8 @@
    *size   = ss.ss_size;
  #elif defined(_ALLBSD_SOURCE)
    pthread_attr_t attr;
---- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	Sun May 28 21:31:42 2017 -0700
 @@ -24,7 +24,7 @@
   */
  
@@ -1493,8 +1476,8 @@
  # include <pthread_np.h> /* For pthread_attr_get_np */
  #endif
  
---- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Sun May 28 21:31:42 2017 -0700
 @@ -111,7 +111,7 @@
    if (e.should_commit()) {
      e.set_gcId(_shared_gc_info.id());
@@ -1504,80 +1487,8 @@
      e.commit();
    }
  }
---- ./hotspot/src/share/vm/opto/lcm.cpp	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/share/vm/opto/lcm.cpp	Sun May 21 11:12:48 2017 -0700
-@@ -57,25 +57,40 @@
- // Check whether val is not-null-decoded compressed oop,
- // i.e. will grab into the base of the heap if it represents NULL.
- static bool accesses_heap_base_zone(Node *val) {
--  if (UseCompressedOops && Universe::narrow_oop_base() > 0) {
-+  if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops.
-     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
--          // decode NULL to point to the heap base (Decode_NN).
--          if (val->bottom_type()->is_oopptr()->ptr() == TypePtr::NotNull) {
--            return true;
--          }
-+      if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) {
-+        // This assumes all Decodes with TypePtr::NotNull are matched to nodes that
-+        // decode NULL to point to the heap base (Decode_NN).
-+        if (val->bottom_type()->is_oopptr()->ptr() == TypePtr::NotNull) {
-+          return true;
-         }
--        // Must recognize load operation with Decode matched in memory operand.
--        // We should not reach here, as os::zero_page_read_protected()
--        // returns true everywhere exept for AIX. On AIX, no such memory operands
--        // exist.
--        NOT_AIX(Unimplemented());
-       }
-+      // Must recognize load operation with Decode matched in memory operand.
-+      // We should not reach here exept for PPC/AIX, as os::zero_page_read_protected()
-+      // returns true everywhere else. On PPC, no such memory operands
-+      // exist, therefore we did not yet implement a check for such operands.
-+      NOT_AIX(Unimplemented());
-+    }
-   }
-   return false;
- }
- 
-+static bool needs_explicit_null_check_for_read(Node *val) {
-+  // On some OSes (AIX) the page at address 0 is only write protected.
-+  // If so, only Store operations will trap.
-+  if (os::zero_page_read_protected()) {
-+    return false;  // Implicit null check will work.
-+  }
-+  // Also a read accessing the base of a heap-based compressed heap will trap.
-+  if (accesses_heap_base_zone(val) &&                    // Hits the base zone page.
-+      Universe::narrow_oop_use_implicit_null_checks()) { // Base zone page is protected.
-+    return false;
-+  }
-+
-+  return true;
-+}
-+
- //------------------------------implicit_null_check----------------------------
- // Detect implicit-null-check opportunities.  Basically, find NULL checks
- // with suitable memory ops nearby.  Use the memory op to do the NULL check.
-@@ -233,14 +248,8 @@
-     // On some OSes (AIX) the page at address 0 is only write protected.
-     // If so, only Store operations will trap.
-     // But a read accessing the base of a heap-based compressed heap will trap.
--    if (!was_store && !os::zero_page_read_protected()) {
--      if (!(accesses_heap_base_zone(val) &&                    // Hits the base zone page.
--            Universe::narrow_oop_use_implicit_null_checks())) { // Page is protected.
--        continue;
--      } else {
--        tty->print("Found load accessing heap base on AIX\n");
--        Unimplemented();
--      }
-+    if (!was_store && needs_explicit_null_check_for_read(val)) {
-+      continue;
-     }
- 
-     // check if the offset is not too high for implicit exception
---- ./hotspot/src/share/vm/runtime/atomic.cpp	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/share/vm/runtime/atomic.cpp	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/share/vm/runtime/atomic.cpp	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/share/vm/runtime/atomic.cpp	Sun May 28 21:31:42 2017 -0700
 @@ -57,6 +57,12 @@
  #ifdef TARGET_OS_ARCH_windows_x86
  # include "atomic_windows_x86.inline.hpp"
@@ -1591,8 +1502,8 @@
  #ifdef TARGET_OS_ARCH_linux_arm
  # include "atomic_linux_arm.inline.hpp"
  #endif
---- ./hotspot/src/share/vm/runtime/objectMonitor.cpp	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/share/vm/runtime/objectMonitor.cpp	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp	Sun May 28 21:31:42 2017 -0700
 @@ -1740,7 +1740,7 @@
       }
       iterator->_notified = 1 ;
@@ -1611,9 +1522,9 @@
       if (Policy != 4) {
          iterator->TState = ObjectWaiter::TS_ENTER ;
       }
---- ./hotspot/src/share/vm/runtime/os.cpp	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/share/vm/runtime/os.cpp	Sun May 21 11:12:48 2017 -0700
-@@ -403,13 +403,6 @@
+--- ./hotspot/src/share/vm/runtime/os.cpp	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/share/vm/runtime/os.cpp	Sun May 28 21:31:42 2017 -0700
+@@ -410,13 +410,6 @@
      if (_native_java_library == NULL) {
        vm_exit_during_initialization("Unable to load native library", ebuf);
      }
@@ -1627,8 +1538,8 @@
    }
    static jboolean onLoaded = JNI_FALSE;
    if (onLoaded) {
---- ./hotspot/src/share/vm/runtime/os.hpp	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/share/vm/runtime/os.hpp	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/share/vm/runtime/os.hpp	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/share/vm/runtime/os.hpp	Sun May 28 21:31:42 2017 -0700
 @@ -30,6 +30,9 @@
  #include "runtime/extendedPC.hpp"
  #include "runtime/handles.hpp"
@@ -1639,7 +1550,7 @@
  #ifdef TARGET_OS_FAMILY_linux
  # include "jvm_linux.h"
  # include <setjmp.h>
-@@ -763,8 +766,8 @@
+@@ -775,8 +778,8 @@
  # include "os_posix.hpp"
  #endif
  #ifdef TARGET_OS_FAMILY_bsd
@@ -1649,8 +1560,8 @@
  #endif
  #ifdef TARGET_OS_ARCH_linux_x86
  # include "os_linux_x86.hpp"
---- ./hotspot/src/share/vm/runtime/vmThread.cpp	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/share/vm/runtime/vmThread.cpp	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/share/vm/runtime/vmThread.cpp	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/share/vm/runtime/vmThread.cpp	Sun May 28 21:31:42 2017 -0700
 @@ -396,7 +396,7 @@
        // Only write caller thread information for non-concurrent vm operations.
        // For concurrent vm operations, the thread id is set to 0 indicating thread is unknown.
@@ -1660,8 +1571,8 @@
        event.commit();
      }
  
---- ./hotspot/src/share/vm/trace/tracetypes.xml	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/share/vm/trace/tracetypes.xml	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/share/vm/trace/tracetypes.xml	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/share/vm/trace/tracetypes.xml	Sun May 28 21:31:42 2017 -0700
 @@ -60,7 +60,7 @@
   <types>
    <content_types>
@@ -1682,8 +1593,8 @@
  
      <!-- VM Thread ID Note: changed from U2 to U8 for hotspot -->
      <primary_type symbol="VMTHREAD" datatype="U8" contenttype="VMTHREAD"
---- ./hotspot/test/compiler/5091921/Test7005594.sh	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/test/compiler/5091921/Test7005594.sh	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/test/compiler/5091921/Test7005594.sh	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/test/compiler/5091921/Test7005594.sh	Sun May 28 21:31:42 2017 -0700
 @@ -60,6 +60,9 @@
    # Windows/MKS
    MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
@@ -1694,8 +1605,8 @@
  else
    echo "Unable to determine amount of physical memory on the machine"
  fi
---- ./hotspot/test/runtime/7110720/Test7110720.sh	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/test/runtime/7110720/Test7110720.sh	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/test/runtime/7110720/Test7110720.sh	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/test/runtime/7110720/Test7110720.sh	Sun May 28 21:31:42 2017 -0700
 @@ -28,7 +28,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -1706,7 +1617,7 @@
      RM=/bin/rm
      CP=/bin/cp
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/test/runtime/7158800/Test7158800.sh	Sun May 21 11:12:48 2017 -0700
++++ ./hotspot/test/runtime/7158800/Test7158800.sh	Sun May 28 21:31:42 2017 -0700
 @@ -0,0 +1,91 @@
 +#!/bin/sh
 +# 
@@ -1799,8 +1710,8 @@
 +    echo "Test Passed"
 +    exit 0
 +fi
---- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Sun May 28 21:31:42 2017 -0700
 @@ -36,8 +36,8 @@
      public static void main(String args[]) throws Throwable {
  
@@ -1812,8 +1723,8 @@
              return;
          }
  
---- ./jaxp/.hgtags	Fri Oct 28 03:35:34 2016 +0100
-+++ ./jaxp/.hgtags	Sun May 21 11:12:36 2017 -0700
+--- ./jaxp/.hgtags	Thu Apr 27 06:11:38 2017 +0100
++++ ./jaxp/.hgtags	Sun May 28 21:31:36 2017 -0700
 @@ -123,6 +123,7 @@
  bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
  067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
@@ -1822,13 +1733,13 @@
  104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
  64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
  2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
-@@ -610,3 +611,4 @@
- be2127cf0435d141d8072a94dbe75a527ceda453 jdk7u111-b00
- cd13b280e8247904509c28ee8aa9b45326185dd7 jdk7u111-b01
- b198ece212c1f7ff382d9282624411a260b52a55 jdk7u121-b00
-+51ed13d07beb90ff71d8625d9d6409cc4add5cbc jdk7u131-b00
---- ./jaxws/.hgtags	Fri Oct 28 03:35:35 2016 +0100
-+++ ./jaxws/.hgtags	Sun May 21 11:12:38 2017 -0700
+@@ -613,3 +614,4 @@
+ 51ed13d07beb90ff71d8625d9d6409cc4add5cbc jdk7u131-b00
+ f347b141975453f642ae1140a45aa7c6127551dd jdk7u141-b00
+ e096a279a1c226d7d3a4aa19d5beeba1fb0507cf jdk7u141-b01
++b4b91a7beb185c0a8a14b83d2b05cfd7fc33c6fe jdk7u141-b02
+--- ./jaxws/.hgtags	Thu Apr 27 06:11:39 2017 +0100
++++ ./jaxws/.hgtags	Sun May 28 21:31:37 2017 -0700
 @@ -123,6 +123,7 @@
  05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
  c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01
@@ -1837,13 +1748,13 @@
  4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02
  272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03
  48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04
-@@ -609,3 +610,4 @@
- 8fd4ada6c5d5c3f71cc52cc2af97c971a58c6b53 jdk7u111-b00
- 18074c212a8997055baa9aca9e9ae0dbbe90e1f4 jdk7u111-b01
- 29919af594f46f158604db87edbd538a3890884a jdk7u121-b00
-+edcc7c1e297588b30daaf61e3cdf25203f829cd4 jdk7u131-b00
---- ./jdk/.hgtags	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/.hgtags	Wed May 24 00:32:01 2017 -0700
+@@ -612,3 +613,4 @@
+ edcc7c1e297588b30daaf61e3cdf25203f829cd4 jdk7u131-b00
+ 90c86962aa2e81ecd8d5d79a282f2492447e4c6e jdk7u141-b00
+ 506e24eee4e1887fbfdd77512f830b75e14c5759 jdk7u141-b01
++1af82a2d3d16626b8d2f5e633d23c027975406b8 jdk7u141-b02
+--- ./jdk/.hgtags	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/.hgtags	Sun May 28 23:44:03 2017 -0700
 @@ -123,6 +123,7 @@
  539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
  69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01
@@ -1852,13 +1763,13 @@
  2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02
  a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03
  b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04
-@@ -596,3 +597,4 @@
- a7267e8244b9418af15b1103b4d906e8c6a61bc0 jdk7u111-b00
- cc1ed9a351886645eb729144696e41d187564ec2 jdk7u111-b01
- c16fb4099a2bafe701d533d9a0fd869e7f8e5408 jdk7u121-b00
-+86d0df91308912e45e1b00f8699e0b157a8857af jdk7u131-b00
---- ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk	Wed May 24 00:32:01 2017 -0700
+@@ -599,3 +600,4 @@
+ 86d0df91308912e45e1b00f8699e0b157a8857af jdk7u131-b00
+ e890a6aef6223d428376aac846c1d1f3e40dbda7 jdk7u141-b00
+ a319566e15f5611bae9cfda2696e8217020a9269 jdk7u141-b01
++19a085e656145471455d7fbd648717f94281a729 jdk7u141-b02
+--- ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -29,6 +29,7 @@
  
  ifneq ($(PLATFORM), windows)
@@ -1872,8 +1783,8 @@
  endif
  endif
 +endif
---- ./jdk/make/com/sun/nio/sctp/FILES_c.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/nio/sctp/FILES_c.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/nio/sctp/FILES_c.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/nio/sctp/FILES_c.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -25,9 +25,13 @@
  
  ifneq ($(PLATFORM),windows)
@@ -1888,8 +1799,8 @@
  endif	
 +endif
 +endif
---- ./jdk/make/com/sun/nio/sctp/FILES_java.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/nio/sctp/FILES_java.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/nio/sctp/FILES_java.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/nio/sctp/FILES_java.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -50,6 +50,8 @@
  
  ifneq ($(PLATFORM), windows)
@@ -1905,8 +1816,8 @@
  endif
 +endif
 +endif
---- ./jdk/make/com/sun/nio/sctp/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/nio/sctp/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/nio/sctp/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/nio/sctp/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -47,9 +47,13 @@
  ifeq ($(PLATFORM), macosx)
  include $(BUILDDIR)/common/Classes.gmk
@@ -1929,8 +1840,8 @@
  endif # macosx
  endif # windows
  
---- ./jdk/make/com/sun/security/auth/module/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/security/auth/module/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/security/auth/module/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/security/auth/module/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -67,7 +67,7 @@
    include FILES_c_solaris.gmk
  endif # solaris
@@ -1940,8 +1851,8 @@
    LIBRARY = jaas_unix
    include FILES_export_unix.gmk
    include FILES_c_unix.gmk
---- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -43,7 +43,7 @@
  	sun/tools/attach/LinuxVirtualMachine.java
  endif
@@ -1951,8 +1862,8 @@
  FILES_export = \
  	sun/tools/attach/BsdVirtualMachine.java
  endif
---- ./jdk/make/com/sun/tools/attach/FILES_c.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_c.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -39,7 +39,7 @@
  	LinuxVirtualMachine.c
  endif
@@ -1962,8 +1873,8 @@
  FILES_c = \
  	BsdVirtualMachine.c
  endif
---- ./jdk/make/com/sun/tools/attach/FILES_java.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_java.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -43,7 +43,7 @@
  	sun/tools/attach/LinuxAttachProvider.java
  endif
@@ -1973,8 +1884,8 @@
  FILES_java += \
  	sun/tools/attach/BsdAttachProvider.java
  endif
---- ./jdk/make/com/sun/tools/attach/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/tools/attach/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/tools/attach/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/tools/attach/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -38,7 +38,7 @@
  ifeq ($(PLATFORM), linux)
  FILES_m = mapfile-linux
@@ -1993,8 +1904,8 @@
    vpath %.c $(call NativeSrcDirList,,native/sun/tools/attach)
  else
    vpath %.c $(PLATFORM_SRC)/native/sun/tools/attach
---- ./jdk/make/com/sun/tools/attach/mapfile-bsd	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/tools/attach/mapfile-bsd	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/tools/attach/mapfile-bsd	Sun May 28 23:44:03 2017 -0700
 @@ -30,6 +30,7 @@
  	    Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
  	    Java_sun_tools_attach_BsdVirtualMachine_close;
@@ -2004,7 +1915,7 @@
  	    Java_sun_tools_attach_BsdVirtualMachine_sendQuitTo;
  	    Java_sun_tools_attach_BsdVirtualMachine_socket;
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/common/Defs-bsd.gmk	Wed May 24 00:32:01 2017 -0700
++++ ./jdk/make/common/Defs-bsd.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -0,0 +1,482 @@
 +#
 +# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -2488,8 +2399,8 @@
 +  OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include
 +  OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
 +endif
---- ./jdk/make/common/Defs-linux.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/Defs-linux.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/Defs-linux.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/Defs-linux.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -445,6 +445,7 @@
  override LIBDL                   = -ldl
  override MOOT_PRIORITIES         = true
@@ -2498,8 +2409,8 @@
  ifeq ($(ARCH), $(findstring $(ARCH), amd64 ppc64))
  override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
  else
---- ./jdk/make/common/Defs-solaris.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/Defs-solaris.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/Defs-solaris.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/Defs-solaris.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -753,6 +753,9 @@
  # Network Services library
  LIBNSL = -lnsl
@@ -2510,8 +2421,8 @@
  # service configuration facility library
  LIBSCF = -lscf
  
---- ./jdk/make/common/Defs.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/Defs.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/Defs.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/Defs.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -179,7 +179,7 @@
  
    ifdef ALT_FREETYPE_LIB_PATH
@@ -2563,8 +2474,8 @@
    VPATH0.java = $(subst $(ONESPACE),:,$(GENSRCDIR) $(call JavaSrcDirList,,classes))
  else
    VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
---- ./jdk/make/common/Library.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/Library.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/Library.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/Library.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -299,8 +299,12 @@
              ifeq ($(PLATFORM), solaris)
  	      $(STRIP) -x $@
@@ -2580,8 +2491,8 @@
              endif
            # implied else here is no stripping at all
            endif
---- ./jdk/make/common/Mapfile-vers.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/Mapfile-vers.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/Mapfile-vers.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/Mapfile-vers.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -76,7 +76,7 @@
  
  endif # PLATFORM
@@ -2591,8 +2502,8 @@
  
  ifeq ($(VARIANT), OPT)
    # OPT build MUST have a mapfile?
---- ./jdk/make/common/Program.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/Program.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/Program.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/Program.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -95,6 +95,17 @@
    endif # SYSTEM_ZLIB
  endif # PLATFORM
@@ -2665,8 +2576,8 @@
  
  OTHER_CPPFLAGS  += -DPROGNAME='"$(PROGRAM)"'
  VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
---- ./jdk/make/common/Release.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/Release.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/Release.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/Release.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -180,6 +180,12 @@
    JA_DIRNAME=ja_JP.UTF-8
  endif # linux
@@ -2711,8 +2622,8 @@
  	       | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
  	  fi; \
  	done
---- ./jdk/make/common/Rules.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/Rules.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/Rules.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/Rules.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -51,7 +51,7 @@
  #
  # All source tree areas for java/properties files (a few may be closed)
@@ -2731,8 +2642,8 @@
  # TODO(cpc): need to document why this is necessary...
  $(CLASSDESTDIR)/%.class: $(JDK_TOPDIR)/src/macosx/classes/%.java
  	@$(add-java-file)
---- ./jdk/make/common/shared/Compiler-gcc.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/shared/Compiler-gcc.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/shared/Compiler-gcc.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/shared/Compiler-gcc.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -72,6 +72,21 @@
  
  endif
@@ -2756,7 +2667,7 @@
  
    # Settings specific to Solaris
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/common/shared/Defs-bsd.gmk	Wed May 24 00:32:01 2017 -0700
++++ ./jdk/make/common/shared/Defs-bsd.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -0,0 +1,267 @@
 +#
 +# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -3025,8 +2936,8 @@
 +endef
 +endif
 +
---- ./jdk/make/common/shared/Defs-utils.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/shared/Defs-utils.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/shared/Defs-utils.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/shared/Defs-utils.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -74,6 +74,13 @@
    UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
  endif
@@ -3077,8 +2988,8 @@
 +    UNZIP      = $(UTILS_DEVTOOL_PATH)unzip
 +  endif
 +endif
---- ./jdk/make/common/shared/Defs-versions.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/shared/Defs-versions.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/shared/Defs-versions.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/shared/Defs-versions.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -44,6 +44,11 @@
    override CC_VERSION = gcc
  endif
@@ -3105,8 +3016,8 @@
  # Mac specific
  ifeq ($(PLATFORM), macosx)
    REQUIRED_OS_NAME            = Darwin
---- ./jdk/make/common/shared/Defs.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/shared/Defs.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/shared/Defs.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/shared/Defs.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -181,7 +181,7 @@
  # platform and shared sources/headers.  This is mainly useful for the
  # Mac OS X build, which pulls its platform sources from the solaris and/or
@@ -3116,8 +3027,8 @@
    define JavaSrcDirList
    $(JAVA_SRCDIR_LIST:%=$1$(JDK_TOPDIR)/%/$2)
    endef
---- ./jdk/make/common/shared/Platform.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/shared/Platform.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/shared/Platform.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/shared/Platform.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -315,6 +315,85 @@
    # How much RAM does this machine have:
  endif
@@ -3204,8 +3115,8 @@
  # Windows with and without CYGWIN will be slightly different
  ifeq ($(SYSTEM_UNAME), Windows_NT)
    PLATFORM = windows
---- ./jdk/make/java/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/java/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/java/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/java/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -53,7 +53,7 @@
    endif
  endif # PLATFORM
@@ -3215,8 +3126,8 @@
    SUBDIRS += jexec
  endif # PLATFORM
  
---- ./jdk/make/java/instrument/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/java/instrument/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/java/instrument/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/java/instrument/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -104,12 +104,24 @@
    # equivalent of strcasecmp is stricmp on Windows
    CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
@@ -3247,8 +3158,8 @@
    ifeq ($(SYSTEM_ZLIB), true)
      OTHER_LDLIBS += -lz
    endif
---- ./jdk/make/java/java/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/java/java/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/java/java/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/java/java/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -177,9 +177,11 @@
  #
  ifneq ($(PLATFORM), windows)
@@ -3271,8 +3182,8 @@
  
  ARCHFLAG = 
  ifeq ($(ARCH_DATA_MODEL), 64)
---- ./jdk/make/java/java/genlocales.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/java/java/genlocales.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/java/java/genlocales.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/java/java/genlocales.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -93,17 +93,65 @@
  
  else
@@ -3343,8 +3254,8 @@
  endif
  	
  genlocales : $(LocaleDataMetaInfo_Dest)  
---- ./jdk/make/java/jli/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/java/jli/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/java/jli/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/java/jli/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -119,9 +119,9 @@
    LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"'
  endif # PLATFORM
@@ -3388,8 +3299,8 @@
  vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)
  ifneq ($(SYSTEM_ZLIB),true)
    vpath %.c $(ZIP_SRC)
---- ./jdk/make/java/net/FILES_c.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/java/net/FILES_c.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/java/net/FILES_c.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/java/net/FILES_c.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -54,6 +54,10 @@
      FILES_c += bsd_close.c
  endif
@@ -3401,8 +3312,8 @@
  ifeq ($(PLATFORM), windows)
      FILES_c += TwoStacksPlainSocketImpl.c
      FILES_c += DualStackPlainSocketImpl.c
---- ./jdk/make/java/net/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/java/net/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/java/net/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/java/net/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -95,7 +95,7 @@
  
  include $(BUILDDIR)/common/Library.gmk
@@ -3412,8 +3323,8 @@
  ifdef DONT_ENABLE_IPV6
    OTHER_CFLAGS += -DDONT_ENABLE_IPV6
  endif
---- ./jdk/make/java/nio/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/java/nio/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/java/nio/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/java/nio/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -263,13 +263,89 @@
  	sun/nio/fs/UnixConstants.java
  endif # PLATFORM = linux
@@ -3565,8 +3476,8 @@
  FILES_m = mapfile-bsd
  endif
  include $(BUILDDIR)/common/Mapfile-vers.gmk
---- ./jdk/make/java/nio/mapfile-bsd	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/java/nio/mapfile-bsd	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/java/nio/mapfile-bsd	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/java/nio/mapfile-bsd	Sun May 28 23:44:03 2017 -0700
 @@ -70,6 +70,7 @@
                  Java_sun_nio_ch_IOUtil_drain;
                  Java_sun_nio_ch_IOUtil_fdVal;
@@ -3587,8 +3498,8 @@
  		Java_sun_nio_ch_KQueuePort_socketpair;
  		Java_sun_nio_ch_KQueuePort_interrupt;
  		Java_sun_nio_ch_KQueuePort_drain1;
---- ./jdk/make/java/npt/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/java/npt/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/java/npt/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/java/npt/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -74,6 +74,14 @@
    OTHER_LDLIBS += -liconv
  endif
@@ -3604,8 +3515,8 @@
  #
  # Add to ambient vpath so we pick up the library files
  #
---- ./jdk/make/java/redist/fonts/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/java/redist/fonts/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/java/redist/fonts/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/java/redist/fonts/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -42,7 +42,7 @@
  	$(LIBDIR)/fonts/LucidaSansRegular.ttf       	\
  	$(LIBDIR)/fonts/LucidaSansDemiBold.ttf       	\
@@ -3633,8 +3544,8 @@
  
  all build : $(INTERNAL_IMPORT_LIST)
  
---- ./jdk/make/javax/sound/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/javax/sound/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/javax/sound/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/javax/sound/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -111,6 +111,21 @@
    #MXSPP_ADD = $(PLATFORM)-$(ARCH)/
  endif # PLATFORM linux
@@ -3657,8 +3568,8 @@
  ifeq ($(PLATFORM), macosx)
    CPPFLAGS += -DUSE_PORTS=TRUE \
                -DUSE_DAUDIO=TRUE \
---- ./jdk/make/javax/sound/SoundDefs.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/javax/sound/SoundDefs.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/javax/sound/SoundDefs.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/javax/sound/SoundDefs.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -40,6 +40,10 @@
    CPPFLAGS += -DX_PLATFORM=X_LINUX
  endif # PLATFORM linux
@@ -3670,8 +3581,8 @@
  ifeq ($(PLATFORM), macosx)
    CPPFLAGS += -DX_PLATFORM=X_MACOSX
  endif # PLATFORM macosx
---- ./jdk/make/javax/sound/jsoundalsa/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/javax/sound/jsoundalsa/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/javax/sound/jsoundalsa/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/javax/sound/jsoundalsa/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -51,6 +51,7 @@
  	$(PORTFILES_c)
  
@@ -3722,8 +3633,8 @@
  
  #
  # Add to the ambient VPATH.
---- ./jdk/make/jpda/transport/socket/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/jpda/transport/socket/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/jpda/transport/socket/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/jpda/transport/socket/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -38,6 +38,11 @@
  
  include $(BUILDDIR)/common/Defs.gmk
@@ -3736,8 +3647,8 @@
  ifeq ($(PLATFORM), linux)
    OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
  endif
---- ./jdk/make/sun/awt/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/sun/awt/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/sun/awt/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/sun/awt/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -127,6 +127,13 @@
  OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL)
  endif
@@ -3813,8 +3724,8 @@
  LDFLAGS += -L$(OPENWIN_LIB)
  endif
  
---- ./jdk/make/sun/awt/mawt.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/sun/awt/mawt.gmk	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/sun/awt/mawt.gmk	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/sun/awt/mawt.gmk	Sun May 28 23:44:03 2017 -0700
 @@ -169,7 +169,7 @@
  OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
  endif
@@ -3871,8 +3782,8 @@
  ifeq ($(PLATFORM), macosx)
    CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
                -I$(OPENWIN_HOME)/include 
---- ./jdk/make/sun/font/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/sun/font/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/sun/font/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/sun/font/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -97,7 +97,7 @@
  # Turn off aliasing with GCC for ExtensionSubtables.cpp (and others on GCC < 4.3)
  # Turn off strict overflow with GCC for IndicRearrangementProcessor.cpp on GCC >= 4.3
@@ -3891,8 +3802,8 @@
  OTHER_INCLUDES += -I$(X11_PATH)/include
  OTHER_LDLIBS  += -lawt $(LIBM) $(LIBCXX)
   ifeq ($(OS_VENDOR),Apple)
---- ./jdk/make/sun/jawt/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/sun/jawt/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/sun/jawt/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/sun/jawt/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -99,8 +99,7 @@
  #
  # Other extra flags needed for compiling.
@@ -3920,18 +3831,8 @@
    ifndef BUILD_HEADLESS_ONLY
      OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
    else
---- ./jdk/make/sun/lwawt/FILES_export_macosx.gmk	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/sun/lwawt/FILES_export_macosx.gmk	Wed May 24 00:32:01 2017 -0700
-@@ -122,7 +122,6 @@
-         sun/lwawt/macosx/CTextPipe.java \
-         sun/lwawt/macosx/CDesktopPeer.java \
-         sun/java2d/CRenderer.java \
--        sun/lwawt/macosx/EventDispatchAccess.java \
-         sun/lwawt/macosx/NSPrintInfo.java \
-         sun/lwawt/macosx/CAccessibility.java \
-         sun/lwawt/macosx/CAccessible.java \
---- ./jdk/make/sun/rmi/rmi/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/sun/rmi/rmi/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/sun/rmi/rmi/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/sun/rmi/rmi/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -70,6 +70,9 @@
      BUILD_TARGETS += bin
    endif
@@ -3942,8 +3843,8 @@
  
  build: $(BUILD_TARGETS)
  
---- ./jdk/make/sun/splashscreen/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/sun/splashscreen/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/sun/splashscreen/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/sun/splashscreen/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -61,6 +61,12 @@
  
  CFLAGS += -DSPLASHSCREEN
@@ -4002,8 +3903,8 @@
    OTHER_CFLAGS += $(ZLIB_CFLAGS)
    OTHER_LDLIBS += $(ZLIB_LIBS)
  endif
---- ./jdk/make/sun/xawt/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/sun/xawt/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/sun/xawt/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/sun/xawt/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -52,6 +52,9 @@
  AUTO_JAVA_PRUNE = WrapperGenerator.java
  
@@ -4056,8 +3957,8 @@
  ifeq ($(PLATFORM), macosx)
    CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
  endif
---- ./jdk/make/tools/freetypecheck/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/tools/freetypecheck/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/tools/freetypecheck/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/tools/freetypecheck/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -52,8 +52,15 @@
    else 
      ifeq ($(PLATFORM), macosx)
@@ -4077,7 +3978,7 @@
    endif
  endif
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/tools/sharing/classlist.bsd	Wed May 24 00:32:01 2017 -0700
++++ ./jdk/make/tools/sharing/classlist.bsd	Sun May 28 23:44:03 2017 -0700
 @@ -0,0 +1,2327 @@
 +java/lang/Object
 +java/lang/String
@@ -6406,8 +6307,8 @@
 +sun/applet/AppletPanel$6
 +javax/swing/BufferStrategyPaintManager$1
 +# f3ac8b467e7f8c49
---- ./jdk/src/bsd/doc/man/appletviewer.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/appletviewer.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/appletviewer.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/appletviewer.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -6460,8 +6361,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/apt.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/apt.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/apt.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/apt.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -6614,8 +6515,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/extcheck.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/extcheck.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/extcheck.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/extcheck.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -6647,8 +6548,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/idlj.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/idlj.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/idlj.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/idlj.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,13 +19,13 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -6971,8 +6872,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/ja/appletviewer.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/appletviewer.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/appletviewer.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/appletviewer.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,51 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -7026,8 +6927,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/apt.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/apt.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/apt.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/apt.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,9 +19,135 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -7166,8 +7067,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/extcheck.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/extcheck.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/extcheck.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/extcheck.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,55 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -7225,8 +7126,8 @@
 +jar(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/idlj.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/idlj.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/idlj.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/idlj.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,720 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -7949,8 +7850,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jar.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jar.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jar.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/jar.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,583 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -8536,8 +8437,8 @@
 +pack200(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jarsigner.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jarsigner.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jarsigner.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/jarsigner.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,1655 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -10195,8 +10096,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/java.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/java.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/java.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/java.1	Sun May 28 23:44:03 2017 -0700
 @@ -1,4 +1,4 @@
 -." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
 +." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -10837,8 +10738,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/javac.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/javac.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/javac.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/javac.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,1222 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -12063,8 +11964,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/javadoc.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/javadoc.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/javadoc.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/javadoc.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,4 +19,4179 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -16246,8 +16147,8 @@
 +http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles(tools.jar) 
 +.RE
 + 
---- ./jdk/src/bsd/doc/man/ja/javah.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/javah.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/javah.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/javah.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,120 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -16370,8 +16271,8 @@
 +javac(1)¡¢java(1)¡¢jdb(1)¡¢javap(1)¡¢javadoc(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/javap.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/javap.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/javap.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/javap.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,299 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -16673,8 +16574,8 @@
 +javac(1)¡¢java(1)¡¢jdb(1)¡¢javah(1)¡¢javadoc(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/javaws.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/javaws.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/javaws.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/javaws.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,204 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -16882,7 +16783,7 @@
 +.LP
 + 
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/doc/man/ja/jcmd.1	Wed May 24 00:32:01 2017 -0700
++++ ./jdk/src/bsd/doc/man/ja/jcmd.1	Sun May 28 23:44:03 2017 -0700
 @@ -0,0 +1,118 @@
 +." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
 +." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -17002,8 +16903,8 @@
 +jps(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jconsole.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jconsole.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jconsole.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/jconsole.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,138 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -17144,8 +17045,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jdb.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jdb.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jdb.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/jdb.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,312 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -17460,8 +17361,8 @@
 +javac(1)¡¢java(1)¡¢javah(1)¡¢javap(1)¡¢javadoc(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jhat.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jhat.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jhat.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/jhat.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,135 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -17599,8 +17500,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jinfo.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jinfo.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jinfo.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/jinfo.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,148 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -17751,8 +17652,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jmap.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jmap.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jmap.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/jmap.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,161 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -17916,8 +17817,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jps.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jps.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jps.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/jps.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,260 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -18180,8 +18081,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jrunscript.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jrunscript.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jrunscript.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/jrunscript.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,194 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -18378,8 +18279,8 @@
 +http://docs.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jsadebugd.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jsadebugd.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jsadebugd.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/jsadebugd.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,107 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -18489,8 +18390,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jstack.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jstack.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jstack.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/jstack.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,154 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -18647,8 +18548,8 @@
 +º®¹ç¥â¡¼¥É¤Î¥¹¥¿¥Ã¥¯¡¦¥È¥ì¡¼¥¹(\-m¥ª¥×¥·¥ç¥ó»ÈÍÑ)¤Ï¡¢¥ê¥â¡¼¥È¡¦¥Ç¥Ð¥Ã¥°¡¦¥µ¡¼¥Ð¡¼¤Ç¤Ïµ¡Ç½¤·¤Þ¤»¤ó¡£
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jstat.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jstat.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jstat.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/jstat.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,5370 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -24021,8 +23922,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/jstatd.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/jstatd.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/jstatd.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/jstatd.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,267 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -24292,8 +24193,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/keytool.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/keytool.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/keytool.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/keytool.1	Sun May 28 23:44:03 2017 -0700
 @@ -1,4 +1,4 @@
 -." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
 +." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
@@ -26129,8 +26030,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/native2ascii.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/native2ascii.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/native2ascii.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/native2ascii.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,54 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -26187,8 +26088,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/orbd.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/orbd.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/orbd.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/orbd.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,350 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -26541,8 +26442,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/pack200.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/pack200.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/pack200.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/pack200.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,344 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -26889,8 +26790,8 @@
 +JDK¤ËÉÕ°¤¹¤ëJava SE API»ÅÍͤȤÎÁê°ã¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢»ÅÍͤòÍ¥À褷¤Æ¤¯¤À¤µ¤¤¡£
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/policytool.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/policytool.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/policytool.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/policytool.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,102 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -26995,8 +26896,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/rmic.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/rmic.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/rmic.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/rmic.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,209 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27208,8 +27109,8 @@
 +http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/rmid.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/rmid.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/rmid.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/rmid.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,310 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27522,8 +27423,8 @@
 +http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath¡¢java(1)
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/rmiregistry.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/rmiregistry.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/rmiregistry.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/rmiregistry.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,65 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27591,8 +27492,8 @@
 +\f2java.rmi.Naming\fP @
 +.fi
 +http://docs.oracle.com/javase/7/docs/api/java/rmi/Naming.html  
---- ./jdk/src/bsd/doc/man/ja/schemagen.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/schemagen.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/schemagen.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/schemagen.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,109 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27704,8 +27605,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/serialver.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/serialver.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/serialver.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/serialver.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,79 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27787,8 +27688,8 @@
 +http://docs.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/servertool.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/servertool.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/servertool.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/servertool.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,95 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -27886,8 +27787,8 @@
 +.SH "´ØÏ¢¹àÌÜ"
 +.LP
 +orbd(1)  
---- ./jdk/src/bsd/doc/man/ja/tnameserv.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/tnameserv.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/tnameserv.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/tnameserv.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,476 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -28366,8 +28267,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/unpack200.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/unpack200.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/unpack200.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/unpack200.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,6 +19,160 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -28530,8 +28431,8 @@
 +JDK¤ËÉÕ°¤¹¤ëJava SE API»ÅÍͤȤÎÁê°ã¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢»ÅÍͤòÍ¥À褷¤Æ¤¯¤À¤µ¤¤¡£
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/ja/wsgen.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/wsgen.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/wsgen.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/wsgen.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,4 +19,638 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -29172,8 +29073,8 @@
 +SOAP 1.2 WSDL¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
 +.LP
 +¥µ¡¼¥Ó¥¹¤ò¥Ç¥×¥í¥¤¤¹¤ë¤È¤­¤ËJAXWS¥é¥ó¥¿¥¤¥à¤Ë¤è¤Ã¤Æ¼«Æ°Åª¤ËWSDL¤¬À¸À®¤µ¤ì¤ë¤¿¤á¡¢³«È¯»þ¤ËWSDL¤òÀ¸À®¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£ 
---- ./jdk/src/bsd/doc/man/ja/wsimport.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/wsimport.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/wsimport.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/wsimport.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,4 +19,1048 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -30224,8 +30125,8 @@
 +Java¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤òÀ¸À®¤·¡¢\f2http://stockquote.example.com/quote?wsdl\fP¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Æ¤½¤ÎJava¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹
 +.br
 + 
---- ./jdk/src/bsd/doc/man/ja/xjc.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/ja/xjc.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/ja/xjc.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/ja/xjc.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,279 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -30508,8 +30409,8 @@
 +
 +.LP
 + 
---- ./jdk/src/bsd/doc/man/jar.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/jar.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/jar.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/jar.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,31 +19,31 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -30958,8 +30859,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/javac.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/javac.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/javac.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/javac.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -31841,8 +31742,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/javadoc.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/javadoc.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/javadoc.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/javadoc.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35157,8 +35058,8 @@
  .RE
 -
 + 
---- ./jdk/src/bsd/doc/man/javah.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/javah.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/javah.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/javah.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35269,8 +35170,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/javap.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/javap.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/javap.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/javap.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35502,8 +35403,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/javaws.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/javaws.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/javaws.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/javaws.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35538,8 +35439,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jconsole.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/jconsole.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/jconsole.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/jconsole.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35657,8 +35558,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jdb.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/jdb.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/jdb.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/jdb.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -35992,8 +35893,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jhat.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/jhat.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/jhat.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/jhat.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36128,8 +36029,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jinfo.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/jinfo.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/jinfo.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/jinfo.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36265,8 +36166,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jmap.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/jmap.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/jmap.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/jmap.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36402,8 +36303,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jps.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/jps.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/jps.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/jps.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36519,8 +36420,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jrunscript.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/jrunscript.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/jrunscript.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/jrunscript.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36667,8 +36568,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jsadebugd.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/jsadebugd.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/jsadebugd.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/jsadebugd.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36747,8 +36648,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jstack.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/jstack.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/jstack.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/jstack.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -36858,8 +36759,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jstat.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/jstat.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/jstat.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/jstat.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -38469,8 +38370,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/jstatd.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/jstatd.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/jstatd.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/jstatd.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -38593,8 +38494,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/keytool.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/keytool.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/keytool.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/keytool.1	Sun May 28 23:44:03 2017 -0700
 @@ -1,4 +1,4 @@
 -." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
 +." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
@@ -39842,8 +39743,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/native2ascii.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/native2ascii.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/native2ascii.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/native2ascii.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -39884,8 +39785,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/orbd.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/orbd.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/orbd.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/orbd.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40119,8 +40020,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/pack200.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/pack200.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/pack200.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/pack200.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40285,8 +40186,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/policytool.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/policytool.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/policytool.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/policytool.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,71 +19,86 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40404,8 +40305,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/rmic.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/rmic.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/rmic.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/rmic.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40614,8 +40515,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/rmid.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/rmid.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/rmid.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/rmid.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40895,8 +40796,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/rmiregistry.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/rmiregistry.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/rmiregistry.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/rmiregistry.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,14 +19,14 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -40939,8 +40840,8 @@
  .fi
 -http://download.oracle.com/javase/7/docs/api/java/rmi/Naming.html
 +http://docs.oracle.com/javase/7/docs/api/java/rmi/Naming.html  
---- ./jdk/src/bsd/doc/man/schemagen.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/schemagen.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/schemagen.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/schemagen.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -41007,8 +40908,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/serialver.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/serialver.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/serialver.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/serialver.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -41068,8 +40969,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/servertool.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/servertool.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/servertool.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/servertool.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,13 +19,13 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -41177,8 +41078,8 @@
  .LP
 -orbd(1)
 +orbd(1)  
---- ./jdk/src/bsd/doc/man/tnameserv.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/tnameserv.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/tnameserv.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/tnameserv.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,18 +19,18 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -41449,8 +41350,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/unpack200.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/unpack200.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/unpack200.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/unpack200.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -41517,8 +41418,8 @@
  .LP
 -
 + 
---- ./jdk/src/bsd/doc/man/wsgen.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/wsgen.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/wsgen.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/wsgen.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -41734,8 +41635,8 @@
  .LP
 -Note that you do not have to generate WSDL at the development time as JAXWS runtime will automatically generate a WSDL for you when you deploy your service.
 +Note that you do not have to generate WSDL at the development time as JAXWS runtime will automatically generate a WSDL for you when you deploy your service. 
---- ./jdk/src/bsd/doc/man/wsimport.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/wsimport.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/wsimport.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/wsimport.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -42032,8 +41933,8 @@
  .br
 -
 + 
---- ./jdk/src/bsd/doc/man/xjc.1	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/bsd/doc/man/xjc.1	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/bsd/doc/man/xjc.1	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/bsd/doc/man/xjc.1	Sun May 28 23:44:03 2017 -0700
 @@ -19,7 +19,7 @@
  ." or visit www.oracle.com if you need additional information or have any
  ." questions.
@@ -42302,8 +42203,8 @@
  .LP
 -
 + 
---- ./jdk/src/share/classes/java/util/TimeZone.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/classes/java/util/TimeZone.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/classes/java/util/TimeZone.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/classes/java/util/TimeZone.java	Sun May 28 23:44:03 2017 -0700
 @@ -917,15 +917,13 @@
          }
          int gmtOffset =  (hours * 60 + num) * 60 * 1000;
@@ -42321,8 +42222,8 @@
          }
          return zi;
      }
---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java	Sun May 28 23:44:03 2017 -0700
 @@ -1146,7 +1146,7 @@
       */
      HashMap<String, Boolean> existsMap;
@@ -42332,8 +42233,8 @@
              return false;
          } else if (existsMap == null) {
             existsMap = new HashMap<String, Boolean>();
---- ./jdk/src/share/classes/sun/awt/OSInfo.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/classes/sun/awt/OSInfo.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/classes/sun/awt/OSInfo.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/classes/sun/awt/OSInfo.java	Sun May 28 23:44:03 2017 -0700
 @@ -39,6 +39,7 @@
          WINDOWS,
          LINUX,
@@ -42353,8 +42254,8 @@
              if (osName.contains("OS X")) {
                  return MACOSX;
              }
---- ./jdk/src/share/classes/sun/font/FontUtilities.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/classes/sun/font/FontUtilities.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/classes/sun/font/FontUtilities.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/classes/sun/font/FontUtilities.java	Sun May 28 23:44:03 2017 -0700
 @@ -48,6 +48,8 @@
  
      public static boolean isLinux;
@@ -42376,8 +42277,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 Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/classes/sun/font/SunFontManager.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/classes/sun/font/SunFontManager.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/classes/sun/font/SunFontManager.java	Sun May 28 23:44:03 2017 -0700
 @@ -418,7 +418,7 @@
                           * registerFonts method as on-screen these JRE fonts
                           * always go through the T2K rasteriser.
@@ -42387,8 +42288,8 @@
                              /* Linux font configuration uses these fonts */
                              registerFontDir(jreFontDirName);
                          }
---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java	Sun May 28 23:44:03 2017 -0700
 @@ -1568,7 +1568,7 @@
          }
  
@@ -42398,8 +42299,8 @@
              execCmd = new String[ncomps];
              execCmd[n++] = "/usr/bin/lpr";
              if ((pFlags & PRINTER) != 0) {
---- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java	Sun May 28 23:44:03 2017 -0700
 @@ -84,7 +84,8 @@
                              String osname = System.getProperty("os.name");
                              if (osname.startsWith("SunOS")) {
@@ -42410,8 +42311,8 @@
                                  gssLibs = new String[]{
                                      "libgssapi.so",
                                      "libgssapi_krb5.so",
---- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	Sun May 28 23:44:03 2017 -0700
 @@ -30,5 +30,6 @@
  #[solaris]sun.tools.attach.SolarisAttachProvider
  #[windows]sun.tools.attach.WindowsAttachProvider
@@ -42419,8 +42320,8 @@
 +#[bsd]sun.tools.attach.BsdAttachProvider
  #[macosx]sun.tools.attach.BsdAttachProvider
  #[aix]sun.tools.attach.AixAttachProvider
---- ./jdk/src/share/classes/sun/tools/jar/Main.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/classes/sun/tools/jar/Main.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/classes/sun/tools/jar/Main.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/classes/sun/tools/jar/Main.java	Sun May 28 23:44:03 2017 -0700
 @@ -51,6 +51,7 @@
      String zname = "";
      String[] files;
@@ -42480,8 +42381,8 @@
                  if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
                      throw new IOException(formatMsg(
                          "error.create.dir", d.getPath()));
---- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties	Sun May 28 23:44:03 2017 -0700
 @@ -44,6 +44,8 @@
          {0} : could not create directory
  error.incorrect.length=\
@@ -42491,8 +42392,8 @@
  out.added.manifest=\
          added manifest
  out.update.manifest=\
---- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt	Sun May 28 23:44:03 2017 -0700
 @@ -38,6 +38,7 @@
  #       gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparcv9]
  #       gnumake JDK=<java_home> OSNAME=linux   [OPT=true]
@@ -42531,8 +42432,8 @@
  # Common -I options
  CFLAGS += -I.
  CFLAGS += -I../agent_util
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	Sun May 28 23:44:03 2017 -0700
 @@ -33,6 +33,10 @@
  
  #include <stdlib.h>
@@ -42553,8 +42454,8 @@
  #define SWAP_BYTES(a) \
      ((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00)
  #else
---- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Sun May 28 23:44:03 2017 -0700
 @@ -64,7 +64,7 @@
  
  
@@ -42564,8 +42465,8 @@
  #include <sys/types.h>
  #endif
  
---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	Sun May 28 23:44:03 2017 -0700
 @@ -24,6 +24,9 @@
   * questions.
   */
@@ -42589,8 +42490,8 @@
  #ifdef __NEWVALID       /* special setup for Sun test regime */
  #if defined(i386) || defined(i486) || \
      defined(intel) || defined(x86) || defined(arm) || \
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	Sun May 28 23:44:03 2017 -0700
 @@ -86,7 +86,7 @@
  #endif /* MLIB_USE_FTOI_CLAMPING */
  
@@ -42630,8 +42531,8 @@
  
  #endif /* _NO_LONGLONG */
  
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	Sun May 28 23:44:03 2017 -0700
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42671,8 +42572,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	Sun May 28 23:44:03 2017 -0700
 @@ -94,7 +94,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42712,8 +42613,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	Sun May 28 23:44:03 2017 -0700
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42753,8 +42654,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	Sun May 28 23:44:03 2017 -0700
 @@ -95,7 +95,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42794,8 +42695,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	Sun May 28 23:44:03 2017 -0700
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42835,8 +42736,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	Sun May 28 23:44:03 2017 -0700
 @@ -94,7 +94,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -42876,8 +42777,8 @@
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	Sun May 28 23:44:03 2017 -0700
 @@ -95,7 +95,7 @@
      dst = dp[0];
      if (ld_offset + size < 32) {
@@ -43097,8 +42998,8 @@
    }
  
  #else  /* _LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	Sun May 28 23:44:03 2017 -0700
 @@ -168,7 +168,7 @@
  }
  
@@ -43379,8 +43280,8 @@
        dp[12] = t0;
        dp[13] = t1;
        dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	Sun May 28 23:44:03 2017 -0700
 @@ -88,7 +88,7 @@
  } d64_2_f32;
  
@@ -43532,8 +43433,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 Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	Sun May 28 23:44:03 2017 -0700
 @@ -30,7 +30,7 @@
  typedef union {
    mlib_d64 db;
@@ -43543,8 +43444,8 @@
      mlib_s32 int1, int0;
  #else
      mlib_s32 int0, int1;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	Sun May 28 23:44:03 2017 -0700
 @@ -275,11 +275,11 @@
        for (i = 0; j <= (b_size - 4); j += 4, i++) {
          src0 = src1;
@@ -43643,8 +43544,8 @@
          s0 = s1;
          dp += SIZE;
          sp += SIZE;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	Sun May 28 23:44:03 2017 -0700
 @@ -120,7 +120,7 @@
    }                                                               \
  }
@@ -44877,8 +44778,8 @@
        dp[12] = t0;
        dp[13] = t1;
        dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	Sun May 28 23:44:03 2017 -0700
 @@ -27,9 +27,21 @@
  #ifndef MLIB_IMAGE_H
  #define MLIB_IMAGE_H
@@ -44902,8 +44803,8 @@
  #include <mlib_types.h>
  #include <mlib_status.h>
  #include <mlib_sys.h>
---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	Sun May 28 23:44:03 2017 -0700
 @@ -26,7 +26,7 @@
  
  #include <stdlib.h>
@@ -44925,8 +44826,8 @@
    return valloc(size);
  #else
    return (void *) memalign(8, size);
---- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h	Sun May 28 23:44:03 2017 -0700
 @@ -59,7 +59,7 @@
  
  #if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__) || defined(AIX)
@@ -44936,8 +44837,8 @@
  #include <stddef.h>                     /* for ptrdiff_t */
  #include <stdint.h>                     /* for uintptr_t */
  #elif defined(__linux__)
---- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h	Sun May 28 23:44:03 2017 -0700
 @@ -26,7 +26,7 @@
  #ifndef OGLFuncs_h_Included
  #define OGLFuncs_h_Included
@@ -44947,8 +44848,8 @@
  #include <dlfcn.h>
  #endif
  #include "jni.h"
---- ./jdk/src/solaris/back/util_md.h	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/back/util_md.h	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/back/util_md.h	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/back/util_md.h	Sun May 28 23:44:03 2017 -0700
 @@ -51,7 +51,7 @@
  
  /* On little endian machines, convert java big endian numbers. */
@@ -44958,8 +44859,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.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/bin/ergo.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/bin/ergo.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/bin/ergo.c	Sun May 28 23:44:03 2017 -0700
 @@ -100,6 +100,27 @@
  /* Compute physical memory by asking the OS */
  uint64_t
@@ -44994,8 +44895,8 @@
    return result;
 +#endif
  }
---- ./jdk/src/solaris/bin/ergo.h	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/bin/ergo.h	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/bin/ergo.h	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/bin/ergo.h	Sun May 28 23:44:03 2017 -0700
 @@ -33,6 +33,10 @@
  #include <sys/stat.h>
  #include <unistd.h>
@@ -45007,8 +44908,8 @@
  
  #include "java.h"
  
---- ./jdk/src/solaris/bin/ergo_i586.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/bin/ergo_i586.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/bin/ergo_i586.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/bin/ergo_i586.c	Sun May 28 23:44:03 2017 -0700
 @@ -106,7 +106,7 @@
  
  #endif /* __solaris__ */
@@ -45067,8 +44968,8 @@
    return result;
 +#endif
  }
---- ./jdk/src/solaris/bin/java_md_solinux.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/bin/java_md_solinux.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/bin/java_md_solinux.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/bin/java_md_solinux.c	Sun May 28 23:44:03 2017 -0700
 @@ -928,8 +928,9 @@
   * onwards the filename returned in DL_info structure from dladdr is
   * an absolute pathname so technically realpath isn't required.
@@ -45125,8 +45026,8 @@
  /* --- Splash Screen shared library support --- */
  static const char* SPLASHSCREEN_SO = JNI_LIB_NAME("splashscreen");
  static void* hSplashLib = NULL;
---- ./jdk/src/solaris/bin/java_md_solinux.h	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/bin/java_md_solinux.h	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/bin/java_md_solinux.h	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/bin/java_md_solinux.h	Sun May 28 23:44:03 2017 -0700
 @@ -33,6 +33,10 @@
  #include <sys/time.h>
  #define CounterGet()              (gethrtime()/1000)
@@ -45148,8 +45049,8 @@
  #else /* Solaris */
  static const char *system_dir   = "/usr/jdk";
  static const char *user_dir     = "/jdk";
---- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd	Sun May 28 23:44:03 2017 -0700
 @@ -95,7 +95,14 @@
              public LaunchMechanism run() {
                  String javahome = System.getProperty("java.home");
@@ -45166,8 +45067,8 @@
                  String s = System.getProperty(
                      "jdk.lang.Process.launchMechanism", "posix_spawn");
  
---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java	Sun May 28 23:44:03 2017 -0700
 @@ -213,7 +213,7 @@
          if (fontID != null) {
              fileName = (String)fontNameMap.get(fontID);
@@ -45195,8 +45096,8 @@
               (!mFontConfig.foundOsSpecificFile() ||
                !mFontConfig.fontFilesArePresent()) ||
               (FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
---- ./jdk/src/solaris/classes/sun/net/PortConfig.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/net/PortConfig.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/classes/sun/net/PortConfig.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/classes/sun/net/PortConfig.java	Sun May 28 23:44:03 2017 -0700
 @@ -59,7 +59,7 @@
                      } else if (os.startsWith("AIX")) {
                          defaultLower = 32768;
@@ -45206,8 +45107,8 @@
                          defaultLower = 49152;
                          defaultUpper = 65535;
                      } else {
---- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java	Sun May 28 23:44:03 2017 -0700
 @@ -50,7 +50,7 @@
              return new SolarisAsynchronousChannelProvider();
          if (osname.equals("Linux"))
@@ -45217,8 +45118,8 @@
              return new BsdAsynchronousChannelProvider();
          if (osname.equals("AIX"))
              return new AixAsynchronousChannelProvider();
---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java	Sun May 28 23:44:03 2017 -0700
 @@ -70,6 +70,8 @@
              return createProvider("sun.nio.fs.LinuxFileSystemProvider");
          if (osname.equals("Darwin") || osname.contains("OS X"))
@@ -45228,8 +45129,8 @@
          if (osname.equals("AIX") || osname.equals("OS400"))
              return createProvider("sun.nio.fs.AixFileSystemProvider");
          throw new AssertionError("Platform not recognized");
---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	Sun May 28 23:44:03 2017 -0700
 @@ -170,6 +170,7 @@
  
      static boolean isBSD() {
@@ -45238,8 +45139,8 @@
                  osname.contains("OS X"));
      }
  
---- ./jdk/src/solaris/javavm/export/jvm_md.h	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/javavm/export/jvm_md.h	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/javavm/export/jvm_md.h	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/javavm/export/jvm_md.h	Sun May 28 23:44:03 2017 -0700
 @@ -75,7 +75,11 @@
  #define JVM_O_O_APPEND   O_APPEND
  #define JVM_O_EXCL       O_EXCL
@@ -45252,8 +45153,8 @@
  
  /* Signals */
  
---- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	Sun May 28 23:44:03 2017 -0700
 @@ -172,6 +172,9 @@
      /*
       * XXXBSD: there's no way available to get swap info in
@@ -45303,8 +45204,8 @@
       */
      // throw_internal_error(env, "Unimplemented in FreeBSD");
      return (100);
---- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c	Sun May 28 23:44:03 2017 -0700
 @@ -151,7 +151,6 @@
      return rv;
  }
@@ -45313,8 +45214,8 @@
  JNIEXPORT jboolean JNICALL
  Java_java_io_UnixFileSystem_setPermission(JNIEnv *env, jobject this,
                                            jobject file,
---- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c	Sun May 28 23:44:03 2017 -0700
 @@ -56,7 +56,7 @@
  
      for (i = 0; environ[i]; i++) {
@@ -45333,8 +45234,8 @@
              jbyteArray var, val;
              const char * valBeg = varEnd + 1;
              jsize varLength = varEnd - environ[i];
---- ./jdk/src/solaris/native/java/lang/childproc.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/java/lang/childproc.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/java/lang/childproc.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/java/lang/childproc.c	Sun May 28 23:44:03 2017 -0700
 @@ -62,6 +62,16 @@
    return c >= '0' && c <= '9';
  }
@@ -45360,8 +45261,8 @@
  
  int
  moveDescriptor(int fd_from, int fd_to)
---- ./jdk/src/solaris/native/java/lang/java_props_md.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/java/lang/java_props_md.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/java/lang/java_props_md.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/java/lang/java_props_md.c	Sun May 28 23:44:03 2017 -0700
 @@ -151,7 +151,7 @@
      lc = setlocale(cat, NULL);
  #endif
@@ -45391,8 +45292,8 @@
      } else {
          sprops.language = "en";
          sprops.encoding = "ISO8859-1";
---- ./jdk/src/solaris/native/java/net/NetworkInterface.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/java/net/NetworkInterface.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c	Sun May 28 23:44:03 2017 -0700
 @@ -67,14 +67,19 @@
  #include <sys/param.h>
  #include <sys/ioctl.h>
@@ -45415,19 +45316,7 @@
  
  #include "jvm.h"
  #include "jni_util.h"
-@@ -1038,8 +1043,9 @@
- }
- 
- 
--/** Linux, AIX **/
--#if !defined(__solaris__)
-+/** Linux, AIX. For Solaris and BSD there are similar sections below. **/
-+#if !defined(__solaris__) && !defined(_ALLBSD_SOURCE)
-+
- /* Open socket for further ioct calls, try v4 socket first and
-  * if it falls return v6 socket
-  */
-@@ -1460,11 +1466,15 @@
+@@ -1461,11 +1466,15 @@
        return -1;
    }
  
@@ -45443,7 +45332,7 @@
    return 0;
  }
  
-@@ -2156,11 +2166,15 @@
+@@ -2157,11 +2166,15 @@
        return -1;
    }
  
@@ -45459,8 +45348,8 @@
    return 0;
  }
  
---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Sun May 28 23:44:03 2017 -0700
 @@ -23,12 +23,12 @@
   * questions.
   */
@@ -45498,8 +45387,8 @@
              len = sizeof(struct sockaddr_in);
          }
          JVM_Connect(fd, (struct sockaddr *)&addr, len);
---- ./jdk/src/solaris/native/java/net/bsd_close.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/java/net/bsd_close.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/java/net/bsd_close.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/java/net/bsd_close.c	Sun May 28 23:44:03 2017 -0700
 @@ -345,6 +345,76 @@
   * signal other than our wakeup signal.
   */
@@ -45583,8 +45472,8 @@
      }
 +#endif
  }
---- ./jdk/src/solaris/native/java/net/net_util_md.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/java/net/net_util_md.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/java/net/net_util_md.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/java/net/net_util_md.c	Sun May 28 23:44:03 2017 -0700
 @@ -45,6 +45,10 @@
  #endif
  #endif
@@ -45620,8 +45509,8 @@
  
      return setsockopt(fd, level, opt, arg, len);
  }
---- ./jdk/src/solaris/native/java/net/net_util_md.h	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/java/net/net_util_md.h	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/java/net/net_util_md.h	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/java/net/net_util_md.h	Sun May 28 23:44:03 2017 -0700
 @@ -46,7 +46,7 @@
     close subroutine does not return until the select call returns.
     ...
@@ -45631,8 +45520,8 @@
  extern int NET_Timeout(int s, long timeout);
  extern int NET_Read(int s, void* buf, size_t len);
  extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
---- ./jdk/src/solaris/native/java/util/TimeZone_md.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/java/util/TimeZone_md.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c	Sun May 28 23:44:03 2017 -0700
 @@ -123,7 +123,7 @@
          return NULL;
      }
@@ -45666,8 +45555,8 @@
  }
 -#endif /* MACOSX */
 +#endif /* _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/awt_Font.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Font.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/awt/awt_Font.c	Sun May 28 23:44:03 2017 -0700
 @@ -334,7 +334,7 @@
              if (strcmp(style, "regular") == 0) {
                  altstyle = "roman";
@@ -45677,8 +45566,8 @@
              if (!strcmp(family, "lucidasans")) {
                  family = "lucida";
              }
---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	Sun May 28 23:44:03 2017 -0700
 @@ -123,7 +123,7 @@
   */
  
@@ -45738,8 +45627,8 @@
  #endif /* HEADLESS */
      return point;
  }
---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Sun May 28 23:44:03 2017 -0700
 @@ -67,7 +67,7 @@
                                  XIMPreeditDrawCallbackStruct *);
  static void PreeditCaretCallback(XIC, XPointer,
@@ -45979,8 +45868,8 @@
      AWT_LOCK();
      adjustStatusWindow(window);
      AWT_UNLOCK();
---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c	Sun May 28 23:44:03 2017 -0700
 @@ -46,7 +46,7 @@
  #include "wsutils.h"
  #include "list.h"
@@ -45990,8 +45879,8 @@
  #include <sys/socket.h>
  #endif
  
---- ./jdk/src/solaris/native/sun/awt/awt_util.h	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_util.h	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_util.h	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/awt/awt_util.h	Sun May 28 23:44:03 2017 -0700
 @@ -187,7 +187,7 @@
  #ifdef __solaris__
  extern Widget awt_util_getXICStatusAreaWindow(Widget w);
@@ -46010,8 +45899,8 @@
  typedef struct _XmImRefRec {
    Cardinal      num_refs;       /* Number of referencing widgets. */
    Cardinal      max_refs;       /* Maximum length of refs array. */
---- ./jdk/src/solaris/native/sun/awt/awt_wm.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_wm.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.c	Sun May 28 23:44:03 2017 -0700
 @@ -121,12 +121,19 @@
  static Atom XA_KWM_WIN_MAXIMIZED;
  
@@ -46109,8 +45998,8 @@
          awt_wmgr = OPENLOOK_WM;
      }
      else {
---- ./jdk/src/solaris/native/sun/awt/awt_wm.h	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_wm.h	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.h	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.h	Sun May 28 23:44:03 2017 -0700
 @@ -45,7 +45,10 @@
      KDE2_WM,
      SAWFISH_WM,
@@ -46123,8 +46012,8 @@
  };
  
  extern void awt_wm_init(void);
---- ./jdk/src/solaris/native/sun/awt/extutil.h	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/awt/extutil.h	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/extutil.h	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/awt/extutil.h	Sun May 28 23:44:03 2017 -0700
 @@ -58,7 +58,7 @@
   */
  /* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
@@ -46140,8 +46029,8 @@
  
 -#endif /* __linux__ || MACOSX */
 +#endif /* __linux__ || _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/fontpath.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/awt/fontpath.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/fontpath.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/awt/fontpath.c	Sun May 28 23:44:03 2017 -0700
 @@ -23,7 +23,7 @@
   * questions.
   */
@@ -46210,8 +46099,8 @@
      }
  #endif
  #endif /* !HEADLESS */
---- ./jdk/src/solaris/native/sun/awt/robot_common.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/awt/robot_common.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/awt/robot_common.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/awt/robot_common.c	Sun May 28 23:44:03 2017 -0700
 @@ -27,7 +27,7 @@
      #error This file should not be included in headless library
  #endif
@@ -46221,8 +46110,8 @@
  #include <stdlib.h>
  #endif
  
---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h	Sun May 28 23:44:03 2017 -0700
 @@ -28,9 +28,9 @@
  #include <sys/types.h>
  
@@ -46235,8 +46124,8 @@
  #include <stdint.h>
  #endif /* __linux__ || MACOSX */
  
---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	Sun May 28 23:44:03 2017 -0700
 @@ -804,7 +804,7 @@
  static int initialized;
  static int usevis = JNI_TRUE;
@@ -46246,8 +46135,8 @@
  #   define ULTRA_CHIP   "sparc64"
  #else
  #   define ULTRA_CHIP   "sun4u"
---- ./jdk/src/solaris/native/sun/net/portconfig.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/net/portconfig.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/net/portconfig.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/net/portconfig.c	Sun May 28 23:44:03 2017 -0700
 @@ -66,6 +66,24 @@
          range->higher = net_getParam("/dev/tcp", "tcp_largest_anon_port");
          return 0;
@@ -46273,8 +46162,8 @@
  #elif defined(_ALLBSD_SOURCE)
      {
          int ret;
---- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c	Sun May 28 23:44:03 2017 -0700
 @@ -204,7 +204,7 @@
          return IOS_THROWN;
      }
@@ -46293,8 +46182,8 @@
  #endif
  
      if (numBytes > 0)
---- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c	Sun May 28 23:44:03 2017 -0700
 @@ -264,6 +264,21 @@
      fl.l_start = (off64_t)pos;
      fl.l_type = F_UNLCK;
@@ -46317,8 +46206,8 @@
      if (lockResult < 0) {
          JNU_ThrowIOExceptionWithLastError(env, "Release failed");
      }
---- ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c	Sun May 28 23:44:03 2017 -0700
 @@ -33,12 +33,19 @@
  #include "nio_util.h"
  
@@ -46367,8 +46256,8 @@
      if (pthread_kill((pthread_t)thread, INTERRUPT_SIGNAL))
          JNU_ThrowIOExceptionWithLastError(env, "Thread signal failed");
  #endif
---- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h	Sun May 28 23:44:03 2017 -0700
 @@ -320,8 +320,20 @@
  typedef int sctp_peeloff_func(int sock, sctp_assoc_t id);
  
@@ -46408,8 +46297,8 @@
  jboolean loadSocketExtensionFuncs(JNIEnv* env);
  
  #endif /* !SUN_NIO_CH_SCTP_H */
---- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c	Sun May 28 23:44:03 2017 -0700
 @@ -58,6 +58,7 @@
   */
  jboolean loadSocketExtensionFuncs
@@ -46426,8 +46315,8 @@
  
      funcsLoaded = JNI_TRUE;
      return JNI_TRUE;
---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	Sun May 28 23:44:03 2017 -0700
 @@ -50,7 +50,7 @@
  {
      const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL);
@@ -46437,8 +46326,8 @@
      void *hModule = dlopen(libName, RTLD_LAZY);
  #else
      void *hModule = dlopen(libName, RTLD_NOLOAD);
---- ./jdk/src/solaris/native/sun/xawt/XWindow.c	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/src/solaris/native/sun/xawt/XWindow.c	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c	Sun May 28 23:44:03 2017 -0700
 @@ -867,7 +867,7 @@
  {
      KeySym originalKeysym = *keysym;
@@ -46448,8 +46337,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/test/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -79,6 +79,11 @@
    endif
    OS_VERSION := $(shell $(UNAME) -r)
@@ -46462,8 +46351,8 @@
  ifeq ($(UNAME_S), Darwin)
    OS_NAME     = macosx
    OS_ARCH    := $(shell $(UNAME) -m)
---- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh	Sun May 28 23:44:03 2017 -0700
 @@ -48,7 +48,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46473,8 +46362,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -56,7 +56,7 @@
  
  OS=`uname -s`
@@ -46484,8 +46373,8 @@
        PATHSEP=":"
        ;;
  
---- ./jdk/test/com/sun/jdi/JITDebug.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/com/sun/jdi/JITDebug.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/com/sun/jdi/JITDebug.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/com/sun/jdi/JITDebug.sh	Sun May 28 23:44:03 2017 -0700
 @@ -63,7 +63,7 @@
  OS=`uname -s`
  export TRANSPORT_METHOD
@@ -46495,8 +46384,8 @@
        PATHSEP=":"
        TRANSPORT_METHOD=dt_socket
        ;;
---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -123,7 +123,7 @@
      esac
      libloc=${jreloc}/lib/${libarch}
@@ -46506,8 +46395,8 @@
      xx=`find ${jreloc}/lib -name libdt_socket.so`
      libloc=`dirname ${xx}`
      ;;
---- ./jdk/test/com/sun/jdi/ShellScaffold.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/com/sun/jdi/ShellScaffold.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/com/sun/jdi/ShellScaffold.sh	Sun May 28 23:44:03 2017 -0700
 @@ -284,7 +284,7 @@
           psCmd=ps
           jstack=jstack.exe
@@ -46517,8 +46406,8 @@
           transport=dt_socket
           address=
           devnull=/dev/null
---- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh	Sun May 28 23:44:03 2017 -0700
 @@ -112,7 +112,7 @@
        fi
        ;;
@@ -46528,8 +46417,8 @@
        pass "This test always passes on $OS"
        ;;
  
---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	Sun May 28 23:44:03 2017 -0700
 @@ -45,7 +45,7 @@
  
  OS=`uname -s`
@@ -46539,8 +46428,8 @@
      PS=":"
      ;;
    Windows* | CYGWIN*)
---- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh	Sun May 28 23:44:03 2017 -0700
 @@ -72,6 +72,16 @@
     done
  }
@@ -46568,8 +46457,8 @@
       Darwin )
         # $ sysctl -n vm.swapusage 
         # total = 8192.00M  used = 7471.11M  free = 720.89M  (encrypted)
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	Sun May 28 23:44:03 2017 -0700
 @@ -48,7 +48,7 @@
  
  # Test GetMaxFileDescriptorCount if we are running on Unix
@@ -46579,8 +46468,8 @@
         runOne GetMaxFileDescriptorCount
         ;;
      * )
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	Sun May 28 23:44:03 2017 -0700
 @@ -48,7 +48,7 @@
  
  # Test GetOpenFileDescriptorCount if we are running on Unix
@@ -46590,8 +46479,8 @@
         runOne GetOpenFileDescriptorCount
         ;;
      * )
---- ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/awt/Focus/NPEInKFMOnButtonClickInDialogTest/NPEInKFMOnButtonClickInDialogTest.java	Sun May 28 23:44:03 2017 -0700
 @@ -50,8 +50,8 @@
  
      public static void main(String[] args) {
@@ -46603,8 +46492,8 @@
              return;
          }
  
---- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh	Sun May 28 23:44:03 2017 -0700
 @@ -25,10 +25,11 @@
  fi
  
@@ -46621,8 +46510,8 @@
  # Windows
  
  if [ -z "${TESTJAVA}" ] ; then
---- ./jdk/test/java/io/File/GetXSpace.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/io/File/GetXSpace.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/io/File/GetXSpace.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/io/File/GetXSpace.sh	Sun May 28 23:44:03 2017 -0700
 @@ -26,7 +26,7 @@
  # set platform-dependent variable
  OS=`uname -s`
@@ -46632,8 +46521,8 @@
    Windows_98 )    return    ;;
    Windows* )      SID=`sid`; TMP="c:/temp"  ;;
    * )
---- ./jdk/test/java/io/FileOutputStream/ManyFiles.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/io/FileOutputStream/ManyFiles.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/io/FileOutputStream/ManyFiles.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/io/FileOutputStream/ManyFiles.java	Sun May 28 23:44:03 2017 -0700
 @@ -43,7 +43,7 @@
          // Windows capability it is much simpler to only run it
          // on that platform.
@@ -46643,8 +46532,8 @@
              return;
  
          for (int n = 0; n < NUM_FILES; n++) {
---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh	Sun May 28 23:44:03 2017 -0700
 @@ -41,7 +41,7 @@
  # Need to determine the classpath separator and filepath separator based on the
  # operating system.
@@ -46654,8 +46543,8 @@
    PS=":"  ;;
  Windows* | CYGWIN* )
    PS=";"  ;;
---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh	Sun May 28 23:44:03 2017 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46665,8 +46554,8 @@
      PS=":"    ;;
    Windows* | CYGWIN* )
      PS=";"    ;;
---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh	Sun May 28 23:44:03 2017 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46676,8 +46565,8 @@
      PS=":"    ;;
    Windows* | CYGWIN* )
      PS=";"    ;;
---- ./jdk/test/java/lang/ClassLoader/Assert.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/lang/ClassLoader/Assert.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/lang/ClassLoader/Assert.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/lang/ClassLoader/Assert.sh	Sun May 28 23:44:03 2017 -0700
 @@ -25,7 +25,7 @@
  
  OS=`uname -s`
@@ -46687,8 +46576,8 @@
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
      ;;
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Sun May 28 23:44:03 2017 -0700
 @@ -45,13 +45,7 @@
  # set platform-specific variables
  OS=`uname -s`
@@ -46704,8 +46593,8 @@
      FS="/"
      ;;
    AIX )
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	Sun May 28 23:44:03 2017 -0700
 @@ -49,13 +49,7 @@
  # set platform-specific variables
  OS=`uname -s`
@@ -46721,8 +46610,8 @@
      FS="/"
      ;;
    AIX )
---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh	Sun May 28 23:44:03 2017 -0700
 @@ -30,7 +30,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46732,8 +46621,8 @@
    Windows* | CYGWIN* )
      echo "Passed"; exit 0 ;;
    * ) echo "Unrecognized system!" ;  exit 1 ;;
---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	Sun May 28 23:44:03 2017 -0700
 @@ -44,7 +44,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46743,8 +46632,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/java/lang/instrument/MakeJAR2.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/lang/instrument/MakeJAR2.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/lang/instrument/MakeJAR2.sh	Sun May 28 23:44:03 2017 -0700
 @@ -49,7 +49,7 @@
  
  OS=`uname -s`
@@ -46754,8 +46643,8 @@
        PATHSEP=":"
        ;;
  
---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh	Sun May 28 23:44:03 2017 -0700
 @@ -35,15 +35,7 @@
  
  OS=`uname -s`
@@ -46773,8 +46662,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	Sun May 28 23:44:03 2017 -0700
 @@ -61,7 +61,7 @@
  while true; do
    echo "Run $i: TestSystemLoadAvg"
@@ -46784,8 +46673,8 @@
           runOne GetSystemLoadAverage
           ;;
        * )
---- ./jdk/test/java/net/Authenticator/B4933582.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/net/Authenticator/B4933582.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/net/Authenticator/B4933582.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/net/Authenticator/B4933582.sh	Sun May 28 23:44:03 2017 -0700
 @@ -26,7 +26,7 @@
  
  OS=`uname -s`
@@ -46795,8 +46684,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java	Sun May 28 23:44:03 2017 -0700
 @@ -45,6 +45,8 @@
              return (true);
          if (p.getProperty ("os.name").equals ("Linux"))
@@ -46806,8 +46695,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 Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	Sun May 28 23:44:03 2017 -0700
 @@ -27,7 +27,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -46817,8 +46706,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/net/Socket/OldSocketImpl.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/net/Socket/OldSocketImpl.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/net/Socket/OldSocketImpl.sh	Sun May 28 23:44:03 2017 -0700
 @@ -28,7 +28,7 @@
  
  OS=`uname -s`
@@ -46828,8 +46717,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URL/B5086147.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/net/URL/B5086147.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/net/URL/B5086147.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/net/URL/B5086147.sh	Sun May 28 23:44:03 2017 -0700
 @@ -26,7 +26,7 @@
  
  OS=`uname -s`
@@ -46839,8 +46728,8 @@
      exit 0
      ;;
    CYGWIN* )
---- ./jdk/test/java/net/URL/runconstructor.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/net/URL/runconstructor.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/net/URL/runconstructor.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/net/URL/runconstructor.sh	Sun May 28 23:44:03 2017 -0700
 @@ -27,7 +27,7 @@
  #
  OS=`uname -s`
@@ -46850,8 +46739,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URLClassLoader/B5077773.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/net/URLClassLoader/B5077773.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/net/URLClassLoader/B5077773.sh	Sun May 28 23:44:03 2017 -0700
 @@ -34,7 +34,7 @@
  
  OS=`uname -s`
@@ -46861,8 +46750,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh	Sun May 28 23:44:03 2017 -0700
 @@ -27,7 +27,7 @@
  
  OS=`uname -s`
@@ -46872,8 +46761,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/net/URLConnection/6212146/test.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/net/URLConnection/6212146/test.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/net/URLConnection/6212146/test.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/net/URLConnection/6212146/test.sh	Sun May 28 23:44:03 2017 -0700
 @@ -33,7 +33,7 @@
  
  OS=`uname -s`
@@ -46883,8 +46772,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile	Sun May 28 23:44:03 2017 -0700
 @@ -71,6 +71,48 @@
    EXTRA_LIBS = -lc
  endif
@@ -46934,8 +46823,8 @@
  LIBDIR=lib/$(PLATFORM)-$(ARCH)
  LAUNCHERLIB=$(LIBDIR)/libLauncher.so
  
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh	Sun May 28 23:44:03 2017 -0700
 @@ -33,11 +33,14 @@
  # @run shell run_tests.sh
  
@@ -47004,8 +46893,8 @@
  
  LIBDIR=lib/${PLATFORM}-${ARCH}
  LAUNCHERLIB=${LIBDIR}/libLauncher.so
---- ./jdk/test/java/nio/charset/Charset/default.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/nio/charset/Charset/default.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/nio/charset/Charset/default.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/nio/charset/Charset/default.sh	Sun May 28 23:44:03 2017 -0700
 @@ -41,10 +41,14 @@
  fi
  
@@ -47025,8 +46914,8 @@
  
  JAVA=$TESTJAVA/bin/java
  
---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh	Sun May 28 23:44:03 2017 -0700
 @@ -34,7 +34,7 @@
  
  OS=`uname -s`
@@ -47036,8 +46925,8 @@
    # Skip locale test for Windows
    Windows* | CYGWIN* )
      echo "Passed"; exit 0 ;;
---- ./jdk/test/java/nio/charset/spi/basic.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/nio/charset/spi/basic.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/nio/charset/spi/basic.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/nio/charset/spi/basic.sh	Sun May 28 23:44:03 2017 -0700
 @@ -70,10 +70,14 @@
      L="$1"
      shift
@@ -47066,8 +46955,8 @@
    Windows* )      CPS=';' ;;
    *)              echo "Unknown platform: `uname`"; exit 1 ;;
  esac
---- ./jdk/test/java/nio/file/FileSystem/Basic.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/nio/file/FileSystem/Basic.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/nio/file/FileSystem/Basic.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/nio/file/FileSystem/Basic.java	Sun May 28 23:44:03 2017 -0700
 @@ -76,6 +76,8 @@
              checkSupported(fs, "posix", "unix", "owner", "acl", "user");
          if (os.equals("Linux"))
@@ -47077,8 +46966,8 @@
          if (os.contains("OS X"))
              checkSupported(fs, "posix", "unix", "owner");
          if (os.equals("Windows"))
---- ./jdk/test/java/nio/file/Files/CopyAndMove.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/nio/file/Files/CopyAndMove.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/nio/file/Files/CopyAndMove.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/nio/file/Files/CopyAndMove.java	Sun May 28 23:44:03 2017 -0700
 @@ -634,7 +634,7 @@
  
                  // check POSIX attributes are copied
@@ -47097,8 +46986,8 @@
          boolean isDirectory = isDirectory(file, NOFOLLOW_LINKS);
  
          if (isUnix) {
---- ./jdk/test/java/rmi/registry/readTest/readTest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/rmi/registry/readTest/readTest.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/rmi/registry/readTest/readTest.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/rmi/registry/readTest/readTest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -34,7 +34,7 @@
  REGARGS=""
  
@@ -47108,8 +46997,8 @@
      PS=":"
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
---- ./jdk/test/java/rmi/reliability/launch_reliability.ksh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/rmi/reliability/launch_reliability.ksh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh	Sun May 28 23:44:03 2017 -0700
 @@ -84,14 +84,12 @@
  
  
@@ -47129,8 +47018,8 @@
  
  export PATH_SEP
  mainpid=$$
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Sun May 28 23:44:03 2017 -0700
 @@ -46,15 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47148,8 +47037,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	Sun May 28 23:44:03 2017 -0700
 @@ -34,15 +34,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47167,8 +47056,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	Sun May 28 23:44:03 2017 -0700
 @@ -50,19 +50,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47190,8 +47079,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh	Sun May 28 23:44:03 2017 -0700
 @@ -46,15 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47209,8 +47098,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/security/Security/signedfirst/Static.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/security/Security/signedfirst/Static.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/security/Security/signedfirst/Static.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/security/Security/signedfirst/Static.sh	Sun May 28 23:44:03 2017 -0700
 @@ -46,15 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47228,8 +47117,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/util/Currency/PropertiesTest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/util/Currency/PropertiesTest.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/util/Currency/PropertiesTest.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/util/Currency/PropertiesTest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -30,7 +30,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47239,8 +47128,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -58,7 +58,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47250,8 +47139,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh	Sun May 28 23:44:03 2017 -0700
 @@ -31,7 +31,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47261,8 +47150,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -72,10 +72,10 @@
  Windows* | CYGWIN* )
      DEL=";"
@@ -47276,8 +47165,8 @@
      DEL=":"
      HAS_S=YES
      ;;
---- ./jdk/test/java/util/ServiceLoader/basic.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/java/util/ServiceLoader/basic.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/java/util/ServiceLoader/basic.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/java/util/ServiceLoader/basic.sh	Sun May 28 23:44:03 2017 -0700
 @@ -42,9 +42,7 @@
  
  OS=`uname -s`
@@ -47289,8 +47178,8 @@
        SEP=':' ;;
      * )
        SEP='\;' ;;
---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -51,7 +51,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47300,8 +47189,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	Sun May 28 23:44:03 2017 -0700
 @@ -92,6 +92,14 @@
        TMP="/tmp"
        ;;
@@ -47317,8 +47206,8 @@
     AIX )
        VAR="A different value for AIX"
        DEFAULT_JDK=/
---- ./jdk/test/javax/script/CommonSetup.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/javax/script/CommonSetup.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/javax/script/CommonSetup.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/javax/script/CommonSetup.sh	Sun May 28 23:44:03 2017 -0700
 @@ -36,7 +36,7 @@
  
  OS=`uname -s`
@@ -47328,8 +47217,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh	Sun May 28 23:44:03 2017 -0700
 @@ -33,17 +33,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47349,8 +47238,8 @@
      PS=":"
      FS="/"
      RM="/bin/rm -f"
---- ./jdk/test/jprt.config	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/jprt.config	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/jprt.config	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/jprt.config	Sun May 28 23:44:03 2017 -0700
 @@ -71,8 +71,8 @@
  
  # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
@@ -47418,8 +47307,8 @@
  
  # Export PATH setting
  PATH="${path4sdk}"
---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh	Sun May 28 23:44:03 2017 -0700
 @@ -50,7 +50,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47429,8 +47318,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Sun May 28 23:44:03 2017 -0700
 @@ -53,8 +53,13 @@
          return isOs("linux");
      }
@@ -47446,8 +47335,8 @@
      }
  
      public static String getOsName() {
---- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java	Sun May 28 23:44:03 2017 -0700
 @@ -107,8 +107,8 @@
  
      public static void main(String[] args) throws AWTException, InvocationTargetException, InterruptedException {
@@ -47459,8 +47348,8 @@
                                 "skipping!");
              return;
          }
---- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -45,37 +45,53 @@
  # has to locate libjvm.so. Also $! is not reliable on some releases of MKS.
  #{
@@ -47540,8 +47429,8 @@
  
  
  #
---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh	Sun May 28 23:44:03 2017 -0700
 @@ -35,7 +35,7 @@
  UMASK=`umask`
  
@@ -47551,8 +47440,8 @@
      PATHSEP=":"
      FILESEP="/"
      DFILESEP=$FILESEP
---- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -86,10 +86,12 @@
  #    on Windows 98.
  
@@ -47570,8 +47459,8 @@
  
  JAVA=${TESTJAVA}/bin/java
  CLASSPATH=${TESTCLASSES}
---- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -70,10 +70,12 @@
  # security the password file.
  
@@ -47589,8 +47478,8 @@
  
  
  # Create configuration file and dummy password file
---- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -69,10 +69,12 @@
  # security the password file.
  
@@ -47608,19 +47497,8 @@
  
  # Create management and SSL configuration files
  
---- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh	Wed May 24 00:32:01 2017 -0700
-@@ -36,7 +36,7 @@
- 
- OS=`uname -s`
- case "$OS" in
--  SunOS | Linux | Darwin | AIX )
-+  SunOS | Linux | *BSD | Darwin | AIX )
-     PS=":"
-     FS="/"
-     ;;
---- ./jdk/test/sun/net/www/MarkResetTest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/net/www/MarkResetTest.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/net/www/MarkResetTest.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/net/www/MarkResetTest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -28,7 +28,7 @@
  
  OS=`uname -s`
@@ -47630,8 +47508,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh	Sun May 28 23:44:03 2017 -0700
 @@ -28,7 +28,7 @@
  
  OS=`uname -s`
@@ -47641,8 +47519,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh	Sun May 28 23:44:03 2017 -0700
 @@ -31,7 +31,7 @@
  
  OS=`uname -s`
@@ -47652,8 +47530,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh	Sun May 28 23:44:03 2017 -0700
 @@ -31,7 +31,7 @@
  
  OS=`uname -s`
@@ -47663,8 +47541,8 @@
      PS=":"
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
---- ./jdk/test/sun/nio/ch/SelProvider.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/nio/ch/SelProvider.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/nio/ch/SelProvider.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/nio/ch/SelProvider.java	Sun May 28 23:44:03 2017 -0700
 @@ -39,7 +39,7 @@
                  expected = "sun.nio.ch.DevPollSelectorProvider";
              } else if ("Linux".equals(osname)) {
@@ -47674,8 +47552,8 @@
                  expected = "sun.nio.ch.KQueueSelectorProvider";
              } else {
                  return;
---- ./jdk/test/sun/security/krb5/runNameEquals.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/krb5/runNameEquals.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/krb5/runNameEquals.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/krb5/runNameEquals.sh	Sun May 28 23:44:03 2017 -0700
 @@ -48,7 +48,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47685,8 +47563,8 @@
      PATHSEP=":"
      FILESEP="/"
      NATIVE=true
---- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh	Sun May 28 23:44:03 2017 -0700
 @@ -131,6 +131,27 @@
  	;;
      esac
@@ -47715,8 +47593,8 @@
    Windows* )  
      FS="\\"
      PS=";"
---- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh	Sun May 28 23:44:03 2017 -0700
 @@ -93,6 +93,27 @@
  	;;
      esac
@@ -47745,8 +47623,8 @@
    Windows* )
      FS="\\"
      PS=";"
---- ./jdk/test/sun/security/pkcs11/PKCS11Test.java	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/pkcs11/PKCS11Test.java	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/pkcs11/PKCS11Test.java	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/pkcs11/PKCS11Test.java	Sun May 28 23:44:03 2017 -0700
 @@ -245,6 +245,8 @@
          osMap.put("SunOS-amd64-64", "/usr/lib/mps/64/");
          osMap.put("Linux-i386-32", "/usr/lib/");
@@ -47756,8 +47634,8 @@
      }
  
      private final static char[] hexDigits = "0123456789abcdef".toCharArray();
---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	Sun May 28 23:44:03 2017 -0700
 @@ -50,19 +50,7 @@
  
  OS=`uname -s`
@@ -47779,8 +47657,8 @@
      FS="/"
      PS=":"
      CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh	Sun May 28 23:44:03 2017 -0700
 @@ -51,19 +51,7 @@
  
  OS=`uname -s`
@@ -47802,8 +47680,8 @@
      FS="/"
      PS=":"
      CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	Sun May 28 23:44:03 2017 -0700
 @@ -44,11 +44,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47817,8 +47695,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	Sun May 28 23:44:03 2017 -0700
 @@ -47,15 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47836,8 +47714,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	Sun May 28 23:44:03 2017 -0700
 @@ -33,7 +33,7 @@
  
  OS=`uname -s`
@@ -47847,8 +47725,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -42,7 +42,7 @@
  
  OS=`uname -s`
@@ -47858,8 +47736,8 @@
          FILESEP="/"
          PATHSEP=":"
          ;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	Sun May 28 23:44:03 2017 -0700
 @@ -32,7 +32,7 @@
  HOSTNAME=`uname -n`
  OS=`uname -s`
@@ -47869,8 +47747,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	Sun May 28 23:44:03 2017 -0700
 @@ -32,7 +32,7 @@
  HOSTNAME=`uname -n`
  OS=`uname -s`
@@ -47880,8 +47758,8 @@
      PS=":"
      FS="/"
      ;;
---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh	Sun May 28 23:44:03 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47891,8 +47769,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh	Sun May 28 23:44:03 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47902,8 +47780,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh	Sun May 28 23:44:03 2017 -0700
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47913,8 +47791,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh	Sun May 28 23:44:03 2017 -0700
 @@ -42,7 +42,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47924,8 +47802,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh	Sun May 28 23:44:03 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47935,8 +47813,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh	Sun May 28 23:44:03 2017 -0700
 @@ -47,15 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47954,8 +47832,8 @@
      PATHSEP=":"
      FILESEP="/"
      ;;
---- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh	Sun May 28 23:44:03 2017 -0700
 @@ -42,13 +42,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47971,8 +47849,8 @@
      FILESEP="/"
      ;;
    AIX )
---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh	Sun May 28 23:44:03 2017 -0700
 @@ -45,7 +45,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47982,8 +47860,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh	Sun May 28 23:44:03 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -47993,8 +47871,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/autotest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/keytool/autotest.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/autotest.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/keytool/autotest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -71,6 +71,27 @@
              "/usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so"`
      fi
@@ -48023,8 +47901,8 @@
    * )
      echo "Will not run test on: ${OS}"
      exit 0;
---- ./jdk/test/sun/security/tools/keytool/i18n.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/keytool/i18n.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/i18n.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/keytool/i18n.sh	Sun May 28 23:44:03 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48034,8 +47912,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/keytool/printssl.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/keytool/printssl.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/printssl.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/keytool/printssl.sh	Sun May 28 23:44:03 2017 -0700
 @@ -37,7 +37,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48045,8 +47923,8 @@
      FS="/"
      ;;
    CYGWIN* )
---- ./jdk/test/sun/security/tools/keytool/resource.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/keytool/resource.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/resource.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/keytool/resource.sh	Sun May 28 23:44:03 2017 -0700
 @@ -43,7 +43,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48056,8 +47934,8 @@
      NULL=/dev/null
      FS="/"
      ;;
---- ./jdk/test/sun/security/tools/keytool/standard.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/keytool/standard.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/keytool/standard.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/keytool/standard.sh	Sun May 28 23:44:03 2017 -0700
 @@ -44,7 +44,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48067,8 +47945,8 @@
      FS="/"
      ;;
    Windows_* )
---- ./jdk/test/sun/security/tools/policytool/Alias.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/policytool/Alias.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/policytool/Alias.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/policytool/Alias.sh	Sun May 28 23:44:03 2017 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48078,8 +47956,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh	Sun May 28 23:44:03 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48089,8 +47967,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh	Sun May 28 23:44:03 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48100,8 +47978,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh	Sun May 28 23:44:03 2017 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48111,8 +47989,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh	Sun May 28 23:44:03 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48122,8 +48000,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh	Sun May 28 23:44:03 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48133,8 +48011,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./jdk/test/sun/security/tools/policytool/i18n.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/security/tools/policytool/i18n.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/security/tools/policytool/i18n.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/security/tools/policytool/i18n.sh	Sun May 28 23:44:03 2017 -0700
 @@ -46,7 +46,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48145,7 +48023,7 @@
      PS=":"
      FS="/"
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh	Wed May 24 00:32:01 2017 -0700
++++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -0,0 +1,111 @@
 +#
 +# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -48258,8 +48136,8 @@
 +
 +   else fail "unspecified test failure"
 +fi
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -54,7 +54,7 @@
  
  OS=`uname -s`
@@ -48269,8 +48147,8 @@
        PATHSEP=":"
        ;;
  
---- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh	Sun May 28 23:44:03 2017 -0700
 @@ -33,7 +33,7 @@
  
  case `uname -s` in
@@ -48280,8 +48158,8 @@
  esac
  
  N2A=$TESTJAVA/bin/native2ascii
---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Wed May 24 00:32:01 2017 -0700
+--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	Sun May 28 23:44:03 2017 -0700
 @@ -56,7 +56,7 @@
  
  OS=`uname -s`
@@ -48291,8 +48169,8 @@
        PATHSEP=":"
        ;;
  
---- ./langtools/.hgtags	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/.hgtags	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/.hgtags	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/.hgtags	Sun May 28 21:31:38 2017 -0700
 @@ -123,6 +123,7 @@
  9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
  d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01
@@ -48301,13 +48179,13 @@
  cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02
  82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03
  baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04
-@@ -609,3 +610,4 @@
- e65eb66727550af75293996fc42e2c49c2002659 jdk7u111-b00
- a5002845bff276d1a8e4bdb4a0dcb972509f7d07 jdk7u111-b01
- 3715f0221fd743e878ae5198dbaebe61ebd4fa97 jdk7u121-b00
-+240ca8086e7151b5c516b5b46d84201e4e8f5806 jdk7u131-b00
---- ./langtools/test/Makefile	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/Makefile	Sun May 21 11:12:40 2017 -0700
+@@ -612,3 +613,4 @@
+ 240ca8086e7151b5c516b5b46d84201e4e8f5806 jdk7u131-b00
+ b1802aa8be3a49d2a5c07160f2406165e309efde jdk7u141-b00
+ 853798299f7a4f38745632dc256219fbf75f861e jdk7u141-b01
++ba8ba083c4392a1ddfe40467de1e08d77443807e jdk7u141-b02
+--- ./langtools/test/Makefile	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/Makefile	Sun May 28 21:31:38 2017 -0700
 @@ -45,6 +45,14 @@
      ARCH=i586
    endif
@@ -48343,8 +48221,8 @@
  
  # Root of all test results
  TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools
---- ./langtools/test/tools/javac/4846262/Test.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javac/4846262/Test.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javac/4846262/Test.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javac/4846262/Test.sh	Sun May 28 21:31:38 2017 -0700
 @@ -44,7 +44,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48354,8 +48232,8 @@
      FS="/"
      ;;
    CYGWIN* )
---- ./langtools/test/tools/javac/6302184/T6302184.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javac/6302184/T6302184.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javac/6302184/T6302184.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javac/6302184/T6302184.sh	Sun May 28 21:31:38 2017 -0700
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48365,8 +48243,8 @@
      FS="/"
      ;;
    CYGWIN* )
---- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh	Sun May 28 21:31:38 2017 -0700
 @@ -56,7 +56,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48376,8 +48254,8 @@
      FS="/"
      CHMOD="${FS}bin${FS}chmod"
      ;;
---- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh	Sun May 28 21:31:38 2017 -0700
 @@ -54,7 +54,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48387,8 +48265,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javac/MissingInclude.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javac/MissingInclude.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javac/MissingInclude.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javac/MissingInclude.sh	Sun May 28 21:31:38 2017 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48398,8 +48276,8 @@
      FS="/"
      ;;
    Windows* )
---- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh	Sun May 28 21:31:38 2017 -0700
 @@ -52,7 +52,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48409,8 +48287,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javac/T5090006/compiler.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javac/T5090006/compiler.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javac/T5090006/compiler.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javac/T5090006/compiler.sh	Sun May 28 21:31:38 2017 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48420,8 +48298,8 @@
      FS="/"
      ;;
    Windows* )
---- ./langtools/test/tools/javac/apt.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javac/apt.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javac/apt.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javac/apt.sh	Sun May 28 21:31:38 2017 -0700
 @@ -38,7 +38,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48431,8 +48309,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./langtools/test/tools/javac/constDebug/ConstDebug.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javac/constDebug/ConstDebug.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh	Sun May 28 21:31:38 2017 -0700
 @@ -47,7 +47,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48442,8 +48320,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh	Sun May 28 21:31:38 2017 -0700
 @@ -48,7 +48,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48453,8 +48331,8 @@
      FS="/"
      ;;
    CYGWIN* )
---- ./langtools/test/tools/javac/innerClassFile/Driver.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javac/innerClassFile/Driver.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javac/innerClassFile/Driver.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javac/innerClassFile/Driver.sh	Sun May 28 21:31:38 2017 -0700
 @@ -53,7 +53,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48464,8 +48342,8 @@
      FS="/"
      ;;
    Windows* )
---- ./langtools/test/tools/javac/javazip/Test.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javac/javazip/Test.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javac/javazip/Test.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javac/javazip/Test.sh	Sun May 28 21:31:38 2017 -0700
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48475,8 +48353,8 @@
      FS="/"
      SCR=`pwd`
      ;;
---- ./langtools/test/tools/javac/links/links.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javac/links/links.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javac/links/links.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javac/links/links.sh	Sun May 28 21:31:38 2017 -0700
 @@ -53,7 +53,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48486,8 +48364,8 @@
      NULL=/dev/null
      PS=":"
      FS="/"
---- ./langtools/test/tools/javac/newlines/Newlines.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javac/newlines/Newlines.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javac/newlines/Newlines.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javac/newlines/Newlines.sh	Sun May 28 21:31:38 2017 -0700
 @@ -50,7 +50,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48497,8 +48375,8 @@
      FS="/"
      ;;
    Windows* )
---- ./langtools/test/tools/javac/stackmap/T4955930.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javac/stackmap/T4955930.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javac/stackmap/T4955930.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javac/stackmap/T4955930.sh	Sun May 28 21:31:38 2017 -0700
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48508,8 +48386,8 @@
      FS="/"
      ;;
    Windows_95 | Windows_98 | Windows_NT )
---- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh	Sun May 28 21:31:38 2017 -0700
 @@ -55,7 +55,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48519,8 +48397,8 @@
      if [ -d /usr/lib/locale/en_US.UTF-8 -o -d /usr/lib/locale/en_US.utf8 ]
      then
          ENV="env LANG=en_US.UTF-8"
---- ./langtools/test/tools/javah/6257087/foo.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javah/6257087/foo.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javah/6257087/foo.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javah/6257087/foo.sh	Sun May 28 21:31:38 2017 -0700
 @@ -41,7 +41,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48530,8 +48408,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javah/ConstMacroTest.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javah/ConstMacroTest.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javah/ConstMacroTest.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javah/ConstMacroTest.sh	Sun May 28 21:31:38 2017 -0700
 @@ -56,7 +56,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48541,8 +48419,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javah/MissingParamClassTest.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javah/MissingParamClassTest.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javah/MissingParamClassTest.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javah/MissingParamClassTest.sh	Sun May 28 21:31:38 2017 -0700
 @@ -58,7 +58,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48552,8 +48430,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javah/ReadOldClass.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javah/ReadOldClass.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javah/ReadOldClass.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javah/ReadOldClass.sh	Sun May 28 21:31:38 2017 -0700
 @@ -43,7 +43,7 @@
  # set platform-dependent variables
  OS=`uname -s`
@@ -48563,8 +48441,8 @@
      PS=":"
      FS="/"
      ;;
---- ./langtools/test/tools/javap/pathsep.sh	Wed Nov 23 00:35:47 2016 -0800
-+++ ./langtools/test/tools/javap/pathsep.sh	Sun May 21 11:12:40 2017 -0700
+--- ./langtools/test/tools/javap/pathsep.sh	Thu Apr 27 06:11:41 2017 +0100
++++ ./langtools/test/tools/javap/pathsep.sh	Sun May 28 21:31:38 2017 -0700
 @@ -40,7 +40,7 @@
  # set platform-dependent variables
  OS=`uname -s`