generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Hide __atexit

Browse Source 
Bug: http://b/21640806
Change-Id: I778b35c8c7538859179e97fcf5a82db2fcd9e50f
(cherry picked from commit 9cf6fc304bbbfb26911e0b624b80d862c40b0308)
This commit is contained in:
Dmitriy Ivanov 2015-06-04 14:33:18 -07:00
parent f2e86cd980
commit c534603f8d
3 changed files with 12 additions and 15 deletions
libc
stdlib
atexit.catexit.h
upstream-openbsd/android/include
openbsd-compat.h

13
libc/stdlib/atexit.c

@ -37,7 +37,18 @@
#include "atexit.h"
#include "private/thread_private.h"
struct atexit *__atexit;
struct atexit {
struct atexit *next; /* next in list */
int ind; /* next index in this table */
int max; /* max entries >= ATEXIT_SIZE */
struct atexit_fn {
void (*fn_ptr)(void *);
void *fn_arg; /* argument for CXA callback */
void *fn_dso; /* shared module handle */
} fns[1]; /* the table itself */
};
static struct atexit *__atexit;
static int restartloop;
/* BEGIN android-changed: __unregister_atfork is used by __cxa_finalize */

13
libc/stdlib/atexit.h

@ -30,18 +30,5 @@
*
*/
struct atexit {
struct atexit *next; /* next in list */
int ind; /* next index in this table */
int max; /* max entries >= ATEXIT_SIZE */
struct atexit_fn {
void (*fn_ptr)(void *);
void *fn_arg; /* argument for CXA callback */
void *fn_dso; /* shared module handle */
} fns[1]; /* the table itself */
};
extern struct atexit *__atexit; /* points to head of LIFO stack */
int __cxa_atexit(void (*)(void *), void *, void *);
void __cxa_finalize(void *);

1
libc/upstream-openbsd/android/include/openbsd-compat.h

@ -74,7 +74,6 @@ __LIBC_HIDDEN__ void* reallocarray(void*, size_t, size_t);
__LIBC64_HIDDEN__ extern const short* _tolower_tab_;
__LIBC64_HIDDEN__ extern const short* _toupper_tab_;
__LIBC_HIDDEN__ extern struct atexit* __atexit;
__LIBC_HIDDEN__ extern const char _C_ctype_[];
__LIBC_HIDDEN__ extern const short _C_toupper_[];
__LIBC_HIDDEN__ extern const short _C_tolower_[];