equal
deleted
inserted
replaced
131 -I$(VM_TESTBASE_DIR)/nsk/share/jni \ |
131 -I$(VM_TESTBASE_DIR)/nsk/share/jni \ |
132 -I$(VM_TESTBASE_DIR)/nsk/share/native \ |
132 -I$(VM_TESTBASE_DIR)/nsk/share/native \ |
133 -I$(VM_TESTBASE_DIR)/nsk/share/aod \ |
133 -I$(VM_TESTBASE_DIR)/nsk/share/aod \ |
134 -I$(VM_TESTBASE_DIR)/nsk/share/jvmti \ |
134 -I$(VM_TESTBASE_DIR)/nsk/share/jvmti \ |
135 -I$(VM_TESTBASE_DIR)/nsk/share/jvmti/aod |
135 -I$(VM_TESTBASE_DIR)/nsk/share/jvmti/aod |
|
136 |
|
137 NSK_AOD_INCLUDES := \ |
|
138 -I$(VM_TESTBASE_DIR)/nsk/share/aod \ |
|
139 -I$(VM_TESTBASE_DIR)/nsk/share/native \ |
|
140 -I$(VM_TESTBASE_DIR)/nsk/share/jni |
136 |
141 |
137 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libProcessUtils := $(VM_SHARE_INCLUDES) |
142 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libProcessUtils := $(VM_SHARE_INCLUDES) |
138 |
143 |
139 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libThreadController := $(NSK_MONITORING_INCLUDES) |
144 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libThreadController := $(NSK_MONITORING_INCLUDES) |
140 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libDeadlock := $(NSK_MONITORING_INCLUDES) |
145 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libDeadlock := $(NSK_MONITORING_INCLUDES) |
820 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach045Agent01 := $(NSK_JVMTI_AOD_INCLUDES) |
825 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach045Agent01 := $(NSK_JVMTI_AOD_INCLUDES) |
821 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach002aAgent00 := $(NSK_JVMTI_AOD_INCLUDES) |
826 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach002aAgent00 := $(NSK_JVMTI_AOD_INCLUDES) |
822 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach021Agent00 := $(NSK_JVMTI_AOD_INCLUDES) |
827 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach021Agent00 := $(NSK_JVMTI_AOD_INCLUDES) |
823 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach050Agent00 := $(NSK_JVMTI_AOD_INCLUDES) |
828 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach050Agent00 := $(NSK_JVMTI_AOD_INCLUDES) |
824 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach002Agent00 := $(NSK_JVMTI_AOD_INCLUDES) |
829 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach002Agent00 := $(NSK_JVMTI_AOD_INCLUDES) |
|
830 |
|
831 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine07agent00 := $(NSK_AOD_INCLUDES) |
|
832 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine07agent01 := $(NSK_AOD_INCLUDES) |
|
833 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine07agent02 := $(NSK_AOD_INCLUDES) |
|
834 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine07agent03 := $(NSK_AOD_INCLUDES) |
|
835 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine09agent00 := $(NSK_AOD_INCLUDES) |
825 |
836 |
826 ################################################################################ |
837 ################################################################################ |
827 |
838 |
828 # Platform specific setup |
839 # Platform specific setup |
829 ifneq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) |
840 ifneq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) |