From 3d10c44a346d6cffb4457cdedf85e380bd24e042 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Tue, 21 Nov 2017 09:44:50 +0100 Subject: [PATCH] 8190418: Stop generating jvmtiEnvStub and jvmtiEnvRecommended Reviewed-by: erikj, tbell, dholmes --- make/hotspot/gensrc/GensrcJvmti.gmk | 15 --------------- make/hotspot/lib/CompileJvm.gmk | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/make/hotspot/gensrc/GensrcJvmti.gmk b/make/hotspot/gensrc/GensrcJvmti.gmk index 1dfe38fce95..70a35e1989c 100644 --- a/make/hotspot/gensrc/GensrcJvmti.gmk +++ b/make/hotspot/gensrc/GensrcJvmti.gmk @@ -104,7 +104,6 @@ $(eval $(call SetupJvmtiGeneration, jvmtiEnterTrace.cpp, jvmtiEnter.xsl, \ $(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 @@ $(eval $(call SetupXslTransform, bytecodeInterpreterWithChecks.cpp, \ 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 diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk index 016dedfca32..e7b5aa61ff5 100644 --- a/make/hotspot/lib/CompileJvm.gmk +++ b/make/hotspot/lib/CompileJvm.gmk @@ -112,7 +112,7 @@ JVM_LIBS += \ # # 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