OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* 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: r249602
This commit is contained in:
Eric Botcazou 2017-06-23 19:34:21 +02:00 committed by Eric Botcazou
parent 5105d5588d
commit ac6a451c19
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcilkrts/ChangeLog
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-05-02 Release Manager 2017-05-02 Release Manager
* GCC 7.1.0 released. * GCC 7.1.0 released.

4
libcilkrts/runtime/config/sparc/os-unix-sysdep.c
View File

@ -47,7 +47,7 @@
* for your assistance in helping us improve Cilk Plus. * 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" #include "os.h"
@ -60,7 +60,7 @@
COMMON_SYSDEP unsigned long long __cilkrts_getticks(void) COMMON_SYSDEP unsigned long long __cilkrts_getticks(void)
{ {
unsigned long long tick; unsigned long long tick;
#ifdef __sparcv9 #if defined(__sparcv9) || defined(__arch64__)
__asm__ volatile("rd %%tick, %0" : "=r"(tick)); __asm__ volatile("rd %%tick, %0" : "=r"(tick));
#else #else
__asm__ volatile("rd %%tick, %L0\n" __asm__ volatile("rd %%tick, %L0\n"

4
libcilkrts/runtime/jmpbuf.h
View File

@ -110,8 +110,8 @@
/** /**
* @brief Some architecture-dependent stack adjustment. * @brief Some architecture-dependent stack adjustment.
*/ */
#if defined(__sparcv9) #if defined(__sparcv9) || (defined(__sparc__) && defined(__arch64__))
// Subtract sparc v9 stack bias so the actual stack starts at the // Subtract SPARC V9 stack bias so the actual stack starts at the
// allocated area. // allocated area.
# define CILK_ADJUST_SP(SP) ((SP) - 2047) # define CILK_ADJUST_SP(SP) ((SP) - 2047)
# define CILK_UNADJUST_SP(SP) ((SP) + 2047) # define CILK_UNADJUST_SP(SP) ((SP) + 2047)