Implement _Unwind_Resume in libc on top of <unwind-link.h>

Temporarily move the arm _Unwind_Resume implementation to the file
used by libpthread.  It will be ported to <unwind-link.h> along with
the rest of nptl.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/sysdeps/arm/arm-unwind-resume.S b/sysdeps/arm/arm-unwind-resume.S
index 22525f4db0..92c171fe0f 100644
--- a/sysdeps/arm/arm-unwind-resume.S
+++ b/sysdeps/arm/arm-unwind-resume.S
@@ -18,29 +18,29 @@
 
 #include <sysdep.h>
 
-/* This is just implementing exactly what the C version does.
+/* This is equivalent to the following C implementation:
+
+   void
+   _Unwind_Resume (struct _Unwind_Exception *exc)
+   {
+     __unwind_link_get_resume () (exc);
+   }
+
    We do it in assembly just to ensure that we get an unmolested tail
    call to the libgcc function, which is necessary for the ARM unwinder.  */
 
 ENTRY (_Unwind_Resume)
-	LDR_HIDDEN (ip, ip, __libgcc_s_resume, 0)
-	cmp	ip, #0
-	beq	1f
-0:	PTR_DEMANGLE (ip, ip, r2, r3)
-	bx	ip
-
 	/* We need to save and restore LR (for our own return address)
 	   and R0 (for the argument to _Unwind_Resume) around the call.  */
-1:	push	{r0, lr}
+	push	{r0, lr}
 	cfi_adjust_cfa_offset (8)
 	cfi_rel_offset (r0, 0)
 	cfi_rel_offset (lr, 4)
-	bl	__libgcc_s_init
+	bl	__unwind_link_get_resume
+	mov	r3, r0
 	pop	{r0, lr}
 	cfi_adjust_cfa_offset (-8)
-	cfi_restore (r0)
+	cfi_restore (r4)
 	cfi_restore (lr)
-
-	LDR_HIDDEN (ip, ip, __libgcc_s_resume, 0)
-	b	0b
+	bx	r3
 END (_Unwind_Resume)