|
 |
67e3c5 |
# HG changeset patch
|
|
|
67e3c5 |
# User sgehwolf
|
|
|
67e3c5 |
# Date 1536682731 -7200
|
|
|
67e3c5 |
# Tue Sep 11 18:18:51 2018 +0200
|
|
|
67e3c5 |
# Node ID 7157249fdd4366d95dd68f3d083ebb0ef84c753b
|
|
|
67e3c5 |
# Parent 8d86b149e10f0a0896e5fd4d8d407e5fda64a529
|
|
|
67e3c5 |
8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
|
|
|
67e3c5 |
Reviewed-by: duke
|
|
|
67e3c5 |
|
|
|
67e3c5 |
diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
|
|
|
67e3c5 |
--- a/make/hotspot/lib/JvmOverrideFiles.gmk
|
|
|
67e3c5 |
+++ b/make/hotspot/lib/JvmOverrideFiles.gmk
|
|
|
67e3c5 |
@@ -43,20 +43,26 @@ ifeq ($(TOOLCHAIN_TYPE), gcc)
|
|
|
67e3c5 |
endif
|
|
|
67e3c5 |
endif
|
|
|
67e3c5 |
|
|
|
67e3c5 |
+LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NONE)
|
|
|
67e3c5 |
+# If the FDLIBM_CFLAGS variable is non-empty we know
|
|
|
67e3c5 |
+# that the fdlibm-fork in hotspot can get optimized
|
|
|
67e3c5 |
+# by using -ffp-contract=off on GCC/Clang platforms.
|
|
|
67e3c5 |
+ifneq ($(FDLIBM_CFLAGS), )
|
|
|
67e3c5 |
+ LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NORM)
|
|
|
67e3c5 |
+endif
|
|
|
67e3c5 |
+
|
|
|
67e3c5 |
ifeq ($(OPENJDK_TARGET_OS), linux)
|
|
|
67e3c5 |
BUILD_LIBJVM_ostream.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
|
|
|
67e3c5 |
BUILD_LIBJVM_logFileOutput.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
|
|
|
67e3c5 |
|
|
|
67e3c5 |
- ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
|
|
|
67e3c5 |
- BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(CXX_O_FLAG_NONE)
|
|
|
67e3c5 |
- BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := -DNO_PCH $(CXX_O_FLAG_NONE)
|
|
|
67e3c5 |
+ BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
|
|
|
67e3c5 |
+ BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
|
|
|
67e3c5 |
|
|
|
67e3c5 |
- ifeq ($(TOOLCHAIN_TYPE), clang)
|
|
|
67e3c5 |
- JVM_PRECOMPILED_HEADER_EXCLUDE := \
|
|
|
67e3c5 |
- sharedRuntimeTrig.cpp \
|
|
|
67e3c5 |
- sharedRuntimeTrans.cpp \
|
|
|
67e3c5 |
- #
|
|
|
67e3c5 |
- endif
|
|
|
67e3c5 |
+ ifeq ($(TOOLCHAIN_TYPE), clang)
|
|
|
67e3c5 |
+ JVM_PRECOMPILED_HEADER_EXCLUDE := \
|
|
|
67e3c5 |
+ sharedRuntimeTrig.cpp \
|
|
|
67e3c5 |
+ sharedRuntimeTrans.cpp \
|
|
|
67e3c5 |
+ #
|
|
|
67e3c5 |
endif
|
|
|
67e3c5 |
|
|
|
67e3c5 |
ifeq ($(OPENJDK_TARGET_CPU), x86)
|