Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Thu, 06 Nov 2014 09:38:10 -0800
- author
- asaha
- date
- Thu, 06 Nov 2014 09:38:10 -0800
- changeset 1345
- e6b1b800663d
- parent 1344
- a676d2d8af0d
- parent 1248
- ccfe5eb20bdd
- child 1346
- 07f2cc0146b1
Merge
| .hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Fri Oct 24 17:04:51 2014 -0700 1.2 +++ b/.hgtags Thu Nov 06 09:38:10 2014 -0800 1.3 @@ -342,6 +342,8 @@ 1.4 886ace09d0934d5410572764685f13119d523823 jdk8u31-b03 1.5 e2d32fe85fb93ce5179c25f5bfd49750a85c9342 jdk8u31-b04 1.6 97de4d73edf1435c9b87d765d2ad91bb16c8d913 jdk8u31-b05 1.7 +f1b61760d01de6ad8d360227ac6c2122765680a2 jdk8u31-b06 1.8 +e9cbffb6c1119f3ef39c68db53c36c5e544c0d3c jdk8u31-b07 1.9 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00 1.10 f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01 1.11 b6a148730f2b14193c308bc9c866c36ee6c08ed3 jdk8u40-b02 1.12 @@ -354,4 +356,6 @@ 1.13 0958d0a9f44efcebe30b17b07240abaa42a2112b jdk8u40-b09 1.14 1053aeab6b12d5cd4e063bf9ee37f20811450084 jdk8u40-b10 1.15 2ffefbac794be27e0c60d7e5f2cb598f04ec2411 jdk8u40-b11 1.16 +3e6d3c8810ee495ba599443e29b0dc72c0dd53fd jdk8u40-b12 1.17 +43ccc2b9d5b7c06baca33162c6aff8900fa76b65 jdk8u40-b13 1.18 ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00
2.1 --- a/common/autoconf/boot-jdk.m4 Fri Oct 24 17:04:51 2014 -0700 2.2 +++ b/common/autoconf/boot-jdk.m4 Thu Nov 06 09:38:10 2014 -0800 2.3 @@ -301,35 +301,59 @@ 2.4 [specify JVM arguments to be passed to all invocations of the Boot JDK, overriding the default values, 2.5 e.g --with-boot-jdk-jvmargs="-Xmx8G -enableassertions"])]) 2.6 2.7 - if test "x$with_boot_jdk_jvmargs" = x; then 2.8 - # Not all JVM:s accept the same arguments on the command line. 2.9 - # OpenJDK specific increase in thread stack for JDK build, 2.10 - # well more specifically, when running javac. 2.11 - if test "x$BUILD_NUM_BITS" = x32; then 2.12 - STACK_SIZE=768 2.13 - else 2.14 - # Running Javac on a JVM on a 64-bit machine, the stack takes more space 2.15 - # since 64-bit pointers are pushed on the stach. Apparently, we need 2.16 - # to increase the stack space when javacing the JDK.... 2.17 - STACK_SIZE=1536 2.18 - fi 2.19 + AC_MSG_CHECKING([flags for boot jdk java command] ) 2.20 2.21 - # Minimum amount of heap memory. 2.22 - ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs,[$JAVA]) 2.23 - if test "x$OPENJDK_TARGET_OS" = "xmacosx" || test "x$OPENJDK_TARGET_CPU" = "xppc64" ; then 2.24 - # Why does macosx need more heap? Its the huge JDK batch. 2.25 - ADD_JVM_ARG_IF_OK([-Xmx1600M],boot_jdk_jvmargs,[$JAVA]) 2.26 - else 2.27 - ADD_JVM_ARG_IF_OK([-Xmx1100M],boot_jdk_jvmargs,[$JAVA]) 2.28 - fi 2.29 - # When is adding -client something that speeds up the JVM? 2.30 - # ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA]) 2.31 - ADD_JVM_ARG_IF_OK([-XX:PermSize=32m],boot_jdk_jvmargs,[$JAVA]) 2.32 - ADD_JVM_ARG_IF_OK([-XX:MaxPermSize=160m],boot_jdk_jvmargs,[$JAVA]) 2.33 - ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs,[$JAVA]) 2.34 - # Disable special log output when a debug build is used as Boot JDK... 2.35 - ADD_JVM_ARG_IF_OK([-XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput],boot_jdk_jvmargs,[$JAVA]) 2.36 + # Disable special log output when a debug build is used as Boot JDK... 2.37 + ADD_JVM_ARG_IF_OK([-XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput],boot_jdk_jvmargs,[$JAVA]) 2.38 + 2.39 + # Apply user provided options. 2.40 + ADD_JVM_ARG_IF_OK([$with_boot_jdk_jvmargs],boot_jdk_jvmargs,[$JAVA]) 2.41 + 2.42 + AC_MSG_RESULT([$boot_jdk_jvmargs]) 2.43 + 2.44 + # For now, general JAVA_FLAGS are the same as the boot jdk jvmargs 2.45 + JAVA_FLAGS=$boot_jdk_jvmargs 2.46 + AC_SUBST(JAVA_FLAGS) 2.47 + 2.48 + 2.49 + AC_MSG_CHECKING([flags for boot jdk java command for big workloads]) 2.50 + 2.51 + # Starting amount of heap memory. 2.52 + ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA]) 2.53 + 2.54 + # Maximum amount of heap memory. 2.55 + # Maximum stack size. 2.56 + if test "x$BUILD_NUM_BITS" = x32; then 2.57 + JVM_MAX_HEAP=1100M 2.58 + STACK_SIZE=768 2.59 + else 2.60 + # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit 2.61 + # pointers are used. Apparently, we need to increase the heap and stack 2.62 + # space for the jvm. More specifically, when running javac to build huge 2.63 + # jdk batch 2.64 + JVM_MAX_HEAP=1600M 2.65 + STACK_SIZE=1536 2.66 fi 2.67 + ADD_JVM_ARG_IF_OK([-Xmx$JVM_MAX_HEAP],boot_jdk_jvmargs_big,[$JAVA]) 2.68 + ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA]) 2.69 + ADD_JVM_ARG_IF_OK([-XX:PermSize=32m],boot_jdk_jvmargs_big,[$JAVA]) 2.70 + ADD_JVM_ARG_IF_OK([-XX:MaxPermSize=160m],boot_jdk_jvmargs_big,[$JAVA]) 2.71 2.72 - AC_SUBST(BOOT_JDK_JVMARGS, $boot_jdk_jvmargs) 2.73 + AC_MSG_RESULT([$boot_jdk_jvmargs_big]) 2.74 + 2.75 + JAVA_FLAGS_BIG=$boot_jdk_jvmargs_big 2.76 + AC_SUBST(JAVA_FLAGS_BIG) 2.77 + 2.78 + 2.79 + AC_MSG_CHECKING([flags for boot jdk java command for small workloads]) 2.80 + 2.81 + # Use serial gc for small short lived tools if possible 2.82 + ADD_JVM_ARG_IF_OK([-XX:+UseSerialGC],boot_jdk_jvmargs_small,[$JAVA]) 2.83 + ADD_JVM_ARG_IF_OK([-Xms32M],boot_jdk_jvmargs_small,[$JAVA]) 2.84 + ADD_JVM_ARG_IF_OK([-Xmx512M],boot_jdk_jvmargs_small,[$JAVA]) 2.85 + 2.86 + AC_MSG_RESULT([$boot_jdk_jvmargs_small]) 2.87 + 2.88 + JAVA_FLAGS_SMALL=$boot_jdk_jvmargs_small 2.89 + AC_SUBST(JAVA_FLAGS_SMALL) 2.90 ])
3.1 --- a/common/autoconf/generated-configure.sh Fri Oct 24 17:04:51 2014 -0700 3.2 +++ b/common/autoconf/generated-configure.sh Thu Nov 06 09:38:10 2014 -0800 3.3 @@ -786,7 +786,9 @@ 3.4 JAXP_TOPDIR 3.5 CORBA_TOPDIR 3.6 LANGTOOLS_TOPDIR 3.7 -BOOT_JDK_JVMARGS 3.8 +JAVA_FLAGS_SMALL 3.9 +JAVA_FLAGS_BIG 3.10 +JAVA_FLAGS 3.11 JAVAC_FLAGS 3.12 BOOT_JDK_SOURCETARGET 3.13 BOOT_JDK 3.14 @@ -3868,7 +3870,7 @@ 3.15 #CUSTOM_AUTOCONF_INCLUDE 3.16 3.17 # Do not change or remove the following line, it is needed for consistency checks: 3.18 -DATE_WHEN_GENERATED=1411155242 3.19 +DATE_WHEN_GENERATED=1413192141 3.20 3.21 ############################################################################### 3.22 # 3.23 @@ -16072,117 +16074,10 @@ 3.24 fi 3.25 3.26 3.27 - if test "x$with_boot_jdk_jvmargs" = x; then 3.28 - # Not all JVM:s accept the same arguments on the command line. 3.29 - # OpenJDK specific increase in thread stack for JDK build, 3.30 - # well more specifically, when running javac. 3.31 - if test "x$BUILD_NUM_BITS" = x32; then 3.32 - STACK_SIZE=768 3.33 - else 3.34 - # Running Javac on a JVM on a 64-bit machine, the stack takes more space 3.35 - # since 64-bit pointers are pushed on the stach. Apparently, we need 3.36 - # to increase the stack space when javacing the JDK.... 3.37 - STACK_SIZE=1536 3.38 - fi 3.39 - 3.40 - # Minimum amount of heap memory. 3.41 - 3.42 - $ECHO "Check if jvm arg is ok: -Xms64M" >&5 3.43 - $ECHO "Command: $JAVA -Xms64M -version" >&5 3.44 - OUTPUT=`$JAVA -Xms64M -version 2>&1` 3.45 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.46 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.47 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.48 - boot_jdk_jvmargs="$boot_jdk_jvmargs -Xms64M" 3.49 - JVM_ARG_OK=true 3.50 - else 3.51 - $ECHO "Arg failed:" >&5 3.52 - $ECHO "$OUTPUT" >&5 3.53 - JVM_ARG_OK=false 3.54 - fi 3.55 - 3.56 - if test "x$OPENJDK_TARGET_OS" = "xmacosx" || test "x$OPENJDK_TARGET_CPU" = "xppc64" ; then 3.57 - # Why does macosx need more heap? Its the huge JDK batch. 3.58 - 3.59 - $ECHO "Check if jvm arg is ok: -Xmx1600M" >&5 3.60 - $ECHO "Command: $JAVA -Xmx1600M -version" >&5 3.61 - OUTPUT=`$JAVA -Xmx1600M -version 2>&1` 3.62 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.63 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.64 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.65 - boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1600M" 3.66 - JVM_ARG_OK=true 3.67 - else 3.68 - $ECHO "Arg failed:" >&5 3.69 - $ECHO "$OUTPUT" >&5 3.70 - JVM_ARG_OK=false 3.71 - fi 3.72 - 3.73 - else 3.74 - 3.75 - $ECHO "Check if jvm arg is ok: -Xmx1100M" >&5 3.76 - $ECHO "Command: $JAVA -Xmx1100M -version" >&5 3.77 - OUTPUT=`$JAVA -Xmx1100M -version 2>&1` 3.78 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.79 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.80 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.81 - boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1100M" 3.82 - JVM_ARG_OK=true 3.83 - else 3.84 - $ECHO "Arg failed:" >&5 3.85 - $ECHO "$OUTPUT" >&5 3.86 - JVM_ARG_OK=false 3.87 - fi 3.88 - 3.89 - fi 3.90 - # When is adding -client something that speeds up the JVM? 3.91 - # ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA]) 3.92 - 3.93 - $ECHO "Check if jvm arg is ok: -XX:PermSize=32m" >&5 3.94 - $ECHO "Command: $JAVA -XX:PermSize=32m -version" >&5 3.95 - OUTPUT=`$JAVA -XX:PermSize=32m -version 2>&1` 3.96 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.97 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.98 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.99 - boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:PermSize=32m" 3.100 - JVM_ARG_OK=true 3.101 - else 3.102 - $ECHO "Arg failed:" >&5 3.103 - $ECHO "$OUTPUT" >&5 3.104 - JVM_ARG_OK=false 3.105 - fi 3.106 - 3.107 - 3.108 - $ECHO "Check if jvm arg is ok: -XX:MaxPermSize=160m" >&5 3.109 - $ECHO "Command: $JAVA -XX:MaxPermSize=160m -version" >&5 3.110 - OUTPUT=`$JAVA -XX:MaxPermSize=160m -version 2>&1` 3.111 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.112 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.113 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.114 - boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:MaxPermSize=160m" 3.115 - JVM_ARG_OK=true 3.116 - else 3.117 - $ECHO "Arg failed:" >&5 3.118 - $ECHO "$OUTPUT" >&5 3.119 - JVM_ARG_OK=false 3.120 - fi 3.121 - 3.122 - 3.123 - $ECHO "Check if jvm arg is ok: -XX:ThreadStackSize=$STACK_SIZE" >&5 3.124 - $ECHO "Command: $JAVA -XX:ThreadStackSize=$STACK_SIZE -version" >&5 3.125 - OUTPUT=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1` 3.126 - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.127 - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.128 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.129 - boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:ThreadStackSize=$STACK_SIZE" 3.130 - JVM_ARG_OK=true 3.131 - else 3.132 - $ECHO "Arg failed:" >&5 3.133 - $ECHO "$OUTPUT" >&5 3.134 - JVM_ARG_OK=false 3.135 - fi 3.136 - 3.137 - # Disable special log output when a debug build is used as Boot JDK... 3.138 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking flags for boot jdk java command " >&5 3.139 +$as_echo_n "checking flags for boot jdk java command ... " >&6; } 3.140 + 3.141 + # Disable special log output when a debug build is used as Boot JDK... 3.142 3.143 $ECHO "Check if jvm arg is ok: -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput" >&5 3.144 $ECHO "Command: $JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version" >&5 3.145 @@ -16198,9 +16093,187 @@ 3.146 JVM_ARG_OK=false 3.147 fi 3.148 3.149 - fi 3.150 - 3.151 - BOOT_JDK_JVMARGS=$boot_jdk_jvmargs 3.152 + 3.153 + # Apply user provided options. 3.154 + 3.155 + $ECHO "Check if jvm arg is ok: $with_boot_jdk_jvmargs" >&5 3.156 + $ECHO "Command: $JAVA $with_boot_jdk_jvmargs -version" >&5 3.157 + OUTPUT=`$JAVA $with_boot_jdk_jvmargs -version 2>&1` 3.158 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.159 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.160 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.161 + boot_jdk_jvmargs="$boot_jdk_jvmargs $with_boot_jdk_jvmargs" 3.162 + JVM_ARG_OK=true 3.163 + else 3.164 + $ECHO "Arg failed:" >&5 3.165 + $ECHO "$OUTPUT" >&5 3.166 + JVM_ARG_OK=false 3.167 + fi 3.168 + 3.169 + 3.170 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boot_jdk_jvmargs" >&5 3.171 +$as_echo "$boot_jdk_jvmargs" >&6; } 3.172 + 3.173 + # For now, general JAVA_FLAGS are the same as the boot jdk jvmargs 3.174 + JAVA_FLAGS=$boot_jdk_jvmargs 3.175 + 3.176 + 3.177 + 3.178 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking flags for boot jdk java command for big workloads" >&5 3.179 +$as_echo_n "checking flags for boot jdk java command for big workloads... " >&6; } 3.180 + 3.181 + # Starting amount of heap memory. 3.182 + 3.183 + $ECHO "Check if jvm arg is ok: -Xms64M" >&5 3.184 + $ECHO "Command: $JAVA -Xms64M -version" >&5 3.185 + OUTPUT=`$JAVA -Xms64M -version 2>&1` 3.186 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.187 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.188 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.189 + boot_jdk_jvmargs_big="$boot_jdk_jvmargs_big -Xms64M" 3.190 + JVM_ARG_OK=true 3.191 + else 3.192 + $ECHO "Arg failed:" >&5 3.193 + $ECHO "$OUTPUT" >&5 3.194 + JVM_ARG_OK=false 3.195 + fi 3.196 + 3.197 + 3.198 + # Maximum amount of heap memory. 3.199 + # Maximum stack size. 3.200 + if test "x$BUILD_NUM_BITS" = x32; then 3.201 + JVM_MAX_HEAP=1100M 3.202 + STACK_SIZE=768 3.203 + else 3.204 + # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit 3.205 + # pointers are used. Apparently, we need to increase the heap and stack 3.206 + # space for the jvm. More specifically, when running javac to build huge 3.207 + # jdk batch 3.208 + JVM_MAX_HEAP=1600M 3.209 + STACK_SIZE=1536 3.210 + fi 3.211 + 3.212 + $ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5 3.213 + $ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5 3.214 + OUTPUT=`$JAVA -Xmx$JVM_MAX_HEAP -version 2>&1` 3.215 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.216 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.217 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.218 + boot_jdk_jvmargs_big="$boot_jdk_jvmargs_big -Xmx$JVM_MAX_HEAP" 3.219 + JVM_ARG_OK=true 3.220 + else 3.221 + $ECHO "Arg failed:" >&5 3.222 + $ECHO "$OUTPUT" >&5 3.223 + JVM_ARG_OK=false 3.224 + fi 3.225 + 3.226 + 3.227 + $ECHO "Check if jvm arg is ok: -XX:ThreadStackSize=$STACK_SIZE" >&5 3.228 + $ECHO "Command: $JAVA -XX:ThreadStackSize=$STACK_SIZE -version" >&5 3.229 + OUTPUT=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1` 3.230 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.231 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.232 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.233 + boot_jdk_jvmargs_big="$boot_jdk_jvmargs_big -XX:ThreadStackSize=$STACK_SIZE" 3.234 + JVM_ARG_OK=true 3.235 + else 3.236 + $ECHO "Arg failed:" >&5 3.237 + $ECHO "$OUTPUT" >&5 3.238 + JVM_ARG_OK=false 3.239 + fi 3.240 + 3.241 + 3.242 + $ECHO "Check if jvm arg is ok: -XX:PermSize=32m" >&5 3.243 + $ECHO "Command: $JAVA -XX:PermSize=32m -version" >&5 3.244 + OUTPUT=`$JAVA -XX:PermSize=32m -version 2>&1` 3.245 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.246 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.247 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.248 + boot_jdk_jvmargs_big="$boot_jdk_jvmargs_big -XX:PermSize=32m" 3.249 + JVM_ARG_OK=true 3.250 + else 3.251 + $ECHO "Arg failed:" >&5 3.252 + $ECHO "$OUTPUT" >&5 3.253 + JVM_ARG_OK=false 3.254 + fi 3.255 + 3.256 + 3.257 + $ECHO "Check if jvm arg is ok: -XX:MaxPermSize=160m" >&5 3.258 + $ECHO "Command: $JAVA -XX:MaxPermSize=160m -version" >&5 3.259 + OUTPUT=`$JAVA -XX:MaxPermSize=160m -version 2>&1` 3.260 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.261 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.262 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.263 + boot_jdk_jvmargs_big="$boot_jdk_jvmargs_big -XX:MaxPermSize=160m" 3.264 + JVM_ARG_OK=true 3.265 + else 3.266 + $ECHO "Arg failed:" >&5 3.267 + $ECHO "$OUTPUT" >&5 3.268 + JVM_ARG_OK=false 3.269 + fi 3.270 + 3.271 + 3.272 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boot_jdk_jvmargs_big" >&5 3.273 +$as_echo "$boot_jdk_jvmargs_big" >&6; } 3.274 + 3.275 + JAVA_FLAGS_BIG=$boot_jdk_jvmargs_big 3.276 + 3.277 + 3.278 + 3.279 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking flags for boot jdk java command for small workloads" >&5 3.280 +$as_echo_n "checking flags for boot jdk java command for small workloads... " >&6; } 3.281 + 3.282 + # Use serial gc for small short lived tools if possible 3.283 + 3.284 + $ECHO "Check if jvm arg is ok: -XX:+UseSerialGC" >&5 3.285 + $ECHO "Command: $JAVA -XX:+UseSerialGC -version" >&5 3.286 + OUTPUT=`$JAVA -XX:+UseSerialGC -version 2>&1` 3.287 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.288 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.289 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.290 + boot_jdk_jvmargs_small="$boot_jdk_jvmargs_small -XX:+UseSerialGC" 3.291 + JVM_ARG_OK=true 3.292 + else 3.293 + $ECHO "Arg failed:" >&5 3.294 + $ECHO "$OUTPUT" >&5 3.295 + JVM_ARG_OK=false 3.296 + fi 3.297 + 3.298 + 3.299 + $ECHO "Check if jvm arg is ok: -Xms32M" >&5 3.300 + $ECHO "Command: $JAVA -Xms32M -version" >&5 3.301 + OUTPUT=`$JAVA -Xms32M -version 2>&1` 3.302 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.303 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.304 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.305 + boot_jdk_jvmargs_small="$boot_jdk_jvmargs_small -Xms32M" 3.306 + JVM_ARG_OK=true 3.307 + else 3.308 + $ECHO "Arg failed:" >&5 3.309 + $ECHO "$OUTPUT" >&5 3.310 + JVM_ARG_OK=false 3.311 + fi 3.312 + 3.313 + 3.314 + $ECHO "Check if jvm arg is ok: -Xmx512M" >&5 3.315 + $ECHO "Command: $JAVA -Xmx512M -version" >&5 3.316 + OUTPUT=`$JAVA -Xmx512M -version 2>&1` 3.317 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.318 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.319 + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.320 + boot_jdk_jvmargs_small="$boot_jdk_jvmargs_small -Xmx512M" 3.321 + JVM_ARG_OK=true 3.322 + else 3.323 + $ECHO "Arg failed:" >&5 3.324 + $ECHO "$OUTPUT" >&5 3.325 + JVM_ARG_OK=false 3.326 + fi 3.327 + 3.328 + 3.329 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boot_jdk_jvmargs_small" >&5 3.330 +$as_echo "$boot_jdk_jvmargs_small" >&6; } 3.331 + 3.332 + JAVA_FLAGS_SMALL=$boot_jdk_jvmargs_small 3.333 3.334 3.335
4.1 --- a/common/autoconf/spec.gmk.in Fri Oct 24 17:04:51 2014 -0700 4.2 +++ b/common/autoconf/spec.gmk.in Thu Nov 06 09:38:10 2014 -0800 4.3 @@ -249,7 +249,6 @@ 4.4 4.5 # The boot jdk to use 4.6 BOOT_JDK:=@BOOT_JDK@ 4.7 -BOOT_JDK_JVMARGS:=@BOOT_JDK_JVMARGS@ 4.8 BOOT_RTJAR:=@BOOT_RTJAR@ 4.9 BOOT_TOOLSJAR=$(BOOT_JDK)/lib/tools.jar 4.10 4.11 @@ -436,9 +435,12 @@ 4.12 POST_STRIP_CMD:=@POST_STRIP_CMD@ 4.13 POST_MCS_CMD:=@POST_MCS_CMD@ 4.14 4.15 -JAVA_FLAGS:=@BOOT_JDK_JVMARGS@ 4.16 +JAVA_FLAGS:=@JAVA_FLAGS@ 4.17 +JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@ 4.18 +JAVA_FLAGS_SMALL:=@JAVA_FLAGS_SMALL@ 4.19 4.20 -JAVA=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS) 4.21 +JAVA=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS_BIG) $(JAVA_FLAGS) 4.22 +JAVA_SMALL=@FIXPATH@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS) 4.23 4.24 JAVAC=@FIXPATH@ $(BOOT_JDK)/bin/javac 4.25 # Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid 4.26 @@ -451,7 +453,7 @@ 4.27 4.28 RMIC=@FIXPATH@ $(BOOT_JDK)/bin/rmic 4.29 4.30 -NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii 4.31 +NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii $(addprefix -J, $(JAVA_FLAGS_SMALL)) 4.32 4.33 JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner 4.34
5.1 --- a/make/Javadoc.gmk Fri Oct 24 17:04:51 2014 -0700 5.2 +++ b/make/Javadoc.gmk Thu Nov 06 09:38:10 2014 -0800 5.3 @@ -311,6 +311,13 @@ 5.4 ################################################################# 5.5 5.6 # 5.7 +# Load custom Javadoc rules, if present 5.8 +# 5.9 +-include $(CUSTOM_MAKE_DIR)/Javadoc.gmk 5.10 + 5.11 +################################################################# 5.12 + 5.13 +# 5.14 # Default target is same as docs target, create core api and all others it can 5.15 # 5.16
6.1 --- a/make/jprt.properties Fri Oct 24 17:04:51 2014 -0700 6.2 +++ b/make/jprt.properties Thu Nov 06 09:38:10 2014 -0800 6.3 @@ -467,19 +467,23 @@ 6.4 windows_i586_6.1-fastdebug-c2-hotspot_internalvmtests, \ 6.5 windows_x64_6.1-fastdebug-c2-hotspot_internalvmtests 6.6 6.7 -my.make.rule.test.targets.hotspot.wbapitests= \ 6.8 - solaris_sparcv9_5.10-{product|fastdebug}-c2-hotspot_wbapitest, \ 6.9 - solaris_x64_5.10-{product|fastdebug}-c2-hotspot_wbapitest, \ 6.10 - linux_i586_2.6-{product|fastdebug}-c2-hotspot_wbapitest, \ 6.11 - linux_x64_2.6-{product|fastdebug}-c2-hotspot_wbapitest, \ 6.12 - windows_i586_6.1-{product|fastdebug}-c2-hotspot_wbapitest, \ 6.13 - windows_x64_6.1-{product|fastdebug}-c2-hotspot_wbapitest, \ 6.14 - linux_i586_2.6-{product|fastdebug}-c1-hotspot_wbapitest, \ 6.15 - windows_i586_6.1-{product|fastdebug}-c1-hotspot_wbapitest 6.16 +my.make.rule.test.targets.hotspot.reg.group= \ 6.17 + solaris_sparcv9_5.10-{product|fastdebug}-c2-GROUP, \ 6.18 + solaris_x64_5.10-{product|fastdebug}-c2-GROUP, \ 6.19 + linux_i586_2.6-{product|fastdebug}-c2-GROUP, \ 6.20 + linux_x64_2.6-{product|fastdebug}-c2-GROUP, \ 6.21 + windows_i586_6.1-{product|fastdebug}-c2-GROUP, \ 6.22 + windows_x64_6.1-{product|fastdebug}-c2-GROUP, \ 6.23 + linux_i586_2.6-{product|fastdebug}-c1-GROUP, \ 6.24 + windows_i586_6.1-{product|fastdebug}-c1-GROUP 6.25 6.26 my.make.rule.test.targets.hotspot= \ 6.27 ${my.make.rule.test.targets.hotspot.clienttests}, \ 6.28 ${my.make.rule.test.targets.hotspot.servertests}, \ 6.29 ${my.make.rule.test.targets.hotspot.internalvmtests}, \ 6.30 - ${my.make.rule.test.targets.hotspot.wbapitests}, \ 6.31 + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_wbapitest}, \ 6.32 + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler}, \ 6.33 + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc}, \ 6.34 + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime}, \ 6.35 + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_serviceability}, \ 6.36 ${my.additional.make.rule.test.targets.hotspot}
