hotspot/make/lib/CompileJvm.gmk

*** 137,146 ****
--- 137,160 ----
  endif
  
  ################################################################################
  # Platform specific setup
  
+ # ARM source selection
+ 
+ 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
  
  ifeq ($(OPENJDK_TARGET_CPU), x86)