← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gcc-4.8/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/aarch64-call-frame-info.diff

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-01-15 15:44:15 UTC
  • Revision ID: package-import@ubuntu.com-20140115154415-9df37q6seo26u549
Tags: 4.8.2-14ubuntu1
* Merge with Debian; remaining changes:
  - Build from the upstream source.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/aarch64-call-frame-info.diff
 
1
# DP: Fix call frame information in ffi_closure_SYSV on AArch64.
 
2
 
 
3
diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S
 
4
index 1022454..ecf6371 100644
 
5
--- a/src/libffi/src/aarch64/sysv.S
 
6
+++ b/src/libffi/src/aarch64/sysv.S
 
7
@@ -231,13 +231,13 @@ ffi_closure_SYSV:
 
8
         cfi_rel_offset (x30, 8)
 
9
 
 
10
         mov     x29, sp
 
11
+        cfi_def_cfa_register (x29)
 
12
 
 
13
         sub     sp, sp, #ffi_closure_SYSV_FS
 
14
-       cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
 
15
 
 
16
         stp     x21, x22, [x29, #-16]
 
17
-        cfi_rel_offset (x21, 0)
 
18
-        cfi_rel_offset (x22, 8)
 
19
+        cfi_rel_offset (x21, -16)
 
20
+        cfi_rel_offset (x22, -8)
 
21
 
 
22
         /* Load x21 with &call_context.  */
 
23
         mov     x21, sp
 
24
@@ -295,7 +295,7 @@ ffi_closure_SYSV:
 
25
         cfi_restore (x22)
 
26
 
 
27
         mov     sp, x29
 
28
-       cfi_adjust_cfa_offset (-ffi_closure_SYSV_FS)
 
29
+        cfi_def_cfa_register (sp)
 
30
 
 
31
         ldp     x29, x30, [sp], #16
 
32
        cfi_adjust_cfa_offset (-16)
 
33