From ce9f10f7f0cc83df3e307a18e480587c3b404321 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Thu, 20 Nov 2014 14:22:40 +0530 Subject: Remove IS_IN_libpthread Replace with IS_IN (libpthread). Generated code unchanged on x86_64. * nptl/lowlevellock.c: Use IS_IN instead of IS_IN_libpthread. * nptl/pthreadP.h: Likewise. * nptl_db/structs.def: Likewise. * sysdeps/arm/sysdep.h: Likewise. * sysdeps/nptl/bits/libc-lock.h: Likewise. * sysdeps/nptl/bits/libc-lockP.h: Likewise. * sysdeps/sparc/sparc32/lowlevellock.c: Likewise. * sysdeps/unix/alpha/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/aarch64/sysdep.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/i386/sysdep.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/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/tile/waitpid.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/cancellation.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h: Likewise. --- sysdeps/unix/sysv/linux/tile/sysdep-cancel.h | 4 ++-- sysdeps/unix/sysv/linux/tile/sysdep.h | 2 +- sysdeps/unix/sysv/linux/tile/waitpid.S | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sysdeps/unix/sysv/linux/tile') diff --git a/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h b/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h index 8140273b7d..028c3930e1 100644 --- a/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h @@ -22,7 +22,7 @@ # include #endif -#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) +#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) /* Allow hacking in some extra code if desired. */ #ifndef PSEUDO_EXTRA @@ -117,7 +117,7 @@ # define STKSPACE (13 * REGSIZE) -# ifdef IS_IN_libpthread +# if IS_IN (libpthread) # define CENABLE jal __pthread_enable_asynccancel # define CDISABLE jal __pthread_disable_asynccancel # elif IS_IN (librt) diff --git a/sysdeps/unix/sysv/linux/tile/sysdep.h b/sysdeps/unix/sysv/linux/tile/sysdep.h index 238b266a82..d03a74bd9e 100644 --- a/sysdeps/unix/sysv/linux/tile/sysdep.h +++ b/sysdeps/unix/sysv/linux/tile/sysdep.h @@ -45,7 +45,7 @@ #ifndef PIC /* For static code, on error jump to __syscall_error directly. */ # define SYSCALL_ERROR_NAME __syscall_error -#elif !defined NOT_IN_libc || defined IS_IN_libpthread +#elif !defined NOT_IN_libc || IS_IN (libpthread) /* Use the internal name for libc/libpthread shared objects. */ # define SYSCALL_ERROR_NAME __GI___syscall_error #else diff --git a/sysdeps/unix/sysv/linux/tile/waitpid.S b/sysdeps/unix/sysv/linux/tile/waitpid.S index 7ccdf25013..7fa1cca660 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 || IS_IN (librt) +#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) /* Call __NR_wait4, providing fourth argument (struct rusage *) as NULL. */ #define PSEUDO_EXTRA move r3, zero; -- cgit v1.2.3