OpenJDK / jdk / jdk
changeset 25617:1a806d6ffdfc
Merge
| author | amurillo |
|---|---|
| date | Fri, 18 Jul 2014 12:22:50 -0700 |
| parents | 2842cbf0da97 5730ea123552 |
| children | 0d4a96093222 685aaa73b319 |
| files | |
| diffstat | 3 files changed, 21 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Tue Jul 15 21:45:50 2014 -0700 +++ b/common/autoconf/generated-configure.sh Fri Jul 18 12:22:50 2014 -0700 @@ -4311,7 +4311,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1404942241 +DATE_WHEN_GENERATED=1405336663 ############################################################################### # @@ -14548,7 +14548,7 @@ if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then INCLUDE_SA=false fi - if test "x$VAR_CPU" = xppc64 ; then + if test "x$OPENJDK_TARGET_OS" = xaix ; then INCLUDE_SA=false fi
--- a/common/autoconf/jdk-options.m4 Tue Jul 15 21:45:50 2014 -0700 +++ b/common/autoconf/jdk-options.m4 Fri Jul 18 12:22:50 2014 -0700 @@ -158,7 +158,7 @@ if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then INCLUDE_SA=false fi - if test "x$VAR_CPU" = xppc64 ; then + if test "x$OPENJDK_TARGET_OS" = xaix ; then INCLUDE_SA=false fi AC_SUBST(INCLUDE_SA)
--- a/make/jprt.properties Tue Jul 15 21:45:50 2014 -0700 +++ b/make/jprt.properties Fri Jul 18 12:22:50 2014 -0700 @@ -460,19 +460,23 @@ windows_i586_6.1-fastdebug-c2-hotspot_internalvmtests, \ windows_x64_6.1-fastdebug-c2-hotspot_internalvmtests -my.make.rule.test.targets.hotspot.wbapitests= \ - solaris_sparcv9_5.11-{product|fastdebug}-c2-hotspot_wbapitest, \ - solaris_x64_5.11-{product|fastdebug}-c2-hotspot_wbapitest, \ - linux_i586_2.6-{product|fastdebug}-c2-hotspot_wbapitest, \ - linux_x64_2.6-{product|fastdebug}-c2-hotspot_wbapitest, \ - windows_i586_6.1-{product|fastdebug}-c2-hotspot_wbapitest, \ - windows_x64_6.1-{product|fastdebug}-c2-hotspot_wbapitest, \ - linux_i586_2.6-{product|fastdebug}-c1-hotspot_wbapitest, \ - windows_i586_6.1-{product|fastdebug}-c1-hotspot_wbapitest +my.make.rule.test.targets.hotspot.reg.group= \ + solaris_sparcv9_5.11-{product|fastdebug}-c2-GROUP, \ + solaris_x64_5.11-{product|fastdebug}-c2-GROUP, \ + linux_i586_2.6-{product|fastdebug}-c2-GROUP, \ + linux_x64_2.6-{product|fastdebug}-c2-GROUP, \ + windows_i586_6.1-{product|fastdebug}-c2-GROUP, \ + windows_x64_6.1-{product|fastdebug}-c2-GROUP, \ + linux_i586_2.6-{product|fastdebug}-c1-GROUP, \ + windows_i586_6.1-{product|fastdebug}-c1-GROUP -my.make.rule.test.targets.hotspot= \ - ${my.make.rule.test.targets.hotspot.clienttests}, \ - ${my.make.rule.test.targets.hotspot.servertests}, \ - ${my.make.rule.test.targets.hotspot.internalvmtests}, \ - ${my.make.rule.test.targets.hotspot.wbapitests}, \ +my.make.rule.test.targets.hotspot= \ + ${my.make.rule.test.targets.hotspot.clienttests}, \ + ${my.make.rule.test.targets.hotspot.servertests}, \ + ${my.make.rule.test.targets.hotspot.internalvmtests}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_wbapitest}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_serviceability}, \ ${my.additional.make.rule.test.targets.hotspot}