make/hotspot/lib/CompileDtracePostJvm.gmk

*** 1,7 ****
  #
! # Copyright (c) 2013, 2017, 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
*** 44,64 ****
  
      # Note that generateJvmOffsets.cpp must be compiled as if it were a file
      # in the libjvm.so, using JVM_CFLAGS as setup in CompileJvm.gmk. Otherwise
      # this would preferrably have been done as a part of GensrcDtrace.gmk.
      $(eval $(call SetupNativeCompilation, BUILD_DTRACE_GEN_OFFSETS, \
          SRC := $(TOPDIR)/make/hotspot/src/native/dtrace, \
          CC := $(BUILD_CXX), \
          CXX := $(BUILD_CXX), \
          LDEXE := $(BUILD_CXX), \
          generateJvmOffsets.cpp_CXXFLAGS := $(JVM_CFLAGS) -mt -xnolib -norunpath, \
          generateJvmOffsetsMain.c_CFLAGS := -mt -m64 -norunpath -z nodefs, \
          LDFLAGS := -m64, \
          LIBS := -lc, \
          OBJECT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets/objs, \
          OUTPUT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets, \
-         PROGRAM := dtraceGenOffsets, \
      ))
  
      DTRACE_GEN_OFFSETS_TOOL := $(BUILD_DTRACE_GEN_OFFSETS_TARGET)
  
      # Argument 1: Output filename
--- 44,65 ----
  
      # Note that generateJvmOffsets.cpp must be compiled as if it were a file
      # in the libjvm.so, using JVM_CFLAGS as setup in CompileJvm.gmk. Otherwise
      # this would preferrably have been done as a part of GensrcDtrace.gmk.
      $(eval $(call SetupNativeCompilation, BUILD_DTRACE_GEN_OFFSETS, \
+         NAME := dtraceGenOffsets, \
+         TYPE := EXECUTABLE, \
          SRC := $(TOPDIR)/make/hotspot/src/native/dtrace, \
          CC := $(BUILD_CXX), \
          CXX := $(BUILD_CXX), \
          LDEXE := $(BUILD_CXX), \
          generateJvmOffsets.cpp_CXXFLAGS := $(JVM_CFLAGS) -mt -xnolib -norunpath, \
          generateJvmOffsetsMain.c_CFLAGS := -mt -m64 -norunpath -z nodefs, \
          LDFLAGS := -m64, \
          LIBS := -lc, \
          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
*** 176,186 ****
      # Build the stand-alone dtrace libraries
  
      LIBJVM_DTRACE_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm_dtrace
  
      $(eval $(call SetupNativeCompilation, BUILD_LIBJVM_DTRACE, \
!         LIBRARY := jvm_dtrace, \
          OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \
          SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_dtrace, \
          CFLAGS := -m64 -G -mt -KPIC, \
          LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \
          LIBS := $(LIBDL) -lc -lthread -ldoor, \
--- 177,187 ----
      # Build the stand-alone dtrace libraries
  
      LIBJVM_DTRACE_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm_dtrace
  
      $(eval $(call SetupNativeCompilation, BUILD_LIBJVM_DTRACE, \
!         NAME := jvm_dtrace, \
          OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \
          SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_dtrace, \
          CFLAGS := -m64 -G -mt -KPIC, \
          LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \
          LIBS := $(LIBDL) -lc -lthread -ldoor, \
*** 191,201 ****
      LIBJVM_DB_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm_db
  
      # Note that libjvm_db.c has tests for COMPILER2, but this was never set by
      # the old build.
      $(eval $(call SetupNativeCompilation, BUILD_LIBJVM_DB, \
!         LIBRARY := jvm_db, \
          OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \
          SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_db, \
          CFLAGS := -I$(JVM_VARIANT_OUTPUTDIR)/gensrc -I$(DTRACE_SUPPORT_DIR) \
              -m64 -G -mt -KPIC, \
          LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \
--- 192,202 ----
      LIBJVM_DB_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm_db
  
      # Note that libjvm_db.c has tests for COMPILER2, but this was never set by
      # the old build.
      $(eval $(call SetupNativeCompilation, BUILD_LIBJVM_DB, \
!         NAME := jvm_db, \
          OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \
          SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_db, \
          CFLAGS := -I$(JVM_VARIANT_OUTPUTDIR)/gensrc -I$(DTRACE_SUPPORT_DIR) \
              -m64 -G -mt -KPIC, \
          LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \