about summary refs log tree commit diff
path: root/elf/stackguard-macros.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-07-07 06:10:18 +0000
committerUlrich Drepper <drepper@redhat.com>2005-07-07 06:10:18 +0000
commit253eb3a0acfae12863c40ef6c6b0128d5b0dc02b (patch)
tree518cbd1b8d05996f4eb31a0cfbbf8789844fcb69 /elf/stackguard-macros.h
parent587d6ddc60bbdf561be3f217280220af9102c3e8 (diff)
downloadglibc-253eb3a0acfae12863c40ef6c6b0128d5b0dc02b.tar.gz
glibc-253eb3a0acfae12863c40ef6c6b0128d5b0dc02b.tar.xz
glibc-253eb3a0acfae12863c40ef6c6b0128d5b0dc02b.zip
* elf/stackguard-macros.h (STACK_CHK_GUARD): Fix s390/s390x definition.
	Reported by Ulrich Weigand <uweigand@de.ibm.com>.

	* elf/stackguard-macros.h (STACK_CHK_GUARD): Add ia64 definition.
Diffstat (limited to 'elf/stackguard-macros.h')
-rw-r--r--elf/stackguard-macros.h7
1 files changed, 5 insertions, 2 deletions
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