55 |
55 |
56 # These files and directories are always excluded |
56 # These files and directories are always excluded |
57 JVM_EXCLUDE_FILES += args.cc |
57 JVM_EXCLUDE_FILES += args.cc |
58 JVM_EXCLUDES += adlc |
58 JVM_EXCLUDES += adlc |
59 |
59 |
60 # Needed by vm_version.cpp |
60 # Needed by abstract_vm_version.cpp |
61 ifeq ($(call isTargetCpu, x86_64), true) |
61 ifeq ($(call isTargetCpu, x86_64), true) |
62 OPENJDK_TARGET_CPU_VM_VERSION := amd64 |
62 OPENJDK_TARGET_CPU_VM_VERSION := amd64 |
63 else ifeq ($(call isTargetCpu, sparcv9), true) |
63 else ifeq ($(call isTargetCpu, sparcv9), true) |
64 OPENJDK_TARGET_CPU_VM_VERSION := sparc |
64 OPENJDK_TARGET_CPU_VM_VERSION := sparc |
65 else |
65 else |
181 EXCLUDES := $(JVM_EXCLUDES), \ |
181 EXCLUDES := $(JVM_EXCLUDES), \ |
182 EXCLUDE_FILES := $(JVM_EXCLUDE_FILES), \ |
182 EXCLUDE_FILES := $(JVM_EXCLUDE_FILES), \ |
183 EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \ |
183 EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \ |
184 EXTRA_OBJECT_FILES := $(DTRACE_EXTRA_OBJECT_FILES), \ |
184 EXTRA_OBJECT_FILES := $(DTRACE_EXTRA_OBJECT_FILES), \ |
185 CFLAGS := $(JVM_CFLAGS), \ |
185 CFLAGS := $(JVM_CFLAGS), \ |
186 vm_version.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \ |
186 abstract_vm_version.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \ |
187 arguments.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \ |
187 arguments.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \ |
188 DISABLED_WARNINGS_gcc := $(DISABLED_WARNINGS_gcc), \ |
188 DISABLED_WARNINGS_gcc := $(DISABLED_WARNINGS_gcc), \ |
189 DISABLED_WARNINGS_clang := $(DISABLED_WARNINGS_clang), \ |
189 DISABLED_WARNINGS_clang := $(DISABLED_WARNINGS_clang), \ |
190 DISABLED_WARNINGS_solstudio := $(DISABLED_WARNINGS_solstudio), \ |
190 DISABLED_WARNINGS_solstudio := $(DISABLED_WARNINGS_solstudio), \ |
191 DISABLED_WARNINGS_xlc := $(DISABLED_WARNINGS_xlc), \ |
191 DISABLED_WARNINGS_xlc := $(DISABLED_WARNINGS_xlc), \ |
204 PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \ |
204 PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \ |
205 PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \ |
205 PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \ |
206 DEFINE_THIS_FILE := false, \ |
206 DEFINE_THIS_FILE := false, \ |
207 )) |
207 )) |
208 |
208 |
209 # Always recompile vm_version.cpp if libjvm needs to be relinked. This ensures |
209 # Always recompile abstract_vm_version.cpp if libjvm needs to be relinked. This ensures |
210 # that the internal vm version is updated as it relies on __DATE__ and __TIME__ |
210 # that the internal vm version is updated as it relies on __DATE__ and __TIME__ |
211 # macros. |
211 # macros. |
212 VM_VERSION_OBJ := $(JVM_OUTPUTDIR)/objs/vm_version$(OBJ_SUFFIX) |
212 ABSTRACT_VM_VERSION_OBJ := $(JVM_OUTPUTDIR)/objs/abstract_vm_version$(OBJ_SUFFIX) |
213 $(VM_VERSION_OBJ): $(filter-out $(VM_VERSION_OBJ) $(JVM_MAPFILE), \ |
213 $(ABSTRACT_VM_VERSION_OBJ): $(filter-out $(ABSTRACT_VM_VERSION_OBJ) $(JVM_MAPFILE), \ |
214 $(BUILD_LIBJVM_TARGET_DEPS)) |
214 $(BUILD_LIBJVM_TARGET_DEPS)) |
215 |
215 |
216 ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true) |
216 ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true) |
217 ifeq ($(call isTargetOs, windows), true) |
217 ifeq ($(call isTargetOs, windows), true) |
218 # It doesn't matter which jvm.lib file gets exported, but we need |
218 # It doesn't matter which jvm.lib file gets exported, but we need |