--- a/make/solaris/Makefile	Wed May 27 13:43:27 2015 +0200
+++ b/make/solaris/Makefile	Thu May 28 15:36:48 2015 +0200
@@ -149,13 +149,13 @@
 SUBDIRS_C2        = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
 SUBDIRS_TIERED    = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
 SUBDIRS_CORE      = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
-SUBDIRS_GRAAL     = $(addprefix $(OSNAME)_$(BUILDARCH)_graal/,$(TARGETS))
+SUBDIRS_JVMCI     = $(addprefix $(OSNAME)_$(BUILDARCH)_jvmci/,$(TARGETS))
 
 TARGETS_C2        = $(TARGETS)
 TARGETS_C1        = $(addsuffix 1,$(TARGETS))
 TARGETS_TIERED    = $(addsuffix tiered,$(TARGETS))
 TARGETS_CORE      = $(addsuffix core,$(TARGETS))
-TARGETS_GRAAL     = $(addsuffix graal,$(TARGETS))
+TARGETS_JVMCI     = $(addsuffix jvmci,$(TARGETS))
 
 BUILDTREE_MAKE    = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
 BUILDTREE_VARS    = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
@@ -173,7 +173,7 @@
 	@echo "  $(TARGETS_C2)"
 	@echo "  $(TARGETS_C1)"
 	@echo "  $(TARGETS_CORE)"
-	@echo "  $(TARGETS_GRAAL)"
+	@echo "  $(TARGETS_JVMCI)"
 
 checks: check_os_version check_j2se_version
 
@@ -223,9 +223,9 @@
 	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
 	$(BUILDTREE) VARIANT=core
 
-$(SUBDIRS_GRAAL): $(BUILDTREE_MAKE)
+$(SUBDIRS_JVMCI): $(BUILDTREE_MAKE)
 	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
-	$(BUILDTREE) VARIANT=graal
+	$(BUILDTREE) VARIANT=jvmci
 
 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
 
@@ -253,17 +253,17 @@
 	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
 endif
 
-$(TARGETS_GRAAL):  $(SUBDIRS_GRAAL)
-	cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && $(MAKE) $(MFLAGS)
+$(TARGETS_JVMCI):  $(SUBDIRS_JVMCI)
+	cd $(OSNAME)_$(BUILDARCH)_jvmci/$(patsubst %jvmci,%,$@) && $(MAKE) $(MFLAGS)
 ifdef INSTALL
-	cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && $(MAKE) $(MFLAGS) install
+	cd $(OSNAME)_$(BUILDARCH)_jvmci/$(patsubst %jvmci,%,$@) && $(MAKE) $(MFLAGS) install
 endif
 
 # Just build the tree, and nothing else:
 tree:      $(SUBDIRS_C2)
 tree1:     $(SUBDIRS_C1)
 treecore:  $(SUBDIRS_CORE)
-treegraal: $(SUBDIRS_GRAAL)
+treejvmci: $(SUBDIRS_JVMCI)
 
 # Doc target.  This is the same for all build options.
 #     Hence create a docs directory beside ...$(ARCH)_[...]
@@ -293,17 +293,17 @@
 clean_docs:
 	rm -rf $(SUBDIR_DOCS)
 
-clean_compiler1 clean_compiler2 clean_core clean_graal:
+clean_compiler1 clean_compiler2 clean_core clean_jvmci:
 	rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
 
-clean:  clean_compiler2 clean_compiler1 clean_core clean_docs clean_graal
+clean:  clean_compiler2 clean_compiler1 clean_core clean_docs clean_jvmci
 
 include $(GAMMADIR)/make/cscope.make
 
 #-------------------------------------------------------------------------------
 
 .PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE)
-.PHONY: tree tree1 treecore treegraal
-.PHONY: all compiler1 compiler2 core graal
-.PHONY: clean clean_compiler1 clean_compiler2 clean_core docs clean_docs clean_graal
+.PHONY: tree tree1 treecore treejvmci
+.PHONY: all compiler1 compiler2 core jvmci
+.PHONY: clean clean_compiler1 clean_compiler2 clean_core docs clean_docs clean_jvmci
 .PHONY: checks check_os_version check_j2se_version