stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
J. Duke 2017-07-05 20:26:10 +02:00
commit c431f7a6b1
5 changed files with 115 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags-top-repo
View File

@ -299,3 +299,4 @@ d6ed47125a76cd1cf8a100568507bfb5e9669d9f jdk9-b53
cb7367141e910e265b8344a8facee740bd1e5467 jdk9-b54 cb7367141e910e265b8344a8facee740bd1e5467 jdk9-b54
0c37a832458f0e0b7d2a3f1a6f69aeae311aeb18 jdk9-b55 0c37a832458f0e0b7d2a3f1a6f69aeae311aeb18 jdk9-b55
eb7febe45865ba6b81f2ea68082262d0708a0b22 jdk9-b56 eb7febe45865ba6b81f2ea68082262d0708a0b22 jdk9-b56
f25ee9f62427a9ba27418e5531a89754791a305b jdk9-b57

58
README-builds.html
View File

@ -441,7 +441,7 @@
</li> </li>
<li> <li>
Install Install
<a href="#vs2010">Visual Studio 2010</a> <a href="#vs2013">Visual Studio 2013</a>
</li> </li>
</ul> </ul>
</td> </td>
@ -750,23 +750,23 @@
</blockquote> </blockquote>
<h5><a name="vs2010">Visual Studio 2010 Compilers</a></h5> <h5><a name="vs2013">Visual Studio 2013 Compilers</a></h5>
<blockquote> <blockquote>
<p> <p>
The 32-bit and 64-bit OpenJDK Windows build requires The 32-bit and 64-bit OpenJDK Windows build requires
Microsoft Visual Studio C++ 2010 (VS2010) Professional Microsoft Visual Studio C++ 2013 (VS2013) Professional
Edition or Express compiler. Edition or Express compiler.
The compiler and other tools are expected to reside The compiler and other tools are expected to reside
in the location defined by the variable in the location defined by the variable
<code>VS100COMNTOOLS</code> which <code>VS120COMNTOOLS</code> which
is set by the Microsoft Visual Studio installer. is set by the Microsoft Visual Studio installer.
</p> </p>
<p> <p>
Only the C++ part of VS2010 is needed. Only the C++ part of VS2013 is needed.
Try to let the installation go to the default Try to let the installation go to the default
install directory. install directory.
Always reboot your system after installing VS2010. Always reboot your system after installing VS2013.
The system environment variable VS100COMNTOOLS The system environment variable VS120COMNTOOLS
should be should be
set in your environment. set in your environment.
</p> </p>
@ -1040,7 +1040,7 @@
<br> <br>
This is usually picked up automatically This is usually picked up automatically
from the redist from the redist
directories of Visual Studio 2010. directories of Visual Studio 2013.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -1854,54 +1854,54 @@
<tbody> <tbody>
<tr> <tr>
<td>Linux X86 (32-bit) and X64 (64-bit)</td> <td>Linux X86 (32-bit) and X64 (64-bit)</td>
<td>Fedora 9</td> <td>Oracle Enterprise Linux 6.4</td>
<td>gcc 4.3 </td> <td>gcc 4.8.2 </td>
<td>JDK 7u7</td> <td>JDK 8</td>
<td>2 or more</td> <td>2 or more</td>
<td>1 GB</td> <td>1 GB</td>
<td>6 GB</td> <td>6 GB</td>
</tr> </tr>
<tr> <tr>
<td>Solaris SPARC (32-bit) and SPARCV9 (64-bit)</td> <td>Solaris SPARCV9 (64-bit)</td>
<td>Solaris 10 Update 6</td> <td>Solaris 10 Update 10</td>
<td>Studio 12 Update 1 + patches</td> <td>Studio 12 Update 3 + patches</td>
<td>JDK 7u7</td> <td>JDK 8</td>
<td>4 or more</td> <td>4 or more</td>
<td>4 GB</td> <td>4 GB</td>
<td>8 GB</td> <td>8 GB</td>
</tr> </tr>
<tr> <tr>
<td>Solaris X86 (32-bit) and X64 (64-bit)</td> <td>Solaris X64 (64-bit)</td>
<td>Solaris 10 Update 6</td> <td>Solaris 10 Update 10</td>
<td>Studio 12 Update 1 + patches</td> <td>Studio 12 Update 3 + patches</td>
<td>JDK 7u7</td> <td>JDK 8</td>
<td>4 or more</td> <td>4 or more</td>
<td>4 GB</td> <td>4 GB</td>
<td>8 GB</td> <td>8 GB</td>
</tr> </tr>
<tr> <tr>
<td>Windows X86 (32-bit)</td> <td>Windows X86 (32-bit)</td>
<td>Windows XP</td> <td>Windows Server 2012 R2 x64</td>
<td>Microsoft Visual Studio C++ 2010 Professional Edition</td> <td>Microsoft Visual Studio C++ 2013 Professional Edition</td>
<td>JDK 7u7</td> <td>JDK 8</td>
<td>2 or more</td> <td>2 or more</td>
<td>2 GB</td> <td>2 GB</td>
<td>6 GB</td> <td>6 GB</td>
</tr> </tr>
<tr> <tr>
<td>Windows X64 (64-bit)</td> <td>Windows X64 (64-bit)</td>
<td>Windows Server 2003 - Enterprise x64 Edition</td> <td>Windows Server 2012 R2 x64</td>
<td>Microsoft Visual Studio C++ 2010 Professional Edition</td> <td>Microsoft Visual Studio C++ 2013 Professional Edition</td>
<td>JDK 7u7</td> <td>JDK 8</td>
<td>2 or more</td> <td>2 or more</td>
<td>2 GB</td> <td>2 GB</td>
<td>6 GB</td> <td>6 GB</td>
</tr> </tr>
<tr> <tr>
<td>Mac OS X X64 (64-bit)</td> <td>Mac OS X X64 (64-bit)</td>
<td>Mac OS X 10.7 "Lion"</td> <td>Mac OS X 10.9 "Mavericks"</td>
<td>XCode 4.5.2 or newer</td> <td>XCode 5.1.1 or newer</td>
<td>JDK 7u7</td> <td>JDK 8</td>
<td>2 or more</td> <td>2 or more</td>
<td>4 GB</td> <td>4 GB</td>
<td>6 GB</td> <td>6 GB</td>
@ -2009,7 +2009,7 @@
</blockquote> </blockquote>
<h4><a name="ubuntu">Ubuntu 12.04</a></h4> <h4><a name="ubuntu">Ubuntu 12.04</a></h4>
<blockquote> <blockquote>
After installing <a href="http://ubuntu.org">Ubuntu</a> 12.04 After installing <a href="http://ubuntu.org">Ubuntu</a> 12.04
you need to install several build dependencies. The simplest you need to install several build dependencies. The simplest
way to do it is to execute the following commands: way to do it is to execute the following commands:

