diff options
| -rw-r--r-- | libc/arch-riscv64/dynamic_function_dispatch.cpp | 2 | ||||
| -rw-r--r-- | libc/bionic/pthread_rwlock.cpp | 5 | ||||
| -rw-r--r-- | libc/malloc_debug/malloc_debug.cpp | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libc/arch-riscv64/dynamic_function_dispatch.cpp b/libc/arch-riscv64/dynamic_function_dispatch.cpp index 265ce3ee6..bb2ba5101 100644 --- a/libc/arch-riscv64/dynamic_function_dispatch.cpp +++ b/libc/arch-riscv64/dynamic_function_dispatch.cpp @@ -35,7 +35,7 @@ extern "C" { -static __always_inline int ifunc_faccessat(int dir_fd, const char* path, int mode) { +static inline __always_inline int ifunc_faccessat(int dir_fd, const char* path, int mode) { register long a0 __asm__("a0") = dir_fd; register long a1 __asm__("a1") = reinterpret_cast<long>(path); register long a2 __asm__("a2") = mode; diff --git a/libc/bionic/pthread_rwlock.cpp b/libc/bionic/pthread_rwlock.cpp index ebf6697a0..6f3c6feb8 100644 --- a/libc/bionic/pthread_rwlock.cpp +++ b/libc/bionic/pthread_rwlock.cpp @@ -69,11 +69,12 @@ #define RWLOCKATTR_KIND_MASK 2 #define RWLOCKATTR_RESERVED_MASK (~3) -static inline __always_inline __always_inline bool __rwlockattr_getpshared(const pthread_rwlockattr_t* attr) { +static inline __always_inline bool __rwlockattr_getpshared(const pthread_rwlockattr_t* attr) { return (*attr & RWLOCKATTR_PSHARED_MASK) >> RWLOCKATTR_PSHARED_SHIFT; } -static inline __always_inline __always_inline void __rwlockattr_setpshared(pthread_rwlockattr_t* attr, int pshared) { +static inline __always_inline void __rwlockattr_setpshared(pthread_rwlockattr_t* attr, + int pshared) { *attr = (*attr & ~RWLOCKATTR_PSHARED_MASK) | (pshared << RWLOCKATTR_PSHARED_SHIFT); } diff --git a/libc/malloc_debug/malloc_debug.cpp b/libc/malloc_debug/malloc_debug.cpp index 3731a5d26..b66b8e27f 100644 --- a/libc/malloc_debug/malloc_debug.cpp +++ b/libc/malloc_debug/malloc_debug.cpp @@ -70,7 +70,7 @@ bool* g_zygote_child; const MallocDispatch* g_dispatch; -static __always_inline uint64_t Nanotime() { +static inline __always_inline uint64_t Nanotime() { struct timespec t = {}; clock_gettime(CLOCK_MONOTONIC, &t); return static_cast<uint64_t>(t.tv_sec) * 1000000000LL + t.tv_nsec; |