about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/arm/Makefile
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-05-13 10:04:05 -0700
committerRoland McGrath <roland@hack.frob.com>2014-05-13 10:04:05 -0700
commit8c6d01f0b11e699d7d9868a5bf1eb6d9054c91a3 (patch)
tree0f86ec102e2b187432508ebcbc035c6dd2b33785 /sysdeps/unix/sysv/linux/arm/Makefile
parentbba6da4e1b9c0faf12ec9a48a2822434d9e6bbcd (diff)
downloadglibc-8c6d01f0b11e699d7d9868a5bf1eb6d9054c91a3.tar.gz
glibc-8c6d01f0b11e699d7d9868a5bf1eb6d9054c91a3.tar.xz
glibc-8c6d01f0b11e699d7d9868a5bf1eb6d9054c91a3.zip
Consolidate NPTL configury for ARM/Linux.
Diffstat (limited to 'sysdeps/unix/sysv/linux/arm/Makefile')
-rw-r--r--sysdeps/unix/sysv/linux/arm/Makefile16
1 files changed, 12 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/arm/Makefile b/sysdeps/unix/sysv/linux/arm/Makefile
index aa7526a258..38275cda81 100644
--- a/sysdeps/unix/sysv/linux/arm/Makefile
+++ b/sysdeps/unix/sysv/linux/arm/Makefile
@@ -37,13 +37,21 @@ libcrypt-sysdep_routines += libc-do-syscall
 endif
 
 ifeq ($(subdir),rt)
-librt-sysdep_routines += libc-do-syscall
-librt-shared-only-routines += libc-do-syscall
+librt-sysdep_routines += libc-do-syscall rt-aeabi_unwind_cpp_pr1
+librt-shared-only-routines += libc-do-syscall rt-aeabi_unwind_cpp_pr1
 endif
 
 ifeq ($(subdir),nptl)
-libpthread-sysdep_routines += libc-do-syscall
-libpthread-shared-only-routines += libc-do-syscall
+libpthread-sysdep_routines += libc-do-syscall nptl-aeabi_unwind_cpp_pr1
+libpthread-shared-only-routines += libc-do-syscall nptl-aeabi_unwind_cpp_pr1
+
+# This test relies on compiling part of the binary with EH information,
+# part without, and unwinding through.  The .ARM.exidx tables have
+# start addresses for EH regions, but no end addresses.  Every
+# region an exception needs to propogate through must have unwind
+# information, or a previous function's unwind table may be used
+# by mistake.
+tests := $(filter-out tst-cleanupx4,$(tests))
 endif
 
 ifeq ($(subdir),resolv)