make/hotspot/lib/JvmOverrideFiles.gmk

@  rev 51626 : 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
|  Summary: Compile with -O2 and -ffp-contract=off as for fdlibm.
|  Reviewed-by: erikj, lucy, aph
o  rev 51625 : 8210703: vmStructs.cpp compiled with -O0
|  Reviewed-by: duke
~

*** 36,60 ****
    BUILD_LIBJVM_assembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
    BUILD_LIBJVM_cardTableBarrierSetAssembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
    BUILD_LIBJVM_interp_masm_x86.cpp_CXXFLAGS := -Wno-uninitialized
  endif
  
  ifeq ($(OPENJDK_TARGET_OS), linux)
    BUILD_LIBJVM_ostream.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
    BUILD_LIBJVM_logFileOutput.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
  
!   ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
!     BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(CXX_O_FLAG_NONE)
!     BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := -DNO_PCH $(CXX_O_FLAG_NONE)
  
      ifeq ($(TOOLCHAIN_TYPE), clang)
        JVM_PRECOMPILED_HEADER_EXCLUDE := \
            sharedRuntimeTrig.cpp \
            sharedRuntimeTrans.cpp \
            #
      endif
-   endif
  
    ifeq ($(OPENJDK_TARGET_CPU), x86)
      # Performance measurements show that by compiling GC related code, we could
      # significantly reduce the GC pause time on 32 bit Linux/Unix platforms by
      # compiling without the PIC flag (-fPIC on linux).
--- 36,66 ----
    BUILD_LIBJVM_assembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
    BUILD_LIBJVM_cardTableBarrierSetAssembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
    BUILD_LIBJVM_interp_masm_x86.cpp_CXXFLAGS := -Wno-uninitialized
  endif
  
+ LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NONE)
+ # If the FDLIBM_CFLAGS variable is non-empty we know
+ # that the fdlibm-fork in hotspot can get optimized
+ # by using -ffp-contract=off on GCC/Clang platforms.
+ ifneq ($(FDLIBM_CFLAGS), )
+   LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NORM)
+ endif
+ 
  ifeq ($(OPENJDK_TARGET_OS), linux)
    BUILD_LIBJVM_ostream.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
    BUILD_LIBJVM_logFileOutput.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
  
!   BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
!   BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
  
    ifeq ($(TOOLCHAIN_TYPE), clang)
      JVM_PRECOMPILED_HEADER_EXCLUDE := \
          sharedRuntimeTrig.cpp \
          sharedRuntimeTrans.cpp \
          #
    endif
  
    ifeq ($(OPENJDK_TARGET_CPU), x86)
      # Performance measurements show that by compiling GC related code, we could
      # significantly reduce the GC pause time on 32 bit Linux/Unix platforms by
      # compiling without the PIC flag (-fPIC on linux).
*** 118,129 ****
    # Workaround for jvmciCompilerToVM.cpp long compilation time
    BUILD_LIBJVM_jvmciCompilerToVMInit.cpp_OPTIMIZATION := NONE
  
  else ifeq ($(OPENJDK_TARGET_OS), macosx)
    # The copied fdlibm routines in these files must not be optimized
!   BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
!   BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
    ifeq ($(TOOLCHAIN_TYPE), clang)
      # NOTE: The old build tested clang version to make sure this workaround
      # for the clang bug was still needed.
      BUILD_LIBJVM_loopTransform.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
      ifneq ($(DEBUG_LEVEL), slowdebug)
--- 124,135 ----
    # Workaround for jvmciCompilerToVM.cpp long compilation time
    BUILD_LIBJVM_jvmciCompilerToVMInit.cpp_OPTIMIZATION := NONE
  
  else ifeq ($(OPENJDK_TARGET_OS), macosx)
    # The copied fdlibm routines in these files must not be optimized
!   BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
!   BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
    ifeq ($(TOOLCHAIN_TYPE), clang)
      # NOTE: The old build tested clang version to make sure this workaround
      # for the clang bug was still needed.
      BUILD_LIBJVM_loopTransform.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
      ifneq ($(DEBUG_LEVEL), slowdebug)