about summary refs log tree commit diff
path: root/sysdeps/arm/pt-arm-unwind-resume.S
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-03-01 15:56:36 +0100
committerFlorian Weimer <fweimer@redhat.com>2021-03-01 16:00:22 +0100
commit97e42bd482b62d7b74889be11c98b0bbb4059dcd (patch)
tree374b3d1c4ab7dc13601bf1af77463aeefd5b73b9 /sysdeps/arm/pt-arm-unwind-resume.S
parent6b7efa3d8703cfd020281706f8110bc4a41b1525 (diff)
downloadglibc-97e42bd482b62d7b74889be11c98b0bbb4059dcd.tar.gz
glibc-97e42bd482b62d7b74889be11c98b0bbb4059dcd.tar.xz
glibc-97e42bd482b62d7b74889be11c98b0bbb4059dcd.zip
nptl: Use <unwind-link.h> for accessing the libgcc_s unwinder
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/arm/pt-arm-unwind-resume.S')
-rw-r--r--sysdeps/arm/pt-arm-unwind-resume.S30
1 files changed, 2 insertions, 28 deletions
diff --git a/sysdeps/arm/pt-arm-unwind-resume.S b/sysdeps/arm/pt-arm-unwind-resume.S
index d579848696..c056eb38d0 100644
--- a/sysdeps/arm/pt-arm-unwind-resume.S
+++ b/sysdeps/arm/pt-arm-unwind-resume.S
@@ -16,31 +16,5 @@
    License along with the GNU C Library.  If not, see
    <https://www.gnu.org/licenses/>.  */
 
-#include <sysdep.h>
-
-/* This is just implementing exactly what the C version does.
-   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}
-	cfi_adjust_cfa_offset (8)
-	cfi_rel_offset (r0, 0)
-	cfi_rel_offset (lr, 4)
-	bl	pthread_cancel_init
-	pop	{r0, lr}
-	cfi_adjust_cfa_offset (-8)
-	cfi_restore (r0)
-	cfi_restore (lr)
-
-	LDR_HIDDEN (ip, ip, __libgcc_s_resume, 0)
-	b	0b
-END (_Unwind_Resume)
+/* The implementation in libpthread is identical to the one in libc.  */
+#include <sysdeps/arm/arm-unwind-resume.S>