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/mips/mips64/sysdep-cancel.h | 4 ++-- sysdeps/unix/sysv/linux/mips/sysdep-cancel.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sysdeps/unix/sysv/linux/mips') diff --git a/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h index acbc5da15a..6f79b14f62 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 || IS_IN (librt) +#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) #ifdef __PIC__ # undef PSEUDO @@ -213,7 +213,7 @@ # define PSEUDO_JMP(sym) jal sym # endif -# ifdef IS_IN_libpthread +# if IS_IN (libpthread) # define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel) # define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel) # elif IS_IN (librt) diff --git a/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h index 5fdd5675d5..1d711f784a 100644 --- a/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/mips/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) # ifdef __PIC__ # define PSEUDO_CPLOAD .cpload t9; @@ -154,7 +154,7 @@ # define PSEUDO_JMP(sym) jal sym; # endif -# ifdef IS_IN_libpthread +# if IS_IN (libpthread) # define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel) # define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel) # elif IS_IN (librt) -- cgit 1.4.1