460 |
460 |
461 # -parameters provides method's parameters information in class file, |
461 # -parameters provides method's parameters information in class file, |
462 # JVMCI compilers make use of that information for various sanity checks. |
462 # JVMCI compilers make use of that information for various sanity checks. |
463 # Don't use Indy strings concatenation to have good JVMCI startup performance. |
463 # Don't use Indy strings concatenation to have good JVMCI startup performance. |
464 |
464 |
465 jdk.vm.ci_ADD_JAVAC_FLAGS := -parameters -Xlint:-exports -XDstringConcat=inline |
465 jdk.internal.vm.ci_ADD_JAVAC_FLAGS := -parameters -Xlint:-exports -XDstringConcat=inline |
466 |
466 |
467 ################################################################################ |
467 ################################################################################ |
468 |
468 |
469 jdk.vm.compiler_ADD_JAVAC_FLAGS := -parameters -XDstringConcat=inline |
469 jdk.internal.vm.compiler_ADD_JAVAC_FLAGS := -parameters -XDstringConcat=inline |
470 |
470 |
471 jdk.vm.compiler_EXCLUDES += \ |
471 jdk.internal.vm.compiler_EXCLUDES += \ |
472 org.graalvm.compiler.core.match.processor \ |
472 org.graalvm.compiler.core.match.processor \ |
473 org.graalvm.compiler.nodeinfo.processor \ |
473 org.graalvm.compiler.nodeinfo.processor \ |
474 org.graalvm.compiler.options.processor \ |
474 org.graalvm.compiler.options.processor \ |
475 org.graalvm.compiler.serviceprovider.processor \ |
475 org.graalvm.compiler.serviceprovider.processor \ |
476 org.graalvm.compiler.replacements.verifier \ |
476 org.graalvm.compiler.replacements.verifier \ |
555 MODULESOURCEPATH := $(call GetModuleSrcPath) |
555 MODULESOURCEPATH := $(call GetModuleSrcPath) |
556 |
556 |
557 # Add imported modules to the modulepath |
557 # Add imported modules to the modulepath |
558 MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES)) |
558 MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES)) |
559 |
559 |
560 ifeq ($(MODULE), jdk.vm.ci) |
560 ifeq ($(MODULE), jdk.internal.vm.ci) |
561 ## WORKAROUND jdk.vm.ci source structure issue |
561 ## WORKAROUND jdk.internal.vm.ci source structure issue |
562 JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \ |
562 JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \ |
563 $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \ |
563 $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \ |
564 $(wildcard $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes/*/src))) |
564 $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src))) |
565 MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH)) |
565 MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH)) |
566 endif |
566 endif |
567 |
567 |
568 ifeq ($(MODULE), jdk.vm.compiler) |
568 ifeq ($(MODULE), jdk.internal.vm.compiler) |
569 ## WORKAROUND jdk.vm.compiler source structure issue |
569 ## WORKAROUND jdk.internal.vm.compiler source structure issue |
570 VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \ |
570 VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \ |
571 $(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \ |
571 $(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \ |
572 $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src))) |
572 $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src))) |
573 MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH)) |
573 MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH)) |
574 endif |
574 endif |