diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386')
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/lowlevellock.h | 8 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/sysdep-cancel.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/sysdep.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S index 4ed46fc63e..13596f11ac 100644 --- a/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +++ b/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -115,7 +115,7 @@ __lll_lock_wait_private: cfi_endproc .size __lll_lock_wait_private,.-__lll_lock_wait_private -#ifdef NOT_IN_libc +#if !IS_IN (libc) .globl __lll_lock_wait .type __lll_lock_wait,@function .hidden __lll_lock_wait @@ -361,7 +361,7 @@ __lll_unlock_wake_private: cfi_endproc .size __lll_unlock_wake_private,.-__lll_unlock_wake_private -#ifdef NOT_IN_libc +#if !IS_IN (libc) .globl __lll_unlock_wake .type __lll_unlock_wake,@function .hidden __lll_unlock_wake diff --git a/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/sysdeps/unix/sysv/linux/i386/lowlevellock.h index ffae477160..1032f4b666 100644 --- a/sysdeps/unix/sysv/linux/i386/lowlevellock.h +++ b/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -71,7 +71,7 @@ #define LLL_SHARED FUTEX_PRIVATE_FLAG -#if !defined NOT_IN_libc || IS_IN (rtld) +#if IS_IN (libc) || IS_IN (rtld) /* In libc.so or ld.so all futexes are private. */ # ifdef __ASSUME_PRIVATE_FUTEX # define __lll_private_flag(fl, private) \ @@ -169,7 +169,7 @@ value is zero. In case the operation failed, the cmpxchg instruction has loaded the current value of the memory work which is guaranteed to be nonzero. */ -#if defined NOT_IN_libc || defined UP +#if !IS_IN (libc) || defined UP # define __lll_trylock_asm LOCK_INSTR "cmpxchgl %2, %1" #else # define __lll_trylock_asm "cmpl $0, %%gs:%P5\n\t" \ @@ -198,7 +198,7 @@ : "memory"); \ ret; }) -#if defined NOT_IN_libc || defined UP +#if !IS_IN (libc) || defined UP # define __lll_lock_asm_start LOCK_INSTR "cmpxchgl %1, %2\n\t" #else # define __lll_lock_asm_start "cmpl $0, %%gs:%P6\n\t" \ @@ -324,7 +324,7 @@ extern int __lll_timedlock_elision (int *futex, short *adapt_count, : "memory"); \ result; }) -#if defined NOT_IN_libc || defined UP +#if !IS_IN (libc) || defined UP # define __lll_unlock_asm LOCK_INSTR "subl $1, %0\n\t" #else # define __lll_unlock_asm "cmpl $0, %%gs:%P3\n\t" \ diff --git a/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h index c17ff6c586..ab15b9d3ef 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 || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -111,7 +111,7 @@ # if IS_IN (libpthread) # define CENABLE call __pthread_enable_asynccancel; # define CDISABLE call __pthread_disable_asynccancel -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define CENABLE call __libc_enable_asynccancel; # define CDISABLE call __libc_disable_asynccancel # elif IS_IN (librt) diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h index b5380043a8..d751c58e3e 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.h +++ b/sysdeps/unix/sysv/linux/i386/sysdep.h @@ -34,7 +34,7 @@ #define SYS_ify(syscall_name) __NR_##syscall_name #if defined USE_DL_SYSINFO \ - && (!defined NOT_IN_libc || IS_IN (libpthread)) + && (IS_IN (libc) || IS_IN (libpthread)) # define I386_USE_SYSENTER 1 #else # undef I386_USE_SYSENTER @@ -115,7 +115,7 @@ # elif defined _LIBC_REENTRANT -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno |