1.1 --- a/make/linux/Makefile Fri Apr 12 12:22:59 2013 -0700
1.2 +++ b/make/linux/Makefile Fri Apr 12 15:53:30 2013 -0700
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 1999, 2013, 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 @@ -142,55 +142,42 @@
1.11 #
1.12 # debug compiler2 <os>_<arch>_compiler2/debug
1.13 # fastdebug compiler2 <os>_<arch>_compiler2/fastdebug
1.14 -# jvmg compiler2 <os>_<arch>_compiler2/jvmg
1.15 # optimized compiler2 <os>_<arch>_compiler2/optimized
1.16 -# profiled compiler2 <os>_<arch>_compiler2/profiled
1.17 # product compiler2 <os>_<arch>_compiler2/product
1.18 #
1.19 # debug1 compiler1 <os>_<arch>_compiler1/debug
1.20 # fastdebug1 compiler1 <os>_<arch>_compiler1/fastdebug
1.21 -# jvmg1 compiler1 <os>_<arch>_compiler1/jvmg
1.22 # optimized1 compiler1 <os>_<arch>_compiler1/optimized
1.23 -# profiled1 compiler1 <os>_<arch>_compiler1/profiled
1.24 # product1 compiler1 <os>_<arch>_compiler1/product
1.25 #
1.26 # debugcore core <os>_<arch>_core/debug
1.27 # fastdebugcore core <os>_<arch>_core/fastdebug
1.28 -# jvmgcore core <os>_<arch>_core/jvmg
1.29 # optimizedcore core <os>_<arch>_core/optimized
1.30 -# profiledcore core <os>_<arch>_core/profiled
1.31 # productcore core <os>_<arch>_core/product
1.32 #
1.33 # debugzero zero <os>_<arch>_zero/debug
1.34 # fastdebugzero zero <os>_<arch>_zero/fastdebug
1.35 -# jvmgzero zero <os>_<arch>_zero/jvmg
1.36 # optimizedzero zero <os>_<arch>_zero/optimized
1.37 -# profiledzero zero <os>_<arch>_zero/profiled
1.38 # productzero zero <os>_<arch>_zero/product
1.39 #
1.40 # debugshark shark <os>_<arch>_shark/debug
1.41 # fastdebugshark shark <os>_<arch>_shark/fastdebug
1.42 -# jvmgshark shark <os>_<arch>_shark/jvmg
1.43 # optimizedshark shark <os>_<arch>_shark/optimized
1.44 -# profiledshark shark <os>_<arch>_shark/profiled
1.45 # productshark shark <os>_<arch>_shark/product
1.46 #
1.47 # fastdebugminimal1 minimal1 <os>_<arch>_minimal1/fastdebug
1.48 -# jvmgminimal1 minimal1 <os>_<arch>_minimal1/jvmg
1.49 # productminimal1 minimal1 <os>_<arch>_minimal1/product
1.50 #
1.51 # What you get with each target:
1.52 #
1.53 -# debug* - "thin" libjvm - debug info linked into the gamma launcher
1.54 +# debug* - debug compile with asserts enabled
1.55 # fastdebug* - optimized compile, but with asserts enabled
1.56 -# jvmg* - "fat" libjvm - debug info linked into libjvm.so
1.57 # optimized* - optimized compile, no asserts
1.58 -# profiled* - gprof
1.59 # product* - the shippable thing: optimized compile, no asserts, -DPRODUCT
1.60
1.61 # This target list needs to be coordinated with the usage message
1.62 # in the build.sh script:
1.63 -TARGETS = debug jvmg fastdebug optimized profiled product
1.64 +TARGETS = debug fastdebug optimized product
1.65
1.66 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
1.67 SUBDIR_DOCS = $(OSNAME)_$(VARIANTARCH)_docs
1.68 @@ -357,15 +344,29 @@
1.69 $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) BUILD_FLAVOR=product jvmtidocs
1.70
1.71 # Synonyms for win32-like targets.
1.72 -compiler2: jvmg product
1.73 +compiler2: debug product
1.74
1.75 -compiler1: jvmg1 product1
1.76 +compiler1: debug1 product1
1.77
1.78 -core: jvmgcore productcore
1.79 +core: debugcore productcore
1.80
1.81 -zero: jvmgzero productzero
1.82 +zero: debugzero productzero
1.83
1.84 -shark: jvmgshark productshark
1.85 +shark: debugshark productshark
1.86 +
1.87 +warn_jvmg_deprecated:
1.88 + echo "Warning: The jvmg target has been replaced with debug"
1.89 + echo "Warning: Please update your usage"
1.90 +
1.91 +jvmg: warn_jvmg_deprecated debug
1.92 +
1.93 +jvmg1: warn_jvmg_deprecated debug1
1.94 +
1.95 +jvmgcore: warn_jvmg_deprecated debugcore
1.96 +
1.97 +jvmgzero: warn_jvmg_deprecated debugzero
1.98 +
1.99 +jvmgshark: warn_jvmg_deprecated debugshark
1.100
1.101 clean_docs:
1.102 rm -rf $(SUBDIR_DOCS)
