From 253eb3a0acfae12863c40ef6c6b0128d5b0dc02b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 7 Jul 2005 06:10:18 +0000 Subject: * elf/stackguard-macros.h (STACK_CHK_GUARD): Fix s390/s390x definition. Reported by Ulrich Weigand . * elf/stackguard-macros.h (STACK_CHK_GUARD): Add ia64 definition. --- elf/stackguard-macros.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'elf/stackguard-macros.h') diff --git a/elf/stackguard-macros.h b/elf/stackguard-macros.h index 0fbf4d2c0b..97db8bc22a 100644 --- a/elf/stackguard-macros.h +++ b/elf/stackguard-macros.h @@ -20,10 +20,13 @@ ({ uintptr_t x; asm ("ld [%%g7+0x14], %0" : "=r" (x)); x; }) #elif defined __s390x__ # define STACK_CHK_GUARD \ - ({ uintptr_t x; asm ("ear %0,%a0; sllg %0,%0,32; ear %0,%a1; lg %0,0x28(%0)" : "=r" (x)); x; }) + ({ uintptr_t x; asm ("ear %0,%%a0; sllg %0,%0,32; ear %0,%%a1; lg %0,0x28(%0)" : "=a" (x)); x; }) #elif defined __s390__ # define STACK_CHK_GUARD \ - ({ uintptr_t x; asm ("ear %0,%%a0; l %0,0x14(%0)" : "=r" (x)); x; }) + ({ uintptr_t x; asm ("ear %0,%%a0; l %0,0x14(%0)" : "=a" (x)); x; }) +#elif defined __ia64__ +# define STACK_CHK_GUARD \ + ({ uintptr_t x; asm ("adds %0 = -8, r13;; ld8 %0 = [%0]" : "=r" (x)); x; }) #else extern uintptr_t __stack_chk_guard; # define STACK_CHK_GUARD __stack_chk_guard -- cgit 1.4.1