Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Wed, 22 Oct 2014 12:28:55 -0700
- author
- lana
- date
- Wed, 22 Oct 2014 12:28:55 -0700
- changeset 1189
- 89d06f82edb7
- parent 1186
- 7cb07a444411
- parent 1188
- f2a095cc352b
- child 1193
- 3e6d3c8810ee
- child 1195
- 0b10f76c8834
Merge
1.1 --- a/common/autoconf/boot-jdk.m4 Wed Oct 22 11:18:15 2014 -0700 1.2 +++ b/common/autoconf/boot-jdk.m4 Wed Oct 22 12:28:55 2014 -0700 1.3 @@ -301,35 +301,59 @@ 1.4 [specify JVM arguments to be passed to all invocations of the Boot JDK, overriding the default values, 1.5 e.g --with-boot-jdk-jvmargs="-Xmx8G -enableassertions"])]) 1.6 1.7 - if test "x$with_boot_jdk_jvmargs" = x; then 1.8 - # Not all JVM:s accept the same arguments on the command line. 1.9 - # OpenJDK specific increase in thread stack for JDK build, 1.10 - # well more specifically, when running javac. 1.11 - if test "x$BUILD_NUM_BITS" = x32; then 1.12 - STACK_SIZE=768 1.13 - else 1.14 - # Running Javac on a JVM on a 64-bit machine, the stack takes more space 1.15 - # since 64-bit pointers are pushed on the stach. Apparently, we need 1.16 - # to increase the stack space when javacing the JDK.... 1.17 - STACK_SIZE=1536 1.18 - fi 1.19 + AC_MSG_CHECKING([flags for boot jdk java command] ) 1.20 1.21 - # Minimum amount of heap memory. 1.22 - ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs,[$JAVA]) 1.23 - if test "x$OPENJDK_TARGET_OS" = "xmacosx" || test "x$OPENJDK_TARGET_CPU" = "xppc64" ; then 1.24 - # Why does macosx need more heap? Its the huge JDK batch. 1.25 - ADD_JVM_ARG_IF_OK([-Xmx1600M],boot_jdk_jvmargs,[$JAVA]) 1.26 - else 1.27 - ADD_JVM_ARG_IF_OK([-Xmx1100M],boot_jdk_jvmargs,[$JAVA]) 1.28 - fi 1.29 - # When is adding -client something that speeds up the JVM? 1.30 - # ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA]) 1.31 - ADD_JVM_ARG_IF_OK([-XX:PermSize=32m],boot_jdk_jvmargs,[$JAVA]) 1.32 - ADD_JVM_ARG_IF_OK([-XX:MaxPermSize=160m],boot_jdk_jvmargs,[$JAVA]) 1.33 - ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs,[$JAVA]) 1.34 - # Disable special log output when a debug build is used as Boot JDK... 1.35 - ADD_JVM_ARG_IF_OK([-XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput],boot_jdk_jvmargs,[$JAVA]) 1.36 + # Disable special log output when a debug build is used as Boot JDK... 1.37 + ADD_JVM_ARG_IF_OK([-XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput],boot_jdk_jvmargs,[$JAVA]) 1.38 + 1.39 + # Apply user provided options. 1.40 + ADD_JVM_ARG_IF_OK([$with_boot_jdk_jvmargs],boot_jdk_jvmargs,[$JAVA]) 1.41 + 1.42 + AC_MSG_RESULT([$boot_jdk_jvmargs]) 1.43 + 1.44 + # For now, general JAVA_FLAGS are the same as the boot jdk jvmargs 1.45 + JAVA_FLAGS=$boot_jdk_jvmargs 1.46 + AC_SUBST(JAVA_FLAGS) 1.47 + 1.48 + 1.49 + AC_MSG_CHECKING([flags for boot jdk java command for big workloads]) 1.50 + 1.51 + # Starting amount of heap memory. 1.52 + ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA]) 1.53 + 1.54 + # Maximum amount of heap memory. 1.55 + # Maximum stack size. 1.56 + if test "x$BUILD_NUM_BITS" = x32; then 1.57 + JVM_MAX_HEAP=1100M 1.58 + STACK_SIZE=768 1.59 + else 1.60 + # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit 1.61 + # pointers are used. Apparently, we need to increase the heap and stack 1.62 + # space for the jvm. More specifically, when running javac to build huge 1.63 + # jdk batch 1.64 + JVM_MAX_HEAP=1600M 1.65 + STACK_SIZE=1536 1.66 fi 1.67 + ADD_JVM_ARG_IF_OK([-Xmx$JVM_MAX_HEAP],boot_jdk_jvmargs_big,[$JAVA]) 1.68 + ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA]) 1.69 + ADD_JVM_ARG_IF_OK([-XX:PermSize=32m],boot_jdk_jvmargs_big,[$JAVA]) 1.70 + ADD_JVM_ARG_IF_OK([-XX:MaxPermSize=160m],boot_jdk_jvmargs_big,[$JAVA]) 1.71 1.72 - AC_SUBST(BOOT_JDK_JVMARGS, $boot_jdk_jvmargs) 1.73 + AC_MSG_RESULT([$boot_jdk_jvmargs_big]) 1.74 + 1.75 + JAVA_FLAGS_BIG=$boot_jdk_jvmargs_big 1.76 + AC_SUBST(JAVA_FLAGS_BIG) 1.77 + 1.78 + 1.79 + AC_MSG_CHECKING([flags for boot jdk java command for small workloads]) 1.80 + 1.81 + # Use serial gc for small short lived tools if possible 1.82 + ADD_JVM_ARG_IF_OK([-XX:+UseSerialGC],boot_jdk_jvmargs_small,[$JAVA]) 1.83 + ADD_JVM_ARG_IF_OK([-Xms32M],boot_jdk_jvmargs_small,[$JAVA]) 1.84 + ADD_JVM_ARG_IF_OK([-Xmx512M],boot_jdk_jvmargs_small,[$JAVA]) 1.85 + 1.86 + AC_MSG_RESULT([$boot_jdk_jvmargs_small]) 1.87 + 1.88 + JAVA_FLAGS_SMALL=$boot_jdk_jvmargs_small 1.89 + AC_SUBST(JAVA_FLAGS_SMALL) 1.90 ])
2.1 --- a/common/autoconf/generated-configure.sh Wed Oct 22 11:18:15 2014 -0700 2.2 +++ b/common/autoconf/generated-configure.sh Wed Oct 22 12:28:55 2014 -0700 2.3 @@ -786,7 +786,9 @@ 2.4 JAXP_TOPDIR 2.5 CORBA_TOPDIR 2.6 LANGTOOLS_TOPDIR 2.7 -BOOT_JDK_JVMARGS 2.8 +JAVA_FLAGS_SMALL 2.9 +JAVA_FLAGS_BIG 2.10 +JAVA_FLAGS 2.11 JAVAC_FLAGS 2.12 BOOT_JDK_SOURCETARGET 2.13 BOOT_JDK 2.14 @@ -3868,7 +3870,7 @@ 2.15 #CUSTOM_AUTOCONF_INCLUDE 2.16 2.17 # Do not change or remove the following line, it is needed for consistency checks: 2.18 -DATE_WHEN_GENERATED=1411155242 2.19 +DATE_WHEN_GENERATED=1413192141 2.20 2.21 ############################################################################### 2.22 # 2.23 @@ -16072,117 +16074,10 @@ 2.24 fi 2.25 2.26 2.27 - if test "x$with_boot_jdk_jvmargs" = x; then 2.28 - # Not all JVM:s accept the same arguments on the command line. 2.29 - # OpenJDK specific increase in thread stack for JDK build, 2.30 - # well more specifically, when running javac. 2.31 - if test "x$BUILD_NUM_BITS" = x32; then 2.32 - STACK_SIZE=768 2.33 - else 2.34 - # Running Javac on a JVM on a 64-bit machine, the stack takes more space 2.35 - # since 64-bit pointers are pushed on the stach. Apparently, we need 2.36 - # to increase the stack space when javacing the JDK.... 2.37 - STACK_SIZE=1536 2.38 - fi 2.39 - 2.40 - # Minimum amount of heap memory. 2.41 - 2.42 - $ECHO "Check if jvm arg is ok: -Xms64M" >&5 2.43 - $ECHO "Command: $JAVA -Xms64M -version" >&5 2.44 - OUTPUT=`$JAVA -Xms64M -version 2>&1` 2.45 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 2.46 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 2.47 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 2.48 - boot_jdk_jvmargs="$boot_jdk_jvmargs -Xms64M" 2.49 - JVM_ARG_OK=true 2.50 - else 2.51 - $ECHO "Arg failed:" >&5 2.52 - $ECHO "$OUTPUT" >&5 2.53 - JVM_ARG_OK=false 2.54 - fi 2.55 - 2.56 - if test "x$OPENJDK_TARGET_OS" = "xmacosx" || test "x$OPENJDK_TARGET_CPU" = "xppc64" ; then 2.57 - # Why does macosx need more heap? Its the huge JDK batch. 2.58 - 2.59 - $ECHO "Check if jvm arg is ok: -Xmx1600M" >&5 2.60 - $ECHO "Command: $JAVA -Xmx1600M -version" >&5 2.61 - OUTPUT=`$JAVA -Xmx1600M -version 2>&1` 2.62 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 2.63 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 2.64 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 2.65 - boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1600M" 2.66 - JVM_ARG_OK=true 2.67 - else 2.68 - $ECHO "Arg failed:" >&5 2.69 - $ECHO "$OUTPUT" >&5 2.70 - JVM_ARG_OK=false 2.71 - fi 2.72 - 2.73 - else 2.74 - 2.75 - $ECHO "Check if jvm arg is ok: -Xmx1100M" >&5 2.76 - $ECHO "Command: $JAVA -Xmx1100M -version" >&5 2.77 - OUTPUT=`$JAVA -Xmx1100M -version 2>&1` 2.78 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 2.79 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 2.80 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 2.81 - boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1100M" 2.82 - JVM_ARG_OK=true 2.83 - else 2.84 - $ECHO "Arg failed:" >&5 2.85 - $ECHO "$OUTPUT" >&5 2.86 - JVM_ARG_OK=false 2.87 - fi 2.88 - 2.89 - fi 2.90 - # When is adding -client something that speeds up the JVM? 2.91 - # ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA]) 2.92 - 2.93 - $ECHO "Check if jvm arg is ok: -XX:PermSize=32m" >&5 2.94 - $ECHO "Command: $JAVA -XX:PermSize=32m -version" >&5 2.95 - OUTPUT=`$JAVA -XX:PermSize=32m -version 2>&1` 2.96 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 2.97 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 2.98 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 2.99 - boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:PermSize=32m" 2.100 - JVM_ARG_OK=true 2.101 - else 2.102 - $ECHO "Arg failed:" >&5 2.103 - $ECHO "$OUTPUT" >&5 2.104 - JVM_ARG_OK=false 2.105 - fi 2.106 - 2.107 - 2.108 - $ECHO "Check if jvm arg is ok: -XX:MaxPermSize=160m" >&5 2.109 - $ECHO "Command: $JAVA -XX:MaxPermSize=160m -version" >&5 2.110 - OUTPUT=`$JAVA -XX:MaxPermSize=160m -version 2>&1` 2.111 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 2.112 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 2.113 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 2.114 - boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:MaxPermSize=160m" 2.115 - JVM_ARG_OK=true 2.116 - else 2.117 - $ECHO "Arg failed:" >&5 2.118 - $ECHO "$OUTPUT" >&5 2.119 - JVM_ARG_OK=false 2.120 - fi 2.121 - 2.122 - 2.123 - $ECHO "Check if jvm arg is ok: -XX:ThreadStackSize=$STACK_SIZE" >&5 2.124 - $ECHO "Command: $JAVA -XX:ThreadStackSize=$STACK_SIZE -version" >&5 2.125 - OUTPUT=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1` 2.126 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 2.127 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 2.128 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 2.129 - boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:ThreadStackSize=$STACK_SIZE" 2.130 - JVM_ARG_OK=true 2.131 - else 2.132 - $ECHO "Arg failed:" >&5 2.133 - $ECHO "$OUTPUT" >&5 2.134 - JVM_ARG_OK=false 2.135 - fi 2.136 - 2.137 - # Disable special log output when a debug build is used as Boot JDK... 2.138 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking flags for boot jdk java command " >&5 2.139 +$as_echo_n "checking flags for boot jdk java command ... " >&6; } 2.140 + 2.141 + # Disable special log output when a debug build is used as Boot JDK... 2.142 2.143 $ECHO "Check if jvm arg is ok: -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput" >&5 2.144 $ECHO "Command: $JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version" >&5 2.145 @@ -16198,9 +16093,187 @@ 2.146 JVM_ARG_OK=false 2.147 fi 2.148 2.149 - fi 2.150 - 2.151 - BOOT_JDK_JVMARGS=$boot_jdk_jvmargs 2.152 + 2.153 + # Apply user provided options. 2.154 + 2.155 + $ECHO "Check if jvm arg is ok: $with_boot_jdk_jvmargs" >&5 2.156 + $ECHO "Command: $JAVA $with_boot_jdk_jvmargs -version" >&5 2.157 + OUTPUT=`$JAVA $with_boot_jdk_jvmargs -version 2>&1` 2.158 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 2.159 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 2.160 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 2.161 + boot_jdk_jvmargs="$boot_jdk_jvmargs $with_boot_jdk_jvmargs" 2.162 + JVM_ARG_OK=true 2.163 + else 2.164 + $ECHO "Arg failed:" >&5 2.165 + $ECHO "$OUTPUT" >&5 2.166 + JVM_ARG_OK=false 2.167 + fi 2.168 + 2.169 + 2.170 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boot_jdk_jvmargs" >&5 2.171 +$as_echo "$boot_jdk_jvmargs" >&6; } 2.172 + 2.173 + # For now, general JAVA_FLAGS are the same as the boot jdk jvmargs 2.174 + JAVA_FLAGS=$boot_jdk_jvmargs 2.175 + 2.176 + 2.177 + 2.178 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking flags for boot jdk java command for big workloads" >&5 2.179 +$as_echo_n "checking flags for boot jdk java command for big workloads... " >&6; } 2.180 + 2.181 + # Starting amount of heap memory. 2.182 + 2.183 + $ECHO "Check if jvm arg is ok: -Xms64M" >&5 2.184 + $ECHO "Command: $JAVA -Xms64M -version" >&5 2.185 + OUTPUT=`$JAVA -Xms64M -version 2>&1` 2.186 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 2.187 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 2.188 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 2.189 + boot_jdk_jvmargs_big="$boot_jdk_jvmargs_big -Xms64M" 2.190 + JVM_ARG_OK=true 2.191 + else 2.192 + $ECHO "Arg failed:" >&5 2.193 + $ECHO "$OUTPUT" >&5 2.194 + JVM_ARG_OK=false 2.195 + fi 2.196 + 2.197 + 2.198 + # Maximum amount of heap memory. 2.199 + # Maximum stack size. 2.200 + if test "x$BUILD_NUM_BITS" = x32; then 2.201 + JVM_MAX_HEAP=1100M 2.202 + STACK_SIZE=768 2.203 + else 2.204 + # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit 2.205 + # pointers are used. Apparently, we need to increase the heap and stack 2.206 + # space for the jvm. More specifically, when running javac to build huge 2.207 + # jdk batch 2.208 + JVM_MAX_HEAP=1600M 2.209 + STACK_SIZE=1536 2.210 + fi 2.211 + 2.212 + $ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5 2.213 + $ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5 2.214 + OUTPUT=`$JAVA -Xmx$JVM_MAX_HEAP -version 2>&1` 2.215 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 2.216 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 2.217 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 2.218 + boot_jdk_jvmargs_big="$boot_jdk_jvmargs_big -Xmx$JVM_MAX_HEAP" 2.219 + JVM_ARG_OK=true 2.220 + else 2.221 + $ECHO "Arg failed:" >&5 2.222 + $ECHO "$OUTPUT" >&5 2.223 + JVM_ARG_OK=false 2.224 + fi 2.225 + 2.226 + 2.227 + $ECHO "Check if jvm arg is ok: -XX:ThreadStackSize=$STACK_SIZE" >&5 2.228 + $ECHO "Command: $JAVA -XX:ThreadStackSize=$STACK_SIZE -version" >&5 2.229 + OUTPUT=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1` 2.230 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 2.231 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 2.232 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 2.233 + boot_jdk_jvmargs_big="$boot_jdk_jvmargs_big -XX:ThreadStackSize=$STACK_SIZE" 2.234 + JVM_ARG_OK=true 2.235 + else 2.236 + $ECHO "Arg failed:" >&5 2.237 + $ECHO "$OUTPUT" >&5 2.238 + JVM_ARG_OK=false 2.239 + fi 2.240 + 2.241 + 2.242 + $ECHO "Check if jvm arg is ok: -XX:PermSize=32m" >&5 2.243 + $ECHO "Command: $JAVA -XX:PermSize=32m -version" >&5 2.244 + OUTPUT=`$JAVA -XX:PermSize=32m -version 2>&1` 2.245 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 2.246 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 2.247 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 2.248 + boot_jdk_jvmargs_big="$boot_jdk_jvmargs_big -XX:PermSize=32m" 2.249 + JVM_ARG_OK=true 2.250 + else 2.251 + $ECHO "Arg failed:" >&5 2.252 + $ECHO "$OUTPUT" >&5 2.253 + JVM_ARG_OK=false 2.254 + fi 2.255 + 2.256 + 2.257 + $ECHO "Check if jvm arg is ok: -XX:MaxPermSize=160m" >&5 2.258 + $ECHO "Command: $JAVA -XX:MaxPermSize=160m -version" >&5 2.259 + OUTPUT=`$JAVA -XX:MaxPermSize=160m -version 2>&1` 2.260 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 2.261 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 2.262 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 2.263 + boot_jdk_jvmargs_big="$boot_jdk_jvmargs_big -XX:MaxPermSize=160m" 2.264 + JVM_ARG_OK=true 2.265 + else 2.266 + $ECHO "Arg failed:" >&5 2.267 + $ECHO "$OUTPUT" >&5 2.268 + JVM_ARG_OK=false 2.269 + fi 2.270 + 2.271 + 2.272 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boot_jdk_jvmargs_big" >&5 2.273 +$as_echo "$boot_jdk_jvmargs_big" >&6; } 2.274 + 2.275 + JAVA_FLAGS_BIG=$boot_jdk_jvmargs_big 2.276 + 2.277 + 2.278 + 2.279 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking flags for boot jdk java command for small workloads" >&5 2.280 +$as_echo_n "checking flags for boot jdk java command for small workloads... " >&6; } 2.281 + 2.282 + # Use serial gc for small short lived tools if possible 2.283 + 2.284 + $ECHO "Check if jvm arg is ok: -XX:+UseSerialGC" >&5 2.285 + $ECHO "Command: $JAVA -XX:+UseSerialGC -version" >&5 2.286 + OUTPUT=`$JAVA -XX:+UseSerialGC -version 2>&1` 2.287 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 2.288 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 2.289 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 2.290 + boot_jdk_jvmargs_small="$boot_jdk_jvmargs_small -XX:+UseSerialGC" 2.291 + JVM_ARG_OK=true 2.292 + else 2.293 + $ECHO "Arg failed:" >&5 2.294 + $ECHO "$OUTPUT" >&5 2.295 + JVM_ARG_OK=false 2.296 + fi 2.297 + 2.298 + 2.299 + $ECHO "Check if jvm arg is ok: -Xms32M" >&5 2.300 + $ECHO "Command: $JAVA -Xms32M -version" >&5 2.301 + OUTPUT=`$JAVA -Xms32M -version 2>&1` 2.302 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 2.303 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 2.304 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 2.305 + boot_jdk_jvmargs_small="$boot_jdk_jvmargs_small -Xms32M" 2.306 + JVM_ARG_OK=true 2.307 + else 2.308 + $ECHO "Arg failed:" >&5 2.309 + $ECHO "$OUTPUT" >&5 2.310 + JVM_ARG_OK=false 2.311 + fi 2.312 + 2.313 + 2.314 + $ECHO "Check if jvm arg is ok: -Xmx512M" >&5 2.315 + $ECHO "Command: $JAVA -Xmx512M -version" >&5 2.316 + OUTPUT=`$JAVA -Xmx512M -version 2>&1` 2.317 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 2.318 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 2.319 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 2.320 + boot_jdk_jvmargs_small="$boot_jdk_jvmargs_small -Xmx512M" 2.321 + JVM_ARG_OK=true 2.322 + else 2.323 + $ECHO "Arg failed:" >&5 2.324 + $ECHO "$OUTPUT" >&5 2.325 + JVM_ARG_OK=false 2.326 + fi 2.327 + 2.328 + 2.329 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boot_jdk_jvmargs_small" >&5 2.330 +$as_echo "$boot_jdk_jvmargs_small" >&6; } 2.331 + 2.332 + JAVA_FLAGS_SMALL=$boot_jdk_jvmargs_small 2.333 2.334 2.335
3.1 --- a/common/autoconf/spec.gmk.in Wed Oct 22 11:18:15 2014 -0700 3.2 +++ b/common/autoconf/spec.gmk.in Wed Oct 22 12:28:55 2014 -0700 3.3 @@ -249,7 +249,6 @@ 3.4 3.5 # The boot jdk to use 3.6 BOOT_JDK:=@BOOT_JDK@ 3.7 -BOOT_JDK_JVMARGS:=@BOOT_JDK_JVMARGS@ 3.8 BOOT_RTJAR:=@BOOT_RTJAR@ 3.9 BOOT_TOOLSJAR=$(BOOT_JDK)/lib/tools.jar 3.10 3.11 @@ -436,9 +435,12 @@ 3.12 POST_STRIP_CMD:=@POST_STRIP_CMD@ 3.13 POST_MCS_CMD:=@POST_MCS_CMD@ 3.14 3.15 -JAVA_FLAGS:=@BOOT_JDK_JVMARGS@ 3.16 +JAVA_FLAGS:=@JAVA_FLAGS@ 3.17 +JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@ 3.18 +JAVA_FLAGS_SMALL:=@JAVA_FLAGS_SMALL@ 3.19 3.20 -JAVA=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS) 3.21 +JAVA=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS_BIG) $(JAVA_FLAGS) 3.22 +JAVA_SMALL=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS) 3.23 3.24 JAVAC=@FIXPATH@ $(BOOT_JDK)/bin/javac 3.25 # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid 3.26 @@ -451,7 +453,7 @@ 3.27 3.28 RMIC=@FIXPATH@ $(BOOT_JDK)/bin/rmic 3.29 3.30 -NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii 3.31 +NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii $(addprefix -J, $(JAVA_FLAGS_SMALL)) 3.32 3.33 JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner 3.34
