make/hotspot/lib/CompileJvm.gmk

rev 52915 : 8221851: Use of THIS_FILE in hotspot invalidates precompiled header on Linux/GCC
Reviewed-by: tbell, ysuenaga, andrew
rev 52916 : 8210459: Add support for generating compile_commands.json
Reviewed-by: andrew
rev 52923 : 8226346: Build better binary builders
Reviewed-by: andrew

*** 184,203 ****
  # 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))
  
! ifeq ($(OPENJDK_TARGET_OS), windows)
    # It doesn't matter which jvm.lib file gets exported, but we need
    # to pick just one.
    ifeq ($(JVM_VARIANT), $(JVM_VARIANT_MAIN))
      $(eval $(call SetupCopyFiles, COPY_JVM_LIB, \
          DEST := $(LIB_OUTPUTDIR), \
          FILES :=$(BUILD_LIBJVM_IMPORT_LIBRARY), \
      ))
      TARGETS += $(COPY_JVM_LIB)
    endif
  endif
  
  # AIX warning explanation:
  # 1500-010  : (W) WARNING in ...: Infinite loop.  Program may not stop.
  #             There are several infinite loops in the vm, so better suppress.
--- 184,205 ----
  # 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
      # to pick just one.
      ifeq ($(JVM_VARIANT), $(JVM_VARIANT_MAIN))
        $(eval $(call SetupCopyFiles, COPY_JVM_LIB, \
            DEST := $(LIB_OUTPUTDIR), \
            FILES :=$(BUILD_LIBJVM_IMPORT_LIBRARY), \
        ))
        TARGETS += $(COPY_JVM_LIB)
      endif
+   endif
  endif
  
  # AIX warning explanation:
  # 1500-010  : (W) WARNING in ...: Infinite loop.  Program may not stop.
  #             There are several infinite loops in the vm, so better suppress.
*** 231,241 ****
  # -l include filenames and line numbers
  #
  # Search the output for the operator(s) of interest, to see where they are
  # referenced.
  
! ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang solstudio), )
  
    DEMANGLED_REGEXP := [^:]operator (new|delete)
  
    # Running c++filt to find offending symbols in all files is too expensive,
    # especially on Solaris, so use mangled names when looking for symbols.
--- 233,244 ----
  # -l include filenames and line numbers
  #
  # Search the output for the operator(s) of interest, to see where they are
  # referenced.
  
! ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
!   ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang solstudio), )
  
      DEMANGLED_REGEXP := [^:]operator (new|delete)
  
      # Running c++filt to find offending symbols in all files is too expensive,
      # especially on Solaris, so use mangled names when looking for symbols.
*** 271,276 ****
--- 274,280 ----
  
        TARGETS += $1.op_check
      endef
  
      $(foreach o, $(BUILD_LIBJVM_ALL_OBJS), $(eval $(call SetupOperatorNewDeleteCheck,$o)))
+   endif
  endif