Mercurial > hg > graal-compiler

comparison make/defs.make @ 21791:cd36556e1b78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove conditional makefile-based compilation of jvmci from mx_graal.py
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Mon, 08 Jun 2015 14:25:25 +0200
parents 3d15183f3c93
children 44bad469bec2
comparison
equal deleted inserted replaced
21790:6db6070d30b9 21791:cd36556e1b78
374 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.jvmci.hotspot.HotSpotResolvedJavaFieldImpl 374 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.jvmci.hotspot.HotSpotResolvedJavaFieldImpl
375 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.jvmci.hotspot.HotSpotResolvedJavaMethodImpl 375 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.jvmci.hotspot.HotSpotResolvedJavaMethodImpl
376 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.jvmci.hotspot.CompileTheWorld 376 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.jvmci.hotspot.CompileTheWorld
377 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.jvmci.compiler.Compiler 377 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.jvmci.compiler.Compiler
378 378
379 <<<<<<< local
379 ifeq ($(JVMCI_USE_MAKE),) 380 ifeq ($(JVMCI_USE_MAKE),)
380 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/truffle.jar 381 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/truffle.jar
381 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_DIR)/graal.jar 382 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_DIR)/graal.jar
382 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_DIR)/graal-truffle.jar 383 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_DIR)/graal-truffle.jar
383 384
432 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.graal.truffle.TruffleCompilerOptions 433 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.graal.truffle.TruffleCompilerOptions
433 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.graal.virtual.phases.ea.PartialEscapePhase 434 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.graal.virtual.phases.ea.PartialEscapePhase
434 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.graal.lir.asm.CompilationResultBuilder 435 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.graal.lir.asm.CompilationResultBuilder
435 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.graal.java.BytecodeParser 436 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/com.oracle.graal.java.BytecodeParser
436 endif 437 endif
438 =======
439 >>>>>>> other
437 440
438 .PHONY: $(HS_ALT_MAKE)/defs.make 441 .PHONY: $(HS_ALT_MAKE)/defs.make
439 442