Mercurial > hg > graal-jvmci-8
diff make/linux/Makefile @ 21559:be896a1983c0
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 | c1bb8028ff63 |
children | dd9cc155639c |
line wrap: on
line diff
--- a/make/linux/Makefile Wed May 27 13:43:27 2015 +0200 +++ b/make/linux/Makefile Thu May 28 15:36:48 2015 +0200 @@ -195,7 +195,7 @@ SUBDIRS_ZERO = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS)) SUBDIRS_SHARK = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS)) SUBDIRS_MINIMAL1 = $(addprefix $(OSNAME)_$(BUILDARCH)_minimal1/,$(TARGETS)) -SUBDIRS_GRAAL = $(addprefix $(OSNAME)_$(BUILDARCH)_graal/,$(TARGETS)) +SUBDIRS_JVMCI = $(addprefix $(OSNAME)_$(BUILDARCH)_jvmci/,$(TARGETS)) TARGETS_C2 = $(TARGETS) TARGETS_C1 = $(addsuffix 1,$(TARGETS)) @@ -204,7 +204,7 @@ TARGETS_ZERO = $(addsuffix zero,$(TARGETS)) TARGETS_SHARK = $(addsuffix shark,$(TARGETS)) TARGETS_MINIMAL1 = $(addsuffix minimal1,$(TARGETS)) -TARGETS_GRAAL = $(addsuffix graal,$(TARGETS)) +TARGETS_JVMCI = $(addsuffix jvmci,$(TARGETS)) BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) @@ -224,7 +224,7 @@ @echo " $(TARGETS_ZERO)" @echo " $(TARGETS_SHARK)" @echo " $(TARGETS_MINIMAL1)" - @echo " $(TARGETS_GRAAL)" + @echo " $(TARGETS_JVMCI)" checks: check_os_version check_j2se_version @@ -286,9 +286,9 @@ $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks $(BUILDTREE) VARIANT=minimal1 -$(SUBDIRS_GRAAL): $(BUILDTREE_MAKE) +$(SUBDIRS_JVMCI): $(BUILDTREE_MAKE) $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=graal + $(BUILDTREE) VARIANT=jvmci platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in $(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@ @@ -337,10 +337,10 @@ cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS) install endif -$(TARGETS_GRAAL): $(SUBDIRS_GRAAL) - cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && $(MAKE) $(MFLAGS) +$(TARGETS_JVMCI): $(SUBDIRS_JVMCI) + cd $(OSNAME)_$(BUILDARCH)_jvmci/$(patsubst %jvmci,%,$@) && $(MAKE) $(MFLAGS) ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && $(MAKE) $(MFLAGS) install + cd $(OSNAME)_$(BUILDARCH)_jvmci/$(patsubst %jvmci,%,$@) && $(MAKE) $(MFLAGS) install endif # Just build the tree, and nothing else: @@ -350,7 +350,7 @@ treezero: $(SUBDIRS_ZERO) treeshark: $(SUBDIRS_SHARK) treeminimal1: $(SUBDIRS_MINIMAL1) -treegraal: $(SUBDIRS_GRAAL) +treejvmci: $(SUBDIRS_JVMCI) # Doc target. This is the same for all build options. # Hence create a docs directory beside ...$(ARCH)_[...] @@ -388,10 +388,10 @@ clean_docs: rm -rf $(SUBDIR_DOCS) -clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark clean_graal clean_minimal1: +clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark clean_jvmci clean_minimal1: rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@) -clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_shark clean_minimal1 clean_graal clean_docs +clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_shark clean_minimal1 clean_jvmci clean_docs include $(GAMMADIR)/make/cscope.make @@ -402,9 +402,9 @@ #------------------------------------------------------------------------------- -.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK) $(TARGETS_MINIMAL1) $(TARGETS_GRAAL) -.PHONY: tree tree1 treecore treezero treeshark treegraal -.PHONY: all compiler1 compiler2 core zero shark graal -.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs clean_graal +.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK) $(TARGETS_MINIMAL1) $(TARGETS_JVMCI) +.PHONY: tree tree1 treecore treezero treeshark treejvmci +.PHONY: all compiler1 compiler2 core zero shark jvmci +.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs clean_jvmci .PHONY: checks check_os_version check_j2se_version .PHONY: $(HS_ALT_MAKE)/$(OSNAME)/Makefile.make