/[packages]/updates/5/java-1.8.0-openjdk/current/SOURCES/java-1.8.0-openjdk-s390-java-opts.patch
ViewVC logotype

Diff of /updates/5/java-1.8.0-openjdk/current/SOURCES/java-1.8.0-openjdk-s390-java-opts.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 995481 by umeabot, Thu Jun 18 23:00:04 2015 UTC revision 995482 by luigiwalser, Fri Mar 25 15:48:52 2016 UTC
# Line 1  Line 1 
1  diff -up jdk8/common/autoconf/boot-jdk.m4.s390 jdk8/common/autoconf/boot-jdk.m4  --- openjdk.orig/common/autoconf/boot-jdk.m4    2016-01-21 18:33:47.586288044 +0000
2  --- jdk8/common/autoconf/boot-jdk.m4.s390       2014-10-28 13:10:36.000000000 -0400  +++ openjdk/common/autoconf/boot-jdk.m4 2016-02-05 15:56:09.012242707 +0000
3  +++ jdk8/common/autoconf/boot-jdk.m4    2015-01-09 15:49:45.443809100 -0500  @@ -1,5 +1,6 @@
4  @@ -319,21 +319,12 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR   #
5     # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
6    +# Copyright 2014 Red Hat, Inc.
7     # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
8     #
9     # This code is free software; you can redistribute it and/or modify it
10    @@ -303,6 +323,9 @@
11    
12     AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
13     [
14    +  # Ensure OPENJDK_TARGET_CPU_ARCH has been setup
15    +  AC_REQUIRE([PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET])
16    +
17       ##############################################################################
18       #
19       # Specify options for anything that is run with the Boot JDK.
20    @@ -325,16 +348,23 @@
21       JAVA_FLAGS=$boot_jdk_jvmargs
22       AC_SUBST(JAVA_FLAGS)
23    
24    -
25     AC_MSG_CHECKING([flags for boot jdk java command for big workloads])     AC_MSG_CHECKING([flags for boot jdk java command for big workloads])
26    
27     # Starting amount of heap memory.     # Starting amount of heap memory.
28  -  ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])  -  ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
29  +  ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs_big,[$JAVA])  +  if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
30    +    ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs_big,[$JAVA])
31    +  else
32    +    ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
33    +  fi
34    
35     # Maximum amount of heap memory.     # Maximum amount of heap memory.
36     # Maximum stack size.     # Maximum stack size.
37  -  if test "x$BUILD_NUM_BITS" = x32; then     if test "x$BOOT_JDK_BITS" = x32; then
38  -    JVM_MAX_HEAP=1100M  -    JVM_MAX_HEAP=1100M
39  +    JVM_MAX_HEAP=768M  +    if test "x$OPENJDK_BUILD_CPU_ARCH" = "xs390"; then
40    +      JVM_MAX_HEAP=768M
41    +    else
42    +      JVM_MAX_HEAP=1100M
43    +    fi
44       STACK_SIZE=768       STACK_SIZE=768
45  -  else     else
46  -    # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit       # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
 -    # pointers are used. Apparently, we need to increase the heap and stack  
 -    # space for the jvm. More specifically, when running javac to build huge  
 -    # jdk batch  
 -    JVM_MAX_HEAP=1600M  
 -    STACK_SIZE=1536  
 -  fi  
    ADD_JVM_ARG_IF_OK([-Xmx$JVM_MAX_HEAP],boot_jdk_jvmargs_big,[$JAVA])  
    ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA])  
    ADD_JVM_ARG_IF_OK([-XX:PermSize=32m],boot_jdk_jvmargs_big,[$JAVA])  
Legend:
Removed from v.995481  
changed lines
  Added in v.995482
  ViewVC Help
Powered by ViewVC 1.1.30