From 3f83552f2ca9b2f2ec311d91570146ca51f99809 Mon Sep 17 00:00:00 2001 From: Chris Metcalf Date: Thu, 17 May 2012 18:51:36 +0000 Subject: [PATCH] tile: support tilegx32 in stackguard-macros.h --- ChangeLog.tile | 2 ++ sysdeps/tile/stackguard-macros.h | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog.tile b/ChangeLog.tile index 51acbc660b..52b38b4a7d 100644 --- a/ChangeLog.tile +++ b/ChangeLog.tile @@ -1,5 +1,7 @@ 2012-05-17 Chris Metcalf + * sysdeps/tile/stackguard-macros.h: Support tilegx32. + * data/c++-types-tilepro-linux-gnu.data: Renamed from data/c++-types-tile-linux-gnu.data. * data/c++-types-tilegx-linux-gnu.data: New file. diff --git a/sysdeps/tile/stackguard-macros.h b/sysdeps/tile/stackguard-macros.h index 7679c0ac00..589ea2b0d8 100644 --- a/sysdeps/tile/stackguard-macros.h +++ b/sysdeps/tile/stackguard-macros.h @@ -1,6 +1,13 @@ +#include + #ifdef __tilegx__ -# define STACK_CHK_GUARD \ +# if __WORDSIZE == 64 +# define STACK_CHK_GUARD \ ({ uintptr_t x; asm ("addi %0, tp, -16; ld %0, %0" : "=r" (x)); x; }) +# else +# define STACK_CHK_GUARD \ + ({ uintptr_t x; asm ("addi %0, tp, -8; ld4s %0, %0" : "=r" (x)); x; }) +# endif #else # define STACK_CHK_GUARD \ ({ uintptr_t x; asm ("addi %0, tp, -8; lw %0, %0" : "=r" (x)); x; }) -- 2.11.4.GIT