From 9ddfa2b9adc84fd8318a3303f66e19f66e9d3084 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 (cherry picked from commit 0276a718c0fa58916a6e7c54bad22b4e58bb39b4) --- ChangeLog | 5 +++++ sysdeps/x86_64/dl-trampoline.S | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7250f068bc7..264d7255fd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-08-20 Ulrich Drepper + + * sysdeps/x86_64/dl-trampoline.S (_dl_runtime_resolve): Fix CFI for + the very first instruction. + 2011-08-20 Ulrich Drepper * sysdeps/x86_64/dl-trampoline.h: If MORE_CODE is defined, restore diff --git a/sysdeps/x86_64/dl-trampoline.S b/sysdeps/x86_64/dl-trampoline.S index 317610c12e9..258c60945a4 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.47.2