diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-06-26 15:08:29 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2014-06-26 15:08:29 -0700 |
| commit | 3cb4de474155c315003746f3de9c408b824abc5e (patch) | |
| tree | 97ab77bdad076daa6d95670b9cb9ed077670de23 /sysdeps/unix | |
| parent | 354426bb34a7dba084cd1dbef46db0994c48988f (diff) | |
| download | glibc-3cb4de474155c315003746f3de9c408b824abc5e.tar.gz glibc-3cb4de474155c315003746f3de9c408b824abc5e.tar.xz glibc-3cb4de474155c315003746f3de9c408b824abc5e.zip | |
ARM: Move more aeabi routine magic out of Linux-specific directories
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/Makefile | 27 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/nptl-aeabi_unwind_cpp_pr1.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/rt-aeabi_unwind_cpp_pr1.c | 1 |
4 files changed, 4 insertions, 26 deletions
diff --git a/sysdeps/unix/sysv/linux/arm/Makefile b/sysdeps/unix/sysv/linux/arm/Makefile index 38275cda81..80c112bc18 100644 --- a/sysdeps/unix/sysv/linux/arm/Makefile +++ b/sysdeps/unix/sysv/linux/arm/Makefile @@ -1,14 +1,3 @@ -ifeq ($(subdir),csu) -# In order for unwinding to fail when it falls out of main, we need a -# 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 += aeabi_read_tp libc-aeabi_read_tp -static-only-routines += aeabi_read_tp -shared-only-routines += libc-aeabi_read_tp -endif - ifeq ($(subdir),elf) sysdep-rtld-routines += aeabi_read_tp libc-do-syscall endif @@ -37,21 +26,13 @@ libcrypt-sysdep_routines += libc-do-syscall endif ifeq ($(subdir),rt) -librt-sysdep_routines += libc-do-syscall rt-aeabi_unwind_cpp_pr1 -librt-shared-only-routines += libc-do-syscall rt-aeabi_unwind_cpp_pr1 +librt-sysdep_routines += libc-do-syscall +librt-shared-only-routines += libc-do-syscall endif ifeq ($(subdir),nptl) -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)) +libpthread-sysdep_routines += libc-do-syscall +libpthread-shared-only-routines += libc-do-syscall endif ifeq ($(subdir),resolv) diff --git a/sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S b/sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S deleted file mode 100644 index 6132afc151..0000000000 --- a/sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S +++ /dev/null @@ -1 +0,0 @@ -#include <aeabi_read_tp.S> diff --git a/sysdeps/unix/sysv/linux/arm/nptl-aeabi_unwind_cpp_pr1.c b/sysdeps/unix/sysv/linux/arm/nptl-aeabi_unwind_cpp_pr1.c deleted file mode 100644 index 7b83522437..0000000000 --- a/sysdeps/unix/sysv/linux/arm/nptl-aeabi_unwind_cpp_pr1.c +++ /dev/null @@ -1 +0,0 @@ -#include <aeabi_unwind_cpp_pr1.c> diff --git a/sysdeps/unix/sysv/linux/arm/rt-aeabi_unwind_cpp_pr1.c b/sysdeps/unix/sysv/linux/arm/rt-aeabi_unwind_cpp_pr1.c deleted file mode 100644 index 7b83522437..0000000000 --- a/sysdeps/unix/sysv/linux/arm/rt-aeabi_unwind_cpp_pr1.c +++ /dev/null @@ -1 +0,0 @@ -#include <aeabi_unwind_cpp_pr1.c> |