changeset 23983:78bb8eb7ab76

Fix build for Linux/SPARC
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Fri, 30 Dec 2016 04:10:18 -0500
parents 49423b7aaea5
children 7139570e01c0
files mx.jvmci/mx_jvmci.py src/cpu/sparc/vm/sharedRuntime_sparc.cpp
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci.py	Mon Dec 05 16:30:33 2016 +0100
+++ b/mx.jvmci/mx_jvmci.py	Fri Dec 30 04:10:18 2016 -0500
@@ -899,8 +899,8 @@
             # setMakeVar("EXPORT_PATH", jdk)
             if mx.get_os() == 'linux' and platform.processor() == 'sparc64':
                 # SPARC/Linux
-                setMakeVar("DEBUG_BINARIES", "true", env=env)
-                setMakeVar("EXTRA_CFLAGS", "-Wno-conversion-null -Wno-int-to-pointer-cast -Wno-unused-function -fno-tree-loop-distribute-patterns -fno-schedule-insns -fno-tree-ccp -fno-ipa-cp-clone -fno-predictive-commoning", env=env)
+                setMakeVar('INCLUDE_TRACE', 'false', env=env)
+                setMakeVar('DISABLE_COMMERCIAL_FEATURES', 'true', env=env)
 
             setMakeVar('MAKE_VERBOSE', 'y' if mx._opts.verbose else '')
             if self.vm.endswith('nojvmci'):
--- a/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Mon Dec 05 16:30:33 2016 +0100
+++ b/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Fri Dec 30 04:10:18 2016 -0500
@@ -3588,7 +3588,6 @@
     __ add(O7, 8, O7);
     __ reset_last_Java_frame();
 
-    after_fetch_unroll_info_call;
     __ ba(after_fetch_unroll_info_call);
     __ delayed()->nop(); // Delay slot
     masm->block_comment("END implicit_exception_uncommon_trap");