aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2017-04-19 13:36:23 +0000
committerGreg Lewis <glewis@FreeBSD.org>2017-04-19 13:36:23 +0000
commit5458611582d73ce042c8d1a42351693a13c8b288 (patch)
treea471d045e5c624288e662e3245bc5dc8b0100001 /java
parent8074dba136d12aa66b7f29311a7ccc95e6bc1d24 (diff)
downloadports-5458611582d73ce042c8d1a42351693a13c8b288.tar.gz
ports-5458611582d73ce042c8d1a42351693a13c8b288.zip
Notes
Diffstat (limited to 'java')
-rw-r--r--java/openjdk8/Makefile8
-rw-r--r--java/openjdk8/distinfo4
-rw-r--r--java/openjdk8/files/patch-bsd1417
-rw-r--r--java/openjdk8/files/patch-bsd-test826
-rw-r--r--java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__bsd.cpp245
-rw-r--r--java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__bsd.hpp63
6 files changed, 1094 insertions, 1469 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index ddd09c73146c..3f420811b993 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -2,7 +2,6 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
-PORTREVISION= 1
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
@@ -28,7 +27,8 @@ PATCHFILES= patch-8u05-b13.xz \
patch-8u92-b14.xz \
patch-8u102-b14.xz \
patch-8u112-b16.xz \
- patch-8u121-b13.xz
+ patch-8u121-b13.xz \
+ patch-8u131-b11.xz
MAINTAINER= java@FreeBSD.org
COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION}
@@ -222,8 +222,8 @@ NO_CCACHE= yes
NOPRECIOUSMAKEVARS= yes
JDK_MAJOR_VERSION= 8
-JDK_UPDATE_VERSION= 121
-JDK_BUILD_NUMBER= 13
+JDK_UPDATE_VERSION= 131
+JDK_BUILD_NUMBER= 11
DIST_BUILD_NUMBER= 132
JTREG_VERSION= 4.1
JTREG_BUILD_NUMBER= b08
diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo
index a46962489a26..dd8577f58412 100644
--- a/java/openjdk8/distinfo
+++ b/java/openjdk8/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1485812255
+TIMESTAMP = 1492583230
SHA256 (openjdk-8-src-b132-03_mar_2014.zip) = ba651f9aa68fdc823b2ef55510710a013ab9f78fff291d5dc1c4d166f3e1e589
SIZE (openjdk-8-src-b132-03_mar_2014.zip) = 124099402
SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c
@@ -37,3 +37,5 @@ SHA256 (patch-8u112-b16.xz) = adbca9b317d599a3ee2e8ac6efb47b0576bdb1ebf0a8b9a0d0
SIZE (patch-8u112-b16.xz) = 217492
SHA256 (patch-8u121-b13.xz) = ef48cad21bb0ccadb3968147ab4d4d0b9ae024bf42a0fccf5714584f43df9ed4
SIZE (patch-8u121-b13.xz) = 135520
+SHA256 (patch-8u131-b11.xz) = c0953d79f7e1b02ed75e6757ff170a144527af9b44f44cb36f2ddb484437d4d6
+SIZE (patch-8u131-b11.xz) = 88068
diff --git a/java/openjdk8/files/patch-bsd b/java/openjdk8/files/patch-bsd
index af118c65eb8f..885a7ffb8718 100644
--- a/java/openjdk8/files/patch-bsd
+++ b/java/openjdk8/files/patch-bsd
@@ -1,5 +1,5 @@
---- ./common/autoconf/build-performance.m4 Mon Nov 28 13:51:01 2016 -0800
-+++ ./common/autoconf/build-performance.m4 Sat Jan 28 19:01:56 2017 -0800
+--- ./common/autoconf/build-performance.m4 Mon Feb 27 11:15:51 2017 -0800
++++ ./common/autoconf/build-performance.m4 Tue Apr 18 21:21:31 2017 -0700
@@ -41,6 +41,10 @@
# Looks like a MacOSX system
NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'`
@@ -38,8 +38,8 @@
AC_MSG_RESULT([no, disabling ccache])
CCACHE=
else
---- ./common/autoconf/generated-configure.sh Mon Nov 28 13:51:01 2016 -0800
-+++ ./common/autoconf/generated-configure.sh Sat Jan 28 19:01:56 2017 -0800
+--- ./common/autoconf/generated-configure.sh Mon Feb 27 11:15:51 2017 -0800
++++ ./common/autoconf/generated-configure.sh Tue Apr 18 21:21:31 2017 -0700
@@ -646,6 +646,8 @@
LIBM
LIBZIP_CAN_USE_MMAP
@@ -685,8 +685,8 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
$as_echo "no, disabling ccache" >&6; }
CCACHE=
---- ./common/autoconf/jdk-options.m4 Mon Nov 28 13:51:01 2016 -0800
-+++ ./common/autoconf/jdk-options.m4 Sat Jan 28 19:01:56 2017 -0800
+--- ./common/autoconf/jdk-options.m4 Mon Feb 27 11:15:51 2017 -0800
++++ ./common/autoconf/jdk-options.m4 Tue Apr 18 21:21:31 2017 -0700
@@ -159,7 +159,7 @@
INCLUDE_SA=false
fi
@@ -717,8 +717,8 @@
# Enable or disable the elliptic curve crypto implementation
#
AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
---- ./common/autoconf/libraries.m4 Mon Nov 28 13:51:01 2016 -0800
-+++ ./common/autoconf/libraries.m4 Sat Jan 28 19:01:56 2017 -0800
+--- ./common/autoconf/libraries.m4 Mon Feb 27 11:15:51 2017 -0800
++++ ./common/autoconf/libraries.m4 Tue Apr 18 21:21:31 2017 -0700
@@ -69,9 +69,15 @@
fi
@@ -856,8 +856,8 @@
+
AC_SUBST(LIBCXX)
])
---- ./common/autoconf/platform.m4 Mon Nov 28 13:51:01 2016 -0800
-+++ ./common/autoconf/platform.m4 Sat Jan 28 19:01:56 2017 -0800
+--- ./common/autoconf/platform.m4 Mon Feb 27 11:15:51 2017 -0800
++++ ./common/autoconf/platform.m4 Tue Apr 18 21:21:31 2017 -0700
@@ -30,7 +30,7 @@
[
# First argument is the cpu name from the trip/quad
@@ -917,8 +917,8 @@
OPENJDK_TARGET_CPU_OSARCH="i386"
elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
# On all platforms except macosx, we replace x86_64 with amd64.
---- ./common/autoconf/spec.gmk.in Mon Nov 28 13:51:01 2016 -0800
-+++ ./common/autoconf/spec.gmk.in Sat Jan 28 19:01:56 2017 -0800
+--- ./common/autoconf/spec.gmk.in Mon Feb 27 11:15:51 2017 -0800
++++ ./common/autoconf/spec.gmk.in Tue Apr 18 21:21:31 2017 -0700
@@ -76,6 +76,7 @@
OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@
OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@
@@ -955,8 +955,8 @@
USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
MSVCR_DLL:=@MSVCR_DLL@
---- ./common/autoconf/toolchain.m4 Mon Nov 28 13:51:01 2016 -0800
-+++ ./common/autoconf/toolchain.m4 Sat Jan 28 19:01:56 2017 -0800
+--- ./common/autoconf/toolchain.m4 Mon Feb 27 11:15:51 2017 -0800
++++ ./common/autoconf/toolchain.m4 Tue Apr 18 21:21:31 2017 -0700
@@ -72,7 +72,7 @@
else
COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
@@ -1074,16 +1074,16 @@
fi
if test "x$DEBUG_LEVEL" = xrelease; then
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DNDEBUG"
---- ./configure Mon Nov 28 13:51:01 2016 -0800
-+++ ./configure Sat Jan 28 19:01:56 2017 -0800
+--- ./configure Mon Feb 27 11:15:51 2017 -0800
++++ ./configure Tue Apr 18 21:21:31 2017 -0700
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
---- ./make/Javadoc.gmk Mon Nov 28 13:51:01 2016 -0800
-+++ ./make/Javadoc.gmk Sat Jan 28 19:01:56 2017 -0800
+--- ./make/Javadoc.gmk Mon Feb 27 11:15:51 2017 -0800
++++ ./make/Javadoc.gmk Tue Apr 18 21:21:31 2017 -0700
@@ -46,8 +46,18 @@
BUILD_NUMBER=$(JDK_BUILD_NUMBER)
@@ -1104,8 +1104,8 @@
-Djava.awt.headless=true \
$(NEW_JAVADOC) \
-bootclasspath $(JDK_OUTPUTDIR)/classes
---- ./make/Main.gmk Mon Nov 28 13:51:01 2016 -0800
-+++ ./make/Main.gmk Sat Jan 28 19:01:56 2017 -0800
+--- ./make/Main.gmk Mon Feb 27 11:15:51 2017 -0800
++++ ./make/Main.gmk Tue Apr 18 21:21:31 2017 -0700
@@ -58,7 +58,11 @@
# Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line,
@@ -1118,8 +1118,8 @@
### Main targets
---- ./make/common/MakeBase.gmk Mon Nov 28 13:51:01 2016 -0800
-+++ ./make/common/MakeBase.gmk Sat Jan 28 19:01:56 2017 -0800
+--- ./make/common/MakeBase.gmk Mon Feb 27 11:15:51 2017 -0800
++++ ./make/common/MakeBase.gmk Tue Apr 18 21:21:31 2017 -0700
@@ -338,7 +338,7 @@
# (and causing a crash on Cygwin).
# Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris.
@@ -1140,8 +1140,8 @@
endef
# Make directory without forking mkdir if not needed
---- ./make/common/NativeCompilation.gmk Mon Nov 28 13:51:01 2016 -0800
-+++ ./make/common/NativeCompilation.gmk Sat Jan 28 19:01:56 2017 -0800
+--- ./make/common/NativeCompilation.gmk Mon Feb 27 11:15:51 2017 -0800
++++ ./make/common/NativeCompilation.gmk Tue Apr 18 21:21:31 2017 -0700
@@ -151,9 +151,9 @@
# CC the compiler to use, default is $(CC)
# LDEXE the linker to use for linking executables, default is $(LDEXE)
@@ -1155,8 +1155,8 @@
ifneq (,$$($1_BIN))
$$(error BIN has been replaced with OBJECT_DIR)
---- ./hotspot/agent/make/Makefile Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/agent/make/Makefile Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/agent/make/Makefile Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/agent/make/Makefile Tue Apr 18 21:21:39 2017 -0700
@@ -50,6 +50,7 @@
sun.jvm.hotspot.debugger.amd64 \
sun.jvm.hotspot.debugger.bsd \
@@ -1235,8 +1235,8 @@
sun/jvm/hotspot/runtime/solaris_amd64/*.java \
sun/jvm/hotspot/runtime/solaris_sparc/*.java \
sun/jvm/hotspot/runtime/solaris_x86/*.java \
---- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Tue Apr 18 21:21:39 2017 -0700
@@ -42,6 +42,10 @@
#include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h"
#endif
@@ -1305,8 +1305,8 @@
(*env)->ReleaseLongArrayElements(env, array, regs, JNI_COMMIT);
return array;
---- ./hotspot/agent/src/os/bsd/symtab.c Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/agent/src/os/bsd/symtab.c Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/agent/src/os/bsd/symtab.c Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/agent/src/os/bsd/symtab.c Tue Apr 18 21:21:39 2017 -0700
@@ -211,6 +211,10 @@
// Reading of elf header
@@ -1347,8 +1347,8 @@
key.data = sym_name;
key.size = strlen(sym_name) + 1;
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Tue Apr 18 21:21:39 2017 -0700
@@ -33,6 +33,7 @@
import sun.jvm.hotspot.debugger.JVMDebugger;
import sun.jvm.hotspot.debugger.MachineDescription;
@@ -1367,7 +1367,7 @@
if (LinuxDebuggerLocal.getAddressSize()==8) {
machDesc = new MachineDescriptionSPARC64Bit();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1412,8 +1412,8 @@
+ return false;
+ }
+}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Tue Apr 18 21:21:39 2017 -0700
@@ -30,8 +30,10 @@
import sun.jvm.hotspot.debugger.cdbg.*;
import sun.jvm.hotspot.debugger.x86.*;
@@ -1439,8 +1439,8 @@
} else {
throw new DebuggerException(cpu + " is not yet supported");
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Tue Apr 18 21:21:39 2017 -0700
@@ -27,6 +27,7 @@
import sun.jvm.hotspot.debugger.*;
import sun.jvm.hotspot.debugger.bsd.amd64.*;
@@ -1459,7 +1459,7 @@
throw new RuntimeException("cpu " + cpu + " is not yet supported");
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1541,7 +1541,7 @@
+ private BsdDebugger dbg;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1590,7 +1590,7 @@
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1715,8 +1715,8 @@
+ public abstract Address getRegisterAsAddress(int index);
+
+}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Tue Apr 18 21:21:39 2017 -0700
@@ -32,7 +32,9 @@
import sun.jvm.hotspot.debugger.cdbg.*;
import sun.jvm.hotspot.debugger.proc.amd64.*;
@@ -1739,7 +1739,7 @@
try {
Class tfc = Class.forName("sun.jvm.hotspot.debugger.proc." +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1828,7 +1828,7 @@
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1877,7 +1877,7 @@
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -1923,8 +1923,8 @@
+ return new ProcPPC64Thread(debugger, id);
+ }
+}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Tue Apr 18 21:21:39 2017 -0700
@@ -33,6 +33,7 @@
import sun.jvm.hotspot.debugger.remote.sparc.*;
import sun.jvm.hotspot.debugger.remote.x86.*;
@@ -1946,7 +1946,7 @@
try {
Class tf = Class.forName("sun.jvm.hotspot.debugger.remote." +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2002,7 +2002,7 @@
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2055,7 +2055,7 @@
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2101,8 +2101,8 @@
+ return new RemotePPC64Thread(debugger, id);
+ }
+}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Tue Apr 18 21:21:39 2017 -0700
@@ -37,6 +37,7 @@
import sun.jvm.hotspot.runtime.linux_sparc.LinuxSPARCJavaThreadPDAccess;
import sun.jvm.hotspot.runtime.bsd_x86.BsdX86JavaThreadPDAccess;
@@ -2121,7 +2121,7 @@
} else if (os.equals("darwin")) {
if (cpu.equals("amd64") || cpu.equals("x86_64")) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ppc64/BsdPPC64JavaThreadPDAccess.java Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ppc64/BsdPPC64JavaThreadPDAccess.java Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2256,7 +2256,7 @@
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2435,7 +2435,7 @@
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,508 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2946,7 +2946,7 @@
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2992,7 +2992,7 @@
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 20014, Oracle and/or its affiliates. All rights reserved.
@@ -3045,8 +3045,8 @@
+ protected void initializeFromPD(RegisterMap map) {}
+ protected Address getLocationPD(VMReg reg) { return null; }
+}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Tue Apr 18 21:21:39 2017 -0700
@@ -61,7 +61,7 @@
return "x86";
} else if (cpu.equals("sparc") || cpu.equals("sparcv9")) {
@@ -3056,8 +3056,8 @@
return cpu;
} else {
try {
---- ./hotspot/make/bsd/Makefile Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/make/bsd/Makefile Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/make/bsd/Makefile Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/make/bsd/Makefile Tue Apr 18 21:21:39 2017 -0700
@@ -66,6 +66,10 @@
FORCE_TIERED=1
endif
@@ -3069,8 +3069,8 @@
ifdef LP64
ifeq ("$(filter $(LP64_ARCH),$(BUILDARCH))","")
---- ./hotspot/make/bsd/makefiles/build_vm_def.sh Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/make/bsd/makefiles/build_vm_def.sh Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Tue Apr 18 21:21:39 2017 -0700
@@ -1,12 +1,28 @@
#!/bin/sh
@@ -3106,8 +3106,8 @@
+ if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";"
+ }' | sort -u ;;
+esac
---- ./hotspot/make/bsd/makefiles/debug.make Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/make/bsd/makefiles/debug.make Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/make/bsd/makefiles/debug.make Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/make/bsd/makefiles/debug.make Tue Apr 18 21:21:39 2017 -0700
@@ -35,7 +35,10 @@
# to inhibit the effect of the previous line on CFLAGS.
@@ -3120,8 +3120,8 @@
VERSION = debug
SYSDEFS += -DASSERT
---- ./hotspot/make/bsd/makefiles/defs.make Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/make/bsd/makefiles/defs.make Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/make/bsd/makefiles/defs.make Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/make/bsd/makefiles/defs.make Tue Apr 18 21:21:39 2017 -0700
@@ -29,7 +29,15 @@
SLASH_JAVA ?= /java
@@ -3220,8 +3220,8 @@
ADD_SA_BINARIES/ia64 =
ADD_SA_BINARIES/arm =
ADD_SA_BINARIES/zero =
---- ./hotspot/make/bsd/makefiles/fastdebug.make Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/make/bsd/makefiles/fastdebug.make Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/make/bsd/makefiles/fastdebug.make Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/make/bsd/makefiles/fastdebug.make Tue Apr 18 21:21:39 2017 -0700
@@ -56,7 +56,10 @@
# to inhibit the effect of the previous line on CFLAGS.
@@ -3234,8 +3234,8 @@
VERSION = fastdebug
SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS
---- ./hotspot/make/bsd/makefiles/gcc.make Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/make/bsd/makefiles/gcc.make Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/make/bsd/makefiles/gcc.make Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/make/bsd/makefiles/gcc.make Tue Apr 18 21:21:39 2017 -0700
@@ -168,6 +168,9 @@
CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
endif
@@ -3362,7 +3362,7 @@
endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/makefiles/launcher.make Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/make/bsd/makefiles/launcher.make Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,117 @@
+#
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -3481,8 +3481,8 @@
+ $(QUIETLY) sed -e 's/@@LIBARCH@@/$(LIBARCH)/g' $< > $@
+ $(QUIETLY) chmod +x $@
+
---- ./hotspot/make/bsd/makefiles/mapfile-vers-debug Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-debug Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug Tue Apr 18 21:21:39 2017 -0700
@@ -21,246 +21,254 @@
# questions.
#
@@ -3490,10 +3490,16 @@
-# Only used for OSX/Darwin builds
# Define public interface.
-- # _JNI
++
++SUNWprivate_1.1 {
++ global:
+ # _JNI
- _JNI_CreateJavaVM
- _JNI_GetCreatedJavaVMs
- _JNI_GetDefaultJavaVMInitArgs
++ JNI_CreateJavaVM;
++ JNI_GetCreatedJavaVMs;
++ JNI_GetDefaultJavaVMInitArgs;
- # _JVM
- _JVM_Accept
@@ -3712,17 +3718,6 @@
- _JVM_Write
- _JVM_Yield
- _JVM_handle_bsd_signal
-+SUNWprivate_1.1 {
-+ global:
-+ # _JNI
-+ JNI_CreateJavaVM;
-+ JNI_GetCreatedJavaVMs;
-+ JNI_GetDefaultJavaVMInitArgs;
-
-- # debug _JVM
-- _JVM_AccessVMBooleanFlag
-- _JVM_AccessVMIntFlag
-- _JVM_VMBreakPoint
+ # JVM
+ JVM_Accept;
+ JVM_ActiveProcessorCount;
@@ -3940,7 +3935,11 @@
+ JVM_Write;
+ JVM_Yield;
+ JVM_handle_bsd_signal;
-+
+
+- # debug _JVM
+- _JVM_AccessVMBooleanFlag
+- _JVM_AccessVMIntFlag
+- _JVM_VMBreakPoint
+ # debug JVM
+ JVM_AccessVMBooleanFlag;
+ JVM_AccessVMIntFlag;
@@ -3971,7 +3970,7 @@
+ *;
+};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,266 @@
+#
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
@@ -4239,8 +4238,8 @@
+
+ # INSERT VTABLE SYMBOLS HERE
+
---- ./hotspot/make/bsd/makefiles/mapfile-vers-product Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-product Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Tue Apr 18 21:21:39 2017 -0700
@@ -21,241 +21,249 @@
# questions.
#
@@ -4248,10 +4247,16 @@
-# Only used for OSX/Darwin builds
# Define public interface.
-- # _JNI
++
++SUNWprivate_1.1 {
++ global:
+ # _JNI
- _JNI_CreateJavaVM
- _JNI_GetCreatedJavaVMs
- _JNI_GetDefaultJavaVMInitArgs
++ JNI_CreateJavaVM;
++ JNI_GetCreatedJavaVMs;
++ JNI_GetDefaultJavaVMInitArgs;
- # _JVM
- _JVM_Accept
@@ -4470,13 +4475,6 @@
- _JVM_Write
- _JVM_Yield
- _JVM_handle_bsd_signal
-+SUNWprivate_1.1 {
-+ global:
-+ # _JNI
-+ JNI_CreateJavaVM;
-+ JNI_GetCreatedJavaVMs;
-+ JNI_GetDefaultJavaVMInitArgs;
-+
+ # JVM
+ JVM_Accept;
+ JVM_ActiveProcessorCount;
@@ -4720,7 +4718,7 @@
+ *;
+};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,261 @@
+#
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
@@ -4983,8 +4981,8 @@
+
+ # INSERT VTABLE SYMBOLS HERE
+
---- ./hotspot/make/bsd/makefiles/optimized.make Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/make/bsd/makefiles/optimized.make Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/make/bsd/makefiles/optimized.make Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/make/bsd/makefiles/optimized.make Tue Apr 18 21:21:39 2017 -0700
@@ -38,6 +38,9 @@
# to inhibit the effect of the previous line on CFLAGS.
@@ -4997,7 +4995,7 @@
VERSION = optimized
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/makefiles/ppc64.make Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/make/bsd/makefiles/ppc64.make Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,51 @@
+#
+# Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -5050,8 +5048,8 @@
+ # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
+ CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string
+endif
---- ./hotspot/make/bsd/makefiles/product.make Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/make/bsd/makefiles/product.make Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/make/bsd/makefiles/product.make Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/make/bsd/makefiles/product.make Tue Apr 18 21:21:39 2017 -0700
@@ -38,7 +38,10 @@
# to inhibit the effect of the previous line on CFLAGS.
@@ -5064,8 +5062,8 @@
SYSDEFS += -DPRODUCT
VERSION = optimized
---- ./hotspot/make/bsd/makefiles/rules.make Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/make/bsd/makefiles/rules.make Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/make/bsd/makefiles/rules.make Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/make/bsd/makefiles/rules.make Tue Apr 18 21:21:39 2017 -0700
@@ -34,7 +34,7 @@
CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS)
CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS)
@@ -5075,8 +5073,8 @@
COMPILE.CC = $(CC_COMPILE) -c
GENASM.CC = $(CC_COMPILE) -S
---- ./hotspot/make/bsd/makefiles/sa.make Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/make/bsd/makefiles/sa.make Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/make/bsd/makefiles/sa.make Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/make/bsd/makefiles/sa.make Tue Apr 18 21:21:39 2017 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
@@ -5191,8 +5189,8 @@
rm -rf $(AGENT_FILES_LIST)
+
+-include $(HS_ALT_MAKE)/bsd/makefiles/sa-rules.make
---- ./hotspot/make/bsd/makefiles/saproc.make Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/make/bsd/makefiles/saproc.make Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/make/bsd/makefiles/saproc.make Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/make/bsd/makefiles/saproc.make Tue Apr 18 21:21:39 2017 -0700
@@ -99,10 +99,10 @@
endif
@@ -5232,8 +5230,8 @@
+ cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"
.PHONY: install_saproc
---- ./hotspot/make/bsd/makefiles/vm.make Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/make/bsd/makefiles/vm.make Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/make/bsd/makefiles/vm.make Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/make/bsd/makefiles/vm.make Tue Apr 18 21:21:39 2017 -0700
@@ -107,7 +107,7 @@
# File specific flags
CXXFLAGS += $(CXXFLAGS/BYFILE)
@@ -5244,7 +5242,7 @@
endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/platform_ppc64 Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/make/bsd/platform_ppc64 Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,17 @@
+os_family = bsd
+
@@ -5263,8 +5261,8 @@
+gnu_dis_arch = ppc64
+
+sysdefs = -DBSD -D_ALLBSD_SOURCE -D_GNU_SOURCE -DPPC64
---- ./hotspot/make/sa.files Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/make/sa.files Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/make/sa.files Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/make/sa.files Tue Apr 18 21:21:39 2017 -0700
@@ -45,6 +45,7 @@
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/amd64/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/*.java \
@@ -5305,8 +5303,8 @@
$(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/jcore/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/soql/*.java \
---- ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -277,5 +277,9 @@
#if defined(TARGET_OS_ARCH_linux_ppc)
#include "bytes_linux_ppc.inline.hpp"
@@ -5317,8 +5315,8 @@
+
#endif // CPU_PPC_VM_BYTES_PPC_HPP
---- ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -307,6 +307,8 @@
// Although AIX runs on big endian CPU, float is in most significant
// word of an argument slot.
@@ -5328,8 +5326,8 @@
#else
#error "unknown OS"
#endif
---- ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -778,6 +778,8 @@
// Although AIX runs on big endian CPU, float is in the most
// significant word of an argument slot.
@@ -5339,8 +5337,8 @@
#else
#error "unknown OS"
#endif
---- ./hotspot/src/cpu/x86/vm/jni_x86.h Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/cpu/x86/vm/jni_x86.h Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/cpu/x86/vm/jni_x86.h Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/cpu/x86/vm/jni_x86.h Tue Apr 18 21:21:39 2017 -0700
@@ -34,7 +34,7 @@
#ifndef __has_attribute
#define __has_attribute(x) 0
@@ -5350,8 +5348,8 @@
#define JNIEXPORT __attribute__((visibility("default")))
#define JNIIMPORT __attribute__((visibility("default")))
#else
---- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -2266,7 +2266,7 @@
if (!is_critical_native) {
// reset handle block
@@ -5361,8 +5359,8 @@
// Any exception pending?
__ cmpptr(Address(thread, in_bytes(Thread::pending_exception_offset())), (int32_t)NULL_WORD);
---- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -23,9 +23,12 @@
*/
@@ -5377,8 +5375,8 @@
#include "asm/macroAssembler.hpp"
#include "asm/macroAssembler.inline.hpp"
#include "code/debugInfoRec.hpp"
---- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -1293,7 +1293,7 @@
// reset handle block
@@ -5388,8 +5386,8 @@
// If result was an oop then unbox and save it in the frame
{ Label L;
---- ./hotspot/src/cpu/x86/vm/x86_32.ad Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/cpu/x86/vm/x86_32.ad Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/cpu/x86/vm/x86_32.ad Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/cpu/x86/vm/x86_32.ad Tue Apr 18 21:21:39 2017 -0700
@@ -1250,6 +1250,7 @@
@@ -5398,8 +5396,8 @@
}
#ifndef PRODUCT
---- ./hotspot/src/os/aix/vm/os_aix.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/os/aix/vm/os_aix.cpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/os/aix/vm/os_aix.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/os/aix/vm/os_aix.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -5236,6 +5236,10 @@
return 0;
}
@@ -5412,7 +5410,7 @@
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -5467,8 +5465,8 @@
+ return false;
+}
+#endif
---- ./hotspot/src/os/bsd/vm/jsig.c Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/os/bsd/vm/jsig.c Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/os/bsd/vm/jsig.c Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/os/bsd/vm/jsig.c Tue Apr 18 21:21:39 2017 -0700
@@ -165,9 +165,8 @@
}
@@ -5481,8 +5479,8 @@
static int call_os_sigaction(int sig, const struct sigaction *act,
struct sigaction *oact) {
---- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -50,6 +50,7 @@
case INTERRUPT_SIGNAL:
case SIGFPE:
@@ -5592,8 +5590,8 @@
+ jio_snprintf(buf, len, "SIG%s", signame);
+ return true;
}
---- ./hotspot/src/os/bsd/vm/jvm_bsd.h Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/os/bsd/vm/jvm_bsd.h Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/os/bsd/vm/jvm_bsd.h Tue Apr 18 21:21:39 2017 -0700
@@ -112,20 +112,6 @@
#define SHUTDOWN2_SIGNAL SIGINT
#define SHUTDOWN3_SIGNAL SIGTERM
@@ -5615,8 +5613,8 @@
#endif /* JVM_MD_H */
#endif // OS_BSD_VM_JVM_BSD_H
---- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -30,7 +30,7 @@
void OSThread::pd_initialize() {
@@ -5626,8 +5624,8 @@
_thread_id = 0;
#else
_thread_id = NULL;
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -97,16 +97,31 @@
# include <sys/shm.h>
#ifndef __APPLE__
@@ -5660,7 +5658,7 @@
#ifdef __APPLE__
# include <mach/mach.h> // semaphore_* API
# include <mach-o/dyld.h>
-@@ -136,6 +151,7 @@
+@@ -136,9 +151,11 @@
volatile uint64_t os::Bsd::_max_abstime = 0;
#else
int (*os::Bsd::_clock_gettime)(clockid_t, struct timespec *) = NULL;
@@ -5668,7 +5666,11 @@
#endif
pthread_t os::Bsd::_main_thread;
int os::Bsd::_page_size = -1;
-@@ -169,6 +185,27 @@
++pthread_condattr_t os::Bsd::_condattr[1];
+
+ static jlong initial_time_count=0;
+
+@@ -169,6 +186,27 @@
// available here means free
julong os::Bsd::available_memory() {
@@ -5696,7 +5698,7 @@
uint64_t available = physical_memory() >> 2;
#ifdef __APPLE__
mach_msg_type_number_t count = HOST_VM_INFO64_COUNT;
-@@ -208,7 +245,7 @@
+@@ -208,7 +246,7 @@
static bool init = false;
static bool privileges = false;
if (!init) {
@@ -5705,7 +5707,7 @@
init = true;
}
return privileges;
-@@ -229,6 +266,8 @@
+@@ -229,6 +267,8 @@
static char cpu_arch[] = "arm";
#elif defined(PPC32)
static char cpu_arch[] = "ppc";
@@ -5714,7 +5716,7 @@
#elif defined(SPARC)
# ifdef _LP64
static char cpu_arch[] = "sparcv9";
-@@ -411,12 +450,21 @@
+@@ -411,12 +451,21 @@
const char *v = ::getenv("LD_LIBRARY_PATH");
const char *v_colon = ":";
if (v == NULL) { v = ""; v_colon = ""; }
@@ -5736,7 +5738,7 @@
Arguments::set_library_path(ld_library_path);
FREE_C_HEAP_ARRAY(char, ld_library_path, mtInternal);
}
-@@ -591,6 +639,9 @@
+@@ -591,6 +640,9 @@
sigaddset(&unblocked_sigs, SIGSEGV);
sigaddset(&unblocked_sigs, SIGBUS);
sigaddset(&unblocked_sigs, SIGFPE);
@@ -5746,7 +5748,7 @@
sigaddset(&unblocked_sigs, SR_signum);
if (!ReduceSignalUsage) {
-@@ -983,6 +1034,13 @@
+@@ -983,6 +1035,13 @@
bool os::vtime_enabled() { return false; }
double os::elapsedVTime() {
@@ -5760,15 +5762,32 @@
// better than nothing, but not much
return elapsedTime();
}
-@@ -1013,6 +1071,7 @@
+@@ -1008,11 +1067,15 @@
+ void os::Bsd::clock_init() {
+ struct timespec res;
+ struct timespec tp;
++ _getcpuclockid = (int (*)(pthread_t, clockid_t *))dlsym(RTLD_DEFAULT, "pthread_getcpuclockid");
+ if (::clock_getres(CLOCK_MONOTONIC, &res) == 0 &&
+ ::clock_gettime(CLOCK_MONOTONIC, &tp) == 0) {
// yes, monotonic clock is supported
_clock_gettime = ::clock_gettime;
++ return;
}
-+ _getcpuclockid = (int (*)(pthread_t, clockid_t *))dlsym(RTLD_DEFAULT, "pthread_getcpuclockid");
++ warning("No monotonic clock was available - timed services may " \
++ "be adversely affected if the time-of-day clock changes");
}
#endif
-@@ -1190,35 +1249,38 @@
+@@ -1048,7 +1111,7 @@
+ jlong os::javaTimeNanos() {
+ if (Bsd::supports_monotonic_clock()) {
+ struct timespec tp;
+- int status = Bsd::_clock_gettime(CLOCK_MONOTONIC, &tp);
++ int status = ::clock_gettime(CLOCK_MONOTONIC, &tp);
+ assert(status == 0, "gettime error");
+ jlong result = jlong(tp.tv_sec) * (1000 * 1000 * 1000) + jlong(tp.tv_nsec);
+ return result;
+@@ -1190,35 +1253,38 @@
pid_t os::Bsd::gettid() {
int retval = -1;
@@ -5819,7 +5838,7 @@
#else
return (intx)::pthread_self();
#endif
-@@ -1696,14 +1758,14 @@
+@@ -1696,14 +1762,14 @@
}
void os::print_os_info_brief(outputStream* st) {
@@ -5836,7 +5855,7 @@
os::Posix::print_uname_info(st);
-@@ -1716,6 +1778,29 @@
+@@ -1716,6 +1782,29 @@
// Nothing to do for now.
}
@@ -5866,7 +5885,7 @@
void os::print_memory_info(outputStream* st) {
st->print("Memory:");
-@@ -1725,11 +1810,14 @@
+@@ -1725,11 +1814,14 @@
os::physical_memory() >> 10);
st->print("(" UINT64_FORMAT "k free)",
os::available_memory() >> 10);
@@ -5886,7 +5905,7 @@
st->cr();
}
-@@ -1768,6 +1856,9 @@
+@@ -1768,6 +1860,9 @@
print_signal_handler(st, SHUTDOWN2_SIGNAL , buf, buflen);
print_signal_handler(st, SHUTDOWN3_SIGNAL , buf, buflen);
print_signal_handler(st, BREAK_SIGNAL, buf, buflen);
@@ -5896,7 +5915,7 @@
}
static char saved_jvm_path[MAXPATHLEN] = {0};
-@@ -1965,7 +2056,7 @@
+@@ -1965,7 +2060,7 @@
os_semaphore_t _semaphore;
};
@@ -5905,7 +5924,7 @@
SEM_INIT(_semaphore, 0);
}
-@@ -2153,7 +2244,7 @@
+@@ -2153,7 +2248,7 @@
if (::write(fd, "", 1) == 1) {
mmap(base, size,
PROT_READ|PROT_WRITE|PROT_EXEC,
@@ -5914,7 +5933,7 @@
}
}
::close(fd);
-@@ -2263,7 +2354,7 @@
+@@ -2263,7 +2358,7 @@
return ::mprotect(addr, size, PROT_NONE) == 0;
#else
uintptr_t res = (uintptr_t) ::mmap(addr, size, PROT_NONE,
@@ -5923,7 +5942,7 @@
return res != (uintptr_t) MAP_FAILED;
#endif
}
-@@ -2290,7 +2381,7 @@
+@@ -2290,7 +2385,7 @@
char * addr;
int flags;
@@ -5932,7 +5951,7 @@
if (fixed) {
assert((uintptr_t)requested_addr % os::Bsd::page_size() == 0, "unaligned address");
flags |= MAP_FIXED;
-@@ -2779,6 +2870,7 @@
+@@ -2779,6 +2874,7 @@
return OS_OK;
#elif defined(__FreeBSD__)
int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
@@ -5940,7 +5959,7 @@
#elif defined(__APPLE__) || defined(__NetBSD__)
struct sched_param sp;
int policy;
-@@ -3325,6 +3417,9 @@
+@@ -3325,6 +3421,9 @@
set_signal_handler(SIGBUS, true);
set_signal_handler(SIGILL, true);
set_signal_handler(SIGFPE, true);
@@ -5950,7 +5969,7 @@
set_signal_handler(SIGXFSZ, true);
#if defined(__APPLE__)
-@@ -3373,18 +3468,6 @@
+@@ -3373,18 +3472,6 @@
}
}
@@ -5969,7 +5988,7 @@
static const char* get_signal_handler_name(address handler,
char* buf, int buflen) {
int offset;
-@@ -3408,9 +3491,6 @@
+@@ -3408,9 +3495,6 @@
sigaction(sig, NULL, &sa);
@@ -5979,7 +5998,7 @@
st->print("%s: ", os::exception_name(sig, buf, buflen));
address handler = (sa.sa_flags & SA_SIGINFO)
-@@ -3432,7 +3512,7 @@
+@@ -3432,7 +3516,7 @@
// May be, handler was resetted by VMError?
if(rh != NULL) {
handler = rh;
@@ -5988,7 +6007,7 @@
}
st->print(", sa_flags=");
-@@ -3474,6 +3554,9 @@
+@@ -3474,6 +3558,9 @@
DO_SIGNAL_CHECK(SIGBUS);
DO_SIGNAL_CHECK(SIGPIPE);
DO_SIGNAL_CHECK(SIGXFSZ);
@@ -5998,7 +6017,7 @@
// ReduceSignalUsage allows the user to override these handlers
-@@ -3508,8 +3591,6 @@
+@@ -3508,8 +3595,6 @@
os_sigaction(sig, (struct sigaction*)NULL, &act);
@@ -6007,7 +6026,7 @@
address thisHandler = (act.sa_flags & SA_SIGINFO)
? CAST_FROM_FN_PTR(address, act.sa_sigaction)
: CAST_FROM_FN_PTR(address, act.sa_handler) ;
-@@ -3574,6 +3655,14 @@
+@@ -3574,6 +3659,14 @@
extern bool signal_name(int signo, char* buf, size_t len);
@@ -6022,7 +6041,33 @@
const char* os::exception_name(int exception_code, char* buf, size_t size) {
if (0 < exception_code && exception_code <= SIGRTMAX) {
// signal
-@@ -3770,6 +3859,19 @@
+@@ -3622,6 +3715,25 @@
+ Bsd::clock_init();
+ initial_time_count = javaTimeNanos();
+
++ // pthread_condattr initialization for monotonic clock
++ int status;
++ pthread_condattr_t* _condattr = os::Bsd::condAttr();
++ if ((status = pthread_condattr_init(_condattr)) != 0) {
++ fatal(err_msg("pthread_condattr_init: %s", strerror(status)));
++ }
++ // Only set the clock if CLOCK_MONOTONIC is available
++ if (Bsd::supports_monotonic_clock()) {
++ if ((status = pthread_condattr_setclock(_condattr, CLOCK_MONOTONIC)) != 0) {
++ if (status == EINVAL) {
++ warning("Unable to use monotonic clock with relative timed-waits" \
++ " - changes to the time-of-day clock may have adverse affects");
++ } else {
++ fatal(err_msg("pthread_condattr_setclock: %s", strerror(status)));
++ }
++ }
++ }
++ // else it defaults to CLOCK_REALTIME
++
+ #ifdef __APPLE__
+ // XXXDARWIN
+ // Work around the unaligned VM callbacks in hotspot's
+@@ -3770,6 +3882,19 @@
};
int os::active_processor_count() {
@@ -6042,7 +6087,7 @@
return _processor_count;
}
-@@ -3981,7 +4083,10 @@
+@@ -3981,7 +4106,10 @@
}
int fd;
int o_delete = (oflag & O_DELETE);
@@ -6054,7 +6099,7 @@
fd = ::open(path, oflag, mode);
if (fd == -1) return -1;
-@@ -4026,7 +4131,7 @@
+@@ -4026,7 +4154,7 @@
* 4843136: (process) pipe file descriptor from Runtime.exec not being closed
* 6339493: (process) Runtime.exec does not close all file descriptors on Solaris 9
*/
@@ -6063,7 +6108,7 @@
{
int flags = ::fcntl(fd, F_GETFD);
if (flags != -1)
-@@ -4166,8 +4271,9 @@
+@@ -4166,8 +4294,9 @@
#ifdef __APPLE__
return os::thread_cpu_time(Thread::current(), true /* user + sys */);
#else
@@ -6075,7 +6120,7 @@
#endif
}
-@@ -4175,8 +4281,9 @@
+@@ -4175,8 +4304,9 @@
#ifdef __APPLE__
return os::thread_cpu_time(thread, true /* user + sys */);
#else
@@ -6087,7 +6132,7 @@
#endif
}
-@@ -4184,8 +4291,9 @@
+@@ -4184,8 +4314,9 @@
#ifdef __APPLE__
return os::thread_cpu_time(Thread::current(), user_sys_cpu_time);
#else
@@ -6099,7 +6144,7 @@
#endif
}
-@@ -4210,8 +4318,41 @@
+@@ -4210,8 +4341,41 @@
return ((jlong)tinfo.user_time.seconds * 1000000000) + ((jlong)tinfo.user_time.microseconds * (jlong)1000);
}
#else
@@ -6143,7 +6188,7 @@
#endif
}
-@@ -4234,7 +4375,7 @@
+@@ -4234,7 +4398,7 @@
#ifdef __APPLE__
return true;
#else
@@ -6152,7 +6197,193 @@
#endif
}
-@@ -4822,13 +4963,29 @@
+@@ -4332,21 +4496,36 @@
+
+ static struct timespec* compute_abstime(struct timespec* abstime, jlong millis) {
+ if (millis < 0) millis = 0;
+- struct timeval now;
+- int status = gettimeofday(&now, NULL);
+- assert(status == 0, "gettimeofday");
++
+ jlong seconds = millis / 1000;
+ millis %= 1000;
+ if (seconds > 50000000) { // see man cond_timedwait(3T)
+ seconds = 50000000;
+ }
+- abstime->tv_sec = now.tv_sec + seconds;
+- long usec = now.tv_usec + millis * 1000;
+- if (usec >= 1000000) {
+- abstime->tv_sec += 1;
+- usec -= 1000000;
++
++ if (os::Bsd::supports_monotonic_clock()) {
++ struct timespec now;
++ int status = ::clock_gettime(CLOCK_MONOTONIC, &now);
++ assert_status(status == 0, status, "clock_gettime");
++ abstime->tv_sec = now.tv_sec + seconds;
++ long nanos = now.tv_nsec + millis * NANOSECS_PER_MILLISEC;
++ if (nanos >= NANOSECS_PER_SEC) {
++ abstime->tv_sec += 1;
++ nanos -= NANOSECS_PER_SEC;
++ }
++ abstime->tv_nsec = nanos;
++ } else {
++ struct timeval now;
++ int status = gettimeofday(&now, NULL);
++ assert(status == 0, "gettimeofday");
++ abstime->tv_sec = now.tv_sec + seconds;
++ long usec = now.tv_usec + millis * 1000;
++ if (usec >= 1000000) {
++ abstime->tv_sec += 1;
++ usec -= 1000000;
++ }
++ abstime->tv_nsec = usec * 1000;
+ }
+- abstime->tv_nsec = usec * 1000;
+ return abstime;
+ }
+
+@@ -4438,7 +4617,7 @@
+ status = os::Bsd::safe_cond_timedwait(_cond, _mutex, &abst);
+ if (status != 0 && WorkAroundNPTLTimedWaitHang) {
+ pthread_cond_destroy (_cond);
+- pthread_cond_init (_cond, NULL) ;
++ pthread_cond_init (_cond, os::Bsd::condAttr()) ;
+ }
+ assert_status(status == 0 || status == EINTR ||
+ status == ETIMEDOUT,
+@@ -4539,32 +4718,50 @@
+
+ static void unpackTime(struct timespec* absTime, bool isAbsolute, jlong time) {
+ assert (time > 0, "convertTime");
+-
+- struct timeval now;
+- int status = gettimeofday(&now, NULL);
+- assert(status == 0, "gettimeofday");
+-
+- time_t max_secs = now.tv_sec + MAX_SECS;
+-
+- if (isAbsolute) {
+- jlong secs = time / 1000;
+- if (secs > max_secs) {
+- absTime->tv_sec = max_secs;
++ time_t max_secs = 0;
++
++ if (!os::Bsd::supports_monotonic_clock() || isAbsolute) {
++ struct timeval now;
++ int status = gettimeofday(&now, NULL);
++ assert(status == 0, "gettimeofday");
++
++ max_secs = now.tv_sec + MAX_SECS;
++
++ if (isAbsolute) {
++ jlong secs = time / 1000;
++ if (secs > max_secs) {
++ absTime->tv_sec = max_secs;
++ } else {
++ absTime->tv_sec = secs;
++ }
++ absTime->tv_nsec = (time % 1000) * NANOSECS_PER_MILLISEC;
++ } else {
++ jlong secs = time / NANOSECS_PER_SEC;
++ if (secs >= MAX_SECS) {
++ absTime->tv_sec = max_secs;
++ absTime->tv_nsec = 0;
++ } else {
++ absTime->tv_sec = now.tv_sec + secs;
++ absTime->tv_nsec = (time % NANOSECS_PER_SEC) + now.tv_usec*1000;
++ if (absTime->tv_nsec >= NANOSECS_PER_SEC) {
++ absTime->tv_nsec -= NANOSECS_PER_SEC;
++ ++absTime->tv_sec; // note: this must be <= max_secs
++ }
++ }
+ }
+- else {
+- absTime->tv_sec = secs;
+- }
+- absTime->tv_nsec = (time % 1000) * NANOSECS_PER_MILLISEC;
+- }
+- else {
++ } else {
++ // must be relative using monotonic clock
++ struct timespec now;
++ int status = ::clock_gettime(CLOCK_MONOTONIC, &now);
++ assert_status(status == 0, status, "clock_gettime");
++ max_secs = now.tv_sec + MAX_SECS;
+ jlong secs = time / NANOSECS_PER_SEC;
+ if (secs >= MAX_SECS) {
+ absTime->tv_sec = max_secs;
+ absTime->tv_nsec = 0;
+- }
+- else {
++ } else {
+ absTime->tv_sec = now.tv_sec + secs;
+- absTime->tv_nsec = (time % NANOSECS_PER_SEC) + now.tv_usec*1000;
++ absTime->tv_nsec = (time % NANOSECS_PER_SEC) + now.tv_nsec;
+ if (absTime->tv_nsec >= NANOSECS_PER_SEC) {
+ absTime->tv_nsec -= NANOSECS_PER_SEC;
+ ++absTime->tv_sec; // note: this must be <= max_secs
+@@ -4644,15 +4841,19 @@
+ jt->set_suspend_equivalent();
+ // cleared by handle_special_suspend_equivalent_condition() or java_suspend_self()
+
++ assert(_cur_index == -1, "invariant");
+ if (time == 0) {
+- status = pthread_cond_wait (_cond, _mutex) ;
++ _cur_index = REL_INDEX; // arbitrary choice when not timed
++ status = pthread_cond_wait (&_cond[_cur_index], _mutex) ;
+ } else {
+- status = os::Bsd::safe_cond_timedwait (_cond, _mutex, &absTime) ;
++ _cur_index = isAbsolute ? ABS_INDEX : REL_INDEX;
++ status = os::Bsd::safe_cond_timedwait (&_cond[_cur_index], _mutex, &absTime) ;
+ if (status != 0 && WorkAroundNPTLTimedWaitHang) {
+- pthread_cond_destroy (_cond) ;
+- pthread_cond_init (_cond, NULL);
++ pthread_cond_destroy (&_cond[_cur_index]) ;
++ pthread_cond_init (&_cond[_cur_index], isAbsolute ? NULL : os::Bsd::condAttr());
+ }
+ }
++ _cur_index = -1;
+ assert_status(status == 0 || status == EINTR ||
+ status == ETIMEDOUT,
+ status, "cond_timedwait");
+@@ -4681,17 +4882,26 @@
+ s = _counter;
+ _counter = 1;
+ if (s < 1) {
+- if (WorkAroundNPTLTimedWaitHang) {
+- status = pthread_cond_signal (_cond) ;
+- assert (status == 0, "invariant") ;
++ // thread might be parked
++ if (_cur_index != -1) {
++ // thread is definitely parked
++ if (WorkAroundNPTLTimedWaitHang) {
++ status = pthread_cond_signal (&_cond[_cur_index]);
++ assert (status == 0, "invariant");
+ status = pthread_mutex_unlock(_mutex);
+- assert (status == 0, "invariant") ;
+- } else {
++ assert (status == 0, "invariant");
++ } else {
++ // must capture correct index before unlocking
++ int index = _cur_index;
+ status = pthread_mutex_unlock(_mutex);
+- assert (status == 0, "invariant") ;
+- status = pthread_cond_signal (_cond) ;
+- assert (status == 0, "invariant") ;
+- }
++ assert (status == 0, "invariant");
++ status = pthread_cond_signal (&_cond[index]);
++ assert (status == 0, "invariant");
++ }
++ } else {
++ pthread_mutex_unlock(_mutex);
++ assert (status == 0, "invariant") ;
++ }
+ } else {
+ pthread_mutex_unlock(_mutex);
+ assert (status == 0, "invariant") ;
+@@ -4822,13 +5032,29 @@
// Get the default path to the core file
// Returns the length of the string
@@ -6189,8 +6420,8 @@
}
#ifndef PRODUCT
---- ./hotspot/src/os/bsd/vm/os_bsd.hpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/os/bsd/vm/os_bsd.hpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -58,12 +58,16 @@
// For signal flags diagnostics
static int sigflags[MAXSIGNUM];
@@ -6218,8 +6449,69 @@
static int page_size(void) { return _page_size; }
static void set_page_size(int val) { _page_size = val; }
---- ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Sat Jan 28 19:02:08 2017 -0800
+@@ -148,6 +155,13 @@
+ #endif
+ }
+
++ // pthread_cond clock suppport
++ private:
++ static pthread_condattr_t _condattr[1];
++
++ public:
++ static pthread_condattr_t* condAttr() { return _condattr; }
++
+ // Stack repair handling
+
+ // none present
+@@ -213,7 +227,7 @@
+ public:
+ PlatformEvent() {
+ int status;
+- status = pthread_cond_init (_cond, NULL);
++ status = pthread_cond_init (_cond, os::Bsd::condAttr());
+ assert_status(status == 0, status, "cond_init");
+ status = pthread_mutex_init (_mutex, NULL);
+ assert_status(status == 0, status, "mutex_init");
+@@ -228,14 +242,19 @@
+ void park () ;
+ void unpark () ;
+ int TryPark () ;
+- int park (jlong millis) ;
++ int park (jlong millis) ; // relative timed-wait only
+ void SetAssociation (Thread * a) { _Assoc = a ; }
+ };
+
+ class PlatformParker : public CHeapObj<mtInternal> {
+ protected:
++ enum {
++ REL_INDEX = 0,
++ ABS_INDEX = 1
++ };
++ int _cur_index; // which cond is in use: -1, 0, 1
+ pthread_mutex_t _mutex [1] ;
+- pthread_cond_t _cond [1] ;
++ pthread_cond_t _cond [2] ; // one for relative times and one for abs.
+
+ public: // TODO-FIXME: make dtor private
+ ~PlatformParker() { guarantee (0, "invariant") ; }
+@@ -243,10 +262,13 @@
+ public:
+ PlatformParker() {
+ int status;
+- status = pthread_cond_init (_cond, NULL);
+- assert_status(status == 0, status, "cond_init");
++ status = pthread_cond_init (&_cond[REL_INDEX], os::Bsd::condAttr());
++ assert_status(status == 0, status, "cond_init rel");
++ status = pthread_cond_init (&_cond[ABS_INDEX], NULL);
++ assert_status(status == 0, status, "cond_init abs");
+ status = pthread_mutex_init (_mutex, NULL);
+ assert_status(status == 0, status, "mutex_init");
++ _cur_index = -1; // mark as unused
+ }
+ };
+
+--- ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/os/bsd/vm/vmError_bsd.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -33,30 +33,50 @@
#include <sys/syscall.h>
#include <unistd.h>
@@ -6281,9 +6573,9 @@
os::fork_and_exec(buf);
yes = false;
}
---- ./hotspot/src/os/linux/vm/os_linux.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/os/linux/vm/os_linux.cpp Sat Jan 28 19:02:08 2017 -0800
-@@ -6156,6 +6156,10 @@
+--- ./hotspot/src/os/linux/vm/os_linux.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/os/linux/vm/os_linux.cpp Tue Apr 18 21:21:39 2017 -0700
+@@ -6199,6 +6199,10 @@
return 0;
}
@@ -6294,8 +6586,8 @@
return strlen(buffer);
}
---- ./hotspot/src/os/posix/vm/os_posix.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/os/posix/vm/os_posix.cpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/os/posix/vm/os_posix.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/os/posix/vm/os_posix.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -53,12 +53,11 @@
n = get_core_path(buffer, bufferSize);
@@ -6358,8 +6650,8 @@
// Linux specific
#ifdef SI_TKILL
{ SI_TKILL, "SI_TKILL", "Signal sent by tkill (pthread_kill)" },
---- ./hotspot/src/os/solaris/vm/os_solaris.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/os/solaris/vm/os_solaris.cpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/os/solaris/vm/os_solaris.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/os/solaris/vm/os_solaris.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -6375,6 +6375,10 @@
return 0;
}
@@ -6372,7 +6664,7 @@
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/atomic_bsd_ppc.inline.hpp Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/atomic_bsd_ppc.inline.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,400 @@
+/*
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -6775,7 +7067,7 @@
+
+#endif // OS_CPU_BSD_PPC_VM_ATOMIC_BSD_PPC_INLINE_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/bytes_bsd_ppc.inline.hpp Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/bytes_bsd_ppc.inline.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -6817,7 +7109,7 @@
+
+#endif // OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/globals_bsd_ppc.hpp Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/globals_bsd_ppc.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -6874,7 +7166,7 @@
+
+#endif // OS_CPU_BSD_PPC_VM_GLOBALS_BSD_PPC_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/orderAccess_bsd_ppc.inline.hpp Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/orderAccess_bsd_ppc.inline.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -7026,7 +7318,7 @@
+
+#endif // OS_CPU_BSD_PPC_VM_ORDERACCESS_BSD_PPC_INLINE_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.cpp Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,666 @@
+/*
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -7695,7 +7987,7 @@
+}
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.hpp Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/os_bsd_ppc.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -7733,7 +8025,7 @@
+
+#endif // OS_CPU_BSD_PPC_VM_OS_BSD_PPC_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/prefetch_bsd_ppc.inline.hpp Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/prefetch_bsd_ppc.inline.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -7786,7 +8078,7 @@
+
+#endif // OS_CPU_BSD_PPC_VM_PREFETCH_BSD_PPC_INLINE_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.cpp Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -7828,7 +8120,7 @@
+ os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.hpp Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/threadLS_bsd_ppc.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -7867,7 +8159,7 @@
+
+#endif // OS_CPU_BSD_PPC_VM_THREADLS_BSD_PPC_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -7906,7 +8198,7 @@
+
+void JavaThread::cache_global_variables() { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.hpp Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -7992,7 +8284,7 @@
+
+#endif // OS_CPU_BSD_PPC_VM_THREAD_BSD_PPC_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os_cpu/bsd_ppc/vm/vmStructs_bsd_ppc.hpp Sat Jan 28 19:02:08 2017 -0800
++++ ./hotspot/src/os_cpu/bsd_ppc/vm/vmStructs_bsd_ppc.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -8049,8 +8341,8 @@
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+
+#endif // OS_CPU_BSD_PPC_VM_VMSTRUCTS_BSD_PPC_HPP
---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -594,7 +594,11 @@
stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
}
@@ -8063,8 +8355,8 @@
thread->doing_unsafe_access()) {
stub = StubRoutines::handler_for_unsafe_access();
}
---- ./hotspot/src/share/vm/opto/node.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/share/vm/opto/node.cpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/share/vm/opto/node.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/share/vm/opto/node.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -286,6 +286,10 @@
#ifdef _MSC_VER // the IDX_INIT hack falls foul of warning C4355
#pragma warning( disable:4355 ) // 'this' : used in base member initializer list
@@ -8087,8 +8379,8 @@
//------------------------------clone------------------------------------------
// Clone a Node.
---- ./hotspot/src/share/vm/runtime/atomic.inline.hpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/share/vm/runtime/atomic.inline.hpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/share/vm/runtime/atomic.inline.hpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/share/vm/runtime/atomic.inline.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -63,6 +63,9 @@
#endif
@@ -8099,8 +8391,8 @@
#ifdef TARGET_OS_ARCH_bsd_x86
# include "atomic_bsd_x86.inline.hpp"
#endif
---- ./hotspot/src/share/vm/runtime/globals.hpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/share/vm/runtime/globals.hpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/share/vm/runtime/globals.hpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/share/vm/runtime/globals.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -94,6 +94,9 @@
#ifdef TARGET_OS_ARCH_aix_ppc
# include "globals_aix_ppc.hpp"
@@ -8111,8 +8403,8 @@
#ifdef TARGET_OS_ARCH_bsd_x86
# include "globals_bsd_x86.hpp"
#endif
---- ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/share/vm/runtime/orderAccess.inline.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -64,6 +64,9 @@
#endif
@@ -8123,9 +8415,9 @@
#ifdef TARGET_OS_ARCH_bsd_x86
# include "orderAccess_bsd_x86.inline.hpp"
#endif
---- ./hotspot/src/share/vm/runtime/os.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/share/vm/runtime/os.cpp Sat Jan 28 19:02:08 2017 -0800
-@@ -424,15 +424,6 @@
+--- ./hotspot/src/share/vm/runtime/os.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/share/vm/runtime/os.cpp Tue Apr 18 21:21:39 2017 -0700
+@@ -426,15 +426,6 @@
if (_native_java_library == NULL) {
vm_exit_during_initialization("Unable to load native library", ebuf);
}
@@ -8141,9 +8433,9 @@
}
static jboolean onLoaded = JNI_FALSE;
if (onLoaded) {
---- ./hotspot/src/share/vm/runtime/os.hpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/share/vm/runtime/os.hpp Sat Jan 28 19:02:08 2017 -0800
-@@ -835,6 +835,9 @@
+--- ./hotspot/src/share/vm/runtime/os.hpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/share/vm/runtime/os.hpp Tue Apr 18 21:21:39 2017 -0700
+@@ -843,6 +843,9 @@
#ifdef TARGET_OS_ARCH_aix_ppc
# include "os_aix_ppc.hpp"
#endif
@@ -8153,8 +8445,8 @@
#ifdef TARGET_OS_ARCH_bsd_x86
# include "os_bsd_x86.hpp"
#endif
---- ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/share/vm/runtime/prefetch.inline.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -63,6 +63,9 @@
#endif
@@ -8165,8 +8457,8 @@
#ifdef TARGET_OS_ARCH_bsd_x86
# include "prefetch_bsd_x86.inline.hpp"
#endif
---- ./hotspot/src/share/vm/runtime/thread.hpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/share/vm/runtime/thread.hpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/share/vm/runtime/thread.hpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/share/vm/runtime/thread.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -1732,6 +1732,9 @@
#ifdef TARGET_OS_ARCH_aix_ppc
# include "thread_aix_ppc.hpp"
@@ -8177,8 +8469,8 @@
#ifdef TARGET_OS_ARCH_bsd_x86
# include "thread_bsd_x86.hpp"
#endif
---- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -75,6 +75,9 @@
#ifdef TARGET_OS_ARCH_aix_ppc
# include "threadLS_aix_ppc.hpp"
@@ -8189,8 +8481,8 @@
#ifdef TARGET_OS_ARCH_bsd_x86
# include "threadLS_bsd_x86.hpp"
#endif
---- ./hotspot/src/share/vm/runtime/vmStructs.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/share/vm/runtime/vmStructs.cpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/share/vm/runtime/vmStructs.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/share/vm/runtime/vmStructs.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -146,6 +146,9 @@
#ifdef TARGET_OS_ARCH_aix_ppc
# include "vmStructs_aix_ppc.hpp"
@@ -8210,8 +8502,8 @@
\
NOT_ZERO(X86_ONLY(declare_constant(frame::entry_frame_call_wrapper_offset))) \
declare_constant(frame::pc_return_offset) \
---- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Tue Apr 18 21:21:39 2017 -0700
@@ -30,6 +30,11 @@
// This file holds compiler-dependent includes,
// globally used constants & types, class (forward)
@@ -8243,8 +8535,8 @@
#define CAN_USE_NAN_DEFINE 1
#endif
---- ./hotspot/src/share/vm/utilities/vmError.cpp Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/src/share/vm/utilities/vmError.cpp Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/src/share/vm/utilities/vmError.cpp Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/src/share/vm/utilities/vmError.cpp Tue Apr 18 21:21:39 2017 -0700
@@ -22,7 +22,6 @@
*
*/
@@ -8253,8 +8545,8 @@
#include "precompiled.hpp"
#include "compiler/compileBroker.hpp"
#include "gc_interface/collectedHeap.hpp"
---- ./jdk/make/CompileDemos.gmk Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/CompileDemos.gmk Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/CompileDemos.gmk Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/CompileDemos.gmk Tue Apr 18 21:21:47 2017 -0700
@@ -323,7 +323,7 @@
$(eval $(call SetupJVMTIDemo,hprof, java_crw_demo, \
-I$(JDK_TOPDIR)/src/share/npt -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
@@ -8264,8 +8556,8 @@
$(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo))
$(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo))
---- ./jdk/make/CompileJavaClasses.gmk Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/CompileJavaClasses.gmk Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/CompileJavaClasses.gmk Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/CompileJavaClasses.gmk Tue Apr 18 21:21:47 2017 -0700
@@ -128,23 +128,32 @@
sun/nio/fs/LinuxFileStore.java \
sun/nio/fs/LinuxFileSystem.java \
@@ -8367,8 +8659,8 @@
$(CLOSED_SRC_DIRS), \
INCLUDES := $(SECURITY_PKGS), \
EXCLUDES := $(EXCLUDES), \
---- ./jdk/make/CompileLaunchers.gmk Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/CompileLaunchers.gmk Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/CompileLaunchers.gmk Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/CompileLaunchers.gmk Tue Apr 18 21:21:47 2017 -0700
@@ -49,7 +49,7 @@
ORIGIN_ROOT := /..
endif
@@ -8473,8 +8765,8 @@
BUILD_JSPAWNHELPER := 1
endif
---- ./jdk/make/CopyFiles.gmk Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/CopyFiles.gmk Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/CopyFiles.gmk Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/CopyFiles.gmk Tue Apr 18 21:21:47 2017 -0700
@@ -29,6 +29,8 @@
ifeq ($(OPENJDK_TARGET_OS), windows)
@@ -8517,8 +8809,8 @@
endif
endif
endif
---- ./jdk/make/Images.gmk Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/Images.gmk Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/Images.gmk Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/Images.gmk Tue Apr 18 21:21:47 2017 -0700
@@ -236,11 +236,11 @@
endif
@@ -8589,7 +8881,7 @@
################################################################################
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/data/classlist/classlist.bsd Sat Jan 28 19:08:22 2017 -0800
++++ ./jdk/make/data/classlist/classlist.bsd Tue Apr 18 21:21:47 2017 -0700
@@ -0,0 +1,2559 @@
+java/lang/Object
+java/lang/String
@@ -11150,8 +11442,8 @@
+java/awt/MenuBar
+sun/awt/X11/XErrorEvent
+# eea35d9d56e0006e
---- ./jdk/make/gendata/GendataFontConfig.gmk Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/gendata/GendataFontConfig.gmk Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/gendata/GendataFontConfig.gmk Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/gendata/GendataFontConfig.gmk Tue Apr 18 21:21:47 2017 -0700
@@ -73,6 +73,13 @@
GENDATA_FONT_CONFIG_SRC_PREFIX := aix.
endif
@@ -11166,8 +11458,8 @@
###
$(GENDATA_FONT_CONFIG_DST)/%.src: \
---- ./jdk/make/lib/Awt2dLibraries.gmk Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/lib/Awt2dLibraries.gmk Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/lib/Awt2dLibraries.gmk Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/lib/Awt2dLibraries.gmk Tue Apr 18 21:21:47 2017 -0700
@@ -309,7 +309,7 @@
debug_trace.c \
debug_util.c
@@ -11292,8 +11584,8 @@
else # .. all other Unixes can use X_LIBS
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
endif
---- ./jdk/make/lib/CoreLibraries.gmk Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/lib/CoreLibraries.gmk Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/lib/CoreLibraries.gmk Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/lib/CoreLibraries.gmk Tue Apr 18 21:21:47 2017 -0700
@@ -82,7 +82,7 @@
endif
@@ -11380,8 +11672,8 @@
LDFLAGS_macosx := -liconv, \
LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
LDFLAGS_SUFFIX_solaris := -lc, \
---- ./jdk/make/lib/NetworkingLibraries.gmk Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/lib/NetworkingLibraries.gmk Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/lib/NetworkingLibraries.gmk Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/lib/NetworkingLibraries.gmk Tue Apr 18 21:21:47 2017 -0700
@@ -42,7 +42,7 @@
LIBNET_EXCLUDE_FILES += linux_close.c
endif
@@ -11410,8 +11702,8 @@
LDFLAGS_SUFFIX_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \
delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \
-DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \
---- ./jdk/make/lib/NioLibraries.gmk Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/lib/NioLibraries.gmk Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/lib/NioLibraries.gmk Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/lib/NioLibraries.gmk Tue Apr 18 21:21:47 2017 -0700
@@ -77,9 +77,28 @@
UnixNativeDispatcher.c
endif
@@ -11472,8 +11764,8 @@
endif
+ endif
endif
---- ./jdk/make/lib/ServiceabilityLibraries.gmk Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/lib/ServiceabilityLibraries.gmk Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/lib/ServiceabilityLibraries.gmk Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/lib/ServiceabilityLibraries.gmk Tue Apr 18 21:21:47 2017 -0700
@@ -34,7 +34,7 @@
ifneq ($(OPENJDK_TARGET_OS), linux)
LIBATTACH_EXCLUDE_FILES += LinuxVirtualMachine.c
@@ -11563,8 +11855,8 @@
ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
LIBHPROF_OPTIMIZATION := LOW
endif
---- ./jdk/make/lib/SoundLibraries.gmk Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/lib/SoundLibraries.gmk Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/lib/SoundLibraries.gmk Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/lib/SoundLibraries.gmk Tue Apr 18 21:21:47 2017 -0700
@@ -75,6 +75,13 @@
LIBJSOUND_CFLAGS += -DX_PLATFORM=X_AIX
endif # OPENJDK_TARGET_OS aix
@@ -11596,8 +11888,8 @@
LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundalsa, \
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
---- ./jdk/make/mapfiles/launchers/mapfile-ppc64 Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/mapfiles/launchers/mapfile-ppc64 Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/mapfiles/launchers/mapfile-ppc64 Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/mapfiles/launchers/mapfile-ppc64 Tue Apr 18 21:21:47 2017 -0700
@@ -33,6 +33,7 @@
environ; # Public symbols and required by Java run time
_environ;
@@ -11606,8 +11898,8 @@
local:
*;
---- ./jdk/make/mapfiles/launchers/mapfile-x86 Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/mapfiles/launchers/mapfile-x86 Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/mapfiles/launchers/mapfile-x86 Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/mapfiles/launchers/mapfile-x86 Tue Apr 18 21:21:47 2017 -0700
@@ -33,6 +33,7 @@
environ; # Public symbols and required by Java run time
_environ;
@@ -11616,8 +11908,8 @@
___Argv; # The following are private, but as they are
_start; # exported from ctr1/crtn, the clever hacker
_init; # might know about them. However note, that
---- ./jdk/make/mapfiles/launchers/mapfile-x86_64 Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/mapfiles/launchers/mapfile-x86_64 Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/mapfiles/launchers/mapfile-x86_64 Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/mapfiles/launchers/mapfile-x86_64 Tue Apr 18 21:21:47 2017 -0700
@@ -33,6 +33,7 @@
environ; # Public symbols and required by Java run time
_environ;
@@ -11627,7 +11919,7 @@
local:
*;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/mapfiles/libattach/mapfile-bsd Sat Jan 28 19:08:22 2017 -0800
++++ ./jdk/make/mapfiles/libattach/mapfile-bsd Tue Apr 18 21:21:47 2017 -0700
@@ -0,0 +1,42 @@
+#
+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
@@ -11672,7 +11964,7 @@
+ *;
+};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/mapfiles/libnio/mapfile-bsd Sat Jan 28 19:08:22 2017 -0800
++++ ./jdk/make/mapfiles/libnio/mapfile-bsd Tue Apr 18 21:21:47 2017 -0700
@@ -0,0 +1,195 @@
+#
+# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -11869,8 +12161,8 @@
+ local:
+ *;
+};
---- ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/mapfiles/libunpack/mapfile-vers-unpack200 Tue Apr 18 21:21:47 2017 -0700
@@ -26,6 +26,9 @@
# Define library interface.
@@ -11882,7 +12174,7 @@
*;
};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/netbeans/common/bsd-sources.ent Sat Jan 28 19:08:22 2017 -0800
++++ ./jdk/make/netbeans/common/bsd-sources.ent Tue Apr 18 21:21:47 2017 -0700
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
@@ -11930,7 +12222,7 @@
+ <location>${root}/src/bsd/classes</location>
+</source-folder>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/netbeans/common/bsd-view.ent Sat Jan 28 19:08:22 2017 -0800
++++ ./jdk/make/netbeans/common/bsd-view.ent Tue Apr 18 21:21:47 2017 -0700
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
@@ -11971,8 +12263,8 @@
+ <includes>${includes}</includes>
+ <excludes>${excludes}</excludes>
+</source-folder>
---- ./jdk/make/netbeans/common/java-data-native.ent Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/netbeans/common/java-data-native.ent Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/netbeans/common/java-data-native.ent Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/netbeans/common/java-data-native.ent Tue Apr 18 21:21:47 2017 -0700
@@ -34,6 +34,7 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4">
<compilation-unit>
@@ -11981,8 +12273,8 @@
<package-root>${root}/src/macosx/classes</package-root>
<package-root>${root}/src/solaris/classes</package-root>
<package-root>${root}/src/windows/classes</package-root>
---- ./jdk/make/netbeans/common/make.xml Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/netbeans/common/make.xml Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/netbeans/common/make.xml Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/netbeans/common/make.xml Tue Apr 18 21:21:47 2017 -0700
@@ -32,16 +32,21 @@
-->
@@ -12017,8 +12309,8 @@
<macrodef name="make-run">
<attribute name="target"/>
<attribute name="dir"/>
---- ./jdk/make/netbeans/j2se/nbproject/project.xml Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/netbeans/j2se/nbproject/project.xml Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/netbeans/j2se/nbproject/project.xml Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/netbeans/j2se/nbproject/project.xml Tue Apr 18 21:21:47 2017 -0700
@@ -34,6 +34,7 @@
<!DOCTYPE project [
<!ENTITY properties SYSTEM "../../common/properties.ent">
@@ -12051,8 +12343,8 @@
&macosx-view;
&unix-view;
&windows-view;
---- ./jdk/make/netbeans/world/nbproject/project.xml Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/make/netbeans/world/nbproject/project.xml Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/make/netbeans/world/nbproject/project.xml Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/make/netbeans/world/nbproject/project.xml Tue Apr 18 21:21:47 2017 -0700
@@ -34,12 +34,14 @@
<!DOCTYPE project [
<!ENTITY properties SYSTEM "../../common/properties.ent">
@@ -12085,7 +12377,7 @@
&unix-view;
&windows-view;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/classes/java/net/DefaultInterface.java Sat Jan 28 19:08:22 2017 -0800
++++ ./jdk/src/bsd/classes/java/net/DefaultInterface.java Tue Apr 18 21:21:47 2017 -0700
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -12185,7 +12477,7 @@
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/classes/sun/nio/ch/DefaultSelectorProvider.java Sat Jan 28 19:08:22 2017 -0800
++++ ./jdk/src/bsd/classes/sun/nio/ch/DefaultSelectorProvider.java Tue Apr 18 21:21:47 2017 -0700
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -12236,7 +12528,7 @@
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueArrayWrapper.java Sat Jan 28 19:08:22 2017 -0800
++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueArrayWrapper.java Tue Apr 18 21:21:47 2017 -0700
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -12452,7 +12744,7 @@
+ private static native void interrupt(int fd);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorImpl.java Sat Jan 28 19:08:22 2017 -0800
++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorImpl.java Tue Apr 18 21:21:47 2017 -0700
@@ -0,0 +1,263 @@
+/*
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
@@ -12718,7 +13010,7 @@
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorProvider.java Sat Jan 28 19:08:22 2017 -0800
++++ ./jdk/src/bsd/classes/sun/nio/ch/KQueueSelectorProvider.java Tue Apr 18 21:21:47 2017 -0700
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -12764,8 +13056,8 @@
+ return new KQueueSelectorImpl(this);
+ }
+}
---- ./jdk/src/bsd/doc/man/javah.1 Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/bsd/doc/man/javah.1 Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/bsd/doc/man/javah.1 Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/bsd/doc/man/javah.1 Tue Apr 18 21:21:47 2017 -0700
@@ -8,7 +8,7 @@
.\"
.\" This code is distributed in the hope that it will be useful, but WITHOUT
@@ -12784,8 +13076,8 @@
\fIWindows\fR:
---- ./jdk/src/bsd/doc/man/rmic.1 Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/bsd/doc/man/rmic.1 Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/bsd/doc/man/rmic.1 Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/bsd/doc/man/rmic.1 Tue Apr 18 21:21:47 2017 -0700
@@ -8,7 +8,7 @@
.\"
.\" This code is distributed in the hope that it will be useful, but WITHOUT
@@ -12813,8 +13105,8 @@
.SH SEE\ ALSO
.TP 0.2i
\(bu
---- ./jdk/src/bsd/doc/man/rmid.1 Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/bsd/doc/man/rmid.1 Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/bsd/doc/man/rmid.1 Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/bsd/doc/man/rmid.1 Tue Apr 18 21:21:47 2017 -0700
@@ -8,7 +8,7 @@
.\"
.\" This code is distributed in the hope that it will be useful, but WITHOUT
@@ -12834,7 +13126,7 @@
.TP 0.2i
\(bu
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/bsd/native/sun/nio/ch/KQueueArrayWrapper.c Sat Jan 28 19:08:22 2017 -0800
++++ ./jdk/src/bsd/native/sun/nio/ch/KQueueArrayWrapper.c Tue Apr 18 21:21:47 2017 -0700
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -13007,7 +13299,7 @@
+ }
+}
+
---- ./jdk/src/macosx/classes/java/net/DefaultInterface.java Wed Nov 30 13:46:05 2016 +0300
+--- ./jdk/src/macosx/classes/java/net/DefaultInterface.java Tue Feb 28 14:44:01 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
@@ -13107,7 +13399,7 @@
- return (ppp != null) ? ppp : loopback;
- }
-}
---- ./jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java Wed Nov 30 13:46:05 2016 +0300
+--- ./jdk/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java Tue Feb 28 14:44:01 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
@@ -13158,7 +13450,7 @@
- }
-
-}
---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java Wed Nov 30 13:46:05 2016 +0300
+--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java Tue Feb 28 14:44:01 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +0,0 @@
-/*
@@ -13374,7 +13666,7 @@
- long timeout);
- private static native void interrupt(int fd);
-}
---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java Wed Nov 30 13:46:05 2016 +0300
+--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java Tue Feb 28 14:44:01 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,263 +0,0 @@
-/*
@@ -13640,7 +13932,7 @@
- return this;
- }
-}
---- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java Wed Nov 30 13:46:05 2016 +0300
+--- ./jdk/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java Tue Feb 28 14:44:01 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
@@ -13687,7 +13979,7 @@
- return new KQueueSelectorImpl(this);
- }
-}
---- ./jdk/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c Wed Nov 30 13:46:05 2016 +0300
+--- ./jdk/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c Tue Feb 28 14:44:01 2017 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
-/*
@@ -13861,8 +14153,8 @@
- }
-}
-
---- ./jdk/src/share/bin/jli_util.h Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/bin/jli_util.h Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/bin/jli_util.h Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/bin/jli_util.h Tue Apr 18 21:21:47 2017 -0700
@@ -87,7 +87,7 @@
#define _LARGFILE64_SOURCE
#define JLI_Lseek lseek64
@@ -13872,8 +14164,8 @@
#define JLI_Lseek lseek
#endif
#ifdef _AIX
---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java Tue Apr 18 21:21:47 2017 -0700
@@ -1146,7 +1146,7 @@
*/
HashMap<String, Boolean> existsMap;
@@ -13883,8 +14175,8 @@
return false;
} else if (existsMap == null) {
existsMap = new HashMap<String, Boolean>();
---- ./jdk/src/share/classes/sun/awt/OSInfo.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/classes/sun/awt/OSInfo.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/classes/sun/awt/OSInfo.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/classes/sun/awt/OSInfo.java Tue Apr 18 21:21:47 2017 -0700
@@ -39,6 +39,7 @@
WINDOWS,
LINUX,
@@ -13904,8 +14196,8 @@
if (osName.contains("OS X")) {
return MACOSX;
}
---- ./jdk/src/share/classes/sun/font/FontUtilities.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/classes/sun/font/FontUtilities.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/classes/sun/font/FontUtilities.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/classes/sun/font/FontUtilities.java Tue Apr 18 21:21:47 2017 -0700
@@ -48,6 +48,8 @@
public static boolean isLinux;
@@ -13924,8 +14216,8 @@
isMacOSX = osName.contains("OS X"); // TODO: MacOSX
String t2kStr = System.getProperty("sun.java2d.font.scaler");
---- ./jdk/src/share/classes/sun/font/SunFontManager.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/classes/sun/font/SunFontManager.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/classes/sun/font/SunFontManager.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/classes/sun/font/SunFontManager.java Tue Apr 18 21:21:47 2017 -0700
@@ -418,7 +418,7 @@
* registerFonts method as on-screen these JRE fonts
* always go through the T2K rasteriser.
@@ -13935,8 +14227,8 @@
/* Linux font configuration uses these fonts */
registerFontDir(jreFontDirName);
}
---- ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Tue Apr 18 21:21:47 2017 -0700
@@ -1306,7 +1306,7 @@
String osName = AccessController.doPrivileged(
new GetPropertyAction("os.name"));
@@ -13946,8 +14238,8 @@
charset("x-COMPOUND_TEXT", "COMPOUND_TEXT",
new String[] {
"COMPOUND_TEXT", // JDK historical
---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java Tue Apr 18 21:21:47 2017 -0700
@@ -1587,9 +1587,31 @@
}
@@ -13982,8 +14274,8 @@
if ((pFlags & PRINTER) != 0) {
execCmd[n++] = "-P" + printer;
}
---- ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java Tue Apr 18 21:21:47 2017 -0700
@@ -48,6 +48,7 @@
public Boolean run() {
String osname = System.getProperty("os.name");
@@ -13992,8 +14284,8 @@
osname.contains("OS X") ||
osname.startsWith("Linux")) {
return new Boolean(System.getProperty
---- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java Tue Apr 18 21:21:47 2017 -0700
@@ -90,6 +90,12 @@
"libgssapi_krb5.so",
"libgssapi_krb5.so.2",
@@ -14007,8 +14299,8 @@
} else if (osname.contains("OS X")) {
gssLibs = new String[]{
"libgssapi_krb5.dylib",
---- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider Tue Apr 18 21:21:47 2017 -0700
@@ -31,4 +31,5 @@
#[windows]sun.tools.attach.WindowsAttachProvider
#[linux]sun.tools.attach.LinuxAttachProvider
@@ -14016,7 +14308,7 @@
+#[bsd]sun.tools.attach.BsdAttachProvider
#[aix]sun.tools.attach.AixAttachProvider
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/share/lib/security/java.security-bsd Sat Jan 28 19:08:22 2017 -0800
++++ ./jdk/src/share/lib/security/java.security-bsd Tue Apr 18 21:21:47 2017 -0700
@@ -0,0 +1,801 @@
+#
+# This is the "master security properties file".
@@ -14819,8 +15111,8 @@
+# java.rmi.dgc.VMID;\
+# java.rmi.dgc.Lease;\
+# maxdepth=5;maxarray=10000
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp Tue Apr 18 21:21:47 2017 -0700
@@ -62,7 +62,7 @@
#endif // End of ZLIB
@@ -14830,8 +15122,8 @@
#define SWAP_BYTES(a) \
((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00)
#else
---- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c Tue Apr 18 21:21:47 2017 -0700
@@ -121,7 +121,7 @@
}
@@ -14859,8 +15151,8 @@
#define MAP_NATIVE2LE16(a) (a)
#define MAP_NATIVE2BE16(a) MAP_SWAP16_impl(a)
#define MAP_NATIVE2LE32(a) (a)
---- ./jdk/src/share/native/com/sun/media/sound/Utilities.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/com/sun/media/sound/Utilities.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/com/sun/media/sound/Utilities.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/com/sun/media/sound/Utilities.c Tue Apr 18 21:21:47 2017 -0700
@@ -28,7 +28,7 @@
@@ -14870,8 +15162,8 @@
return 0;
#else
return 1;
---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h Tue Apr 18 21:21:47 2017 -0700
@@ -40,7 +40,7 @@
#endif
#endif
@@ -14881,8 +15173,8 @@
#define __HI(x) *(1+(int*)&x)
#define __LO(x) *(int*)&x
#define __HIp(x) *(1+(int*)x)
---- ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.c Tue Apr 18 21:21:47 2017 -0700
@@ -624,7 +624,7 @@
switch(type) {
case java_awt_image_BufferedImage_TYPE_INT_ARGB:
@@ -14910,8 +15202,8 @@
colorOrder[0] = 2;
colorOrder[1] = 1;
colorOrder[2] = 0;
---- ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c Tue Apr 18 21:21:47 2017 -0700
@@ -1176,7 +1176,7 @@
#define NLUT 8
@@ -14921,8 +15213,8 @@
#define INDEXES { 3, 2, 1, 0, 7, 6, 5, 4 }
#else
#define INDEXES { 0, 1, 2, 3, 4, 5, 6, 7 }
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c Tue Apr 18 21:21:47 2017 -0700
@@ -86,7 +86,7 @@
#endif /* MLIB_USE_FTOI_CLAMPING */
@@ -14962,8 +15254,8 @@
#endif /* _NO_LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c Tue Apr 18 21:21:47 2017 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15003,8 +15295,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c Tue Apr 18 21:21:47 2017 -0700
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15044,8 +15336,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c Tue Apr 18 21:21:47 2017 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15085,8 +15377,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c Tue Apr 18 21:21:47 2017 -0700
@@ -95,7 +95,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15126,8 +15418,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c Tue Apr 18 21:21:47 2017 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15167,8 +15459,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c Tue Apr 18 21:21:47 2017 -0700
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15208,8 +15500,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c Tue Apr 18 21:21:47 2017 -0700
@@ -95,7 +95,7 @@
dst = dp[0];
if (ld_offset + size < 32) {
@@ -15429,8 +15721,8 @@
}
#else /* _LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c Tue Apr 18 21:21:47 2017 -0700
@@ -168,7 +168,7 @@
}
@@ -15711,8 +16003,8 @@
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c Tue Apr 18 21:21:47 2017 -0700
@@ -88,7 +88,7 @@
} d64_2_f32;
@@ -15864,8 +16156,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 Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c Tue Apr 18 21:21:47 2017 -0700
@@ -30,7 +30,7 @@
typedef union {
mlib_d64 db;
@@ -15875,8 +16167,8 @@
mlib_s32 int1, int0;
#else
mlib_s32 int0, int1;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c Tue Apr 18 21:21:47 2017 -0700
@@ -275,11 +275,11 @@
for (i = 0; j <= (b_size - 4); j += 4, i++) {
src0 = src1;
@@ -15975,8 +16267,8 @@
s0 = s1;
dp += SIZE;
sp += SIZE;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c Tue Apr 18 21:21:47 2017 -0700
@@ -120,7 +120,7 @@
} \
}
@@ -17209,8 +17501,8 @@
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h Tue Apr 18 21:21:47 2017 -0700
@@ -27,9 +27,6 @@
#ifndef MLIB_IMAGE_H
#define MLIB_IMAGE_H
@@ -17221,8 +17513,8 @@
#include <mlib_types.h>
#include <mlib_status.h>
#include <mlib_sys.h>
---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c Tue Apr 18 21:21:47 2017 -0700
@@ -29,7 +29,7 @@
#ifdef MACOSX
#include <unistd.h>
@@ -17242,8 +17534,8 @@
#else
return (void *) memalign(8, size);
#endif /* _MSC_VER */
---- ./jdk/src/share/native/sun/font/layout/LEStandalone.h Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/font/layout/LEStandalone.h Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/font/layout/LEStandalone.h Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/font/layout/LEStandalone.h Tue Apr 18 21:21:47 2017 -0700
@@ -136,7 +136,7 @@
#define U_CAPI extern "C"
@@ -17253,8 +17545,8 @@
#define U_IS_BIG_ENDIAN 0
#endif
#endif
---- ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Tue Apr 18 21:21:47 2017 -0700
@@ -182,7 +182,7 @@
return 0L;
}
@@ -17264,8 +17556,8 @@
/* Reversing data packed into int for LE archs */
if (isInIntPacked) {
inFormatter ^= DOSWAP_SH(1);
---- ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/share/native/sun/management/DiagnosticCommandImpl.c Tue Apr 18 21:21:47 2017 -0700
@@ -27,6 +27,7 @@
#include <jni.h>
#include "management.h"
@@ -17274,8 +17566,8 @@
JNIEXPORT void JNICALL Java_sun_management_DiagnosticCommandImpl_setNotificationEnabled
(JNIEnv *env, jobject dummy, jboolean enabled) {
---- ./jdk/src/solaris/back/util_md.h Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/back/util_md.h Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/back/util_md.h Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/back/util_md.h Tue Apr 18 21:21:47 2017 -0700
@@ -51,7 +51,7 @@
/* On little endian machines, convert java big endian numbers. */
@@ -17285,8 +17577,8 @@
#define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
#define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
---- ./jdk/src/solaris/bin/ergo_i586.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/bin/ergo_i586.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/bin/ergo_i586.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/bin/ergo_i586.c Tue Apr 18 21:21:47 2017 -0700
@@ -106,7 +106,7 @@
#endif /* __solaris__ */
@@ -17305,8 +17597,8 @@
/*
* Routines shared by solaris-i586 and linux-i586.
---- ./jdk/src/solaris/bin/java_md_solinux.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/bin/java_md_solinux.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/bin/java_md_solinux.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/bin/java_md_solinux.c Tue Apr 18 21:21:47 2017 -0700
@@ -35,6 +35,9 @@
#include <sys/stat.h>
#include <unistd.h>
@@ -17398,8 +17690,8 @@
}
int
---- ./jdk/src/solaris/bin/java_md_solinux.h Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/bin/java_md_solinux.h Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/bin/java_md_solinux.h Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/bin/java_md_solinux.h Tue Apr 18 21:21:47 2017 -0700
@@ -26,17 +26,26 @@
#ifndef JAVA_MD_SOLINUX_H
#define JAVA_MD_SOLINUX_H
@@ -17440,8 +17732,8 @@
#else /* !__solaris__, i.e. Linux, AIX,.. */
static const char *system_dir = "/usr/java";
static const char *user_dir = "/java";
---- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java Tue Apr 18 21:21:47 2017 -0700
@@ -82,6 +82,8 @@
LINUX(LaunchMechanism.VFORK, LaunchMechanism.FORK),
@@ -17489,8 +17781,8 @@
case BSD:
case AIX:
// There is a risk that pid will be recycled, causing us to
---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java Tue Apr 18 21:21:47 2017 -0700
@@ -234,7 +234,7 @@
if (fontID != null) {
fileName = (String)fontNameMap.get(fontID);
@@ -17518,8 +17810,8 @@
(!mFontConfig.foundOsSpecificFile() ||
!mFontConfig.fontFilesArePresent()) ||
(FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties Tue Apr 18 21:21:47 2017 -0700
@@ -26,134 +26,134 @@
# Version
@@ -17536,185 +17828,165 @@
-dialog.plain.korean=Baekmuk Gulim
-dialog.plain.chinese-big5=AR PL ShanHeiSun Uni
-dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni
--
--dialog.bold.latin-1=DejaVu LGC Sans Bold
--dialog.bold.japanese-x0208=Sazanami Gothic
--dialog.bold.korean=Baekmuk Gulim
--dialog.bold.chinese-big5=AR PL ShanHeiSun Uni
--dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni
--
--dialog.italic.latin-1=DejaVu LGC Sans Oblique
--dialog.italic.japanese-x0208=Sazanami Gothic
--dialog.italic.korean=Baekmuk Gulim
--dialog.italic.chinese-big5=AR PL ShanHeiSun Uni
--dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni
--
--dialog.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
--dialog.bolditalic.japanese-x0208=Sazanami Gothic
--dialog.bolditalic.korean=Baekmuk Gulim
--dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
--dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+dialog.plain.korean=NanumGothic
+dialog.plain.chinese-big5=AR PL UMing
+dialog.plain.chinese-gb18030=AR PL UMing
--
--sansserif.plain.latin-1=DejaVu LGC Sans
--sansserif.plain.japanese-x0208=Sazanami Gothic
--sansserif.plain.korean=Baekmuk Gulim
--sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni
--sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+-dialog.bold.latin-1=DejaVu LGC Sans Bold
+dialog.bold.latin-1=DejaVu Sans Bold
-+dialog.bold.japanese-x0208=Sazanami Gothic
+ dialog.bold.japanese-x0208=Sazanami Gothic
+-dialog.bold.korean=Baekmuk Gulim
+-dialog.bold.chinese-big5=AR PL ShanHeiSun Uni
+-dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+dialog.bold.korean=NanumGothic Bold
+dialog.bold.chinese-big5=AR PL UMing
+dialog.bold.chinese-gb18030=AR PL UMing
--sansserif.bold.latin-1=DejaVu LGC Sans Bold
--sansserif.bold.japanese-x0208=Sazanami Gothic
--sansserif.bold.korean=Baekmuk Gulim
--sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni
--sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+-dialog.italic.latin-1=DejaVu LGC Sans Oblique
+dialog.italic.latin-1=DejaVu Sans Oblique
-+dialog.italic.japanese-x0208=Sazanami Gothic
+ dialog.italic.japanese-x0208=Sazanami Gothic
+-dialog.italic.korean=Baekmuk Gulim
+-dialog.italic.chinese-big5=AR PL ShanHeiSun Uni
+-dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+dialog.italic.korean=NanumGothic
+dialog.italic.chinese-big5=AR PL UMing
+dialog.italic.chinese-gb18030=AR PL UMing
--sansserif.italic.latin-1=DejaVu LGC Sans Oblique
--sansserif.italic.japanese-x0208=Sazanami Gothic
--sansserif.italic.korean=Baekmuk Gulim
--sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni
--sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni
--
--sansserif.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
--sansserif.bolditalic.japanese-x0208=Sazanami Gothic
--sansserif.bolditalic.korean=Baekmuk Gulim
--sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
--sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+-dialog.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
+dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique
-+dialog.bolditalic.japanese-x0208=Sazanami Gothic
+ dialog.bolditalic.japanese-x0208=Sazanami Gothic
+-dialog.bolditalic.korean=Baekmuk Gulim
+-dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+-dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+dialog.bolditalic.korean=NanumGothic Bold
+dialog.bolditalic.chinese-big5=AR PL UMing
+dialog.bolditalic.chinese-gb18030=AR PL UMing
--serif.plain.latin-1=DejaVu LGC Serif
--serif.plain.japanese-x0208=Sazanami Mincho
--serif.plain.korean=Baekmuk Batang
--serif.plain.chinese-big5=AR PL ZenKai Uni
--serif.plain.chinese-gb18030=AR PL ZenKai Uni
+-sansserif.plain.latin-1=DejaVu LGC Sans
+sansserif.plain.latin-1=DejaVu Sans
-+sansserif.plain.japanese-x0208=Sazanami Gothic
+ sansserif.plain.japanese-x0208=Sazanami Gothic
+-sansserif.plain.korean=Baekmuk Gulim
+-sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni
+-sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+sansserif.plain.korean=NanumGothic
+sansserif.plain.chinese-big5=AR PL UMing
+sansserif.plain.chinese-gb18030=AR PL UMing
--serif.bold.latin-1=DejaVu LGC Serif Bold
--serif.bold.japanese-x0208=Sazanami Mincho
--serif.bold.korean=Baekmuk Batang
--serif.bold.chinese-big5=AR PL ZenKai Uni
--serif.bold.chinese-gb18030=AR PL ZenKai Uni
+-sansserif.bold.latin-1=DejaVu LGC Sans Bold
+sansserif.bold.latin-1=DejaVu Sans Bold
-+sansserif.bold.japanese-x0208=Sazanami Gothic
+ sansserif.bold.japanese-x0208=Sazanami Gothic
+-sansserif.bold.korean=Baekmuk Gulim
+-sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni
+-sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+sansserif.bold.korean=NanumGothic Bold
+sansserif.bold.chinese-big5=AR PL UMing
+sansserif.bold.chinese-gb18030=AR PL UMing
--serif.italic.latin-1=DejaVu LGC Serif Oblique
--serif.italic.japanese-x0208=Sazanami Mincho
--serif.italic.korean=Baekmuk Batang
--serif.italic.chinese-big5=AR PL ZenKai Uni
--serif.italic.chinese-gb18030=AR PL ZenKai Uni
+-sansserif.italic.latin-1=DejaVu LGC Sans Oblique
+sansserif.italic.latin-1=DejaVu Sans Oblique
-+sansserif.italic.japanese-x0208=Sazanami Gothic
+ sansserif.italic.japanese-x0208=Sazanami Gothic
+-sansserif.italic.korean=Baekmuk Gulim
+-sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni
+-sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+sansserif.italic.korean=NanumGothic
+sansserif.italic.chinese-big5=AR PL UMing
+sansserif.italic.chinese-gb18030=AR PL UMing
--serif.bolditalic.latin-1=DejaVu LGC Serif Bold Oblique
--serif.bolditalic.japanese-x0208=Sazanami Mincho
--serif.bolditalic.korean=Baekmuk Batang
--serif.bolditalic.chinese-big5=AR PL ZenKai Uni
--serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni
+-sansserif.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
+sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique
-+sansserif.bolditalic.japanese-x0208=Sazanami Gothic
+ sansserif.bolditalic.japanese-x0208=Sazanami Gothic
+-sansserif.bolditalic.korean=Baekmuk Gulim
+-sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+-sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+sansserif.bolditalic.korean=NanumGothic Bold
+sansserif.bolditalic.chinese-big5=AR PL UMing
+sansserif.bolditalic.chinese-gb18030=AR PL UMing
--monospaced.plain.latin-1=DejaVu LGC Sans Mono
--monospaced.plain.japanese-x0208=Sazanami Gothic
--monospaced.plain.korean=Baekmuk Gulim
--monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni
--monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+-serif.plain.latin-1=DejaVu LGC Serif
+serif.plain.latin-1=DejaVu Serif
-+serif.plain.japanese-x0208=Sazanami Mincho
+ serif.plain.japanese-x0208=Sazanami Mincho
+-serif.plain.korean=Baekmuk Batang
+-serif.plain.chinese-big5=AR PL ZenKai Uni
+-serif.plain.chinese-gb18030=AR PL ZenKai Uni
+serif.plain.korean=NanumMyeongjo
+serif.plain.chinese-big5=AR PL UKai
+serif.plain.chinese-gb18030=AR PL UKai
--monospaced.bold.latin-1=DejaVu LGC Sans Mono Bold
--monospaced.bold.japanese-x0208=Sazanami Gothic
--monospaced.bold.korean=Baekmuk Gulim
--monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni
--monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+-serif.bold.latin-1=DejaVu LGC Serif Bold
+serif.bold.latin-1=DejaVu Serif Bold
-+serif.bold.japanese-x0208=Sazanami Mincho
+ serif.bold.japanese-x0208=Sazanami Mincho
+-serif.bold.korean=Baekmuk Batang
+-serif.bold.chinese-big5=AR PL ZenKai Uni
+-serif.bold.chinese-gb18030=AR PL ZenKai Uni
+serif.bold.korean=NanumMyeongjo Bold
+serif.bold.chinese-big5=AR PL UKai
+serif.bold.chinese-gb18030=AR PL UKai
--monospaced.italic.latin-1=DejaVu LGC Sans Mono Oblique
--monospaced.italic.japanese-x0208=Sazanami Gothic
--monospaced.italic.korean=Baekmuk Gulim
--monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni
--monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+-serif.italic.latin-1=DejaVu LGC Serif Oblique
+serif.italic.latin-1=DejaVu Serif Italic
-+serif.italic.japanese-x0208=Sazanami Mincho
+ serif.italic.japanese-x0208=Sazanami Mincho
+-serif.italic.korean=Baekmuk Batang
+-serif.italic.chinese-big5=AR PL ZenKai Uni
+-serif.italic.chinese-gb18030=AR PL ZenKai Uni
+serif.italic.korean=NanumMyeongjo
+serif.italic.chinese-big5=AR PL UKai
+serif.italic.chinese-gb18030=AR PL UKai
--monospaced.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique
--monospaced.bolditalic.japanese-x0208=Sazanami Gothic
--monospaced.bolditalic.korean=Baekmuk Gulim
--monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
--monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+-serif.bolditalic.latin-1=DejaVu LGC Serif Bold Oblique
+serif.bolditalic.latin-1=DejaVu Serif Bold Italic
-+serif.bolditalic.japanese-x0208=Sazanami Mincho
+ serif.bolditalic.japanese-x0208=Sazanami Mincho
+-serif.bolditalic.korean=Baekmuk Batang
+-serif.bolditalic.chinese-big5=AR PL ZenKai Uni
+-serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni
+serif.bolditalic.korean=NanumMyeongjo Bold
+serif.bolditalic.chinese-big5=AR PL UKai
+serif.bolditalic.chinese-gb18030=AR PL UKai
--dialoginput.plain.latin-1=DejaVu LGC Sans Mono
+-monospaced.plain.latin-1=DejaVu LGC Sans Mono
+monospaced.plain.latin-1=DejaVu Sans Mono
-+monospaced.plain.japanese-x0208=Sazanami Gothic
+ monospaced.plain.japanese-x0208=Sazanami Gothic
+-monospaced.plain.korean=Baekmuk Gulim
+-monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni
+-monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+monospaced.plain.korean=NanumGothic
+monospaced.plain.chinese-big5=AR PL UMing
+monospaced.plain.chinese-gb18030=AR PL UMing
-+
+
+-monospaced.bold.latin-1=DejaVu LGC Sans Mono Bold
+monospaced.bold.latin-1=DejaVu Sans Mono Bold
-+monospaced.bold.japanese-x0208=Sazanami Gothic
+ monospaced.bold.japanese-x0208=Sazanami Gothic
+-monospaced.bold.korean=Baekmuk Gulim
+-monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni
+-monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+monospaced.bold.korean=NanumGothic Bold
+monospaced.bold.chinese-big5=AR PL UMing
+monospaced.bold.chinese-gb18030=AR PL UMing
-+
+
+-monospaced.italic.latin-1=DejaVu LGC Sans Mono Oblique
+monospaced.italic.latin-1=DejaVu Sans Mono Oblique
-+monospaced.italic.japanese-x0208=Sazanami Gothic
+ monospaced.italic.japanese-x0208=Sazanami Gothic
+-monospaced.italic.korean=Baekmuk Gulim
+-monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni
+-monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+monospaced.italic.korean=NanumGothic
+monospaced.italic.chinese-big5=AR PL UMing
+monospaced.italic.chinese-gb18030=AR PL UMing
-+
+
+-monospaced.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique
+monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
-+monospaced.bolditalic.japanese-x0208=Sazanami Gothic
+ monospaced.bolditalic.japanese-x0208=Sazanami Gothic
+-monospaced.bolditalic.korean=Baekmuk Gulim
+-monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+-monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+monospaced.bolditalic.korean=NanumGothic Bold
+monospaced.bolditalic.chinese-big5=AR PL UMing
+monospaced.bolditalic.chinese-gb18030=AR PL UMing
-+
-+
+
+
+-dialoginput.plain.latin-1=DejaVu LGC Sans Mono
+dialoginput.plain.latin-1=DejaVu Sans Mono
dialoginput.plain.japanese-x0208=Sazanami Gothic
-dialoginput.plain.korean=Baekmuk Gulim
@@ -17764,37 +18036,36 @@
-filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Bold.ttf
-filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Oblique.ttf
-filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf
--
--filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono.ttf
--filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf
--filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Oblique.ttf
--filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-BoldOblique.ttf
+## FIXME: Should not hardcode /usr/local
+filename.DejaVu_Sans=/usr/local/lib/X11/fonts/dejavu/DejaVuSans.ttf
+filename.DejaVu_Sans_Bold=/usr/local/lib/X11/fonts/dejavu/DejaVuSans-Bold.ttf
+filename.DejaVu_Sans_Oblique=/usr/local/lib/X11/fonts/dejavu/DejaVuSans-Oblique.ttf
+filename.DejaVu_Sans_Bold_Oblique=/usr/local/lib/X11/fonts/dejavu/DejaVuSans-BoldOblique.ttf
--filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif.ttf
--filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Bold.ttf
--filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Oblique.ttf
--filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-BoldOblique.ttf
+-filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono.ttf
+-filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf
+-filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Oblique.ttf
+-filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-BoldOblique.ttf
+filename.DejaVu_Sans_Mono=/usr/local/lib/X11/fonts/dejavu/DejaVuSansMono.ttf
+filename.DejaVu_Sans_Mono_Bold=/usr/local/lib/X11/fonts/dejavu/DejaVuSansMono-Bold.ttf
+filename.DejaVu_Sans_Mono_Oblique=/usr/local/lib/X11/fonts/dejavu/DejaVuSansMono-Oblique.ttf
+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/local/lib/X11/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf
+-filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif.ttf
+-filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Bold.ttf
+-filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Oblique.ttf
+-filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-BoldOblique.ttf
++filename.DejaVu_Serif=/usr/local/lib/X11/fonts/dejavu/DejaVuSerif.ttf
++filename.DejaVu_Serif_Bold=/usr/local/lib/X11/fonts/dejavu/DejaVuSerif-Bold.ttf
++filename.DejaVu_Serif_Italic=/usr/local/lib/X11/fonts/dejavu/DejaVuSerif-Italic.ttf
++filename.DejaVu_Serif_Bold_Italic=/usr/local/lib/X11/fonts/dejavu/DejaVuSerif-BoldItalic.ttf
+
-filename.Sazanami_Gothic=/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf
-filename.Sazanami_Mincho=/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf
-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/chinese/TrueType/uming.ttf
-filename.AR_PL_ZenKai_Uni=/usr/share/fonts/chinese/TrueType/ukai.ttf
-filename.Baekmuk_Gulim=/usr/share/fonts/korean/TrueType/gulim.ttf
-filename.Baekmuk_Batang=/usr/share/fonts/korean/TrueType/batang.ttf
-+filename.DejaVu_Serif=/usr/local/lib/X11/fonts/dejavu/DejaVuSerif.ttf
-+filename.DejaVu_Serif_Bold=/usr/local/lib/X11/fonts/dejavu/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Italic=/usr/local/lib/X11/fonts/dejavu/DejaVuSerif-Italic.ttf
-+filename.DejaVu_Serif_Bold_Italic=/usr/local/lib/X11/fonts/dejavu/DejaVuSerif-BoldItalic.ttf
-+
+filename.Sazanami_Gothic=/usr/local/share/font-sazanami/sazanami-gothic.ttf
+filename.Sazanami_Mincho=/usr/local/share/font-sazanami/sazanami-mincho.ttf
+filename.AR_PL_ShanHeiSun_Uni=/usr/local/share/fonts/TrueType/uming.ttc
@@ -17803,8 +18074,8 @@
+filename.NanumGothic_Bold=/usr/local/lib/X11/fonts/nanum-ttf/NanumGothicBold.ttf
+filename.NanumMyeongjo=/usr/local/lib/X11/fonts/nanum-ttf/NanumMyeongjo.ttf
+filename.NanumMyeongjo_Bold=/usr/local/lib/X11/fonts/nanum-ttf/NanumMyeongjoBold.ttf
---- ./jdk/src/solaris/classes/sun/net/PortConfig.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/classes/sun/net/PortConfig.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/classes/sun/net/PortConfig.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/classes/sun/net/PortConfig.java Tue Apr 18 21:21:47 2017 -0700
@@ -52,7 +52,7 @@
} else if (os.startsWith("SunOS")) {
defaultLower = 32768;
@@ -17814,8 +18085,8 @@
defaultLower = 49152;
defaultUpper = 65535;
} else if (os.startsWith("AIX")) {
---- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java Tue Apr 18 21:21:47 2017 -0700
@@ -66,7 +66,7 @@
return createProvider("sun.nio.ch.SolarisAsynchronousChannelProvider");
if (osname.equals("Linux"))
@@ -17825,8 +18096,8 @@
return createProvider("sun.nio.ch.BsdAsynchronousChannelProvider");
if (osname.equals("AIX"))
return createProvider("sun.nio.ch.AixAsynchronousChannelProvider");
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java Tue Apr 18 21:21:47 2017 -0700
@@ -25,10 +25,14 @@
package sun.nio.fs;
@@ -17860,8 +18131,8 @@
+ new MagicFileTypeDetector());
+ }
}
---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java Tue Apr 18 21:21:47 2017 -0700
@@ -61,6 +61,8 @@
return createProvider("sun.nio.fs.SolarisFileSystemProvider");
if (osname.equals("Linux"))
@@ -17871,8 +18142,8 @@
if (osname.contains("OS X"))
return createProvider("sun.nio.fs.MacOSXFileSystemProvider");
if (osname.equals("AIX"))
---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java Tue Apr 18 21:21:47 2017 -0700
@@ -161,6 +161,7 @@
static boolean isBSD() {
@@ -17896,8 +18167,8 @@
"/usr/sbin/lpc status all | grep -E '^[ 0-9a-zA-Z_-]*@' | awk -F'@' '{print $1}' | sort"
};
---- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java Tue Apr 18 21:21:47 2017 -0700
@@ -273,7 +273,7 @@
try {
b = s.getBytes("UTF-8");
@@ -17907,8 +18178,8 @@
}
BsdVirtualMachine.write(fd, b, 0, b.length);
}
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c Tue Apr 18 21:21:47 2017 -0700
@@ -675,6 +675,7 @@
return -1;
}
@@ -17925,8 +18196,8 @@
} else if (err == -EAGAIN) {
TRACE0("xrun_recovery: EAGAIN try again flag.\n");
return 0;
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c Tue Apr 18 21:21:47 2017 -0700
@@ -140,7 +140,7 @@
(float) ((int) sr->samp_rates[s]),
DAUDIO_PCM, /* encoding - let's only do PCM */
@@ -17936,8 +18207,8 @@
FALSE /* little endian */
#else
(bits[b] > 8)?TRUE:FALSE /* big endian */
---- ./jdk/src/solaris/native/common/jni_util_md.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/common/jni_util_md.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/common/jni_util_md.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/common/jni_util_md.c Tue Apr 18 21:21:47 2017 -0700
@@ -28,6 +28,7 @@
#include "jni.h"
#include "jni_util.h"
@@ -17946,8 +18217,8 @@
jstring nativeNewStringPlatform(JNIEnv *env, const char *str) {
return NULL;
---- ./jdk/src/solaris/native/java/lang/java_props_md.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/java/lang/java_props_md.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/java/lang/java_props_md.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/java/lang/java_props_md.c Tue Apr 18 21:21:47 2017 -0700
@@ -151,7 +151,7 @@
lc = setlocale(cat, NULL);
#endif
@@ -17982,8 +18253,8 @@
/* user properties */
{
---- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c Tue Apr 18 21:21:47 2017 -0700
@@ -36,20 +36,13 @@
#include <stdlib.h>
#include <ctype.h>
@@ -18024,8 +18295,8 @@
error = getaddrinfo(hostname, NULL, &hints, &res);
if (error) {
---- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c Tue Apr 18 21:21:47 2017 -0700
@@ -33,7 +33,7 @@
#include <strings.h>
#include <stdlib.h>
@@ -18067,8 +18338,8 @@
#ifdef AF_INET6
/* Try once, with our static buffer. */
memset(&hints, 0, sizeof(hints));
---- ./jdk/src/solaris/native/java/net/NetworkInterface.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/java/net/NetworkInterface.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c Tue Apr 18 21:21:47 2017 -0700
@@ -62,14 +62,19 @@
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -18091,8 +18362,8 @@
#include "jvm.h"
#include "jni_util.h"
---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c Tue Apr 18 21:21:47 2017 -0700
@@ -2222,7 +2222,7 @@
}
}
@@ -18102,8 +18373,26 @@
if (family == AF_INET6 && index == 0) {
index = getDefaultScopeID(env);
}
---- ./jdk/src/solaris/native/java/net/bsd_close.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/java/net/bsd_close.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c Tue Apr 18 21:21:47 2017 -0700
+@@ -212,6 +212,7 @@
+ }
+
+ #ifdef AF_INET6
++#ifndef __OpenBSD__
+ /* Disable IPV6_V6ONLY to ensure dual-socket support */
+ if (domain == AF_INET6) {
+ int arg = 0;
+@@ -222,6 +223,7 @@
+ return;
+ }
+ }
++#endif /* ! __OpenBSD__ */
+ #endif /* AF_INET6 */
+
+ /*
+--- ./jdk/src/solaris/native/java/net/bsd_close.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/java/net/bsd_close.c Tue Apr 18 21:21:47 2017 -0700
@@ -316,11 +316,8 @@
}
@@ -18201,8 +18490,8 @@
}
+#endif
}
---- ./jdk/src/solaris/native/java/net/net_util_md.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/java/net/net_util_md.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/java/net/net_util_md.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/java/net/net_util_md.c Tue Apr 18 21:21:47 2017 -0700
@@ -45,6 +45,10 @@
#endif
#endif
@@ -18223,8 +18512,8 @@
static jclass ni_class = NULL;
static jfieldID ni_defaultIndexID;
if (ni_class == NULL) {
---- ./jdk/src/solaris/native/java/net/net_util_md.h Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/java/net/net_util_md.h Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/java/net/net_util_md.h Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/java/net/net_util_md.h Tue Apr 18 21:21:47 2017 -0700
@@ -47,7 +47,7 @@
close subroutine does not return until the select call returns.
...
@@ -18234,8 +18523,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 Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/java/util/TimeZone_md.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c Tue Apr 18 21:21:47 2017 -0700
@@ -56,7 +56,11 @@
#endif
@@ -18299,8 +18588,8 @@
}
-#endif /* MACOSX */
+#endif /* _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/awt_Font.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_Font.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/awt/awt_Font.c Tue Apr 18 21:21:47 2017 -0700
@@ -255,7 +255,7 @@
if (strcmp(style, "regular") == 0) {
altstyle = "roman";
@@ -18310,8 +18599,8 @@
if (!strcmp(family, "lucidasans")) {
family = "lucida";
}
---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Tue Apr 18 21:21:47 2017 -0700
@@ -121,7 +121,7 @@
*/
@@ -18396,8 +18685,8 @@
#endif /* HEADLESS */
return point;
}
---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c Tue Apr 18 21:21:47 2017 -0700
@@ -52,7 +52,7 @@
XIMPreeditDrawCallbackStruct *);
static void PreeditCaretCallback(XIC, XPointer,
@@ -18617,8 +18906,8 @@
AWT_LOCK();
adjustStatusWindow(window);
AWT_UNLOCK();
---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c Tue Apr 18 21:21:47 2017 -0700
@@ -45,7 +45,7 @@
#include "wsutils.h"
#include "list.h"
@@ -18628,8 +18917,8 @@
#include <sys/socket.h>
#endif
---- ./jdk/src/solaris/native/sun/awt/extutil.h Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/awt/extutil.h Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/awt/extutil.h Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/awt/extutil.h Tue Apr 18 21:21:47 2017 -0700
@@ -58,7 +58,7 @@
*/
/* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
@@ -18645,8 +18934,8 @@
-#endif /* __linux__ || MACOSX */
+#endif /* __linux__ || _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/fontpath.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/awt/fontpath.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/awt/fontpath.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/awt/fontpath.c Tue Apr 18 21:21:47 2017 -0700
@@ -23,9 +23,9 @@
* questions.
*/
@@ -18735,8 +19024,8 @@
&& (strcmp((char*)fontformat, "Type 1") != 0)
#endif
) {
---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h Tue Apr 18 21:21:47 2017 -0700
@@ -28,11 +28,11 @@
#include <sys/types.h>
@@ -18752,8 +19041,8 @@
typedef unsigned char jubyte;
typedef unsigned short jushort;
---- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c Tue Apr 18 21:21:47 2017 -0700
@@ -63,9 +63,6 @@
* MLIB_EDGE_SRC_PADDED
*/
@@ -18858,8 +19147,8 @@
LOGIC(da[0], dtmp, dtmp1, |);
}
else { /* aligned */
---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c Tue Apr 18 21:21:47 2017 -0700
@@ -804,7 +804,7 @@
static int initialized;
static int usevis = JNI_TRUE;
@@ -18870,7 +19159,7 @@
#else
# define ULTRA_CHIP "sun4u"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/src/solaris/native/sun/management/BsdOperatingSystem.c Sat Jan 28 19:08:22 2017 -0800
++++ ./jdk/src/solaris/native/sun/management/BsdOperatingSystem.c Tue Apr 18 21:21:47 2017 -0700
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
@@ -18914,8 +19203,8 @@
+{
+ return (jdouble) -1;
+}
---- ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/management/OperatingSystemImpl.c Tue Apr 18 21:21:47 2017 -0700
@@ -56,6 +56,9 @@
#include <limits.h>
#include <stdlib.h>
@@ -19080,8 +19369,8 @@
return -1;
}
---- ./jdk/src/solaris/native/sun/net/portconfig.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/net/portconfig.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/net/portconfig.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/net/portconfig.c Tue Apr 18 21:21:47 2017 -0700
@@ -67,6 +67,24 @@
range->lower = net_getParam("/dev/tcp", "tcp_smallest_anon_port");
return 0;
@@ -19107,8 +19396,8 @@
#elif defined(_ALLBSD_SOURCE)
{
int ret;
---- ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h Tue Apr 18 21:21:47 2017 -0700
@@ -67,7 +67,7 @@
@@ -19157,8 +19446,8 @@
jboolean loadSocketExtensionFuncs(JNIEnv* env);
#endif /* !SUN_NIO_CH_SCTP_H */
---- ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c Tue Apr 18 21:21:47 2017 -0700
@@ -58,6 +58,7 @@
*/
jboolean loadSocketExtensionFuncs
@@ -19175,8 +19464,8 @@
funcsLoaded = JNI_TRUE;
return JNI_TRUE;
---- ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c Tue Apr 18 21:21:47 2017 -0700
@@ -31,6 +31,12 @@
#include <dlfcn.h>
#include <string.h>
@@ -19199,8 +19488,8 @@
if (magic_handle == NULL) {
return JNI_FALSE;
}
---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c Tue Apr 18 21:21:47 2017 -0700
@@ -54,7 +54,7 @@
}
@@ -19210,8 +19499,8 @@
void *hModule = dlopen(libName, RTLD_LAZY);
#else
void *hModule = dlopen(libName, RTLD_NOLOAD);
---- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c Tue Apr 18 21:21:47 2017 -0700
@@ -37,7 +37,9 @@
#include <sys/types.h>
#include <sys/socket.h>
@@ -19222,8 +19511,8 @@
#include <sys/un.h>
#include <fcntl.h>
---- ./jdk/src/solaris/native/sun/xawt/XWindow.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/solaris/native/sun/xawt/XWindow.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c Tue Apr 18 21:21:47 2017 -0700
@@ -886,7 +886,7 @@
{
KeySym originalKeysym = *keysym;
@@ -19233,8 +19522,8 @@
/* The following code on Linux will cause the keypad keys
* not to echo on JTextField when the NumLock is on. The
* keysyms will be 0, because the last parameter 2 is not defined.
---- ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp Tue Apr 18 21:21:47 2017 -0700
@@ -308,7 +308,7 @@
DAUDIO_PCM,
(bitsArray[bitIndex]==8)?FALSE:TRUE, /* signed */
diff --git a/java/openjdk8/files/patch-bsd-test b/java/openjdk8/files/patch-bsd-test
index adf05de8342a..071a811b9dcb 100644
--- a/java/openjdk8/files/patch-bsd-test
+++ b/java/openjdk8/files/patch-bsd-test
@@ -1,5 +1,5 @@
---- ./hotspot/test/compiler/5091921/Test7005594.sh Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/test/compiler/5091921/Test7005594.sh Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/test/compiler/5091921/Test7005594.sh Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/test/compiler/5091921/Test7005594.sh Tue Apr 18 21:21:39 2017 -0700
@@ -60,6 +60,15 @@
# Windows/MKS
MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
@@ -16,8 +16,8 @@
else
echo "Unable to determine amount of physical memory on the machine"
fi
---- ./hotspot/test/compiler/6894807/Test6894807.sh Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/test/compiler/6894807/Test6894807.sh Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/test/compiler/6894807/Test6894807.sh Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/test/compiler/6894807/Test6894807.sh Tue Apr 18 21:21:39 2017 -0700
@@ -21,7 +21,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -27,8 +27,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./hotspot/test/runtime/7110720/Test7110720.sh Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/test/runtime/7110720/Test7110720.sh Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/test/runtime/7110720/Test7110720.sh Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/test/runtime/7110720/Test7110720.sh Tue Apr 18 21:21:39 2017 -0700
@@ -28,7 +28,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -38,8 +38,8 @@
FS="/"
RM=/bin/rm
CP=/bin/cp
---- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Tue Apr 18 21:21:39 2017 -0700
@@ -37,8 +37,8 @@
public static void main(String args[]) throws Throwable {
@@ -51,8 +51,8 @@
return;
}
---- ./hotspot/test/test_env.sh Mon Nov 28 13:51:31 2016 -0800
-+++ ./hotspot/test/test_env.sh Sat Jan 28 19:02:08 2017 -0800
+--- ./hotspot/test/test_env.sh Mon Feb 27 11:16:11 2017 -0800
++++ ./hotspot/test/test_env.sh Tue Apr 18 21:21:39 2017 -0700
@@ -53,7 +53,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -62,8 +62,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Tue Apr 18 21:21:47 2017 -0700
@@ -48,7 +48,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -73,8 +73,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Tue Apr 18 21:21:47 2017 -0700
@@ -31,7 +31,7 @@
OS=`uname -s`
@@ -84,8 +84,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -56,7 +56,7 @@
OS=`uname -s`
@@ -95,8 +95,8 @@
PATHSEP=":"
;;
---- ./jdk/test/com/sun/jdi/JITDebug.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/com/sun/jdi/JITDebug.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/com/sun/jdi/JITDebug.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/com/sun/jdi/JITDebug.sh Tue Apr 18 21:21:47 2017 -0700
@@ -63,7 +63,7 @@
OS=`uname -s`
export TRANSPORT_METHOD
@@ -106,8 +106,8 @@
PATHSEP=":"
TRANSPORT_METHOD=dt_socket
;;
---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -106,7 +106,7 @@
xx=`find ${jreloc}/lib -name libdt_socket.so`
libloc=`dirname ${xx}`
@@ -117,8 +117,8 @@
libloc=${jreloc}/lib
;;
Windows*)
---- ./jdk/test/com/sun/jdi/ShellScaffold.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/com/sun/jdi/ShellScaffold.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/com/sun/jdi/ShellScaffold.sh Tue Apr 18 21:21:47 2017 -0700
@@ -284,7 +284,7 @@
psCmd=ps
jstack=jstack.exe
@@ -128,8 +128,8 @@
transport=dt_socket
address=
devnull=/dev/null
---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Tue Apr 18 21:21:47 2017 -0700
@@ -45,7 +45,7 @@
OS=`uname -s`
@@ -139,8 +139,8 @@
PS=":"
;;
Windows* | CYGWIN*)
---- ./jdk/test/java/awt/JAWT/JAWT.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/awt/JAWT/JAWT.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/awt/JAWT/JAWT.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/awt/JAWT/JAWT.sh Tue Apr 18 21:21:47 2017 -0700
@@ -62,6 +62,23 @@
MAKE="make"
LD_LIBRARY_PATH="."
@@ -174,8 +174,8 @@
exit 0;
;;
* )
---- ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -86,6 +86,14 @@
TMP="/tmp"
;;
@@ -191,8 +191,8 @@
Windows* )
VAR="A different value for Win32"
DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0"
---- ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -59,7 +59,7 @@
# Checking for proper OS
OS=`uname -s`
@@ -202,8 +202,8 @@
FILESEP="/"
;;
---- ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -119,6 +119,14 @@
TMP="/tmp"
;;
@@ -219,8 +219,8 @@
Windows* )
VAR="A different value for Win32"
DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0"
---- ./jdk/test/java/io/File/GetXSpace.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/io/File/GetXSpace.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/io/File/GetXSpace.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/io/File/GetXSpace.java Tue Apr 18 21:21:47 2017 -0700
@@ -51,7 +51,7 @@
private static final String dfFormat;
static {
@@ -230,8 +230,8 @@
// FileSystem Total Used Available Use% MountedOn
dfFormat = "([^\\s]+)\\s+(\\d+)\\s+\\d+\\s+(\\d+)\\s+\\d+%\\s+([^\\s]+)";
} else if (name.startsWith("Windows")) {
---- ./jdk/test/java/io/File/GetXSpace.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/io/File/GetXSpace.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/io/File/GetXSpace.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/io/File/GetXSpace.sh Tue Apr 18 21:21:47 2017 -0700
@@ -26,7 +26,7 @@
# set platform-dependent variable
OS=`uname -s`
@@ -241,8 +241,8 @@
Windows_98 ) return ;;
Windows* ) SID=`sid`; TMP="c:/temp" ;;
* )
---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Tue Apr 18 21:21:47 2017 -0700
@@ -45,7 +45,7 @@
# Need to determine the classpath separator and filepath separator based on the
# operating system.
@@ -252,8 +252,8 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Tue Apr 18 21:21:47 2017 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -263,8 +263,8 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh Tue Apr 18 21:21:47 2017 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -274,8 +274,8 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/lang/ClassLoader/Assert.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/lang/ClassLoader/Assert.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/lang/ClassLoader/Assert.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/lang/ClassLoader/Assert.sh Tue Apr 18 21:21:47 2017 -0700
@@ -25,7 +25,7 @@
OS=`uname -s`
@@ -285,8 +285,8 @@
FS="/"
CHMOD="${FS}bin${FS}chmod"
;;
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Tue Apr 18 21:21:47 2017 -0700
@@ -55,7 +55,7 @@
Linux )
FS="/"
@@ -296,8 +296,8 @@
FS="/"
;;
AIX )
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Tue Apr 18 21:21:47 2017 -0700
@@ -60,7 +60,7 @@
Linux )
FS="/"
@@ -307,8 +307,8 @@
FS="/"
;;
AIX )
---- ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Tue Apr 18 21:21:47 2017 -0700
@@ -148,6 +148,9 @@
} else if (osName.startsWith("Linux") == true) {
return new UnixTest(
@@ -319,8 +319,8 @@
} else if (osName.startsWith("Mac OS")) {
return new MacTest(
File.createTempFile("ProcessTrap-", ".sh",null));
---- ./jdk/test/java/lang/ProcessBuilder/Zombies.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/lang/ProcessBuilder/Zombies.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/lang/ProcessBuilder/Zombies.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/lang/ProcessBuilder/Zombies.java Tue Apr 18 21:21:47 2017 -0700
@@ -34,7 +34,7 @@
static final String os = System.getProperty("os.name");
@@ -330,8 +330,8 @@
"/usr/bin/true" : "/bin/true";
public static void main(String[] args) throws Throwable {
---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Tue Apr 18 21:21:47 2017 -0700
@@ -30,7 +30,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -341,8 +341,8 @@
Windows* | CYGWIN* )
echo "Passed"; exit 0 ;;
* ) echo "Unrecognized system!" ; exit 1 ;;
---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Tue Apr 18 21:21:47 2017 -0700
@@ -48,7 +48,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -352,8 +352,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/java/lang/instrument/MakeJAR2.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/lang/instrument/MakeJAR2.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/lang/instrument/MakeJAR2.sh Tue Apr 18 21:21:47 2017 -0700
@@ -55,7 +55,7 @@
OS=`uname -s`
@@ -363,8 +363,8 @@
PATHSEP=":"
;;
---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Tue Apr 18 21:21:47 2017 -0700
@@ -43,7 +43,7 @@
PS=":"
FS="/"
@@ -374,8 +374,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Tue Apr 18 21:21:47 2017 -0700
@@ -79,8 +79,10 @@
System.out.println("Test passed.");
}
@@ -397,8 +397,8 @@
? output.split(" ")
: output.split(",");
double expected = Double.parseDouble(lavg[0]);
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Tue Apr 18 21:21:47 2017 -0700
@@ -61,7 +61,7 @@
while true; do
echo "Run $i: TestSystemLoadAvg"
@@ -408,8 +408,8 @@
runOne GetSystemLoadAverage
;;
* )
---- ./jdk/test/java/net/Authenticator/B4933582.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/net/Authenticator/B4933582.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/net/Authenticator/B4933582.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/net/Authenticator/B4933582.sh Tue Apr 18 21:21:47 2017 -0700
@@ -26,7 +26,7 @@
OS=`uname -s`
@@ -419,8 +419,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/DatagramSocket/Send12k.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/net/DatagramSocket/Send12k.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/net/DatagramSocket/Send12k.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/net/DatagramSocket/Send12k.java Tue Apr 18 21:21:47 2017 -0700
@@ -36,9 +36,10 @@
public static void main(String args[]) throws Exception {
@@ -434,8 +434,8 @@
SEND_SIZE = 16 * 576;
} else {
SEND_SIZE = 16 * 1024;
---- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Tue Apr 18 21:21:47 2017 -0700
@@ -45,6 +45,8 @@
return (true);
if (p.getProperty ("os.name").equals ("Linux"))
@@ -445,8 +445,8 @@
if (p.getProperty ("os.name").startsWith ("Mac OS"))
return (true);
// Check for specific Solaris version from here
---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Tue Apr 18 21:21:47 2017 -0700
@@ -27,11 +27,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -460,8 +460,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/net/Socket/OldSocketImpl.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/net/Socket/OldSocketImpl.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/net/Socket/OldSocketImpl.sh Tue Apr 18 21:21:47 2017 -0700
@@ -28,7 +28,7 @@
OS=`uname -s`
@@ -471,8 +471,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URL/B5086147.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/net/URL/B5086147.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/net/URL/B5086147.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/net/URL/B5086147.sh Tue Apr 18 21:21:47 2017 -0700
@@ -26,7 +26,7 @@
OS=`uname -s`
@@ -482,8 +482,8 @@
exit 0
;;
CYGWIN* )
---- ./jdk/test/java/net/URLClassLoader/B5077773.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/net/URLClassLoader/B5077773.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/net/URLClassLoader/B5077773.sh Tue Apr 18 21:21:47 2017 -0700
@@ -34,11 +34,7 @@
OS=`uname -s`
@@ -497,8 +497,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Tue Apr 18 21:21:47 2017 -0700
@@ -27,11 +27,7 @@
OS=`uname -s`
@@ -512,8 +512,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLConnection/6212146/test.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/net/URLConnection/6212146/test.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/net/URLConnection/6212146/test.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/net/URLConnection/6212146/test.sh Tue Apr 18 21:21:47 2017 -0700
@@ -33,11 +33,7 @@
OS=`uname -s`
@@ -527,8 +527,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/nio/channels/FileChannel/Transfer.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/nio/channels/FileChannel/Transfer.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/nio/channels/FileChannel/Transfer.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/nio/channels/FileChannel/Transfer.java Tue Apr 18 21:21:47 2017 -0700
@@ -228,7 +228,7 @@
// Windows and Linux can't handle the really large file sizes for a
// truncate or a positional write required by the test for 4563125
@@ -538,8 +538,8 @@
return;
File source = File.createTempFile("blah", null);
source.deleteOnExit();
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Tue Apr 18 21:21:47 2017 -0700
@@ -17,6 +17,12 @@
#include "Launcher.h"
@@ -562,8 +562,8 @@
_exit(-1);
}
---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Tue Apr 18 21:21:47 2017 -0700
@@ -34,7 +34,7 @@
OS=`uname -s`
@@ -573,8 +573,8 @@
# Skip locale test for Windows
Windows* | CYGWIN* )
echo "Passed"; exit 0 ;;
---- ./jdk/test/java/nio/charset/spi/basic.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/nio/charset/spi/basic.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/nio/charset/spi/basic.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/nio/charset/spi/basic.sh Tue Apr 18 21:21:47 2017 -0700
@@ -48,7 +48,7 @@
DIR=`pwd`
@@ -584,8 +584,8 @@
Windows* ) CPS=';' ;;
CYGWIN* )
DIR=`/usr/bin/cygpath -a -s -m $DIR`
---- ./jdk/test/java/nio/file/FileSystem/Basic.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/nio/file/FileSystem/Basic.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/nio/file/FileSystem/Basic.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/nio/file/FileSystem/Basic.java Tue Apr 18 21:21:47 2017 -0700
@@ -76,7 +76,7 @@
checkSupported(fs, "posix", "unix", "owner", "acl", "user");
if (os.equals("Linux"))
@@ -595,8 +595,8 @@
checkSupported(fs, "posix", "unix", "owner");
if (os.equals("Windows"))
checkSupported(fs, "owner", "dos", "acl", "user");
---- ./jdk/test/java/nio/file/Files/CopyAndMove.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/nio/file/Files/CopyAndMove.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/nio/file/Files/CopyAndMove.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/nio/file/Files/CopyAndMove.java Tue Apr 18 21:21:47 2017 -0700
@@ -651,7 +651,7 @@
// check POSIX attributes are copied
@@ -615,8 +615,8 @@
boolean isDirectory = isDirectory(file, NOFOLLOW_LINKS);
if (isUnix) {
---- ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Tue Apr 18 21:21:47 2017 -0700
@@ -33,7 +33,7 @@
OS=`uname -s`
@@ -626,8 +626,8 @@
PS=":"
;;
Windows* | CYGWIN* )
---- ./jdk/test/java/rmi/registry/readTest/readTest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/rmi/registry/readTest/readTest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/rmi/registry/readTest/readTest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/rmi/registry/readTest/readTest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -34,7 +34,7 @@
REGARGS=""
@@ -637,8 +637,8 @@
PS=":"
FS="/"
CHMOD="${FS}bin${FS}chmod"
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Tue Apr 18 21:21:47 2017 -0700
@@ -58,7 +58,7 @@
PATHSEP=":"
FILESEP="/"
@@ -648,8 +648,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Tue Apr 18 21:21:47 2017 -0700
@@ -42,7 +42,7 @@
PATHSEP=":"
FILESEP="/"
@@ -659,8 +659,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Tue Apr 18 21:21:47 2017 -0700
@@ -66,7 +66,7 @@
PATHSEP=";"
FILESEP="/"
@@ -670,8 +670,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh Tue Apr 18 21:21:47 2017 -0700
@@ -58,7 +58,7 @@
PATHSEP=":"
FILESEP="/"
@@ -681,8 +681,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/signedfirst/Static.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/security/Security/signedfirst/Static.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/security/Security/signedfirst/Static.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/security/Security/signedfirst/Static.sh Tue Apr 18 21:21:47 2017 -0700
@@ -58,7 +58,7 @@
PATHSEP=":"
FILESEP="/"
@@ -692,8 +692,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/Currency/PropertiesTest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/util/Currency/PropertiesTest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/util/Currency/PropertiesTest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/util/Currency/PropertiesTest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -52,7 +52,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -703,8 +703,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -62,7 +62,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -714,8 +714,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Tue Apr 18 21:21:47 2017 -0700
@@ -31,7 +31,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -725,8 +725,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/ServiceLoader/basic.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/util/ServiceLoader/basic.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/util/ServiceLoader/basic.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/util/ServiceLoader/basic.sh Tue Apr 18 21:21:47 2017 -0700
@@ -43,9 +43,7 @@
OS=`uname -s`
@@ -738,8 +738,8 @@
SEP=':' ;;
* )
SEP='\;' ;;
---- ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Tue Apr 18 21:21:47 2017 -0700
@@ -31,7 +31,7 @@
OS=`uname -s`
@@ -749,8 +749,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -56,7 +56,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -760,8 +760,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -89,7 +89,7 @@
FILESEP="/"
;;
@@ -771,8 +771,8 @@
VAR="A different value for Linux"
DEFAULT_JDK=/none
#DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386
---- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -90,7 +90,7 @@
FILESEP="/"
;;
@@ -782,8 +782,8 @@
VAR="A different value for Linux"
DEFAULT_JDK=/none
#DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386
---- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Tue Apr 18 21:21:47 2017 -0700
@@ -108,6 +108,14 @@
TMP="/tmp"
;;
@@ -799,8 +799,8 @@
Windows* )
VAR="A different value for Win32"
DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0"
---- ./jdk/test/javax/script/CommonSetup.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/javax/script/CommonSetup.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/javax/script/CommonSetup.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/javax/script/CommonSetup.sh Tue Apr 18 21:21:47 2017 -0700
@@ -36,7 +36,7 @@
OS=`uname -s`
@@ -810,8 +810,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Tue Apr 18 21:21:47 2017 -0700
@@ -43,7 +43,7 @@
FS="/"
RM="/bin/rm -f"
@@ -821,8 +821,8 @@
PS=":"
FS="/"
RM="/bin/rm -f"
---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Tue Apr 18 21:21:47 2017 -0700
@@ -53,7 +53,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -832,8 +832,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Tue Apr 18 21:21:47 2017 -0700
@@ -53,8 +53,13 @@
return isOs("linux");
}
@@ -849,8 +849,8 @@
}
public static String getOsName() {
---- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Tue Apr 18 21:21:47 2017 -0700
@@ -107,8 +107,8 @@
public static void main(String[] args) throws AWTException, InvocationTargetException, InterruptedException {
@@ -862,8 +862,8 @@
"skipping!");
return;
}
---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Tue Apr 18 21:21:47 2017 -0700
@@ -42,7 +42,7 @@
fi
@@ -873,8 +873,8 @@
PATHSEP=":"
FILESEP="/"
DFILESEP=$FILESEP
---- ./jdk/test/sun/net/ftp/MarkResetTest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/net/ftp/MarkResetTest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/net/ftp/MarkResetTest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/net/ftp/MarkResetTest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -28,7 +28,7 @@
OS=`uname -s`
@@ -884,8 +884,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Tue Apr 18 21:21:47 2017 -0700
@@ -28,7 +28,7 @@
OS=`uname -s`
@@ -895,8 +895,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Tue Apr 18 21:21:47 2017 -0700
@@ -31,7 +31,7 @@
OS=`uname -s`
@@ -906,8 +906,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Tue Apr 18 21:21:47 2017 -0700
@@ -31,7 +31,7 @@
OS=`uname -s`
@@ -917,8 +917,8 @@
PS=":"
FS="/"
CHMOD="${FS}bin${FS}chmod"
---- ./jdk/test/sun/nio/ch/SelProvider.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/nio/ch/SelProvider.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/nio/ch/SelProvider.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/nio/ch/SelProvider.java Tue Apr 18 21:21:47 2017 -0700
@@ -39,7 +39,7 @@
expected = "sun.nio.ch.DevPollSelectorProvider";
} else if ("Linux".equals(osname)) {
@@ -928,366 +928,8 @@
expected = "sun.nio.ch.KQueueSelectorProvider";
} else {
return;
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/reflect/ReflectionFactory/ReflectionFactoryTest.java Sat Jan 28 19:08:22 2017 -0800
-@@ -0,0 +1,341 @@
-+/*
-+ * Copyright (c) 2016, 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
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+import java.io.ByteArrayInputStream;
-+import java.io.ByteArrayOutputStream;
-+import java.io.Externalizable;
-+import java.io.IOException;
-+import java.io.ObjectInput;
-+import java.io.ObjectInputStream;
-+import java.io.ObjectOutput;
-+import java.io.ObjectOutputStream;
-+import java.io.OptionalDataException;
-+import java.io.Serializable;
-+import java.lang.invoke.MethodHandle;
-+import java.lang.reflect.Constructor;
-+import java.lang.reflect.InvocationTargetException;
-+
-+import sun.reflect.ReflectionFactory;
-+
-+import org.testng.Assert;
-+import org.testng.annotations.BeforeClass;
-+import org.testng.annotations.Test;
-+import org.testng.annotations.DataProvider;
-+import org.testng.TestNG;
-+
-+/*
-+ * @test
-+ * @bug 8137058 8164908 8168980
-+ * @run testng ReflectionFactoryTest
-+ * @run testng/othervm/policy=security.policy ReflectionFactoryTest
-+ * @summary Basic test for the unsupported ReflectionFactory
-+ */
-+
-+public class ReflectionFactoryTest {
-+
-+ // Initialized by init()
-+ static ReflectionFactory factory;
-+
-+ @DataProvider(name = "ClassConstructors")
-+ static Object[][] classConstructors() {
-+ return new Object[][] {
-+ {Object.class},
-+ {Foo.class},
-+ {Bar.class},
-+ };
-+ }
-+
-+ @BeforeClass
-+ static void init() {
-+ factory = ReflectionFactory.getReflectionFactory();
-+ }
-+
-+ /**
-+ * Test that the correct Constructor is selected and run.
-+ * @param type type of object to create
-+ * @throws NoSuchMethodException - error
-+ * @throws InstantiationException - error
-+ * @throws IllegalAccessException - error
-+ * @throws InvocationTargetException - error
-+ */
-+ @Test(dataProvider="ClassConstructors")
-+ static void testConstructor(Class<?> type)
-+ throws NoSuchMethodException, InstantiationException,
-+ IllegalAccessException, InvocationTargetException
-+ {
-+ @SuppressWarnings("unchecked")
-+ Constructor<?> c = factory.newConstructorForSerialization(type);
-+
-+ Object o = c.newInstance();
-+ Assert.assertEquals(o.getClass(), type, "Instance is wrong type");
-+ if (o instanceof Foo) {
-+ Foo foo = (Foo)o;
-+ foo.check();
-+ }
-+ }
-+
-+ @DataProvider(name = "NonSerialConstructors")
-+ static Object[][] constructors() throws NoSuchMethodException {
-+ return new Object[][] {
-+ {Foo.class, Object.class.getDeclaredConstructor()},
-+ {Foo.class, Foo.class.getDeclaredConstructor()},
-+ {Baz.class, Object.class.getDeclaredConstructor()},
-+ {Baz.class, Foo.class.getDeclaredConstructor()},
-+ {Baz.class, Baz.class.getDeclaredConstructor()}
-+ };
-+ }
-+
-+ /**
-+ * Tests that the given Constructor, in the hierarchy, is run.
-+ */
-+ @Test(dataProvider="NonSerialConstructors")
-+ static void testNonSerializableConstructor(Class<?> cl,
-+ Constructor<?> constructorToCall)
-+ throws ReflectiveOperationException
-+ {
-+ @SuppressWarnings("unchecked")
-+ Constructor<?> c = factory.newConstructorForSerialization(cl,
-+ constructorToCall);
-+
-+ Object o = c.newInstance();
-+ Assert.assertEquals(o.getClass(), cl, "Instance is wrong type");
-+
-+ int expectedFoo = 0;
-+ int expectedBaz = 0;
-+ if (constructorToCall.getName().equals("ReflectionFactoryTest$Foo")) {
-+ expectedFoo = 1;
-+ } else if (constructorToCall.getName().equals("ReflectionFactoryTest$Baz")) {
-+ expectedFoo = 1;
-+ expectedBaz = 4;
-+ }
-+
-+ Assert.assertEquals(((Foo)o).foo(), expectedFoo);
-+ if (o instanceof Baz) {
-+ Assert.assertEquals(((Baz)o).baz(), expectedBaz);
-+ }
-+ }
-+
-+ static class Foo {
-+ private int foo;
-+ public Foo() {
-+ this.foo = 1;
-+ }
-+
-+ public String toString() {
-+ return "foo: " + foo;
-+ }
-+
-+ public void check() {
-+ int expectedFoo = 1;
-+ Assert.assertEquals(foo, expectedFoo, "foo() constructor not run");
-+ }
-+
-+ public int foo() { return foo; }
-+ }
-+
-+ static class Bar extends Foo implements Serializable {
-+ private static final long serialVersionUID = 3L;
-+
-+ private int bar;
-+ public Bar() {
-+ this.bar = 1;
-+ }
-+
-+ public String toString() {
-+ return super.toString() + ", bar: " + bar;
-+ }
-+
-+ public void check() {
-+ super.check();
-+ int expectedBar = 0;
-+ Assert.assertEquals(bar, expectedBar, "bar() constructor not run");
-+ }
-+ }
-+
-+ static class Baz extends Foo {
-+ private static final long serialVersionUID = 4L;
-+
-+ private final int baz;
-+ public Baz() { this.baz = 4; }
-+ public int baz() { return baz; }
-+ }
-+
-+ /**
-+ * Test newConstructorForExternalization returns the constructor and it can be called.
-+ * @throws NoSuchMethodException - error
-+ * @throws InstantiationException - error
-+ * @throws IllegalAccessException - error
-+ * @throws InvocationTargetException - error
-+ */
-+ @Test
-+ static void newConstructorForExternalization()
-+ throws NoSuchMethodException, InstantiationException,
-+ IllegalAccessException, InvocationTargetException {
-+ Constructor<?> cons = factory.newConstructorForExternalization(Ext.class);
-+ Ext ext = (Ext)cons.newInstance();
-+ Assert.assertEquals(ext.ext, 1, "Constructor not run");
-+ }
-+
-+ static class Ext implements Externalizable {
-+ private static final long serialVersionUID = 1L;
-+
-+ int ext;
-+
-+ public Ext() {
-+ ext = 1;
-+ }
-+
-+ @Override
-+ public void writeExternal(ObjectOutput out) throws IOException {}
-+
-+ @Override
-+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {}
-+ }
-+
-+ @Test
-+ static void testReadWriteObjectForSerialization() throws Throwable {
-+ MethodHandle readObjectMethod = factory.readObjectForSerialization(Ser.class);
-+ Assert.assertNotNull(readObjectMethod, "readObjectMethod not found");
-+
-+ MethodHandle readObjectNoDataMethod = factory.readObjectNoDataForSerialization(Ser.class);
-+ Assert.assertNotNull(readObjectNoDataMethod, "readObjectNoDataMethod not found");
-+
-+ MethodHandle writeObjectMethod = factory.writeObjectForSerialization(Ser.class);
-+ Assert.assertNotNull(writeObjectMethod, "writeObjectMethod not found");
-+
-+ MethodHandle readResolveMethod = factory.readResolveForSerialization(Ser.class);
-+ Assert.assertNotNull(readResolveMethod, "readResolveMethod not found");
-+
-+ MethodHandle writeReplaceMethod = factory.writeReplaceForSerialization(Ser.class);
-+ Assert.assertNotNull(writeReplaceMethod, "writeReplaceMethod not found");
-+
-+ byte[] data = null;
-+ try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-+ ObjectOutputStream oos = new ObjectOutputStream(baos)) {
-+ Ser ser = new Ser();
-+
-+ writeReplaceMethod.invoke(ser);
-+ Assert.assertTrue(ser.writeReplaceCalled, "writeReplace not called");
-+ Assert.assertFalse(ser.writeObjectCalled, "writeObject should not have been called");
-+
-+ writeObjectMethod.invoke(ser, oos);
-+ Assert.assertTrue(ser.writeReplaceCalled, "writeReplace should have been called");
-+ Assert.assertTrue(ser.writeObjectCalled, "writeObject not called");
-+ oos.flush();
-+ data = baos.toByteArray();
-+ }
-+
-+ try (ByteArrayInputStream bais = new ByteArrayInputStream(data);
-+ ObjectInputStream ois = new ObjectInputStream(bais)) {
-+ Ser ser2 = new Ser();
-+
-+ readObjectMethod.invoke(ser2, ois);
-+ Assert.assertTrue(ser2.readObjectCalled, "readObject not called");
-+ Assert.assertFalse(ser2.readObjectNoDataCalled, "readObjectNoData should not be called");
-+ Assert.assertFalse(ser2.readResolveCalled, "readResolve should not be called");
-+
-+ readObjectNoDataMethod.invoke(ser2, ois);
-+ Assert.assertTrue(ser2.readObjectCalled, "readObject should have been called");
-+ Assert.assertTrue(ser2.readObjectNoDataCalled, "readObjectNoData not called");
-+ Assert.assertFalse(ser2.readResolveCalled, "readResolve should not be called");
-+
-+ readResolveMethod.invoke(ser2);
-+ Assert.assertTrue(ser2.readObjectCalled, "readObject should have been called");
-+ Assert.assertTrue(ser2.readObjectNoDataCalled, "readObjectNoData not called");
-+ Assert.assertTrue(ser2.readResolveCalled, "readResolve not called");
-+ }
-+ }
-+
-+ @Test
-+ static void hasStaticInitializer() {
-+ boolean actual = factory.hasStaticInitializerForSerialization(Ser.class);
-+ Assert.assertTrue(actual, "hasStaticInitializerForSerialization is wrong");
-+ }
-+
-+ static class Ser implements Serializable {
-+ private static final long serialVersionUID = 2L;
-+ static {
-+ // Define a static class initialization method
-+ }
-+
-+ boolean readObjectCalled = false;
-+ boolean readObjectNoDataCalled = false;
-+ boolean writeObjectCalled = false;
-+ boolean readResolveCalled = false;
-+ boolean writeReplaceCalled = false;
-+
-+ public Ser() {}
-+
-+ private void readObject(ObjectInputStream ois) throws IOException {
-+ Assert.assertFalse(writeObjectCalled, "readObject called too many times");
-+ readObjectCalled = ois.readBoolean();
-+ }
-+
-+ private void readObjectNoData(ObjectInputStream ois) throws IOException {
-+ Assert.assertFalse(readObjectNoDataCalled, "readObjectNoData called too many times");
-+ readObjectNoDataCalled = true;
-+ }
-+
-+ private void writeObject(ObjectOutputStream oos) throws IOException {
-+ Assert.assertFalse(writeObjectCalled, "writeObject called too many times");
-+ writeObjectCalled = true;
-+ oos.writeBoolean(writeObjectCalled);
-+ }
-+
-+ private Object writeReplace() {
-+ Assert.assertFalse(writeReplaceCalled, "writeReplace called too many times");
-+ writeReplaceCalled = true;
-+ return this;
-+ }
-+
-+ private Object readResolve() {
-+ Assert.assertFalse(readResolveCalled, "readResolve called too many times");
-+ readResolveCalled = true;
-+ return this;
-+ }
-+ }
-+
-+ /**
-+ * Test the constructor of OptionalDataExceptions.
-+ */
-+ @Test
-+ static void newOptionalDataException() {
-+ OptionalDataException ode = factory.newOptionalDataExceptionForSerialization(true);
-+ Assert.assertTrue(ode.eof, "eof wrong");
-+ ode = factory.newOptionalDataExceptionForSerialization(false);
-+ Assert.assertFalse(ode.eof, "eof wrong");
-+
-+ }
-+
-+
-+
-+ // Main can be used to run the tests from the command line with only testng.jar.
-+ @SuppressWarnings("raw_types")
-+ @Test(enabled = false)
-+ public static void main(String[] args) {
-+ Class<?>[] testclass = {ReflectionFactoryTest.class};
-+ TestNG testng = new TestNG();
-+ testng.setTestClasses(testclass);
-+ testng.run();
-+ }
-+}
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/test/sun/reflect/ReflectionFactory/security.policy Sat Jan 28 19:08:22 2017 -0800
-@@ -0,0 +1,11 @@
-+// Individual Permissions for ReflectionFactoryTest
-+grant {
-+ // Permissions needed to run the test
-+ permission java.util.PropertyPermission "*", "read";
-+ permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete,execute";
-+
-+ permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-+ permission java.lang.RuntimePermission "accessDeclaredMembers";
-+ permission java.lang.RuntimePermission "accessClassInPackage.sun.reflect";
-+ permission java.lang.RuntimePermission "reflectionFactoryAccess";
-+};
---- ./jdk/test/sun/security/krb5/runNameEquals.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/krb5/runNameEquals.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/krb5/runNameEquals.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/krb5/runNameEquals.sh Tue Apr 18 21:21:47 2017 -0700
@@ -52,7 +52,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1297,8 +939,8 @@
PATHSEP=":"
FILESEP="/"
NATIVE=true
---- ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Tue Apr 18 21:21:47 2017 -0700
@@ -50,7 +50,7 @@
OS=`uname -s`
@@ -1308,8 +950,8 @@
FS="/"
;;
Windows_* )
---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Tue Apr 18 21:21:47 2017 -0700
@@ -66,7 +66,7 @@
CP="${FS}bin${FS}cp"
CHMOD="${FS}bin${FS}chmod"
@@ -1319,8 +961,8 @@
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh Tue Apr 18 21:21:47 2017 -0700
@@ -67,7 +67,7 @@
CP="${FS}bin${FS}cp"
CHMOD="${FS}bin${FS}chmod"
@@ -1330,8 +972,8 @@
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -50,7 +50,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1341,8 +983,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Tue Apr 18 21:21:47 2017 -0700
@@ -52,7 +52,7 @@
PATHSEP=":"
FILESEP="/"
@@ -1352,8 +994,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Tue Apr 18 21:21:47 2017 -0700
@@ -59,7 +59,7 @@
PS=":"
FS="/"
@@ -1363,8 +1005,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Tue Apr 18 21:21:47 2017 -0700
@@ -33,7 +33,7 @@
OS=`uname -s`
@@ -1374,8 +1016,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -46,7 +46,7 @@
OS=`uname -s`
@@ -1385,8 +1027,8 @@
FILESEP="/"
PATHSEP=":"
;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Tue Apr 18 21:21:47 2017 -0700
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
OS=`uname -s`
@@ -1396,8 +1038,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Tue Apr 18 21:21:47 2017 -0700
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
OS=`uname -s`
@@ -1407,8 +1049,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Tue Apr 18 21:21:47 2017 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1418,8 +1060,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Tue Apr 18 21:21:47 2017 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1429,8 +1071,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/diffend.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/diffend.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh Tue Apr 18 21:21:47 2017 -0700
@@ -47,6 +47,13 @@
FS="/"
CP="${FS}bin${FS}cp -f"
@@ -1445,8 +1087,8 @@
CYGWIN* )
NULL=/dev/null
PS=";"
---- ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -39,6 +39,11 @@
Windows_* )
FS="\\"
@@ -1459,8 +1101,8 @@
* )
FS="/"
;;
---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Tue Apr 18 21:21:47 2017 -0700
@@ -42,7 +42,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1470,8 +1112,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Tue Apr 18 21:21:47 2017 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1481,8 +1123,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Tue Apr 18 21:21:47 2017 -0700
@@ -55,7 +55,7 @@
PATHSEP=":"
FILESEP="/"
@@ -1492,8 +1134,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Tue Apr 18 21:21:47 2017 -0700
@@ -48,7 +48,7 @@
Linux )
FILESEP="/"
@@ -1503,8 +1145,8 @@
FILESEP="/"
;;
AIX )
---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Tue Apr 18 21:21:47 2017 -0700
@@ -45,7 +45,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1514,8 +1156,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Tue Apr 18 21:21:47 2017 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1525,8 +1167,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Tue Apr 18 21:21:47 2017 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1536,8 +1178,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/tools/keytool/i18n.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/keytool/i18n.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/keytool/i18n.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/keytool/i18n.sh Tue Apr 18 21:21:47 2017 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1547,8 +1189,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/printssl.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/keytool/printssl.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/keytool/printssl.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/keytool/printssl.sh Tue Apr 18 21:21:47 2017 -0700
@@ -40,7 +40,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1558,8 +1200,8 @@
FS="/"
;;
CYGWIN* )
---- ./jdk/test/sun/security/tools/keytool/resource.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/keytool/resource.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/keytool/resource.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/keytool/resource.sh Tue Apr 18 21:21:47 2017 -0700
@@ -43,7 +43,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1569,8 +1211,8 @@
NULL=/dev/null
FS="/"
;;
---- ./jdk/test/sun/security/tools/keytool/standard.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/keytool/standard.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/keytool/standard.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/keytool/standard.sh Tue Apr 18 21:21:47 2017 -0700
@@ -45,7 +45,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1580,8 +1222,8 @@
FS="/"
;;
Windows_* )
---- ./jdk/test/sun/security/tools/policytool/Alias.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/policytool/Alias.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/policytool/Alias.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/policytool/Alias.sh Tue Apr 18 21:21:47 2017 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1591,8 +1233,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Tue Apr 18 21:21:47 2017 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1602,8 +1244,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Tue Apr 18 21:21:47 2017 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1613,8 +1255,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh Tue Apr 18 21:21:47 2017 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1624,8 +1266,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Tue Apr 18 21:21:47 2017 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1635,8 +1277,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Tue Apr 18 21:21:47 2017 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1646,8 +1288,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/i18n.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/security/tools/policytool/i18n.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/security/tools/policytool/i18n.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/security/tools/policytool/i18n.sh Tue Apr 18 21:21:47 2017 -0700
@@ -49,7 +49,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1657,8 +1299,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/tools/common/CommonSetup.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/tools/common/CommonSetup.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/tools/common/CommonSetup.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/tools/common/CommonSetup.sh Tue Apr 18 21:21:47 2017 -0700
@@ -47,6 +47,7 @@
# isLinux - true if OS is Linux
# isSolaris - true if OS is Solaris
@@ -1686,8 +1328,8 @@
Darwin )
OS="Mac OS X"
isMacos=true
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -54,7 +54,7 @@
OS=`uname -s`
@@ -1697,8 +1339,8 @@
PATHSEP=":"
;;
---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Tue Apr 18 21:21:47 2017 -0700
@@ -56,7 +56,7 @@
OS=`uname -s`
@@ -1708,8 +1350,8 @@
PATHSEP=":"
;;
---- ./jdk/test/tools/launcher/ExecutionEnvironment.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/tools/launcher/ExecutionEnvironment.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/tools/launcher/ExecutionEnvironment.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/tools/launcher/ExecutionEnvironment.java Tue Apr 18 21:21:47 2017 -0700
@@ -194,7 +194,7 @@
Map<String, String> env = new HashMap<>();
@@ -1719,8 +1361,8 @@
for (String x : LD_PATH_STRINGS) {
String pairs[] = x.split("=");
env.put(pairs[0], pairs[1]);
---- ./jdk/test/tools/launcher/RunpathTest.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/tools/launcher/RunpathTest.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/tools/launcher/RunpathTest.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/tools/launcher/RunpathTest.java Tue Apr 18 21:21:47 2017 -0700
@@ -69,7 +69,7 @@
}
@@ -1730,8 +1372,8 @@
RunpathTest rp = new RunpathTest();
rp.testRpath();
}
---- ./jdk/test/tools/launcher/Test7029048.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/tools/launcher/Test7029048.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/tools/launcher/Test7029048.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/tools/launcher/Test7029048.java Tue Apr 18 21:21:47 2017 -0700
@@ -223,7 +223,7 @@
} else if (isSolaris && passes < 9) {
throw new Exception("Test7029048: FAIL: " +
@@ -1741,8 +1383,8 @@
throw new Exception("Test7029048: FAIL: " +
"all tests did not run, expected " + 6 + " got " + passes);
} else {
---- ./jdk/test/tools/launcher/TestHelper.java Wed Nov 30 13:46:05 2016 +0300
-+++ ./jdk/test/tools/launcher/TestHelper.java Sat Jan 28 19:08:22 2017 -0800
+--- ./jdk/test/tools/launcher/TestHelper.java Tue Feb 28 14:44:01 2017 +0300
++++ ./jdk/test/tools/launcher/TestHelper.java Tue Apr 18 21:21:47 2017 -0700
@@ -94,6 +94,8 @@
System.getProperty("os.name", "unknown").startsWith("Linux");
static final boolean isAIX =
@@ -1752,8 +1394,8 @@
static final String LIBJVM = isWindows
? "jvm.dll"
: "libjvm" + (isMacOSX ? ".dylib" : ".so");
---- ./langtools/test/Makefile Mon Nov 28 13:53:32 2016 -0800
-+++ ./langtools/test/Makefile Sat Jan 28 19:02:01 2017 -0800
+--- ./langtools/test/Makefile Mon Feb 27 11:17:29 2017 -0800
++++ ./langtools/test/Makefile Tue Apr 18 21:21:34 2017 -0700
@@ -34,6 +34,14 @@
ARCH=i586
endif
@@ -1769,8 +1411,8 @@
ifeq ($(OSNAME), Darwin)
PLATFORM = bsd
ARCH = $(shell uname -m)
---- ./langtools/test/tools/javah/ReadOldClass.sh Mon Nov 28 13:53:32 2016 -0800
-+++ ./langtools/test/tools/javah/ReadOldClass.sh Sat Jan 28 19:02:01 2017 -0800
+--- ./langtools/test/tools/javah/ReadOldClass.sh Mon Feb 27 11:17:29 2017 -0800
++++ ./langtools/test/tools/javah/ReadOldClass.sh Tue Apr 18 21:21:34 2017 -0700
@@ -43,7 +43,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1780,8 +1422,8 @@
PS=":"
FS="/"
;;
---- ./nashorn/test/script/jfx.js Mon Nov 28 13:53:48 2016 -0800
-+++ ./nashorn/test/script/jfx.js Sat Jan 28 19:02:03 2017 -0800
+--- ./nashorn/test/script/jfx.js Mon Feb 27 11:17:36 2017 -0800
++++ ./nashorn/test/script/jfx.js Tue Apr 18 21:21:36 2017 -0700
@@ -93,6 +93,8 @@
f2 = new File(sb.append(fsep + "linux.png").toString());
} else if (OSInfo.getOSType() == OSType.MACOSX) {
diff --git a/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__bsd.cpp b/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__bsd.cpp
deleted file mode 100644
index 1e1161249e33..000000000000
--- a/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__bsd.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2017-04-12 17:03:59 UTC
-+++ hotspot/src/os/bsd/vm/os_bsd.cpp
-@@ -155,6 +155,7 @@ int (*os::Bsd::_getcpuclockid)(pthread_t
- #endif
- pthread_t os::Bsd::_main_thread;
- int os::Bsd::_page_size = -1;
-+pthread_condattr_t os::Bsd::_condattr[1];
-
- static jlong initial_time_count=0;
-
-@@ -1076,12 +1077,15 @@ void os::Bsd::clock_init() {
- void os::Bsd::clock_init() {
- struct timespec res;
- struct timespec tp;
-+ _getcpuclockid = (int (*)(pthread_t, clockid_t *))dlsym(RTLD_DEFAULT, "pthread_getcpuclockid");
- if (::clock_getres(CLOCK_MONOTONIC, &res) == 0 &&
- ::clock_gettime(CLOCK_MONOTONIC, &tp) == 0) {
- // yes, monotonic clock is supported
- _clock_gettime = ::clock_gettime;
-+ return;
- }
-- _getcpuclockid = (int (*)(pthread_t, clockid_t *))dlsym(RTLD_DEFAULT, "pthread_getcpuclockid");
-+ warning("No monotonic clock was available - timed services may " \
-+ "be adversely affected if the time-of-day clock changes");
- }
- #endif
-
-@@ -1117,7 +1121,7 @@ jlong os::javaTimeNanos() {
- jlong os::javaTimeNanos() {
- if (Bsd::supports_monotonic_clock()) {
- struct timespec tp;
-- int status = Bsd::_clock_gettime(CLOCK_MONOTONIC, &tp);
-+ int status = ::clock_gettime(CLOCK_MONOTONIC, &tp);
- assert(status == 0, "gettime error");
- jlong result = jlong(tp.tv_sec) * (1000 * 1000 * 1000) + jlong(tp.tv_nsec);
- return result;
-@@ -3721,6 +3725,25 @@ void os::init(void) {
- Bsd::clock_init();
- initial_time_count = javaTimeNanos();
-
-+ // pthread_condattr initialization for monotonic clock
-+ int status;
-+ pthread_condattr_t* _condattr = os::Bsd::condAttr();
-+ if ((status = pthread_condattr_init(_condattr)) != 0) {
-+ fatal(err_msg("pthread_condattr_init: %s", strerror(status)));
-+ }
-+ // Only set the clock if CLOCK_MONOTONIC is available
-+ if (Bsd::supports_monotonic_clock()) {
-+ if ((status = pthread_condattr_setclock(_condattr, CLOCK_MONOTONIC)) != 0) {
-+ if (status == EINVAL) {
-+ warning("Unable to use monotonic clock with relative timed-waits" \
-+ " - changes to the time-of-day clock may have adverse affects");
-+ } else {
-+ fatal(err_msg("pthread_condattr_setclock: %s", strerror(status)));
-+ }
-+ }
-+ }
-+ // else it defaults to CLOCK_REALTIME
-+
- #ifdef __APPLE__
- // XXXDARWIN
- // Work around the unaligned VM callbacks in hotspot's
-@@ -4483,21 +4506,36 @@ void os::pause() {
-
- static struct timespec* compute_abstime(struct timespec* abstime, jlong millis) {
- if (millis < 0) millis = 0;
-- struct timeval now;
-- int status = gettimeofday(&now, NULL);
-- assert(status == 0, "gettimeofday");
-+
- jlong seconds = millis / 1000;
- millis %= 1000;
- if (seconds > 50000000) { // see man cond_timedwait(3T)
- seconds = 50000000;
- }
-- abstime->tv_sec = now.tv_sec + seconds;
-- long usec = now.tv_usec + millis * 1000;
-- if (usec >= 1000000) {
-- abstime->tv_sec += 1;
-- usec -= 1000000;
-+
-+ if (os::Bsd::supports_monotonic_clock()) {
-+ struct timespec now;
-+ int status = ::clock_gettime(CLOCK_MONOTONIC, &now);
-+ assert_status(status == 0, status, "clock_gettime");
-+ abstime->tv_sec = now.tv_sec + seconds;
-+ long nanos = now.tv_nsec + millis * NANOSECS_PER_MILLISEC;
-+ if (nanos >= NANOSECS_PER_SEC) {
-+ abstime->tv_sec += 1;
-+ nanos -= NANOSECS_PER_SEC;
-+ }
-+ abstime->tv_nsec = nanos;
-+ } else {
-+ struct timeval now;
-+ int status = gettimeofday(&now, NULL);
-+ assert(status == 0, "gettimeofday");
-+ abstime->tv_sec = now.tv_sec + seconds;
-+ long usec = now.tv_usec + millis * 1000;
-+ if (usec >= 1000000) {
-+ abstime->tv_sec += 1;
-+ usec -= 1000000;
-+ }
-+ abstime->tv_nsec = usec * 1000;
- }
-- abstime->tv_nsec = usec * 1000;
- return abstime;
- }
-
-@@ -4589,7 +4627,7 @@ int os::PlatformEvent::park(jlong millis
- status = os::Bsd::safe_cond_timedwait(_cond, _mutex, &abst);
- if (status != 0 && WorkAroundNPTLTimedWaitHang) {
- pthread_cond_destroy (_cond);
-- pthread_cond_init (_cond, NULL) ;
-+ pthread_cond_init (_cond, os::Bsd::condAttr()) ;
- }
- assert_status(status == 0 || status == EINTR ||
- status == ETIMEDOUT,
-@@ -4690,32 +4728,50 @@ void os::PlatformEvent::unpark() {
-
- static void unpackTime(struct timespec* absTime, bool isAbsolute, jlong time) {
- assert (time > 0, "convertTime");
-+ time_t max_secs = 0;
-
-- struct timeval now;
-- int status = gettimeofday(&now, NULL);
-- assert(status == 0, "gettimeofday");
-+ if (!os::Bsd::supports_monotonic_clock() || isAbsolute) {
-+ struct timeval now;
-+ int status = gettimeofday(&now, NULL);
-+ assert(status == 0, "gettimeofday");
-
-- time_t max_secs = now.tv_sec + MAX_SECS;
-+ max_secs = now.tv_sec + MAX_SECS;
-
-- if (isAbsolute) {
-- jlong secs = time / 1000;
-- if (secs > max_secs) {
-- absTime->tv_sec = max_secs;
-- }
-- else {
-- absTime->tv_sec = secs;
-+ if (isAbsolute) {
-+ jlong secs = time / 1000;
-+ if (secs > max_secs) {
-+ absTime->tv_sec = max_secs;
-+ } else {
-+ absTime->tv_sec = secs;
-+ }
-+ absTime->tv_nsec = (time % 1000) * NANOSECS_PER_MILLISEC;
-+ } else {
-+ jlong secs = time / NANOSECS_PER_SEC;
-+ if (secs >= MAX_SECS) {
-+ absTime->tv_sec = max_secs;
-+ absTime->tv_nsec = 0;
-+ } else {
-+ absTime->tv_sec = now.tv_sec + secs;
-+ absTime->tv_nsec = (time % NANOSECS_PER_SEC) + now.tv_usec*1000;
-+ if (absTime->tv_nsec >= NANOSECS_PER_SEC) {
-+ absTime->tv_nsec -= NANOSECS_PER_SEC;
-+ ++absTime->tv_sec; // note: this must be <= max_secs
-+ }
-+ }
- }
-- absTime->tv_nsec = (time % 1000) * NANOSECS_PER_MILLISEC;
-- }
-- else {
-+ } else {
-+ // must be relative using monotonic clock
-+ struct timespec now;
-+ int status = ::clock_gettime(CLOCK_MONOTONIC, &now);
-+ assert_status(status == 0, status, "clock_gettime");
-+ max_secs = now.tv_sec + MAX_SECS;
- jlong secs = time / NANOSECS_PER_SEC;
- if (secs >= MAX_SECS) {
- absTime->tv_sec = max_secs;
- absTime->tv_nsec = 0;
-- }
-- else {
-+ } else {
- absTime->tv_sec = now.tv_sec + secs;
-- absTime->tv_nsec = (time % NANOSECS_PER_SEC) + now.tv_usec*1000;
-+ absTime->tv_nsec = (time % NANOSECS_PER_SEC) + now.tv_nsec;
- if (absTime->tv_nsec >= NANOSECS_PER_SEC) {
- absTime->tv_nsec -= NANOSECS_PER_SEC;
- ++absTime->tv_sec; // note: this must be <= max_secs
-@@ -4795,15 +4851,19 @@ void Parker::park(bool isAbsolute, jlong
- jt->set_suspend_equivalent();
- // cleared by handle_special_suspend_equivalent_condition() or java_suspend_self()
-
-+ assert(_cur_index == -1, "invariant");
- if (time == 0) {
-- status = pthread_cond_wait (_cond, _mutex) ;
-+ _cur_index = REL_INDEX; // arbitrary choice when not timed
-+ status = pthread_cond_wait (&_cond[_cur_index], _mutex) ;
- } else {
-- status = os::Bsd::safe_cond_timedwait (_cond, _mutex, &absTime) ;
-+ _cur_index = isAbsolute ? ABS_INDEX : REL_INDEX;
-+ status = os::Bsd::safe_cond_timedwait (&_cond[_cur_index], _mutex, &absTime) ;
- if (status != 0 && WorkAroundNPTLTimedWaitHang) {
-- pthread_cond_destroy (_cond) ;
-- pthread_cond_init (_cond, NULL);
-+ pthread_cond_destroy (&_cond[_cur_index]) ;
-+ pthread_cond_init (&_cond[_cur_index], isAbsolute ? NULL : os::Bsd::condAttr());
- }
- }
-+ _cur_index = -1;
- assert_status(status == 0 || status == EINTR ||
- status == ETIMEDOUT,
- status, "cond_timedwait");
-@@ -4832,17 +4892,26 @@ void Parker::unpark() {
- s = _counter;
- _counter = 1;
- if (s < 1) {
-- if (WorkAroundNPTLTimedWaitHang) {
-- status = pthread_cond_signal (_cond) ;
-- assert (status == 0, "invariant") ;
-+ // thread might be parked
-+ if (_cur_index != -1) {
-+ // thread is definitely parked
-+ if (WorkAroundNPTLTimedWaitHang) {
-+ status = pthread_cond_signal (&_cond[_cur_index]);
-+ assert (status == 0, "invariant");
- status = pthread_mutex_unlock(_mutex);
-- assert (status == 0, "invariant") ;
-- } else {
-+ assert (status == 0, "invariant");
-+ } else {
-+ // must capture correct index before unlocking
-+ int index = _cur_index;
- status = pthread_mutex_unlock(_mutex);
-- assert (status == 0, "invariant") ;
-- status = pthread_cond_signal (_cond) ;
-- assert (status == 0, "invariant") ;
-- }
-+ assert (status == 0, "invariant");
-+ status = pthread_cond_signal (&_cond[index]);
-+ assert (status == 0, "invariant");
-+ }
-+ } else {
-+ pthread_mutex_unlock(_mutex);
-+ assert (status == 0, "invariant") ;
-+ }
- } else {
- pthread_mutex_unlock(_mutex);
- assert (status == 0, "invariant") ;
diff --git a/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__bsd.hpp b/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__bsd.hpp
deleted file mode 100644
index 44bd21a99193..000000000000
--- a/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__bsd.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
---- hotspot/src/os/bsd/vm/os_bsd.hpp.orig 2017-04-12 15:33:50 UTC
-+++ hotspot/src/os/bsd/vm/os_bsd.hpp
-@@ -155,6 +155,13 @@ class Bsd {
- #endif
- }
-
-+ // pthread_cond clock suppport
-+ private:
-+ static pthread_condattr_t _condattr[1];
-+
-+ public:
-+ static pthread_condattr_t* condAttr() { return _condattr; }
-+
- // Stack repair handling
-
- // none present
-@@ -220,7 +227,7 @@ class PlatformEvent : public CHeapObj<mt
- public:
- PlatformEvent() {
- int status;
-- status = pthread_cond_init (_cond, NULL);
-+ status = pthread_cond_init (_cond, os::Bsd::condAttr());
- assert_status(status == 0, status, "cond_init");
- status = pthread_mutex_init (_mutex, NULL);
- assert_status(status == 0, status, "mutex_init");
-@@ -235,14 +242,19 @@ class PlatformEvent : public CHeapObj<mt
- void park () ;
- void unpark () ;
- int TryPark () ;
-- int park (jlong millis) ;
-+ int park (jlong millis) ; // relative timed-wait only
- void SetAssociation (Thread * a) { _Assoc = a ; }
- };
-
- class PlatformParker : public CHeapObj<mtInternal> {
- protected:
-+ enum {
-+ REL_INDEX = 0,
-+ ABS_INDEX = 1
-+ };
-+ int _cur_index; // which cond is in use: -1, 0, 1
- pthread_mutex_t _mutex [1] ;
-- pthread_cond_t _cond [1] ;
-+ pthread_cond_t _cond [2] ; // one for relative times and one for abs.
-
- public: // TODO-FIXME: make dtor private
- ~PlatformParker() { guarantee (0, "invariant") ; }
-@@ -250,10 +262,13 @@ class PlatformParker : public CHeapObj<m
- public:
- PlatformParker() {
- int status;
-- status = pthread_cond_init (_cond, NULL);
-- assert_status(status == 0, status, "cond_init");
-+ status = pthread_cond_init (&_cond[REL_INDEX], os::Bsd::condAttr());
-+ assert_status(status == 0, status, "cond_init rel");
-+ status = pthread_cond_init (&_cond[ABS_INDEX], NULL);
-+ assert_status(status == 0, status, "cond_init abs");
- status = pthread_mutex_init (_mutex, NULL);
- assert_status(status == 0, status, "mutex_init");
-+ _cur_index = -1; // mark as unused
- }
- };
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 03:48:44 +0000