diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390')
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/longjmp_chk.c | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/lowlevellock.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/vfork.S | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/vfork.S | 2 |
10 files changed, 15 insertions, 15 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/longjmp_chk.c b/sysdeps/unix/sysv/linux/s390/longjmp_chk.c index 02c96c289a..d18fbdf0a3 100644 --- a/sysdeps/unix/sysv/linux/s390/longjmp_chk.c +++ b/sysdeps/unix/sysv/linux/s390/longjmp_chk.c @@ -20,7 +20,7 @@ #include <shlib-compat.h> -#if !defined NOT_IN_libc && defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) +#if IS_IN (libc) && defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) /* this is a copy from debug/longjmp_chk.c because we need an unique name for __longjmp_chk, but it is already named via a define for __libc_siglongjmp in debug/longjmp_chk.c. */ diff --git a/sysdeps/unix/sysv/linux/s390/lowlevellock.h b/sysdeps/unix/sysv/linux/s390/lowlevellock.h index 2c17b2cab5..14fb4a87ed 100644 --- a/sysdeps/unix/sysv/linux/s390/lowlevellock.h +++ b/sysdeps/unix/sysv/linux/s390/lowlevellock.h @@ -51,7 +51,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) \ 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 d19500ded1..3b027e01f1 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 || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -78,7 +78,7 @@ L(pseudo_end): # if IS_IN (libpthread) # define CENABLE __pthread_enable_asynccancel # define CDISABLE __pthread_disable_asynccancel -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define CENABLE __libc_enable_asynccancel # define CDISABLE __libc_disable_asynccancel # elif IS_IN (librt) diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S index de3f8a4e84..aca7e22a9c 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S +++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S @@ -31,7 +31,7 @@ .text ENTRY(__syscall_error) #ifndef PIC -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno @@ -54,7 +54,7 @@ ENTRY(__syscall_error) br %r14 1: .long rtld_errno - 0b # else -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h index e6fd96a334..f0ef41cef4 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h @@ -105,7 +105,7 @@ br %r14; \ 2: .long rtld_errno-1b # elif defined _LIBC_REENTRANT -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S b/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S index 290e464089..3a368c8d5c 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S +++ b/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S @@ -52,7 +52,7 @@ ENTRY (__libc_vfork) br %r14 PSEUDO_END (__libc_vfork) -#if !NOT_IN_libc +#if IS_IN (libc) weak_alias (__libc_vfork, vfork) strong_alias (__libc_vfork, __vfork) libc_hidden_def (__vfork) 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 9622d5a9ab..4955ec1cbd 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 || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -73,7 +73,7 @@ L(pseudo_end): # define CENABLE __pthread_enable_asynccancel # define CDISABLE __pthread_disable_asynccancel # define __local_multiple_threads __pthread_multiple_threads -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define CENABLE __libc_enable_asynccancel # define CDISABLE __libc_disable_asynccancel # define __local_multiple_threads __libc_multiple_threads @@ -111,7 +111,7 @@ L(pseudo_end): #define LR7_6 lg %r7,56+160(%r15); \ cfi_restore (%r7); -# if IS_IN (libpthread) || !defined NOT_IN_libc +# if IS_IN (libpthread) || IS_IN (libc) # ifndef __ASSEMBLER__ extern int __local_multiple_threads attribute_hidden; # define SINGLE_THREAD_P \ diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S index 0fbfe9c9e0..6b4a613a6a 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S @@ -32,7 +32,7 @@ .text ENTRY(__syscall_error) #ifndef PIC -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno @@ -55,7 +55,7 @@ ENTRY(__syscall_error) lghi %r2,-1 br %r14 # else -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h index 917a636ee2..696e4b3c04 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h @@ -113,7 +113,7 @@ lghi %r2,-1; \ br %r14 # elif defined _LIBC_REENTRANT -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S b/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S index 7de1bb07ad..54bb2724c8 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S +++ b/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S @@ -53,7 +53,7 @@ ENTRY (__libc_vfork) br %r14 PSEUDO_END (__libc_vfork) -#if !NOT_IN_libc +#if IS_IN (libc) weak_alias (__libc_vfork, vfork) strong_alias (__libc_vfork, __vfork) libc_hidden_def (__vfork) |