From 0276a718c0fa58916a6e7c54bad22b4e58bb39b4 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 20 Aug 2011 08:58:44 -0400 Subject: [PATCH] Fix minor CFI problem in regular x86-64 trampoline --- ChangeLog | 3 +++ sysdeps/x86_64/dl-trampoline.S | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fc2bb878f0..b1c0946b92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-08-20 Ulrich Drepper + * 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 317610c12e..258c60945a 100644 --- 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) -- 2.43.5