svn commit: r403646 - in head/java/openjdk8: . files
Greg Lewis
glewis at FreeBSD.org
Sun Dec 13 00:50:59 UTC 2015
Author: glewis
Date: Sun Dec 13 00:50:58 2015
New Revision: 403646
URL: https://svnweb.freebsd.org/changeset/ports/403646
Log:
. Update to 8u66.
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 Sat Dec 12 23:48:39 2015 (r403645)
+++ head/java/openjdk8/Makefile Sun Dec 13 00:50:58 2015 (r403646)
@@ -2,7 +2,6 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
-PORTREVISION= 2
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 \
@@ -20,7 +19,8 @@ PATCHFILES= patch-8u05-b13.xz \
patch-8u40-b25.xz \
patch-8u45-b14.xz \
patch-8u51-b16.xz \
- patch-8u60-b23.xz
+ patch-8u60-b23.xz \
+ patch-8u66-b17.xz
MAINTAINER= java at FreeBSD.org
COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION}
@@ -198,8 +198,8 @@ NO_CCACHE= yes
NOPRECIOUSMAKEVARS= yes
JDK_MAJOR_VERSION= 8
-JDK_UPDATE_VERSION= 60
-JDK_BUILD_NUMBER= 24
+JDK_UPDATE_VERSION= 66
+JDK_BUILD_NUMBER= 17
DIST_BUILD_NUMBER= 132
JTREG_VERSION= 4.1
JTREG_BUILD_NUMBER= b08
Modified: head/java/openjdk8/distinfo
==============================================================================
--- head/java/openjdk8/distinfo Sat Dec 12 23:48:39 2015 (r403645)
+++ head/java/openjdk8/distinfo Sun Dec 13 00:50:58 2015 (r403646)
@@ -20,3 +20,5 @@ SHA256 (patch-8u51-b16.xz) = 146e8ffa759
SIZE (patch-8u51-b16.xz) = 71144
SHA256 (patch-8u60-b23.xz) = 8ebe80e8add9e61dcb43e9be756ccc6d566a39748e7726f265df73af2d082798
SIZE (patch-8u60-b23.xz) = 1043720
+SHA256 (patch-8u66-b17.xz) = a9ab2649c4f107c0399b8ce953d5d8cb683bee959446ef5df9a3c9d5c682bf9b
+SIZE (patch-8u66-b17.xz) = 185576
Modified: head/java/openjdk8/files/patch-bsd
==============================================================================
--- head/java/openjdk8/files/patch-bsd Sat Dec 12 23:48:39 2015 (r403645)
+++ head/java/openjdk8/files/patch-bsd Sun Dec 13 00:50:58 2015 (r403646)
@@ -1,5 +1,12 @@
---- ./common/autoconf/build-performance.m4 Wed Jul 01 21:51:50 2015 -0700
-+++ ./common/autoconf/build-performance.m4 Sat Sep 05 06:32:21 2015 -0700
+--- ./.hgtags 2015-12-12 10:53:30.938451000 -0800
++++ ./.hgtags 2015-10-24 06:20:54.000000000 -0700
+@@ -487,4 +487,3 @@
+ b5c54b2e12c3fbc54c7d7e0f22187fa601feb749 jdk8u66-b14
+ d45e1dc28a6ee6fd03348ee170d9895957888124 jdk8u66-b15
+ 5f29f2da7993f09564f6a5cb34e2799981ea96bb jdk8u66-b16
+-5b37e6757d7c95c9c58b07fb3c9eba234567385a jdk8u40-b24
+--- ./common/autoconf/build-performance.m4 2015-12-12 10:53:20.526424000 -0800
++++ ./common/autoconf/build-performance.m4 2015-10-24 06:20:55.000000000 -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 +45,8 @@
AC_MSG_RESULT([no, disabling ccache])
CCACHE=
else
---- ./common/autoconf/generated-configure.sh Wed Jul 01 21:51:50 2015 -0700
-+++ ./common/autoconf/generated-configure.sh Sat Sep 05 06:32:21 2015 -0700
+--- ./common/autoconf/generated-configure.sh 2015-12-12 10:53:30.948059000 -0800
++++ ./common/autoconf/generated-configure.sh 2015-10-24 06:20:55.000000000 -0700
@@ -646,6 +646,8 @@
LIBM
LIBZIP_CAN_USE_MMAP
@@ -235,23 +242,23 @@
if test -n "$ac_tool_prefix"; then
for ac_prog in gobjcopy objcopy
do
-@@ -29309,8 +29370,10 @@
+@@ -29309,9 +29370,11 @@
SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
SET_SHARED_LIBRARY_MAPFILE=''
SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
-+ POST_STRIP_CMD="$STRIP -S"
-+ fi
-+ if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then
- SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
-- POST_STRIP_CMD="$STRIP -S"
+- SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
+ POST_STRIP_CMD="$STRIP -S"
fi
++ if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then
++ SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
++ fi
else
if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+ # If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
@@ -29736,22 +29799,37 @@
CCXXFLAGS_JDK="$CCXXFLAGS_JDK $ADD_LP64"
# The package path is used only on macosx?
-- PACKAGE_PATH=/opt/local
+
+# Check whether --with-package-path was given.
+if test "${with_package_path+set}" = set; then :
@@ -261,25 +268,14 @@
+ PACKAGE_PATH="$with_package_path"
+ if test "x$PACKAGE_PATH" = x; then
+ if test "`uname -s`" = "Darwin"; then
-+ PACKAGE_PATH=/opt/local
+ PACKAGE_PATH=/opt/local
+ fi
-+
+
+ if test "`uname -s`" = "FreeBSD"; then
+ PACKAGE_PATH=/usr/local
+ fi
-+
-+ if test "`uname -s`" = "NetBSD"; then
-+ PACKAGE_PATH=/usr/pkg
-+ fi
-+
-+ if test "`uname -s`" = "OpenBSD"; then
-+ PACKAGE_PATH=/usr/local
-+ fi
-+ fi
-+
-
- if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
+- if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
- # The macro _LITTLE_ENDIAN needs to be defined the same to avoid the
- # Sun C compiler warning message: warning: macro redefined: _LITTLE_ENDIAN
- # (The Solaris X86 system defines this in file /usr/include/sys/isa_defs.h).
@@ -289,11 +285,21 @@
- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN="
- else
- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN"
-- fi
-- else
-- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN"
++ if test "`uname -s`" = "NetBSD"; then
++ PACKAGE_PATH=/usr/pkg
+ fi
++
++ if test "`uname -s`" = "OpenBSD"; then
++ PACKAGE_PATH=/usr/local
++ fi
++ fi
++
++
++
++ if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_LITTLE_ENDIAN"
-+ else
+ else
+- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN"
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_BIG_ENDIAN"
fi
if test "x$OPENJDK_TARGET_OS" = xlinux; then
@@ -304,13 +310,12 @@
if test "x$OPENJDK_TARGET_OS" = xbsd; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on bsd?" >&5
-$as_echo_n "checking what is not needed on bsd?... " >&6; }
-- ALSA_NOT_NEEDED=yes
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa" >&5
--$as_echo "alsa" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5
+$as_echo_n "checking what is not needed on BSD?... " >&6; }
+ if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd; then
-+ ALSA_NOT_NEEDED=yes
+ ALSA_NOT_NEEDED=yes
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa" >&5
+-$as_echo "alsa" >&6; }
+ PULSE_NOT_NEEDED=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
+$as_echo "alsa pulse" >&6; }
@@ -376,16 +381,13 @@
-else
- as_fn_error $? "--with-giflib=system specified, but gif_lib.h not found!" "$LINENO" 5
--fi
--
--
+ GIFLIB_H_FOUND=yes
+ GIFLIB_CFLAGS=
+
+
-+fi
-+
-+
+ fi
+
+
+ if test "x$GIFLIB_H_FOUND" = xno; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for giflib headers" >&5
+$as_echo_n "checking for giflib headers... " >&6; }
@@ -442,18 +444,12 @@
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGIF 1
-_ACEOF
--
+
- LIBS="-lgif $LIBS"
--
--else
-- as_fn_error $? "--with-giflib=system specified, but no giflib found!" "$LINENO" 5
--fi
--
-+
+ GIFLIB_LIB_FOUND=yes
+ GIFLIB_LDFLAGS=
+
-+
+
+fi
+
+ if test "x$GIFLIB_LIB_FOUND" = xno; then
@@ -463,7 +459,8 @@
+$as_echo_n "checking for DGifOpen in -lgif... " >&6; }
+if ${ac_cv_lib_gif_DGifOpen+:} false; then :
+ $as_echo_n "(cached) " >&6
-+else
+ else
+- as_fn_error $? "--with-giflib=system specified, but no giflib found!" "$LINENO" 5
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgif $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -488,7 +485,7 @@
+ ac_cv_lib_gif_DGifOpen=yes
+else
+ ac_cv_lib_gif_DGifOpen=no
-+fi
+ fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
@@ -505,7 +502,7 @@
+
+ LDFLAGS="$save_LDFLAGS"
+ fi
-+
+
+ if test "x$GIFLIB_LIB_FOUND" = xno; then
+
+ # Print a helpful message on how to acquire the necessary build dependency.
@@ -601,8 +598,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 Wed Jul 01 21:51:50 2015 -0700
-+++ ./common/autoconf/jdk-options.m4 Sat Sep 05 06:32:21 2015 -0700
+--- ./common/autoconf/jdk-options.m4 2015-12-12 10:53:29.272768000 -0800
++++ ./common/autoconf/jdk-options.m4 2015-10-24 06:20:55.000000000 -0700
@@ -410,6 +410,20 @@
###############################################################################
@@ -624,18 +621,17 @@
# Enable or disable the elliptic curve crypto implementation
#
AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
---- ./common/autoconf/libraries.m4 Wed Jul 01 21:51:50 2015 -0700
-+++ ./common/autoconf/libraries.m4 Sat Sep 05 06:32:21 2015 -0700
+--- ./common/autoconf/libraries.m4 2015-12-12 10:53:29.275607000 -0800
++++ ./common/autoconf/libraries.m4 2015-10-24 06:20:55.000000000 -0700
@@ -69,9 +69,15 @@
fi
if test "x$OPENJDK_TARGET_OS" = xbsd; then
- AC_MSG_CHECKING([what is not needed on bsd?])
-- ALSA_NOT_NEEDED=yes
-- AC_MSG_RESULT([alsa])
+ AC_MSG_CHECKING([what is not needed on BSD?])
+ if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd; then
-+ ALSA_NOT_NEEDED=yes
+ ALSA_NOT_NEEDED=yes
+- AC_MSG_RESULT([alsa])
+ PULSE_NOT_NEEDED=yes
+ AC_MSG_RESULT([alsa pulse])
+ else
@@ -763,8 +759,8 @@
+
AC_SUBST(LIBCXX)
])
---- ./common/autoconf/platform.m4 Wed Jul 01 21:51:50 2015 -0700
-+++ ./common/autoconf/platform.m4 Sat Sep 05 06:32:21 2015 -0700
+--- ./common/autoconf/platform.m4 2015-12-12 10:53:29.275987000 -0800
++++ ./common/autoconf/platform.m4 2015-10-24 06:20:55.000000000 -0700
@@ -30,7 +30,7 @@
[
# First argument is the cpu name from the trip/quad
@@ -824,8 +820,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 Wed Jul 01 21:51:50 2015 -0700
-+++ ./common/autoconf/spec.gmk.in Sat Sep 05 06:32:21 2015 -0700
+--- ./common/autoconf/spec.gmk.in 2015-12-12 10:53:29.276399000 -0800
++++ ./common/autoconf/spec.gmk.in 2015-10-24 06:20:55.000000000 -0700
@@ -76,6 +76,7 @@
OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@
OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@
@@ -862,8 +858,8 @@
USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
MSVCR_DLL:=@MSVCR_DLL@
---- ./common/autoconf/toolchain.m4 Wed Jul 01 21:51:50 2015 -0700
-+++ ./common/autoconf/toolchain.m4 Sat Sep 05 06:32:21 2015 -0700
+--- ./common/autoconf/toolchain.m4 2015-12-12 10:53:29.276999000 -0800
++++ ./common/autoconf/toolchain.m4 2015-10-24 06:20:55.000000000 -0700
@@ -72,7 +72,7 @@
else
COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
@@ -882,29 +878,29 @@
AC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
# Only call fixup if objcopy was found.
if test -n "$OBJCOPY"; then
-@@ -634,8 +634,10 @@
+@@ -634,9 +634,11 @@
SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/[$]1'
SET_SHARED_LIBRARY_MAPFILE=''
SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
-+ POST_STRIP_CMD="$STRIP -S"
-+ fi
-+ if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then
- SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
-- POST_STRIP_CMD="$STRIP -S"
+- SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
+ POST_STRIP_CMD="$STRIP -S"
fi
++ if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then
++ SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
++ fi
else
if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+ # If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
@@ -1039,22 +1041,33 @@
CCXXFLAGS_JDK="$CCXXFLAGS_JDK $ADD_LP64"
# The package path is used only on macosx?
-- PACKAGE_PATH=/opt/local
+ AC_ARG_WITH(package-path, [AS_HELP_STRING([--with-package-path],
+ [package path to be used for location of third party packages])])
+ PACKAGE_PATH="$with_package_path"
+ if test "x$PACKAGE_PATH" = x; then
+ if test "`uname -s`" = "Darwin"; then
-+ PACKAGE_PATH=/opt/local
+ PACKAGE_PATH=/opt/local
+ fi
+
+ if test "`uname -s`" = "FreeBSD"; then
@@ -940,356 +936,35 @@
fi
if test "x$OPENJDK_TARGET_OS" = xlinux; then
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DLINUX"
---- ./configure Wed Jul 01 21:51:50 2015 -0700
-+++ ./configure Sat Sep 05 06:32:21 2015 -0700
+--- ./configure 2015-12-12 10:53:19.849663000 -0800
++++ ./configure 2015-10-24 06:20:55.000000000 -0700
@@ -1,4 +1,4 @@
--#!/bin/bash
+-#!/usr/local/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 Wed Jul 01 21:51:50 2015 -0700
-+++ ./make/Javadoc.gmk Sat Sep 05 06:32:21 2015 -0700
-@@ -46,8 +46,18 @@
-
- BUILD_NUMBER=$(JDK_BUILD_NUMBER)
-
-+ifeq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
-+ ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
-+ JAVADOC_CMD_MEM = "-Xmx768m"
-+ else
-+ JAVADOC_CMD_MEM = "-Xmx1024m"
-+ endif
-+else
-+ JAVADOC_CMD_MEM = "-Xmx1024m"
-+endif
-+
- JAVADOC_CMD = $(JAVA) \
-- -Xmx1024m \
-+ $(JAVADOC_CMD_MEM) \
- -Djava.awt.headless=true \
- $(NEW_JAVADOC) \
- -bootclasspath $(JDK_OUTPUTDIR)/classes
---- ./make/Main.gmk Wed Jul 01 21:51:50 2015 -0700
-+++ ./make/Main.gmk Sat Sep 05 06:32:21 2015 -0700
-@@ -58,7 +58,11 @@
-
- # Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line,
- # hence this workaround.
-+ifdef JOBS
-+ifneq ($(JOBS),0)
- MAKE_ARGS:=$(MAKE_ARGS) -j$(JOBS)
-+endif
-+endif
-
- ### Main targets
-
---- ./make/common/MakeBase.gmk Wed Jul 01 21:51:50 2015 -0700
-+++ ./make/common/MakeBase.gmk Sat Sep 05 06:32:21 2015 -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.
- # Only use time if it's GNU time which supports format and output file.
-- WRAPPER_SHELL:=/bin/bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log /bin/bash
-+ WRAPPER_SHELL:=bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log bash
- SHELL=$$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL)
- endif
- # Never remove warning messages; this is just for completeness
-@@ -365,8 +365,8 @@
-
- # This is to be called by all SetupFoo macros
- define LogSetupMacroEntry
-- $(if $(27),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk))
-- $(if $(findstring $(LOG_LEVEL),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26,$(if $($i),$(NEWLINE) $(strip [$i] $($i))))))
-+ $(if $(30),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk))
-+ $(if $(findstring $(LOG_LEVEL),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29,$(if $($i),$(NEWLINE) $(strip [$i] $($i))))))
- endef
-
- # Make directory without forking mkdir if not needed
---- ./make/common/NativeCompilation.gmk Wed Jul 01 21:51:50 2015 -0700
-+++ ./make/common/NativeCompilation.gmk Sat Sep 05 06:32:21 2015 -0700
-@@ -151,9 +151,9 @@
- # CC the compiler to use, default is $(CC)
- # LDEXE the linker to use for linking executables, default is $(LDEXE)
- # OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST
-- $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-- $(call LogSetupMacroEntry,SetupNativeCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25),$(26))
-- $(if $(27),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk))
-+ $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-+ $(call LogSetupMacroEntry,SetupNativeCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25),$(26),$(27),$(28),$(29))
-+ $(if $(30),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk))
-
- ifneq (,$$($1_BIN))
- $$(error BIN has been replaced with OBJECT_DIR)
---- ./corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Wed Jul 01 21:51:57 2015 -0700
-+++ ./corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Wed Jul 08 12:11:34 2015 -0700
-@@ -2430,8 +2430,8 @@
- private void throwAwayData(ValueMember[] fields,
- com.sun.org.omg.SendingContext.CodeBase sender)
- throws InvalidClassException, StreamCorruptedException,
-- ClassNotFoundException, IOException
-- {
-+ ClassNotFoundException, IOException {
-+
- for (int i = 0; i < fields.length; ++i) {
-
- try {
-@@ -2566,8 +2566,7 @@
-
- }
-
-- private static void setObjectField(Object o, Class c, String fieldName, Object v)
-- {
-+ private static void setObjectField(Object o, Class c, String fieldName, Object v) {
- try {
- Field fld = c.getDeclaredField( fieldName ) ;
- Class fieldCl = fld.getType();
-@@ -2577,9 +2576,15 @@
- long key = bridge.objectFieldOffset( fld ) ;
- bridge.putObject( o, key, v ) ;
- } catch (Exception e) {
-- throw utilWrapper.errorSetObjectField( e, fieldName,
-- o.toString(),
-- v.toString() ) ;
-+ if (o != null) {
-+ throw utilWrapper.errorSetObjectField( e, fieldName,
-+ o.toString(),
-+ v.toString() ) ;
-+ } else {
-+ throw utilWrapper.errorSetObjectField( e, fieldName,
-+ "null " + c.getName() + " object",
-+ v.toString() ) ;
-+ }
- }
- }
-
-@@ -2587,12 +2592,22 @@
- {
- try {
- Field fld = c.getDeclaredField( fieldName ) ;
-- long key = bridge.objectFieldOffset( fld ) ;
-- bridge.putBoolean( o, key, v ) ;
-+ if ((fld != null) && (fld.getType() == Boolean.TYPE)) {
-+ long key = bridge.objectFieldOffset( fld ) ;
-+ bridge.putBoolean( o, key, v ) ;
-+ } else {
-+ throw new InvalidObjectException("Field Type mismatch");
-+ }
- } catch (Exception e) {
-+ if (o != null) {
- throw utilWrapper.errorSetBooleanField( e, fieldName,
- o.toString(),
- new Boolean(v) ) ;
-+ } else {
-+ throw utilWrapper.errorSetBooleanField( e, fieldName,
-+ "null " + c.getName() + " object",
-+ new Boolean(v) ) ;
-+ }
- }
- }
-
-@@ -2600,12 +2615,22 @@
- {
- try {
- Field fld = c.getDeclaredField( fieldName ) ;
-- long key = bridge.objectFieldOffset( fld ) ;
-- bridge.putByte( o, key, v ) ;
-+ if ((fld != null) && (fld.getType() == Byte.TYPE)) {
-+ long key = bridge.objectFieldOffset( fld ) ;
-+ bridge.putByte( o, key, v ) ;
-+ } else {
-+ throw new InvalidObjectException("Field Type mismatch");
-+ }
- } catch (Exception e) {
-- throw utilWrapper.errorSetByteField( e, fieldName,
-- o.toString(),
-- new Byte(v) ) ;
-+ if (o != null) {
-+ throw utilWrapper.errorSetByteField( e, fieldName,
-+ o.toString(),
-+ new Byte(v) ) ;
-+ } else {
-+ throw utilWrapper.errorSetByteField( e, fieldName,
-+ "null " + c.getName() + " object",
-+ new Byte(v) ) ;
-+ }
- }
- }
-
-@@ -2613,12 +2638,22 @@
- {
- try {
- Field fld = c.getDeclaredField( fieldName ) ;
-- long key = bridge.objectFieldOffset( fld ) ;
-- bridge.putChar( o, key, v ) ;
-+ if ((fld != null) && (fld.getType() == Character.TYPE)) {
-+ long key = bridge.objectFieldOffset( fld ) ;
-+ bridge.putChar( o, key, v ) ;
-+ } else {
-+ throw new InvalidObjectException("Field Type mismatch");
-+ }
- } catch (Exception e) {
-- throw utilWrapper.errorSetCharField( e, fieldName,
-- o.toString(),
-- new Character(v) ) ;
-+ if (o != null) {
-+ throw utilWrapper.errorSetCharField( e, fieldName,
-+ o.toString(),
-+ new Character(v) ) ;
-+ } else {
-+ throw utilWrapper.errorSetCharField( e, fieldName,
-+ "null " + c.getName() + " object",
-+ new Character(v) ) ;
-+ }
- }
- }
-
-@@ -2626,12 +2661,22 @@
- {
- try {
- Field fld = c.getDeclaredField( fieldName ) ;
-- long key = bridge.objectFieldOffset( fld ) ;
-- bridge.putShort( o, key, v ) ;
-+ if ((fld != null) && (fld.getType() == Short.TYPE)) {
-+ long key = bridge.objectFieldOffset( fld ) ;
-+ bridge.putShort( o, key, v ) ;
-+ } else {
-+ throw new InvalidObjectException("Field Type mismatch");
-+ }
- } catch (Exception e) {
-+ if (o != null) {
- throw utilWrapper.errorSetShortField( e, fieldName,
- o.toString(),
- new Short(v) ) ;
-+ } else {
-+ throw utilWrapper.errorSetShortField( e, fieldName,
-+ "null " + c.getName() + " object",
-+ new Short(v) ) ;
-+ }
- }
- }
-
-@@ -2639,12 +2684,22 @@
- {
- try {
- Field fld = c.getDeclaredField( fieldName ) ;
-- long key = bridge.objectFieldOffset( fld ) ;
-- bridge.putInt( o, key, v ) ;
-+ if ((fld != null) && (fld.getType() == Integer.TYPE)) {
-+ long key = bridge.objectFieldOffset( fld ) ;
-+ bridge.putInt( o, key, v ) ;
-+ } else {
-+ throw new InvalidObjectException("Field Type mismatch");
-+ }
- } catch (Exception e) {
-- throw utilWrapper.errorSetIntField( e, fieldName,
-- o.toString(),
-- new Integer(v) ) ;
-+ if (o != null) {
-+ throw utilWrapper.errorSetIntField( e, fieldName,
-+ o.toString(),
-+ new Integer(v) ) ;
-+ } else {
-+ throw utilWrapper.errorSetIntField( e, fieldName,
-+ "null " + c.getName() + " object",
-+ new Integer(v) ) ;
-+ }
- }
- }
-
-@@ -2652,12 +2707,22 @@
- {
- try {
- Field fld = c.getDeclaredField( fieldName ) ;
-- long key = bridge.objectFieldOffset( fld ) ;
-- bridge.putLong( o, key, v ) ;
-+ if ((fld != null) && (fld.getType() == Long.TYPE)) {
-+ long key = bridge.objectFieldOffset( fld ) ;
-+ bridge.putLong( o, key, v ) ;
-+ } else {
-+ throw new InvalidObjectException("Field Type mismatch");
-+ }
- } catch (Exception e) {
-- throw utilWrapper.errorSetLongField( e, fieldName,
-- o.toString(),
-- new Long(v) ) ;
-+ if (o != null) {
-+ throw utilWrapper.errorSetLongField( e, fieldName,
-+ o.toString(),
-+ new Long(v) ) ;
-+ } else {
-+ throw utilWrapper.errorSetLongField( e, fieldName,
-+ "null " + c.getName() + " object",
-+ new Long(v) ) ;
-+ }
- }
- }
-
-@@ -2665,12 +2730,22 @@
- {
- try {
- Field fld = c.getDeclaredField( fieldName ) ;
-- long key = bridge.objectFieldOffset( fld ) ;
-- bridge.putFloat( o, key, v ) ;
-+ if ((fld != null) && (fld.getType() == Float.TYPE)) {
-+ long key = bridge.objectFieldOffset( fld ) ;
-+ bridge.putFloat( o, key, v ) ;
-+ } else {
-+ throw new InvalidObjectException("Field Type mismatch");
-+ }
- } catch (Exception e) {
-- throw utilWrapper.errorSetFloatField( e, fieldName,
-- o.toString(),
-- new Float(v) ) ;
-+ if (o != null) {
-+ throw utilWrapper.errorSetFloatField( e, fieldName,
-+ o.toString(),
-+ new Float(v) ) ;
-+ } else {
-+ throw utilWrapper.errorSetFloatField( e, fieldName,
-+ "null " + c.getName() + " object",
-+ new Float(v) ) ;
-+ }
- }
- }
-
-@@ -2678,12 +2753,22 @@
- {
- try {
- Field fld = c.getDeclaredField( fieldName ) ;
-- long key = bridge.objectFieldOffset( fld ) ;
-- bridge.putDouble( o, key, v ) ;
-+ if ((fld != null) && (fld.getType() == Double.TYPE)) {
-+ long key = bridge.objectFieldOffset( fld ) ;
-+ bridge.putDouble( o, key, v ) ;
-+ } else {
-+ throw new InvalidObjectException("Field Type mismatch");
-+ }
- } catch (Exception e) {
-- throw utilWrapper.errorSetDoubleField( e, fieldName,
-- o.toString(),
-- new Double(v) ) ;
-+ if (o != null) {
-+ throw utilWrapper.errorSetDoubleField( e, fieldName,
-+ o.toString(),
-+ new Double(v) ) ;
-+ } else {
-+ throw utilWrapper.errorSetDoubleField( e, fieldName,
-+ "null " + c.getName() + " object",
-+ new Double(v) ) ;
-+ }
- }
- }
-
---- ./hotspot/make/bsd/makefiles/build_vm_def.sh Wed Jul 01 21:52:18 2015 -0700
-+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh Sat Sep 05 06:33:34 2015 -0700
-@@ -1,12 +1,28 @@
- #!/bin/sh
+--- ./corba/.hgtags 2015-12-12 10:53:30.949741000 -0800
++++ ./corba/.hgtags 2015-10-24 06:20:56.000000000 -0700
+@@ -489,4 +489,3 @@
+ 0db478b43d7fcf26dc613241654737756ec982c5 jdk8u66-b14
+ b88ba0b818831eb6f3a7954e218b371ed6f5d154 jdk8u66-b15
+ 606448f919ad288412669c3e78482b99d8f5f416 jdk8u66-b16
+-472aa5bae0e78614e873d56bcc31e7caba49963c jdk8u40-b24
+--- ./hotspot/.hgtags 2015-12-12 10:53:30.953266000 -0800
++++ ./hotspot/.hgtags 2015-10-24 06:21:08.000000000 -0700
+@@ -755,4 +755,3 @@
+ 9f7f29ff487ae023ca1f697445004a532751b0d2 jdk8u66-b14
+ 5b67af3317bce1f940c5dc1535411a1002bed6c1 jdk8u66-b15
+ 4bbf0e9196f2786e0bc4f17664e2533808d944bf jdk8u66-b16
+-fa4e797f61e6dda1a60e06944018213bff2a1b76 jdk8u40-b24
+--- ./hotspot/make/bsd/makefiles/build_vm_def.sh 2014-03-03 18:52:06.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh 2015-10-24 06:21:09.000000000 -0700
+@@ -2,11 +2,27 @@
# If we're cross compiling use that path for nm
--if [ "$CROSS_COMPILE_ARCH" != "" ]; then
+ if [ "$CROSS_COMPILE_ARCH" != "" ]; then
-NM=$ALT_COMPILER_PATH/nm
-+if [ "$CROSS_COMPILE_ARCH" != "" ]; then
+ NM=$ALT_COMPILER_PATH/nm
else
-NM=nm
@@ -1318,8 +993,8 @@
+ if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";"
+ }' | sort -u ;;
+esac
---- ./hotspot/make/bsd/makefiles/debug.make Wed Jul 01 21:52:18 2015 -0700
-+++ ./hotspot/make/bsd/makefiles/debug.make Sat Sep 05 06:33:34 2015 -0700
+--- ./hotspot/make/bsd/makefiles/debug.make 2014-03-03 18:52:06.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/debug.make 2015-10-24 06:21:09.000000000 -0700
@@ -35,7 +35,10 @@
# to inhibit the effect of the previous line on CFLAGS.
@@ -1332,8 +1007,8 @@
VERSION = debug
SYSDEFS += -DASSERT
---- ./hotspot/make/bsd/makefiles/fastdebug.make Wed Jul 01 21:52:18 2015 -0700
-+++ ./hotspot/make/bsd/makefiles/fastdebug.make Sat Sep 05 06:33:34 2015 -0700
+--- ./hotspot/make/bsd/makefiles/fastdebug.make 2014-03-03 18:52:06.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/fastdebug.make 2015-10-24 06:21:09.000000000 -0700
@@ -56,7 +56,10 @@
# to inhibit the effect of the previous line on CFLAGS.
@@ -1346,8 +1021,8 @@
VERSION = fastdebug
SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS
---- ./hotspot/make/bsd/makefiles/gcc.make Wed Jul 01 21:52:18 2015 -0700
-+++ ./hotspot/make/bsd/makefiles/gcc.make Sat Sep 05 06:33:34 2015 -0700
+--- ./hotspot/make/bsd/makefiles/gcc.make 2015-12-12 10:53:29.301009000 -0800
++++ ./hotspot/make/bsd/makefiles/gcc.make 2015-10-24 06:21:09.000000000 -0700
@@ -168,6 +168,9 @@
CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
endif
@@ -1362,19 +1037,15 @@
endif
ifeq ($(USE_CLANG), true)
-- # Before Clang 3.1, we had to pass the stack alignment specification directly to llvm with the help of '-mllvm'
-- # Starting with version 3.1, Clang understands the '-mstack-alignment' (and rejects '-mllvm -stack-alignment')
-- ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 1 \) \))" "0"
-- STACK_ALIGNMENT_OPT = -mno-omit-leaf-frame-pointer -mstack-alignment=16
-- else
-- STACK_ALIGNMENT_OPT = -mno-omit-leaf-frame-pointer -mllvm -stack-alignment=16
+ STACK_ALIGNMENT_OPT = -mno-omit-leaf-frame-pointer
+ ifeq ($(OS_VENDOR), Darwin)
-+ # Before Clang 3.1, we had to pass the stack alignment specification directly to llvm with the help of '-mllvm'
-+ # Starting with version 3.1, Clang understands the '-mstack-alignment' (and rejects '-mllvm -stack-alignment')
-+ ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 1 \) \))" "0"
+ # Before Clang 3.1, we had to pass the stack alignment specification directly to llvm with the help of '-mllvm'
+ # Starting with version 3.1, Clang understands the '-mstack-alignment' (and rejects '-mllvm -stack-alignment')
+ ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 1 \) \))" "0"
+- STACK_ALIGNMENT_OPT = -mno-omit-leaf-frame-pointer -mstack-alignment=16
+ STACK_ALIGNMENT_OPT += -mstack-alignment=16
-+ else
+ else
+- STACK_ALIGNMENT_OPT = -mno-omit-leaf-frame-pointer -mllvm -stack-alignment=16
+ STACK_ALIGNMENT_OPT += -mllvm -stack-alignment=16
+ endif
endif
@@ -1398,14 +1069,13 @@
DEBUG_CFLAGS/ppc = -g
DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH))
ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)
-- DEBUG_CFLAGS += -gstabs
+ ifeq ($(USE_CLANG), true)
+ # Clang doesn't understand -gstabs
+ DEBUG_CFLAGS += -g
+ else
-+ DEBUG_CFLAGS += -gstabs
-+ endif
+ DEBUG_CFLAGS += -gstabs
endif
++ endif
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
FASTDEBUG_CFLAGS/ia64 = -g
@@ -1421,8 +1091,8 @@
OPT_CFLAGS/arm = -g
OPT_CFLAGS/ppc = -g
OPT_CFLAGS += $(OPT_CFLAGS/$(BUILDARCH))
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/makefiles/launcher.make Sat Sep 05 06:33:34 2015 -0700
+--- ./hotspot/make/bsd/makefiles/launcher.make 1969-12-31 16:00:00.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/launcher.make 2015-10-24 06:21:09.000000000 -0700
@@ -0,0 +1,117 @@
+#
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -1541,8 +1211,8 @@
+ $(QUIETLY) sed -e 's/@@LIBARCH@@/$(LIBARCH)/g' $< > $@
+ $(QUIETLY) chmod +x $@
+
---- ./hotspot/make/bsd/makefiles/mapfile-vers-debug Wed Jul 01 21:52:18 2015 -0700
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug Sat Sep 05 06:33:34 2015 -0700
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-debug 2015-12-12 10:53:26.626789000 -0800
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug 2015-10-24 06:21:09.000000000 -0700
@@ -21,246 +21,254 @@
# questions.
#
@@ -1557,10 +1227,7 @@
- _JNI_CreateJavaVM
- _JNI_GetCreatedJavaVMs
- _JNI_GetDefaultJavaVMInitArgs
-+ JNI_CreateJavaVM;
-+ JNI_GetCreatedJavaVMs;
-+ JNI_GetDefaultJavaVMInitArgs;
-
+-
- # _JVM
- _JVM_Accept
- _JVM_ActiveProcessorCount
@@ -1778,6 +1445,15 @@
- _JVM_Write
- _JVM_Yield
- _JVM_handle_bsd_signal
+-
+- # debug _JVM
+- _JVM_AccessVMBooleanFlag
+- _JVM_AccessVMIntFlag
+- _JVM_VMBreakPoint
++ JNI_CreateJavaVM;
++ JNI_GetCreatedJavaVMs;
++ JNI_GetDefaultJavaVMInitArgs;
++
+ # JVM
+ JVM_Accept;
+ JVM_ActiveProcessorCount;
@@ -1995,11 +1671,7 @@
+ JVM_Write;
+ JVM_Yield;
+ JVM_handle_bsd_signal;
-
-- # debug _JVM
-- _JVM_AccessVMBooleanFlag
-- _JVM_AccessVMIntFlag
-- _JVM_VMBreakPoint
++
+ # debug JVM
+ JVM_AccessVMBooleanFlag;
+ JVM_AccessVMIntFlag;
@@ -2029,8 +1701,8 @@
+ local:
+ *;
+};
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx Sat Sep 05 06:33:34 2015 -0700
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx 1969-12-31 16:00:00.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx 2015-10-24 06:21:09.000000000 -0700
@@ -0,0 +1,266 @@
+#
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
@@ -2298,8 +1970,8 @@
+
+ # INSERT VTABLE SYMBOLS HERE
+
---- ./hotspot/make/bsd/makefiles/mapfile-vers-product Wed Jul 01 21:52:18 2015 -0700
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product Sat Sep 05 06:33:34 2015 -0700
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-product 2015-12-12 10:53:26.627041000 -0800
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product 2015-10-24 06:21:09.000000000 -0700
@@ -21,241 +21,249 @@
# questions.
#
@@ -2314,10 +1986,7 @@
- _JNI_CreateJavaVM
- _JNI_GetCreatedJavaVMs
- _JNI_GetDefaultJavaVMInitArgs
-+ JNI_CreateJavaVM;
-+ JNI_GetCreatedJavaVMs;
-+ JNI_GetDefaultJavaVMInitArgs;
-
+-
- # _JVM
- _JVM_Accept
- _JVM_ActiveProcessorCount
@@ -2535,6 +2204,10 @@
- _JVM_Write
- _JVM_Yield
- _JVM_handle_bsd_signal
++ JNI_CreateJavaVM;
++ JNI_GetCreatedJavaVMs;
++ JNI_GetDefaultJavaVMInitArgs;
++
+ # JVM
+ JVM_Accept;
+ JVM_ActiveProcessorCount;
@@ -2777,8 +2450,8 @@
+ local:
+ *;
+};
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx Sat Sep 05 06:33:34 2015 -0700
+--- ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx 1969-12-31 16:00:00.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product.macosx 2015-10-24 06:21:09.000000000 -0700
@@ -0,0 +1,261 @@
+#
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
@@ -3041,8 +2714,8 @@
+
+ # INSERT VTABLE SYMBOLS HERE
+
---- ./hotspot/make/bsd/makefiles/optimized.make Wed Jul 01 21:52:18 2015 -0700
-+++ ./hotspot/make/bsd/makefiles/optimized.make Sat Sep 05 06:33:34 2015 -0700
+--- ./hotspot/make/bsd/makefiles/optimized.make 2014-03-03 18:52:06.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/optimized.make 2015-10-24 06:21:09.000000000 -0700
@@ -38,6 +38,9 @@
# to inhibit the effect of the previous line on CFLAGS.
@@ -3054,8 +2727,8 @@
+MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug$(MAPSUFX)
VERSION = optimized
---- ./hotspot/make/bsd/makefiles/product.make Wed Jul 01 21:52:18 2015 -0700
-+++ ./hotspot/make/bsd/makefiles/product.make Sat Sep 05 06:33:34 2015 -0700
+--- ./hotspot/make/bsd/makefiles/product.make 2014-03-03 18:52:06.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/product.make 2015-10-24 06:21:09.000000000 -0700
@@ -38,7 +38,10 @@
# to inhibit the effect of the previous line on CFLAGS.
@@ -3068,8 +2741,8 @@
SYSDEFS += -DPRODUCT
VERSION = optimized
---- ./hotspot/make/bsd/makefiles/rules.make Wed Jul 01 21:52:18 2015 -0700
-+++ ./hotspot/make/bsd/makefiles/rules.make Sat Sep 05 06:33:34 2015 -0700
+--- ./hotspot/make/bsd/makefiles/rules.make 2014-03-03 18:52:06.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/rules.make 2015-10-24 06:21:09.000000000 -0700
@@ -34,7 +34,7 @@
CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS)
CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS)
@@ -3079,8 +2752,8 @@
COMPILE.CC = $(CC_COMPILE) -c
GENASM.CC = $(CC_COMPILE) -S
---- ./hotspot/make/bsd/makefiles/vm.make Wed Jul 01 21:52:18 2015 -0700
-+++ ./hotspot/make/bsd/makefiles/vm.make Sat Sep 05 06:33:34 2015 -0700
+--- ./hotspot/make/bsd/makefiles/vm.make 2015-12-12 10:53:26.627607000 -0800
++++ ./hotspot/make/bsd/makefiles/vm.make 2015-10-24 06:21:09.000000000 -0700
@@ -107,7 +107,7 @@
# File specific flags
CXXFLAGS += $(CXXFLAGS/BYFILE)
@@ -3090,19 +2763,8 @@
CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""
endif
---- ./hotspot/make/hotspot_version Wed Jul 01 21:52:18 2015 -0700
-+++ ./hotspot/make/hotspot_version Sat Sep 05 06:33:34 2015 -0700
-@@ -35,7 +35,7 @@
-
- HS_MAJOR_VER=25
- HS_MINOR_VER=60
--HS_BUILD_NUMBER=22
-+HS_BUILD_NUMBER=23
-
- JDK_MAJOR_VER=1
- JDK_MINOR_VER=8
---- ./hotspot/src/cpu/x86/vm/jni_x86.h Wed Jul 01 21:52:18 2015 -0700
-+++ ./hotspot/src/cpu/x86/vm/jni_x86.h Sat Sep 05 06:33:34 2015 -0700
+--- ./hotspot/src/cpu/x86/vm/jni_x86.h 2014-03-03 18:52:11.000000000 -0800
++++ ./hotspot/src/cpu/x86/vm/jni_x86.h 2015-10-24 06:21:09.000000000 -0700
@@ -34,7 +34,7 @@
#ifndef __has_attribute
#define __has_attribute(x) 0
@@ -3112,8 +2774,8 @@
#define JNIEXPORT __attribute__((visibility("default")))
#define JNIIMPORT __attribute__((visibility("default")))
#else
---- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Wed Jul 01 21:52:18 2015 -0700
-+++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Sat Sep 05 06:33:34 2015 -0700
+--- ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp 2015-12-12 10:53:20.996606000 -0800
++++ ./hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp 2015-10-24 06:21:09.000000000 -0700
@@ -2266,7 +2266,7 @@
if (!is_critical_native) {
// reset handle block
@@ -3123,8 +2785,8 @@
// Any exception pending?
__ cmpptr(Address(thread, in_bytes(Thread::pending_exception_offset())), (int32_t)NULL_WORD);
---- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Wed Jul 01 21:52:18 2015 -0700
-+++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Sat Sep 05 06:33:34 2015 -0700
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list