Mercurial > hg > openjdk > icedtea > jdk7
changeset 247:1fbed32d2ddd
6976186: Integrate Shark
Summary: Shark is a JIT compiler for Zero that uses the LLVM compiler infrastructure.
Reviewed-by: ohair
| author | gbenson |
|---|---|
| date | Tue, 24 Aug 2010 13:27:45 +0100 |
| parents | 9f96a4269d77 |
| children | 90357eee5234 |
| files | make/hotspot-rules.gmk |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/hotspot-rules.gmk Fri Aug 06 12:51:48 2010 -0700 +++ b/make/hotspot-rules.gmk Tue Aug 24 13:27:45 2010 +0100 @@ -73,7 +73,11 @@ endif ifeq ($(ZERO_BUILD), true) - HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero + ifeq ($(SHARK_BUILD), true) + HOTSPOT_TARGET := $(HOTSPOT_TARGET)shark + else + HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero + endif endif HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)