26 # Include support files that will setup compiler flags due to the selected |
26 # Include support files that will setup compiler flags due to the selected |
27 # jvm feature set, and specific file overrides. |
27 # jvm feature set, and specific file overrides. |
28 include lib/JvmFeatures.gmk |
28 include lib/JvmFeatures.gmk |
29 include lib/JvmOverrideFiles.gmk |
29 include lib/JvmOverrideFiles.gmk |
30 |
30 |
31 $(eval $(call IncludeCustomExtension, hotspot, lib/CompileJvm.gmk)) |
31 $(eval $(call IncludeCustomExtension, , hotspot/lib/CompileJvm.gmk)) |
32 |
32 |
33 ################################################################################ |
33 ################################################################################ |
34 # Setup compilation of the main Hotspot native library (libjvm). |
34 # Setup compilation of the main Hotspot native library (libjvm). |
35 |
35 |
36 JVM_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm |
36 JVM_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm |
38 |
38 |
39 ################################################################################ |
39 ################################################################################ |
40 # Platform independent setup |
40 # Platform independent setup |
41 |
41 |
42 # This variable may be added to by a custom extension |
42 # This variable may be added to by a custom extension |
43 JVM_SRC_ROOTS += $(HOTSPOT_TOPDIR)/src |
43 JVM_SRC_ROOTS += $(TOPDIR)/src/hotspot |
44 |
44 |
45 JVM_SRC_DIRS += $(call uniq, $(wildcard $(foreach d, $(JVM_SRC_ROOTS), \ |
45 JVM_SRC_DIRS += $(call uniq, $(wildcard $(foreach d, $(JVM_SRC_ROOTS), \ |
46 $d/share/vm \ |
46 $d/share \ |
47 $d/os/$(HOTSPOT_TARGET_OS)/vm \ |
47 $d/os/$(HOTSPOT_TARGET_OS) \ |
48 $d/os/$(HOTSPOT_TARGET_OS_TYPE)/vm \ |
48 $d/os/$(HOTSPOT_TARGET_OS_TYPE) \ |
49 $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/vm \ |
49 $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH) \ |
50 $d/os_cpu/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH)/vm \ |
50 $d/os_cpu/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH) \ |
51 ))) \ |
51 ))) \ |
52 $(JVM_VARIANT_OUTPUTDIR)/gensrc/jvmtifiles \ |
52 $(JVM_VARIANT_OUTPUTDIR)/gensrc/jvmtifiles \ |
53 $(JVM_VARIANT_OUTPUTDIR)/gensrc/tracefiles \ |
53 $(JVM_VARIANT_OUTPUTDIR)/gensrc/tracefiles \ |
54 # |
54 # |
55 |
55 |
56 JVM_CFLAGS_INCLUDES += \ |
56 JVM_CFLAGS_INCLUDES += \ |
57 $(patsubst %,-I%,$(filter-out $(JVM_VARIANT_OUTPUTDIR)/gensrc/%, $(JVM_SRC_DIRS))) \ |
57 $(patsubst %,-I%,$(filter-out $(JVM_VARIANT_OUTPUTDIR)/gensrc/%, $(JVM_SRC_DIRS))) \ |
58 -I$(JVM_VARIANT_OUTPUTDIR)/gensrc \ |
58 -I$(JVM_VARIANT_OUTPUTDIR)/gensrc \ |
59 -I$(HOTSPOT_TOPDIR)/src/share/vm/precompiled \ |
59 -I$(TOPDIR)/src/hotspot/share/precompiled \ |
60 -I$(HOTSPOT_TOPDIR)/src/share/vm/prims \ |
60 -I$(TOPDIR)/src/hotspot/share/prims \ |
61 # |
61 # |
62 |
62 |
63 # INCLUDE_SUFFIX_* is only meant for including the proper |
63 # INCLUDE_SUFFIX_* is only meant for including the proper |
64 # platform files. Don't use it to guard code. Use the value of |
64 # platform files. Don't use it to guard code. Use the value of |
65 # HOTSPOT_TARGET_CPU_DEFINE etc. instead. |
65 # HOTSPOT_TARGET_CPU_DEFINE etc. instead. |
159 JVM_EXCLUDE_PATTERNS += arm_32 aarch64 |
159 JVM_EXCLUDE_PATTERNS += arm_32 aarch64 |
160 endif |
160 endif |
161 endif |
161 endif |
162 |
162 |
163 ifneq ($(filter $(OPENJDK_TARGET_OS), linux macosx windows), ) |
163 ifneq ($(filter $(OPENJDK_TARGET_OS), linux macosx windows), ) |
164 JVM_PRECOMPILED_HEADER := $(HOTSPOT_TOPDIR)/src/share/vm/precompiled/precompiled.hpp |
164 JVM_PRECOMPILED_HEADER := $(TOPDIR)/src/hotspot/share/precompiled/precompiled.hpp |
165 endif |
165 endif |
166 |
166 |
167 ifeq ($(OPENJDK_TARGET_CPU), x86) |
167 ifeq ($(OPENJDK_TARGET_CPU), x86) |
168 JVM_EXCLUDE_PATTERNS += x86_64 |
168 JVM_EXCLUDE_PATTERNS += x86_64 |
169 else ifeq ($(OPENJDK_TARGET_CPU), x86_64) |
169 else ifeq ($(OPENJDK_TARGET_CPU), x86_64) |
171 endif |
171 endif |
172 |
172 |
173 # Inline assembly for solaris |
173 # Inline assembly for solaris |
174 ifeq ($(OPENJDK_TARGET_OS), solaris) |
174 ifeq ($(OPENJDK_TARGET_OS), solaris) |
175 ifeq ($(OPENJDK_TARGET_CPU), x86_64) |
175 ifeq ($(OPENJDK_TARGET_CPU), x86_64) |
176 JVM_CFLAGS += $(HOTSPOT_TOPDIR)/src/os_cpu/solaris_x86/vm/solaris_x86_64.il |
176 JVM_CFLAGS += $(TOPDIR)/src/hotspot/os_cpu/solaris_x86/solaris_x86_64.il |
177 else ifeq ($(OPENJDK_TARGET_CPU), sparcv9) |
177 else ifeq ($(OPENJDK_TARGET_CPU), sparcv9) |
178 JVM_CFLAGS += $(HOTSPOT_TOPDIR)/src/os_cpu/solaris_sparc/vm/solaris_sparc.il |
178 JVM_CFLAGS += $(TOPDIR)/src/hotspot/os_cpu/solaris_sparc/solaris_sparc.il |
179 endif |
179 endif |
180 endif |
180 endif |
181 |
181 |
182 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9) |
182 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9) |
183 ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), false) |
183 ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), false) |
229 MAPFILE := $(JVM_MAPFILE), \ |
229 MAPFILE := $(JVM_MAPFILE), \ |
230 USE_MAPFILE_FOR_SYMBOLS := true, \ |
230 USE_MAPFILE_FOR_SYMBOLS := true, \ |
231 STRIPFLAGS := $(JVM_STRIPFLAGS), \ |
231 STRIPFLAGS := $(JVM_STRIPFLAGS), \ |
232 EMBED_MANIFEST := true, \ |
232 EMBED_MANIFEST := true, \ |
233 RC_FLAGS := $(JVM_RCFLAGS), \ |
233 RC_FLAGS := $(JVM_RCFLAGS), \ |
234 VERSIONINFO_RESOURCE := $(HOTSPOT_TOPDIR)/src/os/windows/vm/version.rc, \ |
234 VERSIONINFO_RESOURCE := $(TOPDIR)/src/hotspot/os/windows/version.rc, \ |
235 PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \ |
235 PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \ |
236 PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \ |
236 PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \ |
237 )) |
237 )) |
238 |
238 |
239 ifeq ($(OPENJDK_TARGET_OS), windows) |
239 ifeq ($(OPENJDK_TARGET_OS), windows) |