equal
deleted
inserted
replaced
22 # or visit www.oracle.com if you need additional information or have any |
22 # or visit www.oracle.com if you need additional information or have any |
23 # questions. |
23 # questions. |
24 # |
24 # |
25 |
25 |
26 ifeq ($(call check-jvm-feature, dtrace), true) |
26 ifeq ($(call check-jvm-feature, dtrace), true) |
27 ifeq ($(OPENJDK_TARGET_OS), solaris) |
27 ifeq ($(call isTargetOs, solaris), true) |
28 JNI_INCLUDE_FLAGS := \ |
28 JNI_INCLUDE_FLAGS := \ |
29 -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base \ |
29 -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base \ |
30 -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base/$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \ |
30 -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base/$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \ |
31 # |
31 # |
32 |
32 |
40 SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_dtrace, \ |
40 SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_dtrace, \ |
41 CFLAGS := $(JNI_INCLUDE_FLAGS) -m64 -G -mt -KPIC -xldscope=hidden, \ |
41 CFLAGS := $(JNI_INCLUDE_FLAGS) -m64 -G -mt -KPIC -xldscope=hidden, \ |
42 LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \ |
42 LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \ |
43 LIBS := $(LIBDL) -lthread -ldoor, \ |
43 LIBS := $(LIBDL) -lthread -ldoor, \ |
44 OBJECT_DIR := $(LIBJVM_DTRACE_OUTPUTDIR)/objs, \ |
44 OBJECT_DIR := $(LIBJVM_DTRACE_OUTPUTDIR)/objs, \ |
|
45 DEFINE_THIS_FILE := false, \ |
45 )) |
46 )) |
46 |
47 |
47 # Note that libjvm_db.c has tests for COMPILER2, but this was never set by |
48 # Note that libjvm_db.c has tests for COMPILER2, but this was never set by |
48 # the old build. |
49 # the old build. |
49 LIBJVM_DB_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm_db |
50 LIBJVM_DB_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm_db |
52 OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \ |
53 OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \ |
53 SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_db, \ |
54 SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_db, \ |
54 CFLAGS := -I$(DTRACE_GENSRC_DIR) $(JNI_INCLUDE_FLAGS) -m64 -G -mt -KPIC -xldscope=hidden, \ |
55 CFLAGS := -I$(DTRACE_GENSRC_DIR) $(JNI_INCLUDE_FLAGS) -m64 -G -mt -KPIC -xldscope=hidden, \ |
55 LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \ |
56 LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \ |
56 OBJECT_DIR := $(LIBJVM_DB_OUTPUTDIR)/objs, \ |
57 OBJECT_DIR := $(LIBJVM_DB_OUTPUTDIR)/objs, \ |
|
58 DEFINE_THIS_FILE := false, \ |
57 )) |
59 )) |
58 |
60 |
59 TARGETS += $(BUILD_LIBJVM_DTRACE) $(BUILD_LIBJVM_DB) |
61 TARGETS += $(BUILD_LIBJVM_DTRACE) $(BUILD_LIBJVM_DB) |
60 |
62 |
61 endif |
63 endif |