Ignore:
Timestamp:
Feb 13, 2012, 10:07:12 PM (14 years ago)
Author:
dmik
Message:

trunk: Merged in openjdk6 b24 from branches/vendor/oracle.

Location:
trunk/openjdk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/hotspot/make/jprt.properties

    r278 r309  
    11#
    2 # Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    4040
    4141#jprt.tools.default.release=${jprt.submit.release}
    42 jprt.tools.default.release=jdk6perf
     42jprt.tools.default.release=jdk6
    4343
    4444# Disable syncing the source after builds and tests are done.
    … …  
    4949
    5050jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
     51jprt.my.solaris.sparc.jdk7b107=solaris_sparc_5.10
     52jprt.my.solaris.sparc.jdk7temp=solaris_sparc_5.10
    5153jprt.my.solaris.sparc.jdk6=solaris_sparc_5.8
    5254jprt.my.solaris.sparc.jdk6perf=solaris_sparc_5.8
    … …  
    5860
    5961jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
     62jprt.my.solaris.sparcv9.jdk7b107=solaris_sparcv9_5.10
     63jprt.my.solaris.sparcv9.jdk7temp=solaris_sparcv9_5.10
    6064jprt.my.solaris.sparcv9.jdk6=solaris_sparcv9_5.8
    6165jprt.my.solaris.sparcv9.jdk6perf=solaris_sparcv9_5.8
    … …  
    6771
    6872jprt.my.solaris.i586.jdk7=solaris_i586_5.10
     73jprt.my.solaris.i586.jdk7b107=solaris_i586_5.10
     74jprt.my.solaris.i586.jdk7temp=solaris_i586_5.10
    6975jprt.my.solaris.i586.jdk6=solaris_i586_5.8
    7076jprt.my.solaris.i586.jdk6perf=solaris_i586_5.8
    … …  
    7682
    7783jprt.my.solaris.x64.jdk7=solaris_x64_5.10
     84jprt.my.solaris.x64.jdk7b107=solaris_x64_5.10
     85jprt.my.solaris.x64.jdk7temp=solaris_x64_5.10
    7886jprt.my.solaris.x64.jdk6=solaris_x64_5.10
    7987jprt.my.solaris.x64.jdk6perf=solaris_x64_5.10
    … …  
    8593
    8694jprt.my.linux.i586.jdk7=linux_i586_2.6
     95jprt.my.linux.i586.jdk7b107=linux_i586_2.6
     96jprt.my.linux.i586.jdk7temp=linux_i586_2.6
    8797jprt.my.linux.i586.jdk6=linux_i586_2.4
    8898jprt.my.linux.i586.jdk6perf=linux_i586_2.4
    … …  
    94104
    95105jprt.my.linux.x64.jdk7=linux_x64_2.6
     106jprt.my.linux.x64.jdk7b107=linux_x64_2.6
     107jprt.my.linux.x64.jdk7temp=linux_x64_2.6
    96108jprt.my.linux.x64.jdk6=linux_x64_2.4
    97109jprt.my.linux.x64.jdk6perf=linux_x64_2.4
    … …  
    102114jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
    103115
    104 jprt.my.windows.i586.jdk7=windows_i586_5.0
     116jprt.my.windows.i586.jdk7=windows_i586_5.1
     117jprt.my.windows.i586.jdk7b107=windows_i586_5.0
     118jprt.my.windows.i586.jdk7temp=windows_i586_5.0
    105119jprt.my.windows.i586.jdk6=windows_i586_5.0
    106120jprt.my.windows.i586.jdk6perf=windows_i586_5.0
    … …  
    112126
    113127jprt.my.windows.x64.jdk7=windows_x64_5.2
     128jprt.my.windows.x64.jdk7b107=windows_x64_5.2
     129jprt.my.windows.x64.jdk7temp=windows_x64_5.2
    114130jprt.my.windows.x64.jdk6=windows_x64_5.2
    115131jprt.my.windows.x64.jdk6perf=windows_x64_5.2
    … …  
    136152jprt.my.solaris.sparc.test.targets= \
    137153    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jvm98, \
     154    ${jprt.my.solaris.sparc}-{product|fastdebug}-c2-jvm98_tiered, \
    138155    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-scimark, \
    139156    ${jprt.my.solaris.sparc}-product-{c1|c2}-runThese, \
    … …  
    154171    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParOldGC, \
    155172    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_default, \
     173    ${jprt.my.solaris.sparc}-{product|fastdebug}-c2-jbb_default_tiered, \
    156174    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_SerialGC, \
    157175    ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_ParallelGC, \
    … …  
    162180jprt.my.solaris.sparcv9.test.targets= \
    163181    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jvm98, \
     182    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jvm98_tiered, \
    164183    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-scimark, \
    165184    ${jprt.my.solaris.sparcv9}-product-c2-runThese, \
    … …  
    179198    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_ParOldGC, \
    180199    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_default, \
     200    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_default_tiered, \
    181201    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_SerialGC, \
    182202    ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_ParallelGC, \
    … …  
    187207jprt.my.solaris.x64.test.targets= \
    188208    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jvm98, \
     209    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jvm98_tiered, \
    189210    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-scimark, \
    190211    ${jprt.my.solaris.x64}-product-c2-runThese, \
    … …  
    205226    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \
    206227    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_default, \
     228    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_default_tiered, \
    207229    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_SerialGC, \
    208230    ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
    … …  
    213235jprt.my.solaris.i586.test.targets= \
    214236    ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-jvm98, \
     237    ${jprt.my.solaris.i586}-{product|fastdebug}-c2-jvm98_tiered, \
    215238    ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark, \
    216239    ${jprt.my.solaris.i586}-product-{c1|c2}-runThese_Xcomp, \
    … …  
    239262    ${jprt.my.solaris.i586}-product-c1-GCOld_ParOldGC, \
    240263    ${jprt.my.solaris.i586}-fastdebug-c2-jbb_default, \
     264    ${jprt.my.solaris.i586}-fastdebug-c2-jbb_default_tiered, \
    241265    ${jprt.my.solaris.i586}-fastdebug-c2-jbb_ParallelGC, \
    242266    ${jprt.my.solaris.i586}-fastdebug-c2-jbb_CMS, \
    … …  
    246270jprt.my.linux.i586.test.targets = \
    247271    ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-jvm98, \
     272    ${jprt.my.linux.i586}-{product|fastdebug}-c2-jvm98_tiered, \
    248273    ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-scimark, \
    249274    ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \
    … …  
    265290    ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParOldGC, \
    266291    ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_default, \
     292    ${jprt.my.linux.i586}-{product|fastdebug}-c2-jbb_default_tiered, \
    267293    ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParallelGC, \
    268294    ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_CMS, \
    … …  
    272298jprt.my.linux.x64.test.targets = \
    273299    ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98, \
     300    ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98_tiered, \
    274301    ${jprt.my.linux.x64}-{product|fastdebug}-c2-scimark, \
    275302    ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_default, \
    … …  
    288315    ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \
    289316    ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_default, \
     317    ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_default_tiered, \
    290318    ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
    291319    ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_G1, \
    … …  
    294322jprt.my.windows.i586.test.targets = \
    295323    ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-jvm98, \
     324    ${jprt.my.windows.i586}-{product|fastdebug}-c2-jvm98_tiered, \
    296325    ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-scimark, \
    297326    ${jprt.my.windows.i586}-product-{c1|c2}-runThese, \
    … …  
    313342    ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_ParOldGC, \
    314343    ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-jbb_default, \
     344    ${jprt.my.windows.i586}-{product|fastdebug}-c2-jbb_default_tiered, \
    315345    ${jprt.my.windows.i586}-product-{c1|c2}-jbb_ParallelGC, \
    316346    ${jprt.my.windows.i586}-product-{c1|c2}-jbb_CMS, \
    … …  
    320350jprt.my.windows.x64.test.targets = \
    321351    ${jprt.my.windows.x64}-{product|fastdebug}-c2-jvm98, \
     352    ${jprt.my.windows.x64}-{product|fastdebug}-c2-jvm98_tiered, \
    322353    ${jprt.my.windows.x64}-{product|fastdebug}-c2-scimark, \
    323354    ${jprt.my.windows.x64}-product-c2-runThese, \
    … …  
    337368    ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \
    338369    ${jprt.my.windows.x64}-{product|fastdebug}-c2-jbb_default, \
     370    ${jprt.my.windows.x64}-{product|fastdebug}-c2-jbb_default_tiered, \
    339371    ${jprt.my.windows.x64}-product-c2-jbb_CMS, \
    340372    ${jprt.my.windows.x64}-product-c2-jbb_ParallelGC, \
Note: See TracChangeset for help on using the changeset viewer.