Merge "Fix riscv64's crash glue."
diff --git a/debuggerd/crasher/riscv64/crashglue.S b/debuggerd/crasher/riscv64/crashglue.S
index 47dd93b..5334887 100644
--- a/debuggerd/crasher/riscv64/crashglue.S
+++ b/debuggerd/crasher/riscv64/crashglue.S
@@ -1,8 +1,11 @@
-
- .globl crash1
- .globl crashnostack
-
+.globl crash1
crash1:
+ .cfi_startproc
+ addi sp, sp, -16
+ .cfi_def_cfa_offset 16
+ sd ra, 8(sp)
+ .cfi_offset ra, -8
+
li x0,0xdead0000+0
li x1,0xdead0000+1
li x2,0xdead0000+2
@@ -33,13 +36,22 @@
li x27,0xdead0000+27
li x28,0xdead0000+28
# don't trash the stack otherwise the signal handler won't run
- #li $29,0xdead0000+29
+ #li x29,0xdead0000+29
li x30,0xdead0000+30
li x31,0xdead0000+31
+ li sp, 0
+ ld t2, 0(zero)
j .
+ .cfi_endproc
+.globl crashnostack
crashnostack:
- li sp, 0
+ .cfi_startproc
+ mv t1, sp
+ .cfi_def_cfa_register t1
+ li sp, 0
+ ld t2, 0(zero)
j .
+ .cfi_endproc