Mercurial > hg > graal-jvmci-8

changeset 24135:a8e0d0625b32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed defunct support for non-INCLUDE_JVMCI builds
author Doug Simon <doug.simon@oracle.com>
date Fri, 19 May 2017 00:18:36 +0200
parents 824339fb9c34
children 6523380966cd
files hotspot/.cproject make/bsd/makefiles/compiler1.make make/bsd/makefiles/compiler2.make make/bsd/makefiles/jvmci.make make/bsd/makefiles/tiered.make make/defs.make make/linux/makefiles/compiler1.make make/linux/makefiles/compiler2.make make/linux/makefiles/jvmci.make make/linux/makefiles/tiered.make make/solaris/makefiles/compiler1.make make/solaris/makefiles/compiler2.make make/solaris/makefiles/jvmci.make make/solaris/makefiles/tiered.make make/windows/makefiles/jvmti.make make/windows/makefiles/projectcreator.make make/windows/makefiles/vm.make mx.jvmci/mx_jvmci.py mx.jvmci/suite.py
diffstat 19 files changed, 18 insertions(+), 311 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/.cproject	Fri Apr 28 14:37:37 2017 +0200
+++ b/hotspot/.cproject	Fri May 19 00:18:36 2017 +0200
@@ -44,7 +44,6 @@
 									<listOptionValue builtIn="false" value="TARGET_ARCH_MODEL_x86_64=1"/>
 									<listOptionValue builtIn="false" value="INCLUDE_JVMCI=1"/>
 									<listOptionValue builtIn="false" value="COMPILER2=1"/>
-									<listOptionValue builtIn="false" value="COMPILERJVMCI=1"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.preprocessor.undef.2137486146" name="Undefined symbols (-U)" superClass="gnu.cpp.compiler.option.preprocessor.undef"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.866181452" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
@@ -286,7 +285,6 @@
 									<listOptionValue builtIn="false" value="TARGET_OS_ARCH_linux_x86=1"/>
 									<listOptionValue builtIn="false" value="TARGET_ARCH_MODEL_x86_64=1"/>
 									<listOptionValue builtIn="false" value="INCLUDE_JVMCI=1"/>
-									<listOptionValue builtIn="false" value="COMPILERJVMCI=1"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.preprocessor.undef.1682796822" name="Undefined symbols (-U)" superClass="gnu.cpp.compiler.option.preprocessor.undef"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1552002453" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
@@ -517,7 +515,6 @@
 									<listOptionValue builtIn="false" value="DEBUG=1"/>
 									<listOptionValue builtIn="false" value="TARGET_COMPILER_gcc=1"/>
 									<listOptionValue builtIn="false" value="INCLUDE_JVMCI=1"/>
-									<listOptionValue builtIn="false" value="COMPILERJVMCI=1"/>
 									<listOptionValue builtIn="false" value="SPARC=1"/>
 									<listOptionValue builtIn="false" value="SOLARIS=1"/>
 									<listOptionValue builtIn="false" value="TARGET_ARCH_sparc=1"/>
--- a/make/bsd/makefiles/compiler1.make	Fri Apr 28 14:37:37 2017 +0200
+++ b/make/bsd/makefiles/compiler1.make	Fri May 19 00:18:36 2017 +0200
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Sets make macros for making client version of VM
@@ -29,7 +29,3 @@
 VM_SUBDIR = client
 
 CFLAGS += -DCOMPILER1
-
-ifeq ($(INCLUDE_JVMCI), false)
-  VM_SUBDIR = client-nojvmci
-endif
\ No newline at end of file
--- a/make/bsd/makefiles/compiler2.make	Fri Apr 28 14:37:37 2017 +0200
+++ b/make/bsd/makefiles/compiler2.make	Fri May 19 00:18:36 2017 +0200
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Sets make macros for making server version of VM
@@ -29,7 +29,3 @@
 VM_SUBDIR = server
 
 CFLAGS += -DCOMPILER2
