Mercurial > hg > graal-jvmci-8

comparison make/Makefile @ 10408:836a62f43af9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents dcc1994e523e f2110083203d
children 113c00c4def2
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
159 $(CD) $(OUTPUTDIR); \ 159 $(CD) $(OUTPUTDIR); \
160 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 160 $(MAKE) -f $(ABS_OS_MAKEFILE) \
161 $(MAKE_ARGS) BUILD_FLAVOR=product docs 161 $(MAKE_ARGS) BUILD_FLAVOR=product docs
162 endif 162 endif
163 163
164 # Output directories
165 C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
166 C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
167 MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1
168 ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero
169 SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark
170
164 # Build variation of hotspot 171 # Build variation of hotspot
165 $(C1_VM_TARGETS): 172 $(C1_VM_TARGETS):
166 $(CD) $(GAMMADIR)/make; \ 173 $(CD) $(GAMMADIR)/make; \
167 $(MAKE) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT) 174 $(MAKE) BUILD_DIR=$(C1_DIR) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT)
168 175
169 $(C2_VM_TARGETS): 176 $(C2_VM_TARGETS):
170 $(CD) $(GAMMADIR)/make; \ 177 $(CD) $(GAMMADIR)/make; \
171 $(MAKE) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT) 178 $(MAKE) BUILD_DIR=$(C2_DIR) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT)
172 179
173 $(ZERO_VM_TARGETS): 180 $(ZERO_VM_TARGETS):
174 $(CD) $(GAMMADIR)/make; \ 181 $(CD) $(GAMMADIR)/make; \
175 $(MAKE) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ \ 182 $(MAKE) BUILD_DIR=$(ZERO_DIR) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ generic_buildzero $(ALT_OUT)
176 generic_buildzero $(ALT_OUT)
177 183
178 $(SHARK_VM_TARGETS): 184 $(SHARK_VM_TARGETS):
179 $(CD) $(GAMMADIR)/make; \ 185 $(CD) $(GAMMADIR)/make; \
180 $(MAKE) BUILD_FLAVOR=$(@:%shark=%) VM_TARGET=$@ \ 186 $(MAKE) BUILD_DIR=$(SHARK_DIR) BUILD_FLAVOR=$(@:%shark=%) VM_TARGET=$@ generic_buildshark $(ALT_OUT)
181 generic_buildshark $(ALT_OUT)
182 187
183 $(MINIMAL1_VM_TARGETS): 188 $(MINIMAL1_VM_TARGETS):
184 $(CD) $(GAMMADIR)/make; \ 189 $(CD) $(GAMMADIR)/make; \
185 $(MAKE) BUILD_FLAVOR=$(@:%minimal1=%) VM_TARGET=$@ \ 190 $(MAKE) BUILD_DIR=$(MINIMAL1_DIR) BUILD_FLAVOR=$(@:%minimal1=%) VM_TARGET=$@ generic_buildminimal1 $(ALT_OUT)
186 generic_buildminimal1 $(ALT_OUT) 191
192 # Install hotspot script in build directory
193 HOTSPOT_SCRIPT=$(BUILD_DIR)/$(BUILD_FLAVOR)/hotspot
194 $(HOTSPOT_SCRIPT): $(GAMMADIR)/make/hotspot.script
195 $(QUIETLY) $(MKDIR) -p $(BUILD_DIR)/$(BUILD_FLAVOR)
196 $(QUIETLY) cat $< | sed -e 's|@@LIBARCH@@|$(LIBARCH)|g' | sed -e 's|@@JDK_IMPORT_PATH@@|$(JDK_IMPORT_PATH)|g' > $@
197 $(QUIETLY) chmod +x $@
187 198
188 $(GRAAL_VM_TARGETS): 199 $(GRAAL_VM_TARGETS):
189 $(CD) $(GAMMADIR)/make; \ 200 $(CD) $(GAMMADIR)/make; \
190 $(MAKE) BUILD_FLAVOR=$@ VM_TARGET=$@ \ 201 $(MAKE) BUILD_FLAVOR=$@ VM_TARGET=$@ \
191 generic_buildgraal $(ALT_OUT) 202 generic_buildgraal $(ALT_OUT)
192 203
193 # Build compiler1 (client) rule, different for platforms 204 # Build compiler1 (client) rule, different for platforms
194 generic_build1: buildshared 205 generic_build1: $(HOTSPOT_SCRIPT) buildshared
195 $(MKDIR) -p $(OUTPUTDIR) 206 $(MKDIR) -p $(OUTPUTDIR)
196 ifeq ($(OSNAME),windows) 207 ifeq ($(OSNAME),windows)
197 ifeq ($(ARCH_DATA_MODEL), 32) 208 ifeq ($(ARCH_DATA_MODEL), 32)
198 $(CD) $(OUTPUTDIR); \ 209 $(CD) $(OUTPUTDIR); \
199 $(NMAKE) -f $(ABS_OS_MAKEFILE) \ 210 $(NMAKE) -f $(ABS_OS_MAKEFILE) \
210 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 221 $(MAKE) -f $(ABS_OS_MAKEFILE) \
211 $(MAKE_ARGS) $(VM_TARGET) 222 $(MAKE_ARGS) $(VM_TARGET)
212 endif 223 endif
213 224
214 # Build compiler2 (server) rule, different for platforms 225 # Build compiler2 (server) rule, different for platforms
215 generic_build2: buildshared 226 generic_build2: $(HOTSPOT_SCRIPT) buildshared
216 $(MKDIR) -p $(OUTPUTDIR) 227 $(MKDIR) -p $(OUTPUTDIR)
217 ifeq ($(OSNAME),windows) 228 ifeq ($(OSNAME),windows)
218 $(CD) $(OUTPUTDIR); \ 229 $(CD) $(OUTPUTDIR); \
219 $(NMAKE) -f $(ABS_OS_MAKEFILE) \ 230 $(NMAKE) -f $(ABS_OS_MAKEFILE) \
220 Variant=compiler2 \ 231 Variant=compiler2 \
226 $(CD) $(OUTPUTDIR); \ 237 $(CD) $(OUTPUTDIR); \
227 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 238 $(MAKE) -f $(ABS_OS_MAKEFILE) \
228 $(MAKE_ARGS) $(VM_TARGET) 239 $(MAKE_ARGS) $(VM_TARGET)
229 endif 240 endif
230 241
231 generic_buildzero: 242 generic_buildzero: $(HOTSPOT_SCRIPT)
232 $(MKDIR) -p $(OUTPUTDIR) 243 $(MKDIR) -p $(OUTPUTDIR)
233 $(CD) $(OUTPUTDIR); \ 244 $(CD) $(OUTPUTDIR); \
234 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 245 $(MAKE) -f $(ABS_OS_MAKEFILE) \
235 $(MAKE_ARGS) $(VM_TARGET) 246 $(MAKE_ARGS) $(VM_TARGET)
236 247
237 generic_buildshark: 248 generic_buildshark: $(HOTSPOT_SCRIPT)
238 $(MKDIR) -p $(OUTPUTDIR) 249 $(MKDIR) -p $(OUTPUTDIR)
239 $(CD) $(OUTPUTDIR); \ 250 $(CD) $(OUTPUTDIR); \
240 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 251 $(MAKE) -f $(ABS_OS_MAKEFILE) \
241 $(MAKE_ARGS) $(VM_TARGET) 252 $(MAKE_ARGS) $(VM_TARGET)
242 253
243 generic_buildminimal1: 254 generic_buildminimal1: $(HOTSPOT_SCRIPT)
244 ifeq ($(JVM_VARIANT_MINIMAL1),true) 255 ifeq ($(JVM_VARIANT_MINIMAL1),true)
245 $(MKDIR) -p $(OUTPUTDIR) 256 $(MKDIR) -p $(OUTPUTDIR)
246 ifeq ($(ARCH_DATA_MODEL), 32) 257 ifeq ($(ARCH_DATA_MODEL), 32)
247 ifeq ($(OSNAME),windows) 258 ifeq ($(OSNAME),windows)
248 $(ECHO) "No ($(VM_TARGET)) for $(OSNAME) ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)" ; 259 $(ECHO) "No ($(VM_TARGET)) for $(OSNAME) ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)" ;
272 buildshared: 283 buildshared:
273 python2.7 -u $(GAMMADIR)/mxtool/mx.py build --no-native --export-dir $(SHARED_DIR) 284 python2.7 -u $(GAMMADIR)/mxtool/mx.py build --no-native --export-dir $(SHARED_DIR)
274 285
275 # Export file rule 286 # Export file rule
276 generic_export: $(EXPORT_LIST) 287 generic_export: $(EXPORT_LIST)
288
277 export_product: 289 export_product:
278 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ 290 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) generic_export
279 generic_export
280 export_fastdebug: 291 export_fastdebug:
281 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ 292 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) EXPORT_SUBDIR=/$(@:export_%=%) generic_export
282 EXPORT_SUBDIR=/$(@:export_%=%) \
283 generic_export
284 export_debug: 293 export_debug:
285 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ 294 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) EXPORT_SUBDIR=/$(@:export_%=%) generic_export
286 EXPORT_SUBDIR=/$(@:export_%=%) \
287 generic_export
288 export_optimized: 295 export_optimized:
289 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ 296 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) EXPORT_SUBDIR=/$(@:export_%=%) generic_export
290 EXPORT_SUBDIR=/$(@:export_%=%) \ 297
291 generic_export
292 export_product_jdk:: 298 export_product_jdk::
293 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \ 299 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) generic_export
294 VM_SUBDIR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \
295 generic_export
296 export_optimized_jdk:: 300 export_optimized_jdk::
297 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \ 301 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) generic_export
298 VM_SUBDIR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \
299 generic_export
300 export_fastdebug_jdk:: 302 export_fastdebug_jdk::
301 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \ 303 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) generic_export
302 VM_SUBDIR=$(@:export_%_jdk=%) \
303 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
304 generic_export
305 export_debug_jdk:: 304 export_debug_jdk::
306 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=$(@:export_%_jdk=%) \ 305 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) generic_export
307 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
308 generic_export
309 306
310 # Export file copy rules 307 # Export file copy rules
311 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt 308 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
312 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs 309 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
313 C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 310 C1_BUILD_DIR =$(C1_DIR)/$(BUILD_FLAVOR)
314 C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2 311 C2_BUILD_DIR =$(C2_DIR)/$(BUILD_FLAVOR)
315 ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero 312 MINIMAL1_BUILD_DIR=$(MINIMAL1_DIR)/$(BUILD_FLAVOR)
316 SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark 313 ZERO_BUILD_DIR =$(ZERO_DIR)/$(BUILD_FLAVOR)
317 GRAAL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_graal 314 SHARK_BUILD_DIR =$(SHARK_DIR)/$(BUILD_FLAVOR)
318 C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR) 315
319 C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR) 316 # Server (C2)
320 ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
321 SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
322 MINIMAL1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1
323 MINIMAL1_DIR=$(MINIMAL1_BASE_DIR)/$(VM_SUBDIR)
324 GRAAL_DIR=$(GRAAL_BASE_DIR)/$(VM_SUBDIR)
325
326 ifeq ($(JVM_VARIANT_SERVER), true) 317 ifeq ($(JVM_VARIANT_SERVER), true)
327 MISC_DIR=$(C2_DIR) 318 # Common
328 GEN_DIR=$(C2_BASE_DIR)/generated 319 $(EXPORT_SERVER_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz
329 endif 320 $(install-file)
321 $(EXPORT_LIB_DIR)/%.jar: $(C2_BUILD_DIR)/../generated/%.jar
322 $(install-file)
323 $(EXPORT_INCLUDE_DIR)/%: $(C2_BUILD_DIR)/../generated/jvmtifiles/%
324 $(install-file)
325 # Windows
326 $(EXPORT_SERVER_DIR)/%.dll: $(C2_BUILD_DIR)/%.dll
327 $(install-file)
328 $(EXPORT_SERVER_DIR)/%.pdb: $(C2_BUILD_DIR)/%.pdb
329 $(install-file)
330 $(EXPORT_SERVER_DIR)/%.map: $(C2_BUILD_DIR)/%.map
331 $(install-file)
332 $(EXPORT_LIB_DIR)/%.lib: $(C2_BUILD_DIR)/%.lib
333 $(install-file)
334 $(EXPORT_JRE_BIN_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz
335 $(install-file)
336 $(EXPORT_JRE_BIN_DIR)/%.dll: $(C2_BUILD_DIR)/%.dll
337 $(install-file)
338 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(C2_BUILD_DIR)/%.pdb
339 $(install-file)
340 $(EXPORT_JRE_BIN_DIR)/%.map: $(C2_BUILD_DIR)/%.map
341 $(install-file)
342 # Unix
343 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
344 $(install-file)
345 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
346 $(install-file)
347 $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
348 $(install-file)
349 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_BUILD_DIR)/%.debuginfo
350 $(install-file)
351 $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_BUILD_DIR)/%.debuginfo
352 $(install-file)
353 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_BUILD_DIR)/%.debuginfo
354 $(install-file)
355 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz
356 $(install-file)
357 $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_BUILD_DIR)/%.diz
358 $(install-file)
359 endif
360
361 # Client (C1)
330 ifeq ($(JVM_VARIANT_CLIENT), true) 362 ifeq ($(JVM_VARIANT_CLIENT), true)
331 MISC_DIR=$(C1_DIR) 363 # Common
332 GEN_DIR=$(C1_BASE_DIR)/generated 364 $(EXPORT_CLIENT_DIR)/%.diz: $(C1_BUILD_DIR)/%.diz
333 endif 365 $(install-file)
366 $(EXPORT_LIB_DIR)/%.jar: $(C1_BUILD_DIR)/../generated/%.jar
367 $(install-file)
368 $(EXPORT_INCLUDE_DIR)/%: $(C1_BUILD_DIR)/../generated/jvmtifiles/%
369 $(install-file)
370 # Windows
371 $(EXPORT_CLIENT_DIR)/%.dll: $(C1_BUILD_DIR)/%.dll
372 $(install-file)
373 $(EXPORT_CLIENT_DIR)/%.pdb: $(C1_BUILD_DIR)/%.pdb
374 $(install-file)
375 $(EXPORT_CLIENT_DIR)/%.map: $(C1_BUILD_DIR)/%.map
376 $(install-file)
377 $(EXPORT_LIB_DIR)/%.lib: $(C1_BUILD_DIR)/%.lib
378 $(install-file)
379 $(EXPORT_JRE_BIN_DIR)/%.diz: $(C1_BUILD_DIR)/%.diz
380 $(install-file)
381 $(EXPORT_JRE_BIN_DIR)/%.dll: $(C1_BUILD_DIR)/%.dll
382 $(install-file)
383 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(C1_BUILD_DIR)/%.pdb
384 $(install-file)
385 $(EXPORT_JRE_BIN_DIR)/%.map: $(C1_BUILD_DIR)/%.map
386 $(install-file)
387 # Unix
388 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
389 $(install-file)
390 $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
391 $(install-file)
392 $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
393 $(install-file)
394 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_BUILD_DIR)/%.debuginfo
395 $(install-file)
396 $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_BUILD_DIR)/%.debuginfo
397 $(install-file)
398 $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_BUILD_DIR)/%.debuginfo
399 $(install-file)
400 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_BUILD_DIR)/%.diz
401 $(install-file)
402 $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_BUILD_DIR)/%.diz
403 $(install-file)
404 endif
405
406 # Minimal1
407 ifeq ($(JVM_VARIANT_MINIMAL1), true)
408 # Common
409 $(EXPORT_MINIMAL_DIR)/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz
410 $(install-file)
411 $(EXPORT_LIB_DIR)/%.jar: $(MINIMAL1_BUILD_DIR)/../generated/%.jar
412 $(install-file)
413 $(EXPORT_INCLUDE_DIR)/%: $(MINIMAL1_BUILD_DIR)/../generated/jvmtifiles/%
414 $(install-file)
415 # Windows
416 $(EXPORT_MINIMAL_DIR)/%.dll: $(MINIMAL1_BUILD_DIR)/%.dll
417 $(install-file)
418 $(EXPORT_MINIMAL_DIR)/%.pdb: $(MINIMAL1_BUILD_DIR)/%.pdb
419 $(install-file)
420 $(EXPORT_MINIMAL_DIR)/%.map: $(MINIMAL1_BUILD_DIR)/%.map
421 $(install-file)
422 $(EXPORT_LIB_DIR)/%.lib: $(MINIMAL1_BUILD_DIR)/%.lib
423 $(install-file)
424 $(EXPORT_JRE_BIN_DIR)/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz
425 $(install-file)
426 $(EXPORT_JRE_BIN_DIR)/%.dll: $(MINIMAL1_BUILD_DIR)/%.dll
427 $(install-file)
428 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(MINIMAL1_BUILD_DIR)/%.pdb
429 $(install-file)
430 $(EXPORT_JRE_BIN_DIR)/%.map: $(MINIMAL1_BUILD_DIR)/%.map
431 $(install-file)
432 # Unix
433 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
434 $(install-file)
435 $(EXPORT_MINIMAL_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
436 $(install-file)
437 $(EXPORT_MINIMAL_DIR)/64/%.$(LIBRARY_SUFFIX): $(MINIMAL1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
438 $(install-file)
439 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(MINIMAL1_BUILD_DIR)/%.debuginfo
440 $(install-file)
441 $(EXPORT_MINIMAL_DIR)/%.debuginfo: $(MINIMAL1_BUILD_DIR)/%.debuginfo
442 $(install-file)
443 $(EXPORT_MINIMAL_DIR)/64/%.debuginfo: $(MINIMAL1_BUILD_DIR)/%.debuginfo
444 $(install-file)
445 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz
446 $(install-file)
447 $(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz
448 $(install-file)
449 endif
450
451 # Zero
452 ifeq ($(JVM_VARIANT_ZERO), true)
453 # Common
454 $(EXPORT_LIB_DIR)/%.jar: $(ZERO_BUILD_DIR)/../generated/%.jar
455 $(install-file)
456 $(EXPORT_INCLUDE_DIR)/%: $(ZERO_BUILD_DIR)/../generated/jvmtifiles/%
457 $(install-file)
458 # Unix
459 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
460 $(install-file)
461 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(ZERO_BUILD_DIR)/%.debuginfo
462 $(install-file)
463 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(ZERO_BUILD_DIR)/%.diz
464 $(install-file)
465 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
466 $(install-file)
467 $(EXPORT_SERVER_DIR)/%.debuginfo: $(ZERO_BUILD_DIR)/%.debuginfo
468 $(install-file)
469 $(EXPORT_SERVER_DIR)/%.diz: $(ZERO_BUILD_DIR)/%.diz
470 $(install-file)
471 endif
472
473 # Shark
334 ifeq ($(JVM_VARIANT_ZEROSHARK), true) 474 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
335 MISC_DIR=$(SHARK_DIR) 475 # Common
336 GEN_DIR=$(SHARK_BASE_DIR)/generated 476 $(EXPORT_LIB_DIR)/%.jar: $(SHARK_BUILD_DIR)/../generated/%.jar
337 endif 477 $(install-file)
338 ifeq ($(JVM_VARIANT_ZERO), true) 478 $(EXPORT_INCLUDE_DIR)/%: $(SHARK_BUILD_DIR)/../generated/jvmtifiles/%
339 MISC_DIR=$(ZERO_DIR) 479 $(install-file)
340 GEN_DIR=$(ZERO_BASE_DIR)/generated 480 # Unix
341 endif 481 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
342 ifeq ($(JVM_VARIANT_MINIMAL1), true) 482 $(install-file)
343 MISC_DIR=$(MINIMAL1_DIR) 483 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo): $(SHARK_BUILD_DIR)/%.debuginfo
344 GEN_DIR=$(MINIMAL1_BASE_DIR)/generated 484 $(install-file)
345 endif 485 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz
346 486 $(install-file)
347 # Bin files (windows) 487 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
348 ifeq ($(OSNAME),windows) 488 $(install-file)
349 489 $(EXPORT_SERVER_DIR)/%.debuginfo: $(SHARK_BUILD_DIR)/%.debuginfo
350 # Get jvm.lib 490 $(install-file)
351 $(EXPORT_LIB_DIR)/%.lib: $(MISC_DIR)/%.lib 491 $(EXPORT_SERVER_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz
352 $(install-file) 492 $(install-file)
353 493 endif
354 # Other libraries (like SA)
355 $(EXPORT_JRE_BIN_DIR)/%.diz: $(MISC_DIR)/%.diz
356 $(install-file)
357 $(EXPORT_JRE_BIN_DIR)/%.dll: $(MISC_DIR)/%.dll
358 $(install-file)
359 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(MISC_DIR)/%.pdb
360 $(install-file)
361 $(EXPORT_JRE_BIN_DIR)/%.map: $(MISC_DIR)/%.map
362 $(install-file)
363
364 # Client files always come from C1 area
365 $(EXPORT_CLIENT_DIR)/%.diz: $(C1_DIR)/%.diz
366 $(install-file)
367 $(EXPORT_CLIENT_DIR)/%.dll: $(C1_DIR)/%.dll
368 $(install-file)
369 $(EXPORT_CLIENT_DIR)/%.pdb: $(C1_DIR)/%.pdb
370 $(install-file)
371 $(EXPORT_CLIENT_DIR)/%.map: $(C1_DIR)/%.map
372 $(install-file)
373
374 # Server files always come from C2 area
375 $(EXPORT_SERVER_DIR)/%.diz: $(C2_DIR)/%.diz
376 $(install-file)
377 $(EXPORT_SERVER_DIR)/%.dll: $(C2_DIR)/%.dll
378 $(install-file)
379 $(EXPORT_SERVER_DIR)/%.pdb: $(C2_DIR)/%.pdb
380 $(install-file)
381 $(EXPORT_SERVER_DIR)/%.map: $(C2_DIR)/%.map
382 $(install-file)
383 endif
384
385 # Minimal JVM files always come from minimal area
386 $(EXPORT_MINIMAL_DIR)/%.diz: $(MINIMAL1_DIR)/%.diz
387 $(install-file)
388 $(EXPORT_MINIMAL_DIR)/%.dll: $(MINIMAL1_DIR)/%.dll
389 $(install-file)
390 $(EXPORT_MINIMAL_DIR)/%.pdb: $(MINIMAL1_DIR)/%.pdb
391 $(install-file)
392 $(EXPORT_MINIMAL_DIR)/%.map: $(MINIMAL1_DIR)/%.map
393 $(install-file)
394
395 # Shared Library
396 ifneq ($(OSNAME),windows)
397 ifeq ($(JVM_VARIANT_SERVER), true)
398 # C2
399 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
400 $(install-file)
401 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
402 $(install-file)
403 $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
404 $(install-file)
405 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
406 $(install-file)
407 $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
408 $(install-file)
409 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo
410 $(install-file)
411 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_DIR)/%.diz
412 $(install-file)
413 $(EXPORT_SERVER_DIR)/%.diz: $(C2_DIR)/%.diz
414 $(install-file)
415 $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_DIR)/%.diz
416 $(install-file)
417
418 # Graal
419 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(GRAAL_DIR)/%.$(LIBRARY_SUFFIX)
420 $(install-file)
421 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(GRAAL_DIR)/%.$(LIBRARY_SUFFIX)
422 $(install-file)
423 $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(GRAAL_DIR)/%.$(LIBRARY_SUFFIX)
424 $(install-file)
425 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(GRAAL_DIR)/%.debuginfo
426 $(install-file)
427 $(EXPORT_SERVER_DIR)/%.debuginfo: $(GRAAL_DIR)/%.debuginfo
428 $(install-file)
429 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(GRAAL_DIR)/%.debuginfo
430 $(install-file)
431 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(GRAAL_DIR)/%.diz
432 $(install-file)
433 $(EXPORT_SERVER_DIR)/%.diz: $(GRAAL_DIR)/%.diz
434 $(install-file)
435 $(EXPORT_SERVER_DIR)/64/%.diz: $(GRAAL_DIR)/%.diz
436 $(install-file)
437 endif
438 ifeq ($(JVM_VARIANT_CLIENT), true)
439 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
440 $(install-file)
441 $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
442 $(install-file)
443 $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
444 $(install-file)
445 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
446 $(install-file)
447 $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
448 $(install-file)
449 $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo
450 $(install-file)
451 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_DIR)/%.diz
452 $(install-file)
453 $(EXPORT_CLIENT_DIR)/%.diz: $(C1_DIR)/%.diz
454 $(install-file)
455 $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_DIR)/%.diz
456 $(install-file)
457 endif
458 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
459 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
460 $(install-file)
461 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo): $(SHARK_DIR)/%.debuginfo
462 $(install-file)
463 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(SHARK_DIR)/%.diz
464 $(install-file)
465 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
466 $(install-file)
467 $(EXPORT_SERVER_DIR)/%.debuginfo: $(SHARK_DIR)/%.debuginfo
468 $(install-file)
469 $(EXPORT_SERVER_DIR)/%.diz: $(SHARK_DIR)/%.diz
470 $(install-file)
471 endif
472 ifeq ($(JVM_VARIANT_ZERO), true)
473 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
474 $(install-file)
475 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(ZERO_DIR)/%.debuginfo
476 $(install-file)
477 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(ZERO_DIR)/%.diz
478 $(install-file)
479 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
480 $(install-file)
481 $(EXPORT_SERVER_DIR)/%.debuginfo: $(ZERO_DIR)/%.debuginfo
482 $(install-file)
483 $(EXPORT_SERVER_DIR)/%.diz: $(ZERO_DIR)/%.diz
484 $(install-file)
485 endif
486 ifeq ($(JVM_VARIANT_MINIMAL1), true)
487 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
488 $(install-file)
489 $(EXPORT_MINIMAL_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
490 $(install-file)
491 $(EXPORT_MINIMAL_DIR)/64/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
492 $(install-file)
493 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(MINIMAL1_DIR)/%.debuginfo
494 $(install-file)
495 $(EXPORT_MINIMAL_DIR)/%.debuginfo: $(MINIMAL1_DIR)/%.debuginfo
496 $(install-file)
497 $(EXPORT_MINIMAL_DIR)/64/%.debuginfo: $(MINIMAL1_DIR)/%.debuginfo
498 $(install-file)
499 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(MINIMAL1_DIR)/%.diz
500 $(install-file)
501 $(EXPORT_MINIMAL_DIR)/%.diz: $(MINIMAL1_DIR)/%.diz
502 $(install-file)
503 $(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_DIR)/%.diz
504 $(install-file)
505 endif
506 endif
507
508 # Jar file (sa-jdi.jar)
509 $(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
510 $(install-file)
511
512 # Shared jar files
513 $(EXPORT_JRE_LIB_DIR)/%.jar: $(SHARED_DIR)/%.jar
514 $(install-file)
515
516 # Shared options files
517 $(EXPORT_JRE_LIB_DIR)/%.options: $(SHARED_DIR)/%.options
518 $(install-file)
519
520 # Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h, jfr.h)
521 $(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/%
522 $(install-file)
523 494
524 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/% 495 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/%
525 $(install-file) 496 $(install-file)
526 497
527 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/prims/% 498 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/prims/%
535 $(install-file) 506 $(install-file)
536 507
537 JFR_EXISTS=$(shell if [ -d $(HS_ALT_SRC) ]; then echo 1; else echo 0; fi) 508 JFR_EXISTS=$(shell if [ -d $(HS_ALT_SRC) ]; then echo 1; else echo 0; fi)
538 # export jfr.h 509 # export jfr.h
539 ifeq ($JFR_EXISTS,1) 510 ifeq ($JFR_EXISTS,1)
540 $(EXPORT_INCLUDE_DIR)/%: $(HS_ALT_SRC)/share/vm/jfr/agent/% 511 $(EXPORT_INCLUDE_DIR)/%: $(HS_ALT_SRC)/share/vm/jfr/%
541 $(install-file) 512 $(install-file)
542 else 513 else
543 $(EXPORT_INCLUDE_DIR)/jfr.h: 514 $(EXPORT_INCLUDE_DIR)/jfr.h:
544 endif 515 endif
545 516