< prev index next >

make/hotspot/gensrc/GensrcDtrace.gmk

Print this page

        

*** 1,7 **** # ! # Copyright (c) 2013, 2019, 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. Oracle designates this --- 1,7 ---- # ! # Copyright (c) 2013, 2018, 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. Oracle designates this
*** 26,41 **** ################################################################################ # Gensrc support for dtrace. The files generated here are included by dtrace.hpp ifeq ($(call check-jvm-feature, dtrace), true) ! ifeq ($(call isTargetOs, solaris), true) DTRACE_FLAGS := -64 DTRACE_CPP_FLAGS := -D_LP64 ! else ifeq ($(call isTargetOs, macosx), true) DTRACE_CPP_FLAGS := -D_LP64 -x c ! else ifeq ($(call isTargetOs, linux), true) DTRACE_CPP_FLAGS := -x c endif DTRACE_SOURCE_DIR := $(TOPDIR)/src/hotspot/os/posix/dtrace DTRACE_GENSRC_DIR := $(JVM_VARIANT_OUTPUTDIR)/gensrc/dtracefiles --- 26,41 ---- ################################################################################ # Gensrc support for dtrace. The files generated here are included by dtrace.hpp ifeq ($(call check-jvm-feature, dtrace), true) ! ifeq ($(OPENJDK_TARGET_OS), solaris) DTRACE_FLAGS := -64 DTRACE_CPP_FLAGS := -D_LP64 ! else ifeq ($(OPENJDK_TARGET_OS), macosx) DTRACE_CPP_FLAGS := -D_LP64 -x c ! else ifeq ($(OPENJDK_TARGET_OS), linux) DTRACE_CPP_FLAGS := -x c endif DTRACE_SOURCE_DIR := $(TOPDIR)/src/hotspot/os/posix/dtrace DTRACE_GENSRC_DIR := $(JVM_VARIANT_OUTPUTDIR)/gensrc/dtracefiles
*** 52,73 **** # Process all .d files in DTRACE_SOURCE_DIR. They are: # hotspot_jni.d hotspot.d hs_private.d TARGETS += $(patsubst $(DTRACE_SOURCE_DIR)/%.d, \ $(DTRACE_GENSRC_DIR)/%.h, $(wildcard $(DTRACE_SOURCE_DIR)/*.d)) ! ifeq ($(call isTargetOs, solaris), true) ############################################################################ # First we need to generate the dtraceGenOffsets tool. When run, this will # produce two header files and a C++ file. Note that generateJvmOffsets.cpp # is using the same JVM_CFLAGS as libjvm.so. # Include support files that will setup JVM compiler flags. include lib/JvmFeatures.gmk include lib/JvmFlags.gmk ! # We cannot compile until the JVMTI and JFR gensrc has finished. ! # JFR_FILES is defined in GensrcJfr.gmk. JVMTI_H := $(JVM_VARIANT_OUTPUTDIR)/gensrc/jvmtifiles/jvmti.h $(eval $(call SetupNativeCompilation, BUILD_DTRACE_GEN_OFFSETS, \ NAME := dtraceGenOffsets, \ TYPE := EXECUTABLE, \ --- 52,72 ---- # Process all .d files in DTRACE_SOURCE_DIR. They are: # hotspot_jni.d hotspot.d hs_private.d TARGETS += $(patsubst $(DTRACE_SOURCE_DIR)/%.d, \ $(DTRACE_GENSRC_DIR)/%.h, $(wildcard $(DTRACE_SOURCE_DIR)/*.d)) ! ifeq ($(OPENJDK_TARGET_OS), solaris) ############################################################################ # First we need to generate the dtraceGenOffsets tool. When run, this will # produce two header files and a C++ file. Note that generateJvmOffsets.cpp # is using the same JVM_CFLAGS as libjvm.so. # Include support files that will setup JVM compiler flags. include lib/JvmFeatures.gmk include lib/JvmFlags.gmk ! # We cannot compile until the JVMTI gensrc has finished JVMTI_H := $(JVM_VARIANT_OUTPUTDIR)/gensrc/jvmtifiles/jvmti.h $(eval $(call SetupNativeCompilation, BUILD_DTRACE_GEN_OFFSETS, \ NAME := dtraceGenOffsets, \ TYPE := EXECUTABLE, \
*** 75,103 **** TOOLCHAIN := $(TOOLCHAIN_BUILD), \ LDFLAGS := -m64, \ CFLAGS := -m64 $(JVM_CFLAGS), \ DISABLED_WARNINGS_solstudio := hidef w_novirtualdescr unknownpragma \ doubunder nokeyworddefine wunreachable, \ ! EXTRA_DEPS := $(JVMTI_H) $(JFR_FILES), \ OBJECT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets/objs, \ OUTPUT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets, \ - DEFINE_THIS_FILE := false, \ )) DTRACE_GEN_OFFSETS_TOOL := $(BUILD_DTRACE_GEN_OFFSETS_TARGET) # Argument 1: Output filename # Argument 2: dtrace-gen-offset tool command line option define SetupDtraceOffsetsGeneration ! $$(eval $$(call SetupExecute, dtrace_offset_$$(strip $2), \ ! INFO := Generating dtrace $2 file, \ ! DEPS := $$(BUILD_DTRACE_GEN_OFFSETS), \ ! OUTPUT_FILE := $1, \ ! COMMAND := ( $$(DTRACE_GEN_OFFSETS_TOOL) -$$(strip $2) > $1 ), \ ! )) ! TARGETS += $$(dtrace_offset_$$(strip $2)_TARGET) endef JVM_OFFSETS_H := $(DTRACE_GENSRC_DIR)/JvmOffsets.h JVM_OFFSETS_CPP := $(DTRACE_GENSRC_DIR)/JvmOffsets.cpp JVM_OFFSETS_INDEX_H := $(DTRACE_GENSRC_DIR)/JvmOffsetsIndex.h --- 74,99 ---- TOOLCHAIN := $(TOOLCHAIN_BUILD), \ LDFLAGS := -m64, \ CFLAGS := -m64 $(JVM_CFLAGS), \ DISABLED_WARNINGS_solstudio := hidef w_novirtualdescr unknownpragma \ doubunder nokeyworddefine wunreachable, \ ! EXTRA_DEPS := $(JVMTI_H), \ OBJECT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets/objs, \ OUTPUT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets, \ )) DTRACE_GEN_OFFSETS_TOOL := $(BUILD_DTRACE_GEN_OFFSETS_TARGET) # Argument 1: Output filename # Argument 2: dtrace-gen-offset tool command line option define SetupDtraceOffsetsGeneration ! $1: $$(BUILD_DTRACE_GEN_OFFSETS) ! $$(call LogInfo, Generating dtrace $2 file $$(@F)) ! $$(call MakeDir, $$(@D)) ! $$(call ExecuteWithLog, $$@, ( $$(DTRACE_GEN_OFFSETS_TOOL) -$$(strip $2) > $$@ ) ) ! TARGETS += $1 endef JVM_OFFSETS_H := $(DTRACE_GENSRC_DIR)/JvmOffsets.h JVM_OFFSETS_CPP := $(DTRACE_GENSRC_DIR)/JvmOffsets.cpp JVM_OFFSETS_INDEX_H := $(DTRACE_GENSRC_DIR)/JvmOffsetsIndex.h
< prev index next >