about summary refs log tree commit diff
path: root/sysdeps/arm/Makefile
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2015-01-05 14:01:49 -0800
committerRoland McGrath <roland@hack.frob.com>2015-01-05 15:42:16 -0800
commit46abb64d6287d09100b147d062f6810066389b7e (patch)
tree9102447cb3ce0baaf29cb4041d8bb915f1185225 /sysdeps/arm/Makefile
parent61695fb2bab724ed69057c3eff03253708f96517 (diff)
downloadglibc-46abb64d6287d09100b147d062f6810066389b7e.tar.gz
glibc-46abb64d6287d09100b147d062f6810066389b7e.tar.xz
glibc-46abb64d6287d09100b147d062f6810066389b7e.zip
ARM: Consolidate with generic unwinder wrapper code
Diffstat (limited to 'sysdeps/arm/Makefile')
-rw-r--r--sysdeps/arm/Makefile12
1 files changed, 10 insertions, 2 deletions
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