make/hotspot/lib/CompileJvm.gmk

rev 56941 : 8233787: Break cycle in vm_version* includes
Reviewed-by:

*** 55,65 ****
  
  # These files and directories are always excluded
  JVM_EXCLUDE_FILES += args.cc
  JVM_EXCLUDES += adlc
  
! # Needed by vm_version.cpp
  ifeq ($(call isTargetCpu, x86_64), true)
    OPENJDK_TARGET_CPU_VM_VERSION := amd64
  else ifeq ($(call isTargetCpu, sparcv9), true)
    OPENJDK_TARGET_CPU_VM_VERSION := sparc
  else
--- 55,65 ----
  
  # These files and directories are always excluded
  JVM_EXCLUDE_FILES += args.cc
  JVM_EXCLUDES += adlc
  
! # Needed by abstract_vm_version.cpp
  ifeq ($(call isTargetCpu, x86_64), true)
    OPENJDK_TARGET_CPU_VM_VERSION := amd64
  else ifeq ($(call isTargetCpu, sparcv9), true)
    OPENJDK_TARGET_CPU_VM_VERSION := sparc
  else
*** 181,191 ****
      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_gcc := $(DISABLED_WARNINGS_gcc), \
      DISABLED_WARNINGS_clang := $(DISABLED_WARNINGS_clang), \
      DISABLED_WARNINGS_solstudio := $(DISABLED_WARNINGS_solstudio), \
      DISABLED_WARNINGS_xlc := $(DISABLED_WARNINGS_xlc), \
--- 181,191 ----
      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_gcc := $(DISABLED_WARNINGS_gcc), \
      DISABLED_WARNINGS_clang := $(DISABLED_WARNINGS_clang), \
      DISABLED_WARNINGS_solstudio := $(DISABLED_WARNINGS_solstudio), \
      DISABLED_WARNINGS_xlc := $(DISABLED_WARNINGS_xlc), \
*** 204,218 ****
      PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \
      PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
      DEFINE_THIS_FILE := false, \
  ))
  
! # 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 ($(call isTargetOs, windows), true)
      # It doesn't matter which jvm.lib file gets exported, but we need
--- 204,218 ----
      PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \
      PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
      DEFINE_THIS_FILE := false, \
  ))
  
! # 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 ($(call isTargetOs, windows), true)
      # It doesn't matter which jvm.lib file gets exported, but we need