-
-ifeq ($(INCLUDE_JVMCI), false)
-  VM_SUBDIR = server-nojvmci
-endif
\ No newline at end of file
--- a/make/bsd/makefiles/jvmci.make	Fri Apr 28 14:37:37 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2008, 2010 Red Hat, Inc.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#  
-#
-
-# Sets make macros for making JVMCI version of VM
-
-TYPE = JVMCI
-
-VM_SUBDIR = jvmci
-
-# To make a non-tiered JVMCI build, remove the -DCOMPILER1 below and
-# in vm.make remove COMPILER1_PATHS from Src_Dirs/JVMCI and add
-# COMPILER1_SPECIFIC_FILES to Src_Files_EXCLUDE/JVMCI
-CFLAGS += -DCOMPILERJVMCI -DJVMCI -DCOMPILER1
--- a/make/bsd/makefiles/tiered.make	Fri Apr 28 14:37:37 2017 +0200
+++ b/make/bsd/makefiles/tiered.make	Fri May 19 00:18:36 2017 +0200
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Sets make macros for making tiered version of VM
@@ -29,7 +29,3 @@
 VM_SUBDIR = server
 
 CFLAGS += -DCOMPILER2 -DCOMPILER1
-
-ifeq ($(INCLUDE_JVMCI), false)
-  VM_SUBDIR = server-nojvmci
-endif
--- a/make/defs.make	Fri Apr 28 14:37:37 2017 +0200
+++ b/make/defs.make	Fri May 19 00:18:36 2017 +0200
@@ -113,11 +113,6 @@
   endif
 endif
 
-# If we build a no-jvmci-version, we suffix the compiler dir with -nojvmci
-ifeq ($(COMPILER_DIR_SUFFIX)$(subst false,,$(INCLUDE_JVMCI)),)
-	COMPILER_DIR_SUFFIX=-nojvmci
-endif
-
 # hotspot version definitions
 include $(GAMMADIR)/make/hotspot_version
 
@@ -374,4 +369,3 @@
 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h
 
 .PHONY: $(HS_ALT_MAKE)/defs.make
-
--- a/make/linux/makefiles/compiler1.make	Fri Apr 28 14:37:37 2017 +0200
+++ b/make/linux/makefiles/compiler1.make	Fri May 19 00:18:36 2017 +0200
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Sets make macros for making client version of VM
@@ -29,7 +29,3 @@
 VM_SUBDIR = client
 
 CFLAGS += -DCOMPILER1
-
-ifeq ($(INCLUDE_JVMCI), false)
-  VM_SUBDIR = client-nojvmci
-endif
\ No newline at end of file
--- a/make/linux/makefiles/compiler2.make	Fri Apr 28 14:37:37 2017 +0200
+++ b/make/linux/makefiles/compiler2.make	Fri May 19 00:18:36 2017 +0200
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Sets make macros for making server version of VM
@@ -29,7 +29,3 @@
 VM_SUBDIR = server
 
 CFLAGS += -DCOMPILER2
-
-ifeq ($(INCLUDE_JVMCI), false)
-  VM_SUBDIR = server-nojvmci
-endif
\ No newline at end of file
--- a/make/linux/makefiles/jvmci.make	Fri Apr 28 14:37:37 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2008, 2010 Red Hat, Inc.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#  
-#
-
-# Sets make macros for making JVMCI version of VM
-
-TYPE = JVMCI
-
-VM_SUBDIR = jvmci
-
-# To make a non-tiered JVMCI build, remove the -DCOMPILER1 below and
-# in vm.make remove COMPILER1_PATHS from Src_Dirs/JVMCI and add
-# COMPILER1_SPECIFIC_FILES to Src_Files_EXCLUDE/JVMCI
-CFLAGS += -DCOMPILERJVMCI -DJVMCI -DCOMPILER1
--- a/make/linux/makefiles/tiered.make	Fri Apr 28 14:37:37 2017 +0200
+++ b/make/linux/makefiles/tiered.make	Fri May 19 00:18:36 2017 +0200
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Sets make macros for making tiered version of VM
@@ -29,7 +29,3 @@
 VM_SUBDIR = server
 
 CFLAGS += -DCOMPILER2 -DCOMPILER1
-
-ifeq ($(INCLUDE_JVMCI), false)
-  VM_SUBDIR = server-nojvmci
-endif
\ No newline at end of file
--- a/make/solaris/makefiles/compiler1.make	Fri Apr 28 14:37:37 2017 +0200
+++ b/make/solaris/makefiles/compiler1.make	Fri May 19 00:18:36 2017 +0200
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Sets make macros for making client version of VM
@@ -29,7 +29,3 @@
 VM_SUBDIR = client
 
 CFLAGS += -DCOMPILER1
-
-ifeq ($(INCLUDE_JVMCI), false)
-  VM_SUBDIR = client-nojvmci
-endif
--- a/make/solaris/makefiles/compiler2.make	Fri Apr 28 14:37:37 2017 +0200
+++ b/make/solaris/makefiles/compiler2.make	Fri May 19 00:18:36 2017 +0200
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Sets make macros for making server version of VM
@@ -29,7 +29,3 @@
 VM_SUBDIR = server
 
 CFLAGS += -DCOMPILER2
