Merge

Sat, 02 Oct 2010 11:08:37 -0400

author
herrick
date
Sat, 02 Oct 2010 11:08:37 -0400
changeset 234
2a7813a9b529
parent 233
810a461889ab
parent 222
c1df968c4527
child 235
fd3a1c515903

Merge

     1.1 --- a/.hgtags	Tue Sep 28 10:29:08 2010 -0700
     1.2 +++ b/.hgtags	Sat Oct 02 11:08:37 2010 -0400
     1.3 @@ -85,3 +85,5 @@
     1.4  140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108
     1.5  81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109
     1.6  2a02d4a6955c7c078aee9a604cb3be409800d82c jdk7-b110
     1.7 +9702d6fef68e17533ee7fcf5923b11ead3e912ce jdk7-b111
     1.8 +b852103caf73da70068473777ae867a457bb3ae1 jdk7-b112
     2.1 --- a/make/hotspot-rules.gmk	Tue Sep 28 10:29:08 2010 -0700
     2.2 +++ b/make/hotspot-rules.gmk	Sat Oct 02 11:08:37 2010 -0400
     2.3 @@ -73,7 +73,11 @@
     2.4  endif
     2.5  
     2.6  ifeq ($(ZERO_BUILD), true)
     2.7 -  HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
     2.8 +  ifeq ($(SHARK_BUILD), true)
     2.9 +    HOTSPOT_TARGET := $(HOTSPOT_TARGET)shark
    2.10 +  else
    2.11 +    HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
    2.12 +  endif
    2.13  endif
    2.14  
    2.15  HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)

mercurial