Improve CFI in x86-64 ld.so trampoline code.

diff --git a/ChangeLog b/ChangeLog
index 856689f1c08b3f738fbca764ba3a0bfee0116936..081d59b28d6789d48ea4584b43e25433e83b5a70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-29  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/x86_64/dl-trampoline.S (_dl_runtime_profile): Improve CFI
+       information.
+
 2009-07-28  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/x86_64/dl-trampoline.S: Properly restore AVX registers.

diff --git a/sysdeps/x86_64/dl-trampoline.S b/sysdeps/x86_64/dl-trampoline.S
index 5a4c6ddecd22d371f9473a4b901051ad3225938f..20da6956f17d880f531c10565594770ab7bac798 100644 (file)
--- a/sysdeps/x86_64/dl-trampoline.S
+++ b/sysdeps/x86_64/dl-trampoline.S
@@ -61,6 +61,7 @@ _dl_runtime_resolve:
        cfi_startproc
 
 _dl_runtime_profile:
+       cfi_adjust_cfa_offset(16) # Incorporate PLT
        /* The La_x86_64_regs data structure pointed to by the
           fourth paramater must be 16-byte aligned.  This must
           be explicitly enforced.  We have the set up a dynamically
@@ -68,7 +69,7 @@ _dl_runtime_profile:
           has a fixed size and preserves the original stack pointer.  */
 
        subq $32, %rsp          # Allocate the local storage.
-       cfi_adjust_cfa_offset(48) # Incorporate PLT
+       cfi_adjust_cfa_offset(32)
        movq %rbx, (%rsp)
        cfi_rel_offset(%rbx, 0)