*** old/make/hotspot/lib/CompileJvm.gmk	Mon Sep 17 10:29:25 2018
--- new/make/hotspot/lib/CompileJvm.gmk	Mon Sep 17 10:29:25 2018

*** 58,73 ****
--- 58,67 ----
  # 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 := \