44 |
44 |
45 # Note that generateJvmOffsets.cpp must be compiled as if it were a file |
45 # Note that generateJvmOffsets.cpp must be compiled as if it were a file |
46 # in the libjvm.so, using JVM_CFLAGS as setup in CompileJvm.gmk. Otherwise |
46 # in the libjvm.so, using JVM_CFLAGS as setup in CompileJvm.gmk. Otherwise |
47 # this would preferrably have been done as a part of GensrcDtrace.gmk. |
47 # this would preferrably have been done as a part of GensrcDtrace.gmk. |
48 $(eval $(call SetupNativeCompilation, BUILD_DTRACE_GEN_OFFSETS, \ |
48 $(eval $(call SetupNativeCompilation, BUILD_DTRACE_GEN_OFFSETS, \ |
|
49 NAME := dtraceGenOffsets, \ |
|
50 TYPE := EXECUTABLE, \ |
49 SRC := $(TOPDIR)/make/hotspot/src/native/dtrace, \ |
51 SRC := $(TOPDIR)/make/hotspot/src/native/dtrace, \ |
50 TOOLCHAIN := $(TOOLCHAIN_BUILD), \ |
52 TOOLCHAIN := $(TOOLCHAIN_BUILD), \ |
51 LDFLAGS := -m64, \ |
53 LDFLAGS := -m64, \ |
52 CFLAGS := -m64 $(JVM_CFLAGS), \ |
54 CFLAGS := -m64 $(JVM_CFLAGS), \ |
53 OBJECT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets/objs, \ |
55 OBJECT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets/objs, \ |
54 OUTPUT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets, \ |
56 OUTPUT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets, \ |
55 PROGRAM := dtraceGenOffsets, \ |
|
56 )) |
57 )) |
57 |
58 |
58 DTRACE_GEN_OFFSETS_TOOL := $(BUILD_DTRACE_GEN_OFFSETS_TARGET) |
59 DTRACE_GEN_OFFSETS_TOOL := $(BUILD_DTRACE_GEN_OFFSETS_TARGET) |
59 |
60 |
60 # Argument 1: Output filename |
61 # Argument 1: Output filename |
157 # Build the stand-alone dtrace libraries |
158 # Build the stand-alone dtrace libraries |
158 |
159 |
159 LIBJVM_DTRACE_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm_dtrace |
160 LIBJVM_DTRACE_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm_dtrace |
160 |
161 |
161 $(eval $(call SetupNativeCompilation, BUILD_LIBJVM_DTRACE, \ |
162 $(eval $(call SetupNativeCompilation, BUILD_LIBJVM_DTRACE, \ |
162 LIBRARY := jvm_dtrace, \ |
163 NAME := jvm_dtrace, \ |
163 OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \ |
164 OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \ |
164 SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_dtrace, \ |
165 SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_dtrace, \ |
165 CFLAGS := -m64 -G -mt -KPIC, \ |
166 CFLAGS := -m64 -G -mt -KPIC, \ |
166 LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \ |
167 LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \ |
167 LIBS := $(LIBDL) -lc -lthread -ldoor, \ |
168 LIBS := $(LIBDL) -lc -lthread -ldoor, \ |
172 LIBJVM_DB_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm_db |
173 LIBJVM_DB_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm_db |
173 |
174 |
174 # Note that libjvm_db.c has tests for COMPILER2, but this was never set by |
175 # Note that libjvm_db.c has tests for COMPILER2, but this was never set by |
175 # the old build. |
176 # the old build. |
176 $(eval $(call SetupNativeCompilation, BUILD_LIBJVM_DB, \ |
177 $(eval $(call SetupNativeCompilation, BUILD_LIBJVM_DB, \ |
177 LIBRARY := jvm_db, \ |
178 NAME := jvm_db, \ |
178 OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \ |
179 OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \ |
179 SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_db, \ |
180 SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_db, \ |
180 CFLAGS := -I$(JVM_VARIANT_OUTPUTDIR)/gensrc -I$(DTRACE_SUPPORT_DIR) \ |
181 CFLAGS := -I$(JVM_VARIANT_OUTPUTDIR)/gensrc -I$(DTRACE_SUPPORT_DIR) \ |
181 -m64 -G -mt -KPIC, \ |
182 -m64 -G -mt -KPIC, \ |
182 LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \ |
183 LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \ |