Merge pull request #6962 from fjeremic/revert-z15-0.16.0

Revert "Enable z15 by default" (0.16.0)
eclipse-openj9 · Sep 4, 2019 · 7af314c · 7af314c
2 parents 227a3c8 + 19b878a
commit 7af314c
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/runtime/compiler/control/J9Options.cpp b/runtime/compiler/control/J9Options.cpp
@@ -1961,6 +1961,14 @@ J9::Options::fePreProcess(void * base)
       {
       self()->setOption(TR_InlineVeryLargeCompiledMethods);
       }
+
+   static bool enableZ15 = feGetEnv("TR_EnableZ15") != NULL;
+
+   if (!enableZ15)
+      {
+      // Disable zNext support until it has been gone through several rounds of functional stress testing
+      self()->setOption(TR_DisableZ15);
+      }
 #endif
 
    // On big machines we can afford to spend more time compiling