make/hotspot/gensrc/GensrcDtrace.gmk

*** 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
--- 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
*** 52,62 ****
    # 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.
  
--- 52,62 ----
    # 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.