Date: Wed, 19 Apr 2017 13:36:23 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438840 - in head/java/openjdk8: . files Message-ID: <201704191336.v3JDaNxO005985@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Wed Apr 19 13:36:23 2017 New Revision: 438840 URL: https://svnweb.freebsd.org/changeset/ports/438840 Log: Update to 8u131. Deleted: head/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__bsd.cpp head/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__bsd.hpp Modified: head/java/openjdk8/Makefile head/java/openjdk8/distinfo head/java/openjdk8/files/patch-bsd head/java/openjdk8/files/patch-bsd-test Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Wed Apr 19 13:25:45 2017 (r438839) +++ head/java/openjdk8/Makefile Wed Apr 19 13:36:23 2017 (r438840) @@ -2,7 +2,6 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} -PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \ @@ -28,7 +27,8 @@ PATCHFILES= patch-8u05-b13.xz \ patch-8u92-b14.xz \ patch-8u102-b14.xz \ patch-8u112-b16.xz \ - patch-8u121-b13.xz + patch-8u121-b13.xz \ + patch-8u131-b11.xz MAINTAINER= java@FreeBSD.org COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} @@ -222,8 +222,8 @@ NO_CCACHE= yes NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 121 -JDK_BUILD_NUMBER= 13 +JDK_UPDATE_VERSION= 131 +JDK_BUILD_NUMBER= 11 DIST_BUILD_NUMBER= 132 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 Modified: head/java/openjdk8/distinfo ============================================================================== --- head/java/openjdk8/distinfo Wed Apr 19 13:25:45 2017 (r438839) +++ head/java/openjdk8/distinfo Wed Apr 19 13:36:23 2017 (r438840) @@ -1,4 +1,4 @@ -TIMESTAMP = 1485812255 +TIMESTAMP = 1492583230 SHA256 (openjdk-8-src-b132-03_mar_2014.zip) = ba651f9aa68fdc823b2ef55510710a013ab9f78fff291d5dc1c4d166f3e1e589 SIZE (openjdk-8-src-b132-03_mar_2014.zip) = 124099402 SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c @@ -37,3 +37,5 @@ SHA256 (patch-8u112-b16.xz) = adbca9b317 SIZE (patch-8u112-b16.xz) = 217492 SHA256 (patch-8u121-b13.xz) = ef48cad21bb0ccadb3968147ab4d4d0b9ae024bf42a0fccf5714584f43df9ed4 SIZE (patch-8u121-b13.xz) = 135520 +SHA256 (patch-8u131-b11.xz) = c0953d79f7e1b02ed75e6757ff170a144527af9b44f44cb36f2ddb484437d4d6 +SIZE (patch-8u131-b11.xz) = 88068 Modified: head/java/openjdk8/files/patch-bsd ============================================================================== --- head/java/openjdk8/files/patch-bsd Wed Apr 19 13:25:45 2017 (r438839) +++ head/java/openjdk8/files/patch-bsd Wed Apr 19 13:36:23 2017 (r438840) @@ -1,5 +1,5 @@ ---- ./common/autoconf/build-performance.m4 Mon Nov 28 13:51:01 2016 -0800 -+++ ./common/autoconf/build-performance.m4 Sat Jan 28 19:01:56 2017 -0800 +--- ./common/autoconf/build-performance.m4 Mon Feb 27 11:15:51 2017 -0800 ++++ ./common/autoconf/build-performance.m4 Tue Apr 18 21:21:31 2017 -0700 @@ -41,6 +41,10 @@ # Looks like a MacOSX system NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'` @@ -38,8 +38,8 @@ AC_MSG_RESULT([no, disabling ccache]) CCACHE= else ---- ./common/autoconf/generated-configure.sh Mon Nov 28 13:51:01 2016 -0800 -+++ ./common/autoconf/generated-configure.sh Sat Jan 28 19:01:56 2017 -0800 +--- ./common/autoconf/generated-configure.sh Mon Feb 27 11:15:51 2017 -0800 ++++ ./common/autoconf/generated-configure.sh Tue Apr 18 21:21:31 2017 -0700 @@ -646,6 +646,8 @@ LIBM LIBZIP_CAN_USE_MMAP @@ -685,8 +685,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5 $as_echo "no, disabling ccache" >&6; } CCACHE= ---- ./common/autoconf/jdk-options.m4 Mon Nov 28 13:51:01 2016 -0800 -+++ ./common/autoconf/jdk-options.m4 Sat Jan 28 19:01:56 2017 -0800 +--- ./common/autoconf/jdk-options.m4 Mon Feb 27 11:15:51 2017 -0800 ++++ ./common/autoconf/jdk-options.m4 Tue Apr 18 21:21:31 2017 -0700 @@ -159,7 +159,7 @@ INCLUDE_SA=false fi @@ -717,8 +717,8 @@ # Enable or disable the elliptic curve crypto implementation # AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC], ---- ./common/autoconf/libraries.m4 Mon Nov 28 13:51:01 2016 -0800 -+++ ./common/autoconf/libraries.m4 Sat Jan 28 19:01:56 2017 -0800 +--- ./common/autoconf/libraries.m4 Mon Feb 27 11:15:51 2017 -0800 ++++ ./common/autoconf/libraries.m4 Tue Apr 18 21:21:31 2017 -0700 @@ -69,9 +69,15 @@ fi @@ -856,8 +856,8 @@ + AC_SUBST(LIBCXX) ]) ---- ./common/autoconf/platform.m4 Mon Nov 28 13:51:01 2016 -0800 -+++ ./common/autoconf/platform.m4 Sat Jan 28 19:01:56 2017 -0800 +--- ./common/autoconf/platform.m4 Mon Feb 27 11:15:51 2017 -0800 ++++ ./common/autoconf/platform.m4 Tue Apr 18 21:21:31 2017 -0700 @@ -30,7 +30,7 @@ [ # First argument is the cpu name from the trip/quad @@ -917,8 +917,8 @@ OPENJDK_TARGET_CPU_OSARCH="i386" elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then # On all platforms except macosx, we replace x86_64 with amd64. ---- ./common/autoconf/spec.gmk.in Mon Nov 28 13:51:01 2016 -0800 -+++ ./common/autoconf/spec.gmk.in Sat Jan 28 19:01:56 2017 -0800 +--- ./common/autoconf/spec.gmk.in Mon Feb 27 11:15:51 2017 -0800 ++++ ./common/autoconf/spec.gmk.in Tue Apr 18 21:21:31 2017 -0700 @@ -76,6 +76,7 @@ OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@ OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@ @@ -955,8 +955,8 @@ USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@ LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@ MSVCR_DLL:=@MSVCR_DLL@ ---- ./common/autoconf/toolchain.m4 Mon Nov 28 13:51:01 2016 -0800 -+++ ./common/autoconf/toolchain.m4 Sat Jan 28 19:01:56 2017 -0800 +--- ./common/autoconf/toolchain.m4 Mon Feb 27 11:15:51 2017 -0800 ++++ ./common/autoconf/toolchain.m4 Tue Apr 18 21:21:31 2017 -0700 @@ -72,7 +72,7 @@ else COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1` @@ -1074,16 +1074,16 @@ fi if test "x$DEBUG_LEVEL" = xrelease; then CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DNDEBUG" ---- ./configure Mon Nov 28 13:51:01 2016 -0800 -+++ ./configure Sat Jan 28 19:01:56 2017 -0800 +--- ./configure Mon Feb 27 11:15:51 2017 -0800 ++++ ./configure Tue Apr 18 21:21:31 2017 -0700 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ---- ./make/Javadoc.gmk Mon Nov 28 13:51:01 2016 -0800 -+++ ./make/Javadoc.gmk Sat Jan 28 19:01:56 2017 -0800 +--- ./make/Javadoc.gmk Mon Feb 27 11:15:51 2017 -0800 ++++ ./make/Javadoc.gmk Tue Apr 18 21:21:31 2017 -0700 @@ -46,8 +46,18 @@ BUILD_NUMBER=$(JDK_BUILD_NUMBER) @@ -1104,8 +1104,8 @@ -Djava.awt.headless=true \ $(NEW_JAVADOC) \ -bootclasspath $(JDK_OUTPUTDIR)/classes ---- ./make/Main.gmk Mon Nov 28 13:51:01 2016 -0800 -+++ ./make/Main.gmk Sat Jan 28 19:01:56 2017 -0800 +--- ./make/Main.gmk Mon Feb 27 11:15:51 2017 -0800 ++++ ./make/Main.gmk Tue Apr 18 21:21:31 2017 -0700 @@ -58,7 +58,11 @@ # Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line, @@ -1118,8 +1118,8 @@ ### Main targets ---- ./make/common/MakeBase.gmk Mon Nov 28 13:51:01 2016 -0800 -+++ ./make/common/MakeBase.gmk Sat Jan 28 19:01:56 2017 -0800 +--- ./make/common/MakeBase.gmk Mon Feb 27 11:15:51 2017 -0800 ++++ ./make/common/MakeBase.gmk Tue Apr 18 21:21:31 2017 -0700 @@ -338,7 +338,7 @@ # (and causing a crash on Cygwin). # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris. @@ -1140,8 +1140,8 @@ endef # Make directory without forking mkdir if not needed ---- ./make/common/NativeCompilation.gmk Mon Nov 28 13:51:01 2016 -0800 -+++ ./make/common/NativeCompilation.gmk Sat Jan 28 19:01:56 2017 -0800 +--- ./make/common/NativeCompilation.gmk Mon Feb 27 11:15:51 2017 -0800 ++++ ./make/common/NativeCompilation.gmk Tue Apr 18 21:21:31 2017 -0700 @@ -151,9 +151,9 @@ # CC the compiler to use, default is $(CC) # LDEXE the linker to use for linking executables, default is $(LDEXE) @@ -1155,8 +1155,8 @@ ifneq (,$$($1_BIN)) $$(error BIN has been replaced with OBJECT_DIR) ---- ./hotspot/agent/make/Makefile Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/agent/make/Makefile Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/agent/make/Makefile Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/agent/make/Makefile Tue Apr 18 21:21:39 2017 -0700 @@ -50,6 +50,7 @@ sun.jvm.hotspot.debugger.amd64 \ sun.jvm.hotspot.debugger.bsd \ @@ -1235,8 +1235,8 @@ sun/jvm/hotspot/runtime/solaris_amd64/*.java \ sun/jvm/hotspot/runtime/solaris_sparc/*.java \ sun/jvm/hotspot/runtime/solaris_x86/*.java \ ---- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c Tue Apr 18 21:21:39 2017 -0700 @@ -42,6 +42,10 @@ #include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h" #endif @@ -1305,8 +1305,8 @@ (*env)->ReleaseLongArrayElements(env, array, regs, JNI_COMMIT); return array; ---- ./hotspot/agent/src/os/bsd/symtab.c Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/agent/src/os/bsd/symtab.c Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/agent/src/os/bsd/symtab.c Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/agent/src/os/bsd/symtab.c Tue Apr 18 21:21:39 2017 -0700 @@ -211,6 +211,10 @@ // Reading of elf header @@ -1347,8 +1347,8 @@ key.data = sym_name; key.size = strlen(sym_name) + 1; ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java Tue Apr 18 21:21:39 2017 -0700 @@ -33,6 +33,7 @@ import sun.jvm.hotspot.debugger.JVMDebugger; import sun.jvm.hotspot.debugger.MachineDescription; @@ -1367,7 +1367,7 @@ if (LinuxDebuggerLocal.getAddressSize()==8) { machDesc = new MachineDescriptionSPARC64Bit(); --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionPPC64.java Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1412,8 +1412,8 @@ + return false; + } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java Tue Apr 18 21:21:39 2017 -0700 @@ -30,8 +30,10 @@ import sun.jvm.hotspot.debugger.cdbg.*; import sun.jvm.hotspot.debugger.x86.*; @@ -1439,8 +1439,8 @@ } else { throw new DebuggerException(cpu + " is not yet supported"); } ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java Tue Apr 18 21:21:39 2017 -0700 @@ -27,6 +27,7 @@ import sun.jvm.hotspot.debugger.*; import sun.jvm.hotspot.debugger.bsd.amd64.*; @@ -1459,7 +1459,7 @@ throw new RuntimeException("cpu " + cpu + " is not yet supported"); } --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64CFrame.java Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1541,7 +1541,7 @@ + private BsdDebugger dbg; +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ppc64/BsdPPC64ThreadContext.java Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1590,7 +1590,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/ppc64/PPC64ThreadContext.java Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1715,8 +1715,8 @@ + public abstract Address getRegisterAsAddress(int index); + +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java Tue Apr 18 21:21:39 2017 -0700 @@ -32,7 +32,9 @@ import sun.jvm.hotspot.debugger.cdbg.*; import sun.jvm.hotspot.debugger.proc.amd64.*; @@ -1739,7 +1739,7 @@ try { Class tfc = Class.forName("sun.jvm.hotspot.debugger.proc." + --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64Thread.java Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1828,7 +1828,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadContext.java Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1877,7 +1877,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ppc64/ProcPPC64ThreadFactory.java Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -1923,8 +1923,8 @@ + return new ProcPPC64Thread(debugger, id); + } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Tue Apr 18 21:21:39 2017 -0700 @@ -33,6 +33,7 @@ import sun.jvm.hotspot.debugger.remote.sparc.*; import sun.jvm.hotspot.debugger.remote.x86.*; @@ -1946,7 +1946,7 @@ try { Class tf = Class.forName("sun.jvm.hotspot.debugger.remote." + --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64Thread.java Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2002,7 +2002,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadContext.java Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2055,7 +2055,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/ppc64/RemotePPC64ThreadFactory.java Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2101,8 +2101,8 @@ + return new RemotePPC64Thread(debugger, id); + } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Tue Apr 18 21:21:39 2017 -0700 @@ -37,6 +37,7 @@ import sun.jvm.hotspot.runtime.linux_sparc.LinuxSPARCJavaThreadPDAccess; import sun.jvm.hotspot.runtime.bsd_x86.BsdX86JavaThreadPDAccess; @@ -2121,7 +2121,7 @@ } else if (os.equals("darwin")) { if (cpu.equals("amd64") || cpu.equals("x86_64")) { --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ppc64/BsdPPC64JavaThreadPDAccess.java Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ppc64/BsdPPC64JavaThreadPDAccess.java Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2256,7 +2256,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64CurrentFrameGuess.java Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,176 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2435,7 +2435,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64Frame.java Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,508 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2946,7 +2946,7 @@ + } +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64JavaCallWrapper.java Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -2992,7 +2992,7 @@ + +} --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ppc64/PPC64RegisterMap.java Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,51 @@ +/* + * Copyright (c) 20014, Oracle and/or its affiliates. All rights reserved. @@ -3045,8 +3045,8 @@ + protected void initializeFromPD(RegisterMap map) {} + protected Address getLocationPD(VMReg reg) { return null; } +} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java Tue Apr 18 21:21:39 2017 -0700 @@ -61,7 +61,7 @@ return "x86"; } else if (cpu.equals("sparc") || cpu.equals("sparcv9")) { @@ -3056,8 +3056,8 @@ return cpu; } else { try { ---- ./hotspot/make/bsd/Makefile Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/make/bsd/Makefile Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/make/bsd/Makefile Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/make/bsd/Makefile Tue Apr 18 21:21:39 2017 -0700 @@ -66,6 +66,10 @@ FORCE_TIERED=1 endif @@ -3069,8 +3069,8 @@ ifdef LP64 ifeq ("$(filter $(LP64_ARCH),$(BUILDARCH))","") ---- ./hotspot/make/bsd/makefiles/build_vm_def.sh Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/make/bsd/makefiles/build_vm_def.sh Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Tue Apr 18 21:21:39 2017 -0700 @@ -1,12 +1,28 @@ #!/bin/sh @@ -3106,8 +3106,8 @@ + if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";" + }' | sort -u ;; +esac ---- ./hotspot/make/bsd/makefiles/debug.make Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/make/bsd/makefiles/debug.make Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/make/bsd/makefiles/debug.make Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/debug.make Tue Apr 18 21:21:39 2017 -0700 @@ -35,7 +35,10 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -3120,8 +3120,8 @@ VERSION = debug SYSDEFS += -DASSERT ---- ./hotspot/make/bsd/makefiles/defs.make Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/make/bsd/makefiles/defs.make Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/make/bsd/makefiles/defs.make Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/defs.make Tue Apr 18 21:21:39 2017 -0700 @@ -29,7 +29,15 @@ SLASH_JAVA ?= /java @@ -3220,8 +3220,8 @@ ADD_SA_BINARIES/ia64 = ADD_SA_BINARIES/arm = ADD_SA_BINARIES/zero = ---- ./hotspot/make/bsd/makefiles/fastdebug.make Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/make/bsd/makefiles/fastdebug.make Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/make/bsd/makefiles/fastdebug.make Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/fastdebug.make Tue Apr 18 21:21:39 2017 -0700 @@ -56,7 +56,10 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -3234,8 +3234,8 @@ VERSION = fastdebug SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS ---- ./hotspot/make/bsd/makefiles/gcc.make Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/make/bsd/makefiles/gcc.make Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/make/bsd/makefiles/gcc.make Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/gcc.make Tue Apr 18 21:21:39 2017 -0700 @@ -168,6 +168,9 @@ CFLAGS += -DDONT_USE_PRECOMPILED_HEADER endif @@ -3362,7 +3362,7 @@ endif --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/makefiles/launcher.make Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/launcher.make Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,117 @@ +# +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. @@ -3481,8 +3481,8 @@ + $(QUIETLY) sed -e 's/@@LIBARCH@@/$(LIBARCH)/g' $< > $@ + $(QUIETLY) chmod +x $@ + ---- ./hotspot/make/bsd/makefiles/mapfile-vers-debug Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/make/bsd/makefiles/mapfile-vers-debug Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug Tue Apr 18 21:21:39 2017 -0700 @@ -21,246 +21,254 @@ # questions. # @@ -3490,10 +3490,16 @@ -# Only used for OSX/Darwin builds # Define public interface. -- # _JNI ++ ++SUNWprivate_1.1 { ++ global: + # _JNI - _JNI_CreateJavaVM - _JNI_GetCreatedJavaVMs - _JNI_GetDefaultJavaVMInitArgs ++ JNI_CreateJavaVM; ++ JNI_GetCreatedJavaVMs; ++ JNI_GetDefaultJavaVMInitArgs; - # _JVM - _JVM_Accept @@ -3712,17 +3718,6 @@ - _JVM_Write - _JVM_Yield - _JVM_handle_bsd_signal -+SUNWprivate_1.1 { -+ global: -+ # _JNI -+ JNI_CreateJavaVM; -+ JNI_GetCreatedJavaVMs; -+ JNI_GetDefaultJavaVMInitArgs; - -- # debug _JVM -- _JVM_AccessVMBooleanFlag -- _JVM_AccessVMIntFlag -- _JVM_VMBreakPoint + # JVM + JVM_Accept; + JVM_ActiveProcessorCount; @@ -3940,7 +3935,11 @@ + JVM_Write; + JVM_Yield; + JVM_handle_bsd_signal; -+ + +- # debug _JVM +- _JVM_AccessVMBooleanFlag +- _JVM_AccessVMIntFlag +- _JVM_VMBreakPoint + # debug JVM + JVM_AccessVMBooleanFlag; + JVM_AccessVMIntFlag; @@ -3971,7 +3970,7 @@ + *; +}; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,266 @@ +# +# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. @@ -4239,8 +4238,8 @@ + + # INSERT VTABLE SYMBOLS HERE + ---- ./hotspot/make/bsd/makefiles/mapfile-vers-product Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/make/bsd/makefiles/mapfile-vers-product Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Tue Apr 18 21:21:39 2017 -0700 @@ -21,241 +21,249 @@ # questions. # @@ -4248,10 +4247,16 @@ -# Only used for OSX/Darwin builds # Define public interface. -- # _JNI ++ ++SUNWprivate_1.1 { ++ global: + # _JNI - _JNI_CreateJavaVM - _JNI_GetCreatedJavaVMs - _JNI_GetDefaultJavaVMInitArgs ++ JNI_CreateJavaVM; ++ JNI_GetCreatedJavaVMs; ++ JNI_GetDefaultJavaVMInitArgs; - # _JVM - _JVM_Accept @@ -4470,13 +4475,6 @@ - _JVM_Write - _JVM_Yield - _JVM_handle_bsd_signal -+SUNWprivate_1.1 { -+ global: -+ # _JNI -+ JNI_CreateJavaVM; -+ JNI_GetCreatedJavaVMs; -+ JNI_GetDefaultJavaVMInitArgs; -+ + # JVM + JVM_Accept; + JVM_ActiveProcessorCount; @@ -4720,7 +4718,7 @@ + *; +}; --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,261 @@ +# +# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. @@ -4983,8 +4981,8 @@ + + # INSERT VTABLE SYMBOLS HERE + ---- ./hotspot/make/bsd/makefiles/optimized.make Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/make/bsd/makefiles/optimized.make Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/make/bsd/makefiles/optimized.make Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/optimized.make Tue Apr 18 21:21:39 2017 -0700 @@ -38,6 +38,9 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -4997,7 +4995,7 @@ VERSION = optimized --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/makefiles/ppc64.make Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/ppc64.make Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,51 @@ +# +# Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. @@ -5050,8 +5048,8 @@ + # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI. + CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string +endif ---- ./hotspot/make/bsd/makefiles/product.make Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/make/bsd/makefiles/product.make Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/make/bsd/makefiles/product.make Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/product.make Tue Apr 18 21:21:39 2017 -0700 @@ -38,7 +38,10 @@ # to inhibit the effect of the previous line on CFLAGS. @@ -5064,8 +5062,8 @@ SYSDEFS += -DPRODUCT VERSION = optimized ---- ./hotspot/make/bsd/makefiles/rules.make Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/make/bsd/makefiles/rules.make Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/make/bsd/makefiles/rules.make Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/rules.make Tue Apr 18 21:21:39 2017 -0700 @@ -34,7 +34,7 @@ CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS) CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS) @@ -5075,8 +5073,8 @@ COMPILE.CC = $(CC_COMPILE) -c GENASM.CC = $(CC_COMPILE) -S ---- ./hotspot/make/bsd/makefiles/sa.make Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/make/bsd/makefiles/sa.make Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/make/bsd/makefiles/sa.make Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/sa.make Tue Apr 18 21:21:39 2017 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. @@ -5191,8 +5189,8 @@ rm -rf $(AGENT_FILES_LIST) + +-include $(HS_ALT_MAKE)/bsd/makefiles/sa-rules.make ---- ./hotspot/make/bsd/makefiles/saproc.make Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/make/bsd/makefiles/saproc.make Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/make/bsd/makefiles/saproc.make Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/saproc.make Tue Apr 18 21:21:39 2017 -0700 @@ -99,10 +99,10 @@ endif @@ -5232,8 +5230,8 @@ + cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done" .PHONY: install_saproc ---- ./hotspot/make/bsd/makefiles/vm.make Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/make/bsd/makefiles/vm.make Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/make/bsd/makefiles/vm.make Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/make/bsd/makefiles/vm.make Tue Apr 18 21:21:39 2017 -0700 @@ -107,7 +107,7 @@ # File specific flags CXXFLAGS += $(CXXFLAGS/BYFILE) @@ -5244,7 +5242,7 @@ endif --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/make/bsd/platform_ppc64 Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/make/bsd/platform_ppc64 Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,17 @@ +os_family = bsd + @@ -5263,8 +5261,8 @@ +gnu_dis_arch = ppc64 + +sysdefs = -DBSD -D_ALLBSD_SOURCE -D_GNU_SOURCE -DPPC64 ---- ./hotspot/make/sa.files Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/make/sa.files Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/make/sa.files Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/make/sa.files Tue Apr 18 21:21:39 2017 -0700 @@ -45,6 +45,7 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/amd64/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/*.java \ @@ -5305,8 +5303,8 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/jcore/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/soql/*.java \ ---- ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/src/cpu/ppc/vm/bytes_ppc.hpp Tue Apr 18 21:21:39 2017 -0700 @@ -277,5 +277,9 @@ #if defined(TARGET_OS_ARCH_linux_ppc) #include "bytes_linux_ppc.inline.hpp" @@ -5317,8 +5315,8 @@ + #endif // CPU_PPC_VM_BYTES_PPC_HPP ---- ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/src/cpu/ppc/vm/interpreter_ppc.cpp Tue Apr 18 21:21:39 2017 -0700 @@ -307,6 +307,8 @@ // Although AIX runs on big endian CPU, float is in most significant // word of an argument slot. @@ -5328,8 +5326,8 @@ #else #error "unknown OS" #endif ---- ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Tue Apr 18 21:21:39 2017 -0700 @@ -778,6 +778,8 @@ // Although AIX runs on big endian CPU, float is in the most // significant word of an argument slot. @@ -5339,8 +5337,8 @@ #else #error "unknown OS" #endif ---- ./hotspot/src/cpu/x86/vm/jni_x86.h Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/src/cpu/x86/vm/jni_x86.h Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/src/cpu/x86/vm/jni_x86.h Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/src/cpu/x86/vm/jni_x86.h Tue Apr 18 21:21:39 2017 -0700 @@ -34,7 +34,7 @@ #ifndef __has_attribute #define __has_attribute(x) 0 @@ -5350,8 +5348,8 @@ #define JNIEXPORT __attribute__((visibility("default"))) #define JNIIMPORT __attribute__((visibility("default"))) #else ---- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Tue Apr 18 21:21:39 2017 -0700 @@ -2266,7 +2266,7 @@ if (!is_critical_native) { // reset handle block @@ -5361,8 +5359,8 @@ // Any exception pending? __ cmpptr(Address(thread, in_bytes(Thread::pending_exception_offset())), (int32_t)NULL_WORD); ---- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Tue Apr 18 21:21:39 2017 -0700 @@ -23,9 +23,12 @@ */ @@ -5377,8 +5375,8 @@ #include "asm/macroAssembler.hpp" #include "asm/macroAssembler.inline.hpp" #include "code/debugInfoRec.hpp" ---- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Tue Apr 18 21:21:39 2017 -0700 @@ -1293,7 +1293,7 @@ // reset handle block @@ -5388,8 +5386,8 @@ // If result was an oop then unbox and save it in the frame { Label L; ---- ./hotspot/src/cpu/x86/vm/x86_32.ad Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/src/cpu/x86/vm/x86_32.ad Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/src/cpu/x86/vm/x86_32.ad Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/src/cpu/x86/vm/x86_32.ad Tue Apr 18 21:21:39 2017 -0700 @@ -1250,6 +1250,7 @@ @@ -5398,8 +5396,8 @@ } #ifndef PRODUCT ---- ./hotspot/src/os/aix/vm/os_aix.cpp Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/src/os/aix/vm/os_aix.cpp Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/src/os/aix/vm/os_aix.cpp Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/src/os/aix/vm/os_aix.cpp Tue Apr 18 21:21:39 2017 -0700 @@ -5236,6 +5236,10 @@ return 0; } @@ -5412,7 +5410,7 @@ } --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Sat Jan 28 19:02:08 2017 -0800 ++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp Tue Apr 18 21:21:39 2017 -0700 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. @@ -5467,8 +5465,8 @@ + return false; +} +#endif ---- ./hotspot/src/os/bsd/vm/jsig.c Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/src/os/bsd/vm/jsig.c Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/src/os/bsd/vm/jsig.c Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/src/os/bsd/vm/jsig.c Tue Apr 18 21:21:39 2017 -0700 @@ -165,9 +165,8 @@ } @@ -5481,8 +5479,8 @@ static int call_os_sigaction(int sig, const struct sigaction *act, struct sigaction *oact) { ---- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp Tue Apr 18 21:21:39 2017 -0700 @@ -50,6 +50,7 @@ case INTERRUPT_SIGNAL: case SIGFPE: @@ -5592,8 +5590,8 @@ + jio_snprintf(buf, len, "SIG%s", signame); + return true; } ---- ./hotspot/src/os/bsd/vm/jvm_bsd.h Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/src/os/bsd/vm/jvm_bsd.h Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/src/os/bsd/vm/jvm_bsd.h Tue Apr 18 21:21:39 2017 -0700 @@ -112,20 +112,6 @@ #define SHUTDOWN2_SIGNAL SIGINT #define SHUTDOWN3_SIGNAL SIGTERM @@ -5615,8 +5613,8 @@ #endif /* JVM_MD_H */ #endif // OS_BSD_VM_JVM_BSD_H ---- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp Tue Apr 18 21:21:39 2017 -0700 @@ -30,7 +30,7 @@ void OSThread::pd_initialize() { @@ -5626,8 +5624,8 @@ _thread_id = 0; #else _thread_id = NULL; ---- ./hotspot/src/os/bsd/vm/os_bsd.cpp Mon Nov 28 13:51:31 2016 -0800 -+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Sat Jan 28 19:02:08 2017 -0800 +--- ./hotspot/src/os/bsd/vm/os_bsd.cpp Mon Feb 27 11:16:11 2017 -0800 ++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp Tue Apr 18 21:21:39 2017 -0700 @@ -97,16 +97,31 @@ # include <sys/shm.h> #ifndef __APPLE__ @@ -5660,7 +5658,7 @@ #ifdef __APPLE__ # include <mach/mach.h> // semaphore_* API # include <mach-o/dyld.h> -@@ -136,6 +151,7 @@ +@@ -136,9 +151,11 @@ volatile uint64_t os::Bsd::_max_abstime = 0; #else int (*os::Bsd::_clock_gettime)(clockid_t, struct timespec *) = NULL; @@ -5668,7 +5666,11 @@ #endif pthread_t os::Bsd::_main_thread; int os::Bsd::_page_size = -1; -@@ -169,6 +185,27 @@ ++pthread_condattr_t os::Bsd::_condattr[1]; + + static jlong initial_time_count=0; + +@@ -169,6 +186,27 @@ // available here means free julong os::Bsd::available_memory() { @@ -5696,7 +5698,7 @@ uint64_t available = physical_memory() >> 2; #ifdef __APPLE__ mach_msg_type_number_t count = HOST_VM_INFO64_COUNT; -@@ -208,7 +245,7 @@ +@@ -208,7 +246,7 @@ static bool init = false; static bool privileges = false; if (!init) { @@ -5705,7 +5707,7 @@ init = true; } return privileges; -@@ -229,6 +266,8 @@ +@@ -229,6 +267,8 @@ static char cpu_arch[] = "arm"; #elif defined(PPC32) static char cpu_arch[] = "ppc"; @@ -5714,7 +5716,7 @@ #elif defined(SPARC) # ifdef _LP64 static char cpu_arch[] = "sparcv9"; -@@ -411,12 +450,21 @@ +@@ -411,12 +451,21 @@ const char *v = ::getenv("LD_LIBRARY_PATH"); const char *v_colon = ":"; if (v == NULL) { v = ""; v_colon = ""; } @@ -5736,7 +5738,7 @@ Arguments::set_library_path(ld_library_path); FREE_C_HEAP_ARRAY(char, ld_library_path, mtInternal); } -@@ -591,6 +639,9 @@ +@@ -591,6 +640,9 @@ sigaddset(&unblocked_sigs, SIGSEGV); sigaddset(&unblocked_sigs, SIGBUS); sigaddset(&unblocked_sigs, SIGFPE); @@ -5746,7 +5748,7 @@ sigaddset(&unblocked_sigs, SR_signum); if (!ReduceSignalUsage) { -@@ -983,6 +1034,13 @@ +@@ -983,6 +1035,13 @@ bool os::vtime_enabled() { return false; } double os::elapsedVTime() { @@ -5760,15 +5762,32 @@ // better than nothing, but not much return elapsedTime(); } -@@ -1013,6 +1071,7 @@ +@@ -1008,11 +1067,15 @@ + void os::Bsd::clock_init() { + struct timespec res; + struct timespec tp; ++ _getcpuclockid = (int (*)(pthread_t, clockid_t *))dlsym(RTLD_DEFAULT, "pthread_getcpuclockid"); + if (::clock_getres(CLOCK_MONOTONIC, &res) == 0 && + ::clock_gettime(CLOCK_MONOTONIC, &tp) == 0) { // yes, monotonic clock is supported _clock_gettime = ::clock_gettime; ++ return; } -+ _getcpuclockid = (int (*)(pthread_t, clockid_t *))dlsym(RTLD_DEFAULT, "pthread_getcpuclockid"); ++ warning("No monotonic clock was available - timed services may " \ ++ "be adversely affected if the time-of-day clock changes"); } #endif -@@ -1190,35 +1249,38 @@ +@@ -1048,7 +1111,7 @@ + jlong os::javaTimeNanos() { + if (Bsd::supports_monotonic_clock()) { + struct timespec tp; +- int status = Bsd::_clock_gettime(CLOCK_MONOTONIC, &tp); ++ int status = ::clock_gettime(CLOCK_MONOTONIC, &tp); + assert(status == 0, "gettime error"); + jlong result = jlong(tp.tv_sec) * (1000 * 1000 * 1000) + jlong(tp.tv_nsec); + return result; +@@ -1190,35 +1253,38 @@ pid_t os::Bsd::gettid() { int retval = -1; @@ -5819,7 +5838,7 @@ #else return (intx)::pthread_self(); #endif -@@ -1696,14 +1758,14 @@ +@@ -1696,14 +1762,14 @@ } void os::print_os_info_brief(outputStream* st) { @@ -5836,7 +5855,7 @@ os::Posix::print_uname_info(st); -@@ -1716,6 +1778,29 @@ +@@ -1716,6 +1782,29 @@ // Nothing to do for now. } @@ -5866,7 +5885,7 @@ void os::print_memory_info(outputStream* st) { st->print("Memory:"); -@@ -1725,11 +1810,14 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704191336.v3JDaNxO005985>