From 102dde842ae75ddee71a413fc8c4320894e159de Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Thu, 3 Aug 2017 14:29:06 -0300 Subject: Remove NO_CANCELLATION macro The NO_CANCELLATION macro is used currently on generic headers to define non cancellable syscalls and on Linux fcntl to implement the non cancellable variation. Former should be single-handled by not-cancel.h header and former could be simplified build both cancellable and non cancellable for default objects and alias the non-cancellable to default one for rtld ones (since Linux already support cancellation as default). This patch thus removes the NO_CANCELLATION macro and its usage. The generic non cancellable fcntl is route to internal fcntl. Checked on x86_64-linux-gnu and i686-linux-gnu. Also checked with a build again major ABIs. * sysdeps/generic/not-cancel.h (NO_CANCELLATION): Remove macro. * sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/arm/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/mips/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/nios2/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/powerpc/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/sh/sysdep-cancel.h (NO_CANCELLATION): Likewise * sysdeps/unix/sysv/linux/sparc/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/tile/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h (NO_CANCELLATION): Likewise. * sysdeps/unix/sysv/linux/not-cancel.h (__fcntl_nocancel): Add hidden prototype. * sysdeps/unix/sysv/linux/fcntl.c (__fcntl_nocancel): Define only for !IS_IN (rtld) and remove NO_CANCELLATION usage. --- ChangeLog | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index e0473dc29e..a934c69393 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,45 @@ +2017-08-31 Adhemerval Zanella + + * sysdeps/generic/not-cancel.h (NO_CANCELLATION): Remove macro. + * sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h (NO_CANCELLATION): + Likewise. + * sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h (NO_CANCELLATION): + Likewise. + * sysdeps/unix/sysv/linux/arm/sysdep-cancel.h (NO_CANCELLATION): + Likewise. + * sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h (NO_CANCELLATION): + Likewise. + * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h (NO_CANCELLATION): + Likewise. + * sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h (NO_CANCELLATION): + Likewise. + * sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h (NO_CANCELLATION): + Likewise. + * sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h + (NO_CANCELLATION): Likewise. + * sysdeps/unix/sysv/linux/mips/sysdep-cancel.h (NO_CANCELLATION): + Likewise. + * sysdeps/unix/sysv/linux/nios2/sysdep-cancel.h (NO_CANCELLATION): + Likewise. + * sysdeps/unix/sysv/linux/powerpc/sysdep-cancel.h (NO_CANCELLATION): + Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h + (NO_CANCELLATION): Likewise. + * sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h + (NO_CANCELLATION): Likewise. + * sysdeps/unix/sysv/linux/sh/sysdep-cancel.h (NO_CANCELLATION): + Likewise + * sysdeps/unix/sysv/linux/sparc/sysdep-cancel.h (NO_CANCELLATION): + Likewise. + * sysdeps/unix/sysv/linux/tile/sysdep-cancel.h (NO_CANCELLATION): + Likewise. + * sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h (NO_CANCELLATION): + Likewise. + * sysdeps/unix/sysv/linux/not-cancel.h (__fcntl_nocancel): Add + hidden prototype. + * sysdeps/unix/sysv/linux/fcntl.c (__fcntl_nocancel): Define only + for !IS_IN (rtld) and remove NO_CANCELLATION usage. + 2017-08-31 Steve Ellcey * sysdeps/aarch64/dl-irel.h: (elf_ifunc_invoke): Change argument type -- cgit 1.4.1