svn commit: r442035 - in head/java/openjdk7: . files
Greg Lewis
glewis at FreeBSD.org
Tue May 30 00:19:08 UTC 2017
Author: glewis
Date: Tue May 30 00:19:06 2017
New Revision: 442035
URL: https://svnweb.freebsd.org/changeset/ports/442035
Log:
. Update to 7u141.
Modified:
head/java/openjdk7/Makefile
head/java/openjdk7/distinfo
head/java/openjdk7/files/patch-bsd
Modified: head/java/openjdk7/Makefile
==============================================================================
--- head/java/openjdk7/Makefile Mon May 29 21:59:29 2017 (r442034)
+++ head/java/openjdk7/Makefile Tue May 30 00:19:06 2017 (r442035)
@@ -32,7 +32,8 @@ PATCHFILES= patch-7u45-b30.xz \
patch-7u101-b00.xz \
patch-7u111-b01.xz \
patch-7u121-b00.xz \
- patch-7u131-b00.xz
+ patch-7u131-b00.xz \
+ patch-7u141-b02.xz
MAINTAINER?= glewis at FreeBSD.org
COMMENT?= Java Development Kit 7
@@ -75,8 +76,8 @@ JAVAVMS_COMMENT+= JRE
INSTALLDIR= ${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}-jre
.endif
-PORT_MINOR_VERSION= 131
-PORT_BUILD_NUMBER= 00
+PORT_MINOR_VERSION= 141
+PORT_BUILD_NUMBER= 02
JDK_MAJOR_VERSION= 7
JDK_MINOR_VERSION= 40
JDK_BUILD_NUMBER= 43
Modified: head/java/openjdk7/distinfo
==============================================================================
--- head/java/openjdk7/distinfo Mon May 29 21:59:29 2017 (r442034)
+++ head/java/openjdk7/distinfo Tue May 30 00:19:06 2017 (r442035)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1496029291
+TIMESTAMP = 1496080874
SHA256 (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 00f8ea561876cbcad174ba3ca7a9ae10b50df46a782ac64c2ac57ac357b50596
SIZE (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 104575196
SHA256 (apache-ant-1.9.7-bin.zip) = b28c5ea0b5ea90bb4ad6bab229b6a56ac4461760a251a12567803a69259cd9de
@@ -33,3 +33,5 @@ SHA256 (patch-7u121-b00.xz) = e8cba92ab6
SIZE (patch-7u121-b00.xz) = 670484
SHA256 (patch-7u131-b00.xz) = 5c7b4f9be1d7bc3336ba19c288c882ff5cbd1b1b0ee403f84229cd8807452024
SIZE (patch-7u131-b00.xz) = 769172
+SHA256 (patch-7u141-b02.xz) = 721db525f519417c30d37bcfa80ff715a1e2858e0882e75759b4eaedd6a20510
+SIZE (patch-7u141-b02.xz) = 165488
Modified: head/java/openjdk7/files/patch-bsd
==============================================================================
--- head/java/openjdk7/files/patch-bsd Mon May 29 21:59:29 2017 (r442034)
+++ head/java/openjdk7/files/patch-bsd Tue May 30 00:19:06 2017 (r442035)
@@ -1,5 +1,5 @@
---- ./.hgtags Fri Oct 28 03:35:31 2016 +0100
-+++ ./.hgtags Sun May 21 11:12:34 2017 -0700
+--- ./.hgtags Thu Apr 27 06:11:36 2017 +0100
++++ ./.hgtags Sun May 28 21:31:34 2017 -0700
@@ -123,6 +123,7 @@
2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
@@ -8,13 +8,13 @@
34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02
bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03
f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04
-@@ -607,3 +608,4 @@
- bade1889699bab14082e84de3b40901964b52483 jdk7u111-b00
- 9b95c1ef81fe7bb010a6938d1cb97843b9a1fc68 jdk7u111-b01
- 974935f4e21dae1170b5247a8af362617d105e1c jdk7u121-b00
-+259e6ca7faf17e2b96fb0733f30e62327a7acdfa jdk7u131-b00
---- ./corba/.hgtags Fri Oct 28 03:35:33 2016 +0100
-+++ ./corba/.hgtags Sun May 21 11:12:35 2017 -0700
+@@ -610,3 +611,4 @@
+ 259e6ca7faf17e2b96fb0733f30e62327a7acdfa jdk7u131-b00
+ e3b3add63d287cd07398949308308135ded4197e jdk7u141-b00
+ b21d7bc25e0f96c6ed9b19e1ea0ea6253c34d7fe jdk7u141-b01
++db8fe12e5e508b18dd0aeb166099406a774b0d04 jdk7u141-b02
+--- ./corba/.hgtags Thu Apr 27 06:11:37 2017 +0100
++++ ./corba/.hgtags Sun May 28 21:31:35 2017 -0700
@@ -123,6 +123,7 @@
770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
@@ -23,13 +23,13 @@
9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
-@@ -609,3 +610,4 @@
- c1def4cc27fb92914168a5f65658eba4a1754dfe jdk7u111-b00
- 36715cc029596f86e977d486e547f62bb07eed74 jdk7u111-b01
- ad3a33a23c69608ae140d4564d045b62533f45a3 jdk7u121-b00
-+d93d13bcb01d7b635d0e021877e1102e34bae8fb jdk7u131-b00
---- ./hotspot/.hgtags Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/.hgtags Sun May 21 11:12:48 2017 -0700
+@@ -612,3 +613,4 @@
+ d93d13bcb01d7b635d0e021877e1102e34bae8fb jdk7u131-b00
+ 61c10a1eaa7b6f77e63f90e624a82a664a451d42 jdk7u141-b00
+ caa46a309b1195a0301956e7416633b717553925 jdk7u141-b01
++39240de9d27767c8bad74e34f83f0a4902a9ef85 jdk7u141-b02
+--- ./hotspot/.hgtags Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/.hgtags Sun May 28 21:31:42 2017 -0700
@@ -182,6 +182,7 @@
38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16
81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147
@@ -38,13 +38,13 @@
9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01
0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
-@@ -841,3 +842,4 @@
- 14d0f4da4a74897fc3274f8f549f41544bb4625a jdk7u111-b00
- 9efa3fae3c278a7f48badec775d7f9b2d5320b6d jdk7u111-b01
- 17b40d99ea3665de2bfffe163b68f2dfcf675cba jdk7u121-b00
-+95e4ea3d479ebdab9d78725776b6b11d4add6b0e jdk7u131-b00
---- ./hotspot/agent/src/os/bsd/ps_proc.c Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/agent/src/os/bsd/ps_proc.c Sun May 21 11:12:48 2017 -0700
+@@ -844,3 +845,4 @@
+ 95e4ea3d479ebdab9d78725776b6b11d4add6b0e jdk7u131-b00
+ be8da42894af5f7d11b4bad83e166186f01ce1b4 jdk7u141-b00
+ 22c5a6ca09e35b63baf51bad4cb3d8f0cf326705 jdk7u141-b01
++56ad25be7d88c2c2da562fe1e8879c8723d01da1 jdk7u141-b02
+--- ./hotspot/agent/src/os/bsd/ps_proc.c Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/agent/src/os/bsd/ps_proc.c Sun May 28 21:31:42 2017 -0700
@@ -131,7 +131,7 @@
static bool ptrace_continue(pid_t pid, int signal) {
@@ -54,8 +54,8 @@
print_debug("ptrace(PTRACE_CONT, ..) failed for %d\n", pid);
return false;
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sun May 28 21:31:42 2017 -0700
@@ -33,6 +33,7 @@
import sun.jvm.hotspot.debugger.remote.*;
import sun.jvm.hotspot.debugger.windbg.*;
@@ -64,8 +64,8 @@
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.oops.*;
import sun.jvm.hotspot.runtime.*;
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Sun May 28 21:31:42 2017 -0700
@@ -35,6 +35,7 @@
import sun.jvm.hotspot.debugger.windbg.*;
import sun.jvm.hotspot.debugger.linux.*;
@@ -74,8 +74,8 @@
import sun.jvm.hotspot.debugger.remote.*;
import sun.jvm.hotspot.livejvm.*;
import sun.jvm.hotspot.memory.*;
---- ./hotspot/make/bsd/Makefile Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/Makefile Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/Makefile Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/Makefile Sun May 28 21:31:42 2017 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -105,8 +105,8 @@
# Synonyms for win32-like targets.
compiler2: jvmg product
---- ./hotspot/make/bsd/makefiles/build_vm_def.sh Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/makefiles/build_vm_def.sh Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sun May 28 21:31:42 2017 -0700
@@ -1,12 +1,28 @@
#!/bin/sh
@@ -142,8 +142,8 @@
+ if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";"
+ }' | sort -u ;;
+esac
---- ./hotspot/make/bsd/makefiles/buildtree.make Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/makefiles/buildtree.make Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/makefiles/buildtree.make Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/makefiles/buildtree.make Sun May 28 21:31:42 2017 -0700
@@ -255,6 +255,16 @@
echo "$(call gamma-path,commonsrc,os/posix/vm)"; \
[ -n "$(CFLAGS_BROWSE)" ] && \
@@ -170,8 +170,8 @@
.dbxrc: $(BUILDTREE_MAKE)
@echo Creating $@ ...
---- ./hotspot/make/bsd/makefiles/gcc.make Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/makefiles/gcc.make Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/makefiles/gcc.make Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/makefiles/gcc.make Sun May 28 21:31:42 2017 -0700
@@ -117,7 +117,10 @@
CFLAGS += -fno-rtti
CFLAGS += -fno-exceptions
@@ -197,8 +197,8 @@
endif
# -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
---- ./hotspot/make/bsd/makefiles/jsig.make Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/makefiles/jsig.make Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/makefiles/jsig.make Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/makefiles/jsig.make Sun May 28 21:31:42 2017 -0700
@@ -36,9 +36,16 @@
LIBJSIG_G = lib$(JSIG_G).so
endif
@@ -251,8 +251,8 @@
$(QUIETLY) cp -f $(LIBJSIG) $(DEST_JSIG) && echo "Done"
.PHONY: install_jsig
---- ./hotspot/make/bsd/makefiles/launcher.make Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/makefiles/launcher.make Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/makefiles/launcher.make Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/makefiles/launcher.make Sun May 28 21:31:42 2017 -0700
@@ -50,7 +50,7 @@
LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
else
@@ -262,8 +262,8 @@
# The gamma launcher runs the JDK from $JAVA_HOME, overriding the JVM with a
# freshly built JVM at ./libjvm.{so|dylib}. This is accomplished by setting
---- ./hotspot/make/bsd/makefiles/mapfile-vers-product Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-product Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sun May 28 21:31:42 2017 -0700
@@ -19,237 +19,248 @@
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
@@ -738,8 +738,8 @@
+ local:
+ *;
+};
---- ./hotspot/make/bsd/makefiles/ppc.make Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/makefiles/ppc.make Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/makefiles/ppc.make Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/makefiles/ppc.make Sun May 28 21:31:42 2017 -0700
@@ -28,3 +28,6 @@
# Must also specify if CPU is big endian
CFLAGS += -DVM_BIG_ENDIAN
@@ -747,8 +747,8 @@
+ifdef E500V2
+ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1
+endif
---- ./hotspot/make/bsd/makefiles/saproc.make Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/bsd/makefiles/saproc.make Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/bsd/makefiles/saproc.make Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/bsd/makefiles/saproc.make Sun May 28 21:31:42 2017 -0700
@@ -36,6 +36,11 @@
LIBSAPROC_G = lib$(SAPROC_G).so
endif
@@ -805,8 +805,8 @@
cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"; \
fi
---- ./hotspot/make/solaris/makefiles/defs.make Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/make/solaris/makefiles/defs.make Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/make/solaris/makefiles/defs.make Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/make/solaris/makefiles/defs.make Sun May 28 21:31:42 2017 -0700
@@ -221,8 +221,8 @@
endif
ifeq ($(JVM_VARIANT_CLIENT),true)
@@ -818,8 +818,8 @@
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
ifeq ($(ARCH_DATA_MODEL),32)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
---- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Sun May 28 21:31:42 2017 -0700
@@ -71,7 +71,11 @@
define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true);
@@ -833,7 +833,7 @@
// GC Ergo Flags
define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Sun May 21 11:12:48 2017 -0700
++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Sun May 28 21:31:42 2017 -0700
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -881,8 +881,8 @@
+ return false;
+}
+
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Sun May 28 21:31:42 2017 -0700
@@ -163,6 +163,7 @@
#endif
pthread_t os::Bsd::_main_thread;
@@ -900,7 +900,7 @@
////////////////////////////////////////////////////////////////////////////////
// utility functions
-@@ -355,7 +358,13 @@
+@@ -341,7 +344,13 @@
* since it returns a 64 bit value)
*/
mib[0] = CTL_HW;
@@ -914,7 +914,7 @@
len = sizeof(mem_val);
if (sysctl(mib, 2, &mem_val, &len, NULL, 0) != -1) {
assert(len == sizeof(mem_val), "unexpected data size");
-@@ -1625,7 +1634,10 @@
+@@ -1611,7 +1620,10 @@
::clock_gettime(CLOCK_MONOTONIC, &tp) == 0) {
// yes, monotonic clock is supported
_clock_gettime = ::clock_gettime;
@@ -926,7 +926,7 @@
}
#else
void os::Bsd::clock_init() {
-@@ -1711,7 +1723,7 @@
+@@ -1697,7 +1709,7 @@
jlong os::javaTimeNanos() {
if (Bsd::supports_monotonic_clock()) {
struct timespec tp;
@@ -935,7 +935,7 @@
assert(status == 0, "gettime error");
jlong result = jlong(tp.tv_sec) * (1000 * 1000 * 1000) + jlong(tp.tv_nsec);
return result;
-@@ -1848,9 +1860,15 @@
+@@ -1834,9 +1846,15 @@
return n;
}
@@ -951,7 +951,7 @@
#else
return (intx)::pthread_self();
#endif
-@@ -2401,14 +2419,14 @@
+@@ -2387,14 +2405,14 @@
}
void os::print_os_info_brief(outputStream* st) {
@@ -968,7 +968,7 @@
os::Posix::print_uname_info(st);
-@@ -2417,10 +2435,6 @@
+@@ -2403,10 +2421,6 @@
os::Posix::print_load_average(st);
}
@@ -979,7 +979,7 @@
void os::print_memory_info(outputStream* st) {
st->print("Memory:");
-@@ -2437,6 +2451,7 @@
+@@ -2423,6 +2437,7 @@
st->print("(" UINT64_FORMAT "k free)",
os::available_memory() >> 10);
#ifndef _ALLBSD_SOURCE
@@ -987,7 +987,7 @@
st->print(", swap " UINT64_FORMAT "k",
((jlong)si.totalswap * si.mem_unit) >> 10);
st->print("(" UINT64_FORMAT "k free)",
-@@ -2444,12 +2459,22 @@
+@@ -2430,12 +2445,22 @@
#endif
st->cr();
@@ -1010,7 +1010,7 @@
// Taken from /usr/include/bits/siginfo.h Supposed to be architecture specific
// but they're the same for all the bsd arch that we support
// and they're the same for solaris but there's no common place to put this.
-@@ -2596,6 +2621,25 @@
+@@ -2582,6 +2607,25 @@
assert(len < buflen, "Ran out of buffer space");
jrelib_p = buf + len;
@@ -1036,7 +1036,7 @@
// Add the appropriate library subdir
snprintf(jrelib_p, buflen-len, "/jre/lib");
if (0 != access(buf, F_OK)) {
-@@ -2625,6 +2669,7 @@
+@@ -2611,6 +2655,7 @@
if (rp == NULL)
return;
}
@@ -1044,7 +1044,7 @@
}
}
}
-@@ -2728,10 +2773,14 @@
+@@ -2714,10 +2759,14 @@
bool timedwait(unsigned int sec, int nsec);
private:
jlong currenttime() const;
@@ -1060,7 +1060,7 @@
SEM_INIT(_semaphore, 0);
}
-@@ -2796,7 +2845,7 @@
+@@ -2782,7 +2831,7 @@
bool Semaphore::timedwait(unsigned int sec, int nsec) {
struct timespec ts;
@@ -1069,7 +1069,7 @@
while (1) {
int result = sem_timedwait(&_semaphore, &ts);
-@@ -3017,7 +3066,11 @@
+@@ -3003,7 +3052,11 @@
}
void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) {
@@ -1081,7 +1081,7 @@
}
void os::numa_make_global(char *addr, size_t bytes) {
-@@ -3864,6 +3917,7 @@
+@@ -3850,6 +3903,7 @@
return OS_OK;
#elif defined(__FreeBSD__)
int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
@@ -1089,7 +1089,7 @@
#elif defined(__APPLE__) || defined(__NetBSD__)
struct sched_param sp;
int policy;
-@@ -4718,6 +4772,25 @@
+@@ -4704,6 +4758,25 @@
Bsd::clock_init();
initial_time_count = os::elapsed_counter();
@@ -1115,7 +1115,7 @@
#ifdef __APPLE__
// XXXDARWIN
// Work around the unaligned VM callbacks in hotspot's
-@@ -5638,21 +5711,36 @@
+@@ -5622,21 +5695,36 @@
static struct timespec* compute_abstime(struct timespec* abstime, jlong millis) {
if (millis < 0) millis = 0;
@@ -1162,7 +1162,7 @@
return abstime;
}
-@@ -5744,7 +5832,7 @@
+@@ -5728,7 +5816,7 @@
status = os::Bsd::safe_cond_timedwait(_cond, _mutex, &abst);
if (status != 0 && WorkAroundNPTLTimedWaitHang) {
pthread_cond_destroy (_cond);
@@ -1171,7 +1171,7 @@
}
assert_status(status == 0 || status == EINTR ||
status == ETIMEDOUT,
-@@ -5845,32 +5933,50 @@
+@@ -5829,32 +5917,50 @@
static void unpackTime(struct timespec* absTime, bool isAbsolute, jlong time) {
assert (time > 0, "convertTime");
@@ -1242,7 +1242,7 @@
if (absTime->tv_nsec >= NANOSECS_PER_SEC) {
absTime->tv_nsec -= NANOSECS_PER_SEC;
++absTime->tv_sec; // note: this must be <= max_secs
-@@ -5950,15 +6056,19 @@
+@@ -5934,15 +6040,19 @@
jt->set_suspend_equivalent();
// cleared by handle_special_suspend_equivalent_condition() or java_suspend_self()
@@ -1266,7 +1266,7 @@
assert_status(status == 0 || status == EINTR ||
status == ETIMEDOUT,
status, "cond_timedwait");
-@@ -5987,17 +6097,26 @@
+@@ -5971,17 +6081,26 @@
s = _counter;
_counter = 1;
if (s < 1) {
@@ -1302,26 +1302,9 @@
} else {
pthread_mutex_unlock(_mutex);
assert (status == 0, "invariant") ;
---- ./hotspot/src/os/bsd/vm/os_bsd.hpp Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Sun May 21 11:12:48 2017 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -27,6 +27,9 @@
-
- // Bsd_OS defines the interface to Bsd operating systems
-
-+// Information about the protection of the page at address '0' on this os.
-+static bool zero_page_read_protected() { return true; }
-+
- /* pthread_getattr_np comes with BsdThreads-0.9-7 on RedHat 7.1 */
- typedef int (*pthread_getattr_func_type) (pthread_t, pthread_attr_t *);
-
-@@ -103,6 +106,12 @@
+--- ./hotspot/src/os/bsd/vm/os_bsd.hpp Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Sun May 28 21:31:42 2017 -0700
+@@ -106,6 +106,12 @@
static bool hugetlbfs_sanity_check(bool warn, size_t page_size);
@@ -1334,7 +1317,7 @@
public:
static void init_thread_fpu_state();
-@@ -222,6 +231,13 @@
+@@ -225,6 +231,13 @@
static jlong fast_thread_cpu_time(clockid_t clockid);
#endif
@@ -1348,7 +1331,7 @@
// Stack repair handling
// none present
-@@ -287,7 +303,7 @@
+@@ -290,7 +303,7 @@
public:
PlatformEvent() {
int status;
@@ -1357,7 +1340,7 @@
assert_status(status == 0, status, "cond_init");
status = pthread_mutex_init (_mutex, NULL);
assert_status(status == 0, status, "mutex_init");
-@@ -302,14 +318,19 @@
+@@ -305,14 +318,19 @@
void park () ;
void unpark () ;
int TryPark () ;
@@ -1379,7 +1362,7 @@
public: // TODO-FIXME: make dtor private
~PlatformParker() { guarantee (0, "invariant") ; }
-@@ -317,10 +338,13 @@
+@@ -320,10 +338,13 @@
public:
PlatformParker() {
int status;
@@ -1395,8 +1378,8 @@
}
};
---- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Sun May 28 21:31:42 2017 -0700
@@ -31,10 +31,22 @@
# include "atomic_bsd_x86.inline.hpp"
# include "orderAccess_bsd_x86.inline.hpp"
@@ -1420,8 +1403,8 @@
// System includes
---- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Sun May 28 21:31:42 2017 -0700
@@ -34,11 +34,26 @@
# include "orderAccess_bsd_x86.inline.hpp"
# include "prefetch_bsd_x86.inline.hpp"
@@ -1449,8 +1432,8 @@
// Contains inlined functions for class Thread and ThreadLocalStorage
---- ./hotspot/src/os/posix/vm/os_posix.cpp Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/os/posix/vm/os_posix.cpp Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/os/posix/vm/os_posix.cpp Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/os/posix/vm/os_posix.cpp Sun May 28 21:31:42 2017 -0700
@@ -183,11 +183,19 @@
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
else st->print("%d", rlim.rlim_cur);
@@ -1471,8 +1454,8 @@
}
void os::Posix::print_uname_info(outputStream* st) {
---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sun May 28 21:31:42 2017 -0700
@@ -945,7 +945,7 @@
if (rslt != 0)
fatal(err_msg("pthread_stackseg_np failed with err = %d", rslt));
@@ -1482,8 +1465,8 @@
*size = ss.ss_size;
#elif defined(_ALLBSD_SOURCE)
pthread_attr_t attr;
---- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Sun May 28 21:31:42 2017 -0700
@@ -24,7 +24,7 @@
*/
@@ -1493,8 +1476,8 @@
# include <pthread_np.h> /* For pthread_attr_get_np */
#endif
---- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Sun May 28 21:31:42 2017 -0700
@@ -111,7 +111,7 @@
if (e.should_commit()) {
e.set_gcId(_shared_gc_info.id());
@@ -1504,80 +1487,8 @@
e.commit();
}
}
---- ./hotspot/src/share/vm/opto/lcm.cpp Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/share/vm/opto/lcm.cpp Sun May 21 11:12:48 2017 -0700
-@@ -57,25 +57,40 @@
- // Check whether val is not-null-decoded compressed oop,
- // i.e. will grab into the base of the heap if it represents NULL.
- static bool accesses_heap_base_zone(Node *val) {
-- if (UseCompressedOops && Universe::narrow_oop_base() > 0) {
-+ if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops.
- if (val && val->is_Mach()) {
-- if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) {
-- // This assumes all Decodes with TypePtr::NotNull are matched to nodes that
-- // decode NULL to point to the heap base (Decode_NN).
-- if (val->bottom_type()->is_oopptr()->ptr() == TypePtr::NotNull) {
-- return true;
-- }
-+ if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) {
-+ // This assumes all Decodes with TypePtr::NotNull are matched to nodes that
-+ // decode NULL to point to the heap base (Decode_NN).
-+ if (val->bottom_type()->is_oopptr()->ptr() == TypePtr::NotNull) {
-+ return true;
- }
-- // Must recognize load operation with Decode matched in memory operand.
-- // We should not reach here, as os::zero_page_read_protected()
-- // returns true everywhere exept for AIX. On AIX, no such memory operands
-- // exist.
-- NOT_AIX(Unimplemented());
- }
-+ // Must recognize load operation with Decode matched in memory operand.
-+ // We should not reach here exept for PPC/AIX, as os::zero_page_read_protected()
-+ // returns true everywhere else. On PPC, no such memory operands
-+ // exist, therefore we did not yet implement a check for such operands.
-+ NOT_AIX(Unimplemented());
-+ }
- }
- return false;
- }
-
-+static bool needs_explicit_null_check_for_read(Node *val) {
-+ // On some OSes (AIX) the page at address 0 is only write protected.
-+ // If so, only Store operations will trap.
-+ if (os::zero_page_read_protected()) {
-+ return false; // Implicit null check will work.
-+ }
-+ // Also a read accessing the base of a heap-based compressed heap will trap.
-+ if (accesses_heap_base_zone(val) && // Hits the base zone page.
-+ Universe::narrow_oop_use_implicit_null_checks()) { // Base zone page is protected.
-+ return false;
-+ }
-+
-+ return true;
-+}
-+
- //------------------------------implicit_null_check----------------------------
- // Detect implicit-null-check opportunities. Basically, find NULL checks
- // with suitable memory ops nearby. Use the memory op to do the NULL check.
-@@ -233,14 +248,8 @@
- // On some OSes (AIX) the page at address 0 is only write protected.
- // If so, only Store operations will trap.
- // But a read accessing the base of a heap-based compressed heap will trap.
-- if (!was_store && !os::zero_page_read_protected()) {
-- if (!(accesses_heap_base_zone(val) && // Hits the base zone page.
-- Universe::narrow_oop_use_implicit_null_checks())) { // Page is protected.
-- continue;
-- } else {
-- tty->print("Found load accessing heap base on AIX\n");
-- Unimplemented();
-- }
-+ if (!was_store && needs_explicit_null_check_for_read(val)) {
-+ continue;
- }
-
- // check if the offset is not too high for implicit exception
---- ./hotspot/src/share/vm/runtime/atomic.cpp Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/share/vm/runtime/atomic.cpp Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/share/vm/runtime/atomic.cpp Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/share/vm/runtime/atomic.cpp Sun May 28 21:31:42 2017 -0700
@@ -57,6 +57,12 @@
#ifdef TARGET_OS_ARCH_windows_x86
# include "atomic_windows_x86.inline.hpp"
@@ -1591,8 +1502,8 @@
#ifdef TARGET_OS_ARCH_linux_arm
# include "atomic_linux_arm.inline.hpp"
#endif
---- ./hotspot/src/share/vm/runtime/objectMonitor.cpp Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/share/vm/runtime/objectMonitor.cpp Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp Sun May 28 21:31:42 2017 -0700
@@ -1740,7 +1740,7 @@
}
iterator->_notified = 1 ;
@@ -1611,9 +1522,9 @@
if (Policy != 4) {
iterator->TState = ObjectWaiter::TS_ENTER ;
}
---- ./hotspot/src/share/vm/runtime/os.cpp Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/share/vm/runtime/os.cpp Sun May 21 11:12:48 2017 -0700
-@@ -403,13 +403,6 @@
+--- ./hotspot/src/share/vm/runtime/os.cpp Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/share/vm/runtime/os.cpp Sun May 28 21:31:42 2017 -0700
+@@ -410,13 +410,6 @@
if (_native_java_library == NULL) {
vm_exit_during_initialization("Unable to load native library", ebuf);
}
@@ -1627,8 +1538,8 @@
}
static jboolean onLoaded = JNI_FALSE;
if (onLoaded) {
---- ./hotspot/src/share/vm/runtime/os.hpp Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/share/vm/runtime/os.hpp Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/share/vm/runtime/os.hpp Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/share/vm/runtime/os.hpp Sun May 28 21:31:42 2017 -0700
@@ -30,6 +30,9 @@
#include "runtime/extendedPC.hpp"
#include "runtime/handles.hpp"
@@ -1639,7 +1550,7 @@
#ifdef TARGET_OS_FAMILY_linux
# include "jvm_linux.h"
# include <setjmp.h>
-@@ -763,8 +766,8 @@
+@@ -775,8 +778,8 @@
# include "os_posix.hpp"
#endif
#ifdef TARGET_OS_FAMILY_bsd
@@ -1649,8 +1560,8 @@
#endif
#ifdef TARGET_OS_ARCH_linux_x86
# include "os_linux_x86.hpp"
---- ./hotspot/src/share/vm/runtime/vmThread.cpp Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/share/vm/runtime/vmThread.cpp Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/share/vm/runtime/vmThread.cpp Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/share/vm/runtime/vmThread.cpp Sun May 28 21:31:42 2017 -0700
@@ -396,7 +396,7 @@
// Only write caller thread information for non-concurrent vm operations.
// For concurrent vm operations, the thread id is set to 0 indicating thread is unknown.
@@ -1660,8 +1571,8 @@
event.commit();
}
---- ./hotspot/src/share/vm/trace/tracetypes.xml Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/src/share/vm/trace/tracetypes.xml Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/src/share/vm/trace/tracetypes.xml Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/src/share/vm/trace/tracetypes.xml Sun May 28 21:31:42 2017 -0700
@@ -60,7 +60,7 @@
<types>
<content_types>
@@ -1682,8 +1593,8 @@
<!-- VM Thread ID Note: changed from U2 to U8 for hotspot -->
<primary_type symbol="VMTHREAD" datatype="U8" contenttype="VMTHREAD"
---- ./hotspot/test/compiler/5091921/Test7005594.sh Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/test/compiler/5091921/Test7005594.sh Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/test/compiler/5091921/Test7005594.sh Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/test/compiler/5091921/Test7005594.sh Sun May 28 21:31:42 2017 -0700
@@ -60,6 +60,9 @@
# Windows/MKS
MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
@@ -1694,8 +1605,8 @@
else
echo "Unable to determine amount of physical memory on the machine"
fi
---- ./hotspot/test/runtime/7110720/Test7110720.sh Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/test/runtime/7110720/Test7110720.sh Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/test/runtime/7110720/Test7110720.sh Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/test/runtime/7110720/Test7110720.sh Sun May 28 21:31:42 2017 -0700
@@ -28,7 +28,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1706,7 +1617,7 @@
RM=/bin/rm
CP=/bin/cp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/test/runtime/7158800/Test7158800.sh Sun May 21 11:12:48 2017 -0700
++++ ./hotspot/test/runtime/7158800/Test7158800.sh Sun May 28 21:31:42 2017 -0700
@@ -0,0 +1,91 @@
+#!/bin/sh
+#
@@ -1799,8 +1710,8 @@
+ echo "Test Passed"
+ exit 0
+fi
---- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Wed Jan 18 01:08:41 2017 +0000
-+++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Sun May 21 11:12:48 2017 -0700
+--- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Thu Apr 27 06:11:42 2017 +0100
++++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Sun May 28 21:31:42 2017 -0700
@@ -36,8 +36,8 @@
public static void main(String args[]) throws Throwable {
@@ -1812,8 +1723,8 @@
return;
}
---- ./jaxp/.hgtags Fri Oct 28 03:35:34 2016 +0100
-+++ ./jaxp/.hgtags Sun May 21 11:12:36 2017 -0700
+--- ./jaxp/.hgtags Thu Apr 27 06:11:38 2017 +0100
++++ ./jaxp/.hgtags Sun May 28 21:31:36 2017 -0700
@@ -123,6 +123,7 @@
bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
@@ -1822,13 +1733,13 @@
104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
-@@ -610,3 +611,4 @@
- be2127cf0435d141d8072a94dbe75a527ceda453 jdk7u111-b00
- cd13b280e8247904509c28ee8aa9b45326185dd7 jdk7u111-b01
- b198ece212c1f7ff382d9282624411a260b52a55 jdk7u121-b00
-+51ed13d07beb90ff71d8625d9d6409cc4add5cbc jdk7u131-b00
---- ./jaxws/.hgtags Fri Oct 28 03:35:35 2016 +0100
-+++ ./jaxws/.hgtags Sun May 21 11:12:38 2017 -0700
+@@ -613,3 +614,4 @@
+ 51ed13d07beb90ff71d8625d9d6409cc4add5cbc jdk7u131-b00
+ f347b141975453f642ae1140a45aa7c6127551dd jdk7u141-b00
+ e096a279a1c226d7d3a4aa19d5beeba1fb0507cf jdk7u141-b01
++b4b91a7beb185c0a8a14b83d2b05cfd7fc33c6fe jdk7u141-b02
+--- ./jaxws/.hgtags Thu Apr 27 06:11:39 2017 +0100
++++ ./jaxws/.hgtags Sun May 28 21:31:37 2017 -0700
@@ -123,6 +123,7 @@
05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01
@@ -1837,13 +1748,13 @@
4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02
272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03
48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04
-@@ -609,3 +610,4 @@
- 8fd4ada6c5d5c3f71cc52cc2af97c971a58c6b53 jdk7u111-b00
- 18074c212a8997055baa9aca9e9ae0dbbe90e1f4 jdk7u111-b01
- 29919af594f46f158604db87edbd538a3890884a jdk7u121-b00
-+edcc7c1e297588b30daaf61e3cdf25203f829cd4 jdk7u131-b00
---- ./jdk/.hgtags Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/.hgtags Wed May 24 00:32:01 2017 -0700
+@@ -612,3 +613,4 @@
+ edcc7c1e297588b30daaf61e3cdf25203f829cd4 jdk7u131-b00
+ 90c86962aa2e81ecd8d5d79a282f2492447e4c6e jdk7u141-b00
+ 506e24eee4e1887fbfdd77512f830b75e14c5759 jdk7u141-b01
++1af82a2d3d16626b8d2f5e633d23c027975406b8 jdk7u141-b02
+--- ./jdk/.hgtags Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/.hgtags Sun May 28 23:44:03 2017 -0700
@@ -123,6 +123,7 @@
539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01
@@ -1852,13 +1763,13 @@
2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02
a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03
b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04
-@@ -596,3 +597,4 @@
- a7267e8244b9418af15b1103b4d906e8c6a61bc0 jdk7u111-b00
- cc1ed9a351886645eb729144696e41d187564ec2 jdk7u111-b01
- c16fb4099a2bafe701d533d9a0fd869e7f8e5408 jdk7u121-b00
-+86d0df91308912e45e1b00f8699e0b157a8857af jdk7u131-b00
---- ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk Wed May 24 00:32:01 2017 -0700
+@@ -599,3 +600,4 @@
+ 86d0df91308912e45e1b00f8699e0b157a8857af jdk7u131-b00
+ e890a6aef6223d428376aac846c1d1f3e40dbda7 jdk7u141-b00
+ a319566e15f5611bae9cfda2696e8217020a9269 jdk7u141-b01
++19a085e656145471455d7fbd648717f94281a729 jdk7u141-b02
+--- ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk Sun May 28 23:44:03 2017 -0700
@@ -29,6 +29,7 @@
ifneq ($(PLATFORM), windows)
@@ -1872,8 +1783,8 @@
endif
endif
+endif
---- ./jdk/make/com/sun/nio/sctp/FILES_c.gmk Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/nio/sctp/FILES_c.gmk Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/nio/sctp/FILES_c.gmk Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/nio/sctp/FILES_c.gmk Sun May 28 23:44:03 2017 -0700
@@ -25,9 +25,13 @@
ifneq ($(PLATFORM),windows)
@@ -1888,8 +1799,8 @@
endif
+endif
+endif
---- ./jdk/make/com/sun/nio/sctp/FILES_java.gmk Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/nio/sctp/FILES_java.gmk Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/nio/sctp/FILES_java.gmk Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/nio/sctp/FILES_java.gmk Sun May 28 23:44:03 2017 -0700
@@ -50,6 +50,8 @@
ifneq ($(PLATFORM), windows)
@@ -1905,8 +1816,8 @@
endif
+endif
+endif
---- ./jdk/make/com/sun/nio/sctp/Makefile Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/nio/sctp/Makefile Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/nio/sctp/Makefile Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/nio/sctp/Makefile Sun May 28 23:44:03 2017 -0700
@@ -47,9 +47,13 @@
ifeq ($(PLATFORM), macosx)
include $(BUILDDIR)/common/Classes.gmk
@@ -1929,8 +1840,8 @@
endif # macosx
endif # windows
---- ./jdk/make/com/sun/security/auth/module/Makefile Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/security/auth/module/Makefile Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/security/auth/module/Makefile Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/security/auth/module/Makefile Sun May 28 23:44:03 2017 -0700
@@ -67,7 +67,7 @@
include FILES_c_solaris.gmk
endif # solaris
@@ -1940,8 +1851,8 @@
LIBRARY = jaas_unix
include FILES_export_unix.gmk
include FILES_c_unix.gmk
---- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk Sun May 28 23:44:03 2017 -0700
@@ -43,7 +43,7 @@
sun/tools/attach/LinuxVirtualMachine.java
endif
@@ -1951,8 +1862,8 @@
FILES_export = \
sun/tools/attach/BsdVirtualMachine.java
endif
---- ./jdk/make/com/sun/tools/attach/FILES_c.gmk Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_c.gmk Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk Sun May 28 23:44:03 2017 -0700
@@ -39,7 +39,7 @@
LinuxVirtualMachine.c
endif
@@ -1962,8 +1873,8 @@
FILES_c = \
BsdVirtualMachine.c
endif
---- ./jdk/make/com/sun/tools/attach/FILES_java.gmk Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_java.gmk Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk Sun May 28 23:44:03 2017 -0700
@@ -43,7 +43,7 @@
sun/tools/attach/LinuxAttachProvider.java
endif
@@ -1973,8 +1884,8 @@
FILES_java += \
sun/tools/attach/BsdAttachProvider.java
endif
---- ./jdk/make/com/sun/tools/attach/Makefile Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/tools/attach/Makefile Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/tools/attach/Makefile Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/tools/attach/Makefile Sun May 28 23:44:03 2017 -0700
@@ -38,7 +38,7 @@
ifeq ($(PLATFORM), linux)
FILES_m = mapfile-linux
@@ -1993,8 +1904,8 @@
vpath %.c $(call NativeSrcDirList,,native/sun/tools/attach)
else
vpath %.c $(PLATFORM_SRC)/native/sun/tools/attach
---- ./jdk/make/com/sun/tools/attach/mapfile-bsd Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/com/sun/tools/attach/mapfile-bsd Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/com/sun/tools/attach/mapfile-bsd Sun May 28 23:44:03 2017 -0700
@@ -30,6 +30,7 @@
Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
Java_sun_tools_attach_BsdVirtualMachine_close;
@@ -2004,7 +1915,7 @@
Java_sun_tools_attach_BsdVirtualMachine_sendQuitTo;
Java_sun_tools_attach_BsdVirtualMachine_socket;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/common/Defs-bsd.gmk Wed May 24 00:32:01 2017 -0700
++++ ./jdk/make/common/Defs-bsd.gmk Sun May 28 23:44:03 2017 -0700
@@ -0,0 +1,482 @@
+#
+# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -2488,8 +2399,8 @@
+ OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include
+ OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
+endif
---- ./jdk/make/common/Defs-linux.gmk Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/Defs-linux.gmk Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/Defs-linux.gmk Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/Defs-linux.gmk Sun May 28 23:44:03 2017 -0700
@@ -445,6 +445,7 @@
override LIBDL = -ldl
override MOOT_PRIORITIES = true
@@ -2498,8 +2409,8 @@
ifeq ($(ARCH), $(findstring $(ARCH), amd64 ppc64))
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
---- ./jdk/make/common/Defs-solaris.gmk Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/Defs-solaris.gmk Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/Defs-solaris.gmk Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/Defs-solaris.gmk Sun May 28 23:44:03 2017 -0700
@@ -753,6 +753,9 @@
# Network Services library
LIBNSL = -lnsl
@@ -2510,8 +2421,8 @@
# service configuration facility library
LIBSCF = -lscf
---- ./jdk/make/common/Defs.gmk Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/Defs.gmk Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/Defs.gmk Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/Defs.gmk Sun May 28 23:44:03 2017 -0700
@@ -179,7 +179,7 @@
ifdef ALT_FREETYPE_LIB_PATH
@@ -2563,8 +2474,8 @@
VPATH0.java = $(subst $(ONESPACE),:,$(GENSRCDIR) $(call JavaSrcDirList,,classes))
else
VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
---- ./jdk/make/common/Library.gmk Fri Jan 23 10:31:15 2015 -0800
-+++ ./jdk/make/common/Library.gmk Wed May 24 00:32:01 2017 -0700
+--- ./jdk/make/common/Library.gmk Wed Apr 03 20:42:55 2013 +0400
++++ ./jdk/make/common/Library.gmk Sun May 28 23:44:03 2017 -0700
@@ -299,8 +299,12 @@
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list