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 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'sysdeps/arm/Makefile') 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 -- cgit v1.2.3