-
-ifeq ($(INCLUDE_JVMCI), false)
-  VM_SUBDIR = server-nojvmci
-endif
--- a/make/solaris/makefiles/jvmci.make	Fri Apr 28 14:37:37 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2008, 2010 Red Hat, Inc.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#  
-#
-
-# Sets make macros for making JVMCI version of VM
-
-TYPE = JVMCI
-
-VM_SUBDIR = jvmci
-
-# To make a non-tiered JVMCI build, remove the -DCOMPILER1 below and
-# in vm.make remove COMPILER1_PATHS from Src_Dirs/JVMCI and add
-# COMPILER1_SPECIFIC_FILES to Src_Files_EXCLUDE/JVMCI
-CFLAGS += -DCOMPILERJVMCI -DJVMCI -DCOMPILER1
--- a/make/solaris/makefiles/tiered.make	Fri Apr 28 14:37:37 2017 +0200
+++ b/make/solaris/makefiles/tiered.make	Fri May 19 00:18:36 2017 +0200
@@ -19,7 +19,7 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # Sets make macros for making tiered version of VM
@@ -29,7 +29,3 @@
 VM_SUBDIR = server
 
 CFLAGS += -DCOMPILER2 -DCOMPILER1
-
-ifeq ($(INCLUDE_JVMCI), false)
-  VM_SUBDIR = server-nojvmci
-endif
--- a/make/windows/makefiles/jvmti.make	Fri Apr 28 14:37:37 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-#
-# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#  
-#
-
-# This makefile (jvmti.make) is included from the jvmti.make in the
-# build directories.
-#
-# It knows how to build and run the tools to generate jvmti.
-
-!include $(WorkSpace)/make/windows/makefiles/rules.make
-
-# #########################################################################
-
-JvmtiSrcDir = $(WorkSpace)/src/share/vm/prims
-InterpreterSrcDir = $(WorkSpace)/src/share/vm/interpreter
-
-JvmtiGeneratedNames = \
-        jvmtiEnv.hpp \
-        jvmtiEnter.cpp \
-        jvmtiEnterTrace.cpp \
-        jvmtiEnvRecommended.cpp \
-        bytecodeInterpreterWithChecks.cpp \
-        jvmti.h \
-
-JvmtiEnvFillSource = $(JvmtiSrcDir)/jvmtiEnvFill.java
-JvmtiEnvFillClass = $(JvmtiOutDir)/jvmtiEnvFill.class
-
-JvmtiGenSource = $(JvmtiSrcDir)/jvmtiGen.java
-JvmtiGenClass = $(JvmtiOutDir)/jvmtiGen.class
-
-#Note: JvmtiGeneratedFiles must be kept in sync with JvmtiGeneratedNames by hand.
-#Should be equivalent #to "JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%)"
-JvmtiGeneratedFiles = \
-        $(JvmtiOutDir)/jvmtiEnv.hpp \
-        $(JvmtiOutDir)/jvmtiEnter.cpp \
-        $(JvmtiOutDir)/jvmtiEnterTrace.cpp \
-        $(JvmtiOutDir)/jvmtiEnvRecommended.cpp\
-        $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp\
-        $(JvmtiOutDir)/jvmti.h \
-
-XSLT = $(RUN_JAVA) -classpath $(JvmtiOutDir) jvmtiGen
-
-# #########################################################################
-
-both = $(JvmtiGenClass) $(JvmtiSrcDir)/jvmti.xml $(JvmtiSrcDir)/jvmtiLib.xsl
-
-default::
-        @if not exist $(JvmtiOutDir) mkdir $(JvmtiOutDir)
-
-$(JvmtiGenClass): $(JvmtiGenSource)
-	$(COMPILE_JAVAC) -d $(JvmtiOutDir) $(JvmtiGenSource)
-
-$(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
-	@$(COMPILE_JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
-
-$(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
-	@echo Generating $@
-	@$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnter.cpp -PARAM interface jvmti
-
-$(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp: $(JvmtiGenClass) $(InterpreterSrcDir)/bytecodeInterpreter.cpp $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl
-	@echo Generating $@
-	@$(XSLT) -IN $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml -XSL $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl -OUT $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp
-
-$(JvmtiOutDir)/jvmtiEnterTrace.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
-	@echo Generating $@
-	@$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnterTrace.cpp -PARAM interface jvmti -PARAM trace Trace
-
-$(JvmtiOutDir)/jvmtiEnvRecommended.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnv.xsl $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiEnvFillClass)
-	@echo Generating $@
-	@$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnv.xsl -OUT $(JvmtiOutDir)/jvmtiEnvStub.cpp
-	@$(RUN_JAVA) -classpath $(JvmtiOutDir) jvmtiEnvFill $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiOutDir)/jvmtiEnvStub.cpp $(JvmtiOutDir)/jvmtiEnvRecommended.cpp
-
-$(JvmtiOutDir)/jvmtiEnv.hpp: $(both) $(JvmtiSrcDir)/jvmtiHpp.xsl
-	@echo Generating $@
-	@$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiHpp.xsl -OUT $(JvmtiOutDir)/jvmtiEnv.hpp
-
-$(JvmtiOutDir)/jvmti.h: $(both) $(JvmtiSrcDir)/jvmtiH.xsl
-	@echo Generating $@
-	@$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiH.xsl -OUT $(JvmtiOutDir)/jvmti.h
-
-jvmtidocs:  $(JvmtiOutDir)/jvmti.html
-
-$(JvmtiOutDir)/jvmti.html: $(both) $(JvmtiSrcDir)/jvmti.xsl
-	@echo Generating $@
-	@$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmti.xsl -OUT $(JvmtiOutDir)/jvmti.html
-
-# #########################################################################
-
-cleanall :
-	rm $(JvmtiGenClass) $(JvmtiEnvFillClass) $(JvmtiGeneratedFiles)
-
-# #########################################################################
-
-.PHONY: jvmtidocs cleanall
--- a/make/windows/makefiles/projectcreator.make	Fri Apr 28 14:37:37 2017 +0200
+++ b/make/windows/makefiles/projectcreator.make	Fri May 19 00:18:36 2017 +0200
@@ -177,26 +177,15 @@
 ##################################################
 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
  -define_compiler1 COMPILER1 \
- -define_compiler1 JVMCI \
  $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1)
 
 ##################################################
-# JVMCI compiler specific options
-##################################################
-ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
- -define_jvmci COMPILER1 \
- -define_jvmci COMPILERJVMCI \
- -define_jvmci JVMCI \
- $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=jvmci)
-
-##################################################
 # Server(C2) compiler specific options
 ##################################################
 #NOTE! This list must be kept in sync with GENERATED_NAMES in adlc.make.
 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
  -define_compiler2 COMPILER1 \
  -define_compiler2 COMPILER2 \
