svn commit: r449459 - in head/java/openjdk7: . files
Greg Lewis
glewis at FreeBSD.org
Fri Sep 8 18:11:06 UTC 2017
Author: glewis
Date: Fri Sep 8 18:11:04 2017
New Revision: 449459
URL: https://svnweb.freebsd.org/changeset/ports/449459
Log:
. Update to 7u151.
Deleted:
head/java/openjdk7/files/patch-hotspot_src_share_vm_opto_lcm.cpp
Modified:
head/java/openjdk7/Makefile
head/java/openjdk7/distinfo
head/java/openjdk7/files/patch-bsd
Modified: head/java/openjdk7/Makefile
==============================================================================
--- head/java/openjdk7/Makefile Fri Sep 8 17:55:37 2017 (r449458)
+++ head/java/openjdk7/Makefile Fri Sep 8 18:11:04 2017 (r449459)
@@ -33,7 +33,8 @@ PATCHFILES= patch-7u45-b30.xz \
patch-7u111-b01.xz \
patch-7u121-b00.xz \
patch-7u131-b00.xz \
- patch-7u141-b02.xz
+ patch-7u141-b02.xz \
+ patch-7u151-b01.xz
MAINTAINER?= glewis at FreeBSD.org
COMMENT?= Java Development Kit 7
@@ -76,8 +77,8 @@ JAVAVMS_COMMENT+= JRE
INSTALLDIR= ${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}-jre
.endif
-PORT_MINOR_VERSION= 141
-PORT_BUILD_NUMBER= 02
+PORT_MINOR_VERSION= 151
+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 Fri Sep 8 17:55:37 2017 (r449458)
+++ head/java/openjdk7/distinfo Fri Sep 8 18:11:04 2017 (r449459)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1496080874
+TIMESTAMP = 1504889826
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
@@ -35,3 +35,5 @@ SHA256 (patch-7u131-b00.xz) = 5c7b4f9be1d7bc3336ba19c2
SIZE (patch-7u131-b00.xz) = 769172
SHA256 (patch-7u141-b02.xz) = 721db525f519417c30d37bcfa80ff715a1e2858e0882e75759b4eaedd6a20510
SIZE (patch-7u141-b02.xz) = 165488
+SHA256 (patch-7u151-b01.xz) = 90f1f83528825290f2183f4122e8cef8e1bac4814a826f449271cc7635ca197c
+SIZE (patch-7u151-b01.xz) = 217872
Modified: head/java/openjdk7/files/patch-bsd
==============================================================================
--- head/java/openjdk7/files/patch-bsd Fri Sep 8 17:55:37 2017 (r449458)
+++ head/java/openjdk7/files/patch-bsd Fri Sep 8 18:11:04 2017 (r449459)
@@ -1,5 +1,5 @@
---- ./.hgtags Thu Apr 27 06:11:36 2017 +0100
-+++ ./.hgtags Sun May 28 21:31:34 2017 -0700
+--- ./.hgtags Tue Aug 01 14:12:25 2017 +0100
++++ ./.hgtags Thu Sep 07 23:37:08 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
-@@ -610,3 +611,4 @@
- 259e6ca7faf17e2b96fb0733f30e62327a7acdfa jdk7u131-b00
- e3b3add63d287cd07398949308308135ded4197e jdk7u141-b00
+@@ -612,3 +613,4 @@
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
+ db8fe12e5e508b18dd0aeb166099406a774b0d04 jdk7u141-b02
+ ae6c3762cdc9b1610211cd1ad1a29ed1a7f8471e jdk7u151-b00
++c63b09823b9fa0ddeb37c1ac534569a9227c5bf6 jdk7u151-b01
+--- ./corba/.hgtags Tue Aug 01 14:12:26 2017 +0100
++++ ./corba/.hgtags Thu Sep 07 23:37:09 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
-@@ -612,3 +613,4 @@
- d93d13bcb01d7b635d0e021877e1102e34bae8fb jdk7u131-b00
- 61c10a1eaa7b6f77e63f90e624a82a664a451d42 jdk7u141-b00
+@@ -614,3 +615,4 @@
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
+ 39240de9d27767c8bad74e34f83f0a4902a9ef85 jdk7u141-b02
+ d232281a177cd3f80d48eca3f1bbc3919f720a1e jdk7u151-b00
++f74af33b4963a7c484ffa605f11e41efd92966e3 jdk7u151-b01
+--- ./hotspot/.hgtags Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/.hgtags Fri Sep 08 09:32:12 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
-@@ -844,3 +845,4 @@
- 95e4ea3d479ebdab9d78725776b6b11d4add6b0e jdk7u131-b00
- be8da42894af5f7d11b4bad83e166186f01ce1b4 jdk7u141-b00
+@@ -846,3 +847,4 @@
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
+ 56ad25be7d88c2c2da562fe1e8879c8723d01da1 jdk7u141-b02
+ 75662a7ec1719b3133636d09bd078968579a55ab jdk7u151-b00
++d0c7cea0660f7a8188a7b8c1f6d1a6c8d6388fb0 jdk7u151-b01
+--- ./hotspot/agent/src/os/bsd/ps_proc.c Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/agent/src/os/bsd/ps_proc.c Fri Sep 08 09:32:12 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 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
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Fri Sep 08 09:32:12 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 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
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Fri Sep 08 09:32:12 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 Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/make/bsd/Makefile Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/make/bsd/Makefile Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/Makefile Fri Sep 08 09:32:12 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 Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/make/bsd/makefiles/build_vm_def.sh Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Fri Sep 08 09:32:12 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 Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/make/bsd/makefiles/buildtree.make Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/make/bsd/makefiles/buildtree.make Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/makefiles/buildtree.make Fri Sep 08 09:32:12 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 Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/make/bsd/makefiles/gcc.make Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/make/bsd/makefiles/gcc.make Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/makefiles/gcc.make Fri Sep 08 09:32:12 2017 -0700
@@ -117,7 +117,10 @@
CFLAGS += -fno-rtti
CFLAGS += -fno-exceptions
@@ -184,8 +184,16 @@
# version 4 and above support fvisibility=hidden (matches jni_x86.h file)
# except 4.1.2 gives pointless warnings that can't be disabled (afaik)
ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
-@@ -215,7 +218,11 @@
+@@ -178,6 +181,7 @@
+ else
+ ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
+ endif
++ACCEPTABLE_WARNINGS += -Wno-deprecated-declarations
+ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
+ # Special cases
+@@ -215,7 +219,11 @@
+
# Flags for generating make dependency flags.
ifneq ("${CC_VER_MAJOR}", "2")
-DEPFLAGS = -fpch-deps -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d)
@@ -197,8 +205,8 @@
endif
# -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
---- ./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
+--- ./hotspot/make/bsd/makefiles/jsig.make Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/makefiles/jsig.make Fri Sep 08 09:32:12 2017 -0700
@@ -36,9 +36,16 @@
LIBJSIG_G = lib$(JSIG_G).so
endif
@@ -251,8 +259,8 @@
$(QUIETLY) cp -f $(LIBJSIG) $(DEST_JSIG) && echo "Done"
.PHONY: install_jsig
---- ./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
+--- ./hotspot/make/bsd/makefiles/launcher.make Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/makefiles/launcher.make Fri Sep 08 09:32:12 2017 -0700
@@ -50,7 +50,7 @@
LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
else
@@ -262,8 +270,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 Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-product Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Fri Sep 08 09:32:12 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 +746,8 @@
+ local:
+ *;
+};
---- ./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
+--- ./hotspot/make/bsd/makefiles/ppc.make Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/makefiles/ppc.make Fri Sep 08 09:32:12 2017 -0700
@@ -28,3 +28,6 @@
# Must also specify if CPU is big endian
CFLAGS += -DVM_BIG_ENDIAN
@@ -747,8 +755,8 @@
+ifdef E500V2
+ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1
+endif
---- ./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
+--- ./hotspot/make/bsd/makefiles/saproc.make Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/bsd/makefiles/saproc.make Fri Sep 08 09:32:12 2017 -0700
@@ -36,6 +36,11 @@
LIBSAPROC_G = lib$(SAPROC_G).so
endif
@@ -805,8 +813,8 @@
cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"; \
fi
---- ./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
+--- ./hotspot/make/solaris/makefiles/defs.make Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/make/solaris/makefiles/defs.make Fri Sep 08 09:32:12 2017 -0700
@@ -221,8 +221,8 @@
endif
ifeq ($(JVM_VARIANT_CLIENT),true)
@@ -818,8 +826,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 Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Fri Sep 08 09:32:12 2017 -0700
@@ -71,7 +71,11 @@
define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true);
@@ -833,7 +841,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 28 21:31:42 2017 -0700
++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Fri Sep 08 09:32:12 2017 -0700
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -881,8 +889,8 @@
+ return false;
+}
+
---- ./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
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Fri Sep 08 09:32:12 2017 -0700
@@ -163,6 +163,7 @@
#endif
pthread_t os::Bsd::_main_thread;
@@ -1302,8 +1310,8 @@
} else {
pthread_mutex_unlock(_mutex);
assert (status == 0, "invariant") ;
---- ./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
+--- ./hotspot/src/os/bsd/vm/os_bsd.hpp Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Fri Sep 08 09:32:12 2017 -0700
@@ -106,6 +106,12 @@
static bool hugetlbfs_sanity_check(bool warn, size_t page_size);
@@ -1378,8 +1386,8 @@
}
};
---- ./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
+--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Fri Sep 08 09:32:12 2017 -0700
@@ -31,10 +31,22 @@
# include "atomic_bsd_x86.inline.hpp"
# include "orderAccess_bsd_x86.inline.hpp"
@@ -1403,8 +1411,8 @@
// System includes
---- ./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
+--- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Fri Sep 08 09:32:12 2017 -0700
@@ -34,11 +34,26 @@
# include "orderAccess_bsd_x86.inline.hpp"
# include "prefetch_bsd_x86.inline.hpp"
@@ -1432,8 +1440,8 @@
// Contains inlined functions for class Thread and ThreadLocalStorage
---- ./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
+--- ./hotspot/src/os/posix/vm/os_posix.cpp Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/os/posix/vm/os_posix.cpp Fri Sep 08 09:32:12 2017 -0700
@@ -183,11 +183,19 @@
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
else st->print("%d", rlim.rlim_cur);
@@ -1454,8 +1462,8 @@
}
void os::Posix::print_uname_info(outputStream* st) {
---- ./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
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Fri Sep 08 09:32:12 2017 -0700
@@ -945,7 +945,7 @@
if (rslt != 0)
fatal(err_msg("pthread_stackseg_np failed with err = %d", rslt));
@@ -1465,8 +1473,8 @@
*size = ss.ss_size;
#elif defined(_ALLBSD_SOURCE)
pthread_attr_t attr;
---- ./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
+--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Fri Sep 08 09:32:12 2017 -0700
@@ -24,7 +24,7 @@
*/
@@ -1476,8 +1484,8 @@
# include <pthread_np.h> /* For pthread_attr_get_np */
#endif
---- ./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
+--- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Fri Sep 08 09:32:12 2017 -0700
@@ -111,7 +111,7 @@
if (e.should_commit()) {
e.set_gcId(_shared_gc_info.id());
@@ -1487,8 +1495,19 @@
e.commit();
}
}
---- ./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
+--- ./hotspot/src/share/vm/opto/lcm.cpp Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/share/vm/opto/lcm.cpp Fri Sep 08 09:32:12 2017 -0700
+@@ -57,7 +57,7 @@
+ // 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 (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops.
++ if (Universe::narrow_oop_base() != NULL) { // 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
+--- ./hotspot/src/share/vm/runtime/atomic.cpp Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/share/vm/runtime/atomic.cpp Fri Sep 08 09:32:12 2017 -0700
@@ -57,6 +57,12 @@
#ifdef TARGET_OS_ARCH_windows_x86
# include "atomic_windows_x86.inline.hpp"
@@ -1502,8 +1521,8 @@
#ifdef TARGET_OS_ARCH_linux_arm
# include "atomic_linux_arm.inline.hpp"
#endif
---- ./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
+--- ./hotspot/src/share/vm/runtime/objectMonitor.cpp Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp Fri Sep 08 09:32:12 2017 -0700
@@ -1740,7 +1740,7 @@
}
iterator->_notified = 1 ;
@@ -1522,8 +1541,8 @@
if (Policy != 4) {
iterator->TState = ObjectWaiter::TS_ENTER ;
}
---- ./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
+--- ./hotspot/src/share/vm/runtime/os.cpp Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/share/vm/runtime/os.cpp Fri Sep 08 09:32:12 2017 -0700
@@ -410,13 +410,6 @@
if (_native_java_library == NULL) {
vm_exit_during_initialization("Unable to load native library", ebuf);
@@ -1538,8 +1557,8 @@
}
static jboolean onLoaded = JNI_FALSE;
if (onLoaded) {
---- ./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
+--- ./hotspot/src/share/vm/runtime/os.hpp Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/share/vm/runtime/os.hpp Fri Sep 08 09:32:12 2017 -0700
@@ -30,6 +30,9 @@
#include "runtime/extendedPC.hpp"
#include "runtime/handles.hpp"
@@ -1560,8 +1579,8 @@
#endif
#ifdef TARGET_OS_ARCH_linux_x86
# include "os_linux_x86.hpp"
---- ./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
+--- ./hotspot/src/share/vm/runtime/vmThread.cpp Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/share/vm/runtime/vmThread.cpp Fri Sep 08 09:32:12 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.
@@ -1571,8 +1590,8 @@
event.commit();
}
---- ./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
+--- ./hotspot/src/share/vm/trace/tracetypes.xml Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/src/share/vm/trace/tracetypes.xml Fri Sep 08 09:32:12 2017 -0700
@@ -60,7 +60,7 @@
<types>
<content_types>
@@ -1593,8 +1612,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 Thu Apr 27 06:11:42 2017 +0100
-+++ ./hotspot/test/compiler/5091921/Test7005594.sh Sun May 28 21:31:42 2017 -0700
+--- ./hotspot/test/compiler/5091921/Test7005594.sh Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/test/compiler/5091921/Test7005594.sh Fri Sep 08 09:32:12 2017 -0700
@@ -60,6 +60,9 @@
# Windows/MKS
MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
@@ -1605,8 +1624,8 @@
else
echo "Unable to determine amount of physical memory on the machine"
fi
---- ./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
+--- ./hotspot/test/runtime/7110720/Test7110720.sh Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/test/runtime/7110720/Test7110720.sh Fri Sep 08 09:32:12 2017 -0700
@@ -28,7 +28,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -1617,7 +1636,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 28 21:31:42 2017 -0700
++++ ./hotspot/test/runtime/7158800/Test7158800.sh Fri Sep 08 09:32:12 2017 -0700
@@ -0,0 +1,91 @@
+#!/bin/sh
+#
@@ -1710,8 +1729,8 @@
+ echo "Test Passed"
+ exit 0
+fi
---- ./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
+--- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Thu Aug 03 07:27:30 2017 +0100
++++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Fri Sep 08 09:32:12 2017 -0700
@@ -36,8 +36,8 @@
public static void main(String args[]) throws Throwable {
@@ -1723,8 +1742,8 @@
return;
}
---- ./jaxp/.hgtags Thu Apr 27 06:11:38 2017 +0100
-+++ ./jaxp/.hgtags Sun May 28 21:31:36 2017 -0700
+--- ./jaxp/.hgtags Tue Aug 01 14:12:27 2017 +0100
++++ ./jaxp/.hgtags Thu Sep 07 23:37:10 2017 -0700
@@ -123,6 +123,7 @@
bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
@@ -1733,13 +1752,13 @@
104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
-@@ -613,3 +614,4 @@
- 51ed13d07beb90ff71d8625d9d6409cc4add5cbc jdk7u131-b00
- f347b141975453f642ae1140a45aa7c6127551dd jdk7u141-b00
+@@ -615,3 +616,4 @@
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
+ b4b91a7beb185c0a8a14b83d2b05cfd7fc33c6fe jdk7u141-b02
+ 26391fa1d876e3bf563f21328d7ea24d5d657b21 jdk7u151-b00
++57fc772ac86ac6cbd297cd6f09a63f9c016c271c jdk7u151-b01
+--- ./jaxws/.hgtags Tue Aug 01 14:12:28 2017 +0100
++++ ./jaxws/.hgtags Thu Sep 07 23:37:12 2017 -0700
@@ -123,6 +123,7 @@
05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01
@@ -1748,13 +1767,13 @@
4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02
272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03
48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04
-@@ -612,3 +613,4 @@
- edcc7c1e297588b30daaf61e3cdf25203f829cd4 jdk7u131-b00
- 90c86962aa2e81ecd8d5d79a282f2492447e4c6e jdk7u141-b00
+@@ -614,3 +615,4 @@
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
+ 1af82a2d3d16626b8d2f5e633d23c027975406b8 jdk7u141-b02
+ 1f0dd7a7e0ccaa340db533da400bb83ca1ad3cf2 jdk7u151-b00
++3233576db658552e8933b1cd86f5586507564f44 jdk7u151-b01
+--- ./jdk/.hgtags Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/.hgtags Thu Sep 07 23:37:21 2017 -0700
@@ -123,6 +123,7 @@
539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01
@@ -1763,13 +1782,13 @@
2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02
a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03
b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04
-@@ -599,3 +600,4 @@
- 86d0df91308912e45e1b00f8699e0b157a8857af jdk7u131-b00
- e890a6aef6223d428376aac846c1d1f3e40dbda7 jdk7u141-b00
+@@ -601,3 +602,4 @@
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
+ 19a085e656145471455d7fbd648717f94281a729 jdk7u141-b02
+ 871e3350966f67b95768a94c1854f1515cfa56ca jdk7u151-b00
++da1c09ab9b742fa77c0e667c2218b8d626432656 jdk7u151-b01
+--- ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/nio/sctp/Exportedfiles.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -29,6 +29,7 @@
ifneq ($(PLATFORM), windows)
@@ -1783,8 +1802,8 @@
endif
endif
+endif
---- ./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
+--- ./jdk/make/com/sun/nio/sctp/FILES_c.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/nio/sctp/FILES_c.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -25,9 +25,13 @@
ifneq ($(PLATFORM),windows)
@@ -1799,8 +1818,8 @@
endif
+endif
+endif
---- ./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
+--- ./jdk/make/com/sun/nio/sctp/FILES_java.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/nio/sctp/FILES_java.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -50,6 +50,8 @@
ifneq ($(PLATFORM), windows)
@@ -1816,8 +1835,8 @@
endif
+endif
+endif
---- ./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
+--- ./jdk/make/com/sun/nio/sctp/Makefile Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/nio/sctp/Makefile Thu Sep 07 23:37:21 2017 -0700
@@ -47,9 +47,13 @@
ifeq ($(PLATFORM), macosx)
include $(BUILDDIR)/common/Classes.gmk
@@ -1840,8 +1859,8 @@
endif # macosx
endif # windows
---- ./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
+--- ./jdk/make/com/sun/security/auth/module/Makefile Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/security/auth/module/Makefile Thu Sep 07 23:37:21 2017 -0700
@@ -67,7 +67,7 @@
include FILES_c_solaris.gmk
endif # solaris
@@ -1851,8 +1870,8 @@
LIBRARY = jaas_unix
include FILES_export_unix.gmk
include FILES_c_unix.gmk
---- ./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
+--- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -43,7 +43,7 @@
sun/tools/attach/LinuxVirtualMachine.java
endif
@@ -1862,8 +1881,8 @@
FILES_export = \
sun/tools/attach/BsdVirtualMachine.java
endif
---- ./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
+--- ./jdk/make/com/sun/tools/attach/FILES_c.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -39,7 +39,7 @@
LinuxVirtualMachine.c
endif
@@ -1873,8 +1892,8 @@
FILES_c = \
BsdVirtualMachine.c
endif
---- ./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
+--- ./jdk/make/com/sun/tools/attach/FILES_java.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -43,7 +43,7 @@
sun/tools/attach/LinuxAttachProvider.java
endif
@@ -1884,8 +1903,8 @@
FILES_java += \
sun/tools/attach/BsdAttachProvider.java
endif
---- ./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
+--- ./jdk/make/com/sun/tools/attach/Makefile Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/tools/attach/Makefile Thu Sep 07 23:37:21 2017 -0700
@@ -38,7 +38,7 @@
ifeq ($(PLATFORM), linux)
FILES_m = mapfile-linux
@@ -1904,8 +1923,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 Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/com/sun/tools/attach/mapfile-bsd Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/com/sun/tools/attach/mapfile-bsd Thu Sep 07 23:37:21 2017 -0700
@@ -30,6 +30,7 @@
Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
Java_sun_tools_attach_BsdVirtualMachine_close;
@@ -1915,7 +1934,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 28 23:44:03 2017 -0700
++++ ./jdk/make/common/Defs-bsd.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -0,0 +1,482 @@
+#
+# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -2399,8 +2418,8 @@
+ OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include
+ OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include
+endif
---- ./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
+--- ./jdk/make/common/Defs-linux.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/Defs-linux.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -445,6 +445,7 @@
override LIBDL = -ldl
override MOOT_PRIORITIES = true
@@ -2409,8 +2428,8 @@
ifeq ($(ARCH), $(findstring $(ARCH), amd64 ppc64))
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
---- ./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
+--- ./jdk/make/common/Defs-solaris.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/Defs-solaris.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -753,6 +753,9 @@
# Network Services library
LIBNSL = -lnsl
@@ -2421,8 +2440,8 @@
# service configuration facility library
LIBSCF = -lscf
---- ./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
+--- ./jdk/make/common/Defs.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/Defs.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -179,7 +179,7 @@
ifdef ALT_FREETYPE_LIB_PATH
@@ -2474,8 +2493,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 Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/Library.gmk Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/Library.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/Library.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -299,8 +299,12 @@
ifeq ($(PLATFORM), solaris)
$(STRIP) -x $@
@@ -2491,8 +2510,8 @@
endif
# implied else here is no stripping at all
endif
---- ./jdk/make/common/Mapfile-vers.gmk Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/Mapfile-vers.gmk Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/Mapfile-vers.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/Mapfile-vers.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -76,7 +76,7 @@
endif # PLATFORM
@@ -2502,8 +2521,8 @@
ifeq ($(VARIANT), OPT)
# OPT build MUST have a mapfile?
---- ./jdk/make/common/Program.gmk Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/Program.gmk Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/Program.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/Program.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -95,6 +95,17 @@
endif # SYSTEM_ZLIB
endif # PLATFORM
@@ -2576,8 +2595,8 @@
OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
---- ./jdk/make/common/Release.gmk Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/Release.gmk Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/Release.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/Release.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -180,6 +180,12 @@
JA_DIRNAME=ja_JP.UTF-8
endif # linux
@@ -2622,8 +2641,8 @@
| ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
fi; \
done
---- ./jdk/make/common/Rules.gmk Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/Rules.gmk Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/Rules.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/Rules.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -51,7 +51,7 @@
#
# All source tree areas for java/properties files (a few may be closed)
@@ -2642,8 +2661,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 Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/shared/Compiler-gcc.gmk Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/shared/Compiler-gcc.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/shared/Compiler-gcc.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -72,6 +72,21 @@
endif
@@ -2667,7 +2686,7 @@
# Settings specific to Solaris
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./jdk/make/common/shared/Defs-bsd.gmk Sun May 28 23:44:03 2017 -0700
++++ ./jdk/make/common/shared/Defs-bsd.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -0,0 +1,267 @@
+#
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -2936,8 +2955,8 @@
+endef
+endif
+
---- ./jdk/make/common/shared/Defs-utils.gmk Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/shared/Defs-utils.gmk Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/shared/Defs-utils.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/shared/Defs-utils.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -74,6 +74,13 @@
UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
endif
@@ -2988,8 +3007,8 @@
+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ endif
+endif
---- ./jdk/make/common/shared/Defs-versions.gmk Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/shared/Defs-versions.gmk Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/shared/Defs-versions.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/shared/Defs-versions.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -44,6 +44,11 @@
override CC_VERSION = gcc
endif
@@ -3016,8 +3035,8 @@
# Mac specific
ifeq ($(PLATFORM), macosx)
REQUIRED_OS_NAME = Darwin
---- ./jdk/make/common/shared/Defs.gmk Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/shared/Defs.gmk Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/shared/Defs.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/shared/Defs.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -181,7 +181,7 @@
# platform and shared sources/headers. This is mainly useful for the
# Mac OS X build, which pulls its platform sources from the solaris and/or
@@ -3027,8 +3046,8 @@
define JavaSrcDirList
$(JAVA_SRCDIR_LIST:%=$1$(JDK_TOPDIR)/%/$2)
endef
---- ./jdk/make/common/shared/Platform.gmk Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/common/shared/Platform.gmk Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/common/shared/Platform.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/common/shared/Platform.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -315,6 +315,85 @@
# How much RAM does this machine have:
endif
@@ -3115,8 +3134,8 @@
# Windows with and without CYGWIN will be slightly different
ifeq ($(SYSTEM_UNAME), Windows_NT)
PLATFORM = windows
---- ./jdk/make/java/Makefile Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/Makefile Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/Makefile Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/Makefile Thu Sep 07 23:37:21 2017 -0700
@@ -53,7 +53,7 @@
endif
endif # PLATFORM
@@ -3126,8 +3145,8 @@
SUBDIRS += jexec
endif # PLATFORM
---- ./jdk/make/java/instrument/Makefile Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/instrument/Makefile Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/instrument/Makefile Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/instrument/Makefile Thu Sep 07 23:37:21 2017 -0700
@@ -104,12 +104,24 @@
# equivalent of strcasecmp is stricmp on Windows
CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
@@ -3158,8 +3177,8 @@
ifeq ($(SYSTEM_ZLIB), true)
OTHER_LDLIBS += -lz
endif
---- ./jdk/make/java/java/Makefile Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/java/Makefile Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/java/Makefile Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/java/Makefile Thu Sep 07 23:37:21 2017 -0700
@@ -177,9 +177,11 @@
#
ifneq ($(PLATFORM), windows)
@@ -3182,8 +3201,8 @@
ARCHFLAG =
ifeq ($(ARCH_DATA_MODEL), 64)
---- ./jdk/make/java/java/genlocales.gmk Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/java/genlocales.gmk Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/java/genlocales.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/java/genlocales.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -93,17 +93,65 @@
else
@@ -3254,8 +3273,8 @@
endif
genlocales : $(LocaleDataMetaInfo_Dest)
---- ./jdk/make/java/jli/Makefile Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/jli/Makefile Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/jli/Makefile Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/jli/Makefile Thu Sep 07 23:37:21 2017 -0700
@@ -119,9 +119,9 @@
LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"'
endif # PLATFORM
@@ -3299,8 +3318,8 @@
vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)
ifneq ($(SYSTEM_ZLIB),true)
vpath %.c $(ZIP_SRC)
---- ./jdk/make/java/net/FILES_c.gmk Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/net/FILES_c.gmk Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/net/FILES_c.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/net/FILES_c.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -54,6 +54,10 @@
FILES_c += bsd_close.c
endif
@@ -3312,8 +3331,8 @@
ifeq ($(PLATFORM), windows)
FILES_c += TwoStacksPlainSocketImpl.c
FILES_c += DualStackPlainSocketImpl.c
---- ./jdk/make/java/net/Makefile Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/net/Makefile Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/net/Makefile Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/net/Makefile Thu Sep 07 23:37:21 2017 -0700
@@ -95,7 +95,7 @@
include $(BUILDDIR)/common/Library.gmk
@@ -3323,8 +3342,8 @@
ifdef DONT_ENABLE_IPV6
OTHER_CFLAGS += -DDONT_ENABLE_IPV6
endif
---- ./jdk/make/java/nio/Makefile Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/nio/Makefile Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/nio/Makefile Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/nio/Makefile Thu Sep 07 23:37:21 2017 -0700
@@ -263,13 +263,89 @@
sun/nio/fs/UnixConstants.java
endif # PLATFORM = linux
@@ -3476,8 +3495,8 @@
FILES_m = mapfile-bsd
endif
include $(BUILDDIR)/common/Mapfile-vers.gmk
---- ./jdk/make/java/nio/mapfile-bsd Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/nio/mapfile-bsd Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/nio/mapfile-bsd Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/nio/mapfile-bsd Thu Sep 07 23:37:21 2017 -0700
@@ -70,6 +70,7 @@
Java_sun_nio_ch_IOUtil_drain;
Java_sun_nio_ch_IOUtil_fdVal;
@@ -3498,8 +3517,8 @@
Java_sun_nio_ch_KQueuePort_socketpair;
Java_sun_nio_ch_KQueuePort_interrupt;
Java_sun_nio_ch_KQueuePort_drain1;
---- ./jdk/make/java/npt/Makefile Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/npt/Makefile Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/npt/Makefile Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/npt/Makefile Thu Sep 07 23:37:21 2017 -0700
@@ -74,6 +74,14 @@
OTHER_LDLIBS += -liconv
endif
@@ -3515,8 +3534,8 @@
#
# Add to ambient vpath so we pick up the library files
#
---- ./jdk/make/java/redist/fonts/Makefile Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/java/redist/fonts/Makefile Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/java/redist/fonts/Makefile Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/java/redist/fonts/Makefile Thu Sep 07 23:37:21 2017 -0700
@@ -42,7 +42,7 @@
$(LIBDIR)/fonts/LucidaSansRegular.ttf \
$(LIBDIR)/fonts/LucidaSansDemiBold.ttf \
@@ -3544,8 +3563,8 @@
all build : $(INTERNAL_IMPORT_LIST)
---- ./jdk/make/javax/sound/Makefile Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/javax/sound/Makefile Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/javax/sound/Makefile Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/javax/sound/Makefile Thu Sep 07 23:37:21 2017 -0700
@@ -111,6 +111,21 @@
#MXSPP_ADD = $(PLATFORM)-$(ARCH)/
endif # PLATFORM linux
@@ -3568,8 +3587,8 @@
ifeq ($(PLATFORM), macosx)
CPPFLAGS += -DUSE_PORTS=TRUE \
-DUSE_DAUDIO=TRUE \
---- ./jdk/make/javax/sound/SoundDefs.gmk Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/javax/sound/SoundDefs.gmk Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/javax/sound/SoundDefs.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/javax/sound/SoundDefs.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -40,6 +40,10 @@
CPPFLAGS += -DX_PLATFORM=X_LINUX
endif # PLATFORM linux
@@ -3581,8 +3600,8 @@
ifeq ($(PLATFORM), macosx)
CPPFLAGS += -DX_PLATFORM=X_MACOSX
endif # PLATFORM macosx
---- ./jdk/make/javax/sound/jsoundalsa/Makefile Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/javax/sound/jsoundalsa/Makefile Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/javax/sound/jsoundalsa/Makefile Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/javax/sound/jsoundalsa/Makefile Thu Sep 07 23:37:21 2017 -0700
@@ -51,6 +51,7 @@
$(PORTFILES_c)
@@ -3633,8 +3652,8 @@
#
# Add to the ambient VPATH.
---- ./jdk/make/jpda/transport/socket/Makefile Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/jpda/transport/socket/Makefile Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/jpda/transport/socket/Makefile Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/jpda/transport/socket/Makefile Thu Sep 07 23:37:21 2017 -0700
@@ -38,6 +38,11 @@
include $(BUILDDIR)/common/Defs.gmk
@@ -3647,8 +3666,8 @@
ifeq ($(PLATFORM), linux)
OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
endif
---- ./jdk/make/sun/awt/Makefile Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/sun/awt/Makefile Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/sun/awt/Makefile Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/sun/awt/Makefile Thu Sep 07 23:37:21 2017 -0700
@@ -127,6 +127,13 @@
OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL)
endif
@@ -3724,8 +3743,8 @@
LDFLAGS += -L$(OPENWIN_LIB)
endif
---- ./jdk/make/sun/awt/mawt.gmk Wed Apr 03 20:42:55 2013 +0400
-+++ ./jdk/make/sun/awt/mawt.gmk Sun May 28 23:44:03 2017 -0700
+--- ./jdk/make/sun/awt/mawt.gmk Tue Aug 01 14:12:33 2017 +0100
++++ ./jdk/make/sun/awt/mawt.gmk Thu Sep 07 23:37:21 2017 -0700
@@ -169,7 +169,7 @@
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list