changeset 48206:9fe60f7e366f

8190418: Stop generating jvmtiEnvStub and jvmtiEnvRecommended Reviewed-by: erikj, tbell, dholmes
author ihse
date Tue, 21 Nov 2017 09:44:50 +0100
parents 8fb080e5714b
children cd8f5f780750
files make/hotspot/gensrc/GensrcJvmti.gmk make/hotspot/lib/CompileJvm.gmk
diffstat 2 files changed, 1 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/make/hotspot/gensrc/GensrcJvmti.gmk	Tue Nov 21 11:27:46 2017 +0530
+++ b/make/hotspot/gensrc/GensrcJvmti.gmk	Tue Nov 21 09:44:50 2017 +0100
@@ -104,7 +104,6 @@
 $(eval $(call SetupJvmtiGeneration, jvmtiEnv.hpp, jvmtiHpp.xsl))
 $(eval $(call SetupJvmtiGeneration, jvmti.h, jvmtiH.xsl))
 $(eval $(call SetupJvmtiGeneration, jvmti.html, jvmti.xsl))
-$(eval $(call SetupJvmtiGeneration, jvmtiEnvStub.cpp, jvmtiEnv.xsl))
 
 JVMTI_BC_SRCDIR := $(TOPDIR)/src/hotspot/share/interpreter
 
@@ -115,20 +114,6 @@
     DEPS := $(JVMTI_BC_SRCDIR)/bytecodeInterpreter.cpp, \
 ))
 
-# We need $(JVMTI_OUTPUTDIR)/jvmtiEnvStub.cpp (generated above) as input
-$(JVMTI_OUTPUTDIR)/jvmtiEnvRecommended.cpp: $(JVMTI_SRCDIR)/jvmtiEnv.cpp \
-    $(JVMTI_OUTPUTDIR)/jvmtiEnvStub.cpp $(BUILD_JVMTI_TOOLS)
-	$(call LogInfo, Generating $(@F))
-	$(call MakeDir, $(@D))
-	$(call ExecuteWithLog, $@, $(TOOL_JVMTI_ENV_FILL) $(JVMTI_SRCDIR)/jvmtiEnv.cpp \
-	    $(JVMTI_OUTPUTDIR)/jvmtiEnvStub.cpp \
-	    $(JVMTI_OUTPUTDIR)/jvmtiEnvRecommended.cpp)
-        # jvmtiEnvFill does not necessarily return an error code on failure.
-        # NOTE: We should really fix jvmtiEnvFill.java instead.
-	test -f $@
-
-TARGETS += $(JVMTI_OUTPUTDIR)/jvmtiEnvRecommended.cpp
-
 ################################################################################
 # Copy jvmti.h to include dir
 
--- a/make/hotspot/lib/CompileJvm.gmk	Tue Nov 21 11:27:46 2017 +0530
+++ b/make/hotspot/lib/CompileJvm.gmk	Tue Nov 21 09:44:50 2017 +0100
@@ -112,7 +112,7 @@
     #
 
 # These files and directories are always excluded
-JVM_EXCLUDE_FILES += jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp args.cc
+JVM_EXCLUDE_FILES += jsig.c args.cc
 JVM_EXCLUDES += adlc
 
 # Needed by vm_version.cpp