diff options
25 files changed, 73 insertions, 46 deletions
@@ -1,5 +1,32 @@ 2014-11-24 Siddhesh Poyarekar <siddhesh@redhat.com> + * include/mqueue.h: Use IS_IN instead of IS_IN_librt. + * nptl/pthreadP.h: Likewise. + * sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/arm/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/ia64/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/mips/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/not-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: + Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: + Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/sh/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/tile/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/tile/waitpid.S: Likewise. + * sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h: Likewise. + * dlfcn/dladdr.c: Use IS_IN. * dlfcn/dladdr1.c: Likewise. * dlfcn/dlclose.c: Likewise. diff --git a/include/mqueue.h b/include/mqueue.h index 1ac4f13445..aba788e803 100644 --- a/include/mqueue.h +++ b/include/mqueue.h @@ -1,6 +1,6 @@ #include <rt/mqueue.h> -#ifdef IS_IN_librt +#if IS_IN (librt) hidden_proto (mq_timedsend) hidden_proto (mq_timedreceive) hidden_proto (mq_setattr) diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 3aa24c283b..376dbff316 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -308,7 +308,7 @@ __do_cancel (void) # define LIBC_CANCEL_HANDLED() \ __asm (".globl " __SYMBOL_PREFIX "__pthread_enable_asynccancel"); \ __asm (".globl " __SYMBOL_PREFIX "__pthread_disable_asynccancel") -#elif defined IS_IN_librt +#elif IS_IN (librt) # define LIBC_CANCEL_ASYNC() \ __librt_enable_asynccancel () # define LIBC_CANCEL_RESET(val) \ diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h index 546ed7b55c..9e347de390 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -89,7 +89,7 @@ ENTRY (name); \ # define CENABLE bl __libc_enable_asynccancel # define CDISABLE bl __libc_disable_asynccancel # define __local_multiple_threads __libc_multiple_threads -# elif defined IS_IN_librt +# elif IS_IN (librt) # define CENABLE bl __librt_enable_asynccancel # define CDISABLE bl __librt_disable_asynccancel # else diff --git a/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h b/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h index 69809bc9e1..45bf93b89b 100644 --- a/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h @@ -21,7 +21,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) /* ??? Assumes that nothing comes between PSEUDO and PSEUDO_END besides "ret". */ @@ -121,7 +121,7 @@ __LABEL($multi_error) \ # define __local_enable_asynccancel __libc_enable_asynccancel # define __local_disable_asynccancel __libc_disable_asynccancel # define __local_multiple_threads __libc_multiple_threads -# elif defined IS_IN_librt +# elif IS_IN (librt) # define __local_enable_asynccancel __librt_enable_asynccancel # define __local_disable_asynccancel __librt_disable_asynccancel # else diff --git a/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h b/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h index a0a869605e..e5a8e36a22 100644 --- a/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h @@ -21,7 +21,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) /* NOTE: We do mark syscalls with unwind annotations, for the benefit of cancellation; but they're really only accurate at the point of the @@ -189,7 +189,7 @@ # define CENABLE bl PLTJMP(__libc_enable_asynccancel) # define CDISABLE bl PLTJMP(__libc_disable_asynccancel) # define __local_multiple_threads __libc_multiple_threads -# elif defined IS_IN_librt +# elif IS_IN (librt) # define CENABLE bl PLTJMP(__librt_enable_asynccancel) # define CDISABLE bl PLTJMP(__librt_disable_asynccancel) # else diff --git a/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h b/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h index 6f1c9d745b..365237e31e 100644 --- a/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) # ifndef NO_ERROR # define NO_ERROR -0x1000 @@ -228,7 +228,7 @@ L(pre_end): ASM_LINE_SEP \ # define CDISABLE .import __libc_disable_asynccancel,code ASM_LINE_SEP \ bl __libc_disable_asynccancel,%r2 ASM_LINE_SEP # endif -# elif defined IS_IN_librt +# elif IS_IN (librt) # ifdef PIC # define CENABLE .import __librt_enable_asynccancel,code ASM_LINE_SEP \ bl __librt_enable_asynccancel,%r2 ASM_LINE_SEP @@ -248,7 +248,7 @@ L(pre_end): ASM_LINE_SEP \ # define __local_multiple_threads __pthread_multiple_threads # elif !defined NOT_IN_libc # define __local_multiple_threads __libc_multiple_threads -# elif IS_IN_librt +# elif IS_IN (librt) # define __local_multiple_threads __librt_multiple_threads # else # error Unsupported library @@ -271,7 +271,7 @@ L(pre_end): ASM_LINE_SEP \ # define NO_CANCELLATION 1 #endif -/* !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt */ +/* !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) */ #ifndef __ASSEMBLER__ # define RTLD_SINGLE_THREAD_P \ diff --git a/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h index 4f4318d0bd..75fe2e64f1 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -114,7 +114,7 @@ # elif !defined NOT_IN_libc # define CENABLE call __libc_enable_asynccancel; # define CDISABLE call __libc_disable_asynccancel -# elif defined IS_IN_librt +# elif IS_IN (librt) # define CENABLE call __librt_enable_asynccancel; # define CDISABLE call __librt_disable_asynccancel # else diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h index c44c48460c..366728f306 100644 --- a/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) # undef PSEUDO @@ -185,7 +185,7 @@ __GC_##name: \ # elif !defined NOT_IN_libc # define CENABLE br.call.sptk.many b0 = __libc_enable_asynccancel # define CDISABLE br.call.sptk.many b0 = __libc_disable_asynccancel -# elif defined IS_IN_librt +# elif IS_IN (librt) # define CENABLE br.call.sptk.many b0 = __librt_enable_asynccancel # define CDISABLE br.call.sptk.many b0 = __librt_disable_asynccancel # else diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h index e0ec861dab..49d289c6ca 100644 --- a/sysdeps/unix/sysv/linux/ia64/sysdep.h +++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h @@ -62,7 +62,7 @@ #if defined USE_DL_SYSINFO \ && (!defined NOT_IN_libc \ - || defined IS_IN_libpthread || defined IS_IN_librt) + || defined IS_IN_libpthread || IS_IN (librt)) # define IA64_USE_NEW_STUB #else # undef IA64_USE_NEW_STUB diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h b/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h index 868ce56687..0e19a38b0f 100644 --- a/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -106,7 +106,7 @@ # elif !defined NOT_IN_libc # define CENABLE PSEUDO_JMP (__libc_enable_asynccancel) # define CDISABLE PSEUDO_JMP (__libc_disable_asynccancel) -# elif defined IS_IN_librt +# elif IS_IN (librt) # define CENABLE PSEUDO_JMP (__librt_enable_asynccancel) # define CDISABLE PSEUDO_JMP (__librt_disable_asynccancel) # else diff --git a/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h b/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h index 0080d8d4f9..4d371eff3c 100644 --- a/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h @@ -21,9 +21,9 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) -# if !defined(IS_IN_librt) || !defined(PIC) +# if !IS_IN (librt) || !defined(PIC) # define AC_STACK_SIZE 16 /* space for r15, async_cancel arg and 2 temp words */ # define AC_SET_GOT /* empty */ # define AC_RESTORE_GOT /* empty */ @@ -110,7 +110,7 @@ L(pseudo_cancel): \ # define CENABLE PSEUDO_JMP (__libc_enable_asynccancel) # define CDISABLE PSEUDO_JMP (__libc_disable_asynccancel) # define __local_multiple_threads __libc_multiple_threads -# elif defined IS_IN_librt +# elif IS_IN (librt) # define CENABLE PSEUDO_JMP (__librt_enable_asynccancel) # define CDISABLE PSEUDO_JMP (__librt_disable_asynccancel) # else diff --git a/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h index 341b9a0ba0..acbc5da15a 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h @@ -27,7 +27,7 @@ happen before any instructions. So we use cfi_same_value instead of cfi_restore. */ -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) #ifdef __PIC__ # undef PSEUDO @@ -216,7 +216,7 @@ # ifdef IS_IN_libpthread # define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel) # define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel) -# elif defined IS_IN_librt +# elif IS_IN (librt) # define CENABLE PSEUDO_JMP (__librt_enable_asynccancel) # define CDISABLE PSEUDO_JMP (__librt_disable_asynccancel) # else diff --git a/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h index 3666081266..5fdd5675d5 100644 --- a/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) # ifdef __PIC__ # define PSEUDO_CPLOAD .cpload t9; @@ -157,7 +157,7 @@ # ifdef IS_IN_libpthread # define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel) # define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel) -# elif defined IS_IN_librt +# elif IS_IN (librt) # define CENABLE PSEUDO_JMP (__librt_enable_asynccancel) # define CDISABLE PSEUDO_JMP (__librt_disable_asynccancel) # else diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h index 14f5e8bd8b..d089531f1a 100644 --- a/sysdeps/unix/sysv/linux/not-cancel.h +++ b/sysdeps/unix/sysv/linux/not-cancel.h @@ -19,7 +19,7 @@ #include <sysdep.h> -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) extern int __open_nocancel (const char *, int, ...) attribute_hidden; extern int __close_nocancel (int) attribute_hidden; extern int __read_nocancel (int, void *, size_t) attribute_hidden; diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h index b6eedcb0e9..962beaff59 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h @@ -23,7 +23,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -87,7 +87,7 @@ # elif !defined NOT_IN_libc # define CENABLE bl __libc_enable_asynccancel@local # define CDISABLE bl __libc_disable_asynccancel@local -# elif defined IS_IN_librt +# elif IS_IN (librt) # define CENABLE bl __librt_enable_asynccancel@local # define CDISABLE bl __librt_disable_asynccancel@local # else diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h index 5807d9d5bc..0447062f28 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h @@ -23,7 +23,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) # ifdef HAVE_ASM_GLOBAL_DOT_NAME # define DASHDASHPFX(str) .__##str @@ -115,7 +115,7 @@ # define CENABLE bl JUMPTARGET(__libc_enable_asynccancel); nop # define CDISABLE bl JUMPTARGET(__libc_disable_asynccancel); nop # endif -# elif defined IS_IN_librt +# elif IS_IN (librt) # ifdef SHARED # define CENABLE bl JUMPTARGET(__librt_enable_asynccancel) # define CDISABLE bl JUMPTARGET(__librt_disable_asynccancel) diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h index 0eeefca5cb..bc5d852939 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -81,7 +81,7 @@ L(pseudo_end): # elif !defined NOT_IN_libc # define CENABLE __libc_enable_asynccancel # define CDISABLE __libc_disable_asynccancel -# elif defined IS_IN_librt +# elif IS_IN (librt) # define CENABLE __librt_enable_asynccancel # define CDISABLE __librt_disable_asynccancel # else diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h index b3560c8e4e..885bf7ea9d 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -77,7 +77,7 @@ L(pseudo_end): # define CENABLE __libc_enable_asynccancel # define CDISABLE __libc_disable_asynccancel # define __local_multiple_threads __libc_multiple_threads -# elif defined IS_IN_librt +# elif IS_IN (librt) # define CENABLE __librt_enable_asynccancel # define CDISABLE __librt_disable_asynccancel # else diff --git a/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h index 4278f25d7b..4ef51c0f12 100644 --- a/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h @@ -21,7 +21,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) # define _IMM12 #-12 # define _IMM16 #-16 @@ -111,7 +111,7 @@ # elif !defined NOT_IN_libc # define __local_enable_asynccancel __libc_enable_asynccancel # define __local_disable_asynccancel __libc_disable_asynccancel -# elif defined IS_IN_librt +# elif IS_IN (librt) # define __local_enable_asynccancel __librt_enable_asynccancel # define __local_disable_asynccancel __librt_disable_asynccancel # else diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h index fd9968f911..2e24d2a72b 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -74,7 +74,7 @@ __##syscall_name##_nocancel: \ # elif !defined NOT_IN_libc # define CENABLE call __libc_enable_asynccancel # define CDISABLE call __libc_disable_asynccancel -# elif defined IS_IN_librt +# elif IS_IN (librt) # define CENABLE call __librt_enable_asynccancel # define CDISABLE call __librt_disable_asynccancel # else diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h index 4dad994ab3..0ae3b615b2 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -72,7 +72,7 @@ __##syscall_name##_nocancel: \ # elif !defined NOT_IN_libc # define CENABLE call __libc_enable_asynccancel # define CDISABLE call __libc_disable_asynccancel -# elif defined IS_IN_librt +# elif IS_IN (librt) # define CENABLE call __librt_enable_asynccancel # define CDISABLE call __librt_disable_asynccancel # else diff --git a/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h b/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h index 233333844f..8140273b7d 100644 --- a/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) /* Allow hacking in some extra code if desired. */ #ifndef PSEUDO_EXTRA @@ -120,7 +120,7 @@ # ifdef IS_IN_libpthread # define CENABLE jal __pthread_enable_asynccancel # define CDISABLE jal __pthread_disable_asynccancel -# elif defined IS_IN_librt +# elif IS_IN (librt) # define CENABLE jal __librt_enable_asynccancel # define CDISABLE jal __librt_disable_asynccancel # else diff --git a/sysdeps/unix/sysv/linux/tile/waitpid.S b/sysdeps/unix/sysv/linux/tile/waitpid.S index 22642aee41..7ccdf25013 100644 --- a/sysdeps/unix/sysv/linux/tile/waitpid.S +++ b/sysdeps/unix/sysv/linux/tile/waitpid.S @@ -1,7 +1,7 @@ /* extern pid_t __waitpid_nocancel (pid_t, int *, int) attribute_hidden; */ -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) /* Call __NR_wait4, providing fourth argument (struct rusage *) as NULL. */ #define PSEUDO_EXTRA move r3, zero; diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h index 83cd25fe8d..efdb1c657a 100644 --- a/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt +#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) /* The code to disable cancellation depends on the fact that the called functions are special. They don't modify registers other than %rax @@ -67,7 +67,7 @@ # define CENABLE call __libc_enable_asynccancel; # define CDISABLE call __libc_disable_asynccancel; # define __local_multiple_threads __libc_multiple_threads -# elif defined IS_IN_librt +# elif IS_IN (librt) # define CENABLE call __librt_enable_asynccancel; # define CDISABLE call __librt_disable_asynccancel; # else |