--- openjdk/common/autoconf/boot-jdk.m4	2017-01-25 05:18:48.000000000 +0100
+++ openjdk/common/autoconf/boot-jdk.m4	2017-01-30 08:38:38.677272517 +0100
@@ -351,7 +351,7 @@
   AC_MSG_CHECKING([flags for boot jdk java command for big workloads])
 
   # Starting amount of heap memory.
-  if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
+  if test "x$OPENJDK_BUILD_CPU" = "xs390"; then
     ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs_big,[$JAVA])
   else
     ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
@@ -360,7 +360,7 @@
   # Maximum amount of heap memory.
   # Maximum stack size.
   if test "x$BOOT_JDK_BITS" = x32; then
-    if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
+    if test "x$OPENJDK_BUILD_CPU" = "xs390"; then
       JVM_MAX_HEAP=768M
     else
       JVM_MAX_HEAP=1100M