Fix minor CFI problem in regular x86-64 trampoline

diff --git a/ChangeLog b/ChangeLog
index fc2bb87..b1c0946 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-08-20  Ulrich Drepper  <drepper@gmail.com>
 
+       * sysdeps/x86_64/dl-trampoline.S (_dl_runtime_resolve): Fix CFI for
+       the very first instruction.
+
        * sysdeps/x86_64/dl-trampoline.h: If MORE_CODE is defined, restore
        the CFI state in the end.
        * sysdeps/x86_64/dl-trampoline.S: Define MORE_CODE before first

diff --git a/sysdeps/x86_64/dl-trampoline.S b/sysdeps/x86_64/dl-trampoline.S
index 317610c..258c609 100644 (file)
--- a/sysdeps/x86_64/dl-trampoline.S
+++ b/sysdeps/x86_64/dl-trampoline.S
@@ -27,8 +27,9 @@
        .align 16
        cfi_startproc
 _dl_runtime_resolve:
+       cfi_adjust_cfa_offset(16) # Incorporate PLT
        subq $56,%rsp
-       cfi_adjust_cfa_offset(72) # Incorporate PLT
+       cfi_adjust_cfa_offset(56)
        movq %rax,(%rsp)        # Preserve registers otherwise clobbered.
        movq %rcx, 8(%rsp)
        movq %rdx, 16(%rsp)