- -define_compiler2 JVMCI \
  -additionalFile_compiler2 $(Platform_arch_model).ad \
  -additionalFile_compiler2 ad_$(Platform_arch_model).cpp \
  -additionalFile_compiler2 ad_$(Platform_arch_model).hpp \
--- a/make/windows/makefiles/vm.make	Fri Apr 28 14:37:37 2017 +0200
+++ b/make/windows/makefiles/vm.make	Fri May 19 00:18:36 2017 +0200
@@ -48,10 +48,6 @@
 CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER1" /D "COMPILER2"
 !endif
 
-!if "$(Variant)" == "jvmci"
-CXX_FLAGS=$(CXX_FLAGS) /D "JVMCI" /D "COMPILERJVMCI" /D "COMPILER1"
-!endif
-
 !if "$(BUILDARCH)" == "i486"
 HOTSPOT_LIB_ARCH=i386
 !else
@@ -405,4 +401,3 @@
 
 vm.def: $(Obj_Files)
 	sh $(WorkSpace)/make/windows/build_vm_def.sh $(BUILD_VM_DEF_FLAG)
-
--- a/mx.jvmci/mx_jvmci.py	Fri Apr 28 14:37:37 2017 +0200
+++ b/mx.jvmci/mx_jvmci.py	Fri May 19 00:18:36 2017 +0200
@@ -59,8 +59,6 @@
 _vmAliases = {
     'jvmci' : 'server',
     'graal' : 'server',
-    'server-nograal' : 'server-nojvmci',
-    'client-nograal' : 'client-nograal',
 }
 
 _JVMCI_JDK_TAG = 'jvmci'
@@ -756,10 +754,6 @@
     var = m.group(1)
     if var == 'os':
         return _hotspotOs(mx.get_os())
-    if var == 'nojvmci':
-        if get_vm().endswith('nojvmci'):
-            return '-nojvmci'
-        return ''
     if var == 'buildname':
         return _hotspotGetVariant()
     if var == 'vmbuild':
@@ -787,7 +781,7 @@
 def _hotspotGetVariant(vm=None):
     if not vm:
         vm = get_vm()
