Add x32 support to STACK_CHK_GUARD

diff --git a/ChangeLog b/ChangeLog
index 9d8a713..0c4a814 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-05-11  H.J. Lu  <hongjiu.lu@intel.com>
 
+       * elf/stackguard-macros.h (STACK_CHK_GUARD) [__x86_64__]: Use
+       "%c1" with "i" (offsetof (tcbhead_t, stack_guard)).
+
+2012-05-11  H.J. Lu  <hongjiu.lu@intel.com>
+
        * elf/tls-macros.h (TLS_LE): Use mov instead of movq to load
        thread pointer.
        (TLS_IE): Use mov/add instead of movq/addq to load thread

diff --git a/elf/stackguard-macros.h b/elf/stackguard-macros.h
index a9889cf..0cad315 100644 (file)
--- a/elf/stackguard-macros.h
+++ b/elf/stackguard-macros.h
@@ -5,7 +5,9 @@
   ({ uintptr_t x; asm ("movl %%gs:0x14, %0" : "=r" (x)); x; })
 #elif defined __x86_64__
 # define STACK_CHK_GUARD \
-  ({ uintptr_t x; asm ("movq %%fs:0x28, %0" : "=r" (x)); x; })
+  ({ uintptr_t x;                                              \
+     asm ("mov %%fs:%c1, %0" : "=r" (x)                                \
+         : "i" (offsetof (tcbhead_t, stack_guard))); x; })
 #elif defined __powerpc64__
 # define STACK_CHK_GUARD \
   ({ uintptr_t x; asm ("ld %0,-28688(13)" : "=r" (x)); x; })