diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-05-10 18:05:49 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-06-04 09:54:52 -0300 |
| commit | 57094e576aed174317fb7de2da34be8536891678 (patch) | |
| tree | 7e356e67bb76d05dea6247720518f34e18879c8f | |
| parent | eaa53d0f77691e37aa6f22e18205a2ba019e1a1c (diff) | |
| download | glibc-57094e576aed174317fb7de2da34be8536891678.zip glibc-57094e576aed174317fb7de2da34be8536891678.tar.gz glibc-57094e576aed174317fb7de2da34be8536891678.tar.bz2 | |
libio: Assume _IO_lock_inexpensive
It is already set by both Linux and Hurd.
| -rw-r--r-- | libio/libio.h | 11 | ||||
| -rw-r--r-- | sysdeps/mach/libc-lock.h | 3 | ||||
| -rw-r--r-- | sysdeps/nptl/stdio-lock.h | 3 |
3 files changed, 2 insertions, 15 deletions
diff --git a/libio/libio.h b/libio/libio.h index 98d526d..cebdc65 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -280,17 +280,10 @@ libc_hidden_proto (_IO_sgetn) # undef _IO_ftrylockfile # define _IO_peekc(_fp) _IO_peekc_locked (_fp) -# if _IO_lock_inexpensive -# define _IO_flockfile(_fp) \ +# define _IO_flockfile(_fp) \ if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_lock_lock (*(_fp)->_lock) -# define _IO_funlockfile(_fp) \ +# define _IO_funlockfile(_fp) \ if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_lock_unlock (*(_fp)->_lock) -# else -# define _IO_flockfile(_fp) \ - if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_flockfile (_fp) -# define _IO_funlockfile(_fp) \ - if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_funlockfile (_fp) -# endif #endif /* _IO_MTSAFE_IO */ #endif /* _LIBIO_H */ diff --git a/sysdeps/mach/libc-lock.h b/sysdeps/mach/libc-lock.h index d713f34..220fcee 100644 --- a/sysdeps/mach/libc-lock.h +++ b/sysdeps/mach/libc-lock.h @@ -24,9 +24,6 @@ #include <tls.h> #include <lowlevellock.h> -/* The locking here is very inexpensive, even for inlining. */ -#define _IO_lock_inexpensive 1 - typedef unsigned int __libc_lock_t; typedef struct { diff --git a/sysdeps/nptl/stdio-lock.h b/sysdeps/nptl/stdio-lock.h index f2eee49..a4f419b 100644 --- a/sysdeps/nptl/stdio-lock.h +++ b/sysdeps/nptl/stdio-lock.h @@ -23,9 +23,6 @@ #include <lowlevellock.h> -/* The locking here is very inexpensive, even for inlining. */ -#define _IO_lock_inexpensive 1 - typedef struct { int lock; int cnt; void *owner; } _IO_lock_t; #define _IO_lock_t_defined 1 |