From e0b5ab6bcb7b3a3ea1a87603e805efa328e4b2a3 Mon Sep 17 00:00:00 2001
From: Gary Benson <gbenson@openjdk.org>
Date: Tue, 24 Aug 2010 13:27:45 +0100
Subject: [PATCH] 6976186: Integrate Shark

Shark is a JIT compiler for Zero that uses the LLVM compiler infrastructure.

Reviewed-by: ohair
---
 make/hotspot-rules.gmk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/make/hotspot-rules.gmk b/make/hotspot-rules.gmk
index 72d6f14152d..9a85b93f990 100644
--- a/make/hotspot-rules.gmk
+++ b/make/hotspot-rules.gmk
@@ -73,7 +73,11 @@ ifeq ($(DEBUG_NAME), fastdebug)
 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)