--- old/hotspot/make/lib/CompileJvm.gmk	2016-09-27 09:56:06.115701086 -0400
+++ new/hotspot/make/lib/CompileJvm.gmk	2016-09-27 09:56:04.519610648 -0400
@@ -28,7 +28,6 @@
 include lib/JvmFeatures.gmk
 include lib/JvmOverrideFiles.gmk
 
-$(eval $(call IncludeCustomExtension, hotspot, lib/CompileJvm.gmk))
 
 ################################################################################
 # Setup compilation of the main Hotspot native library (libjvm).
@@ -139,6 +138,21 @@
 ################################################################################
 # 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