tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Clean up __always_inline" into main am: 0b1161d9b5

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3047052

Change-Id: I0d34c45bcef8ef91b20bec04670faea3445fec30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-04-17 20:46:29 +00:00 committed by Automerger Merge Worker
commit 965f3b9858
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libc/arch-riscv64/dynamic_function_dispatch.cpp
View file

@ -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;

5
libc/bionic/pthread_rwlock.cpp
View file

@ -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);
}

2
libc/malloc_debug/malloc_debug.cpp
View file

@ -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;