From aa2f176d6f75b86b91e544c2e494066ac8f88cbd Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 23 May 2014 16:37:15 -0400 Subject: [PATCH] arm,aarch64: Remove SINGLE_THREAD_P_PIC This macro was removed by 2005-11-16 Daniel Jacobowitz but not applied to the (still separate) eabi port so necro'd when the eabi port superceded the old abi. It was thence copied into the new AArch64 port. --- ChangeLog | 5 +++++ sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h | 1 - sysdeps/unix/sysv/linux/arm/sysdep-cancel.h | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4fcaa28450..299d4dedee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2014-05-25 Richard Henderson + * sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h + (SINGLE_THREAD_P_PIC): Remove. + * sysdeps/unix/sysv/linux/arm/sysdep-cancel.h + (SINGLE_THREAD_P_PIC): Remove. + * sysdeps/unix/sysv/linux/aarch64/sysdep.h (PSEUDO_RET): Move branch to syscall error ... (PSEUDO): ... here. diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h index 2d0ae5b939..c300b2d4ac 100644 --- a/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h @@ -186,7 +186,6 @@ extern int __local_multiple_threads attribute_hidden; cfi_restore (x30); \ cfi_adjust_cfa_offset (-16); \ cmp w16, 0 -# define SINGLE_THREAD_P_PIC(x) SINGLE_THREAD_P # endif # endif diff --git a/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h b/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h index 118e6c3466..a0a869605e 100644 --- a/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h @@ -223,7 +223,6 @@ extern int __local_multiple_threads attribute_hidden; cfi_adjust_cfa_offset (-8); \ cfi_restore (lr); \ teq ip, #0 -# define SINGLE_THREAD_P_PIC(x) SINGLE_THREAD_P # endif # endif