make/hotspot/lib/CompileJvm.gmk

*** 58,73 ****
  # Needed by vm_version.cpp
  ifeq ($(OPENJDK_TARGET_CPU), x86_64)
    OPENJDK_TARGET_CPU_VM_VERSION := amd64
  else ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
    OPENJDK_TARGET_CPU_VM_VERSION := sparc
- else ifeq ($(HOTSPOT_TARGET_CPU_ARCH), arm)
-   ifeq ($(OPENJDK_TARGET_CPU), aarch64)
-     # This sets the Oracle Aarch64 port to use arm64
-     # while the original Aarch64 port uses aarch64
-     OPENJDK_TARGET_CPU_VM_VERSION := arm64
-   endif
  else
    OPENJDK_TARGET_CPU_VM_VERSION := $(OPENJDK_TARGET_CPU)
  endif
  
  CFLAGS_VM_VERSION := \
--- 58,67 ----