1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
diff --git a/make/Makefile b/make/Makefile
--- a/make/Makefile
+++ b/make/Makefile
@@ -301,23 +301,18 @@
ifeq ($(JVM_VARIANT_SERVER), true)
MISC_DIR=$(C2_DIR)
- GEN_DIR=$(C2_BASE_DIR)/generated
endif
ifeq ($(JVM_VARIANT_CLIENT), true)
MISC_DIR=$(C1_DIR)
- GEN_DIR=$(C1_BASE_DIR)/generated
endif
ifeq ($(JVM_VARIANT_ZEROSHARK), true)
MISC_DIR=$(SHARK_DIR)
- GEN_DIR=$(SHARK_BASE_DIR)/generated
endif
ifeq ($(JVM_VARIANT_ZERO), true)
MISC_DIR=$(ZERO_DIR)
- GEN_DIR=$(ZERO_BASE_DIR)/generated
endif
ifeq ($(JVM_VARIANT_MINIMAL1), true)
MISC_DIR=$(MINIMAL1_DIR)
- GEN_DIR=$(MINIMAL1_BASE_DIR)/generated
endif
# Bin files (windows)
@@ -377,17 +372,21 @@
$(install-file)
$(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
$(install-file)
- $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
$(install-file)
- $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
+ $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
$(install-file)
- $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo
+ $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo
$(install-file)
- $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_DIR)/%.diz
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_DIR)/%.diz
$(install-file)
- $(EXPORT_SERVER_DIR)/%.diz: $(C2_DIR)/%.diz
+ $(EXPORT_SERVER_DIR)/%.diz: $(C2_DIR)/%.diz
$(install-file)
- $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_DIR)/%.diz
+ $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_DIR)/%.diz
+ $(install-file)
+ $(EXPORT_LIB_DIR)/%.jar: $(C2_BASE_DIR)/generated/%.jar
+ $(install-file)
+ $(EXPORT_INCLUDE_DIR)/%: $(C2_BASE_DIR)/generated/jvmtifiles/%
$(install-file)
endif
ifeq ($(JVM_VARIANT_CLIENT), true)
@@ -397,17 +396,21 @@
$(install-file)
$(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
$(install-file)
- $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
$(install-file)
- $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
+ $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
$(install-file)
- $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo
+ $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo
$(install-file)
- $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_DIR)/%.diz
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_DIR)/%.diz
$(install-file)
- $(EXPORT_CLIENT_DIR)/%.diz: $(C1_DIR)/%.diz
+ $(EXPORT_CLIENT_DIR)/%.diz: $(C1_DIR)/%.diz
$(install-file)
- $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_DIR)/%.diz
+ $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_DIR)/%.diz
+ $(install-file)
+ $(EXPORT_LIB_DIR)/%.jar: $(C1_BASE_DIR)/generated/%.jar
+ $(install-file)
+ $(EXPORT_INCLUDE_DIR)/%: $(C1_BASE_DIR)/generated/jvmtifiles/%
$(install-file)
endif
ifeq ($(JVM_VARIANT_ZEROSHARK), true)
@@ -423,6 +426,10 @@
$(install-file)
$(EXPORT_SERVER_DIR)/%.diz: $(SHARK_DIR)/%.diz
$(install-file)
+ $(EXPORT_LIB_DIR)/%.jar: $(SHARK_BASE_DIR)/generated/%.jar
+ $(install-file)
+ $(EXPORT_INCLUDE_DIR)/%: $(SHARK_BASE_DIR)/generated/jvmtifiles/%
+ $(install-file)
endif
ifeq ($(JVM_VARIANT_ZERO), true)
$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
@@ -437,6 +444,10 @@
$(install-file)
$(EXPORT_SERVER_DIR)/%.diz: $(ZERO_DIR)/%.diz
$(install-file)
+ $(EXPORT_LIB_DIR)/%.jar: $(ZERO_BASE_DIR)/generated/%.jar
+ $(install-file)
+ $(EXPORT_INCLUDE_DIR)/%: $(ZERO_BASE_DIR)/generated/jvmtifiles/%
+ $(install-file)
endif
ifeq ($(JVM_VARIANT_MINIMAL1), true)
$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
@@ -457,17 +468,13 @@
$(install-file)
$(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_DIR)/%.diz
$(install-file)
+ $(EXPORT_LIB_DIR)/%.jar: $(MINIMAL1_BASE_DIR)/generated/%.jar
+ $(install-file)
+ $(EXPORT_INCLUDE_DIR)/%: $(MINIMAL1_BASE_DIR)/generated/jvmtifiles/%
+ $(install-file)
endif
endif
-# Jar file (sa-jdi.jar)
-$(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
- $(install-file)
-
-# Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h, jfr.h)
-$(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/%
- $(install-file)
-
$(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/%
$(install-file)
|
