From ce1917d0bf87f8d98c0891a85272c21bd0a46654 Mon Sep 17 00:00:00 2001 From: John David Anglin Date: Sun, 16 Jul 2017 12:46:50 -0400 Subject: Add CFI annotation. --- ChangeLog | 5 +++++ sysdeps/unix/sysv/linux/hppa/clone.S | 3 +++ sysdeps/unix/sysv/linux/hppa/getcontext.S | 3 +++ sysdeps/unix/sysv/linux/hppa/pt-vfork.S | 3 +++ sysdeps/unix/sysv/linux/hppa/setcontext.S | 3 +++ 5 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index a4a41341d6..03e9ee0e68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2017-07-16 John David Anglin + * sysdeps/unix/sysv/linux/hppa/clone.S (__clone): Add .cfi annotation. + * sysdeps/unix/sysv/linux/hppa/getcontext.S (__getcontext): Likewise. + * sysdeps/unix/sysv/linux/hppa/pt-vfork.S (__vfork): Likewise. + * sysdeps/unix/sysv/linux/hppa/setcontext.S (__setcontext): Likewise. + * sysdeps/unix/sysv/linux/hppa/getcontext.S (__getcontext): Fix stack offset for r19 load. diff --git a/sysdeps/unix/sysv/linux/hppa/clone.S b/sysdeps/unix/sysv/linux/hppa/clone.S index 8c43944c7a..ead3c9227a 100644 --- a/sysdeps/unix/sysv/linux/hppa/clone.S +++ b/sysdeps/unix/sysv/linux/hppa/clone.S @@ -64,9 +64,12 @@ ENTRY(__clone) /* Prologue */ stwm %r4, 64(%sp) + .cfi_def_cfa_offset -64 + .cfi_offset 4, 0 stw %sp, -4(%sp) #ifdef PIC stw %r19, -32(%sp) + .cfi_offset 19, 32 #endif /* Sanity check arguments. */ diff --git a/sysdeps/unix/sysv/linux/hppa/getcontext.S b/sysdeps/unix/sysv/linux/hppa/getcontext.S index 2d7529b3e8..68a74a0b7e 100644 --- a/sysdeps/unix/sysv/linux/hppa/getcontext.S +++ b/sysdeps/unix/sysv/linux/hppa/getcontext.S @@ -130,8 +130,11 @@ ENTRY(__getcontext) /* Prologue */ stwm %r4, 64(%sp) + .cfi_def_cfa_offset -64 + .cfi_offset 4, 0 #ifdef PIC stw %r19, -32(%sp) + .cfi_offset 19, 32 #endif /* Set up the trampoline registers. diff --git a/sysdeps/unix/sysv/linux/hppa/pt-vfork.S b/sysdeps/unix/sysv/linux/hppa/pt-vfork.S index fc4573c86b..8b7d7df2fe 100644 --- a/sysdeps/unix/sysv/linux/hppa/pt-vfork.S +++ b/sysdeps/unix/sysv/linux/hppa/pt-vfork.S @@ -58,7 +58,10 @@ ENTRY(__vfork) that there is no child now, so it's safe to create a frame. */ stw %rp, -20(%sp) + .cfi_offset 2, -20 stwm %r3, 64(%sp) + .cfi_def_cfa_offset -64 + .cfi_offset 3, 0 stw %sp, -4(%sp) sub %r0,%ret0,%r3 diff --git a/sysdeps/unix/sysv/linux/hppa/setcontext.S b/sysdeps/unix/sysv/linux/hppa/setcontext.S index 848d02e908..92cb204f8d 100644 --- a/sysdeps/unix/sysv/linux/hppa/setcontext.S +++ b/sysdeps/unix/sysv/linux/hppa/setcontext.S @@ -26,8 +26,11 @@ ENTRY(__setcontext) /* Prologue */ stwm %r3, 64(%sp) + .cfi_def_cfa_offset -64 + .cfi_offset 3, 0 #ifdef PIC stw %r19, -32(%sp) + .cfi_offset 19, 32 #endif /* Save ucp. */ -- cgit 1.4.1