Mercurial > hg > truffle

comparison make/defs.make @ 21559:be896a1983c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Thu, 28 May 2015 15:36:48 +0200
parents 5324104ac4f3
children 47bebae7454f
comparison
equal deleted inserted replaced
21558:d563baeca9df 21559:be896a1983c0
339 EXPORT_LIB_DIR = $(EXPORT_PATH)/lib 339 EXPORT_LIB_DIR = $(EXPORT_PATH)/lib
340 EXPORT_JRE_DIR = $(EXPORT_PATH)/jre 340 EXPORT_JRE_DIR = $(EXPORT_PATH)/jre
341 EXPORT_JRE_BIN_DIR = $(EXPORT_JRE_DIR)/bin 341 EXPORT_JRE_BIN_DIR = $(EXPORT_JRE_DIR)/bin
342 EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib 342 EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib
343 EXPORT_JRE_LIB_EXT_DIR = $(EXPORT_JRE_LIB_DIR)/ext 343 EXPORT_JRE_LIB_EXT_DIR = $(EXPORT_JRE_LIB_DIR)/ext
344 EXPORT_JRE_LIB_GRAAL_DIR = $(EXPORT_JRE_LIB_DIR)/graal 344 EXPORT_JRE_LIB_JVMCI_DIR = $(EXPORT_JRE_LIB_DIR)/jvmci
345 EXPORT_JRE_LIB_GRAAL_SERVICES_DIR = $(EXPORT_JRE_LIB_GRAAL_DIR)/services 345 EXPORT_JRE_LIB_JVMCI_SERVICES_DIR = $(EXPORT_JRE_LIB_JVMCI_DIR)/services
346 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH) 346 EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH)
347 347
348 # non-universal macosx builds need to appear universal 348 # non-universal macosx builds need to appear universal
349 ifeq ($(OS_VENDOR), Darwin) 349 ifeq ($(OS_VENDOR), Darwin)
350 ifneq ($(MACOSX_UNIVERSAL), true) 350 ifneq ($(MACOSX_UNIVERSAL), true)
356 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h 356 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmti.h
357 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h 357 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jvmticmlr.h
358 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h 358 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jni.h
359 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h 359 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h
360 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h 360 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jmm.h
361 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/graal-loader.jar 361 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/jvmci-loader.jar
362 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/truffle.jar 362 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/truffle.jar
363 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_DIR)/graal.jar 363 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_DIR)/graal.jar
364 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_DIR)/graal-truffle.jar 364 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_DIR)/graal-truffle.jar
365 365
366 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.compiler.match.MatchStatementSet 366 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/com.oracle.jvmci.hotspot.HotSpotJVMCIBackendFactory
367 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.hotspot.HotSpotBackendFactory 367 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/com.oracle.jvmci.hotspot.HotSpotVMEventListener
368 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.nodes.spi.ReplacementsProvider 368 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/com.oracle.jvmci.runtime.OptionsParsed
369 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.phases.tiers.CompilerConfiguration 369
370 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.truffle.hotspot.nfi.RawNativeCallNodeFactory 370 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/com.oracle.graal.api.runtime.GraalRuntimeFactory
371 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.truffle.OptimizedCallTargetInstrumentationFactory 371 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/com.oracle.graal.compiler.match.MatchStatementSet
372 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.graal.api.runtime.GraalRuntimeFactory 372 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/com.oracle.graal.hotspot.HotSpotBackendFactory
373 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.jvmci.hotspot.HotSpotJVMCIBackendFactory 373 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/com.oracle.graal.nodes.spi.ReplacementsProvider
374 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.jvmci.hotspot.HotSpotVMEventListener 374 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/com.oracle.graal.phases.tiers.CompilerConfiguration
375 EXPORT_LIST += $(EXPORT_JRE_LIB_GRAAL_SERVICES_DIR)/com.oracle.jvmci.runtime.OptionsParsed 375 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/com.oracle.graal.truffle.hotspot.nfi.RawNativeCallNodeFactory
376 EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/com.oracle.graal.truffle.OptimizedCallTargetInstrumentationFactory
376 377
377 .PHONY: $(HS_ALT_MAKE)/defs.make 378 .PHONY: $(HS_ALT_MAKE)/defs.make
378 379