6
common/autoconf/generated-configure.sh
View File

@ -4294,8 +4294,8 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
# #
################################################################################ ################################################################################
# The order of these defines the priority by which we try to find them.
VALID_VS_VERSIONS="2010 2012 2013" VALID_VS_VERSIONS="2013 2012 2010"
VS_DESCRIPTION_2010="Microsoft Visual Studio 2010" VS_DESCRIPTION_2010="Microsoft Visual Studio 2010"
VS_VERSION_INTERNAL_2010=100 VS_VERSION_INTERNAL_2010=100
@ -4369,7 +4369,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1426774983 DATE_WHEN_GENERATED=1428017006
############################################################################### ###############################################################################
# #

18
common/autoconf/toolchain_windows.m4
View File

@ -24,8 +24,8 @@
# #
################################################################################ ################################################################################
# The order of these defines the priority by which we try to find them.
VALID_VS_VERSIONS="2010 2012 2013" VALID_VS_VERSIONS="2013 2012 2010"
VS_DESCRIPTION_2010="Microsoft Visual Studio 2010" VS_DESCRIPTION_2010="Microsoft Visual Studio 2010"
VS_VERSION_INTERNAL_2010=100 VS_VERSION_INTERNAL_2010=100
@ -72,7 +72,7 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
else else
VCVARSFILE="vc/bin/amd64/vcvars64.bat" VCVARSFILE="vc/bin/amd64/vcvars64.bat"
fi fi
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(VS_BASE) BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(VS_BASE)
if test -d "$VS_BASE"; then if test -d "$VS_BASE"; then
if test -f "$VS_BASE/$VCVARSFILE"; then if test -f "$VS_BASE/$VCVARSFILE"; then
@ -404,7 +404,7 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL],
METHOD="$3" METHOD="$3"
if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
AC_MSG_NOTICE([Found $1 at $POSSIBLE_MSVC_DLL using $METHOD]) AC_MSG_NOTICE([Found $1 at $POSSIBLE_MSVC_DLL using $METHOD])
# Need to check if the found msvcr is correct architecture # Need to check if the found msvcr is correct architecture
AC_MSG_CHECKING([found $1 architecture]) AC_MSG_CHECKING([found $1 architecture])
MSVC_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVC_DLL"` MSVC_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVC_DLL"`
@ -463,9 +463,9 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL], TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
[well-known location in Boot JDK]) [well-known location in Boot JDK])
fi fi
if test "x$MSVC_DLL" = x; then if test "x$MSVC_DLL" = x; then
# Probe: Look in the Windows system32 directory # Probe: Look in the Windows system32 directory
CYGWIN_SYSTEMROOT="$SYSTEMROOT" CYGWIN_SYSTEMROOT="$SYSTEMROOT"
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_SYSTEMROOT) BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_SYSTEMROOT)
POSSIBLE_MSVC_DLL="$CYGWIN_SYSTEMROOT/system32/$DLL_NAME" POSSIBLE_MSVC_DLL="$CYGWIN_SYSTEMROOT/system32/$DLL_NAME"
@ -489,7 +489,7 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
[search of VS100COMNTOOLS]) [search of VS100COMNTOOLS])
fi fi
fi fi
if test "x$MSVC_DLL" = x; then if test "x$MSVC_DLL" = x; then
# Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now. # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
# (This was the original behaviour; kept since it might turn something up) # (This was the original behaviour; kept since it might turn something up)
@ -506,12 +506,12 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
| $HEAD --lines 1` | $HEAD --lines 1`
fi fi
fi fi
TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL], TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
[search of VCINSTALLDIR]) [search of VCINSTALLDIR])
fi fi
fi fi
if test "x$MSVC_DLL" = x; then if test "x$MSVC_DLL" = x; then
AC_MSG_CHECKING([for $DLL_NAME]) AC_MSG_CHECKING([for $DLL_NAME])
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])

140
make/jprt.properties
View File

@ -119,6 +119,12 @@ jprt.i586.productOpen.build.configure.args= \
${my.i586.default.build.configure.args} \ ${my.i586.default.build.configure.args} \
${jprt.productOpen.build.configure.args} ${jprt.productOpen.build.configure.args}
jprt.windows_i586_6.2.build.configure.args= \
--with-toolchain-version=2013 \
${jprt.i586.build.configure.args}
jprt.windows_x64_6.2.build.configure.args= \
--with-toolchain-version=2013
######## ########
# #
# Build targets and options (default/jdk) # Build targets and options (default/jdk)
@ -133,9 +139,9 @@ my.build.targets.default= \
solaris_x64_5.11-{product|fastdebug}, \ solaris_x64_5.11-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \ linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \ linux_x64_2.6-{product|fastdebug}, \
macosx_x64_10.7-{product|fastdebug}, \ macosx_x64_10.9-{product|fastdebug}, \
windows_i586_6.1-{product|fastdebug}, \ windows_i586_6.2-{product|fastdebug}, \
windows_x64_6.1-{product|fastdebug} windows_x64_6.2-{product|fastdebug}
# Test target list (no fastdebug & limited c2 testing) # Test target list (no fastdebug & limited c2 testing)
my.test.target.set= \ my.test.target.set= \
@ -143,9 +149,9 @@ my.test.target.set= \
solaris_x64_5.11-product-c2-TESTNAME, \ solaris_x64_5.11-product-c2-TESTNAME, \
linux_i586_2.6-product-{c1|c2}-TESTNAME, \ linux_i586_2.6-product-{c1|c2}-TESTNAME, \
linux_x64_2.6-product-c2-TESTNAME, \ linux_x64_2.6-product-c2-TESTNAME, \
macosx_x64_10.7-product-c2-TESTNAME, \ macosx_x64_10.9-product-c2-TESTNAME, \
windows_i586_6.1-product-c1-TESTNAME, \ windows_i586_6.2-product-c1-TESTNAME, \
windows_x64_6.1-product-c2-TESTNAME windows_x64_6.2-product-c2-TESTNAME
# Default vm test targets (testset=default) # Default vm test targets (testset=default)
my.test.targets.default= \ my.test.targets.default= \
@ -255,9 +261,9 @@ my.build.targets.hotspot= \
solaris_x64_5.11-{product|fastdebug}, \ solaris_x64_5.11-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \ linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \ linux_x64_2.6-{product|fastdebug}, \
macosx_x64_10.7-{product|fastdebug}, \ macosx_x64_10.9-{product|fastdebug}, \
windows_i586_6.1-{product|fastdebug}, \ windows_i586_6.2-{product|fastdebug}, \
windows_x64_6.1-{product|fastdebug}, \ windows_x64_6.2-{product|fastdebug}, \
solaris_x64_5.11-{debugOpen}, \ solaris_x64_5.11-{debugOpen}, \
linux_x64_2.6-{productOpen}, \ linux_x64_2.6-{productOpen}, \
${my.additional.build.targets.hotspot} ${my.additional.build.targets.hotspot}
@ -332,57 +338,57 @@ my.test.targets.hotspot.linux.x64= \
linux_x64_2.6-{product|fastdebug}-c2-jbb_ParOldGC linux_x64_2.6-{product|fastdebug}-c2-jbb_ParOldGC
my.test.targets.hotspot.macosx.x64= \ my.test.targets.hotspot.macosx.x64= \
macosx_x64_10.7-{product|fastdebug}-c2-jvm98, \ macosx_x64_10.9-{product|fastdebug}-c2-jvm98, \
macosx_x64_10.7-{product|fastdebug}-c2-jvm98_nontiered, \ macosx_x64_10.9-{product|fastdebug}-c2-jvm98_nontiered, \
macosx_x64_10.7-{product|fastdebug}-c2-scimark, \ macosx_x64_10.9-{product|fastdebug}-c2-scimark, \
macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_SerialGC, \ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_SerialGC, \
macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParallelGC, \ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_ParallelGC, \
macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_CMS, \ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_CMS, \
macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_G1, \ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_G1, \
macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParOldGC, \ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_ParOldGC, \
macosx_x64_10.7-{product|fastdebug}-c2-jbb_default_nontiered, \ macosx_x64_10.9-{product|fastdebug}-c2-jbb_default_nontiered, \
macosx_x64_10.7-{product|fastdebug}-c2-jbb_ParallelGC, \ macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParallelGC, \
macosx_x64_10.7-{product|fastdebug}-c2-jbb_G1, \ macosx_x64_10.9-{product|fastdebug}-c2-jbb_G1, \
macosx_x64_10.7-{product|fastdebug}-c2-jbb_ParOldGC macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParOldGC
my.test.targets.hotspot.windows.i586= \ my.test.targets.hotspot.windows.i586= \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-jvm98, \ windows_i586_6.2-{product|fastdebug}-{c1|c2}-jvm98, \
windows_i586_6.1-{product|fastdebug}-c2-jvm98_nontiered, \ windows_i586_6.2-{product|fastdebug}-c2-jvm98_nontiered, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-scimark, \ windows_i586_6.2-{product|fastdebug}-{c1|c2}-scimark, \
windows_i586_6.1-product-{c1|c2}-runThese8, \ windows_i586_6.2-product-{c1|c2}-runThese8, \
windows_i586_6.1-product-{c1|c2}-runThese8_Xcomp_lang, \ windows_i586_6.2-product-{c1|c2}-runThese8_Xcomp_lang, \
windows_i586_6.1-product-{c1|c2}-runThese8_Xcomp_vm, \ windows_i586_6.2-product-{c1|c2}-runThese8_Xcomp_vm, \
windows_i586_6.1-fastdebug-c1-runThese8_Xshare, \ windows_i586_6.2-fastdebug-c1-runThese8_Xshare, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_G1, \ windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \ windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \
windows_i586_6.1-{product|fastdebug}-{c1|c2}-jbb_default, \ windows_i586_6.2-{product|fastdebug}-{c1|c2}-jbb_default, \
windows_i586_6.1-{product|fastdebug}-c2-jbb_default_nontiered, \ windows_i586_6.2-{product|fastdebug}-c2-jbb_default_nontiered, \
windows_i586_6.1-product-{c1|c2}-jbb_ParallelGC, \ windows_i586_6.2-product-{c1|c2}-jbb_ParallelGC, \
windows_i586_6.1-product-{c1|c2}-jbb_CMS, \ windows_i586_6.2-product-{c1|c2}-jbb_CMS, \
windows_i586_6.1-product-{c1|c2}-jbb_G1, \ windows_i586_6.2-product-{c1|c2}-jbb_G1, \
windows_i586_6.1-product-{c1|c2}-jbb_ParOldGC windows_i586_6.2-product-{c1|c2}-jbb_ParOldGC
my.test.targets.hotspot.windows.x64= \ my.test.targets.hotspot.windows.x64= \
windows_x64_6.1-{product|fastdebug}-c2-jvm98, \ windows_x64_6.2-{product|fastdebug}-c2-jvm98, \
windows_x64_6.1-{product|fastdebug}-c2-jvm98_nontiered, \ windows_x64_6.2-{product|fastdebug}-c2-jvm98_nontiered, \
windows_x64_6.1-{product|fastdebug}-c2-scimark, \ windows_x64_6.2-{product|fastdebug}-c2-scimark, \
windows_x64_6.1-product-c2-runThese8, \ windows_x64_6.2-product-c2-runThese8, \
windows_x64_6.1-product-c2-runThese8_Xcomp_lang, \ windows_x64_6.2-product-c2-runThese8_Xcomp_lang, \
windows_x64_6.1-product-c2-runThese8_Xcomp_vm, \ windows_x64_6.2-product-c2-runThese8_Xcomp_vm, \
windows_x64_6.1-{product|fastdebug}-c2-GCBasher_SerialGC, \ windows_x64_6.2-{product|fastdebug}-c2-GCBasher_SerialGC, \
windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParallelGC, \ windows_x64_6.2-{product|fastdebug}-c2-GCBasher_ParallelGC, \
windows_x64_6.1-{product|fastdebug}-c2-GCBasher_CMS, \ windows_x64_6.2-{product|fastdebug}-c2-GCBasher_CMS, \
windows_x64_6.1-{product|fastdebug}-c2-GCBasher_G1, \ windows_x64_6.2-{product|fastdebug}-c2-GCBasher_G1, \
windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParOldGC, \ windows_x64_6.2-{product|fastdebug}-c2-GCBasher_ParOldGC, \
windows_x64_6.1-{product|fastdebug}-c2-jbb_default, \ windows_x64_6.2-{product|fastdebug}-c2-jbb_default, \
windows_x64_6.1-{product|fastdebug}-c2-jbb_default_nontiered, \ windows_x64_6.2-{product|fastdebug}-c2-jbb_default_nontiered, \
windows_x64_6.1-product-c2-jbb_CMS, \ windows_x64_6.2-product-c2-jbb_CMS, \
windows_x64_6.1-product-c2-jbb_ParallelGC, \ windows_x64_6.2-product-c2-jbb_ParallelGC, \
windows_x64_6.1-product-c2-jbb_G1, \ windows_x64_6.2-product-c2-jbb_G1, \
windows_x64_6.1-product-c2-jbb_ParOldGC windows_x64_6.2-product-c2-jbb_ParOldGC
# Some basic "smoke" tests for OpenJDK builds # Some basic "smoke" tests for OpenJDK builds
my.test.targets.hotspot.open= \ my.test.targets.hotspot.open= \
@ -411,36 +417,36 @@ my.test.targets.hotspot= \
my.make.rule.test.targets.hotspot.clienttests= \ my.make.rule.test.targets.hotspot.clienttests= \
linux_i586_2.6-*-c1-hotspot_clienttest, \ linux_i586_2.6-*-c1-hotspot_clienttest, \
windows_i586_6.1-*-c1-hotspot_clienttest windows_i586_6.2-*-c1-hotspot_clienttest
my.make.rule.test.targets.hotspot.servertests= \ my.make.rule.test.targets.hotspot.servertests= \
solaris_sparcv9_5.11-*-c2-hotspot_servertest, \ solaris_sparcv9_5.11-*-c2-hotspot_servertest, \
solaris_x64_5.11-*-c2-hotspot_servertest, \ solaris_x64_5.11-*-c2-hotspot_servertest, \
linux_i586_2.6-*-c2-hotspot_servertest, \ linux_i586_2.6-*-c2-hotspot_servertest, \
linux_x64_2.6-*-c2-hotspot_servertest, \ linux_x64_2.6-*-c2-hotspot_servertest, \
macosx_x64_10.7-*-c2-hotspot_servertest, \ macosx_x64_10.9-*-c2-hotspot_servertest, \
windows_i586_6.1-*-c2-hotspot_servertest, \ windows_i586_6.2-*-c2-hotspot_servertest, \
windows_x64_6.1-*-c2-hotspot_servertest windows_x64_6.2-*-c2-hotspot_servertest
my.make.rule.test.targets.hotspot.internalvmtests= \ my.make.rule.test.targets.hotspot.internalvmtests= \
solaris_sparcv9_5.11-fastdebug-c2-hotspot_internalvmtests, \ solaris_sparcv9_5.11-fastdebug-c2-hotspot_internalvmtests, \
solaris_x64_5.11-fastdebug-c2-hotspot_internalvmtests, \ solaris_x64_5.11-fastdebug-c2-hotspot_internalvmtests, \
linux_i586_2.6-fastdebug-c2-hotspot_internalvmtests, \ linux_i586_2.6-fastdebug-c2-hotspot_internalvmtests, \
linux_x64_2.6-fastdebug-c2-hotspot_internalvmtests, \ linux_x64_2.6-fastdebug-c2-hotspot_internalvmtests, \
macosx_x64_10.7-fastdebug-c2-hotspot_internalvmtests, \ macosx_x64_10.9-fastdebug-c2-hotspot_internalvmtests, \
windows_i586_6.1-fastdebug-c2-hotspot_internalvmtests, \ windows_i586_6.2-fastdebug-c2-hotspot_internalvmtests, \
windows_x64_6.1-fastdebug-c2-hotspot_internalvmtests windows_x64_6.2-fastdebug-c2-hotspot_internalvmtests
my.make.rule.test.targets.hotspot.reg.group= \ my.make.rule.test.targets.hotspot.reg.group= \
solaris_sparcv9_5.11-fastdebug-c2-GROUP, \ solaris_sparcv9_5.11-fastdebug-c2-GROUP, \
solaris_x64_5.11-fastdebug-c2-GROUP, \ solaris_x64_5.11-fastdebug-c2-GROUP, \
linux_i586_2.6-fastdebug-c2-GROUP, \ linux_i586_2.6-fastdebug-c2-GROUP, \
linux_x64_2.6-fastdebug-c2-GROUP, \ linux_x64_2.6-fastdebug-c2-GROUP, \
macosx_x64_10.7-fastdebug-c2-GROUP, \ macosx_x64_10.9-fastdebug-c2-GROUP, \
windows_i586_6.1-fastdebug-c2-GROUP, \ windows_i586_6.2-fastdebug-c2-GROUP, \
windows_x64_6.1-fastdebug-c2-GROUP, \ windows_x64_6.2-fastdebug-c2-GROUP, \
linux_i586_2.6-fastdebug-c1-GROUP, \ linux_i586_2.6-fastdebug-c1-GROUP, \
windows_i586_6.1-fastdebug-c1-GROUP windows_i586_6.2-fastdebug-c1-GROUP
my.make.rule.test.targets.hotspot= \ my.make.rule.test.targets.hotspot= \
${my.make.rule.test.targets.hotspot.clienttests}, \ ${my.make.rule.test.targets.hotspot.clienttests}, \