diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-11-20 14:22:40 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-11-24 11:41:46 +0530 |
| commit | ce9f10f7f0cc83df3e307a18e480587c3b404321 (patch) | |
| tree | 5928110640fc4f478949efc01ad50b97de4266e0 /sysdeps/unix/sysv/linux/x86_64 | |
| parent | 016afc75cd45dfaf49c0aa7a9befda77ab933846 (diff) | |
| download | glibc-ce9f10f7f0cc83df3e307a18e480587c3b404321.tar.gz glibc-ce9f10f7f0cc83df3e307a18e480587c3b404321.tar.xz glibc-ce9f10f7f0cc83df3e307a18e480587c3b404321.zip | |
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.
Diffstat (limited to 'sysdeps/unix/sysv/linux/x86_64')
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/cancellation.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/x86_64/cancellation.S b/sysdeps/unix/sysv/linux/x86_64/cancellation.S index 89fda5efeb..5189bbcf2c 100644 --- a/sysdeps/unix/sysv/linux/x86_64/cancellation.S +++ b/sysdeps/unix/sysv/linux/x86_64/cancellation.S @@ -21,7 +21,7 @@ #include <kernel-features.h> #include "lowlevellock.h" -#ifdef IS_IN_libpthread +#if IS_IN (libpthread) # if defined SHARED && !defined NO_HIDDEN # define __pthread_unwind __GI___pthread_unwind # endif diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h index efdb1c657a..2667292155 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 || IS_IN (librt) +#if !defined NOT_IN_libc || 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 @@ -59,7 +59,7 @@ jae SYSCALL_ERROR_LABEL -# ifdef IS_IN_libpthread +# if IS_IN (libpthread) # define CENABLE call __pthread_enable_asynccancel; # define CDISABLE call __pthread_disable_asynccancel; # define __local_multiple_threads __pthread_multiple_threads @@ -74,7 +74,7 @@ # error Unsupported library # endif -# if defined IS_IN_libpthread || !defined NOT_IN_libc +# if IS_IN (libpthread) || !defined NOT_IN_libc # ifndef __ASSEMBLER__ extern int __local_multiple_threads attribute_hidden; # define SINGLE_THREAD_P \ |