Mercurial > hg > release > icedtea8-forest-3.0

changeset 1741:cfae5084732f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Thu, 03 Dec 2015 10:56:30 -0800
parents ae5e60bb575d (diff) 07707d0f0c78 (current diff)
children 88dabb4d7699 175b7b630a4b
files .hgtags
diffstat 4 files changed, 53 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Dec 03 10:30:33 2015 -0800
+++ b/.hgtags	Thu Dec 03 10:56:30 2015 -0800
@@ -494,8 +494,33 @@
 d45e1dc28a6ee6fd03348ee170d9895957888124 jdk8u66-b15
 5f29f2da7993f09564f6a5cb34e2799981ea96bb jdk8u66-b16
 6eab3ce957aa560f8f9080a2c9535d1ee70fc834 jdk8u66-b17
+a482cd45f31d7bf4ffc77acace705a0b9f888489 jdk8u66-b18
 e6361dcd087eef288fdeeaa17c2dbf9aa4793d5d jdk8u66-b31
 b0bbac715f3bcefc57350b653decd9806144288a jdk8u66-b32
 75d6658e00b4115648b643dcad86a6879c9c94f3 jdk8u66-b33
 2a363653a0918df1eb369f6dc637258afeb6f7d1 jdk8u66-b34
 1719690a0ee77b273a487bcc4a38a721cee3785b jdk8u66-b35
+ab2d570584a2bb01a6fedf7bd483443fdfc3d799 jdk8u71-b00
+1956eeeaed470cc9b46addabceb91c9900f2f83a jdk8u71-b01
+b9c864410397ae0e23219b8ab218c33c9859c592 jdk8u71-b02
+3ae95bcc5c89751e50c9181be12887ed6931e615 jdk8u71-b03
+1c87b989c16309652cec988e645dc7f277cfb56d jdk8u71-b04
+c70fdd779a6775bc5f90d60ff1feca2c90e3c2b7 jdk8u71-b05
+2c05fc89cda0befb802e838b442fc27d5b83980b jdk8u71-b06
+9b1bb13cc10cae3379849f341ccd0f21600de863 jdk8u71-b07
+0ed543b92df44dfcfbfd074b9d6461a50e5f198f jdk8u71-b08
+4231747bc5013bbead0cefa37ae4d2a390f2d446 jdk8u71-b09
+5b9d5e755832e86824826fda37c8e6ee4ed064f5 jdk8u71-b10
+4ad71baca90cbe089c121457a80f6693aa80b4e6 jdk8u71-b11
+31a6e29ec33a9a3c6ac13ce66d3b96196700841c jdk8u72-b00
+d0afaafe3790d446d24ca35ddf61380457362b39 jdk8u72-b01
+2ffdd22b85317d3ba5ab28e34bcd288a5f18d998 jdk8u72-b02
+4270b7d818b26a67f9704b1575208876ab07f45d jdk8u72-b03
+19bf2975a37001daa2d45c171f65ae4e12d639df jdk8u72-b04
+674a69ec28a9e62b1adc90b138a4957bbc82946c jdk8u72-b05
+8c0ad72a45012464c18b4a74fdd711fe82e8842d jdk8u72-b06
+98f42c9df8c121347367164776eff3ebd50cb91e jdk8u72-b07
+55c885702381d47704589a37f05c0f7045be4e36 jdk8u72-b08
+178589d241af764add3d4cbf6977945f65859c1d jdk8u72-b09
+bd25b660575f8ac3567b5ae2ac1e7f6b31df583e jdk8u72-b10
+3b454f1fb441a71836666b6727274a937249ca92 jdk8u72-b11
--- a/common/autoconf/boot-jdk.m4	Thu Dec 03 10:30:33 2015 -0800
+++ b/common/autoconf/boot-jdk.m4	Thu Dec 03 10:56:30 2015 -0800
@@ -289,6 +289,16 @@
   BOOT_JDK_SOURCETARGET="-source 7 -target 7"
   AC_SUBST(BOOT_JDK_SOURCETARGET)
   AC_SUBST(JAVAC_FLAGS)
+
+  # Check if the boot jdk is 32 or 64 bit
+  if "$JAVA" -d64 -version > /dev/null 2>&1; then
+    BOOT_JDK_BITS="64"
+  else
+    BOOT_JDK_BITS="32"
+  fi
+  AC_MSG_CHECKING([if Boot JDK is 32 or 64 bits])
+  AC_MSG_RESULT([$BOOT_JDK_BITS])
+  AC_SUBST(BOOT_JDK_BITS)
 ])
 
 AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
@@ -323,7 +333,7 @@
 
   # Maximum amount of heap memory.
   # Maximum stack size.
-  if test "x$BUILD_NUM_BITS" = x32; then
+  if test "x$BOOT_JDK_BITS" = x32; then
     JVM_MAX_HEAP=1100M
     STACK_SIZE=768
   else
--- a/common/autoconf/generated-configure.sh	Thu Dec 03 10:30:33 2015 -0800
+++ b/common/autoconf/generated-configure.sh	Thu Dec 03 10:56:30 2015 -0800
@@ -792,6 +792,7 @@
 JAVA_FLAGS_SMALL
 JAVA_FLAGS_BIG
 JAVA_FLAGS
+BOOT_JDK_BITS
 JAVAC_FLAGS
 BOOT_JDK_SOURCETARGET
 BOOT_JDK
@@ -3879,7 +3880,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1444076935
+DATE_WHEN_GENERATED=1445418840
 
 ###############################################################################
 #
@@ -16071,6 +16072,18 @@
 
 
 
+  # Check if the boot jdk is 32 or 64 bit
+  if "$JAVA" -d64 -version > /dev/null 2>&1; then
+    BOOT_JDK_BITS="64"
+  else
+    BOOT_JDK_BITS="32"
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Boot JDK is 32 or 64 bits" >&5
+$as_echo_n "checking if Boot JDK is 32 or 64 bits... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_BITS" >&5
+$as_echo "$BOOT_JDK_BITS" >&6; }
+
+
 
   ##############################################################################
   #
@@ -16150,7 +16163,7 @@
 
   # Maximum amount of heap memory.
   # Maximum stack size.
-  if test "x$BUILD_NUM_BITS" = x32; then
+  if test "x$BOOT_JDK_BITS" = x32; then
     JVM_MAX_HEAP=1100M
     STACK_SIZE=768
   else
--- a/make/Javadoc.gmk	Thu Dec 03 10:30:33 2015 -0800
+++ b/make/Javadoc.gmk	Thu Dec 03 10:56:30 2015 -0800
@@ -258,6 +258,8 @@
 with conceptual overviews, definitions of terms, workarounds, \
 and working code examples.<br>\
 $(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
+Use is subject to <a href="http://download.oracle.com/otndocs/jcp/java_se-8-mrel-spec/license.html">license terms</a>. \
+Also see the <a target="_blank" href="http://www.oracle.com/technetwork/java/redist-137594.html">documentation redistribution policy</a>.\
 </font>
 
 # Common javadoc options used by all