hotspot/make/lib/CompileJvm.gmk
Index
Unified diffs
Context diffs
Sdiffs
Wdiffs
Patch
New
Old
Previous File
Next File
jdk9-arm3264 Cdiff hotspot/make/lib/CompileJvm.gmk
hotspot/make/lib/CompileJvm.gmk
Print this page
*** 26,36 ****
# Include support files that will setup compiler flags due to the selected
# jvm feature set, and specific file overrides.
include lib/JvmFeatures.gmk
include lib/JvmOverrideFiles.gmk
- $(eval $(call IncludeCustomExtension, hotspot, lib/CompileJvm.gmk))
################################################################################
# Setup compilation of the main Hotspot native library (libjvm).
JVM_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm
--- 26,35 ----
*** 137,146 ****
--- 136,160 ----
endif
################################################################################
# Platform specific setup
+ # ARM source selection
+ # TODO - Need a better way of selecting open versus closed aarch64 sources
+
+ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), linux-arm)
+ JVM_EXCLUDE_PATTERNS += arm_64
+
+ else ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), linux-aarch64)
+ # Open aarch64 port is named "aarch64", exclude it if the
+ # HOTSPOT_TARGET_CPU_ARCH is set to arm. In this case we
+ # want the hybrid sources.
+ ifeq ($(HOTSPOT_TARGET_CPU_ARCH), arm)
+ JVM_EXCLUDE_PATTERNS += arm_32 aarch64
+ endif
+ endif
+
ifneq ($(filter $(OPENJDK_TARGET_OS), linux macosx windows), )
JVM_PRECOMPILED_HEADER := $(HOTSPOT_TOPDIR)/src/share/vm/precompiled/precompiled.hpp
endif
ifneq ($(filter $(OPENJDK_TARGET_OS), macosx aix solaris), )
hotspot/make/lib/CompileJvm.gmk
Index
Unified diffs
Context diffs
Sdiffs
Wdiffs
Patch
New
Old
Previous File
Next File