make/hotspot/lib/CompileJvm.gmk

*** 55,65 ****
  
  # These files and directories are always excluded
  JVM_EXCLUDE_FILES += args.cc
  JVM_EXCLUDES += adlc
  
! # 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)
--- 55,65 ----
  
  # These files and directories are always excluded
  JVM_EXCLUDE_FILES += args.cc
  JVM_EXCLUDES += adlc
  
! # Needed by abstract_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)
*** 156,166 ****
      EXCLUDES := $(JVM_EXCLUDES), \
      EXCLUDE_FILES := $(JVM_EXCLUDE_FILES), \
      EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \
      EXTRA_OBJECT_FILES := $(DTRACE_EXTRA_OBJECT_FILES), \
      CFLAGS := $(JVM_CFLAGS), \
!     vm_version.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
      arguments.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
      DISABLED_WARNINGS_clang := tautological-compare, \
      DISABLED_WARNINGS_solstudio := $(DISABLED_WARNINGS_solstudio), \
      DISABLED_WARNINGS_xlc := 1540-0216 1540-0198 1540-1090 1540-1639 \
          1540-1088 1500-010, \
--- 156,166 ----
      EXCLUDES := $(JVM_EXCLUDES), \
      EXCLUDE_FILES := $(JVM_EXCLUDE_FILES), \
      EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \
      EXTRA_OBJECT_FILES := $(DTRACE_EXTRA_OBJECT_FILES), \
      CFLAGS := $(JVM_CFLAGS), \
!     abstract_vm_version.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
      arguments.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
      DISABLED_WARNINGS_clang := tautological-compare, \
      DISABLED_WARNINGS_solstudio := $(DISABLED_WARNINGS_solstudio), \
      DISABLED_WARNINGS_xlc := 1540-0216 1540-0198 1540-1090 1540-1639 \
          1540-1088 1500-010, \
*** 177,191 ****
      VERSIONINFO_RESOURCE := $(TOPDIR)/src/hotspot/os/windows/version.rc, \
      PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \
      PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
  ))
  
! # Always recompile vm_version.cpp if libjvm needs to be relinked. This ensures
  # that the internal vm version is updated as it relies on __DATE__ and __TIME__
  # macros.
! VM_VERSION_OBJ := $(JVM_OUTPUTDIR)/objs/vm_version$(OBJ_SUFFIX)
! $(VM_VERSION_OBJ): $(filter-out $(VM_VERSION_OBJ) $(JVM_MAPFILE), \
      $(BUILD_LIBJVM_TARGET_DEPS))
  
  ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
    ifeq ($(OPENJDK_TARGET_OS), windows)
      # It doesn't matter which jvm.lib file gets exported, but we need
--- 177,191 ----
      VERSIONINFO_RESOURCE := $(TOPDIR)/src/hotspot/os/windows/version.rc, \
      PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \
      PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
  ))
  
! # Always recompile abstract_vm_version.cpp if libjvm needs to be relinked. This ensures
  # that the internal vm version is updated as it relies on __DATE__ and __TIME__
  # macros.
! ABSTRACT_VM_VERSION_OBJ := $(JVM_OUTPUTDIR)/objs/abstract_vm_version$(OBJ_SUFFIX)
! $(ABSTRACT_VM_VERSION_OBJ): $(filter-out $(ABSTRACT_VM_VERSION_OBJ) $(JVM_MAPFILE), \
      $(BUILD_LIBJVM_TARGET_DEPS))
  
  ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
    ifeq ($(OPENJDK_TARGET_OS), windows)
      # It doesn't matter which jvm.lib file gets exported, but we need