provide CFI for newer gdb versions which are confused by our stack

manipulations otherwise. These macros are probably not implemented in
older gas versions. We'll see when people complain, but otherwise
this is a very good candidate for

MERGE TO STABLE

as it fixes --gdb-attach=yes for any recent distro.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1940

diff --git a/coregrind/vg_startup.S b/coregrind/vg_startup.S
index 83153866f32e5de9a645410bc687986e962228cb..6b352cd483589b6b122da3642fde83c20259cff4 100644 (file)
--- a/coregrind/vg_startup.S
+++ b/coregrind/vg_startup.S
@@ -228,8 +228,10 @@ vg_esp_saved_over_GDB_start:
        .long   0
 .text
        
+.type VG_(swizzle_esp_then_start_GDB),@function
 .global VG_(swizzle_esp_then_start_GDB)        
 VG_(swizzle_esp_then_start_GDB):
+       .cfi_startproc
        pushal
 
        # remember the simulators current stack/frame pointers
@@ -256,17 +258,21 @@ VG_(swizzle_esp_then_start_GDB):
 
        # push %EBP.  This is a faked %ebp-chain pointer.
        pushl   %eax
+       .cfi_adjust_cfa_offset 0x4
 
        movl    %esp, %ebp
+       .cfi_def_cfa_register ebp
        
        call    VG_(start_GDB_whilst_on_client_stack)
 
        # restore the simulators stack/frame pointer
        movl    vg_ebp_saved_over_GDB_start, %ebp
        movl    vg_esp_saved_over_GDB_start, %esp
+       .cfi_adjust_cfa_offset -0x4
        
        popal
        ret
+       .cfi_endproc
 
 # gcc puts this construction at the end of every function.  I think it
 # allows the linker to figure out the size of the function.  So we do