From 46abb64d6287d09100b147d062f6810066389b7e Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 5 Jan 2015 14:01:49 -0800 Subject: ARM: Consolidate with generic unwinder wrapper code --- sysdeps/arm/Makefile | 12 ++++++++-- sysdeps/arm/arm-unwind-resume.S | 46 ++++++++++++++++++++++++++++++++++++++ sysdeps/arm/pt-arm-unwind-resume.S | 2 ++ sysdeps/arm/rt-arm-unwind-resume.S | 1 + sysdeps/arm/unwind-resume.h | 33 +++++++++++++++++++++++++++ 5 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 sysdeps/arm/arm-unwind-resume.S create mode 100644 sysdeps/arm/pt-arm-unwind-resume.S create mode 100644 sysdeps/arm/rt-arm-unwind-resume.S create mode 100644 sysdeps/arm/unwind-resume.h (limited to 'sysdeps/arm') diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile index db60a17671..f72cce0919 100644 --- a/sysdeps/arm/Makefile +++ b/sysdeps/arm/Makefile @@ -50,6 +50,9 @@ shared-only-routines += libc-aeabi_read_tp # cantunwind marker. There's one in start.S. To make sure we reach it, add # unwind tables for __libc_start_main. CFLAGS-libc-start.c += -fexceptions + +sysdep_routines += arm-unwind-resume +shared-only-routines += arm-unwind-resume endif ifeq ($(subdir),gmon) @@ -61,6 +64,11 @@ CFLAGS-backtrace.c += -funwind-tables endif ifeq ($(subdir),rt) -librt-sysdep_routines += rt-aeabi_unwind_cpp_pr1 -librt-shared-only-routines += rt-aeabi_unwind_cpp_pr1 +librt-sysdep_routines += rt-aeabi_unwind_cpp_pr1 rt-arm-unwind-resume +librt-shared-only-routines += rt-aeabi_unwind_cpp_pr1 rt-arm-unwind-resume +endif + +ifeq ($(subdir),nptl) +libpthread-sysdep_routines += pt-arm-unwind-resume +libpthread-shared-only-routines += pt-arm-unwind-resume endif diff --git a/sysdeps/arm/arm-unwind-resume.S b/sysdeps/arm/arm-unwind-resume.S new file mode 100644 index 0000000000..d201788f2d --- /dev/null +++ b/sysdeps/arm/arm-unwind-resume.S @@ -0,0 +1,46 @@ +/* _Unwind_Resume wrapper for ARM EABI. + Copyright (C) 2015 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library. If not, see + . */ + +#include + +/* 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 __libgcc_s_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) diff --git a/sysdeps/arm/pt-arm-unwind-resume.S b/sysdeps/arm/pt-arm-unwind-resume.S new file mode 100644 index 0000000000..7cb555c02b --- /dev/null +++ b/sysdeps/arm/pt-arm-unwind-resume.S @@ -0,0 +1,2 @@ +#define __libgcc_s_init pthread_cancel_init +#include diff --git a/sysdeps/arm/rt-arm-unwind-resume.S b/sysdeps/arm/rt-arm-unwind-resume.S new file mode 100644 index 0000000000..9144b0ce88 --- /dev/null +++ b/sysdeps/arm/rt-arm-unwind-resume.S @@ -0,0 +1 @@ +#include diff --git a/sysdeps/arm/unwind-resume.h b/sysdeps/arm/unwind-resume.h new file mode 100644 index 0000000000..1474bb0c1b --- /dev/null +++ b/sysdeps/arm/unwind-resume.h @@ -0,0 +1,33 @@ +/* Definitions for unwind-resume.c. ARM (EABI) version. + Copyright (C) 2014 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; see the file COPYING.LIB. If + not, see . */ + +/* The EABI personality routine has a different signature than the + canonical one. These macros tell sysdeps/gnu/unwind*.c how to + define __gcc_personality_v0. */ +#define PERSONALITY_PROTO \ + (_Unwind_State state, \ + struct _Unwind_Exception *ue_header, \ + struct _Unwind_Context *context) +#define PERSONALITY_ARGS \ + (state, ue_header, context) + +/* It's vitally important that _Unwind_Resume not have a stack frame; the + ARM unwinder relies on register state at entrance. So we write this in + assembly (see arm-unwind-resume.S). This macro tells the generic code + not to provide the generic C definition. */ +#define HAVE_ARCH_UNWIND_RESUME 1 -- cgit v1.2.3