From owner-svn-ports-all@freebsd.org Wed Feb 3 03:42:58 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EE102A731F2; Wed, 3 Feb 2016 03:42:57 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A56C69B9; Wed, 3 Feb 2016 03:42:57 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u133gud0084665; Wed, 3 Feb 2016 03:42:56 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u133guWM084662; Wed, 3 Feb 2016 03:42:56 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201602030342.u133guWM084662@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Wed, 3 Feb 2016 03:42:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407937 - in head/java/openjdk7: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Feb 2016 03:42:58 -0000 Author: glewis Date: Wed Feb 3 03:42:56 2016 New Revision: 407937 URL: https://svnweb.freebsd.org/changeset/ports/407937 Log: . Update to 7u95. Modified: head/java/openjdk7/Makefile head/java/openjdk7/distinfo head/java/openjdk7/files/patch-bsd Modified: head/java/openjdk7/Makefile ============================================================================== --- head/java/openjdk7/Makefile Wed Feb 3 03:42:19 2016 (r407936) +++ head/java/openjdk7/Makefile Wed Feb 3 03:42:56 2016 (r407937) @@ -27,7 +27,8 @@ PATCHFILES= patch-7u45-b30.xz \ patch-7u76-b31.xz \ patch-7u80-b32.xz \ patch-7u85-b02.xz \ - patch-7u91-b02.xz + patch-7u91-b02.xz \ + patch-7u95-b00.xz MAINTAINER?= glewis@FreeBSD.org COMMENT?= Java Development Kit 7 @@ -56,8 +57,8 @@ JAVAVMS_COMMENT+= JRE INSTALLDIR= ${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}-jre .endif -PORT_MINOR_VERSION= 91 -PORT_BUILD_NUMBER= 02 +PORT_MINOR_VERSION= 95 +PORT_BUILD_NUMBER= 00 JDK_MAJOR_VERSION= 7 JDK_MINOR_VERSION= 40 JDK_BUILD_NUMBER= 43 Modified: head/java/openjdk7/distinfo ============================================================================== --- head/java/openjdk7/distinfo Wed Feb 3 03:42:19 2016 (r407936) +++ head/java/openjdk7/distinfo Wed Feb 3 03:42:56 2016 (r407937) @@ -22,3 +22,5 @@ SHA256 (patch-7u85-b02.xz) = 87699747b28 SIZE (patch-7u85-b02.xz) = 78796 SHA256 (patch-7u91-b02.xz) = b18c3843d656340fcca0e9b0eb0410a598dbce9c53c84fc6fde53d189bf44829 SIZE (patch-7u91-b02.xz) = 152344 +SHA256 (patch-7u95-b00.xz) = bb522469cedcd31ff15fde745ab5717bd012c52ce2e25d1180b3338b90f755a3 +SIZE (patch-7u95-b00.xz) = 91612 Modified: head/java/openjdk7/files/patch-bsd ============================================================================== --- head/java/openjdk7/files/patch-bsd Wed Feb 3 03:42:19 2016 (r407936) +++ head/java/openjdk7/files/patch-bsd Wed Feb 3 03:42:56 2016 (r407937) @@ -1,5 +1,53 @@ ---- ./hotspot/agent/src/os/bsd/ps_proc.c Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/agent/src/os/bsd/ps_proc.c Sun Apr 19 13:24:21 2015 -0700 +--- ./.hgtags 2016-02-02 14:47:34.440327000 -0800 ++++ ./.hgtags 2016-02-01 17:27:13.000000000 -0800 +@@ -123,6 +123,7 @@ + 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 + 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01 + d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147 ++00b623147f23ef8a92a25c4c28ef8681dc1d1b52 7u0 + 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02 + bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03 + f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04 +@@ -601,5 +602,3 @@ + 63d687368ce5bca36efbe48db2cf26df171b162d jdk7u91-b00 + 03b03194afbe87a049a1c6d83f49788602c363d8 jdk7u91-b01 + 2be0ab1a24b2b6910d8f31e3314ffa48f30f21df jdk7u91-b02 +-1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43 +-dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60 +--- ./corba/.hgtags 2016-02-02 14:47:34.440721000 -0800 ++++ ./corba/.hgtags 2016-02-01 17:27:14.000000000 -0800 +@@ -123,6 +123,7 @@ + 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 + 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01 + 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147 ++578c4d2c534cc761f5f5cc0d8360471bb8d5f94f 7u0 + 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02 + dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03 + eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04 +@@ -603,5 +604,3 @@ + f9630ed441a06612f61a88bd3da39075015213a7 jdk7u91-b00 + 34be12b4b6ea5f30d364a916a92effeafdce678d jdk7u91-b01 + e3a6331d136ecac575730b498501f5b0dc4302e2 jdk7u91-b02 +-e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43 +-08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60 +--- ./hotspot/.hgtags 2016-02-02 14:47:34.441185000 -0800 ++++ ./hotspot/.hgtags 2016-02-01 17:27:21.000000000 -0800 +@@ -182,6 +182,7 @@ + 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16 + 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147 + 81d815b05abb564aa1f4100ae13491c949b9a07e hs21-b17 ++f1a18ada5853af49fce54d43dd5a5b67dc291470 7u0 + 9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01 + 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01 + 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02 +@@ -835,5 +836,3 @@ + cce12560430861a962349343b61d3a9eb12c6571 jdk7u91-b00 + 5eaaa63440c4416cd9c03d586f72b3be8c7c73f8 jdk7u91-b01 + 2f2d431ace967c9a71194e1bb46f38b35ea43512 jdk7u91-b02 +-eceae04782438987cd747e1c76e4085f50b43a18 jdk7u40-b43 +-af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60 +--- ./hotspot/agent/src/os/bsd/ps_proc.c 2013-09-06 11:21:50.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/ps_proc.c 2016-02-01 17:27:20.000000000 -0800 @@ -131,7 +131,7 @@ static bool ptrace_continue(pid_t pid, int signal) { @@ -9,8 +57,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 10 09:07:36 2015 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2013-09-06 11:21:51.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2016-02-01 17:27:21.000000000 -0800 @@ -33,6 +33,7 @@ import sun.jvm.hotspot.debugger.remote.*; import sun.jvm.hotspot.debugger.windbg.*; @@ -19,8 +67,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 10 09:07:36 2015 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2013-09-06 11:21:52.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2016-02-01 17:27:21.000000000 -0800 @@ -35,6 +35,7 @@ import sun.jvm.hotspot.debugger.windbg.*; import sun.jvm.hotspot.debugger.linux.*; @@ -29,8 +77,8 @@ import sun.jvm.hotspot.debugger.remote.*; import sun.jvm.hotspot.livejvm.*; import sun.jvm.hotspot.memory.*; ---- ./hotspot/make/bsd/Makefile Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/make/bsd/Makefile Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/make/bsd/Makefile 2013-09-06 11:21:59.000000000 -0700 ++++ ./hotspot/make/bsd/Makefile 2016-02-01 17:27:21.000000000 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -60,8 +108,8 @@ # Synonyms for win32-like targets. compiler2: jvmg product ---- ./hotspot/make/bsd/makefiles/build_vm_def.sh Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/make/bsd/makefiles/build_vm_def.sh 2013-09-06 11:21:59.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh 2016-02-01 17:27:21.000000000 -0800 @@ -1,12 +1,28 @@ #!/bin/sh @@ -97,8 +145,8 @@ + if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";" + }' | sort -u ;; +esac ---- ./hotspot/make/bsd/makefiles/buildtree.make Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/make/bsd/makefiles/buildtree.make Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/make/bsd/makefiles/buildtree.make 2016-02-02 14:47:32.155479000 -0800 ++++ ./hotspot/make/bsd/makefiles/buildtree.make 2016-02-01 17:27:21.000000000 -0800 @@ -255,6 +255,16 @@ echo "$(call gamma-path,commonsrc,os/posix/vm)"; \ [ -n "$(CFLAGS_BROWSE)" ] && \ @@ -125,8 +173,8 @@ .dbxrc: $(BUILDTREE_MAKE) @echo Creating $@ ... ---- ./hotspot/make/bsd/makefiles/gcc.make Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/make/bsd/makefiles/gcc.make Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/make/bsd/makefiles/gcc.make 2016-02-02 14:47:32.155740000 -0800 ++++ ./hotspot/make/bsd/makefiles/gcc.make 2016-02-01 17:27:21.000000000 -0800 @@ -117,7 +117,10 @@ CFLAGS += -fno-rtti CFLAGS += -fno-exceptions @@ -152,8 +200,8 @@ endif # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp. ---- ./hotspot/make/bsd/makefiles/jsig.make Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/make/bsd/makefiles/jsig.make Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/make/bsd/makefiles/jsig.make 2013-09-06 11:22:00.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/jsig.make 2016-02-01 17:27:21.000000000 -0800 @@ -36,9 +36,16 @@ LIBJSIG_G = lib$(JSIG_G).so endif @@ -206,8 +254,8 @@ $(QUIETLY) cp -f $(LIBJSIG) $(DEST_JSIG) && echo "Done" .PHONY: install_jsig ---- ./hotspot/make/bsd/makefiles/launcher.make Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/make/bsd/makefiles/launcher.make Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/make/bsd/makefiles/launcher.make 2013-09-06 11:22:00.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/launcher.make 2016-02-01 17:27:21.000000000 -0800 @@ -50,7 +50,7 @@ LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) else @@ -217,8 +265,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 10 09:07:36 2015 -0700 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/make/bsd/makefiles/mapfile-vers-product 2016-02-02 14:47:33.284543000 -0800 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product 2016-02-01 17:27:21.000000000 -0800 @@ -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 @@ -233,7 +281,7 @@ - _JNI_CreateJavaVM - _JNI_GetCreatedJavaVMs - _JNI_GetDefaultJavaVMInitArgs - +- - # _JVM - _JVM_Accept - _JVM_ActiveProcessorCount @@ -445,6 +493,7 @@ - _JVM_Write - _JVM_Yield - _JVM_handle_bsd_signal ++ +SUNWprivate_1.1 { + global: + # JNI @@ -692,8 +741,8 @@ + local: + *; +}; ---- ./hotspot/make/bsd/makefiles/ppc.make Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/make/bsd/makefiles/ppc.make Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/make/bsd/makefiles/ppc.make 2013-09-06 11:22:00.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/ppc.make 2016-02-01 17:27:21.000000000 -0800 @@ -28,3 +28,6 @@ # Must also specify if CPU is big endian CFLAGS += -DVM_BIG_ENDIAN @@ -701,8 +750,8 @@ +ifdef E500V2 +ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1 +endif ---- ./hotspot/make/bsd/makefiles/saproc.make Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/make/bsd/makefiles/saproc.make Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/make/bsd/makefiles/saproc.make 2013-09-06 11:22:00.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/saproc.make 2016-02-01 17:27:21.000000000 -0800 @@ -36,6 +36,11 @@ LIBSAPROC_G = lib$(SAPROC_G).so endif @@ -759,8 +808,8 @@ cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"; \ fi ---- ./hotspot/make/solaris/makefiles/defs.make Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/make/solaris/makefiles/defs.make Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/make/solaris/makefiles/defs.make 2013-09-06 11:22:00.000000000 -0700 ++++ ./hotspot/make/solaris/makefiles/defs.make 2016-02-01 17:27:21.000000000 -0800 @@ -221,8 +221,8 @@ endif ifeq ($(JVM_VARIANT_CLIENT),true) @@ -772,8 +821,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 10 09:07:36 2015 -0700 -+++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2013-09-06 11:22:02.000000000 -0700 ++++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2016-02-01 17:27:21.000000000 -0800 @@ -71,7 +71,11 @@ define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteFrequentPairs, true); @@ -786,8 +835,8 @@ // 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 Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/os/bsd/vm/decoder_bsd.cpp 1969-12-31 16:00:00.000000000 -0800 ++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp 2016-02-01 17:27:21.000000000 -0800 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -835,8 +884,8 @@ + return false; +} + ---- ./hotspot/src/os/bsd/vm/os_bsd.cpp Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2016-02-02 14:47:34.525776000 -0800 ++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2016-02-01 17:27:21.000000000 -0800 @@ -187,6 +187,8 @@ static int SR_signum = SIGUSR2; sigset_t SR_sigset; @@ -1014,8 +1063,8 @@ #elif defined(__APPLE__) || defined(__NetBSD__) struct sched_param sp; int policy; ---- ./hotspot/src/os/bsd/vm/os_bsd.hpp Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2013-09-06 11:22:03.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2016-02-01 17:27:21.000000000 -0800 @@ -103,6 +103,12 @@ static bool hugetlbfs_sanity_check(bool warn, size_t page_size); @@ -1029,8 +1078,8 @@ public: static void init_thread_fpu_state(); ---- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2013-09-06 11:22:03.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2016-02-01 17:27:21.000000000 -0800 @@ -31,10 +31,22 @@ # include "atomic_bsd_x86.inline.hpp" # include "orderAccess_bsd_x86.inline.hpp" @@ -1054,8 +1103,8 @@ // System includes ---- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2013-09-06 11:22:03.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2016-02-01 17:27:21.000000000 -0800 @@ -34,11 +34,26 @@ # include "orderAccess_bsd_x86.inline.hpp" # include "prefetch_bsd_x86.inline.hpp" @@ -1083,8 +1132,8 @@ // Contains inlined functions for class Thread and ThreadLocalStorage ---- ./hotspot/src/os/posix/vm/os_posix.cpp Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/src/os/posix/vm/os_posix.cpp Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/os/posix/vm/os_posix.cpp 2016-02-02 14:47:32.181226000 -0800 ++++ ./hotspot/src/os/posix/vm/os_posix.cpp 2016-02-01 17:27:21.000000000 -0800 @@ -175,11 +175,19 @@ if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); else st->print("%d", rlim.rlim_cur); @@ -1105,8 +1154,8 @@ } void os::Posix::print_uname_info(outputStream* st) { ---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2013-09-06 11:22:04.000000000 -0700 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2016-02-01 17:27:21.000000000 -0800 @@ -945,7 +945,7 @@ if (rslt != 0) fatal(err_msg("pthread_stackseg_np failed with err = %d", rslt)); @@ -1116,8 +1165,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 10 09:07:36 2015 -0700 -+++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2013-09-06 11:22:04.000000000 -0700 ++++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2016-02-01 17:27:21.000000000 -0800 @@ -24,7 +24,7 @@ */ @@ -1127,8 +1176,8 @@ # include /* For pthread_attr_get_np */ #endif ---- ./hotspot/src/share/vm/code/relocInfo.hpp Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/src/share/vm/code/relocInfo.hpp Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/share/vm/code/relocInfo.hpp 2013-09-06 11:22:10.000000000 -0700 ++++ ./hotspot/src/share/vm/code/relocInfo.hpp 2016-02-01 17:27:21.000000000 -0800 @@ -371,7 +371,7 @@ // "immediate" in the prefix header word itself. This optimization // is invisible outside this module.) @@ -1147,8 +1196,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 10 09:07:36 2015 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp 2016-02-02 14:47:32.225756000 -0800 ++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp 2016-02-01 17:27:21.000000000 -0800 @@ -111,7 +111,7 @@ if (e.should_commit()) { e.set_gcId(_shared_gc_info.id()); @@ -1158,8 +1207,8 @@ e.commit(); } } ---- ./hotspot/src/share/vm/runtime/atomic.cpp Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/src/share/vm/runtime/atomic.cpp Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/share/vm/runtime/atomic.cpp 2013-09-06 11:22:15.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/atomic.cpp 2016-02-01 17:27:21.000000000 -0800 @@ -54,6 +54,12 @@ #ifdef TARGET_OS_ARCH_windows_x86 # include "atomic_windows_x86.inline.hpp" @@ -1173,8 +1222,8 @@ #ifdef TARGET_OS_ARCH_linux_arm # include "atomic_linux_arm.inline.hpp" #endif ---- ./hotspot/src/share/vm/runtime/objectMonitor.cpp Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/share/vm/runtime/objectMonitor.cpp 2016-02-02 14:47:33.723933000 -0800 ++++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp 2016-02-01 17:27:21.000000000 -0800 @@ -1744,7 +1744,7 @@ } iterator->_notified = 1 ; @@ -1193,8 +1242,8 @@ if (Policy != 4) { iterator->TState = ObjectWaiter::TS_ENTER ; } ---- ./hotspot/src/share/vm/runtime/os.cpp Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/src/share/vm/runtime/os.cpp Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/share/vm/runtime/os.cpp 2016-02-02 14:47:31.834837000 -0800 ++++ ./hotspot/src/share/vm/runtime/os.cpp 2016-02-01 17:27:21.000000000 -0800 @@ -399,13 +399,6 @@ if (_native_java_library == NULL) { vm_exit_during_initialization("Unable to load native library", ebuf); @@ -1209,8 +1258,8 @@ } static jboolean onLoaded = JNI_FALSE; if (onLoaded) { ---- ./hotspot/src/share/vm/runtime/os.hpp Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/src/share/vm/runtime/os.hpp Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/share/vm/runtime/os.hpp 2016-02-02 14:47:33.724463000 -0800 ++++ ./hotspot/src/share/vm/runtime/os.hpp 2016-02-01 17:27:21.000000000 -0800 @@ -30,6 +30,9 @@ #include "runtime/extendedPC.hpp" #include "runtime/handles.hpp" @@ -1225,14 +1274,14 @@ # include "os_windows.hpp" #endif #ifdef TARGET_OS_FAMILY_bsd -+# include "os_bsd.hpp" - # include "os_posix.hpp" --# include "os_bsd.hpp" +-# include "os_posix.hpp" + # include "os_bsd.hpp" ++# include "os_posix.hpp" #endif #ifdef TARGET_OS_ARCH_linux_x86 # include "os_linux_x86.hpp" ---- ./hotspot/src/share/vm/runtime/vmThread.cpp Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/src/share/vm/runtime/vmThread.cpp Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/share/vm/runtime/vmThread.cpp 2016-02-02 14:47:33.342637000 -0800 ++++ ./hotspot/src/share/vm/runtime/vmThread.cpp 2016-02-01 17:27:21.000000000 -0800 @@ -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. @@ -1242,8 +1291,8 @@ event.commit(); } ---- ./hotspot/src/share/vm/trace/tracetypes.xml Fri Apr 10 09:07:36 2015 -0700 -+++ ./hotspot/src/share/vm/trace/tracetypes.xml Sun Apr 19 13:24:21 2015 -0700 +--- ./hotspot/src/share/vm/trace/tracetypes.xml 2016-02-02 14:47:32.265541000 -0800 ++++ ./hotspot/src/share/vm/trace/tracetypes.xml 2016-02-01 17:27:21.000000000 -0800 @@ -60,7 +60,7 @@ @@ -1264,8 +1313,8 @@ $@.tmp.euro; -- @$(ECHO) $(subst .java,'\n',$(Euro_Resources_java)) >> $@.tmp.euro; -- @$(ECHO) $(subst .properties,'\n',$(NonEuro_Resources_properties)) > $@.tmp.noneuro; -- @$(ECHO) $(subst .java,'\n',$(NonEuro_Resources_java)) >> $@.tmp.noneuro; ++$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH) ++ @$(RM) $@.tmp.euro $@.tmp.noneuro; ++ @$(prep-target) + @$(ECHO) $(Euro_Resources_properties) | $(SED) -e s@.properties@'\ +'@g > $@.tmp.euro; + @$(ECHO) $(Euro_Resources_java) | $(SED) -e s@.java@'\ @@ -2830,10 +2924,10 @@ +'@g > $@.tmp.noneuro; + @$(ECHO) $(NonEuro_Resources_java) | $(SED) -e s@.java@'\ +'@g >> $@.tmp.noneuro; - NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \ - $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \ - $@.tmp.noneuro $< $@ - @$(RM) $@.tmp.euro $@.tmp.noneuro; ++ NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \ ++ $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \ ++ $@.tmp.noneuro $< $@ ++ @$(RM) $@.tmp.euro $@.tmp.noneuro; + +else + @@ -2857,9 +2951,13 @@ + +else + -+$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH) -+ @$(RM) $@.tmp.euro $@.tmp.noneuro; -+ @$(prep-target) + $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH) + @$(RM) $@.tmp.euro $@.tmp.noneuro; + @$(prep-target) +- @$(ECHO) $(subst .properties,'\n',$(Euro_Resources_properties)) > $@.tmp.euro; +- @$(ECHO) $(subst .java,'\n',$(Euro_Resources_java)) >> $@.tmp.euro; +- @$(ECHO) $(subst .properties,'\n',$(NonEuro_Resources_properties)) > $@.tmp.noneuro; +- @$(ECHO) $(subst .java,'\n',$(NonEuro_Resources_java)) >> $@.tmp.noneuro; + @$(ECHO) $(Euro_Resources_properties) | $(SED) -e s@.properties@'\ +'@g > $@.tmp.euro; + @$(ECHO) $(Euro_Resources_java) | $(SED) -e s@.java@'\ @@ -2868,19 +2966,20 @@ +'@g > $@.tmp.noneuro; + @$(ECHO) $(NonEuro_Resources_java) | $(SED) -e s@.java@'\ +'@g >> $@.tmp.noneuro; -+ NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \ -+ $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \ -+ $@.tmp.noneuro $< $@ -+ @$(RM) $@.tmp.euro $@.tmp.noneuro; -+endif + NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \ + $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \ + $@.tmp.noneuro $< $@ + @$(RM) $@.tmp.euro $@.tmp.noneuro; + endif + +endif + - endif ++endif genlocales : $(LocaleDataMetaInfo_Dest) ---- ./jdk/make/java/jli/Makefile Fri Apr 10 09:12:54 2015 -0700 -+++ ./jdk/make/java/jli/Makefile Thu Apr 23 13:38:32 2015 -0400 + +--- ./jdk/make/java/jli/Makefile 2013-09-06 11:27:37.000000000 -0700 ++++ ./jdk/make/java/jli/Makefile 2016-02-01 17:27:29.000000000 -0800 @@ -119,9 +119,9 @@ LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"' endif # PLATFORM @@ -2902,8 +3001,8 @@ ifeq ($(USE_PTHREADS),true) LDLIBS += -lpthread endif # USE_PTHREADS ---- ./jdk/make/java/net/FILES_c.gmk Fri Apr 10 09:12:54 2015 -0700 -+++ ./jdk/make/java/net/FILES_c.gmk Thu Apr 23 13:38:32 2015 -0400 +--- ./jdk/make/java/net/FILES_c.gmk 2016-02-02 14:47:33.817607000 -0800 ++++ ./jdk/make/java/net/FILES_c.gmk 2016-02-01 17:27:29.000000000 -0800 @@ -50,6 +50,10 @@ FILES_c += bsd_close.c endif @@ -2915,8 +3014,8 @@ ifeq ($(PLATFORM), windows) FILES_c += TwoStacksPlainSocketImpl.c FILES_c += DualStackPlainSocketImpl.c ---- ./jdk/make/java/net/Makefile Fri Apr 10 09:12:54 2015 -0700 -+++ ./jdk/make/java/net/Makefile Thu Apr 23 13:38:32 2015 -0400 +--- ./jdk/make/java/net/Makefile 2016-02-02 14:47:31.860015000 -0800 ++++ ./jdk/make/java/net/Makefile 2016-02-01 17:27:29.000000000 -0800 @@ -93,7 +93,7 @@ include $(BUILDDIR)/common/Library.gmk @@ -2926,8 +3025,8 @@ ifdef DONT_ENABLE_IPV6 OTHER_CFLAGS += -DDONT_ENABLE_IPV6 endif ---- ./jdk/make/java/nio/Makefile Fri Apr 10 09:12:54 2015 -0700 -+++ ./jdk/make/java/nio/Makefile Thu Apr 23 13:38:32 2015 -0400 +--- ./jdk/make/java/nio/Makefile 2016-02-02 14:47:33.818248000 -0800 ++++ ./jdk/make/java/nio/Makefile 2016-02-01 17:27:29.000000000 -0800 @@ -263,13 +263,89 @@ sun/nio/fs/UnixConstants.java endif # PLATFORM = linux @@ -3068,8 +3167,8 @@ FILES_m = mapfile-bsd endif include $(BUILDDIR)/common/Mapfile-vers.gmk ---- ./jdk/make/java/nio/mapfile-bsd Fri Apr 10 09:12:54 2015 -0700 -+++ ./jdk/make/java/nio/mapfile-bsd Thu Apr 23 13:38:32 2015 -0400 +--- ./jdk/make/java/nio/mapfile-bsd 2013-09-06 11:27:37.000000000 -0700 ++++ ./jdk/make/java/nio/mapfile-bsd 2016-02-01 17:27:29.000000000 -0800 @@ -70,6 +70,7 @@ Java_sun_nio_ch_IOUtil_drain; Java_sun_nio_ch_IOUtil_fdVal; @@ -3090,8 +3189,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 10 09:12:54 2015 -0700 -+++ ./jdk/make/java/npt/Makefile Thu Apr 23 13:38:32 2015 -0400 +--- ./jdk/make/java/npt/Makefile 2016-02-02 15:16:45.845810000 -0800 ++++ ./jdk/make/java/npt/Makefile 2016-02-02 15:17:38.957069000 -0800 @@ -74,6 +74,14 @@ OTHER_LDLIBS += -liconv endif @@ -3107,8 +3206,8 @@ # # Add to ambient vpath so we pick up the library files # ---- ./jdk/make/java/redist/fonts/Makefile Fri Apr 10 09:12:54 2015 -0700 -+++ ./jdk/make/java/redist/fonts/Makefile Thu Apr 23 13:38:32 2015 -0400 +--- ./jdk/make/java/redist/fonts/Makefile 2013-09-06 11:27:37.000000000 -0700 ++++ ./jdk/make/java/redist/fonts/Makefile 2016-02-01 17:27:29.000000000 -0800 @@ -42,7 +42,7 @@ $(LIBDIR)/fonts/LucidaSansRegular.ttf \ $(LIBDIR)/fonts/LucidaSansDemiBold.ttf \ @@ -3136,8 +3235,8 @@ all build : $(INTERNAL_IMPORT_LIST) ---- ./jdk/make/javax/sound/Makefile Fri Apr 10 09:12:54 2015 -0700 -+++ ./jdk/make/javax/sound/Makefile Thu Apr 23 13:38:32 2015 -0400 +--- ./jdk/make/javax/sound/Makefile 2013-09-06 11:27:38.000000000 -0700 ++++ ./jdk/make/javax/sound/Makefile 2016-02-01 17:27:29.000000000 -0800 @@ -111,6 +111,21 @@ #MXSPP_ADD = $(PLATFORM)-$(ARCH)/ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***