1.1 --- a/make/linux/Makefile Wed Aug 11 01:17:27 2010 -0700
1.2 +++ b/make/linux/Makefile Wed Aug 11 05:51:21 2010 -0700
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -168,6 +168,13 @@
1.11 # profiledzero zero <os>_<arch>_zero/profiled
1.12 # productzero zero <os>_<arch>_zero/product
1.13 #
1.14 +# debugshark shark <os>_<arch>_shark/debug
1.15 +# fastdebugshark shark <os>_<arch>_shark/fastdebug
1.16 +# jvmgshark shark <os>_<arch>_shark/jvmg
1.17 +# optimizedshark shark <os>_<arch>_shark/optimized
1.18 +# profiledshark shark <os>_<arch>_shark/profiled
1.19 +# productshark shark <os>_<arch>_shark/product
1.20 +#
1.21 # What you get with each target:
1.22 #
1.23 # debug* - "thin" libjvm_g - debug info linked into the gamma_g launcher
1.24 @@ -191,12 +198,14 @@
1.25 SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
1.26 SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
1.27 SUBDIRS_ZERO = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS))
1.28 +SUBDIRS_SHARK = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS))
1.29
1.30 TARGETS_C2 = $(TARGETS)
1.31 TARGETS_C1 = $(addsuffix 1,$(TARGETS))
1.32 TARGETS_TIERED = $(addsuffix tiered,$(TARGETS))
1.33 TARGETS_CORE = $(addsuffix core,$(TARGETS))
1.34 TARGETS_ZERO = $(addsuffix zero,$(TARGETS))
1.35 +TARGETS_SHARK = $(addsuffix shark,$(TARGETS))
1.36
1.37 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
1.38 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
1.39 @@ -213,6 +222,7 @@
1.40 @echo " $(TARGETS_C1)"
1.41 @echo " $(TARGETS_CORE)"
1.42 @echo " $(TARGETS_ZERO)"
1.43 + @echo " $(TARGETS_SHARK)"
1.44
1.45 checks: check_os_version check_j2se_version
1.46
1.47 @@ -266,6 +276,10 @@
1.48 $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
1.49 $(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH)
1.50
1.51 +$(SUBDIRS_SHARK): $(BUILDTREE_MAKE) platform_zero
1.52 + $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
1.53 + $(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH)
1.54 +
1.55 platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in
1.56 $(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@
1.57
1.58 @@ -306,11 +320,19 @@
1.59 cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
1.60 endif
1.61
1.62 +$(TARGETS_SHARK): $(SUBDIRS_SHARK)
1.63 + cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
1.64 + cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
1.65 +ifdef INSTALL
1.66 + cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
1.67 +endif
1.68 +
1.69 # Just build the tree, and nothing else:
1.70 tree: $(SUBDIRS_C2)
1.71 tree1: $(SUBDIRS_C1)
1.72 treecore: $(SUBDIRS_CORE)
1.73 treezero: $(SUBDIRS_ZERO)
1.74 +treeshark: $(SUBDIRS_SHARK)
1.75
1.76 # Doc target. This is the same for all build options.
1.77 # Hence create a docs directory beside ...$(ARCH)_[...]
1.78 @@ -327,20 +349,22 @@
1.79
1.80 zero: jvmgzero productzero
1.81
1.82 +shark: jvmgshark productshark
1.83 +
1.84 clean_docs:
1.85 rm -rf $(SUBDIR_DOCS)
1.86
1.87 -clean_compiler1 clean_compiler2 clean_core clean_zero:
1.88 +clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark:
1.89 rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
1.90
1.91 -clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_docs
1.92 +clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_shark clean_docs
1.93
1.94 include $(GAMMADIR)/make/$(OSNAME)/makefiles/cscope.make
1.95
1.96 #-------------------------------------------------------------------------------
1.97
1.98 -.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO)
1.99 -.PHONY: tree tree1 treecore treezero
1.100 -.PHONY: all compiler1 compiler2 core zero
1.101 -.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero docs clean_docs
1.102 +.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK)
1.103 +.PHONY: tree tree1 treecore treezero treeshark
1.104 +.PHONY: all compiler1 compiler2 core zero shark
1.105 +.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs
1.106 .PHONY: checks check_os_version check_j2se_version
