Use LP_SIZE and load timeout pointer into RDX_LP

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index bd7311f..d1ca161 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
+       (LLL_STUB_UNWIND_INFO_START): Align label to LP_SIZE instead
+       of 8.
+       (LLL_STUB_UNWIND_INFO_END): Likewise.
+       (lll_timedlock): Load timeout pointer into RDX_LP.
+       (lll_robust_timedlock): Likewise.
+
 2012-05-15  Siddhesh Poyarekar  <siddhesh@redhat.com>
            Jakub Jelinek  <jakub@redhat.com>
 

diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
index dada21c..1f5b848 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
@@ -119,7 +119,7 @@
        ".byte  0x12    # DW_CFA_def_cfa_sf\n\t"                \
        ".uleb128 0x7\n\t"                                      \
        ".sleb128 16\n\t"                                       \
-       ".align 8\n"                                            \
+       ".align " LP_SIZE "\n"                                  \
 "9:\t" ".long  23f-10f # FDE Length\n"                         \
 "10:\t"        ".long  10b-7b  # FDE CIE offset\n\t"                   \
        ".long  1b-.    # FDE initial location\n\t"             \
@@ -166,7 +166,7 @@
        ".uleb128 22f-21f\n"                                    \
 "21:\t"        ".byte  0x80    # DW_OP_breg16\n\t"                     \
        ".sleb128 4b-5b\n"                                      \
-"22:\t"        ".align 8\n"                                            \
+"22:\t"        ".align " LP_SIZE "\n"                                  \
 "23:\t"        ".previous\n"
 
 /* Unwind info for
@@ -407,7 +407,7 @@ LLL_STUB_UNWIND_INFO_END
                       ".type _L_timedlock_%=, @function\n"                   \
                       "_L_timedlock_%=:\n"                                   \
                       "1:\tleaq %4, %%rdi\n"                                 \
-                      "0:\tmovq %8, %%rdx\n"                                 \
+                      "0:\tmov %8, %%" RDX_LP "\n"                           \
                       "2:\tsubq $128, %%rsp\n"                               \
                       "3:\tcallq __lll_timedlock_wait\n"                     \
                       "4:\taddq $128, %%rsp\n"                               \
@@ -431,7 +431,7 @@ LLL_STUB_UNWIND_INFO_END
                       ".type _L_robust_timedlock_%=, @function\n"            \
                       "_L_robust_timedlock_%=:\n"                            \
                       "1:\tleaq %4, %%rdi\n"                                 \
-                      "0:\tmovq %8, %%rdx\n"                                 \
+                      "0:\tmov %8, %%" RDX_LP "\n"                           \
                       "2:\tsubq $128, %%rsp\n"                               \
                       "3:\tcallq __lll_robust_timedlock_wait\n"              \
                       "4:\taddq $128, %%rsp\n"                               \