--- a/.hgtags-top-repo Fri Jan 25 02:36:28 2013 -0800
+++ b/.hgtags-top-repo Wed Jul 05 18:37:42 2017 +0200
@@ -195,3 +195,4 @@
51ad2a34342055333eb5f36e2fb514b027895708 jdk8-b71
c1be681d80a1f1c848dc671d664fccb19e046a12 jdk8-b72
93b9664f97eeb6f89397a8842318ebacaac9feb9 jdk8-b73
+b43aa5bd8ca5c8121336495382d35ecfa7a71536 jdk8-b74
--- a/common/autoconf/generated-configure.sh Fri Jan 25 02:36:28 2013 -0800
+++ b/common/autoconf/generated-configure.sh Wed Jul 05 18:37:42 2017 +0200
@@ -3723,7 +3723,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1358499442
+DATE_WHEN_GENERATED=1359376859
###############################################################################
#
--- a/common/autoconf/jdk-options.m4 Fri Jan 25 02:36:28 2013 -0800
+++ b/common/autoconf/jdk-options.m4 Wed Jul 05 18:37:42 2017 +0200
@@ -389,7 +389,8 @@
AC_MSG_ERROR([Milestone must have a value])
elif test "x$with_milestone" != x; then
MILESTONE="$with_milestone"
-else
+fi
+if test "x$MILESTONE" = x; then
MILESTONE=internal
fi
--- a/common/autoconf/libraries.m4 Fri Jan 25 02:36:28 2013 -0800
+++ b/common/autoconf/libraries.m4 Wed Jul 05 18:37:42 2017 +0200
@@ -136,6 +136,12 @@
AC_PATH_X
AC_PATH_XTRA
+# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
+# this doesn't make sense so we remove it.
+if test "x$COMPILE_TYPE" = xcross; then
+ X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[[^ ]]*//g'`
+fi
+
if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
HELP_MSG_MISSING_DEPENDENCY([x11])
AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
--- a/common/bin/compare.sh Fri Jan 25 02:36:28 2013 -0800
+++ b/common/bin/compare.sh Wed Jul 05 18:37:42 2017 +0200
@@ -350,9 +350,15 @@
OTHER_DIR=$2
WORK_DIR=$3
ZIP_FILE=$4
+ # Optionally provide different name for other zipfile
+ OTHER_ZIP_FILE=$5
THIS_ZIP=$THIS_DIR/$ZIP_FILE
- OTHER_ZIP=$OTHER_DIR/$ZIP_FILE
+ if [ -n "$OTHER_ZIP_FILE" ]; then
+ OTHER_ZIP=$OTHER_DIR/$OTHER_ZIP_FILE
+ else
+ OTHER_ZIP=$OTHER_DIR/$ZIP_FILE
+ fi
THIS_SUFFIX="${THIS_ZIP##*.}"
OTHER_SUFFIX="${OTHER_ZIP##*.}"
@@ -962,6 +968,9 @@
echo "[FILTER] List filenames in the image to compare, works for jars, zips, libs and execs"
echo "Example:"
echo "bash ./common/bin/compareimages.sh CodePointIM.jar"
+ echo ""
+ echo "-2zips <file1> <file2> Compare two zip files only"
+ echo ""
exit 10
fi
@@ -1023,6 +1032,13 @@
-execs)
CMP_EXECS=true
;;
+ -2zips)
+ CMP_2_ZIPS=true
+ THIS_FILE=$2
+ OTHER_FILE=$3
+ shift
+ shift
+ ;;
*)
CMP_NAMES=false
CMP_PERMS=false
@@ -1041,6 +1057,18 @@
shift
done
+if [ "$CMP_2_ZIPS" = "true" ]; then
+ THIS_DIR="$(dirname $THIS_FILE)"
+ THIS_DIR="$(cd "$THIS_DIR" && pwd )"
+ OTHER_DIR="$(dirname $OTHER_FILE)"
+ OTHER_DIR="$(cd "$OTHER_DIR" && pwd )"
+ THIS_FILE_NAME="$(basename $THIS_FILE)"
+ OTHER_FILE_NAME="$(basename $OTHER_FILE)"
+ echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME
+ compare_zip_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2zips $THIS_FILE_NAME $OTHER_FILE_NAME
+ exit
+fi
+
if [ "$CMP_NAMES" = "false" ] && [ "$CMP_TYPES" = "false" ] && [ "$CMP_PERMS" = "false" ] && [ "$CMP_GENERAL" = "false" ] && [ "$CMP_ZIPS" = "false" ] && [ "$CMP_JARS" = "false" ] && [ "$CMP_LIBS" = "false" ] && [ "$CMP_EXECS" = "false" ]; then
CMP_NAMES=true
CMP_PERMS=true
--- a/common/bin/compare_exceptions.sh.incl Fri Jan 25 02:36:28 2013 -0800
+++ b/common/bin/compare_exceptions.sh.incl Wed Jul 05 18:37:42 2017 +0200
@@ -887,6 +887,17 @@
./jre/bin/unpack200.exe
"
+# jabswitch.exe is compiled and linked with incremental turned on in the old
+# build. This makes no sense, so it's turned off in the new build.
+ACCEPTED_SIZE_DIFF="
+./bin/jabswitch.exe
+./jre/bin/jabswitch.exe
+"
+ACCEPTED_DIS_DIFF="
+./bin/jabswitch.exe
+./jre/bin/jabswitch.exe
+"
+
# On windows, there are unavoidable allignment issues making
# a perfect disasm diff impossible. Filter out the following:
# * Random parts of C++ symbols (this is a bit greedy, but does the trick)
--- a/common/makefiles/javadoc/CORE_PKGS.gmk Fri Jan 25 02:36:28 2013 -0800
+++ b/common/makefiles/javadoc/CORE_PKGS.gmk Wed Jul 05 18:37:42 2017 +0200
@@ -127,6 +127,11 @@
java.sql \
java.text \
java.text.spi \
+ java.time \
+ java.time.temporal \
+ java.time.calendar \
+ java.time.format \
+ java.time.zone \
java.util \
java.util.concurrent \
java.util.concurrent.atomic \
--- a/common/makefiles/javadoc/Javadoc.gmk Fri Jan 25 02:36:28 2013 -0800
+++ b/common/makefiles/javadoc/Javadoc.gmk Wed Jul 05 18:37:42 2017 +0200
@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -269,6 +269,7 @@
-quiet \
-use \
-keywords \
+ -Xdoclint:none \
$(ADDITIONAL_JAVADOCFLAGS)
ifdef OPENJDK
--- a/make/jprt.properties Fri Jan 25 02:36:28 2013 -0800
+++ b/make/jprt.properties Wed Jul 05 18:37:42 2017 +0200
@@ -92,6 +92,7 @@
${jprt.my.test.target.set:TESTNAME=jdk_text}, \
${jprt.my.test.target.set:TESTNAME=jdk_tools}, \
${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_time}, \
${jprt.my.test.target.set:TESTNAME=jdk_other}
# All vm test targets (testset=all)
--- a/test/Makefile Fri Jan 25 02:36:28 2013 -0800
+++ b/test/Makefile Wed Jul 05 18:37:42 2017 +0200
@@ -63,7 +63,8 @@
jdk_nio \
jdk_security1 \
jdk_text \
- jdk_util
+ jdk_util \
+ jdk_time
# These tests are not part of the default testing list
JDK_NONDEFAULT_TEST_LIST = \