changeset 1667:28fa502c15b1

Merge
author asaha
date Thu, 29 Oct 2015 17:02:30 -0700
parents 1f832b4b015b 5f3c76b5a83d
children a35cbc019d28
files .hgtags
diffstat 3 files changed, 36 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Oct 16 12:14:21 2015 -0700
+++ b/.hgtags	Thu Oct 29 17:02:30 2015 -0700
@@ -498,4 +498,14 @@
 1956eeeaed470cc9b46addabceb91c9900f2f83a jdk8u71-b01
 b9c864410397ae0e23219b8ab218c33c9859c592 jdk8u71-b02
 3ae95bcc5c89751e50c9181be12887ed6931e615 jdk8u71-b03
+1c87b989c16309652cec988e645dc7f277cfb56d jdk8u71-b04
+c70fdd779a6775bc5f90d60ff1feca2c90e3c2b7 jdk8u71-b05
+2c05fc89cda0befb802e838b442fc27d5b83980b jdk8u71-b06
+31a6e29ec33a9a3c6ac13ce66d3b96196700841c jdk8u72-b00
+d0afaafe3790d446d24ca35ddf61380457362b39 jdk8u72-b01
+2ffdd22b85317d3ba5ab28e34bcd288a5f18d998 jdk8u72-b02
+4270b7d818b26a67f9704b1575208876ab07f45d jdk8u72-b03
+19bf2975a37001daa2d45c171f65ae4e12d639df jdk8u72-b04
+674a69ec28a9e62b1adc90b138a4957bbc82946c jdk8u72-b05
+8c0ad72a45012464c18b4a74fdd711fe82e8842d jdk8u72-b06
 ac4e9dfd23236821432786b27566fa2f800aa3d4 jdk8u75-b00
--- a/common/autoconf/boot-jdk.m4	Fri Oct 16 12:14:21 2015 -0700
+++ b/common/autoconf/boot-jdk.m4	Thu Oct 29 17:02:30 2015 -0700
@@ -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	Fri Oct 16 12:14:21 2015 -0700
+++ b/common/autoconf/generated-configure.sh	Thu Oct 29 17:02:30 2015 -0700
@@ -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