os-unix-sysdep.c (__cilkrts_getticks): Adjust preprocessor test for SPARC/Linux.

	* runtime/config/sparc/os-unix-sysdep.c (__cilkrts_getticks): Adjust
	preprocessor test for SPARC/Linux.
	* runtime/jmpbuf.h (CILK_[UN]ADJUST_SP): Likewise.

From-SVN: r249601

diff --git a/libcilkrts/ChangeLog b/libcilkrts/ChangeLog
index 603b05a2a24f76e129779293aca2c58778177dea..2f81d09545a662609add0980f4ee975f72f1d1ea 100644 (file)
--- a/libcilkrts/ChangeLog
+++ b/libcilkrts/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-23  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       * runtime/config/sparc/os-unix-sysdep.c (__cilkrts_getticks): Adjust
+       preprocessor test for SPARC/Linux.
+       * runtime/jmpbuf.h (CILK_[UN]ADJUST_SP): Likewise.
+
 2017-01-20  Jakub Jelinek  <jakub@redhat.com>
 
        PR other/79046

diff --git a/libcilkrts/runtime/config/sparc/os-unix-sysdep.c b/libcilkrts/runtime/config/sparc/os-unix-sysdep.c
index 997e9f6892f31a40cf1969fcafebf27f39ebc5cc..a3ede6461a022f83a167457623de13e3289599c3 100644 (file)
--- a/libcilkrts/runtime/config/sparc/os-unix-sysdep.c
+++ b/libcilkrts/runtime/config/sparc/os-unix-sysdep.c
@@ -47,7 +47,7 @@
  *  for your assistance in helping us improve Cilk Plus.
  *************************************************************************
  *
- * This file contains system-specific code for sparc-based systems
+ * This file contains system-specific code for SPARC-based systems
  */
 
 #include "os.h"
@@ -60,7 +60,7 @@
 COMMON_SYSDEP unsigned long long __cilkrts_getticks(void)
 {
     unsigned long long tick;
-#ifdef __sparcv9
+#if defined(__sparcv9) || defined(__arch64__)
     __asm__ volatile("rd %%tick, %0" : "=r"(tick));
 #else
     __asm__ volatile("rd %%tick, %L0\n"

diff --git a/libcilkrts/runtime/jmpbuf.h b/libcilkrts/runtime/jmpbuf.h
index 9ae2fd24bd3d266ef045e50d7374bb5bc08ca0ff..453d26913c4a741a2675b95395571e907fa82fa4 100644 (file)
--- a/libcilkrts/runtime/jmpbuf.h
+++ b/libcilkrts/runtime/jmpbuf.h
@@ -110,8 +110,8 @@
 /**
  * @brief Some architecture-dependent stack adjustment.
  */
-#if defined(__sparcv9)
-    // Subtract sparc v9 stack bias so the actual stack starts at the
+#if defined(__sparcv9) || (defined(__sparc__) && defined(__arch64__))
+    // Subtract SPARC V9 stack bias so the actual stack starts at the
     // allocated area.
 #   define CILK_ADJUST_SP(SP) ((SP) - 2047)
 #   define CILK_UNADJUST_SP(SP) ((SP) + 2047)