diff options
| -rw-r--r-- | .hgtags | 14 | ||||
| -rw-r--r-- | common/autoconf/boot-jdk.m4 | 12 | ||||
| -rw-r--r-- | common/autoconf/generated-configure.sh | 17 |
3 files changed, 40 insertions, 3 deletions
@@ -510,3 +510,17 @@ c70fdd779a6775bc5f90d60ff1feca2c90e3c2b7 jdk8u71-b05 4d09473111deb8fd6323df6f9e9536084cae2844 jdk8u71-b12 4f9e7b1a4e04f2ae44c1f6501e4444b82c45afff jdk8u71-b13 1397b1bae600666de90459de7fba3576bb99eeb8 jdk8u71-b14 +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 +e831ce671fb072501670ee593e1080659cbc9804 jdk8u72-b12 +8f5ca46a90af013525cbdf3b023727450cdb8119 jdk8u72-b13 diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4 index fa2dfc9..ace6f7d 100644 --- a/common/autoconf/boot-jdk.m4 +++ b/common/autoconf/boot-jdk.m4 @@ -289,6 +289,16 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK], 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 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS], # 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 diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 0848db3..3dbbbd7 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -792,6 +792,7 @@ LANGTOOLS_TOPDIR JAVA_FLAGS_SMALL JAVA_FLAGS_BIG JAVA_FLAGS +BOOT_JDK_BITS JAVAC_FLAGS BOOT_JDK_SOURCETARGET BOOT_JDK @@ -3879,7 +3880,7 @@ fi #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 @@ $as_echo "ok" >&6; } + # 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 @@ $as_echo_n "checking flags for boot jdk java command for big workloads... " >&6; # 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 |