comparison make/linux/Makefile @ 3547:44da449fc29c

Update linux makefiles to create a graal VM, make a few run* +x
author Gilles Duboscq <gilles.duboscq@oracle.com>
date Wed, 17 Aug 2011 11:58:19 +0200
parents be4ca325525a
children 782ed8718420
comparison
equal deleted inserted replaced
3546:4aa80ca3dbec 3547:44da449fc29c
197 SUBDIRS_C2 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS)) 197 SUBDIRS_C2 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
198 SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS)) 198 SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
199 SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS)) 199 SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
200 SUBDIRS_ZERO = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS)) 200 SUBDIRS_ZERO = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS))
201 SUBDIRS_SHARK = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS)) 201 SUBDIRS_SHARK = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS))
202 SUBDIRS_GRAAL = $(addprefix $(OSNAME)_$(BUILDARCH)_graal/,$(TARGETS))
202 203
203 TARGETS_C2 = $(TARGETS) 204 TARGETS_C2 = $(TARGETS)
204 TARGETS_C1 = $(addsuffix 1,$(TARGETS)) 205 TARGETS_C1 = $(addsuffix 1,$(TARGETS))
205 TARGETS_TIERED = $(addsuffix tiered,$(TARGETS)) 206 TARGETS_TIERED = $(addsuffix tiered,$(TARGETS))
206 TARGETS_CORE = $(addsuffix core,$(TARGETS)) 207 TARGETS_CORE = $(addsuffix core,$(TARGETS))
207 TARGETS_ZERO = $(addsuffix zero,$(TARGETS)) 208 TARGETS_ZERO = $(addsuffix zero,$(TARGETS))
208 TARGETS_SHARK = $(addsuffix shark,$(TARGETS)) 209 TARGETS_SHARK = $(addsuffix shark,$(TARGETS))
210 TARGETS_GRAAL = $(addsuffix graal,$(TARGETS))
209 211
210 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make 212 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
211 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) 213 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
212 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 214 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
213 215
221 @echo " $(TARGETS_C2)" 223 @echo " $(TARGETS_C2)"
222 @echo " $(TARGETS_C1)" 224 @echo " $(TARGETS_C1)"
223 @echo " $(TARGETS_CORE)" 225 @echo " $(TARGETS_CORE)"
224 @echo " $(TARGETS_ZERO)" 226 @echo " $(TARGETS_ZERO)"
225 @echo " $(TARGETS_SHARK)" 227 @echo " $(TARGETS_SHARK)"
228 @echo " $(TARGETS_GRAAL)"
226 229
227 checks: check_os_version check_j2se_version 230 checks: check_os_version check_j2se_version
228 231
229 # We do not want people accidentally building on old systems (e.g. Linux 2.2.x, 232 # We do not want people accidentally building on old systems (e.g. Linux 2.2.x,
230 # Solaris 2.5.1, 2.6). 233 # Solaris 2.5.1, 2.6).
278 281
279 $(SUBDIRS_SHARK): $(BUILDTREE_MAKE) platform_zero 282 $(SUBDIRS_SHARK): $(BUILDTREE_MAKE) platform_zero
280 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks 283 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
281 $(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH) 284 $(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH)
282 285
286 $(SUBDIRS_GRAAL): $(BUILDTREE_MAKE)
287 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
288 $(BUILDTREE) VARIANT=graal
289
283 platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in 290 platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in
284 $(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@ 291 $(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@
285 292
286 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME 293 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
287 294
323 $(TARGETS_SHARK): $(SUBDIRS_SHARK) 330 $(TARGETS_SHARK): $(SUBDIRS_SHARK)
324 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) 331 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
325 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma 332 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
326 ifdef INSTALL 333 ifdef INSTALL
327 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install 334 cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
335 endif
336
337 $(TARGETS_GRAAL): $(SUBDIRS_GRAAL)
338 cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && $(MAKE) $(MFLAGS)
339 cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && ./test_gamma
340 ifdef INSTALL
341 cd $(OSNAME)_$(BUILDARCH)_graal/$(patsubst %graal,%,$@) && $(MAKE) $(MFLAGS) install
328 endif 342 endif
329 343
330 # Just build the tree, and nothing else: 344 # Just build the tree, and nothing else:
331 tree: $(SUBDIRS_C2) 345 tree: $(SUBDIRS_C2)
332 tree1: $(SUBDIRS_C1) 346 tree1: $(SUBDIRS_C1)
333 treecore: $(SUBDIRS_CORE) 347 treecore: $(SUBDIRS_CORE)
334 treezero: $(SUBDIRS_ZERO) 348 treezero: $(SUBDIRS_ZERO)
335 treeshark: $(SUBDIRS_SHARK) 349 treeshark: $(SUBDIRS_SHARK)
350 treegraal: $(SUBDIRS_GRAAL)
336 351
337 # Doc target. This is the same for all build options. 352 # Doc target. This is the same for all build options.
338 # Hence create a docs directory beside ...$(ARCH)_[...] 353 # Hence create a docs directory beside ...$(ARCH)_[...]
339 docs: checks 354 docs: checks
340 $(QUIETLY) mkdir -p $(SUBDIR_DOCS) 355 $(QUIETLY) mkdir -p $(SUBDIR_DOCS)
361 376
362 include $(GAMMADIR)/make/cscope.make 377 include $(GAMMADIR)/make/cscope.make
363 378
364 #------------------------------------------------------------------------------- 379 #-------------------------------------------------------------------------------
365 380
366 .PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK) 381 .PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK) $(TARGETS_GRAAL)
367 .PHONY: tree tree1 treecore treezero treeshark 382 .PHONY: tree tree1 treecore treezero treeshark treegraal
368 .PHONY: all compiler1 compiler2 core zero shark 383 .PHONY: all compiler1 compiler2 core zero shark graal
369 .PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs 384 .PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs clean_graal
370 .PHONY: checks check_os_version check_j2se_version 385 .PHONY: checks check_os_version check_j2se_version