Blame SOURCES/java-1.8.0-openjdk-s390-java-opts.patch

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