diff options
| author | robm <none@none> | 2015-10-22 22:47:47 +0100 |
|---|---|---|
| committer | robm <none@none> | 2015-10-22 22:47:47 +0100 |
| commit | df53c131a30a320416718226834c7eaf8e1e42cf (patch) | |
| tree | 93ccc007dced5b16cea0c2c7edb710b1f74ce791 | |
| parent | 4080b853bed4b898647397665d7072a6665a601a (diff) | |
| parent | 74b649e55c5576589a177b86666449ad7f41f499 (diff) | |
| download | jdk8u-df53c131a30a320416718226834c7eaf8e1e42cf.tar.gz | |
Merge
| -rw-r--r-- | common/autoconf/boot-jdk.m4 | 12 | ||||
| -rw-r--r-- | common/autoconf/generated-configure.sh | 17 |
2 files changed, 26 insertions, 3 deletions
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 |