Update x86_64 PTR_MANGLE/PTR_DEMANGLE for x32

diff --git a/ChangeLog b/ChangeLog
index 499d1274a4cdfabfc8fc807e326c622fc316262e..6fbcc32a84bb2ccce595604f67861baba099a7ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * sysdeps/unix/sysv/linux/x86_64/sysdep.h (PTR_MANGLE): Remove
+       the `q' suffix from xor/rol instructions.  Use $2*LP_SIZE+1
+       instead of $17.
+       (PTR_DEMANGLE): Likewise.
+
 2012-05-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/x86_64/sysdep.h (LP_SIZE): New macro.

diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
index c9c4dbdc594a2bb0b963b78671b7658c8b078b32..aae4cb01b4674b1c964c350670e104d7e5129243 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
@@ -342,33 +342,33 @@
 /* We cannot use the thread descriptor because in ld.so we use setjmp
    earlier than the descriptor is initialized.  */
 # ifdef __ASSEMBLER__
-#  define PTR_MANGLE(reg)      xorq __pointer_chk_guard_local(%rip), reg;    \
-                               rolq $17, reg
-#  define PTR_DEMANGLE(reg)    rorq $17, reg;                                \
-                               xorq __pointer_chk_guard_local(%rip), reg
+#  define PTR_MANGLE(reg)      xor __pointer_chk_guard_local(%rip), reg;    \
+                               rol $2*LP_SIZE+1, reg
+#  define PTR_DEMANGLE(reg)    ror $2*LP_SIZE+1, reg;                       \
+                               xor __pointer_chk_guard_local(%rip), reg
 # else
-#  define PTR_MANGLE(reg)      asm ("xorq __pointer_chk_guard_local(%%rip), %0\n" \
-                                    "rolq $17, %0"                           \
+#  define PTR_MANGLE(reg)      asm ("xor __pointer_chk_guard_local(%%rip), %0\n" \
+                                    "rol $2*" LP_SIZE "+1, %0"                   \
                                     : "=r" (reg) : "0" (reg))
-#  define PTR_DEMANGLE(reg)    asm ("rorq $17, %0\n"                         \
-                                    "xorq __pointer_chk_guard_local(%%rip), %0" \
+#  define PTR_DEMANGLE(reg)    asm ("ror $2*" LP_SIZE "+1, %0\n"                 \
+                                    "xor __pointer_chk_guard_local(%%rip), %0"   \
                                     : "=r" (reg) : "0" (reg))
 # endif
 #else
 # ifdef __ASSEMBLER__
-#  define PTR_MANGLE(reg)      xorq %fs:POINTER_GUARD, reg;                  \
-                               rolq $17, reg
-#  define PTR_DEMANGLE(reg)    rorq $17, reg;                                \
-                               xorq %fs:POINTER_GUARD, reg
+#  define PTR_MANGLE(reg)      xor %fs:POINTER_GUARD, reg;                   \
+                               rol $2*LP_SIZE+1, reg
+#  define PTR_DEMANGLE(reg)    ror $2*LP_SIZE+1, reg;                        \
+                               xor %fs:POINTER_GUARD, reg
 # else
-#  define PTR_MANGLE(var)      asm ("xorq %%fs:%c2, %0\n"                    \
-                                    "rolq $17, %0"                           \
+#  define PTR_MANGLE(var)      asm ("xor %%fs:%c2, %0\n"                     \
+                                    "rol $2*" LP_SIZE "+1, %0"               \
                                     : "=r" (var)                             \
                                     : "0" (var),                             \
                                       "i" (offsetof (tcbhead_t,              \
                                                      pointer_guard)))
-#  define PTR_DEMANGLE(var)    asm ("rorq $17, %0\n"                         \
-                                    "xorq %%fs:%c2, %0"                      \
+#  define PTR_DEMANGLE(var)    asm ("ror $2*" LP_SIZE "+1, %0\n"             \
+                                    "xor %%fs:%c2, %0"                       \
                                     : "=r" (var)                             \
                                     : "0" (var),                             \
                                       "i" (offsetof (tcbhead_t,              \