comparison 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
comparison
equal deleted inserted replaced
21558:d563baeca9df 21559:be896a1983c0
193 SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS)) 193 SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
194 SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS)) 194 SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
195 SUBDIRS_ZERO = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS)) 195 SUBDIRS_ZERO = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS))
196 SUBDIRS_SHARK = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS)) 196 SUBDIRS_SHARK = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS))
197 SUBDIRS_MINIMAL1 = $(addprefix $(OSNAME)_$(BUILDARCH)_minimal1/,$(TARGETS)) 197 SUBDIRS_MINIMAL1 = $(addprefix $(OSNAME)_$(BUILDARCH)_minimal1/,$(TARGETS))
198 SUBDIRS_GRAAL = $(addprefix $(OSNAME)_$(BUILDARCH)_graal/,$(TARGETS)) 198 SUBDIRS_JVMCI = $(addprefix $(OSNAME)_$(BUILDARCH)_jvmci/,$(TARGETS))
199 199
200 TARGETS_C2 = $(TARGETS) 200 TARGETS_C2 = $(TARGETS)
201 TARGETS_C1 = $(addsuffix 1,$(TARGETS)) 201 TARGETS_C1 = $(addsuffix 1,$(TARGETS))
202 TARGETS_TIERED = $(addsuffix tiered,$(TARGETS)) 202 TARGETS_TIERED = $(addsuffix tiered,$(TARGETS))
203 TARGETS_CORE = $(addsuffix core,$(TARGETS)) 203 TARGETS_CORE = $(addsuffix core,$(TARGETS))
204 TARGETS_ZERO = $(addsuffix zero,$(TARGETS)) 204 TARGETS_ZERO = $(addsuffix zero,$(TARGETS))
205 TARGETS_SHARK = $(addsuffix shark,$(TARGETS)) 205 TARGETS_SHARK = $(addsuffix shark,$(TARGETS))
206 TARGETS_MINIMAL1 = $(addsuffix minimal1,$(TARGETS)) 206 TARGETS_MINIMAL1 = $(addsuffix minimal1,$(TARGETS))
207 TARGETS_GRAAL = $(addsuffix graal,$(TARGETS)) 207 TARGETS_JVMCI = $(addsuffix jvmci,$(TARGETS))
208 208
209 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make 209 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
210 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) 210 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
211 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 211 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
212 BUILDTREE_VARS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE) 212 BUILDTREE_VARS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE)
222 @echo " $(TARGETS_C1)" 222 @echo " $(TARGETS_C1)"
223 @echo " $(TARGETS_CORE)" 223 @echo " $(TARGETS_CORE)"
224 @echo " $(TARGETS_ZERO)" 224 @echo " $(TARGETS_ZERO)"
225 @echo " $(TARGETS_SHARK)" 225 @echo " $(TARGETS_SHARK)"
226 @echo " $(TARGETS_MINIMAL1)" 226 @echo " $(TARGETS_MINIMAL1)"
227 @echo " $(TARGETS_GRAAL)" 227 @echo " $(TARGETS_JVMCI)"
228 228
229 checks: check_os_version check_j2se_version 229 checks: check_os_version check_j2se_version
230 230
231 # We do not want people accidentally building on old systems (e.g. Linux 2.2.x, 231 # We do not want people accidentally building on old systems (e.g. Linux 2.2.x,
232 # Solaris 2.5.1, 2.6). 232 # Solaris 2.5.1, 2.6).
284 284
285 $(SUBDIRS_MINIMAL1): $(BUILDTREE_MAKE) 285 $(SUBDIRS_MINIMAL1): $(BUILDTREE_MAKE)
286 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks 286 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
287 $(BUILDTREE) VARIANT=minimal1 287 $(BUILDTREE) VARIANT=minimal1
288 288
289 $(SUBDIRS_GRAAL): $(BUILDTREE_MAKE) 289 $(SUBDIRS_JVMCI): $(BUILDTREE_MAKE)
290 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks 290 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
291 $(BUILDTREE) VARIANT=graal 291 $(BUILDTREE) VARIANT=jvmci
292 292
293 platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in 293 platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in
294 $(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@ 294 $(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@
295 295
296 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME 296 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
335 cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS) 335 cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS)
336 ifdef INSTALL 336 ifdef INSTALL
337 cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS) install 337 cd $(OSNAME)_$(BUILDARCH)_minimal1/$(patsubst %minimal1,%,$@) && $(MAKE) $(MFLAGS) install
338 endif 338 endif
339 339
340 $(TARGETS_GRAAL): $(SUBDIRS_GRAAL) 340 $(TARGETS_JVMCI): $(SUBDIRS_JVMCI)
341 cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && $(MAKE) $(MFLAGS) 341 cd $(OSNAME)_$(BUILDARCH)_jvmci/$(patsubst %jvmci,%,$@) && $(MAKE) $(MFLAGS)
342 ifdef INSTALL 342 ifdef INSTALL
343 cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && $(MAKE) $(MFLAGS) install 343 cd $(OSNAME)_$(BUILDARCH)_jvmci/$(patsubst %jvmci,%,$@) && $(MAKE) $(MFLAGS) install
344 endif 344 endif
345 345
346 # Just build the tree, and nothing else: 346 # Just build the tree, and nothing else:
347 tree: $(SUBDIRS_C2) 347 tree: $(SUBDIRS_C2)
348 tree1: $(SUBDIRS_C1) 348 tree1: $(SUBDIRS_C1)
349 treecore: $(SUBDIRS_CORE) 349 treecore: $(SUBDIRS_CORE)
350 treezero: $(SUBDIRS_ZERO) 350 treezero: $(SUBDIRS_ZERO)
351 treeshark: $(SUBDIRS_SHARK) 351 treeshark: $(SUBDIRS_SHARK)
352 treeminimal1: $(SUBDIRS_MINIMAL1) 352 treeminimal1: $(SUBDIRS_MINIMAL1)
353 treegraal: $(SUBDIRS_GRAAL) 353 treejvmci: $(SUBDIRS_JVMCI)
354 354
355 # Doc target. This is the same for all build options. 355 # Doc target. This is the same for all build options.
356 # Hence create a docs directory beside ...$(ARCH)_[...] 356 # Hence create a docs directory beside ...$(ARCH)_[...]
357 # We specify 'BUILD_FLAVOR=product' so that the proper 357 # We specify 'BUILD_FLAVOR=product' so that the proper
358 # ENABLE_FULL_DEBUG_SYMBOLS value is used. 358 # ENABLE_FULL_DEBUG_SYMBOLS value is used.
386 jvmgshark: warn_jvmg_deprecated debugshark 386 jvmgshark: warn_jvmg_deprecated debugshark
387 387
388 clean_docs: 388 clean_docs:
389 rm -rf $(SUBDIR_DOCS) 389 rm -rf $(SUBDIR_DOCS)
390 390
391 clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark clean_graal clean_minimal1: 391 clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark clean_jvmci clean_minimal1:
392 rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@) 392 rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
393 393
394 clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_shark clean_minimal1 clean_graal clean_docs 394 clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_shark clean_minimal1 clean_jvmci clean_docs
395 395
396 include $(GAMMADIR)/make/cscope.make 396 include $(GAMMADIR)/make/cscope.make
397 397
398 # 398 #
399 # Include alternate Makefile if it exists. 399 # Include alternate Makefile if it exists.
400 # 400 #
401 -include $(HS_ALT_MAKE)/$(OSNAME)/Makefile.make 401 -include $(HS_ALT_MAKE)/$(OSNAME)/Makefile.make
402 402
403 #------------------------------------------------------------------------------- 403 #-------------------------------------------------------------------------------
404 404
405 .PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK) $(TARGETS_MINIMAL1) $(TARGETS_GRAAL) 405 .PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK) $(TARGETS_MINIMAL1) $(TARGETS_JVMCI)
406 .PHONY: tree tree1 treecore treezero treeshark treegraal 406 .PHONY: tree tree1 treecore treezero treeshark treejvmci
407 .PHONY: all compiler1 compiler2 core zero shark graal 407 .PHONY: all compiler1 compiler2 core zero shark jvmci
408 .PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs clean_graal 408 .PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs clean_jvmci
409 .PHONY: checks check_os_version check_j2se_version 409 .PHONY: checks check_os_version check_j2se_version
410 .PHONY: $(HS_ALT_MAKE)/$(OSNAME)/Makefile.make 410 .PHONY: $(HS_ALT_MAKE)/$(OSNAME)/Makefile.make