Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
7104565: trim jprt build targets
Fri, 12 Apr 2013 15:53:30 -0700
- author
- drchase
- date
- Fri, 12 Apr 2013 15:53:30 -0700
- changeset 4942
- f36e073d56a4
- parent 4940
- b8b081e53312
- child 4943
- bc63dd2539a4
7104565: trim jprt build targets
Summary: remove JPRT debug builds, remove -DDEBUG -DFASTDEBUG and use ASSERT instead in sources
Reviewed-by: dholmes, kvn, coleenp
1.1 --- a/make/Makefile Fri Apr 12 12:22:59 2013 -0700 1.2 +++ b/make/Makefile Fri Apr 12 15:53:30 2013 -0700 1.3 @@ -19,7 +19,7 @@ 1.4 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 1.5 # or visit www.oracle.com if you need additional information or have any 1.6 # questions. 1.7 -# 1.8 +# 1.9 # 1.10 1.11 # Top level gnumake file for hotspot builds 1.12 @@ -85,15 +85,15 @@ 1.13 endif 1.14 1.15 # Typical C1/C2 targets made available with this Makefile 1.16 -C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1 1.17 -C2_VM_TARGETS=product fastdebug optimized jvmg 1.18 -ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero 1.19 -SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark 1.20 -MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 jvmgminimal1 1.21 +C1_VM_TARGETS=product1 fastdebug1 optimized1 debug1 1.22 +C2_VM_TARGETS=product fastdebug optimized debug 1.23 +ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero 1.24 +SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark debugshark 1.25 +MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 debugminimal1 1.26 1.27 COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product 1.28 COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 docs export_fastdebug 1.29 -COMMON_VM_DEBUG_TARGETS=jvmg jvmg1 docs export_debug 1.30 +COMMON_VM_DEBUG_TARGETS=debug debug1 docs export_debug 1.31 1.32 # JDK directory list 1.33 JDK_DIRS=bin include jre lib demo 1.34 @@ -103,13 +103,13 @@ 1.35 ifeq ($(JVM_VARIANT_MINIMAL1),true) 1.36 all_product: productminimal1 1.37 all_fastdebug: fastdebugminimal1 1.38 -all_debug: jvmgminimal1 1.39 +all_debug: debugminimal1 1.40 endif 1.41 1.42 ifdef BUILD_CLIENT_ONLY 1.43 all_product: product1 docs export_product 1.44 all_fastdebug: fastdebug1 docs export_fastdebug 1.45 -all_debug: jvmg1 docs export_debug 1.46 +all_debug: debug1 docs export_debug 1.47 else 1.48 ifeq ($(MACOSX_UNIVERSAL),true) 1.49 all_product: universal_product 1.50 @@ -127,13 +127,13 @@ 1.51 allzero: all_productzero all_fastdebugzero 1.52 all_productzero: productzero docs export_product 1.53 all_fastdebugzero: fastdebugzero docs export_fastdebug 1.54 -all_debugzero: jvmgzero docs export_debug 1.55 +all_debugzero: debugzero docs export_debug 1.56 all_optimizedzero: optimizedzero docs export_optimized 1.57 1.58 allshark: all_productshark all_fastdebugshark 1.59 all_productshark: productshark docs export_product 1.60 all_fastdebugshark: fastdebugshark docs export_fastdebug 1.61 -all_debugshark: jvmgshark docs export_debug 1.62 +all_debugshark: debugshark docs export_debug 1.63 all_optimizedshark: optimizedshark docs export_optimized 1.64 1.65 # Do everything 1.66 @@ -227,7 +227,7 @@ 1.67 $(MKDIR) -p $(OUTPUTDIR) 1.68 $(CD) $(OUTPUTDIR); \ 1.69 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 1.70 - $(MAKE_ARGS) $(VM_TARGET) 1.71 + $(MAKE_ARGS) $(VM_TARGET) 1.72 1.73 generic_buildminimal1: 1.74 ifeq ($(JVM_VARIANT_MINIMAL1),true) 1.75 @@ -260,7 +260,7 @@ 1.76 EXPORT_SUBDIR=/$(@:export_%=%) \ 1.77 generic_export 1.78 export_debug: 1.79 - $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=${VM_DEBUG} \ 1.80 + $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ 1.81 EXPORT_SUBDIR=/$(@:export_%=%) \ 1.82 generic_export 1.83 export_optimized: 1.84 @@ -281,7 +281,7 @@ 1.85 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \ 1.86 generic_export 1.87 export_debug_jdk:: 1.88 - $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=${VM_DEBUG} \ 1.89 + $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=$(@:export_%_jdk=%) \ 1.90 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \ 1.91 generic_export 1.92 1.93 @@ -323,7 +323,7 @@ 1.94 # Bin files (windows) 1.95 ifeq ($(OSNAME),windows) 1.96 1.97 -# Get jvm.lib 1.98 +# Get jvm.lib 1.99 $(EXPORT_LIB_DIR)/%.lib: $(MISC_DIR)/%.lib 1.100 $(install-file) 1.101 1.102 @@ -541,11 +541,11 @@ 1.103 @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -showversion -help 1.104 1.105 # C2 test targets 1.106 -test_product test_optimized test_fastdebug test_jvmg: 1.107 +test_product test_optimized test_fastdebug test_debug: 1.108 @$(MAKE) generic_test ALTJVM_DIR="$(C2_DIR)/$(@:test_%=%)" 1.109 1.110 # C1 test targets 1.111 -test_product1 test_optimized1 test_fastdebug1 test_jvmg1: 1.112 +test_product1 test_optimized1 test_fastdebug1 test_debug1: 1.113 ifeq ($(ARCH_DATA_MODEL), 32) 1.114 @$(MAKE) generic_test ALTJVM_DIR="$(C1_DIR)/$(@:test_%1=%)" 1.115 else 1.116 @@ -553,15 +553,15 @@ 1.117 endif 1.118 1.119 # Zero test targets 1.120 -test_productzero test_optimizedzero test_fastdebugzero test_jvmgzero: 1.121 +test_productzero test_optimizedzero test_fastdebugzero test_debugzero: 1.122 @$(MAKE) generic_test ALTJVM_DIR="$(ZERO_DIR)/$(@:test_%zero=%)" 1.123 1.124 # Shark test targets 1.125 -test_productshark test_optimizedshark test_fastdebugshark test_jvmgshark: 1.126 +test_productshark test_optimizedshark test_fastdebugshark test_debugshark: 1.127 @$(MAKE) generic_test ALTJVM_DIR="$(SHARK_DIR)/$(@:test_%shark=%)" 1.128 1.129 # Minimal1 test targets 1.130 -test_productminimal1 test_optimizedminimal1 test_fastdebugminimal1 test_jvmgminimal1: 1.131 +test_productminimal1 test_optimizedminimal1 test_fastdebugminimal1 test_debugminimal1: 1.132 @$(MAKE) generic_test ALTJVM_DIR="$(MINIMAL1_DIR)/$(@:test_%minimal1=%)" 1.133 1.134 1.135 @@ -626,7 +626,7 @@ 1.136 # Intro help message 1.137 intro_help: 1.138 @$(ECHO) \ 1.139 -"Makefile for the Hotspot workspace." 1.140 +"Makefile for the Hotspot workspace." 1.141 @$(ECHO) \ 1.142 "Default behavior is to build and create an export area for the j2se builds." 1.143 1.144 @@ -637,7 +637,7 @@ 1.145 @$(ECHO) "world: Same as: all create_jdk" 1.146 @$(ECHO) "all_product: Same as: product product1 export_product" 1.147 @$(ECHO) "all_fastdebug: Same as: fastdebug fastdebug1 export_fastdebug" 1.148 - @$(ECHO) "all_debug: Same as: jvmg jvmg1 export_debug" 1.149 + @$(ECHO) "all_debug: Same as: debug debug1 export_debug" 1.150 @$(ECHO) "all_optimized: Same as: optimized optimized1 export_optimized" 1.151 @$(ECHO) "clean: Clean all areas" 1.152 @$(ECHO) "export_product: Export product files to EXPORT_PATH" 1.153 @@ -730,7 +730,7 @@ 1.154 @$(ECHO) \ 1.155 " $(MAKE) world" 1.156 @$(ECHO) \ 1.157 -" $(MAKE) ALT_BOOTDIR=/opt/java/jdk$(PREVIOUS_JDK_VERSION)" 1.158 +" $(MAKE) ALT_BOOTDIR=/opt/java/jdk$(PREVIOUS_JDK_VERSION)" 1.159 @$(ECHO) \ 1.160 " $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk$(JDK_VERSION)" 1.161 1.162 @@ -741,6 +741,23 @@ 1.163 endif 1.164 endif 1.165 1.166 +# Compatibility for transition to new naming 1.167 +warn_jvmg_deprecated: 1.168 + echo "Warning: The jvmg target has been replaced with debug" 1.169 + echo "Warning: Please update your usage" 1.170 + 1.171 +jvmg: warn_jvmg_deprecated debug 1.172 + 1.173 +jvmg1: warn_jvmg_deprecated debug1 1.174 + 1.175 +jvmgminimal1: warn_jvmg_deprecated debugminimal1 1.176 + 1.177 +jvmgcore: warn_jvmg_deprecated debugcore 1.178 + 1.179 +jvmgzero: warn_jvmg_deprecated debugzero 1.180 + 1.181 +jvmgshark: warn_jvmg_deprecated debugshark 1.182 + 1.183 # JPRT rule to build this workspace 1.184 include $(GAMMADIR)/make/jprt.gmk 1.185
2.1 --- a/make/bsd/Makefile Fri Apr 12 12:22:59 2013 -0700 2.2 +++ b/make/bsd/Makefile Fri Apr 12 15:53:30 2013 -0700 2.3 @@ -1,5 +1,5 @@ 2.4 # 2.5 -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. 2.6 +# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 2.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.8 # 2.9 # This code is free software; you can redistribute it and/or modify it 2.10 @@ -142,55 +142,43 @@ 2.11 # 2.12 # debug compiler2 <os>_<arch>_compiler2/debug 2.13 # fastdebug compiler2 <os>_<arch>_compiler2/fastdebug 2.14 -# jvmg compiler2 <os>_<arch>_compiler2/jvmg 2.15 # optimized compiler2 <os>_<arch>_compiler2/optimized 2.16 -# profiled compiler2 <os>_<arch>_compiler2/profiled 2.17 # product compiler2 <os>_<arch>_compiler2/product 2.18 # 2.19 # debug1 compiler1 <os>_<arch>_compiler1/debug 2.20 # fastdebug1 compiler1 <os>_<arch>_compiler1/fastdebug 2.21 -# jvmg1 compiler1 <os>_<arch>_compiler1/jvmg 2.22 # optimized1 compiler1 <os>_<arch>_compiler1/optimized 2.23 -# profiled1 compiler1 <os>_<arch>_compiler1/profiled 2.24 # product1 compiler1 <os>_<arch>_compiler1/product 2.25 # 2.26 # debugcore core <os>_<arch>_core/debug 2.27 # fastdebugcore core <os>_<arch>_core/fastdebug 2.28 -# jvmgcore core <os>_<arch>_core/jvmg 2.29 # optimizedcore core <os>_<arch>_core/optimized 2.30 -# profiledcore core <os>_<arch>_core/profiled 2.31 # productcore core <os>_<arch>_core/product 2.32 # 2.33 # debugzero zero <os>_<arch>_zero/debug 2.34 # fastdebugzero zero <os>_<arch>_zero/fastdebug 2.35 -# jvmgzero zero <os>_<arch>_zero/jvmg 2.36 # optimizedzero zero <os>_<arch>_zero/optimized 2.37 -# profiledzero zero <os>_<arch>_zero/profiled 2.38 # productzero zero <os>_<arch>_zero/product 2.39 # 2.40 # debugshark shark <os>_<arch>_shark/debug 2.41 # fastdebugshark shark <os>_<arch>_shark/fastdebug 2.42 -# jvmgshark shark <os>_<arch>_shark/jvmg 2.43 # optimizedshark shark <os>_<arch>_shark/optimized 2.44 -# profiledshark shark <os>_<arch>_shark/profiled 2.45 # productshark shark <os>_<arch>_shark/product 2.46 # 2.47 # fastdebugminimal1 minimal1 <os>_<arch>_minimal1/fastdebug 2.48 -# jvmgminimal1 minimal1 <os>_<arch>_minimal1/jvmg 2.49 +# debugminimal1 minimal1 <os>_<arch>_minimal1/debug 2.50 # productminimal1 minimal1 <os>_<arch>_minimal1/product 2.51 # 2.52 # What you get with each target: 2.53 # 2.54 -# debug* - "thin" libjvm - debug info linked into the gamma launcher 2.55 +# debug* - debug compile with asserts enabled 2.56 # fastdebug* - optimized compile, but with asserts enabled 2.57 -# jvmg* - "fat" libjvm - debug info linked into libjvm.so 2.58 # optimized* - optimized compile, no asserts 2.59 -# profiled* - gprof 2.60 # product* - the shippable thing: optimized compile, no asserts, -DPRODUCT 2.61 2.62 # This target list needs to be coordinated with the usage message 2.63 # in the build.sh script: 2.64 -TARGETS = debug jvmg fastdebug optimized profiled product 2.65 +TARGETS = debug fastdebug optimized product 2.66 2.67 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 2.68 SUBDIR_DOCS = $(OSNAME)_$(VARIANTARCH)_docs 2.69 @@ -354,15 +342,29 @@ 2.70 $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) jvmtidocs 2.71 2.72 # Synonyms for win32-like targets. 2.73 -compiler2: jvmg product 2.74 +compiler2: debug product 2.75 2.76 -compiler1: jvmg1 product1 2.77 +compiler1: debug1 product1 2.78 2.79 -core: jvmgcore productcore 2.80 +core: debugcore productcore 2.81 2.82 -zero: jvmgzero productzero 2.83 +zero: debugzero productzero 2.84 2.85 -shark: jvmgshark productshark 2.86 +shark: debugshark productshark 2.87 + 2.88 +warn_jvmg_deprecated: 2.89 + echo "Warning: The jvmg target has been replaced with debug" 2.90 + echo "Warning: Please update your usage" 2.91 + 2.92 +jvmg: warn_jvmg_deprecated debug 2.93 + 2.94 +jvmg1: warn_jvmg_deprecated debug1 2.95 + 2.96 +jvmgcore: warn_jvmg_deprecated debugcore 2.97 + 2.98 +jvmgzero: warn_jvmg_deprecated debugzero 2.99 + 2.100 +jvmgshark: warn_jvmg_deprecated debugshark 2.101 2.102 clean_docs: 2.103 rm -rf $(SUBDIR_DOCS)
3.1 --- a/make/bsd/makefiles/buildtree.make Fri Apr 12 12:22:59 2013 -0700 3.2 +++ b/make/bsd/makefiles/buildtree.make Fri Apr 12 15:53:30 2013 -0700 3.3 @@ -19,7 +19,7 @@ 3.4 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 3.5 # or visit www.oracle.com if you need additional information or have any 3.6 # questions. 3.7 -# 3.8 +# 3.9 # 3.10 3.11 # Usage: 3.12 @@ -46,11 +46,11 @@ 3.13 # Makefile - for "make foo" 3.14 # flags.make - with macro settings 3.15 # vm.make - to support making "$(MAKE) -v vm.make" in makefiles 3.16 -# adlc.make - 3.17 +# adlc.make - 3.18 # jvmti.make - generate JVMTI bindings from the spec (JSR-163) 3.19 # sa.make - generate SA jar file and natives 3.20 # env.[ck]sh - environment settings 3.21 -# 3.22 +# 3.23 # The makefiles are split this way so that "make foo" will run faster by not 3.24 # having to read the dependency files for the vm. 3.25 3.26 @@ -122,7 +122,7 @@ 3.27 $(PLATFORM_DIR)/generated/jvmtifiles \ 3.28 $(PLATFORM_DIR)/generated/dtracefiles 3.29 3.30 -TARGETS = debug fastdebug jvmg optimized product profiled 3.31 +TARGETS = debug fastdebug optimized product 3.32 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS)) 3.33 3.34 # For dependencies and recursive makes. 3.35 @@ -186,8 +186,8 @@ 3.36 $(QUIETLY) mkdir -p $@ 3.37 3.38 # Convenience macro which takes a source relative path, applies $(1) to the 3.39 -# absolute path, and then replaces $(GAMMADIR) in the result with a 3.40 -# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile. 3.41 +# absolute path, and then replaces $(GAMMADIR) in the result with a 3.42 +# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile. 3.43 gamma-path=$(subst $(GAMMADIR),\$$(GAMMADIR),$(call $(1),$(HS_COMMON_SRC)/$(2))) 3.44 3.45 # This bit is needed to enable local rebuilds. 3.46 @@ -279,8 +279,6 @@ 3.47 $(QUIETLY) ( \ 3.48 $(BUILDTREE_COMMENT); \ 3.49 echo; \ 3.50 - [ "$(TARGET)" = profiled ] && \ 3.51 - echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/optimized.make"; \ 3.52 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(TARGET).make"; \ 3.53 ) > $@ 3.54 3.55 @@ -381,7 +379,7 @@ 3.56 $(QUIETLY) ( \ 3.57 $(BUILDTREE_COMMENT); \ 3.58 echo "JDK=${JAVA_HOME}"; \ 3.59 - ) > $@ 3.60 + ) > $@ 3.61 3.62 FORCE: 3.63
4.1 --- a/make/bsd/makefiles/debug.make Fri Apr 12 12:22:59 2013 -0700 4.2 +++ b/make/bsd/makefiles/debug.make Fri Apr 12 15:53:30 2013 -0700 4.3 @@ -1,5 +1,5 @@ 4.4 # 4.5 -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. 4.6 +# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 4.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4.8 # 4.9 # This code is free software; you can redistribute it and/or modify it 4.10 @@ -19,7 +19,7 @@ 4.11 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 4.12 # or visit www.oracle.com if you need additional information or have any 4.13 # questions. 4.14 -# 4.15 +# 4.16 # 4.17 4.18 # Sets make macros for making debug version of VM 4.19 @@ -27,17 +27,16 @@ 4.20 # Compiler specific DEBUG_CFLAGS are passed in from gcc.make, sparcWorks.make 4.21 DEBUG_CFLAGS/DEFAULT= $(DEBUG_CFLAGS) 4.22 DEBUG_CFLAGS/BYFILE = $(DEBUG_CFLAGS/$@)$(DEBUG_CFLAGS/DEFAULT$(DEBUG_CFLAGS/$@)) 4.23 -CFLAGS += $(DEBUG_CFLAGS/BYFILE) 4.24 + 4.25 +# _NMT_NOINLINE_ informs NMT that no inlining by Compiler 4.26 +CFLAGS += $(DEBUG_CFLAGS/BYFILE) -D_NMT_NOINLINE_ 4.27 + 4.28 +# Set the environment variable HOTSPARC_GENERIC to "true" 4.29 +# to inhibit the effect of the previous line on CFLAGS. 4.30 4.31 # Linker mapfile 4.32 MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug 4.33 4.34 -_JUNK_ := $(shell echo -e >&2 ""\ 4.35 - "----------------------------------------------------------------------\n" \ 4.36 - "WARNING: 'make debug' is deprecated. It will be removed in the future.\n" \ 4.37 - "Please use 'make jvmg' to build debug JVM. \n" \ 4.38 - "----------------------------------------------------------------------\n") 4.39 - 4.40 VERSION = debug 4.41 -SYSDEFS += -DASSERT -DDEBUG 4.42 +SYSDEFS += -DASSERT 4.43 PICFLAGS = DEFAULT
5.1 --- a/make/bsd/makefiles/defs.make Fri Apr 12 12:22:59 2013 -0700 5.2 +++ b/make/bsd/makefiles/defs.make Fri Apr 12 15:53:30 2013 -0700 5.3 @@ -1,5 +1,5 @@ 5.4 # 5.5 -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. 5.6 +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. 5.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.8 # 5.9 # This code is free software; you can redistribute it and/or modify it 5.10 @@ -19,7 +19,7 @@ 5.11 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 5.12 # or visit www.oracle.com if you need additional information or have any 5.13 # questions. 5.14 -# 5.15 +# 5.16 # 5.17 5.18 # The common definitions for hotspot bsd builds. 5.19 @@ -86,7 +86,7 @@ 5.20 VM_PLATFORM = bsd_i486 5.21 HS_ARCH = x86 5.22 # We have to reset ARCH to i386 since SRCARCH relies on it 5.23 - ARCH = i386 5.24 + ARCH = i386 5.25 endif 5.26 endif 5.27 5.28 @@ -146,9 +146,6 @@ 5.29 LIBRARY_SUFFIX=so 5.30 endif 5.31 5.32 -# FIXUP: The subdirectory for a debug build is NOT the same on all platforms 5.33 -VM_DEBUG=jvmg 5.34 - 5.35 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html 5.36 5.37 # client and server subdirectories have symbolic links to ../libjsig.so 5.38 @@ -177,7 +174,7 @@ 5.39 else 5.40 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.debuginfo 5.41 endif 5.42 - endif 5.43 + endif 5.44 endif 5.45 5.46 # Serviceability Binaries
6.1 --- a/make/bsd/makefiles/fastdebug.make Fri Apr 12 12:22:59 2013 -0700 6.2 +++ b/make/bsd/makefiles/fastdebug.make Fri Apr 12 15:53:30 2013 -0700 6.3 @@ -1,5 +1,5 @@ 6.4 # 6.5 -# Copyright (c) 1999, 2012 Oracle and/or its affiliates. All rights reserved. 6.6 +# Copyright (c) 1999, 2013 Oracle and/or its affiliates. All rights reserved. 6.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 6.8 # 6.9 # This code is free software; you can redistribute it and/or modify it 6.10 @@ -19,7 +19,7 @@ 6.11 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 6.12 # or visit www.oracle.com if you need additional information or have any 6.13 # questions. 6.14 -# 6.15 +# 6.16 # 6.17 6.18 # Sets make macros for making debug version of VM 6.19 @@ -59,5 +59,5 @@ 6.20 MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug 6.21 6.22 VERSION = optimized 6.23 -SYSDEFS += -DASSERT -DFASTDEBUG 6.24 +SYSDEFS += -DASSERT 6.25 PICFLAGS = DEFAULT
7.1 --- a/make/bsd/makefiles/jvmg.make Fri Apr 12 12:22:59 2013 -0700 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,42 +0,0 @@ 7.4 -# 7.5 -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. 7.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 7.7 -# 7.8 -# This code is free software; you can redistribute it and/or modify it 7.9 -# under the terms of the GNU General Public License version 2 only, as 7.10 -# published by the Free Software Foundation. 7.11 -# 7.12 -# This code is distributed in the hope that it will be useful, but WITHOUT 7.13 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 7.14 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 7.15 -# version 2 for more details (a copy is included in the LICENSE file that 7.16 -# accompanied this code). 7.17 -# 7.18 -# You should have received a copy of the GNU General Public License version 7.19 -# 2 along with this work; if not, write to the Free Software Foundation, 7.20 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 7.21 -# 7.22 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 7.23 -# or visit www.oracle.com if you need additional information or have any 7.24 -# questions. 7.25 -# 7.26 -# 7.27 - 7.28 -# Sets make macros for making debug version of VM 7.29 - 7.30 -# Compiler specific DEBUG_CFLAGS are passed in from gcc.make, sparcWorks.make 7.31 -DEBUG_CFLAGS/DEFAULT= $(DEBUG_CFLAGS) 7.32 -DEBUG_CFLAGS/BYFILE = $(DEBUG_CFLAGS/$@)$(DEBUG_CFLAGS/DEFAULT$(DEBUG_CFLAGS/$@)) 7.33 - 7.34 -# _NMT_NOINLINE_ informs NMT that no inlining by Compiler 7.35 -CFLAGS += $(DEBUG_CFLAGS/BYFILE) -D_NMT_NOINLINE_ 7.36 - 7.37 -# Set the environment variable HOTSPARC_GENERIC to "true" 7.38 -# to inhibit the effect of the previous line on CFLAGS. 7.39 - 7.40 -# Linker mapfile 7.41 -MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug 7.42 - 7.43 -VERSION = debug 7.44 -SYSDEFS += -DASSERT -DDEBUG 7.45 -PICFLAGS = DEFAULT
8.1 --- a/make/bsd/makefiles/profiled.make Fri Apr 12 12:22:59 2013 -0700 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,30 +0,0 @@ 8.4 -# 8.5 -# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. 8.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 8.7 -# 8.8 -# This code is free software; you can redistribute it and/or modify it 8.9 -# under the terms of the GNU General Public License version 2 only, as 8.10 -# published by the Free Software Foundation. 8.11 -# 8.12 -# This code is distributed in the hope that it will be useful, but WITHOUT 8.13 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 8.14 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 8.15 -# version 2 for more details (a copy is included in the LICENSE file that 8.16 -# accompanied this code). 8.17 -# 8.18 -# You should have received a copy of the GNU General Public License version 8.19 -# 2 along with this work; if not, write to the Free Software Foundation, 8.20 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 8.21 -# 8.22 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 8.23 -# or visit www.oracle.com if you need additional information or have any 8.24 -# questions. 8.25 -# 8.26 -# 8.27 - 8.28 -# Sets make macros for making profiled version of Gamma VM 8.29 -# (It is also optimized.) 8.30 - 8.31 -CFLAGS += -pg 8.32 -AOUT_FLAGS += -pg 8.33 -LDNOMAP = true
9.1 --- a/make/jprt.properties Fri Apr 12 12:22:59 2013 -0700 9.2 +++ b/make/jprt.properties Fri Apr 12 15:53:30 2013 -0700 9.3 @@ -133,15 +133,15 @@ 9.4 # Standard list of jprt build targets for this source tree 9.5 9.6 jprt.build.targets.standard= \ 9.7 - ${jprt.my.solaris.sparc}-{product|fastdebug|debug}, \ 9.8 - ${jprt.my.solaris.sparcv9}-{product|fastdebug|debug}, \ 9.9 - ${jprt.my.solaris.i586}-{product|fastdebug|debug}, \ 9.10 - ${jprt.my.solaris.x64}-{product|fastdebug|debug}, \ 9.11 - ${jprt.my.linux.i586}-{product|fastdebug|debug}, \ 9.12 + ${jprt.my.solaris.sparc}-{product|fastdebug}, \ 9.13 + ${jprt.my.solaris.sparcv9}-{product|fastdebug}, \ 9.14 + ${jprt.my.solaris.i586}-{product|fastdebug}, \ 9.15 + ${jprt.my.solaris.x64}-{product|fastdebug}, \ 9.16 + ${jprt.my.linux.i586}-{product|fastdebug}, \ 9.17 ${jprt.my.linux.x64}-{product|fastdebug}, \ 9.18 - ${jprt.my.macosx.x64}-{product|fastdebug|debug}, \ 9.19 - ${jprt.my.windows.i586}-{product|fastdebug|debug}, \ 9.20 - ${jprt.my.windows.x64}-{product|fastdebug|debug}, \ 9.21 + ${jprt.my.macosx.x64}-{product|fastdebug}, \ 9.22 + ${jprt.my.windows.i586}-{product|fastdebug}, \ 9.23 + ${jprt.my.windows.x64}-{product|fastdebug}, \ 9.24 ${jprt.my.linux.armvh}-{product|fastdebug} 9.25 9.26 jprt.build.targets.open= \ 9.27 @@ -150,7 +150,7 @@ 9.28 ${jprt.my.linux.x64}-{productOpen} 9.29 9.30 jprt.build.targets.embedded= \ 9.31 - ${jprt.my.linux.i586}-{productEmb|fastdebugEmb|debugEmb}, \ 9.32 + ${jprt.my.linux.i586}-{productEmb|fastdebugEmb}, \ 9.33 ${jprt.my.linux.ppc}-{productEmb|fastdebugEmb}, \ 9.34 ${jprt.my.linux.ppcv2}-{productEmb|fastdebugEmb}, \ 9.35 ${jprt.my.linux.ppcsflt}-{productEmb|fastdebugEmb}, \ 9.36 @@ -174,21 +174,18 @@ 9.37 ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-scimark, \ 9.38 ${jprt.my.solaris.sparc}-product-{c1|c2}-runThese, \ 9.39 ${jprt.my.solaris.sparc}-fastdebug-c1-runThese_Xshare, \ 9.40 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ 9.41 ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ 9.42 ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ 9.43 ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ 9.44 ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ 9.45 ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_G1, \ 9.46 ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \ 9.47 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_default, \ 9.48 ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_SerialGC, \ 9.49 ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParallelGC, \ 9.50 ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParNewGC, \ 9.51 ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_CMS, \ 9.52 ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_G1, \ 9.53 ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-GCOld_ParOldGC, \ 9.54 - ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_default, \ 9.55 ${jprt.my.solaris.sparc}-{product|fastdebug}-c2-jbb_default_nontiered, \ 9.56 ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_SerialGC, \ 9.57 ${jprt.my.solaris.sparc}-{product|fastdebug}-{c1|c2}-jbb_ParallelGC, \ 9.58 @@ -201,21 +198,18 @@ 9.59 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jvm98_nontiered, \ 9.60 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-scimark, \ 9.61 ${jprt.my.solaris.sparcv9}-product-c2-runThese, \ 9.62 - ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_default, \ 9.63 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_SerialGC, \ 9.64 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_ParallelGC, \ 9.65 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_ParNewGC, \ 9.66 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_CMS, \ 9.67 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_G1, \ 9.68 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCBasher_ParOldGC, \ 9.69 - ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_default, \ 9.70 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_SerialGC, \ 9.71 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_ParallelGC, \ 9.72 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_ParNewGC, \ 9.73 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_CMS, \ 9.74 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_G1, \ 9.75 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-GCOld_ParOldGC, \ 9.76 - ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_default, \ 9.77 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_default_nontiered, \ 9.78 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_SerialGC, \ 9.79 ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-jbb_ParallelGC, \ 9.80 @@ -229,21 +223,18 @@ 9.81 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-scimark, \ 9.82 ${jprt.my.solaris.x64}-product-c2-runThese, \ 9.83 ${jprt.my.solaris.x64}-product-c2-runThese_Xcomp, \ 9.84 - ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_default, \ 9.85 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \ 9.86 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \ 9.87 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \ 9.88 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_CMS, \ 9.89 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_G1, \ 9.90 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCBasher_ParOldGC, \ 9.91 - ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_default, \ 9.92 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \ 9.93 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \ 9.94 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \ 9.95 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_CMS, \ 9.96 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_G1, \ 9.97 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \ 9.98 - ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_default, \ 9.99 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_default_nontiered, \ 9.100 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_SerialGC, \ 9.101 ${jprt.my.solaris.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \ 9.102 @@ -258,28 +249,24 @@ 9.103 ${jprt.my.solaris.i586}-product-{c1|c2}-runThese_Xcomp, \ 9.104 ${jprt.my.solaris.i586}-fastdebug-c1-runThese_Xcomp, \ 9.105 ${jprt.my.solaris.i586}-fastdebug-c1-runThese_Xshare, \ 9.106 - ${jprt.my.solaris.i586}-product-c1-GCBasher_default, \ 9.107 ${jprt.my.solaris.i586}-product-c1-GCBasher_SerialGC, \ 9.108 ${jprt.my.solaris.i586}-product-c1-GCBasher_ParallelGC, \ 9.109 ${jprt.my.solaris.i586}-product-c1-GCBasher_ParNewGC, \ 9.110 ${jprt.my.solaris.i586}-product-c1-GCBasher_CMS, \ 9.111 ${jprt.my.solaris.i586}-product-c1-GCBasher_G1, \ 9.112 ${jprt.my.solaris.i586}-product-c1-GCBasher_ParOldGC, \ 9.113 - ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_default, \ 9.114 ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_SerialGC, \ 9.115 ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParallelGC, \ 9.116 ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParNewGC, \ 9.117 ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_CMS, \ 9.118 ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_G1, \ 9.119 ${jprt.my.solaris.i586}-fastdebug-c2-GCBasher_ParOldGC, \ 9.120 - ${jprt.my.solaris.i586}-product-c1-GCOld_default, \ 9.121 ${jprt.my.solaris.i586}-product-c1-GCOld_SerialGC, \ 9.122 ${jprt.my.solaris.i586}-product-c1-GCOld_ParallelGC, \ 9.123 ${jprt.my.solaris.i586}-product-c1-GCOld_ParNewGC, \ 9.124 ${jprt.my.solaris.i586}-product-c1-GCOld_CMS, \ 9.125 ${jprt.my.solaris.i586}-product-c1-GCOld_G1, \ 9.126 ${jprt.my.solaris.i586}-product-c1-GCOld_ParOldGC, \ 9.127 - ${jprt.my.solaris.i586}-fastdebug-c2-jbb_default, \ 9.128 ${jprt.my.solaris.i586}-fastdebug-c2-jbb_default_nontiered, \ 9.129 ${jprt.my.solaris.i586}-fastdebug-c2-jbb_ParallelGC, \ 9.130 ${jprt.my.solaris.i586}-fastdebug-c2-jbb_CMS, \ 9.131 @@ -293,21 +280,19 @@ 9.132 ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \ 9.133 ${jprt.my.linux.i586}-fastdebug-c1-runThese_Xshare, \ 9.134 ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp, \ 9.135 - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ 9.136 ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ 9.137 ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ 9.138 ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ 9.139 ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ 9.140 ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_G1, \ 9.141 ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \ 9.142 - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_default, \ 9.143 ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_SerialGC, \ 9.144 ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParallelGC, \ 9.145 ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParNewGC, \ 9.146 ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_CMS, \ 9.147 ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_G1, \ 9.148 ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParOldGC, \ 9.149 - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_default, \ 9.150 + ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_SerialGC, \ 9.151 ${jprt.my.linux.i586}-{product|fastdebug}-c2-jbb_default_nontiered, \ 9.152 ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParallelGC, \ 9.153 ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_CMS, \ 9.154 @@ -318,21 +303,18 @@ 9.155 ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98, \ 9.156 ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98_nontiered, \ 9.157 ${jprt.my.linux.x64}-{product|fastdebug}-c2-scimark, \ 9.158 - ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_default, \ 9.159 ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \ 9.160 ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \ 9.161 ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \ 9.162 ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_CMS, \ 9.163 ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_G1, \ 9.164 ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCBasher_ParOldGC, \ 9.165 - ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_default, \ 9.166 ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \ 9.167 ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \ 9.168 ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \ 9.169 ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_CMS, \ 9.170 ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_G1, \ 9.171 ${jprt.my.linux.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \ 9.172 - ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_default, \ 9.173 ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_default_nontiered, \ 9.174 ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \ 9.175 ${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_G1, \ 9.176 @@ -342,21 +324,18 @@ 9.177 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jvm98, \ 9.178 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jvm98_nontiered, \ 9.179 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-scimark, \ 9.180 - ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_default, \ 9.181 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \ 9.182 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \ 9.183 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \ 9.184 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_CMS, \ 9.185 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_G1, \ 9.186 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_ParOldGC, \ 9.187 - ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_default, \ 9.188 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \ 9.189 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \ 9.190 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \ 9.191 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_CMS, \ 9.192 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_G1, \ 9.193 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \ 9.194 - ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default, \ 9.195 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default_nontiered, \ 9.196 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \ 9.197 ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_G1, \ 9.198 @@ -369,14 +348,12 @@ 9.199 ${jprt.my.windows.i586}-product-{c1|c2}-runThese, \ 9.200 ${jprt.my.windows.i586}-product-{c1|c2}-runThese_Xcomp, \ 9.201 ${jprt.my.windows.i586}-fastdebug-c1-runThese_Xshare, \ 9.202 - ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ 9.203 ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ 9.204 ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ 9.205 ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ 9.206 ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ 9.207 ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_G1, \ 9.208 ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \ 9.209 - ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_default, \ 9.210 ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_SerialGC, \ 9.211 ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_ParallelGC, \ 9.212 ${jprt.my.windows.i586}-product-{c1|c2}-GCOld_ParNewGC, \ 9.213 @@ -396,14 +373,12 @@ 9.214 ${jprt.my.windows.x64}-{product|fastdebug}-c2-scimark, \ 9.215 ${jprt.my.windows.x64}-product-c2-runThese, \ 9.216 ${jprt.my.windows.x64}-product-c2-runThese_Xcomp, \ 9.217 - ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_default, \ 9.218 ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \ 9.219 ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \ 9.220 ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \ 9.221 ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_CMS, \ 9.222 ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_G1, \ 9.223 ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParOldGC, \ 9.224 - ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_default, \ 9.225 ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \ 9.226 ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \ 9.227 ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \ 9.228 @@ -419,7 +394,7 @@ 9.229 9.230 # Some basic "smoke" tests for OpenJDK builds 9.231 jprt.test.targets.open = \ 9.232 - ${jprt.my.solaris.x64}-{productOpen|debugOpen|fastdebugOpen}-c2-jvm98, \ 9.233 + ${jprt.my.solaris.x64}-{productOpen|fastdebugOpen}-c2-jvm98, \ 9.234 ${jprt.my.solaris.i586}-{productOpen|fastdebugOpen}-c2-jvm98, \ 9.235 ${jprt.my.linux.x64}-{productOpen|fastdebugOpen}-c2-jvm98 9.236 9.237 @@ -520,5 +495,5 @@ 9.238 jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}} 9.239 9.240 # 7155453: Work-around to prevent popups on OSX from blocking test completion 9.241 -# but the work-around is added to all platforms to be consistent 9.242 +# but the work-around is added to all platforms to be consistent 9.243 jprt.jbb.options=-Djava.awt.headless=true
10.1 --- a/make/linux/Makefile Fri Apr 12 12:22:59 2013 -0700 10.2 +++ b/make/linux/Makefile Fri Apr 12 15:53:30 2013 -0700 10.3 @@ -1,5 +1,5 @@ 10.4 # 10.5 -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. 10.6 +# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 10.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 10.8 # 10.9 # This code is free software; you can redistribute it and/or modify it 10.10 @@ -142,55 +142,42 @@ 10.11 # 10.12 # debug compiler2 <os>_<arch>_compiler2/debug 10.13 # fastdebug compiler2 <os>_<arch>_compiler2/fastdebug 10.14 -# jvmg compiler2 <os>_<arch>_compiler2/jvmg 10.15 # optimized compiler2 <os>_<arch>_compiler2/optimized 10.16 -# profiled compiler2 <os>_<arch>_compiler2/profiled 10.17 # product compiler2 <os>_<arch>_compiler2/product 10.18 # 10.19 # debug1 compiler1 <os>_<arch>_compiler1/debug 10.20 # fastdebug1 compiler1 <os>_<arch>_compiler1/fastdebug 10.21 -# jvmg1 compiler1 <os>_<arch>_compiler1/jvmg 10.22 # optimized1 compiler1 <os>_<arch>_compiler1/optimized 10.23 -# profiled1 compiler1 <os>_<arch>_compiler1/profiled 10.24 # product1 compiler1 <os>_<arch>_compiler1/product 10.25 # 10.26 # debugcore core <os>_<arch>_core/debug 10.27 # fastdebugcore core <os>_<arch>_core/fastdebug 10.28 -# jvmgcore core <os>_<arch>_core/jvmg 10.29 # optimizedcore core <os>_<arch>_core/optimized 10.30 -# profiledcore core <os>_<arch>_core/profiled 10.31 # productcore core <os>_<arch>_core/product 10.32 # 10.33 # debugzero zero <os>_<arch>_zero/debug 10.34 # fastdebugzero zero <os>_<arch>_zero/fastdebug 10.35 -# jvmgzero zero <os>_<arch>_zero/jvmg 10.36 # optimizedzero zero <os>_<arch>_zero/optimized 10.37 -# profiledzero zero <os>_<arch>_zero/profiled 10.38 # productzero zero <os>_<arch>_zero/product 10.39 # 10.40 # debugshark shark <os>_<arch>_shark/debug 10.41 # fastdebugshark shark <os>_<arch>_shark/fastdebug 10.42 -# jvmgshark shark <os>_<arch>_shark/jvmg 10.43 # optimizedshark shark <os>_<arch>_shark/optimized 10.44 -# profiledshark shark <os>_<arch>_shark/profiled 10.45 # productshark shark <os>_<arch>_shark/product 10.46 # 10.47 # fastdebugminimal1 minimal1 <os>_<arch>_minimal1/fastdebug 10.48 -# jvmgminimal1 minimal1 <os>_<arch>_minimal1/jvmg 10.49 # productminimal1 minimal1 <os>_<arch>_minimal1/product 10.50 # 10.51 # What you get with each target: 10.52 # 10.53 -# debug* - "thin" libjvm - debug info linked into the gamma launcher 10.54 +# debug* - debug compile with asserts enabled 10.55 # fastdebug* - optimized compile, but with asserts enabled 10.56 -# jvmg* - "fat" libjvm - debug info linked into libjvm.so 10.57 # optimized* - optimized compile, no asserts 10.58 -# profiled* - gprof 10.59 # product* - the shippable thing: optimized compile, no asserts, -DPRODUCT 10.60 10.61 # This target list needs to be coordinated with the usage message 10.62 # in the build.sh script: 10.63 -TARGETS = debug jvmg fastdebug optimized profiled product 10.64 +TARGETS = debug fastdebug optimized product 10.65 10.66 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 10.67 SUBDIR_DOCS = $(OSNAME)_$(VARIANTARCH)_docs 10.68 @@ -357,15 +344,29 @@ 10.69 $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) BUILD_FLAVOR=product jvmtidocs 10.70 10.71 # Synonyms for win32-like targets. 10.72 -compiler2: jvmg product 10.73 +compiler2: debug product 10.74 10.75 -compiler1: jvmg1 product1 10.76 +compiler1: debug1 product1 10.77 10.78 -core: jvmgcore productcore 10.79 +core: debugcore productcore 10.80 10.81 -zero: jvmgzero productzero 10.82 +zero: debugzero productzero 10.83 10.84 -shark: jvmgshark productshark 10.85 +shark: debugshark productshark 10.86 + 10.87 +warn_jvmg_deprecated: 10.88 + echo "Warning: The jvmg target has been replaced with debug" 10.89 + echo "Warning: Please update your usage" 10.90 + 10.91 +jvmg: warn_jvmg_deprecated debug 10.92 + 10.93 +jvmg1: warn_jvmg_deprecated debug1 10.94 + 10.95 +jvmgcore: warn_jvmg_deprecated debugcore 10.96 + 10.97 +jvmgzero: warn_jvmg_deprecated debugzero 10.98 + 10.99 +jvmgshark: warn_jvmg_deprecated debugshark 10.100 10.101 clean_docs: 10.102 rm -rf $(SUBDIR_DOCS)
11.1 --- a/make/linux/makefiles/buildtree.make Fri Apr 12 12:22:59 2013 -0700 11.2 +++ b/make/linux/makefiles/buildtree.make Fri Apr 12 15:53:30 2013 -0700 11.3 @@ -19,7 +19,7 @@ 11.4 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 11.5 # or visit www.oracle.com if you need additional information or have any 11.6 # questions. 11.7 -# 11.8 +# 11.9 # 11.10 11.11 # Usage: 11.12 @@ -46,11 +46,11 @@ 11.13 # Makefile - for "make foo" 11.14 # flags.make - with macro settings 11.15 # vm.make - to support making "$(MAKE) -v vm.make" in makefiles 11.16 -# adlc.make - 11.17 +# adlc.make - 11.18 # jvmti.make - generate JVMTI bindings from the spec (JSR-163) 11.19 # sa.make - generate SA jar file and natives 11.20 # env.[ck]sh - environment settings 11.21 -# 11.22 +# 11.23 # The makefiles are split this way so that "make foo" will run faster by not 11.24 # having to read the dependency files for the vm. 11.25 11.26 @@ -117,7 +117,7 @@ 11.27 $(PLATFORM_DIR)/generated/adfiles \ 11.28 $(PLATFORM_DIR)/generated/jvmtifiles 11.29 11.30 -TARGETS = debug fastdebug jvmg optimized product profiled 11.31 +TARGETS = debug fastdebug optimized product 11.32 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS)) 11.33 11.34 # For dependencies and recursive makes. 11.35 @@ -179,8 +179,8 @@ 11.36 $(QUIETLY) mkdir -p $@ 11.37 11.38 # Convenience macro which takes a source relative path, applies $(1) to the 11.39 -# absolute path, and then replaces $(GAMMADIR) in the result with a 11.40 -# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile. 11.41 +# absolute path, and then replaces $(GAMMADIR) in the result with a 11.42 +# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile. 11.43 gamma-path=$(subst $(GAMMADIR),\$$(GAMMADIR),$(call $(1),$(HS_COMMON_SRC)/$(2))) 11.44 11.45 # This bit is needed to enable local rebuilds. 11.46 @@ -284,8 +284,6 @@ 11.47 $(QUIETLY) ( \ 11.48 $(BUILDTREE_COMMENT); \ 11.49 echo; \ 11.50 - [ "$(TARGET)" = profiled ] && \ 11.51 - echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/optimized.make"; \ 11.52 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(TARGET).make"; \ 11.53 ) > $@ 11.54 11.55 @@ -376,7 +374,7 @@ 11.56 $(QUIETLY) ( \ 11.57 $(BUILDTREE_COMMENT); \ 11.58 echo "JDK=${JAVA_HOME}"; \ 11.59 - ) > $@ 11.60 + ) > $@ 11.61 11.62 FORCE: 11.63
12.1 --- a/make/linux/makefiles/debug.make Fri Apr 12 12:22:59 2013 -0700 12.2 +++ b/make/linux/makefiles/debug.make Fri Apr 12 15:53:30 2013 -0700 12.3 @@ -1,5 +1,5 @@ 12.4 # 12.5 -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. 12.6 +# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 12.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 12.8 # 12.9 # This code is free software; you can redistribute it and/or modify it 12.10 @@ -19,7 +19,7 @@ 12.11 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 12.12 # or visit www.oracle.com if you need additional information or have any 12.13 # questions. 12.14 -# 12.15 +# 12.16 # 12.17 12.18 # Sets make macros for making debug version of VM 12.19 @@ -27,17 +27,16 @@ 12.20 # Compiler specific DEBUG_CFLAGS are passed in from gcc.make, sparcWorks.make 12.21 DEBUG_CFLAGS/DEFAULT= $(DEBUG_CFLAGS) 12.22 DEBUG_CFLAGS/BYFILE = $(DEBUG_CFLAGS/$@)$(DEBUG_CFLAGS/DEFAULT$(DEBUG_CFLAGS/$@)) 12.23 -CFLAGS += $(DEBUG_CFLAGS/BYFILE) 12.24 + 12.25 +# _NMT_NOINLINE_ informs NMT that no inlining by Compiler 12.26 +CFLAGS += $(DEBUG_CFLAGS/BYFILE) -D_NMT_NOINLINE_ 12.27 + 12.28 +# Set the environment variable HOTSPARC_GENERIC to "true" 12.29 +# to inhibit the effect of the previous line on CFLAGS. 12.30 12.31 # Linker mapfile 12.32 MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-debug 12.33 12.34 -_JUNK_ := $(shell echo -e >&2 ""\ 12.35 - "----------------------------------------------------------------------\n" \ 12.36 - "WARNING: 'make debug' is deprecated. It will be removed in the future.\n" \ 12.37 - "Please use 'make jvmg' to build debug JVM. \n" \ 12.38 - "----------------------------------------------------------------------\n") 12.39 - 12.40 VERSION = debug 12.41 -SYSDEFS += -DASSERT -DDEBUG 12.42 +SYSDEFS += -DASSERT 12.43 PICFLAGS = DEFAULT
13.1 --- a/make/linux/makefiles/defs.make Fri Apr 12 12:22:59 2013 -0700 13.2 +++ b/make/linux/makefiles/defs.make Fri Apr 12 15:53:30 2013 -0700 13.3 @@ -1,5 +1,5 @@ 13.4 # 13.5 -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. 13.6 +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. 13.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 13.8 # 13.9 # This code is free software; you can redistribute it and/or modify it 13.10 @@ -19,7 +19,7 @@ 13.11 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 13.12 # or visit www.oracle.com if you need additional information or have any 13.13 # questions. 13.14 -# 13.15 +# 13.16 # 13.17 13.18 # The common definitions for hotspot linux builds. 13.19 @@ -92,7 +92,7 @@ 13.20 VM_PLATFORM = linux_i486 13.21 HS_ARCH = x86 13.22 # We have to reset ARCH to i686 since SRCARCH relies on it 13.23 - ARCH = i686 13.24 + ARCH = i686 13.25 endif 13.26 endif 13.27 13.28 @@ -240,9 +240,6 @@ 13.29 # Library suffix 13.30 LIBRARY_SUFFIX=so 13.31 13.32 -# FIXUP: The subdirectory for a debug build is NOT the same on all platforms 13.33 -VM_DEBUG=jvmg 13.34 - 13.35 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html 13.36 13.37 # client and server subdirectories have symbolic links to ../libjsig.so 13.38 @@ -279,7 +276,7 @@ 13.39 else 13.40 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo 13.41 endif 13.42 - endif 13.43 + endif 13.44 endif 13.45 13.46 ifeq ($(JVM_VARIANT_MINIMAL1),true) 13.47 @@ -292,15 +289,15 @@ 13.48 else 13.49 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.debuginfo 13.50 endif 13.51 - endif 13.52 + endif 13.53 endif 13.54 13.55 # Serviceability Binaries 13.56 # No SA Support for PPC, IA64, ARM or zero 13.57 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ 13.58 - $(EXPORT_LIB_DIR)/sa-jdi.jar 13.59 + $(EXPORT_LIB_DIR)/sa-jdi.jar 13.60 ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ 13.61 - $(EXPORT_LIB_DIR)/sa-jdi.jar 13.62 + $(EXPORT_LIB_DIR)/sa-jdi.jar 13.63 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 13.64 ifeq ($(ZIP_DEBUGINFO_FILES),1) 13.65 ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz 13.66 @@ -310,10 +307,10 @@ 13.67 ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo 13.68 endif 13.69 endif 13.70 -ADD_SA_BINARIES/ppc = 13.71 -ADD_SA_BINARIES/ia64 = 13.72 -ADD_SA_BINARIES/arm = 13.73 -ADD_SA_BINARIES/zero = 13.74 +ADD_SA_BINARIES/ppc = 13.75 +ADD_SA_BINARIES/ia64 = 13.76 +ADD_SA_BINARIES/arm = 13.77 +ADD_SA_BINARIES/zero = 13.78 13.79 -include $(HS_ALT_MAKE)/linux/makefiles/defs.make 13.80
14.1 --- a/make/linux/makefiles/fastdebug.make Fri Apr 12 12:22:59 2013 -0700 14.2 +++ b/make/linux/makefiles/fastdebug.make Fri Apr 12 15:53:30 2013 -0700 14.3 @@ -1,5 +1,5 @@ 14.4 # 14.5 -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. 14.6 +# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 14.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 14.8 # 14.9 # This code is free software; you can redistribute it and/or modify it 14.10 @@ -19,7 +19,7 @@ 14.11 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 14.12 # or visit www.oracle.com if you need additional information or have any 14.13 # questions. 14.14 -# 14.15 +# 14.16 # 14.17 14.18 # Sets make macros for making debug version of VM 14.19 @@ -59,5 +59,5 @@ 14.20 MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-debug 14.21 14.22 VERSION = optimized 14.23 -SYSDEFS += -DASSERT -DFASTDEBUG 14.24 +SYSDEFS += -DASSERT 14.25 PICFLAGS = DEFAULT
15.1 --- a/make/linux/makefiles/jvmg.make Fri Apr 12 12:22:59 2013 -0700 15.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 15.3 @@ -1,42 +0,0 @@ 15.4 -# 15.5 -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. 15.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 15.7 -# 15.8 -# This code is free software; you can redistribute it and/or modify it 15.9 -# under the terms of the GNU General Public License version 2 only, as 15.10 -# published by the Free Software Foundation. 15.11 -# 15.12 -# This code is distributed in the hope that it will be useful, but WITHOUT 15.13 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 15.14 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15.15 -# version 2 for more details (a copy is included in the LICENSE file that 15.16 -# accompanied this code). 15.17 -# 15.18 -# You should have received a copy of the GNU General Public License version 15.19 -# 2 along with this work; if not, write to the Free Software Foundation, 15.20 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 15.21 -# 15.22 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 15.23 -# or visit www.oracle.com if you need additional information or have any 15.24 -# questions. 15.25 -# 15.26 -# 15.27 - 15.28 -# Sets make macros for making debug version of VM 15.29 - 15.30 -# Compiler specific DEBUG_CFLAGS are passed in from gcc.make, sparcWorks.make 15.31 -DEBUG_CFLAGS/DEFAULT= $(DEBUG_CFLAGS) 15.32 -DEBUG_CFLAGS/BYFILE = $(DEBUG_CFLAGS/$@)$(DEBUG_CFLAGS/DEFAULT$(DEBUG_CFLAGS/$@)) 15.33 - 15.34 -# _NMT_NOINLINE_ informs NMT that no inlining by Compiler 15.35 -CFLAGS += $(DEBUG_CFLAGS/BYFILE) -D_NMT_NOINLINE_ 15.36 - 15.37 -# Set the environment variable HOTSPARC_GENERIC to "true" 15.38 -# to inhibit the effect of the previous line on CFLAGS. 15.39 - 15.40 -# Linker mapfile 15.41 -MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-debug 15.42 - 15.43 -VERSION = debug 15.44 -SYSDEFS += -DASSERT -DDEBUG 15.45 -PICFLAGS = DEFAULT
16.1 --- a/make/linux/makefiles/profiled.make Fri Apr 12 12:22:59 2013 -0700 16.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 16.3 @@ -1,30 +0,0 @@ 16.4 -# 16.5 -# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. 16.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 16.7 -# 16.8 -# This code is free software; you can redistribute it and/or modify it 16.9 -# under the terms of the GNU General Public License version 2 only, as 16.10 -# published by the Free Software Foundation. 16.11 -# 16.12 -# This code is distributed in the hope that it will be useful, but WITHOUT 16.13 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 16.14 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 16.15 -# version 2 for more details (a copy is included in the LICENSE file that 16.16 -# accompanied this code). 16.17 -# 16.18 -# You should have received a copy of the GNU General Public License version 16.19 -# 2 along with this work; if not, write to the Free Software Foundation, 16.20 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 16.21 -# 16.22 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 16.23 -# or visit www.oracle.com if you need additional information or have any 16.24 -# questions. 16.25 -# 16.26 -# 16.27 - 16.28 -# Sets make macros for making profiled version of Gamma VM 16.29 -# (It is also optimized.) 16.30 - 16.31 -CFLAGS += -pg 16.32 -AOUT_FLAGS += -pg 16.33 -LDNOMAP = true
17.1 --- a/make/solaris/Makefile Fri Apr 12 12:22:59 2013 -0700 17.2 +++ b/make/solaris/Makefile Fri Apr 12 15:53:30 2013 -0700 17.3 @@ -120,37 +120,29 @@ 17.4 # 17.5 # debug compiler2 <os>_<arch>_compiler2/debug 17.6 # fastdebug compiler2 <os>_<arch>_compiler2/fastdebug 17.7 -# jvmg compiler2 <os>_<arch>_compiler2/jvmg 17.8 # optimized compiler2 <os>_<arch>_compiler2/optimized 17.9 -# profiled compiler2 <os>_<arch>_compiler2/profiled 17.10 # product compiler2 <os>_<arch>_compiler2/product 17.11 # 17.12 # debug1 compiler1 <os>_<arch>_compiler1/debug 17.13 # fastdebug1 compiler1 <os>_<arch>_compiler1/fastdebug 17.14 -# jvmg1 compiler1 <os>_<arch>_compiler1/jvmg 17.15 # optimized1 compiler1 <os>_<arch>_compiler1/optimized 17.16 -# profiled1 compiler1 <os>_<arch>_compiler1/profiled 17.17 # product1 compiler1 <os>_<arch>_compiler1/product 17.18 # 17.19 # debugcore core <os>_<arch>_core/debug 17.20 # fastdebugcore core <os>_<arch>_core/fastdebug 17.21 -# jvmgcore core <os>_<arch>_core/jvmg 17.22 # optimizedcore core <os>_<arch>_core/optimized 17.23 -# profiledcore core <os>_<arch>_core/profiled 17.24 # productcore core <os>_<arch>_core/product 17.25 # 17.26 # What you get with each target: 17.27 # 17.28 -# debug* - "thin" libjvm - debug info linked into the gamma launcher 17.29 +# debug* - debug compile with asserts enabled 17.30 # fastdebug* - optimized compile, but with asserts enabled 17.31 -# jvmg* - "fat" libjvm - debug info linked into libjvm.so 17.32 # optimized* - optimized compile, no asserts 17.33 -# profiled* - gprof 17.34 # product* - the shippable thing: optimized compile, no asserts, -DPRODUCT 17.35 17.36 # This target list needs to be coordinated with the usage message 17.37 # in the build.sh script: 17.38 -TARGETS = debug jvmg fastdebug optimized profiled product 17.39 +TARGETS = debug fastdebug optimized product 17.40 17.41 SUBDIR_DOCS = $(OSNAME)_$(BUILDARCH)_docs 17.42 SUBDIRS_C1 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler1/,$(TARGETS)) 17.43 @@ -267,11 +259,21 @@ 17.44 $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) BUILD_FLAVOR=product jvmtidocs 17.45 17.46 # Synonyms for win32-like targets. 17.47 -compiler2: jvmg product 17.48 +compiler2: debug product 17.49 17.50 -compiler1: jvmg1 product1 17.51 +compiler1: debug1 product1 17.52 17.53 -core: jvmgcore productcore 17.54 +core: debugcore productcore 17.55 + 17.56 +warn_jvmg_deprecated: 17.57 + echo "Warning: The jvmg target has been replaced with debug" 17.58 + echo "Warning: Please update your usage" 17.59 + 17.60 +jvmg: warn_jvmg_deprecated debug 17.61 + 17.62 +jvmg1: warn_jvmg_deprecated debug1 17.63 + 17.64 +jvmgcore: warn_jvmg_deprecated debugcore 17.65 17.66 clean_docs: 17.67 rm -rf $(SUBDIR_DOCS)
18.1 --- a/make/solaris/makefiles/buildtree.make Fri Apr 12 12:22:59 2013 -0700 18.2 +++ b/make/solaris/makefiles/buildtree.make Fri Apr 12 15:53:30 2013 -0700 18.3 @@ -19,7 +19,7 @@ 18.4 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 18.5 # or visit www.oracle.com if you need additional information or have any 18.6 # questions. 18.7 -# 18.8 +# 18.9 # 18.10 18.11 # Usage: 18.12 @@ -46,11 +46,11 @@ 18.13 # Makefile - for "make foo" 18.14 # flags.make - with macro settings 18.15 # vm.make - to support making "$(MAKE) -v vm.make" in makefiles 18.16 -# adlc.make - 18.17 +# adlc.make - 18.18 # jvmti.make - generate JVMTI bindings from the spec (JSR-163) 18.19 # sa.make - generate SA jar file and natives 18.20 # env.[ck]sh - environment settings 18.21 -# 18.22 +# 18.23 # The makefiles are split this way so that "make foo" will run faster by not 18.24 # having to read the dependency files for the vm. 18.25 18.26 @@ -69,7 +69,7 @@ 18.27 GCC_LIB = /usr/local/lib 18.28 else 18.29 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH) 18.30 -GCC_LIB = 18.31 +GCC_LIB = 18.32 endif 18.33 18.34 ifdef FORCE_TIERED 18.35 @@ -110,7 +110,7 @@ 18.36 $(PLATFORM_DIR)/generated/adfiles \ 18.37 $(PLATFORM_DIR)/generated/jvmtifiles 18.38 18.39 -TARGETS = debug fastdebug jvmg optimized product profiled 18.40 +TARGETS = debug fastdebug optimized product 18.41 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS)) 18.42 18.43 # For dependencies and recursive makes. 18.44 @@ -153,7 +153,7 @@ 18.45 endif 18.46 endif 18.47 18.48 -BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 18.49 +BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 18.50 18.51 BUILDTREE = \ 18.52 $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS) 18.53 @@ -172,8 +172,8 @@ 18.54 $(QUIETLY) mkdir -p $@ 18.55 18.56 # Convenience macro which takes a source relative path, applies $(1) to the 18.57 -# absolute path, and then replaces $(GAMMADIR) in the result with a 18.58 -# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile. 18.59 +# absolute path, and then replaces $(GAMMADIR) in the result with a 18.60 +# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile. 18.61 gamma-path=$(subst $(GAMMADIR),\$$(GAMMADIR),$(call $(1),$(HS_COMMON_SRC)/$(2))) 18.62 18.63 # This bit is needed to enable local rebuilds. 18.64 @@ -274,8 +274,6 @@ 18.65 $(QUIETLY) ( \ 18.66 $(BUILDTREE_COMMENT); \ 18.67 echo; \ 18.68 - [ "$(TARGET)" = profiled ] && \ 18.69 - echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/optimized.make"; \ 18.70 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(TARGET).make"; \ 18.71 ) > $@ 18.72 18.73 @@ -366,7 +364,7 @@ 18.74 $(QUIETLY) ( \ 18.75 $(BUILDTREE_COMMENT); \ 18.76 echo "JDK=${JAVA_HOME}"; \ 18.77 - ) > $@ 18.78 + ) > $@ 18.79 18.80 FORCE: 18.81
19.1 --- a/make/solaris/makefiles/debug.make Fri Apr 12 12:22:59 2013 -0700 19.2 +++ b/make/solaris/makefiles/debug.make Fri Apr 12 15:53:30 2013 -0700 19.3 @@ -1,5 +1,5 @@ 19.4 # 19.5 -# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 19.6 +# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 19.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 19.8 # 19.9 # This code is free software; you can redistribute it and/or modify it 19.10 @@ -19,7 +19,7 @@ 19.11 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 19.12 # or visit www.oracle.com if you need additional information or have any 19.13 # questions. 19.14 -# 19.15 +# 19.16 # 19.17 19.18 # Sets make macros for making debug version of VM 19.19 @@ -37,22 +37,20 @@ 19.20 endif 19.21 endif 19.22 19.23 -CFLAGS += $(DEBUG_CFLAGS/BYFILE) 19.24 +# _NMT_NOINLINE_ informs NMT that no inlining by Compiler 19.25 +CFLAGS += $(DEBUG_CFLAGS/BYFILE) -D_NMT_NOINLINE_ 19.26 + 19.27 +# Set the environment variable HOTSPARC_GENERIC to "true" 19.28 +# to inhibit the effect of the previous line on CFLAGS. 19.29 19.30 # Linker mapfiles 19.31 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \ 19.32 $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug 19.33 19.34 -# This mapfile is only needed when compiling with dtrace support, 19.35 +# This mapfile is only needed when compiling with dtrace support, 19.36 # and mustn't be otherwise. 19.37 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) 19.38 19.39 -_JUNK_ := $(shell echo >&2 ""\ 19.40 - "-------------------------------------------------------------------------\n" \ 19.41 - "WARNING: 'gnumake debug' is deprecated. It will be removed in the future.\n" \ 19.42 - "Please use 'gnumake jvmg' to build debug JVM. \n" \ 19.43 - "-------------------------------------------------------------------------\n") 19.44 - 19.45 VERSION = debug 19.46 -SYSDEFS += -DASSERT -DDEBUG 19.47 +SYSDEFS += -DASSERT 19.48 PICFLAGS = DEFAULT
20.1 --- a/make/solaris/makefiles/defs.make Fri Apr 12 12:22:59 2013 -0700 20.2 +++ b/make/solaris/makefiles/defs.make Fri Apr 12 15:53:30 2013 -0700 20.3 @@ -1,5 +1,5 @@ 20.4 # 20.5 -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. 20.6 +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. 20.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 20.8 # 20.9 # This code is free software; you can redistribute it and/or modify it 20.10 @@ -19,7 +19,7 @@ 20.11 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 20.12 # or visit www.oracle.com if you need additional information or have any 20.13 # questions. 20.14 -# 20.15 +# 20.16 # 20.17 20.18 # The common definitions for hotspot solaris builds. 20.19 @@ -172,9 +172,6 @@ 20.20 # Library suffix 20.21 LIBRARY_SUFFIX=so 20.22 20.23 -# FIXUP: The subdirectory for a debug build is NOT the same on all platforms 20.24 -VM_DEBUG=jvmg 20.25 - 20.26 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html 20.27 20.28 # client and server subdirectories have symbolic links to ../libjsig.$(LIBRARY_SUFFIX) 20.29 @@ -221,8 +218,8 @@ 20.30 endif 20.31 ifeq ($(JVM_VARIANT_CLIENT),true) 20.32 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 20.33 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) 20.34 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX) 20.35 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) 20.36 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX) 20.37 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) 20.38 ifeq ($(ARCH_DATA_MODEL),32) 20.39 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) 20.40 @@ -257,4 +254,4 @@ 20.41 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo 20.42 endif 20.43 endif 20.44 -EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 20.45 +EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
21.1 --- a/make/solaris/makefiles/fastdebug.make Fri Apr 12 12:22:59 2013 -0700 21.2 +++ b/make/solaris/makefiles/fastdebug.make Fri Apr 12 15:53:30 2013 -0700 21.3 @@ -1,5 +1,5 @@ 21.4 # 21.5 -# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 21.6 +# Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 21.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 21.8 # 21.9 # This code is free software; you can redistribute it and/or modify it 21.10 @@ -19,7 +19,7 @@ 21.11 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 21.12 # or visit www.oracle.com if you need additional information or have any 21.13 # questions. 21.14 -# 21.15 +# 21.16 # 21.17 21.18 # Sets make macros for making debug version of VM 21.19 @@ -118,10 +118,10 @@ 21.20 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \ 21.21 $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug 21.22 21.23 -# This mapfile is only needed when compiling with dtrace support, 21.24 +# This mapfile is only needed when compiling with dtrace support, 21.25 # and mustn't be otherwise. 21.26 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) 21.27 21.28 VERSION = optimized 21.29 -SYSDEFS += -DASSERT -DFASTDEBUG -DCHECK_UNHANDLED_OOPS 21.30 +SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS 21.31 PICFLAGS = DEFAULT
22.1 --- a/make/solaris/makefiles/jvmg.make Fri Apr 12 12:22:59 2013 -0700 22.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 22.3 @@ -1,56 +0,0 @@ 22.4 -# 22.5 -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. 22.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 22.7 -# 22.8 -# This code is free software; you can redistribute it and/or modify it 22.9 -# under the terms of the GNU General Public License version 2 only, as 22.10 -# published by the Free Software Foundation. 22.11 -# 22.12 -# This code is distributed in the hope that it will be useful, but WITHOUT 22.13 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 22.14 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 22.15 -# version 2 for more details (a copy is included in the LICENSE file that 22.16 -# accompanied this code). 22.17 -# 22.18 -# You should have received a copy of the GNU General Public License version 22.19 -# 2 along with this work; if not, write to the Free Software Foundation, 22.20 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 22.21 -# 22.22 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 22.23 -# or visit www.oracle.com if you need additional information or have any 22.24 -# questions. 22.25 -# 22.26 -# 22.27 - 22.28 -# Sets make macros for making debug version of VM 22.29 - 22.30 -# Compiler specific DEBUG_CFLAGS are passed in from gcc.make, sparcWorks.make 22.31 -DEBUG_CFLAGS/DEFAULT= $(DEBUG_CFLAGS) 22.32 -DEBUG_CFLAGS/BYFILE = $(DEBUG_CFLAGS/$@)$(DEBUG_CFLAGS/DEFAULT$(DEBUG_CFLAGS/$@)) 22.33 - 22.34 -ifeq ("${Platform_compiler}", "sparcWorks") 22.35 - 22.36 -ifeq ($(COMPILER_REV_NUMERIC),508) 22.37 - # SS11 SEGV when compiling with -g and -xarch=v8, using different backend 22.38 - DEBUG_CFLAGS/compileBroker.o = $(DEBUG_CFLAGS) -xO0 22.39 - DEBUG_CFLAGS/jvmtiTagMap.o = $(DEBUG_CFLAGS) -xO0 22.40 -endif 22.41 -endif 22.42 - 22.43 -# _NMT_NOINLINE_ informs NMT that no inlining by Compiler 22.44 -CFLAGS += $(DEBUG_CFLAGS/BYFILE) -D_NMT_NOINLINE_ 22.45 - 22.46 -# Set the environment variable HOTSPARC_GENERIC to "true" 22.47 -# to inhibit the effect of the previous line on CFLAGS. 22.48 - 22.49 -# Linker mapfiles 22.50 -MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \ 22.51 - $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug 22.52 - 22.53 -# This mapfile is only needed when compiling with dtrace support, 22.54 -# and mustn't be otherwise. 22.55 -MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) 22.56 - 22.57 -VERSION = debug 22.58 -SYSDEFS += -DASSERT -DDEBUG 22.59 -PICFLAGS = DEFAULT
23.1 --- a/make/solaris/makefiles/profiled.make Fri Apr 12 12:22:59 2013 -0700 23.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 23.3 @@ -1,44 +0,0 @@ 23.4 -# 23.5 -# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 23.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 23.7 -# 23.8 -# This code is free software; you can redistribute it and/or modify it 23.9 -# under the terms of the GNU General Public License version 2 only, as 23.10 -# published by the Free Software Foundation. 23.11 -# 23.12 -# This code is distributed in the hope that it will be useful, but WITHOUT 23.13 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 23.14 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 23.15 -# version 2 for more details (a copy is included in the LICENSE file that 23.16 -# accompanied this code). 23.17 -# 23.18 -# You should have received a copy of the GNU General Public License version 23.19 -# 2 along with this work; if not, write to the Free Software Foundation, 23.20 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 23.21 -# 23.22 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 23.23 -# or visit www.oracle.com if you need additional information or have any 23.24 -# questions. 23.25 -# 23.26 -# 23.27 - 23.28 -# Sets make macros for making profiled version of Gamma VM 23.29 -# (It is also optimized.) 23.30 - 23.31 -CFLAGS += -pg 23.32 - 23.33 -# On x86 Solaris 2.6, 7, and 8 if LD_LIBRARY_PATH has /usr/lib in it then 23.34 -# adlc linked with -pg puts out empty header files. To avoid linking adlc 23.35 -# with -pg the profile flag is split out separately and used in rules.make 23.36 - 23.37 -PROF_AOUT_FLAGS += -pg 23.38 - 23.39 -# To do a profiled build of the product, such as for generating the 23.40 -# reordering file, set PROFILE_PRODUCT. Otherwise the reordering file will 23.41 -# contain references to functions which are not defined in the PRODUCT build. 23.42 - 23.43 -ifdef PROFILE_PRODUCT 23.44 - SYSDEFS += -DPRODUCT 23.45 -endif 23.46 - 23.47 -LDNOMAP = true
24.1 --- a/make/windows/build.make Fri Apr 12 12:22:59 2013 -0700 24.2 +++ b/make/windows/build.make Fri Apr 12 15:53:30 2013 -0700 24.3 @@ -1,5 +1,5 @@ 24.4 # 24.5 -# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. 24.6 +# Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 24.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 24.8 # 24.9 # This code is free software; you can redistribute it and/or modify it 24.10 @@ -235,18 +235,14 @@ 24.11 cd $(variantDir) 24.12 nmake -nologo -f $(WorkSpace)\make\windows\makefiles\top.make BUILD_FLAVOR=product ARCH=$(ARCH) 24.13 24.14 -# The debug or jvmg (all the same thing) is an optional build 24.15 -debug jvmg: checks $(variantDir) $(variantDir)\local.make sanity 24.16 +# The debug build is an optional build 24.17 +debug: checks $(variantDir) $(variantDir)\local.make sanity 24.18 cd $(variantDir) 24.19 nmake -nologo -f $(WorkSpace)\make\windows\makefiles\top.make BUILD_FLAVOR=debug ARCH=$(ARCH) 24.20 fastdebug: checks $(variantDir) $(variantDir)\local.make sanity 24.21 cd $(variantDir) 24.22 nmake -nologo -f $(WorkSpace)\make\windows\makefiles\top.make BUILD_FLAVOR=fastdebug ARCH=$(ARCH) 24.23 24.24 -develop: checks $(variantDir) $(variantDir)\local.make sanity 24.25 - cd $(variantDir) 24.26 - nmake -nologo -f $(WorkSpace)\make\windows\makefiles\top.make BUILD_FLAVOR=product DEVELOP=1 ARCH=$(ARCH) 24.27 - 24.28 # target to create just the directory structure 24.29 tree: checks $(variantDir) $(variantDir)\local.make sanity 24.30 mkdir $(variantDir)\product
25.1 --- a/make/windows/makefiles/defs.make Fri Apr 12 12:22:59 2013 -0700 25.2 +++ b/make/windows/makefiles/defs.make Fri Apr 12 15:53:30 2013 -0700 25.3 @@ -19,7 +19,7 @@ 25.4 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 25.5 # or visit www.oracle.com if you need additional information or have any 25.6 # questions. 25.7 -# 25.8 +# 25.9 # 25.10 25.11 # The common definitions for hotspot windows builds. 25.12 @@ -209,8 +209,6 @@ 25.13 ifneq (,$(findstring MINGW,$(SYSTEM_UNAME))) 25.14 USING_MINGW=true 25.15 endif 25.16 -# FIXUP: The subdirectory for a debug build is NOT the same on all platforms 25.17 -VM_DEBUG=debug 25.18 25.19 # Windows wants particular paths due to nmake (must be after macros defined) 25.20 # It is important that gnumake invokes nmake with C:\\...\\ formated 25.21 @@ -292,7 +290,7 @@ 25.22 MAKE_ARGS += BUILD_WIN_SA=1 25.23 endif 25.24 25.25 -# Propagate compiler and tools paths from configure to nmake. 25.26 +# Propagate compiler and tools paths from configure to nmake. 25.27 # Need to make sure they contain \\ and not /. 25.28 ifneq ($(SPEC),) 25.29 ifeq ($(USING_CYGWIN), true)
26.1 --- a/make/windows/makefiles/vm.make Fri Apr 12 12:22:59 2013 -0700 26.2 +++ b/make/windows/makefiles/vm.make Fri Apr 12 15:53:30 2013 -0700 26.3 @@ -31,11 +31,7 @@ 26.4 ALTSRC=$(WorkSpace)\src\closed 26.5 26.6 !ifdef RELEASE 26.7 -!ifdef DEVELOP 26.8 -CXX_FLAGS=$(CXX_FLAGS) /D "DEBUG" 26.9 -!else 26.10 CXX_FLAGS=$(CXX_FLAGS) /D "PRODUCT" 26.11 -!endif 26.12 !else 26.13 CXX_FLAGS=$(CXX_FLAGS) /D "ASSERT" 26.14 !endif 26.15 @@ -186,7 +182,7 @@ 26.16 26.17 # Special case files not using precompiled header files. 26.18 26.19 -c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp 26.20 +c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp 26.21 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp 26.22 26.23 os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp
27.1 --- a/make/windows/projectfiles/compiler2/ADLCompiler.dsp Fri Apr 12 12:22:59 2013 -0700 27.2 +++ b/make/windows/projectfiles/compiler2/ADLCompiler.dsp Fri Apr 12 15:53:30 2013 -0700 27.3 @@ -67,7 +67,7 @@ 27.4 # PROP Ignore_Export_Lib 0 27.5 # PROP Target_Dir "" 27.6 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c 27.7 -# ADD CPP /nologo /ML /W3 /WX /Gm /GX /Zi /Od /I "." /I "$(HotSpotWorkSpace)\src\share\vm\opto" /I "$(HotSpotWorkSpace)\src\share\vm\prims" /I "$(HotSpotWorkSpace)\src\share\vm\lookup" /I "$(HotSpotWorkSpace)\src\share\vm\interpreter" /I "$(HotSpotWorkSpace)\src\share\vm\asm" /I "$(HotSpotWorkSpace)\src\share\vm\compiler" /I "$(HotSpotWorkSpace)\src\share\vm\utilities" /I "$(HotSpotWorkSpace)\src\share\vm\code" /I "$(HotSpotWorkSpace)\src\share\vm\oops" /I "$(HotSpotWorkSpace)\src\share\vm\runtime" /I "$(HotSpotWorkSpace)\src\share\vm\memory" /I "$(HotSpotWorkSpace)\src\share\vm\libadt" /I "$(HotSpotWorkSpace)\src\cpu\i486\vm" /I "$(HotSpotWorkSpace)\src\os\win32\vm" /D "WIN32" /D "DEBUG" /D "_WINDOWS" /D "ASSERT" /Fr /FD /c 27.8 +# ADD CPP /nologo /ML /W3 /WX /Gm /GX /Zi /Od /I "." /I "$(HotSpotWorkSpace)\src\share\vm\opto" /I "$(HotSpotWorkSpace)\src\share\vm\prims" /I "$(HotSpotWorkSpace)\src\share\vm\lookup" /I "$(HotSpotWorkSpace)\src\share\vm\interpreter" /I "$(HotSpotWorkSpace)\src\share\vm\asm" /I "$(HotSpotWorkSpace)\src\share\vm\compiler" /I "$(HotSpotWorkSpace)\src\share\vm\utilities" /I "$(HotSpotWorkSpace)\src\share\vm\code" /I "$(HotSpotWorkSpace)\src\share\vm\oops" /I "$(HotSpotWorkSpace)\src\share\vm\runtime" /I "$(HotSpotWorkSpace)\src\share\vm\memory" /I "$(HotSpotWorkSpace)\src\share\vm\libadt" /I "$(HotSpotWorkSpace)\src\cpu\i486\vm" /I "$(HotSpotWorkSpace)\src\os\win32\vm" /D "WIN32" /D "_WINDOWS" /D "ASSERT" /Fr /FD /c 27.9 # ADD BASE RSC /l 0x409 27.10 # ADD RSC /l 0x409 27.11 BSC32=bscmake.exe
28.1 --- a/make/windows/projectfiles/tiered/ADLCompiler.dsp Fri Apr 12 12:22:59 2013 -0700 28.2 +++ b/make/windows/projectfiles/tiered/ADLCompiler.dsp Fri Apr 12 15:53:30 2013 -0700 28.3 @@ -67,7 +67,7 @@ 28.4 # PROP Ignore_Export_Lib 0 28.5 # PROP Target_Dir "" 28.6 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c 28.7 -# ADD CPP /nologo /ML /W3 /WX /Gm /GX /Zi /Od /I "." /I "$(HotSpotWorkSpace)\src\share\vm\opto" /I "$(HotSpotWorkSpace)\src\share\vm\prims" /I "$(HotSpotWorkSpace)\src\share\vm\lookup" /I "$(HotSpotWorkSpace)\src\share\vm\interpreter" /I "$(HotSpotWorkSpace)\src\share\vm\asm" /I "$(HotSpotWorkSpace)\src\share\vm\compiler" /I "$(HotSpotWorkSpace)\src\share\vm\utilities" /I "$(HotSpotWorkSpace)\src\share\vm\code" /I "$(HotSpotWorkSpace)\src\share\vm\oops" /I "$(HotSpotWorkSpace)\src\share\vm\runtime" /I "$(HotSpotWorkSpace)\src\share\vm\memory" /I "$(HotSpotWorkSpace)\src\share\vm\libadt" /I "$(HotSpotWorkSpace)\src\cpu\i486\vm" /I "$(HotSpotWorkSpace)\src\os\win32\vm" /D "WIN32" /D "DEBUG" /D "_WINDOWS" /D "ASSERT" /Fr /FD /c 28.8 +# ADD CPP /nologo /ML /W3 /WX /Gm /GX /Zi /Od /I "." /I "$(HotSpotWorkSpace)\src\share\vm\opto" /I "$(HotSpotWorkSpace)\src\share\vm\prims" /I "$(HotSpotWorkSpace)\src\share\vm\lookup" /I "$(HotSpotWorkSpace)\src\share\vm\interpreter" /I "$(HotSpotWorkSpace)\src\share\vm\asm" /I "$(HotSpotWorkSpace)\src\share\vm\compiler" /I "$(HotSpotWorkSpace)\src\share\vm\utilities" /I "$(HotSpotWorkSpace)\src\share\vm\code" /I "$(HotSpotWorkSpace)\src\share\vm\oops" /I "$(HotSpotWorkSpace)\src\share\vm\runtime" /I "$(HotSpotWorkSpace)\src\share\vm\memory" /I "$(HotSpotWorkSpace)\src\share\vm\libadt" /I "$(HotSpotWorkSpace)\src\cpu\i486\vm" /I "$(HotSpotWorkSpace)\src\os\win32\vm" /D "WIN32" /D "_WINDOWS" /D "ASSERT" /Fr /FD /c 28.9 # ADD BASE RSC /l 0x409 28.10 # ADD RSC /l 0x409 28.11 BSC32=bscmake.exe
29.1 --- a/src/cpu/sparc/vm/frame_sparc.cpp Fri Apr 12 12:22:59 2013 -0700 29.2 +++ b/src/cpu/sparc/vm/frame_sparc.cpp Fri Apr 12 15:53:30 2013 -0700 29.3 @@ -1,5 +1,5 @@ 29.4 /* 29.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 29.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 29.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 29.8 * 29.9 * This code is free software; you can redistribute it and/or modify it 29.10 @@ -304,7 +304,7 @@ 29.11 29.12 // The sender should positively be an nmethod or call_stub. On sparc we might in fact see something else. 29.13 // The cause of this is because at a save instruction the O7 we get is a leftover from an earlier 29.14 - // window use. So if a runtime stub creates two frames (common in fastdebug/jvmg) then we see the 29.15 + // window use. So if a runtime stub creates two frames (common in fastdebug/debug) then we see the 29.16 // stale pc. So if the sender blob is not something we'd expect we have little choice but to declare 29.17 // the stack unwalkable. pd_get_top_frame_for_signal_handler tries to recover from this by unwinding 29.18 // that initial frame and retrying.
30.1 --- a/src/os/bsd/dtrace/generateJvmOffsets.cpp Fri Apr 12 12:22:59 2013 -0700 30.2 +++ b/src/os/bsd/dtrace/generateJvmOffsets.cpp Fri Apr 12 15:53:30 2013 -0700 30.3 @@ -1,5 +1,5 @@ 30.4 /* 30.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. 30.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 30.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 30.8 * 30.9 * This code is free software; you can redistribute it and/or modify it 30.10 @@ -60,7 +60,7 @@ 30.11 #define PR_MODEL_LP64 2 30.12 30.13 #ifdef COMPILER1 30.14 -#if defined(DEBUG) || defined(FASTDEBUG) 30.15 +#ifdef ASSERT 30.16 30.17 /* 30.18 * To avoid the most part of potential link errors 30.19 @@ -84,7 +84,7 @@ 30.20 30.21 StubQueue* AbstractInterpreter::_code = NULL; 30.22 30.23 -#endif /* defined(DEBUG) || defined(FASTDEBUG) */ 30.24 +#endif /* ASSERT */ 30.25 #endif /* COMPILER1 */ 30.26 30.27 #define GEN_OFFS(Type,Name) \
31.1 --- a/src/os/solaris/dtrace/generateJvmOffsets.cpp Fri Apr 12 12:22:59 2013 -0700 31.2 +++ b/src/os/solaris/dtrace/generateJvmOffsets.cpp Fri Apr 12 15:53:30 2013 -0700 31.3 @@ -1,5 +1,5 @@ 31.4 /* 31.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. 31.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 31.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 31.8 * 31.9 * This code is free software; you can redistribute it and/or modify it 31.10 @@ -55,14 +55,14 @@ 31.11 #include "utilities/accessFlags.hpp" 31.12 #include "utilities/globalDefinitions.hpp" 31.13 #ifdef COMPILER1 31.14 -#if defined(DEBUG) || defined(FASTDEBUG) 31.15 +#ifdef ASSERT 31.16 31.17 /* 31.18 * To avoid the most part of potential link errors 31.19 * we link this program with -z nodefs . 31.20 * 31.21 * But for 'debug1' and 'fastdebug1' we still have to provide 31.22 - * a particular workaround for the following symbols bellow. 31.23 + * a particular workaround for the following symbols below. 31.24 * It will be good to find out a generic way in the future. 31.25 */ 31.26 31.27 @@ -79,7 +79,7 @@ 31.28 31.29 StubQueue* AbstractInterpreter::_code = NULL; 31.30 31.31 -#endif /* defined(DEBUG) || defined(FASTDEBUG) */ 31.32 +#endif /* ASSERT */ 31.33 #endif /* COMPILER1 */ 31.34 31.35 #define GEN_OFFS(Type,Name) \
32.1 --- a/src/os/windows/vm/os_windows.cpp Fri Apr 12 12:22:59 2013 -0700 32.2 +++ b/src/os/windows/vm/os_windows.cpp Fri Apr 12 15:53:30 2013 -0700 32.3 @@ -4238,9 +4238,6 @@ 32.4 path[3] = '\0'; 32.5 } 32.6 32.7 - #ifdef DEBUG 32.8 - jio_fprintf(stderr, "sysNativePath: %s\n", path); 32.9 - #endif DEBUG 32.10 return path; 32.11 } 32.12
33.1 --- a/src/share/tools/hsdis/Makefile Fri Apr 12 12:22:59 2013 -0700 33.2 +++ b/src/share/tools/hsdis/Makefile Fri Apr 12 15:53:30 2013 -0700 33.3 @@ -1,5 +1,5 @@ 33.4 # 33.5 -# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved. 33.6 +# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. 33.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 33.8 # 33.9 # This code is free software; you can redistribute it and/or modify it 33.10 @@ -19,7 +19,7 @@ 33.11 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 33.12 # or visit www.oracle.com if you need additional information or have any 33.13 # questions. 33.14 -# 33.15 +# 33.16 # 33.17 33.18 # Single gnu makefile for solaris, linux and windows (windows requires cygwin and mingw) 33.19 @@ -66,7 +66,7 @@ 33.20 endif 33.21 CC = $(MINGW)-gcc 33.22 CONFIGURE_ARGS= --host=$(MINGW) --target=$(MINGW) 33.23 -else #linux 33.24 +else #linux 33.25 CPU = $(shell uname -m) 33.26 ARCH1=$(CPU:x86_64=amd64) 33.27 ARCH=$(ARCH1:i686=i386) 33.28 @@ -116,7 +116,6 @@ 33.29 else #Windows 33.30 OS = windows 33.31 CC = gcc 33.32 -#CPPFLAGS += /D"WIN32" /D"_WINDOWS" /D"DEBUG" /D"NDEBUG" 33.33 CFLAGS += /nologo /MD /W3 /WX /O2 /Fo$(@:.dll=.obj) /Gi- 33.34 CFLAGS += LIBARCH=\"$(LIBARCH)\" 33.35 DLDFLAGS += /dll /subsystem:windows /incremental:no \
34.1 --- a/src/share/vm/classfile/stackMapFrame.hpp Fri Apr 12 12:22:59 2013 -0700 34.2 +++ b/src/share/vm/classfile/stackMapFrame.hpp Fri Apr 12 15:53:30 2013 -0700 34.3 @@ -1,5 +1,5 @@ 34.4 /* 34.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. 34.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 34.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 34.8 * 34.9 * This code is free software; you can redistribute it and/or modify it 34.10 @@ -175,14 +175,14 @@ 34.11 ErrorContext* ctx, TRAPS) const; 34.12 34.13 inline void set_mark() { 34.14 -#ifdef DEBUG 34.15 +#ifdef ASSERT 34.16 // Put bogus type to indicate it's no longer valid. 34.17 if (_stack_mark != -1) { 34.18 for (int i = _stack_mark - 1; i >= _stack_size; --i) { 34.19 _stack[i] = VerificationType::bogus_type(); 34.20 } 34.21 } 34.22 -#endif // def DEBUG 34.23 +#endif // def ASSERT 34.24 _stack_mark = _stack_size; 34.25 } 34.26
35.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Fri Apr 12 12:22:59 2013 -0700 35.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Fri Apr 12 15:53:30 2013 -0700 35.3 @@ -6921,7 +6921,7 @@ 35.4 size = CompactibleFreeListSpace::adjustObjectSize( 35.5 p->oop_iterate(_scanningClosure)); 35.6 } 35.7 - #ifdef DEBUG 35.8 + #ifdef ASSERT 35.9 size_t direct_size = 35.10 CompactibleFreeListSpace::adjustObjectSize(p->size()); 35.11 assert(size == direct_size, "Inconsistency in size"); 35.12 @@ -6933,7 +6933,7 @@ 35.13 assert(_bitMap->isMarked(addr+size-1), 35.14 "inconsistent Printezis mark"); 35.15 } 35.16 - #endif // DEBUG 35.17 + #endif // ASSERT 35.18 } else { 35.19 // an unitialized object 35.20 assert(_bitMap->isMarked(addr+1), "missing Printezis mark?"); 35.21 @@ -7075,14 +7075,14 @@ 35.22 HeapWord* addr = (HeapWord*)p; 35.23 assert(_span.contains(addr), "we are scanning the CMS generation"); 35.24 bool is_obj_array = false; 35.25 - #ifdef DEBUG 35.26 + #ifdef ASSERT 35.27 if (!_parallel) { 35.28 assert(_mark_stack->isEmpty(), "pre-condition (eager drainage)"); 35.29 assert(_collector->overflow_list_is_empty(), 35.30 "overflow list should be empty"); 35.31 35.32 } 35.33 - #endif // DEBUG 35.34 + #endif // ASSERT 35.35 if (_bit_map->isMarked(addr)) { 35.36 // Obj arrays are precisely marked, non-arrays are not; 35.37 // so we scan objArrays precisely and non-arrays in their 35.38 @@ -7102,14 +7102,14 @@ 35.39 } 35.40 } 35.41 } 35.42 - #ifdef DEBUG 35.43 + #ifdef ASSERT 35.44 if (!_parallel) { 35.45 assert(_mark_stack->isEmpty(), "post-condition (eager drainage)"); 35.46 assert(_collector->overflow_list_is_empty(), 35.47 "overflow list should be empty"); 35.48 35.49 } 35.50 - #endif // DEBUG 35.51 + #endif // ASSERT 35.52 return is_obj_array; 35.53 } 35.54 35.55 @@ -8320,7 +8320,7 @@ 35.56 assert(size == CompactibleFreeListSpace::adjustObjectSize(size), 35.57 "alignment problem"); 35.58 35.59 -#ifdef DEBUG 35.60 +#ifdef ASSERT 35.61 if (oop(addr)->klass_or_null() != NULL) { 35.62 // Ignore mark word because we are running concurrent with mutators 35.63 assert(oop(addr)->is_oop(true), "live block should be an oop");
36.1 --- a/src/share/vm/memory/allocation.hpp Fri Apr 12 12:22:59 2013 -0700 36.2 +++ b/src/share/vm/memory/allocation.hpp Fri Apr 12 15:53:30 2013 -0700 36.3 @@ -1,5 +1,5 @@ 36.4 /* 36.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 36.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 36.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 36.8 * 36.9 * This code is free software; you can redistribute it and/or modify it 36.10 @@ -178,7 +178,7 @@ 36.11 #endif // INCLUDE_NMT 36.12 36.13 // debug build does not inline 36.14 -#if defined(_DEBUG_) 36.15 +#if defined(_NMT_NOINLINE_) 36.16 #define CURRENT_PC (NMT_track_callsite ? os::get_caller_pc(1) : 0) 36.17 #define CALLER_PC (NMT_track_callsite ? os::get_caller_pc(2) : 0) 36.18 #define CALLER_CALLER_PC (NMT_track_callsite ? os::get_caller_pc(3) : 0)
37.1 --- a/src/share/vm/runtime/vmThread.cpp Fri Apr 12 12:22:59 2013 -0700 37.2 +++ b/src/share/vm/runtime/vmThread.cpp Fri Apr 12 15:53:30 2013 -0700 37.3 @@ -123,7 +123,7 @@ 37.4 _queue[prio]->set_next(_queue[prio]); 37.5 _queue[prio]->set_prev(_queue[prio]); 37.6 assert(queue_empty(prio), "drain corrupted queue"); 37.7 -#ifdef DEBUG 37.8 +#ifdef ASSERT 37.9 int len = 0; 37.10 VM_Operation* cur; 37.11 for(cur = r; cur != NULL; cur=cur->next()) len++;
