|
 |
74b02f5 |
--- openjdk.orig/common/autoconf/boot-jdk.m4 2016-01-21 18:33:47.586288044 +0000
|
|
|
74b02f5 |
+++ openjdk/common/autoconf/boot-jdk.m4 2016-02-05 15:56:09.012242707 +0000
|
|
|
74b02f5 |
@@ -1,5 +1,6 @@
|
|
|
74b02f5 |
#
|
|
|
74b02f5 |
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
|
|
|
74b02f5 |
+# Copyright 2014 Red Hat, Inc.
|
|
|
74b02f5 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
|
74b02f5 |
#
|
|
|
74b02f5 |
# This code is free software; you can redistribute it and/or modify it
|
|
|
74b02f5 |
@@ -303,6 +323,9 @@
|
|
|
74b02f5 |
|
|
|
74b02f5 |
AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
|
|
|
74b02f5 |
[
|
|
|
74b02f5 |
+ # Ensure OPENJDK_TARGET_CPU_ARCH has been setup
|
|
|
74b02f5 |
+ AC_REQUIRE([PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET])
|
|
|
74b02f5 |
+
|
|
|
74b02f5 |
##############################################################################
|
|
|
74b02f5 |
#
|
|
|
74b02f5 |
# Specify options for anything that is run with the Boot JDK.
|
|
|
74b02f5 |
@@ -325,16 +348,23 @@
|
|
|
74b02f5 |
JAVA_FLAGS=$boot_jdk_jvmargs
|
|
|
74b02f5 |
AC_SUBST(JAVA_FLAGS)
|
|
|
74b02f5 |
|
|
|
74b02f5 |
-
|
|
|
74b02f5 |
AC_MSG_CHECKING([flags for boot jdk java command for big workloads])
|
|
|
74b02f5 |
|
|
|
74b02f5 |
# Starting amount of heap memory.
|
|
|
74b02f5 |
- ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
|
|
|
74b02f5 |
+ if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
|
|
|
74b02f5 |
+ ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs_big,[$JAVA])
|
|
|
74b02f5 |
+ else
|
|
|
74b02f5 |
+ ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
|
|
|
74b02f5 |
+ fi
|
|
|
74b02f5 |
|
|
|
74b02f5 |
# Maximum amount of heap memory.
|
|
|
74b02f5 |
# Maximum stack size.
|
|
|
74b02f5 |
if test "x$BOOT_JDK_BITS" = x32; then
|
|
|
74b02f5 |
- JVM_MAX_HEAP=1100M
|
|
|
74b02f5 |
+ if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
|
|
|
74b02f5 |
+ JVM_MAX_HEAP=768M
|
|
|
74b02f5 |
+ else
|
|
|
74b02f5 |
+ JVM_MAX_HEAP=1100M
|
|
|
74b02f5 |
+ fi
|
|
|
74b02f5 |
STACK_SIZE=768
|
|
|
74b02f5 |
else
|
|
|
74b02f5 |
# Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
|