diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h | 1 | ||||
-rw-r--r-- | 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 <rth@twiddle.net> + * 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 |