Mercurial > jdk8-mips64-public > corba / file comparison
comparison: make/common/shared/Defs-java.gmk
make/common/shared/Defs-java.gmk
- changeset 111
- 3f1ef7f899ea
- parent 109
- 8001ba2bf10d
- child 158
- 91006f157c46
equal
deleted
inserted
replaced
| 110:04414f276160 | 111:3f1ef7f899ea |
|---|---|
| 53 else | 53 else |
| 54 ifeq ($(ARCH_DATA_MODEL), 32) | 54 ifeq ($(ARCH_DATA_MODEL), 32) |
| 55 ADD_CLIENT_VM_OPTION = true | 55 ADD_CLIENT_VM_OPTION = true |
| 56 endif | 56 endif |
| 57 endif | 57 endif |
| 58 JAVA_JVM_FLAGS = | 58 |
| 59 # Options for hotspot to turn off printing of options with fastdebug version | |
| 60 # and creating the hotspot.log file. | |
| 61 JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \ | |
| 62 -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput | |
| 63 | |
| 64 # JVM options | |
| 65 JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS) | |
| 66 | |
| 59 ifeq ($(ADD_CLIENT_VM_OPTION), true) | 67 ifeq ($(ADD_CLIENT_VM_OPTION), true) |
| 60 JAVA_JVM_FLAGS += -client | 68 JAVA_JVM_FLAGS += -client |
| 69 endif | |
| 70 ifdef USE_HOTSPOT_INTERPRETER_MODE | |
| 71 JAVA_JVM_FLAGS += -Xint | |
| 61 endif | 72 endif |
| 62 | 73 |
| 63 # Various VM flags | 74 # Various VM flags |
| 64 JAVA_TOOLS_FLAGS = $(JAVA_JVM_FLAGS) $(JAVA_MEM_FLAGS) | 75 JAVA_TOOLS_FLAGS = $(JAVA_JVM_FLAGS) $(JAVA_MEM_FLAGS) |
| 65 | 76 |
| 98 endif | 109 endif |
| 99 JAVACFLAGS = | 110 JAVACFLAGS = |
| 100 ifeq ($(DEBUG_CLASSFILES),true) | 111 ifeq ($(DEBUG_CLASSFILES),true) |
| 101 JAVACFLAGS += -g | 112 JAVACFLAGS += -g |
| 102 endif | 113 endif |
| 103 ifeq ($(COMPILER_WARNINGS_FATAL), true) | 114 ifeq ($(JAVAC_MAX_WARNINGS), true) |
| 115 JAVACFLAGS += -Xlint:all | |
| 116 endif | |
| 117 ifeq ($(JAVAC_WARNINGS_FATAL), true) | |
| 104 JAVACFLAGS += -Werror | 118 JAVACFLAGS += -Werror |
| 105 endif | 119 endif |
| 106 | 120 |
| 107 NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true | 121 NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true |
| 108 JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS) | 122 JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS) |
| 109 | 123 |
| 110 # Add the source level | 124 # Add the source level |
| 111 LANGUAGE_VERSION = -source 7 | 125 SOURCE_LANGUAGE_VERSION = 7 |
| 126 LANGUAGE_VERSION = -source $(SOURCE_LANGUAGE_VERSION) | |
| 112 JAVACFLAGS += $(LANGUAGE_VERSION) | 127 JAVACFLAGS += $(LANGUAGE_VERSION) |
| 113 | 128 |
| 114 # Add the class version we want | 129 # Add the class version we want |
| 115 TARGET_CLASS_VERSION = 7 | 130 TARGET_CLASS_VERSION = 7 |
| 116 CLASS_VERSION = -target $(TARGET_CLASS_VERSION) | 131 CLASS_VERSION = -target $(TARGET_CLASS_VERSION) |
| 174 # | 189 # |
| 175 | 190 |
| 176 # The javac options supplied to the boot javac is limited. This compiler | 191 # The javac options supplied to the boot javac is limited. This compiler |
| 177 # should only be used to build the 'make/tools' sources, which are not | 192 # should only be used to build the 'make/tools' sources, which are not |
| 178 # class files that end up in the classes directory. | 193 # class files that end up in the classes directory. |
| 179 ifeq ($(COMPILER_WARNINGS_FATAL), true) | 194 ifeq ($(JAVAC_MAX_WARNINGS), true) |
| 195 BOOT_JAVACFLAGS += -Xlint:all | |
| 196 endif | |
| 197 ifeq ($(JAVAC_WARNINGS_FATAL), true) | |
| 180 BOOT_JAVACFLAGS += -Werror | 198 BOOT_JAVACFLAGS += -Werror |
| 181 endif | 199 endif |
| 200 | |
| 182 BOOT_SOURCE_LANGUAGE_VERSION = 6 | 201 BOOT_SOURCE_LANGUAGE_VERSION = 6 |
| 183 BOOT_TARGET_CLASS_VERSION = 6 | 202 BOOT_TARGET_CLASS_VERSION = 6 |
| 184 BOOT_JAVACFLAGS += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) | 203 BOOT_JAVACFLAGS += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) |
| 204 BOOT_JAR_JFLAGS += $(JAR_JFLAGS) | |
| 185 | 205 |
| 186 BOOT_JAVA_CMD = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS) | 206 BOOT_JAVA_CMD = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS) |
| 187 BOOT_JAVAC_CMD = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS) | 207 BOOT_JAVAC_CMD = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS) |
| 188 BOOT_JAR_CMD = $(BOOTDIR)/bin/jar | 208 BOOT_JAR_CMD = $(BOOTDIR)/bin/jar |
| 189 BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner | 209 BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner |
