commit 07c85f1688182bec2aa21a2195997e7893ad6a4d
author Victor Khimenko <khim@google.com> Mon Sep 28 20:46:50 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 28 20:46:50 2020 +0000
tree 3424c0411a26ebd0235db71f4727e02f17cc783d
parent d510f2273209fec81f7b5d457e72cd75a5bc34dd
parent 6427f39ba9a77ba6d83de5f9b79fedc66edf5522

Merge "Make __clone_for_fork pure native bridge mode abstraction"

libc/bionic/fork.cpp

diff --git a/libc/bionic/fork.cpp b/libc/bionic/fork.cpp
index 5bc7d3f..8c5cf2b 100644
--- a/libc/bionic/fork.cpp
+++ b/libc/bionic/fork.cpp
@@ -33,8 +33,8 @@
 #include "private/bionic_defs.h"
 #include "pthread_internal.h"
 
-__BIONIC_WEAK_FOR_NATIVE_BRIDGE
-extern "C" __LIBC_HIDDEN__ int __clone_for_fork() {
+__BIONIC_WEAK_FOR_NATIVE_BRIDGE_INLINE
+int __clone_for_fork() {
   pthread_internal_t* self = __get_thread();
 
   int result = clone(nullptr, nullptr, (CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD),

libc/private/bionic_defs.h

diff --git a/libc/private/bionic_defs.h b/libc/private/bionic_defs.h
index c0ae1b0..5a48f25 100644
--- a/libc/private/bionic_defs.h
+++ b/libc/private/bionic_defs.h
@@ -36,9 +36,12 @@
 #ifdef __ANDROID_NATIVE_BRIDGE__
 #define __BIONIC_WEAK_FOR_NATIVE_BRIDGE __attribute__((__weak__, __noinline__))
 #define __BIONIC_WEAK_VARIABLE_FOR_NATIVE_BRIDGE __attribute__((__weak__))
+#define __BIONIC_WEAK_FOR_NATIVE_BRIDGE_INLINE \
+  __BIONIC_WEAK_FOR_NATIVE_BRIDGE extern "C" __LIBC_HIDDEN__
 #else
 #define __BIONIC_WEAK_FOR_NATIVE_BRIDGE
 #define __BIONIC_WEAK_VARIABLE_FOR_NATIVE_BRIDGE
+#define __BIONIC_WEAK_FOR_NATIVE_BRIDGE_INLINE static inline
 #endif
 
 #endif /* __BIONIC_PRIVATE_BIONIC_DEFS_H_ */