Mercurial > hg > truffle
diff make/bsd/Makefile @ 9159:43223d3f5dcd
Merge with hsx/hotspot-comp
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 16 Apr 2013 17:39:46 +0200 |
parents | b9a918201d47 f36e073d56a4 |
children | 096c224171c4 |
line wrap: on
line diff
--- a/make/bsd/Makefile Tue Apr 16 17:16:06 2013 +0200 +++ b/make/bsd/Makefile Tue Apr 16 17:39:46 2013 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -142,55 +142,43 @@ # # debug compiler2 <os>_<arch>_compiler2/debug # fastdebug compiler2 <os>_<arch>_compiler2/fastdebug -# jvmg compiler2 <os>_<arch>_compiler2/jvmg # optimized compiler2 <os>_<arch>_compiler2/optimized -# profiled compiler2 <os>_<arch>_compiler2/profiled # product compiler2 <os>_<arch>_compiler2/product # # debug1 compiler1 <os>_<arch>_compiler1/debug # fastdebug1 compiler1 <os>_<arch>_compiler1/fastdebug -# jvmg1 compiler1 <os>_<arch>_compiler1/jvmg # optimized1 compiler1 <os>_<arch>_compiler1/optimized -# profiled1 compiler1 <os>_<arch>_compiler1/profiled # product1 compiler1 <os>_<arch>_compiler1/product # # debugcore core <os>_<arch>_core/debug # fastdebugcore core <os>_<arch>_core/fastdebug -# jvmgcore core <os>_<arch>_core/jvmg # optimizedcore core <os>_<arch>_core/optimized -# profiledcore core <os>_<arch>_core/profiled # productcore core <os>_<arch>_core/product # # debugzero zero <os>_<arch>_zero/debug # fastdebugzero zero <os>_<arch>_zero/fastdebug -# jvmgzero zero <os>_<arch>_zero/jvmg # optimizedzero zero <os>_<arch>_zero/optimized -# profiledzero zero <os>_<arch>_zero/profiled # productzero zero <os>_<arch>_zero/product # # debugshark shark <os>_<arch>_shark/debug # fastdebugshark shark <os>_<arch>_shark/fastdebug -# jvmgshark shark <os>_<arch>_shark/jvmg # optimizedshark shark <os>_<arch>_shark/optimized -# profiledshark shark <os>_<arch>_shark/profiled # productshark shark <os>_<arch>_shark/product # # fastdebugminimal1 minimal1 <os>_<arch>_minimal1/fastdebug -# jvmgminimal1 minimal1 <os>_<arch>_minimal1/jvmg +# debugminimal1 minimal1 <os>_<arch>_minimal1/debug # productminimal1 minimal1 <os>_<arch>_minimal1/product # # What you get with each target: # -# debug* - "thin" libjvm - debug info linked into the gamma launcher +# debug* - debug compile with asserts enabled # fastdebug* - optimized compile, but with asserts enabled -# jvmg* - "fat" libjvm - debug info linked into libjvm.so # optimized* - optimized compile, no asserts -# profiled* - gprof # product* - the shippable thing: optimized compile, no asserts, -DPRODUCT # This target list needs to be coordinated with the usage message # in the build.sh script: -TARGETS = debug jvmg fastdebug optimized profiled product +TARGETS = debug fastdebug optimized product ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) SUBDIR_DOCS = $(OSNAME)_$(VARIANTARCH)_docs @@ -368,15 +356,29 @@ $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) jvmtidocs # Synonyms for win32-like targets. -compiler2: jvmg product +compiler2: debug product + +compiler1: debug1 product1 -compiler1: jvmg1 product1 +core: debugcore productcore + +zero: debugzero productzero + +shark: debugshark productshark -core: jvmgcore productcore +warn_jvmg_deprecated: + echo "Warning: The jvmg target has been replaced with debug" + echo "Warning: Please update your usage" + +jvmg: warn_jvmg_deprecated debug -zero: jvmgzero productzero +jvmg1: warn_jvmg_deprecated debug1 + +jvmgcore: warn_jvmg_deprecated debugcore -shark: jvmgshark productshark +jvmgzero: warn_jvmg_deprecated debugzero + +jvmgshark: warn_jvmg_deprecated debugshark clean_docs: rm -rf $(SUBDIR_DOCS)