1.1 --- a/make/common/shared/Defs-java.gmk Mon Aug 24 17:25:50 2009 -0700
1.2 +++ b/make/common/shared/Defs-java.gmk Tue Sep 01 23:44:41 2009 +0100
1.3 @@ -55,10 +55,21 @@
1.4 ADD_CLIENT_VM_OPTION = true
1.5 endif
1.6 endif
1.7 -JAVA_JVM_FLAGS =
1.8 +
1.9 +# Options for hotspot to turn off printing of options with fastdebug version
1.10 +# and creating the hotspot.log file.
1.11 +JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \
1.12 + -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput
1.13 +
1.14 +# JVM options
1.15 +JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS)
1.16 +
1.17 ifeq ($(ADD_CLIENT_VM_OPTION), true)
1.18 JAVA_JVM_FLAGS += -client
1.19 endif
1.20 +ifdef USE_HOTSPOT_INTERPRETER_MODE
1.21 + JAVA_JVM_FLAGS += -Xint
1.22 +endif
1.23
1.24 # Various VM flags
1.25 JAVA_TOOLS_FLAGS = $(JAVA_JVM_FLAGS) $(JAVA_MEM_FLAGS)
1.26 @@ -100,7 +111,10 @@
1.27 ifeq ($(DEBUG_CLASSFILES),true)
1.28 JAVACFLAGS += -g
1.29 endif
1.30 -ifeq ($(COMPILER_WARNINGS_FATAL), true)
1.31 +ifeq ($(JAVAC_MAX_WARNINGS), true)
1.32 + JAVACFLAGS += -Xlint:all
1.33 +endif
1.34 +ifeq ($(JAVAC_WARNINGS_FATAL), true)
1.35 JAVACFLAGS += -Werror
1.36 endif
1.37
1.38 @@ -108,7 +122,8 @@
1.39 JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS)
1.40
1.41 # Add the source level
1.42 -LANGUAGE_VERSION = -source 7
1.43 +SOURCE_LANGUAGE_VERSION = 7
1.44 +LANGUAGE_VERSION = -source $(SOURCE_LANGUAGE_VERSION)
1.45 JAVACFLAGS += $(LANGUAGE_VERSION)
1.46
1.47 # Add the class version we want
1.48 @@ -176,12 +191,17 @@
1.49 # The javac options supplied to the boot javac is limited. This compiler
1.50 # should only be used to build the 'make/tools' sources, which are not
1.51 # class files that end up in the classes directory.
1.52 -ifeq ($(COMPILER_WARNINGS_FATAL), true)
1.53 +ifeq ($(JAVAC_MAX_WARNINGS), true)
1.54 + BOOT_JAVACFLAGS += -Xlint:all
1.55 +endif
1.56 +ifeq ($(JAVAC_WARNINGS_FATAL), true)
1.57 BOOT_JAVACFLAGS += -Werror
1.58 endif
1.59 +
1.60 BOOT_SOURCE_LANGUAGE_VERSION = 6
1.61 BOOT_TARGET_CLASS_VERSION = 6
1.62 BOOT_JAVACFLAGS += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
1.63 +BOOT_JAR_JFLAGS += $(JAR_JFLAGS)
1.64
1.65 BOOT_JAVA_CMD = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS)
1.66 BOOT_JAVAC_CMD = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS)
