diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-05-11 16:31:34 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-05-11 16:31:34 -0700 |
| commit | 9fb1a21f4d33c4c82719d6130e149eb2c5a51ae8 (patch) | |
| tree | 12cff7b38a7113a36c170faa8d9985978f74bafd | |
| parent | d3c6600440bfa95db3bb1ddd6c75dc43cffb79e7 (diff) | |
| download | glibc-9fb1a21f4d33c4c82719d6130e149eb2c5a51ae8.tar.gz glibc-9fb1a21f4d33c4c82719d6130e149eb2c5a51ae8.tar.xz glibc-9fb1a21f4d33c4c82719d6130e149eb2c5a51ae8.zip | |
Add x32 support to STACK_CHK_GUARD
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/stackguard-macros.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 9d8a7136c3..0c4a814167 100644 --- 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 a9889cf7b2..0cad31550c 100644 --- 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; }) |