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
This commit is contained in:
Eric Botcazou 2017-06-23 19:33:43 +02:00 committed by Eric Botcazou
parent 3c76bd9257
commit eded3fe592
3 changed files with 10 additions and 4 deletions

View File

@ -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

View File

@ -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"

View File

@ -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)