-    variant = {'client': 'compiler1', 'server': 'compiler2', 'client-nojvmci': 'compiler1', 'server-nojvmci': 'compiler2'}.get(vm, vm)
+    variant = {'client': 'compiler1', 'server': 'compiler2'}.get(vm, vm)
     return variant
 
 """
@@ -903,13 +897,9 @@
                 setMakeVar('DISABLE_COMMERCIAL_FEATURES', 'true', env=env)
 
             setMakeVar('MAKE_VERBOSE', 'y' if mx._opts.verbose else '')
-            if self.vm.endswith('nojvmci'):
-                setMakeVar('INCLUDE_JVMCI', 'false')
-                setMakeVar('ALT_OUTPUTDIR', join(_suite.dir, 'build-nojvmci', _hotspotOs(mx.get_os())), env=env)
-            else:
-                version = _suite.release_version()
-                setMakeVar('USER_RELEASE_SUFFIX', 'jvmci-' + version)
-                setMakeVar('INCLUDE_JVMCI', 'true')
+            version = _suite.release_version()
+            setMakeVar('USER_RELEASE_SUFFIX', 'jvmci-' + version)
+            setMakeVar('INCLUDE_JVMCI', 'true')
             # setMakeVar('INSTALL', 'y', env=env)
             if mx.get_os() == 'darwin' and platform.mac_ver()[0] != '':
                 # Force use of clang on MacOS
@@ -1001,7 +991,6 @@
                 shutil.rmtree(name, ignore_errors=False, onerror=handleRemoveReadonly)
             elif os.path.isfile(name):
                 os.unlink(name)
-        nojvmci_outputdir = join(_suite.dir, 'build-nojvmci', _hotspotOs(mx.get_os()))
         makeFiles = join(_suite.dir, 'make')
         if mx._opts.verbose:
             outCapture = None
@@ -1010,7 +999,6 @@
                 pass
             outCapture = _consume
         mx.run([mx.gmake_cmd(), 'ARCH_DATA_MODEL=64', 'ALT_BOOTDIR=' + get_jvmci_bootstrap_jdk().home, 'clean'], out=outCapture, cwd=makeFiles)
-        mx.run([mx.gmake_cmd(), 'ARCH_DATA_MODEL=64', 'ALT_BOOTDIR=' + get_jvmci_bootstrap_jdk().home, 'ALT_OUTPUTDIR=' + nojvmci_outputdir, 'clean'], out=outCapture, cwd=makeFiles)
         rmIfExists(_jdksDir())
         self._newestOutput = None
 
@@ -1349,7 +1337,7 @@
                         print >> fp, l
 
 def isJVMCIEnabled(vm):
-    return vm != 'original' and not vm.endswith('nojvmci')
+    return vm != 'original'
 
 def jol(args):
     """Java Object Layout"""
@@ -1464,8 +1452,7 @@
             mx.make_eclipse_launch(_suite, args, _suite.name + '-' + build, name=None, deps=mx.dependencies())
 
         pfx = _vm_prefix.split() if _vm_prefix is not None else []
-        if not vm.endswith('nojvmci'):
-            args = get_jvmci_mode_args() + args
+        args = get_jvmci_mode_args() + args
         cmd = pfx + [self.java] + ['-' + vm] + args
         return mx.run(cmd, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd, timeout=timeout)
 
--- a/mx.jvmci/suite.py	Fri Apr 28 14:37:37 2017 +0200
+++ b/mx.jvmci/suite.py	Fri May 19 00:18:36 2017 +0200
@@ -36,8 +36,8 @@
     },
 
     "C1VISUALIZER_DIST" : {
-      "urls" : ["https://java.net/downloads/c1visualizer/c1visualizer_2015-07-22.zip"],
-      "sha1" : "7ead6b2f7ed4643ef4d3343a5562e3d3f39564ac",
+      "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/c1visualizer/c1visualizer-1.6.zip"],
+      "sha1" : "5309b3fad46067846b9e2ea55933786cdbd6f6dd",
     },
 
     "JOL_INTERNALS" : {
@@ -216,7 +216,7 @@
         "jdk.vm.ci.hotspot",
       ],
       "class" : "HotSpotProject",
-      "output" : "build<nojvmci>",
+      "output" : "build",
       # vs-<arch>/<buildname>/generated/jvmtifiles/jvmti.h
       # vs-<arch>/<buildname>/<vmbuild>/<lib:jvm>
       # vs-<arch>/<buildname>/<vmbuild>/<libdebug:jvm>