Mercurial > hg > graal-jvmci-8

comparison make/Makefile @ 6275:957c266d8bc5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Tue, 21 Aug 2012 10:39:19 +0200
parents 33df1aeaebbf 74c359c4a9e5
children e522a00b91aa
comparison
equal deleted inserted replaced
5891:fd8832ae511d 6275:957c266d8bc5
141 # Build or export docs 141 # Build or export docs
142 docs: 142 docs:
143 ifeq ($(OSNAME),windows) 143 ifeq ($(OSNAME),windows)
144 @$(ECHO) "No docs ($(VM_TARGET)) for windows" 144 @$(ECHO) "No docs ($(VM_TARGET)) for windows"
145 else 145 else
146 # We specify 'BUILD_FLAVOR=product' so that the proper
147 # ENABLE_FULL_DEBUG_SYMBOLS value is used.
146 $(CD) $(OUTPUTDIR); \ 148 $(CD) $(OUTPUTDIR); \
147 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 149 $(MAKE) -f $(ABS_OS_MAKEFILE) \
148 $(MAKE_ARGS) docs 150 $(MAKE_ARGS) BUILD_FLAVOR=product docs
149 endif 151 endif
150 152
151 # Build variation of hotspot 153 # Build variation of hotspot
152 $(C1_VM_TARGETS): 154 $(C1_VM_TARGETS):
153 $(CD) $(GAMMADIR)/make; \ 155 $(CD) $(GAMMADIR)/make; \
154 $(MAKE) VM_TARGET=$@ generic_build1 $(ALT_OUT) 156 $(MAKE) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT)
155 157
156 $(C2_VM_TARGETS): 158 $(C2_VM_TARGETS):
157 $(CD) $(GAMMADIR)/make; \ 159 $(CD) $(GAMMADIR)/make; \
158 $(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT) 160 $(MAKE) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT)
159 161
160 $(KERNEL_VM_TARGETS): 162 $(KERNEL_VM_TARGETS):
161 $(CD) $(GAMMADIR)/make; \ 163 $(CD) $(GAMMADIR)/make; \
162 $(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT) 164 $(MAKE) BUILD_FLAVOR=$(@:%kernel=%) VM_TARGET=$@ \
165 generic_buildkernel $(ALT_OUT)
163 166
164 $(ZERO_VM_TARGETS): 167 $(ZERO_VM_TARGETS):
165 $(CD) $(GAMMADIR)/make; \ 168 $(CD) $(GAMMADIR)/make; \
166 $(MAKE) VM_TARGET=$@ generic_buildzero $(ALT_OUT) 169 $(MAKE) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ \
170 generic_buildzero $(ALT_OUT)
167 171
168 $(SHARK_VM_TARGETS): 172 $(SHARK_VM_TARGETS):
169 $(CD) $(GAMMADIR)/make; \ 173 $(CD) $(GAMMADIR)/make; \
170 $(MAKE) VM_TARGET=$@ generic_buildshark $(ALT_OUT) 174 $(MAKE) BUILD_FLAVOR=$(@:%shark=%) VM_TARGET=$@ \
175 generic_buildshark $(ALT_OUT)
171 176
172 $(GRAAL_VM_TARGETS): 177 $(GRAAL_VM_TARGETS):
173 $(CD) $(GAMMADIR)/make; \ 178 $(CD) $(GAMMADIR)/make; \
174 $(MAKE) VM_TARGET=$@ generic_buildgraal $(ALT_OUT) 179 $(MAKE) VM_TARGET=$@ generic_buildgraal $(ALT_OUT)
175 180
248 $(MAKE_ARGS) $(VM_TARGET) 253 $(MAKE_ARGS) $(VM_TARGET)
249 254
250 # Export file rule 255 # Export file rule
251 generic_export: $(EXPORT_LIST) 256 generic_export: $(EXPORT_LIST)
252 export_product: 257 export_product:
253 $(MAKE) VM_SUBDIR=product generic_export 258 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
259 generic_export
254 export_fastdebug: 260 export_fastdebug:
255 $(MAKE) VM_SUBDIR=fastdebug EXPORT_SUBDIR=/fastdebug generic_export 261 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
262 EXPORT_SUBDIR=/$(@:export_%=%) \
263 generic_export
256 export_debug: 264 export_debug:
257 $(MAKE) VM_SUBDIR=${VM_DEBUG} EXPORT_SUBDIR=/debug generic_export 265 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=${VM_DEBUG} \
266 EXPORT_SUBDIR=/$(@:export_%=%) \
267 generic_export
258 export_optimized: 268 export_optimized:
259 $(MAKE) VM_SUBDIR=optimized EXPORT_SUBDIR=/optimized generic_export 269 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
270 EXPORT_SUBDIR=/$(@:export_%=%) \
271 generic_export
260 export_product_jdk:: 272 export_product_jdk::
261 $(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \ 273 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \
262 VM_SUBDIR=product generic_export 274 VM_SUBDIR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \
275 generic_export
263 export_optimized_jdk:: 276 export_optimized_jdk::
264 $(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \ 277 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \
265 VM_SUBDIR=optimized generic_export 278 VM_SUBDIR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \
279 generic_export
266 export_fastdebug_jdk:: 280 export_fastdebug_jdk::
267 $(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/fastdebug \ 281 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \
268 VM_SUBDIR=fastdebug generic_export 282 VM_SUBDIR=$(@:export_%_jdk=%) \
283 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
284 generic_export
269 export_debug_jdk:: 285 export_debug_jdk::
270 $(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/debug \ 286 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=${VM_DEBUG} \
271 VM_SUBDIR=${VM_DEBUG} generic_export 287 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
288 generic_export
272 289
273 # Export file copy rules 290 # Export file copy rules
274 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt 291 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
275 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs 292 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
276 C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 293 C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
284 KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR) 301 KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
285 ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR) 302 ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
286 SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR) 303 SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
287 GRAAL_DIR=$(GRAAL_BASE_DIR)/$(VM_SUBDIR) 304 GRAAL_DIR=$(GRAAL_BASE_DIR)/$(VM_SUBDIR)
288 305
289 # Misc files and generated files need to come from C1 or C2 area 306 ifeq ($(JVM_VARIANT_SERVER), true)
290 ifeq ($(ZERO_BUILD), true) 307 MISC_DIR=$(C2_DIR)
291 ifeq ($(SHARK_BUILD), true) 308 GEN_DIR=$(C2_BASE_DIR)/generated
292 MISC_DIR=$(SHARK_DIR) 309 endif
293 GEN_DIR=$(SHARK_BASE_DIR)/generated 310 ifeq ($(JVM_VARIANT_CLIENT), true)
294 else 311 MISC_DIR=$(C1_DIR)
295 MISC_DIR=$(ZERO_DIR) 312 GEN_DIR=$(C1_BASE_DIR)/generated
296 GEN_DIR=$(ZERO_BASE_DIR)/generated 313 endif
297 endif 314 ifeq ($(JVM_VARIANT_KERNEL), true)
298 else 315 MISC_DIR=$(C2_DIR)
299 ifeq ($(ARCH_DATA_MODEL), 32) 316 GEN_DIR=$(C2_BASE_DIR)/generated
300 MISC_DIR=$(C1_DIR) 317 endif
301 GEN_DIR=$(C1_BASE_DIR)/generated 318 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
302 else 319 MISC_DIR=$(SHARK_DIR)
303 MISC_DIR=$(C2_DIR) 320 GEN_DIR=$(SHARK_BASE_DIR)/generated
304 GEN_DIR=$(C2_BASE_DIR)/generated 321 endif
305 endif 322 ifeq ($(JVM_VARIANT_ZERO), true)
323 MISC_DIR=$(ZERO_DIR)
324 GEN_DIR=$(ZERO_BASE_DIR)/generated
306 endif 325 endif
307 326
308 # Bin files (windows) 327 # Bin files (windows)
309 ifeq ($(OSNAME),windows) 328 ifeq ($(OSNAME),windows)
310 329
311 # Get jvm.lib 330 # Get jvm.lib
312 $(EXPORT_LIB_DIR)/%.lib: $(MISC_DIR)/%.lib 331 $(EXPORT_LIB_DIR)/%.lib: $(MISC_DIR)/%.lib
313 $(install-file) 332 $(install-file)
314 333
315 # Other libraries (like SA) 334 # Other libraries (like SA)
335 $(EXPORT_JRE_BIN_DIR)/%.diz: $(MISC_DIR)/%.diz
336 $(install-file)
316 $(EXPORT_JRE_BIN_DIR)/%.dll: $(MISC_DIR)/%.dll 337 $(EXPORT_JRE_BIN_DIR)/%.dll: $(MISC_DIR)/%.dll
317 $(install-file) 338 $(install-file)
318 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(MISC_DIR)/%.pdb 339 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(MISC_DIR)/%.pdb
319 $(install-file) 340 $(install-file)
320 $(EXPORT_JRE_BIN_DIR)/%.map: $(MISC_DIR)/%.map 341 $(EXPORT_JRE_BIN_DIR)/%.map: $(MISC_DIR)/%.map
321 $(install-file) 342 $(install-file)
322 343
323 # Client files always come from C1 area 344 # Client files always come from C1 area
345 $(EXPORT_CLIENT_DIR)/%.diz: $(C1_DIR)/%.diz
346 $(install-file)
324 $(EXPORT_CLIENT_DIR)/%.dll: $(C1_DIR)/%.dll 347 $(EXPORT_CLIENT_DIR)/%.dll: $(C1_DIR)/%.dll
325 $(install-file) 348 $(install-file)
326 $(EXPORT_CLIENT_DIR)/%.pdb: $(C1_DIR)/%.pdb 349 $(EXPORT_CLIENT_DIR)/%.pdb: $(C1_DIR)/%.pdb
327 $(install-file) 350 $(install-file)
328 $(EXPORT_CLIENT_DIR)/%.map: $(C1_DIR)/%.map 351 $(EXPORT_CLIENT_DIR)/%.map: $(C1_DIR)/%.map
329 $(install-file) 352 $(install-file)
330 353
331 # Server files always come from C2 area 354 # Server files always come from C2 area
355 $(EXPORT_SERVER_DIR)/%.diz: $(C2_DIR)/%.diz
356 $(install-file)
332 $(EXPORT_SERVER_DIR)/%.dll: $(C2_DIR)/%.dll 357 $(EXPORT_SERVER_DIR)/%.dll: $(C2_DIR)/%.dll
333 $(install-file) 358 $(install-file)
334 $(EXPORT_SERVER_DIR)/%.pdb: $(C2_DIR)/%.pdb 359 $(EXPORT_SERVER_DIR)/%.pdb: $(C2_DIR)/%.pdb
335 $(install-file) 360 $(install-file)
336 $(EXPORT_SERVER_DIR)/%.map: $(C2_DIR)/%.map 361 $(EXPORT_SERVER_DIR)/%.map: $(C2_DIR)/%.map
337 $(install-file) 362 $(install-file)
338 363
339 # Kernel files always come from kernel area 364 # Kernel files always come from kernel area
365 $(EXPORT_KERNEL_DIR)/%.diz: $(KERNEL_DIR)/%.diz
366 $(install-file)
340 $(EXPORT_KERNEL_DIR)/%.dll: $(KERNEL_DIR)/%.dll 367 $(EXPORT_KERNEL_DIR)/%.dll: $(KERNEL_DIR)/%.dll
341 $(install-file) 368 $(install-file)
342 $(EXPORT_KERNEL_DIR)/%.pdb: $(KERNEL_DIR)/%.pdb 369 $(EXPORT_KERNEL_DIR)/%.pdb: $(KERNEL_DIR)/%.pdb
343 $(install-file) 370 $(install-file)
344 $(EXPORT_KERNEL_DIR)/%.map: $(KERNEL_DIR)/%.map 371 $(EXPORT_KERNEL_DIR)/%.map: $(KERNEL_DIR)/%.map
345 $(install-file) 372 $(install-file)
346 endif 373 endif
347 374
348 # Shared Library 375 # Shared Library
349 ifneq ($(OSNAME),windows) 376 ifneq ($(OSNAME),windows)
350 ifeq ($(ZERO_BUILD), true) 377 ifeq ($(JVM_VARIANT_SERVER), true)
351 ifeq ($(SHARK_BUILD), true) 378 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
352 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) 379 $(install-file)
353 $(install-file) 380 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
354 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) 381 $(install-file)
355 $(install-file) 382 $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
356 else 383 $(install-file)
357 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX) 384 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
358 $(install-file) 385 $(install-file)
359 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX) 386 $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
360 $(install-file) 387 $(install-file)
388 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo
389 $(install-file)
390 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_DIR)/%.diz
391 $(install-file)
392 $(EXPORT_SERVER_DIR)/%.diz: $(C2_DIR)/%.diz
393 $(install-file)
394 $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_DIR)/%.diz
395 $(install-file)
361 endif 396 endif
362 else 397 ifeq ($(JVM_VARIANT_CLIENT), true)
363 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) 398 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
364 $(install-file) 399 $(install-file)
365 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) 400 $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
366 $(install-file) 401 $(install-file)
367 $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) 402 $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
368 $(install-file) 403 $(install-file)
369 $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) 404 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
370 $(install-file) 405 $(install-file)
371 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) 406 $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
372 $(install-file) 407 $(install-file)
373 $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) 408 $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo
374 $(install-file) 409 $(install-file)
375 410 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_DIR)/%.diz
376 # Debug info for shared library 411 $(install-file)
377 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo 412 $(EXPORT_CLIENT_DIR)/%.diz: $(C1_DIR)/%.diz
378 $(install-file) 413 $(install-file)
379 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo 414 $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_DIR)/%.diz
380 $(install-file) 415 $(install-file)
381 $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo 416 endif
382 $(install-file) 417 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
383 $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo 418 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
384 $(install-file) 419 $(install-file)
385 $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo 420 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
386 $(install-file) 421 $(install-file)
387 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo 422 endif
388 $(install-file) 423 ifeq ($(JVM_VARIANT_ZERO), true)
389 endif 424 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
425 $(install-file)
426 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
427 $(install-file)
428 endif
390 endif 429 endif
391 430
392 # Jar file (sa-jdi.jar) 431 # Jar file (sa-jdi.jar)
393 $(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar 432 $(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
433 $(install-file)
434
435 $(EXPORT_JRE_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
394 $(install-file) 436 $(install-file)
395 437
396 # Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h, jfr.h) 438 # Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h, jfr.h)
397 $(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/% 439 $(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/%
398 $(install-file) 440 $(install-file)
461 ($(CD) $(JDK_IMPORT_PATH) && \ 503 ($(CD) $(JDK_IMPORT_PATH) && \
462 $(TAR) -cf - *) | \ 504 $(TAR) -cf - *) | \
463 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -) 505 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
464 506
465 test_jdk: 507 test_jdk:
466 ifeq ($(ARCH_DATA_MODEL), 32) 508 ifeq ($(JVM_VARIANT_CLIENT), true)
467 ifneq ($(ZERO_BUILD), true) 509 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -Xinternalversion
468 $(JDK_IMAGE_DIR)/bin/java -d32 -client -Xinternalversion 510 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -version
469 $(JDK_IMAGE_DIR)/bin/java -d32 -client -version 511 endif
470 endif 512 ifeq ($(findstring true, $(JVM_VARIANT_SERVER)\
471 $(JDK_IMAGE_DIR)/bin/java -d32 -server -Xinternalversion 513 $(JVM_VARIANT_ZERO)$(JVM_VARIANT_ZEROSHARK)), true)
472 $(JDK_IMAGE_DIR)/bin/java -d32 -server -version 514 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -server -Xinternalversion
473 endif 515 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -server -version
474 ifeq ($(ARCH_DATA_MODEL), 64) 516 endif
475 $(JDK_IMAGE_DIR)/bin/java -d64 -server -Xinternalversion 517 ifeq ($(JVM_VARIANT_KERNEL), true)
476 $(JDK_IMAGE_DIR)/bin/java -d64 -server -version 518 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -kernel -Xinternalversion
477 endif 519 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -kernel -version
520 endif
478 521
479 copy_product_jdk:: 522 copy_product_jdk::
480 $(RM) -r $(JDK_IMAGE_DIR) 523 $(RM) -r $(JDK_IMAGE_DIR)
481 $(MKDIR) -p $(JDK_IMAGE_DIR) 524 $(MKDIR) -p $(JDK_IMAGE_DIR)
482 ($(CD) $(JDK_IMPORT_PATH) && \ 525 ($(CD) $(JDK_IMPORT_PATH) && \