From 4f2a81a360f4e75d88fd20a598bccaf7ed145a14 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Sun, 7 Jul 2024 19:47:50 +0800 Subject: [PATCH] No dtrace for now --- hotspot/make/bsd/makefiles/dtrace.make | 2 +- hotspot/make/bsd/makefiles/top.make | 10 +++++----- hotspot/make/bsd/makefiles/vm.make | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git hotspot/make/bsd/makefiles/dtrace.make hotspot/make/bsd/makefiles/dtrace.make index 9374062d11..7311ae245f 100644 --- hotspot/make/bsd/makefiles/dtrace.make +++ hotspot/make/bsd/makefiles/dtrace.make @@ -367,7 +367,7 @@ ifneq ("${DTRACE_PROG}", "") ifeq ("${HOTSPOT_DISABLE_DTRACE_PROBES}", "") DTRACE_OBJS = $(DTRACE.o) #$(JVMOFFS.o) -CFLAGS += -DDTRACE_ENABLED #$(DTRACE_INCL) +#CFLAGS += -DDTRACE_ENABLED #$(DTRACE_INCL) #clangCFLAGS += -DDTRACE_ENABLED -fno-optimize-sibling-calls #MAPFILE_DTRACE_OPT = $(MAPFILE_DTRACE) diff --git hotspot/make/bsd/makefiles/top.make hotspot/make/bsd/makefiles/top.make index 472b439ed0..698c2d9692 100644 --- hotspot/make/bsd/makefiles/top.make +++ hotspot/make/bsd/makefiles/top.make @@ -98,14 +98,14 @@ jvmti_stuff: $(Cached_plat) $(adjust-mflags) jfr_stuff: $(Cached_plat) $(adjust-mflags) @$(MAKE) -f jfr.make $(MFLAGS-adjusted) -ifeq ($(OS_VENDOR), Darwin) +# ifeq ($(OS_VENDOR), Darwin) # generate dtrace header files -dtrace_stuff: $(Cached_plat) $(adjust-mflags) - @$(MAKE) -f dtrace.make dtrace_stuff $(MFLAGS-adjusted) GENERATED=$(GENERATED) -else +# dtrace_stuff: $(Cached_plat) $(adjust-mflags) +# @$(MAKE) -f dtrace.make dtrace_stuff $(MFLAGS-adjusted) GENERATED=$(GENERATED) +# else dtrace_stuff: @# We need a null action here, so implicit rules don't get consulted. -endif +# endif # generate SA jar files and native header sa_stuff: diff --git hotspot/make/bsd/makefiles/vm.make hotspot/make/bsd/makefiles/vm.make index fabf5897fb..1dca75ee15 100644 --- hotspot/make/bsd/makefiles/vm.make +++ hotspot/make/bsd/makefiles/vm.make @@ -396,7 +396,7 @@ include $(MAKEFILES_DIR)/saproc.make ifeq ($(OS_VENDOR), Darwin) # no libjvm_db for macosx -build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck +build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(BUILDLIBSAPROC) echo "Doing vm.make build:" else build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC)