From fb68d1896602e102c32ccf00043112bec163815b Mon Sep 17 00:00:00 2001 From: ebotcazou Date: Fri, 23 Jun 2017 17:33:43 +0000 Subject: [PATCH] * runtime/config/sparc/os-unix-sysdep.c (__cilkrts_getticks): Adjust preprocessor test for SPARC/Linux. * runtime/jmpbuf.h (CILK_[UN]ADJUST_SP): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@249601 138bc75d-0d04-0410-961f-82ee72b054a4 --- libcilkrts/ChangeLog | 6 ++++++ libcilkrts/runtime/config/sparc/os-unix-sysdep.c | 4 ++-- libcilkrts/runtime/jmpbuf.h | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libcilkrts/ChangeLog b/libcilkrts/ChangeLog index 603b05a2a24..2f81d09545a 100644 --- a/libcilkrts/ChangeLog +++ b/libcilkrts/ChangeLog @@ -1,3 +1,9 @@ +2017-06-23 Eric Botcazou + + * 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 PR other/79046 diff --git a/libcilkrts/runtime/config/sparc/os-unix-sysdep.c b/libcilkrts/runtime/config/sparc/os-unix-sysdep.c index 997e9f6892f..a3ede6461a0 100644 --- 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 9ae2fd24bd3..453d26913c4 100644 --- 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) -- 2.11.4.GIT