svn commit: r420530 - in head/java/openjdk7: . files
Greg Lewis
glewis at FreeBSD.org
Sat Aug 20 21:07:48 UTC 2016
Author: glewis
Date: Sat Aug 20 21:07:46 2016
New Revision: 420530
URL: https://svnweb.freebsd.org/changeset/ports/420530
Log:
. Update to 7u111.
Modified:
head/java/openjdk7/Makefile
head/java/openjdk7/distinfo
head/java/openjdk7/files/patch-bsd
Modified: head/java/openjdk7/Makefile
==============================================================================
--- head/java/openjdk7/Makefile Sat Aug 20 21:04:16 2016 (r420529)
+++ head/java/openjdk7/Makefile Sat Aug 20 21:07:46 2016 (r420530)
@@ -3,7 +3,6 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
-PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
@@ -30,7 +29,8 @@ PATCHFILES= patch-7u45-b30.xz \
patch-7u85-b02.xz \
patch-7u91-b02.xz \
patch-7u95-b00.xz \
- patch-7u101-b00.xz
+ patch-7u101-b00.xz \
+ patch-7u111-b01.xz
MAINTAINER?= glewis at FreeBSD.org
COMMENT?= Java Development Kit 7
@@ -59,8 +59,8 @@ JAVAVMS_COMMENT+= JRE
INSTALLDIR= ${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}-jre
.endif
-PORT_MINOR_VERSION= 101
-PORT_BUILD_NUMBER= 00
+PORT_MINOR_VERSION= 111
+PORT_BUILD_NUMBER= 01
JDK_MAJOR_VERSION= 7
JDK_MINOR_VERSION= 40
JDK_BUILD_NUMBER= 43
Modified: head/java/openjdk7/distinfo
==============================================================================
--- head/java/openjdk7/distinfo Sat Aug 20 21:04:16 2016 (r420529)
+++ head/java/openjdk7/distinfo Sat Aug 20 21:07:46 2016 (r420530)
@@ -27,3 +27,5 @@ SHA256 (patch-7u95-b00.xz) = bb522469ced
SIZE (patch-7u95-b00.xz) = 91612
SHA256 (patch-7u101-b00.xz) = 8406d9f453b91c4e31e5a6a0a1769c3da87e3e3bf7a4c567024f7f929f555702
SIZE (patch-7u101-b00.xz) = 121752
+SHA256 (patch-7u111-b01.xz) = d46ffd30a6fa6d8ce40231e6dadcabf491a347e2afea87302f38bab5e2bee523
+SIZE (patch-7u111-b01.xz) = 273552
Modified: head/java/openjdk7/files/patch-bsd
==============================================================================
--- head/java/openjdk7/files/patch-bsd Sat Aug 20 21:04:16 2016 (r420529)
+++ head/java/openjdk7/files/patch-bsd Sat Aug 20 21:07:46 2016 (r420530)
@@ -1,5 +1,5 @@
---- ./.hgtags Wed Mar 23 21:08:19 2016 +0000
-+++ ./.hgtags Sun May 01 16:41:46 2016 -0700
+--- ./.hgtags Wed Jul 20 04:05:01 2016 +0100
++++ ./.hgtags Sat Aug 20 11:56:17 2016 -0700
@@ -123,6 +123,7 @@
2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
@@ -8,13 +8,13 @@
34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02
bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03
f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04
-@@ -603,3 +604,4 @@
- 2be0ab1a24b2b6910d8f31e3314ffa48f30f21df jdk7u91-b02
- a28bc539342e4ca724a5abd2521c6a58f04c2113 jdk7u95-b00
+@@ -605,3 +606,4 @@
251bb2a6d5cfbb76c0f4bdfecea4ca9c8af21558 jdk7u99-b00
-+12491db47c7ccffcc3e881df68f4c2f727b44e5d jdk7u101-b00
---- ./corba/.hgtags Fri Apr 15 03:57:30 2016 +0100
-+++ ./corba/.hgtags Sun May 01 16:42:06 2016 -0700
+ 12491db47c7ccffcc3e881df68f4c2f727b44e5d jdk7u101-b00
+ bade1889699bab14082e84de3b40901964b52483 jdk7u111-b00
++9b95c1ef81fe7bb010a6938d1cb97843b9a1fc68 jdk7u111-b01
+--- ./corba/.hgtags Wed Jul 20 04:05:02 2016 +0100
++++ ./corba/.hgtags Sat Aug 20 11:56:18 2016 -0700
@@ -123,6 +123,7 @@
770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
@@ -23,13 +23,13 @@
9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
-@@ -605,3 +606,4 @@
- e3a6331d136ecac575730b498501f5b0dc4302e2 jdk7u91-b02
- 96b735f85c61ad721113713551271106a5070742 jdk7u95-b00
+@@ -607,3 +608,4 @@
adda687205a9a40573fdb538240a5699fdc7dbd6 jdk7u99-b00
-+9c164195bcc97da6c6567e6e6d55ea349f1c583d jdk7u101-b00
---- ./hotspot/.hgtags Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/.hgtags Sun May 01 16:42:53 2016 -0700
+ 9c164195bcc97da6c6567e6e6d55ea349f1c583d jdk7u101-b00
+ c1def4cc27fb92914168a5f65658eba4a1754dfe jdk7u111-b00
++36715cc029596f86e977d486e547f62bb07eed74 jdk7u111-b01
+--- ./hotspot/.hgtags Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/.hgtags Sat Aug 20 11:56:24 2016 -0700
@@ -182,6 +182,7 @@
38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16
81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147
@@ -38,13 +38,13 @@
9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01
0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
-@@ -837,3 +838,4 @@
- 2f2d431ace967c9a71194e1bb46f38b35ea43512 jdk7u91-b02
- b3c5ff648bcad305163b323ad15dde1b6234d501 jdk7u95-b00
+@@ -839,3 +840,4 @@
631da593499ee184ea8efb2bc5491e0d99ac636d jdk7u99-b00
-+6e42747134be8a4a366d337da1fc84a847ad8381 jdk7u101-b00
---- ./hotspot/agent/src/os/bsd/ps_proc.c Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/agent/src/os/bsd/ps_proc.c Sun May 01 16:42:53 2016 -0700
+ 6e42747134be8a4a366d337da1fc84a847ad8381 jdk7u101-b00
+ 14d0f4da4a74897fc3274f8f549f41544bb4625a jdk7u111-b00
++9efa3fae3c278a7f48badec775d7f9b2d5320b6d jdk7u111-b01
+--- ./hotspot/agent/src/os/bsd/ps_proc.c Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/agent/src/os/bsd/ps_proc.c Sat Aug 20 11:56:24 2016 -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 Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sat Aug 20 11:56:24 2016 -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 Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Sat Aug 20 11:56:24 2016 -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 Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/Makefile Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/Makefile Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/Makefile Sat Aug 20 11:56:24 2016 -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 Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/makefiles/build_vm_def.sh Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sat Aug 20 11:56:24 2016 -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 Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/makefiles/buildtree.make Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/makefiles/buildtree.make Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/makefiles/buildtree.make Sat Aug 20 11:56:24 2016 -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 Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/makefiles/gcc.make Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/makefiles/gcc.make Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/makefiles/gcc.make Sat Aug 20 11:56:24 2016 -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 Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/makefiles/jsig.make Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/makefiles/jsig.make Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/makefiles/jsig.make Sat Aug 20 11:56:24 2016 -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 Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/makefiles/launcher.make Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/makefiles/launcher.make Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/makefiles/launcher.make Sat Aug 20 11:56:24 2016 -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 Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-product Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sat Aug 20 11:56:24 2016 -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
@@ -737,8 +737,8 @@
+ local:
+ *;
+};
---- ./hotspot/make/bsd/makefiles/ppc.make Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/makefiles/ppc.make Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/makefiles/ppc.make Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/makefiles/ppc.make Sat Aug 20 11:56:24 2016 -0700
@@ -28,3 +28,6 @@
# Must also specify if CPU is big endian
CFLAGS += -DVM_BIG_ENDIAN
@@ -746,8 +746,8 @@
+ifdef E500V2
+ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1
+endif
---- ./hotspot/make/bsd/makefiles/saproc.make Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/bsd/makefiles/saproc.make Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/bsd/makefiles/saproc.make Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/bsd/makefiles/saproc.make Sat Aug 20 11:56:24 2016 -0700
@@ -36,6 +36,11 @@
LIBSAPROC_G = lib$(SAPROC_G).so
endif
@@ -804,8 +804,8 @@
cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"; \
fi
---- ./hotspot/make/solaris/makefiles/defs.make Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/make/solaris/makefiles/defs.make Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/make/solaris/makefiles/defs.make Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/make/solaris/makefiles/defs.make Sat Aug 20 11:56:24 2016 -0700
@@ -221,8 +221,8 @@
endif
ifeq ($(JVM_VARIANT_CLIENT),true)
@@ -817,8 +817,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 Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Sat Aug 20 11:56:24 2016 -0700
@@ -71,7 +71,11 @@
define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true);
@@ -832,7 +832,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 01 16:42:53 2016 -0700
++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Sat Aug 20 11:56:24 2016 -0700
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -880,8 +880,8 @@
+ return false;
+}
+
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Sat Aug 20 11:56:24 2016 -0700
@@ -187,6 +187,8 @@
static int SR_signum = SIGUSR2;
sigset_t SR_sigset;
@@ -1059,8 +1059,8 @@
#elif defined(__APPLE__) || defined(__NetBSD__)
struct sched_param sp;
int policy;
---- ./hotspot/src/os/bsd/vm/os_bsd.hpp Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.hpp Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Sat Aug 20 11:56:24 2016 -0700
@@ -103,6 +103,12 @@
static bool hugetlbfs_sanity_check(bool warn, size_t page_size);
@@ -1074,8 +1074,8 @@
public:
static void init_thread_fpu_state();
---- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Sat Aug 20 11:56:24 2016 -0700
@@ -31,10 +31,22 @@
# include "atomic_bsd_x86.inline.hpp"
# include "orderAccess_bsd_x86.inline.hpp"
@@ -1099,8 +1099,8 @@
// System includes
---- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Sat Aug 20 11:56:24 2016 -0700
@@ -34,11 +34,26 @@
# include "orderAccess_bsd_x86.inline.hpp"
# include "prefetch_bsd_x86.inline.hpp"
@@ -1128,8 +1128,8 @@
// Contains inlined functions for class Thread and ThreadLocalStorage
---- ./hotspot/src/os/posix/vm/os_posix.cpp Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/os/posix/vm/os_posix.cpp Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/os/posix/vm/os_posix.cpp Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/os/posix/vm/os_posix.cpp Sat Aug 20 11:56:24 2016 -0700
@@ -175,11 +175,19 @@
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
else st->print("%d", rlim.rlim_cur);
@@ -1150,8 +1150,8 @@
}
void os::Posix::print_uname_info(outputStream* st) {
---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sat Aug 20 11:56:24 2016 -0700
@@ -945,7 +945,7 @@
if (rslt != 0)
fatal(err_msg("pthread_stackseg_np failed with err = %d", rslt));
@@ -1161,8 +1161,8 @@
*size = ss.ss_size;
#elif defined(_ALLBSD_SOURCE)
pthread_attr_t attr;
---- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Sat Aug 20 11:56:24 2016 -0700
@@ -24,7 +24,7 @@
*/
@@ -1172,8 +1172,8 @@
# include <pthread_np.h> /* For pthread_attr_get_np */
#endif
---- ./hotspot/src/share/vm/code/relocInfo.hpp Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/share/vm/code/relocInfo.hpp Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/share/vm/code/relocInfo.hpp Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/share/vm/code/relocInfo.hpp Sat Aug 20 11:56:24 2016 -0700
@@ -371,7 +371,7 @@
// "immediate" in the prefix header word itself. This optimization
// is invisible outside this module.)
@@ -1192,8 +1192,8 @@
assert(relocInfo::fits_into_immediate(datalen), "datalen in limits");
return relocInfo(relocInfo::data_prefix_tag, relocInfo::RAW_BITS, relocInfo::datalen_tag | datalen);
}
---- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Sat Aug 20 11:56:24 2016 -0700
@@ -111,7 +111,7 @@
if (e.should_commit()) {
e.set_gcId(_shared_gc_info.id());
@@ -1203,8 +1203,8 @@
e.commit();
}
}
---- ./hotspot/src/share/vm/runtime/atomic.cpp Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/share/vm/runtime/atomic.cpp Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/share/vm/runtime/atomic.cpp Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/share/vm/runtime/atomic.cpp Sat Aug 20 11:56:24 2016 -0700
@@ -54,6 +54,12 @@
#ifdef TARGET_OS_ARCH_windows_x86
# include "atomic_windows_x86.inline.hpp"
@@ -1218,8 +1218,8 @@
#ifdef TARGET_OS_ARCH_linux_arm
# include "atomic_linux_arm.inline.hpp"
#endif
---- ./hotspot/src/share/vm/runtime/objectMonitor.cpp Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/share/vm/runtime/objectMonitor.cpp Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp Sat Aug 20 11:56:24 2016 -0700
@@ -1744,7 +1744,7 @@
}
iterator->_notified = 1 ;
@@ -1238,8 +1238,8 @@
if (Policy != 4) {
iterator->TState = ObjectWaiter::TS_ENTER ;
}
---- ./hotspot/src/share/vm/runtime/os.cpp Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/share/vm/runtime/os.cpp Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/share/vm/runtime/os.cpp Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/share/vm/runtime/os.cpp Sat Aug 20 11:56:24 2016 -0700
@@ -399,13 +399,6 @@
if (_native_java_library == NULL) {
vm_exit_during_initialization("Unable to load native library", ebuf);
@@ -1254,8 +1254,8 @@
}
static jboolean onLoaded = JNI_FALSE;
if (onLoaded) {
---- ./hotspot/src/share/vm/runtime/os.hpp Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/share/vm/runtime/os.hpp Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/share/vm/runtime/os.hpp Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/share/vm/runtime/os.hpp Sat Aug 20 11:56:24 2016 -0700
@@ -30,6 +30,9 @@
#include "runtime/extendedPC.hpp"
#include "runtime/handles.hpp"
@@ -1276,8 +1276,8 @@
#endif
#ifdef TARGET_OS_ARCH_linux_x86
# include "os_linux_x86.hpp"
---- ./hotspot/src/share/vm/runtime/vmThread.cpp Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/share/vm/runtime/vmThread.cpp Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/share/vm/runtime/vmThread.cpp Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/share/vm/runtime/vmThread.cpp Sat Aug 20 11:56:24 2016 -0700
@@ -393,7 +393,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.
@@ -1287,8 +1287,8 @@
event.commit();
}
---- ./hotspot/src/share/vm/trace/tracetypes.xml Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/src/share/vm/trace/tracetypes.xml Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/src/share/vm/trace/tracetypes.xml Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/src/share/vm/trace/tracetypes.xml Sat Aug 20 11:56:24 2016 -0700
@@ -60,7 +60,7 @@
<types>
<content_types>
@@ -1309,8 +1309,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 Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/test/compiler/5091921/Test7005594.sh Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/test/compiler/5091921/Test7005594.sh Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/test/compiler/5091921/Test7005594.sh Sat Aug 20 11:56:24 2016 -0700
@@ -60,6 +60,9 @@
# Windows/MKS
MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
@@ -1321,8 +1321,8 @@
else
echo "Unable to determine amount of physical memory on the machine"
fi
---- ./hotspot/test/runtime/7110720/Test7110720.sh Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/test/runtime/7110720/Test7110720.sh Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/test/runtime/7110720/Test7110720.sh Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/test/runtime/7110720/Test7110720.sh Sat Aug 20 11:56:24 2016 -0700
@@ -28,7 +28,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1333,7 +1333,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 01 16:42:53 2016 -0700
++++ ./hotspot/test/runtime/7158800/Test7158800.sh Sat Aug 20 11:56:24 2016 -0700
@@ -0,0 +1,91 @@
+#!/bin/sh
+#
@@ -1426,8 +1426,8 @@
+ echo "Test Passed"
+ exit 0
+fi
---- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Fri Apr 15 04:31:10 2016 +0100
-+++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Sun May 01 16:42:53 2016 -0700
+--- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Wed Jul 20 04:05:08 2016 +0100
++++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Sat Aug 20 11:56:24 2016 -0700
@@ -36,8 +36,8 @@
public static void main(String args[]) throws Throwable {
@@ -1439,8 +1439,8 @@
return;
}
---- ./jaxp/.hgtags Fri Apr 15 04:34:37 2016 +0100
-+++ ./jaxp/.hgtags Sun May 01 16:42:15 2016 -0700
+--- ./jaxp/.hgtags Wed Jul 20 04:05:04 2016 +0100
++++ ./jaxp/.hgtags Sat Aug 20 11:56:20 2016 -0700
@@ -123,6 +123,7 @@
bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
@@ -1449,13 +1449,13 @@
104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
-@@ -606,3 +607,4 @@
- 6d9a192976332443bb3be46d49d5b255d9781fe9 jdk7u91-b02
- 7c422316234f10b327fdbc181aedd5e74f31fd38 jdk7u95-b00
+@@ -608,3 +609,4 @@
c029d7572a67cb2fb3f9f2d8e91cbdda3beab95e jdk7u99-b00
-+dcdbebfaf4b42da4927d3d0c682205a23cd7cdb8 jdk7u101-b00
---- ./jaxws/.hgtags Wed Mar 23 21:08:23 2016 +0000
-+++ ./jaxws/.hgtags Sun May 01 16:42:25 2016 -0700
+ dcdbebfaf4b42da4927d3d0c682205a23cd7cdb8 jdk7u101-b00
+ be2127cf0435d141d8072a94dbe75a527ceda453 jdk7u111-b00
++cd13b280e8247904509c28ee8aa9b45326185dd7 jdk7u111-b01
+--- ./jaxws/.hgtags Wed Jul 20 04:05:05 2016 +0100
++++ ./jaxws/.hgtags Sat Aug 20 11:56:21 2016 -0700
@@ -123,6 +123,7 @@
05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01
@@ -1464,13 +1464,13 @@
4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02
272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03
48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04
-@@ -605,3 +606,4 @@
- 2230b8f8e03a8eaefc83acb577f30c4de88c45a7 jdk7u91-b02
- 3427b35ce5a1a0143b4aedf3f5e0a1953ad7fd7f jdk7u95-b00
+@@ -607,3 +608,4 @@
e0764f20b2894c5de39f1e235171d42d5f2703eb jdk7u99-b00
-+36ee37eedf25da13abde1c0b8974fb3b95c59c7c jdk7u101-b00
---- ./jdk/.hgtags Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/.hgtags Sun May 01 21:26:40 2016 -0700
+ 36ee37eedf25da13abde1c0b8974fb3b95c59c7c jdk7u101-b00
+ 8fd4ada6c5d5c3f71cc52cc2af97c971a58c6b53 jdk7u111-b00
++18074c212a8997055baa9aca9e9ae0dbbe90e1f4 jdk7u111-b01
+--- ./jdk/.hgtags Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/.hgtags Sat Aug 20 12:04:16 2016 -0700
@@ -123,6 +123,7 @@
539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01
@@ -1479,13 +1479,13 @@
2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02
a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03
b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04
-@@ -592,3 +593,4 @@
- c434c67b8189677dec0a0034a109fb261497cd92 jdk7u91-b02
- 3a74fee9ba00da3bd3a22492e1b069430a82574d jdk7u95-b00
+@@ -594,3 +595,4 @@
0b89eea70cf4952b22dfe10ea8611ddb852d73d6 jdk7u99-b00
-+bdcfc4d9ab9f52fbf37db876c08a1846765627c4 jdk7u101-b00
---- ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk Sun May 01 21:26:40 2016 -0700
+ bdcfc4d9ab9f52fbf37db876c08a1846765627c4 jdk7u101-b00
+ a7267e8244b9418af15b1103b4d906e8c6a61bc0 jdk7u111-b00
++cc1ed9a351886645eb729144696e41d187564ec2 jdk7u111-b01
+--- ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -29,6 +29,7 @@
ifneq ($(PLATFORM), windows)
@@ -1499,8 +1499,8 @@
endif
endif
+endif
---- ./jdk/make/com/sun/nio/sctp/FILES_c.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/nio/sctp/FILES_c.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/nio/sctp/FILES_c.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/nio/sctp/FILES_c.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -25,9 +25,13 @@
ifneq ($(PLATFORM),windows)
@@ -1515,8 +1515,8 @@
endif
+endif
+endif
---- ./jdk/make/com/sun/nio/sctp/FILES_java.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/nio/sctp/FILES_java.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/nio/sctp/FILES_java.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/nio/sctp/FILES_java.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -50,6 +50,8 @@
ifneq ($(PLATFORM), windows)
@@ -1532,8 +1532,8 @@
endif
+endif
+endif
---- ./jdk/make/com/sun/nio/sctp/Makefile Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/nio/sctp/Makefile Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/nio/sctp/Makefile Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/nio/sctp/Makefile Sat Aug 20 12:04:16 2016 -0700
@@ -47,9 +47,13 @@
ifeq ($(PLATFORM), macosx)
include $(BUILDDIR)/common/Classes.gmk
@@ -1556,8 +1556,8 @@
endif # macosx
endif # windows
---- ./jdk/make/com/sun/security/auth/module/Makefile Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/security/auth/module/Makefile Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/security/auth/module/Makefile Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/security/auth/module/Makefile Sat Aug 20 12:04:16 2016 -0700
@@ -67,7 +67,7 @@
include FILES_c_solaris.gmk
endif # solaris
@@ -1567,8 +1567,8 @@
LIBRARY = jaas_unix
include FILES_export_unix.gmk
include FILES_c_unix.gmk
---- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -43,7 +43,7 @@
sun/tools/attach/LinuxVirtualMachine.java
endif
@@ -1578,8 +1578,8 @@
FILES_export = \
sun/tools/attach/BsdVirtualMachine.java
endif
---- ./jdk/make/com/sun/tools/attach/FILES_c.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_c.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -39,7 +39,7 @@
LinuxVirtualMachine.c
endif
@@ -1589,8 +1589,8 @@
FILES_c = \
BsdVirtualMachine.c
endif
---- ./jdk/make/com/sun/tools/attach/FILES_java.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_java.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -43,7 +43,7 @@
sun/tools/attach/LinuxAttachProvider.java
endif
@@ -1600,8 +1600,8 @@
FILES_java += \
sun/tools/attach/BsdAttachProvider.java
endif
---- ./jdk/make/com/sun/tools/attach/Makefile Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/tools/attach/Makefile Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/tools/attach/Makefile Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/tools/attach/Makefile Sat Aug 20 12:04:16 2016 -0700
@@ -38,7 +38,7 @@
ifeq ($(PLATFORM), linux)
FILES_m = mapfile-linux
@@ -1620,8 +1620,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 Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/com/sun/tools/attach/mapfile-bsd Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/com/sun/tools/attach/mapfile-bsd Sat Aug 20 12:04:16 2016 -0700
@@ -30,6 +30,7 @@
Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
Java_sun_tools_attach_BsdVirtualMachine_close;
@@ -1631,7 +1631,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 Sun May 01 21:26:40 2016 -0700
++++ ./jdk/make/common/Defs-bsd.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -0,0 +1,482 @@
+#
+# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -2115,9 +2115,9 @@
+ OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include
+ OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
+endif
---- ./jdk/make/common/Defs-linux.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/Defs-linux.gmk Sun May 01 21:26:40 2016 -0700
-@@ -426,6 +426,7 @@
+--- ./jdk/make/common/Defs-linux.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/Defs-linux.gmk Sat Aug 20 12:04:16 2016 -0700
+@@ -432,6 +432,7 @@
override LIBDL = -ldl
override MOOT_PRIORITIES = true
override NO_INTERRUPTIBLE_IO = true
@@ -2125,8 +2125,8 @@
ifeq ($(ARCH), amd64)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
---- ./jdk/make/common/Defs-solaris.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/Defs-solaris.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/Defs-solaris.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/Defs-solaris.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -753,6 +753,9 @@
# Network Services library
LIBNSL = -lnsl
@@ -2137,8 +2137,8 @@
# service configuration facility library
LIBSCF = -lscf
---- ./jdk/make/common/Defs.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/Defs.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/Defs.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/Defs.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -179,15 +179,15 @@
ifdef ALT_FREETYPE_LIB_PATH
@@ -2189,8 +2189,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 Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/Library.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/Library.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/Library.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -299,8 +299,12 @@
ifeq ($(PLATFORM), solaris)
$(STRIP) -x $@
@@ -2206,8 +2206,8 @@
endif
# implied else here is no stripping at all
endif
---- ./jdk/make/common/Mapfile-vers.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/Mapfile-vers.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/Mapfile-vers.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/Mapfile-vers.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -76,7 +76,7 @@
endif # PLATFORM
@@ -2217,8 +2217,8 @@
ifeq ($(VARIANT), OPT)
# OPT build MUST have a mapfile?
---- ./jdk/make/common/Program.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/Program.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/Program.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/Program.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -95,6 +95,17 @@
endif # SYSTEM_ZLIB
endif # PLATFORM
@@ -2291,8 +2291,8 @@
OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
---- ./jdk/make/common/Release.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/Release.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/Release.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/Release.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -180,6 +180,12 @@
JA_DIRNAME=ja_JP.UTF-8
endif # linux
@@ -2337,8 +2337,8 @@
| ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
fi; \
done
---- ./jdk/make/common/Rules.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/Rules.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/Rules.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/Rules.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -51,7 +51,7 @@
#
# All source tree areas for java/properties files (a few may be closed)
@@ -2357,8 +2357,8 @@
# TODO(cpc): need to document why this is necessary...
$(CLASSDESTDIR)/%.class: $(JDK_TOPDIR)/src/macosx/classes/%.java
@$(add-java-file)
---- ./jdk/make/common/shared/Compiler-gcc.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/shared/Compiler-gcc.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/shared/Compiler-gcc.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/shared/Compiler-gcc.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -72,6 +72,21 @@
endif
@@ -2382,7 +2382,7 @@
# Settings specific to Solaris
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/common/shared/Defs-bsd.gmk Sun May 01 21:26:40 2016 -0700
++++ ./jdk/make/common/shared/Defs-bsd.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -0,0 +1,267 @@
+#
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -2651,8 +2651,8 @@
+endef
+endif
+
---- ./jdk/make/common/shared/Defs-utils.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/shared/Defs-utils.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/shared/Defs-utils.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/shared/Defs-utils.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -74,6 +74,13 @@
UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
endif
@@ -2703,8 +2703,8 @@
+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ endif
+endif
---- ./jdk/make/common/shared/Defs-versions.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/shared/Defs-versions.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/shared/Defs-versions.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/shared/Defs-versions.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -44,6 +44,11 @@
override CC_VERSION = gcc
endif
@@ -2731,8 +2731,8 @@
# Mac specific
ifeq ($(PLATFORM), macosx)
REQUIRED_OS_NAME = Darwin
---- ./jdk/make/common/shared/Defs.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/shared/Defs.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/shared/Defs.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/shared/Defs.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -181,7 +181,7 @@
# platform and shared sources/headers. This is mainly useful for the
# Mac OS X build, which pulls its platform sources from the solaris and/or
@@ -2742,8 +2742,8 @@
define JavaSrcDirList
$(JAVA_SRCDIR_LIST:%=$1$(JDK_TOPDIR)/%/$2)
endef
---- ./jdk/make/common/shared/Platform.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/common/shared/Platform.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/common/shared/Platform.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/common/shared/Platform.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -298,6 +298,85 @@
# How much RAM does this machine have:
endif
@@ -2830,8 +2830,8 @@
# Windows with and without CYGWIN will be slightly different
ifeq ($(SYSTEM_UNAME), Windows_NT)
PLATFORM = windows
---- ./jdk/make/java/Makefile Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/Makefile Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/Makefile Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/Makefile Sat Aug 20 12:04:16 2016 -0700
@@ -53,7 +53,7 @@
endif
endif # PLATFORM
@@ -2841,8 +2841,8 @@
SUBDIRS += jexec
endif # PLATFORM
---- ./jdk/make/java/instrument/Makefile Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/instrument/Makefile Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/instrument/Makefile Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/instrument/Makefile Sat Aug 20 12:04:16 2016 -0700
@@ -104,12 +104,24 @@
# equivalent of strcasecmp is stricmp on Windows
CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
@@ -2873,8 +2873,8 @@
ifeq ($(SYSTEM_ZLIB), true)
OTHER_LDLIBS += -lz
endif
---- ./jdk/make/java/java/Makefile Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/java/Makefile Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/java/Makefile Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/java/Makefile Sat Aug 20 12:04:16 2016 -0700
@@ -177,9 +177,11 @@
#
ifneq ($(PLATFORM), windows)
@@ -2897,8 +2897,8 @@
ARCHFLAG =
ifeq ($(ARCH_DATA_MODEL), 64)
---- ./jdk/make/java/java/genlocales.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/java/genlocales.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/java/genlocales.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/java/genlocales.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -93,17 +93,65 @@
else
@@ -2969,8 +2969,8 @@
endif
genlocales : $(LocaleDataMetaInfo_Dest)
---- ./jdk/make/java/jli/Makefile Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/jli/Makefile Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/jli/Makefile Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/jli/Makefile Sat Aug 20 12:04:16 2016 -0700
@@ -119,9 +119,9 @@
LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"'
endif # PLATFORM
@@ -2992,8 +2992,8 @@
ifeq ($(USE_PTHREADS),true)
LDLIBS += -lpthread
endif # USE_PTHREADS
---- ./jdk/make/java/net/FILES_c.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/net/FILES_c.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/net/FILES_c.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/net/FILES_c.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -50,6 +50,10 @@
FILES_c += bsd_close.c
endif
@@ -3005,8 +3005,8 @@
ifeq ($(PLATFORM), windows)
FILES_c += TwoStacksPlainSocketImpl.c
FILES_c += DualStackPlainSocketImpl.c
---- ./jdk/make/java/net/Makefile Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/net/Makefile Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/net/Makefile Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/net/Makefile Sat Aug 20 12:04:16 2016 -0700
@@ -93,7 +93,7 @@
include $(BUILDDIR)/common/Library.gmk
@@ -3016,8 +3016,8 @@
ifdef DONT_ENABLE_IPV6
OTHER_CFLAGS += -DDONT_ENABLE_IPV6
endif
---- ./jdk/make/java/nio/Makefile Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/nio/Makefile Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/nio/Makefile Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/nio/Makefile Sat Aug 20 12:04:16 2016 -0700
@@ -263,13 +263,89 @@
sun/nio/fs/UnixConstants.java
endif # PLATFORM = linux
@@ -3158,8 +3158,8 @@
FILES_m = mapfile-bsd
endif
include $(BUILDDIR)/common/Mapfile-vers.gmk
---- ./jdk/make/java/nio/mapfile-bsd Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/nio/mapfile-bsd Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/nio/mapfile-bsd Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/nio/mapfile-bsd Sat Aug 20 12:04:16 2016 -0700
@@ -70,6 +70,7 @@
Java_sun_nio_ch_IOUtil_drain;
Java_sun_nio_ch_IOUtil_fdVal;
@@ -3180,8 +3180,8 @@
Java_sun_nio_ch_KQueuePort_socketpair;
Java_sun_nio_ch_KQueuePort_interrupt;
Java_sun_nio_ch_KQueuePort_drain1;
---- ./jdk/make/java/npt/Makefile Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/npt/Makefile Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/npt/Makefile Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/npt/Makefile Sat Aug 20 12:04:16 2016 -0700
@@ -74,6 +74,14 @@
OTHER_LDLIBS += -liconv
endif
@@ -3197,8 +3197,8 @@
#
# Add to ambient vpath so we pick up the library files
#
---- ./jdk/make/java/redist/fonts/Makefile Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/java/redist/fonts/Makefile Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/java/redist/fonts/Makefile Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/java/redist/fonts/Makefile Sat Aug 20 12:04:16 2016 -0700
@@ -42,7 +42,7 @@
$(LIBDIR)/fonts/LucidaSansRegular.ttf \
$(LIBDIR)/fonts/LucidaSansDemiBold.ttf \
@@ -3226,8 +3226,8 @@
all build : $(INTERNAL_IMPORT_LIST)
---- ./jdk/make/javax/sound/Makefile Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/javax/sound/Makefile Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/javax/sound/Makefile Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/javax/sound/Makefile Sat Aug 20 12:04:16 2016 -0700
@@ -111,6 +111,21 @@
#MXSPP_ADD = $(PLATFORM)-$(ARCH)/
endif # PLATFORM linux
@@ -3250,8 +3250,8 @@
ifeq ($(PLATFORM), macosx)
CPPFLAGS += -DUSE_PORTS=TRUE \
-DUSE_DAUDIO=TRUE \
---- ./jdk/make/javax/sound/SoundDefs.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/javax/sound/SoundDefs.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/javax/sound/SoundDefs.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/javax/sound/SoundDefs.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -40,6 +40,10 @@
CPPFLAGS += -DX_PLATFORM=X_LINUX
endif # PLATFORM linux
@@ -3263,8 +3263,8 @@
ifeq ($(PLATFORM), macosx)
CPPFLAGS += -DX_PLATFORM=X_MACOSX
endif # PLATFORM macosx
---- ./jdk/make/javax/sound/jsoundalsa/Makefile Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/javax/sound/jsoundalsa/Makefile Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/javax/sound/jsoundalsa/Makefile Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/javax/sound/jsoundalsa/Makefile Sat Aug 20 12:04:16 2016 -0700
@@ -51,6 +51,7 @@
$(PORTFILES_c)
@@ -3315,8 +3315,8 @@
#
# Add to the ambient VPATH.
---- ./jdk/make/jpda/transport/socket/Makefile Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/jpda/transport/socket/Makefile Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/jpda/transport/socket/Makefile Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/jpda/transport/socket/Makefile Sat Aug 20 12:04:16 2016 -0700
@@ -38,6 +38,11 @@
include $(BUILDDIR)/common/Defs.gmk
@@ -3329,8 +3329,8 @@
ifeq ($(PLATFORM), linux)
OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
endif
---- ./jdk/make/sun/awt/Makefile Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/sun/awt/Makefile Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/sun/awt/Makefile Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/sun/awt/Makefile Sat Aug 20 12:04:16 2016 -0700
@@ -127,7 +127,12 @@
OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL)
endif
@@ -3397,8 +3397,8 @@
LDFLAGS += -L$(OPENWIN_LIB)
endif
---- ./jdk/make/sun/awt/mawt.gmk Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/sun/awt/mawt.gmk Sun May 01 21:26:40 2016 -0700
+--- ./jdk/make/sun/awt/mawt.gmk Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/sun/awt/mawt.gmk Sat Aug 20 12:04:16 2016 -0700
@@ -169,7 +169,7 @@
OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
endif
@@ -3455,18 +3455,18 @@
ifeq ($(PLATFORM), macosx))
CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
-I$(OPENWIN_HOME)/include
---- ./jdk/make/sun/font/Makefile Fri Apr 15 03:53:39 2016 +0100
-+++ ./jdk/make/sun/font/Makefile Sun May 01 21:26:40 2016 -0700
-@@ -96,7 +96,7 @@
-
- # Turn off aliasing with GCC for ExtensionSubtables.cpp
- # Turn off strict overflow with GCC for IndicRearrangementProcessor.cpp
+--- ./jdk/make/sun/font/Makefile Fri Jul 22 13:58:07 2016 +0100
++++ ./jdk/make/sun/font/Makefile Sat Aug 20 12:04:16 2016 -0700
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list