diff options
| author | Eric Botcazou <ebotcazou@libertysurf.fr> | 2017-06-23 19:33:43 +0200 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2017-06-23 17:33:43 +0000 |
| commit | eded3fe59237591c17259f1b6df9174b25643673 (patch) | |
| tree | 9faa22bc0830ccca8ce01ec8f0abafdea8201fc5 /libcilkrts | |
| parent | 3c76bd9257081e6cbbaecf5bcb57cec64b0a6d31 (diff) | |
| download | gcc-eded3fe59237591c17259f1b6df9174b25643673.zip gcc-eded3fe59237591c17259f1b6df9174b25643673.tar.gz gcc-eded3fe59237591c17259f1b6df9174b25643673.tar.bz2 | |
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
Diffstat (limited to 'libcilkrts')
| -rw-r--r-- | libcilkrts/ChangeLog | 6 | ||||
| -rw-r--r-- | libcilkrts/runtime/config/sparc/os-unix-sysdep.c | 4 | ||||
| -rw-r--r-- | libcilkrts/runtime/jmpbuf.h | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/libcilkrts/ChangeLog b/libcilkrts/ChangeLog index 603b05a..2f81d09 100644 --- 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 997e9f6..a3ede64 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 9ae2fd2..453d269 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) |