changeset 39215:43bb4e6e754a

Merge
author erikj
date Tue, 07 Jun 2016 19:05:37 +0200
parents 95ea5fb34655 294cc054a0b4
children ad613683c889
files
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/make/lib/JvmOverrideFiles.gmk	Tue Jun 07 12:55:29 2016 +0300
+++ b/hotspot/make/lib/JvmOverrideFiles.gmk	Tue Jun 07 19:05:37 2016 +0200
@@ -153,6 +153,13 @@
   # mode, so don't optimize sharedRuntimeTrig.cpp at all.
   BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
 
+  ifneq ($(DEBUG_LEVEL),slowdebug)
+    # Compiling jvmtiEnterTrace.cpp with full optimization needs more than 30min
+    # (mostly because of '-qhot=level=1' and the more than 1300 'log_trace' calls
+    # which cause a lot of template expansion).
+    BUILD_LIBJVM_jvmtiEnterTrace.cpp_OPTIMIZATION := LOW
+  endif
+
   # Disable ELF decoder on AIX (AIX uses XCOFF).
   JVM_EXCLUDE_PATTERNS += elf