From 788a2bc756fdc3dbaf0d2622ba47fccdfd8e6f01 Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Mon, 21 Dec 2015 23:26:53 -0800 Subject: [PATCH] Make some of unwanted symbols LIBC_PRIVATE Bug: http://b/26274444 Change-Id: Ic66f6519a974b72779071235c1d0dd36655fd1b9 --- libc/libc.arm.brillo.map | 34 ++++++++++++------------ libc/libc.arm.map | 54 +++++++++++++++++++-------------------- libc/libc.arm64.map | 4 +-- libc/libc.map.txt | 54 +++++++++++++++++++-------------------- libc/libc.mips.brillo.map | 34 ++++++++++++------------ libc/libc.mips.map | 54 +++++++++++++++++++-------------------- libc/libc.mips64.map | 4 +-- libc/libc.x86.brillo.map | 34 ++++++++++++------------ libc/libc.x86.map | 54 +++++++++++++++++++-------------------- libc/libc.x86_64.map | 4 +-- 10 files changed, 165 insertions(+), 165 deletions(-) diff --git a/libc/libc.arm.brillo.map b/libc/libc.arm.brillo.map index 690d9b295..8cbff2b39 100644 --- a/libc/libc.arm.brillo.map +++ b/libc/libc.arm.brillo.map @@ -44,7 +44,6 @@ LIBC { __get_h_errno; __getcpu; # arm x86 mips __getcwd; # arm x86 mips - __getdents64; # arm x86 mips __getpid; # arm x86 mips __getpriority; # arm x86 mips __gnu_basename; @@ -161,24 +160,14 @@ LIBC { __sched_cpucount; __sched_cpufree; __sched_getaffinity; # arm x86 mips - __sclose; # arm x86 mips __set_tid_address; # arm x86 mips __set_tls; # arm mips __sF; - __sflags; # arm x86 mips - __sflush; # arm x86 mips - __sfp; # arm x86 mips - __sglue; # arm x86 mips __sigaction; # arm x86 mips __signalfd4; # arm x86 mips - __smakebuf; # arm x86 mips __snprintf_chk; __socket; # arm x86 mips __sprintf_chk; - __sread; # arm x86 mips - __srefill; # arm x86 mips - __srget; # arm x86 mips - __sseek; # arm x86 mips __stack_chk_fail; __stack_chk_guard; __statfs64; # arm x86 mips @@ -195,9 +184,6 @@ LIBC { __strncpy_chk; __strncpy_chk2; __strrchr_chk; - __swbuf; # arm x86 mips - __swrite; # arm x86 mips - __swsetup; # arm x86 mips __sym_ntop; __sym_ntos; __sym_ston; @@ -229,7 +215,6 @@ LIBC { _Exit; _exit; _flushlbf; - _fwalk; # arm x86 mips _getlong; _getshort; _longjmp; @@ -405,7 +390,6 @@ LIBC { fputws; fread; free; - free_malloc_leak_info; freeaddrinfo; freelocale; fremovexattr; @@ -446,7 +430,6 @@ LIBC { fwscanf; gai_strerror; get_avphys_pages; - get_malloc_leak_info; get_nprocs; get_nprocs_conf; get_phys_pages; @@ -1357,6 +1340,7 @@ LIBC_PRIVATE { __floatunsidf; # arm __floatunsisf; # arm __gedf2; # arm + __getdents64; # arm x86 mips __gnu_ldivmod_helper; # arm __gnu_uldivmod_helper; # arm __gnu_Unwind_Backtrace; # arm @@ -1388,13 +1372,27 @@ LIBC_PRIVATE { __popcount_tab; # arm __popcountsi2; # arm x86 mips __restore_core_regs; # arm + __sclose; # arm x86 mips + __sflags; # arm x86 mips + __sflush; # arm x86 mips + __sfp; # arm x86 mips + __sglue; # arm x86 mips + __smakebuf; # arm x86 mips + __sread; # arm x86 mips + __srefill; # arm x86 mips + __srget; # arm x86 mips + __sseek; # arm x86 mips __subdf3; # arm __subsf3; # arm + __swbuf; # arm x86 mips + __swrite; # arm x86 mips + __swsetup; # arm x86 mips __truncdfsf2; # arm __udivdi3; # arm x86 mips __udivsi3; # arm __unorddf2; # arm __unordsf2; # arm + _fwalk; # arm x86 mips _Unwind_Backtrace; # arm _Unwind_Complete; # arm _Unwind_DeleteException; # arm @@ -1411,6 +1409,8 @@ LIBC_PRIVATE { _Unwind_VRS_Pop; # arm _Unwind_VRS_Set; # arm atexit; # arm + free_malloc_leak_info; + get_malloc_leak_info; gMallocLeakZygoteChild; restore_core_regs; # arm SHA1Final; # arm x86 mips diff --git a/libc/libc.arm.map b/libc/libc.arm.map index 5d36376ce..ab40c68b1 100644 --- a/libc/libc.arm.map +++ b/libc/libc.arm.map @@ -40,15 +40,10 @@ LIBC { __freadable; __fsetlocking; __fstatfs64; # arm x86 mips - __futex_wait; # arm x86 mips nobrillo - __futex_wake; # arm x86 mips nobrillo __fwritable; __get_h_errno; - __get_thread; # arm x86 mips nobrillo - __get_tls; # arm x86 mips nobrillo __getcpu; # arm x86 mips __getcwd; # arm x86 mips - __getdents64; # arm x86 mips __getpid; # arm x86 mips __getpriority; # arm x86 mips __gnu_basename; @@ -102,7 +97,6 @@ LIBC { __ns_skiprr; # arm x86 mips __ns_sprintrr; # arm x86 mips __ns_sprintrrf; # arm x86 mips - __open; # arm x86 mips nobrillo __open_2; __openat; # arm x86 mips __openat_2; @@ -119,8 +113,6 @@ LIBC { __p_time; __p_type; __p_type_syms; - __page_shift; # arm x86 mips nobrillo - __page_size; # arm x86 mips nobrillo __poll_chk; __ppoll; # arm x86 mips __ppoll_chk; @@ -169,27 +161,15 @@ LIBC { __sched_cpucount; __sched_cpufree; __sched_getaffinity; # arm x86 mips - __sclose; # arm x86 mips - __sdidinit; # arm x86 mips nobrillo __set_errno; # arm x86 mips nobrillo __set_tid_address; # arm x86 mips __set_tls; # arm mips __sF; - __sflags; # arm x86 mips - __sflush; # arm x86 mips - __sfp; # arm x86 mips - __sglue; # arm x86 mips __sigaction; # arm x86 mips __signalfd4; # arm x86 mips - __sinit; # arm x86 mips nobrillo - __smakebuf; # arm x86 mips __snprintf_chk; __socket; # arm x86 mips __sprintf_chk; - __sread; # arm x86 mips - __srefill; # arm x86 mips - __srget; # arm x86 mips - __sseek; # arm x86 mips __stack_chk_fail; __stack_chk_guard; __statfs64; # arm x86 mips @@ -206,9 +186,6 @@ LIBC { __strncpy_chk; __strncpy_chk2; __strrchr_chk; - __swbuf; # arm x86 mips - __swrite; # arm x86 mips - __swsetup; # arm x86 mips __sym_ntop; __sym_ntos; __sym_ston; @@ -235,13 +212,11 @@ LIBC { __umask_chk; __vsnprintf_chk; __vsprintf_chk; - __wait4; # arm x86 mips nobrillo __waitid; # arm x86 mips _ctype_; _Exit; _exit; _flushlbf; - _fwalk; # arm x86 mips _getlong; _getshort; _longjmp; @@ -423,7 +398,6 @@ LIBC { fputws; fread; free; - free_malloc_leak_info; freeaddrinfo; freelocale; fremovexattr; @@ -465,7 +439,6 @@ LIBC { fwscanf; gai_strerror; get_avphys_pages; - get_malloc_leak_info; get_nprocs; get_nprocs_conf; get_phys_pages; @@ -1390,7 +1363,12 @@ LIBC_PRIVATE { __floatundisf; # arm __floatunsidf; # arm __floatunsisf; # arm + __futex_wait; # arm x86 mips nobrillo + __futex_wake; # arm x86 mips nobrillo __gedf2; # arm + __get_thread; # arm x86 mips nobrillo + __get_tls; # arm x86 mips nobrillo + __getdents64; # arm x86 mips __gnu_ldivmod_helper; # arm __gnu_uldivmod_helper; # arm __gnu_Unwind_Backtrace; # arm @@ -1419,16 +1397,36 @@ LIBC_PRIVATE { __muldi3; # arm __mulsf3; # arm __nedf2; # arm + __open; # arm x86 mips nobrillo + __page_shift; # arm x86 mips nobrillo + __page_size; # arm x86 mips nobrillo __popcount_tab; # arm __popcountsi2; # arm x86 mips __restore_core_regs; # arm + __sclose; # arm x86 mips + __sdidinit; # arm x86 mips nobrillo + __sflags; # arm x86 mips + __sflush; # arm x86 mips + __sfp; # arm x86 mips + __sglue; # arm x86 mips + __sinit; # arm x86 mips nobrillo + __smakebuf; # arm x86 mips + __sread; # arm x86 mips + __srefill; # arm x86 mips + __srget; # arm x86 mips + __sseek; # arm x86 mips __subdf3; # arm __subsf3; # arm + __swbuf; # arm x86 mips + __swrite; # arm x86 mips + __swsetup; # arm x86 mips __truncdfsf2; # arm __udivdi3; # arm x86 mips __udivsi3; # arm __unorddf2; # arm __unordsf2; # arm + __wait4; # arm x86 mips nobrillo + _fwalk; # arm x86 mips _Unwind_Backtrace; # arm _Unwind_Complete; # arm _Unwind_DeleteException; # arm @@ -1449,6 +1447,8 @@ LIBC_PRIVATE { dlmalloc_inspect_all; # arm x86 mips nobrillo dlmalloc_trim; # arm x86 mips nobrillo dlmalloc_usable_size; # arm x86 mips nobrillo + free_malloc_leak_info; + get_malloc_leak_info; gMallocLeakZygoteChild; restore_core_regs; # arm SHA1Final; # arm x86 mips diff --git a/libc/libc.arm64.map b/libc/libc.arm64.map index 8fa46a84c..e54bef622 100644 --- a/libc/libc.arm64.map +++ b/libc/libc.arm64.map @@ -316,7 +316,6 @@ LIBC { fputws; fread; free; - free_malloc_leak_info; freeaddrinfo; freelocale; fremovexattr; @@ -357,7 +356,6 @@ LIBC { fwscanf; gai_strerror; get_avphys_pages; - get_malloc_leak_info; get_nprocs; get_nprocs_conf; get_phys_pages; @@ -1181,5 +1179,7 @@ LIBC_N { LIBC_PRIVATE { global: + free_malloc_leak_info; + get_malloc_leak_info; gMallocLeakZygoteChild; } LIBC_N; diff --git a/libc/libc.map.txt b/libc/libc.map.txt index 447b90771..c738ee4c9 100644 --- a/libc/libc.map.txt +++ b/libc/libc.map.txt @@ -40,15 +40,10 @@ LIBC { __freadable; __fsetlocking; __fstatfs64; # arm x86 mips - __futex_wait; # arm x86 mips nobrillo - __futex_wake; # arm x86 mips nobrillo __fwritable; __get_h_errno; - __get_thread; # arm x86 mips nobrillo - __get_tls; # arm x86 mips nobrillo __getcpu; # arm x86 mips __getcwd; # arm x86 mips - __getdents64; # arm x86 mips __getpid; # arm x86 mips __getpriority; # arm x86 mips __gnu_basename; @@ -103,7 +98,6 @@ LIBC { __ns_skiprr; # arm x86 mips __ns_sprintrr; # arm x86 mips __ns_sprintrrf; # arm x86 mips - __open; # arm x86 mips nobrillo __open_2; __openat; # arm x86 mips __openat_2; @@ -120,8 +114,6 @@ LIBC { __p_time; __p_type; __p_type_syms; - __page_shift; # arm x86 mips nobrillo - __page_size; # arm x86 mips nobrillo __poll_chk; __ppoll; # arm x86 mips __ppoll_chk; @@ -170,28 +162,16 @@ LIBC { __sched_cpucount; __sched_cpufree; __sched_getaffinity; # arm x86 mips - __sclose; # arm x86 mips - __sdidinit; # arm x86 mips nobrillo __set_errno; # arm x86 mips nobrillo __set_thread_area; # x86 __set_tid_address; # arm x86 mips __set_tls; # arm mips __sF; - __sflags; # arm x86 mips - __sflush; # arm x86 mips - __sfp; # arm x86 mips - __sglue; # arm x86 mips __sigaction; # arm x86 mips __signalfd4; # arm x86 mips - __sinit; # arm x86 mips nobrillo - __smakebuf; # arm x86 mips __snprintf_chk; __socket; # arm x86 mips __sprintf_chk; - __sread; # arm x86 mips - __srefill; # arm x86 mips - __srget; # arm x86 mips - __sseek; # arm x86 mips __stack_chk_fail; __stack_chk_guard; __statfs64; # arm x86 mips @@ -208,9 +188,6 @@ LIBC { __strncpy_chk; __strncpy_chk2; __strrchr_chk; - __swbuf; # arm x86 mips - __swrite; # arm x86 mips - __swsetup; # arm x86 mips __sym_ntop; __sym_ntos; __sym_ston; @@ -237,14 +214,12 @@ LIBC { __umask_chk; __vsnprintf_chk; __vsprintf_chk; - __wait4; # arm x86 mips nobrillo __waitid; # arm x86 mips _ctype_; _Exit; _exit; _flush_cache; # mips _flushlbf; - _fwalk; # arm x86 mips _getlong; _getshort; _longjmp; @@ -426,7 +401,6 @@ LIBC { fputws; fread; free; - free_malloc_leak_info; freeaddrinfo; freelocale; fremovexattr; @@ -468,7 +442,6 @@ LIBC { fwscanf; gai_strerror; get_avphys_pages; - get_malloc_leak_info; get_nprocs; get_nprocs_conf; get_phys_pages; @@ -1416,7 +1389,12 @@ LIBC_PRIVATE { __floatundisf; # arm __floatunsidf; # arm __floatunsisf; # arm + __futex_wait; # arm x86 mips nobrillo + __futex_wake; # arm x86 mips nobrillo __gedf2; # arm + __get_thread; # arm x86 mips nobrillo + __get_tls; # arm x86 mips nobrillo + __getdents64; # arm x86 mips __gnu_ldivmod_helper; # arm __gnu_uldivmod_helper; # arm __gnu_Unwind_Backtrace; # arm @@ -1445,17 +1423,37 @@ LIBC_PRIVATE { __muldi3; # arm __mulsf3; # arm __nedf2; # arm + __open; # arm x86 mips nobrillo + __page_shift; # arm x86 mips nobrillo + __page_size; # arm x86 mips nobrillo __popcount_tab; # arm __popcountsi2; # arm x86 mips __restore_core_regs; # arm + __sclose; # arm x86 mips + __sdidinit; # arm x86 mips nobrillo + __sflags; # arm x86 mips + __sflush; # arm x86 mips + __sfp; # arm x86 mips + __sglue; # arm x86 mips + __sinit; # arm x86 mips nobrillo + __smakebuf; # arm x86 mips + __sread; # arm x86 mips + __srefill; # arm x86 mips + __srget; # arm x86 mips + __sseek; # arm x86 mips __subdf3; # arm __subsf3; # arm + __swbuf; # arm x86 mips + __swrite; # arm x86 mips + __swsetup; # arm x86 mips __truncdfsf2; # arm __udivdi3; # arm x86 mips __udivsi3; # arm __umoddi3; # x86 mips __unorddf2; # arm __unordsf2; # arm + __wait4; # arm x86 mips nobrillo + _fwalk; # arm x86 mips _Unwind_Backtrace; # arm _Unwind_Complete; # arm _Unwind_DeleteException; # arm @@ -1476,6 +1474,8 @@ LIBC_PRIVATE { dlmalloc_inspect_all; # arm x86 mips nobrillo dlmalloc_trim; # arm x86 mips nobrillo dlmalloc_usable_size; # arm x86 mips nobrillo + free_malloc_leak_info; + get_malloc_leak_info; gMallocLeakZygoteChild; restore_core_regs; # arm SHA1Final; # arm x86 mips diff --git a/libc/libc.mips.brillo.map b/libc/libc.mips.brillo.map index 382eee3e9..709ffd9a5 100644 --- a/libc/libc.mips.brillo.map +++ b/libc/libc.mips.brillo.map @@ -41,7 +41,6 @@ LIBC { __get_h_errno; __getcpu; # arm x86 mips __getcwd; # arm x86 mips - __getdents64; # arm x86 mips __getpid; # arm x86 mips __getpriority; # arm x86 mips __gnu_basename; @@ -159,24 +158,14 @@ LIBC { __sched_cpucount; __sched_cpufree; __sched_getaffinity; # arm x86 mips - __sclose; # arm x86 mips __set_tid_address; # arm x86 mips __set_tls; # arm mips __sF; - __sflags; # arm x86 mips - __sflush; # arm x86 mips - __sfp; # arm x86 mips - __sglue; # arm x86 mips __sigaction; # arm x86 mips __signalfd4; # arm x86 mips - __smakebuf; # arm x86 mips __snprintf_chk; __socket; # arm x86 mips __sprintf_chk; - __sread; # arm x86 mips - __srefill; # arm x86 mips - __srget; # arm x86 mips - __sseek; # arm x86 mips __stack_chk_fail; __stack_chk_guard; __statfs64; # arm x86 mips @@ -193,9 +182,6 @@ LIBC { __strncpy_chk; __strncpy_chk2; __strrchr_chk; - __swbuf; # arm x86 mips - __swrite; # arm x86 mips - __swsetup; # arm x86 mips __sym_ntop; __sym_ntos; __sym_ston; @@ -228,7 +214,6 @@ LIBC { _exit; _flush_cache; # mips _flushlbf; - _fwalk; # arm x86 mips _getlong; _getshort; _longjmp; @@ -404,7 +389,6 @@ LIBC { fputws; fread; free; - free_malloc_leak_info; freeaddrinfo; freelocale; fremovexattr; @@ -445,7 +429,6 @@ LIBC { fwscanf; gai_strerror; get_avphys_pages; - get_malloc_leak_info; get_nprocs; get_nprocs_conf; get_phys_pages; @@ -1265,9 +1248,26 @@ LIBC_PRIVATE { __accept4; # arm x86 mips __bionic_brk; # arm x86 mips __divdi3; # arm x86 mips + __getdents64; # arm x86 mips __popcountsi2; # arm x86 mips + __sclose; # arm x86 mips + __sflags; # arm x86 mips + __sflush; # arm x86 mips + __sfp; # arm x86 mips + __sglue; # arm x86 mips + __smakebuf; # arm x86 mips + __sread; # arm x86 mips + __srefill; # arm x86 mips + __srget; # arm x86 mips + __sseek; # arm x86 mips + __swbuf; # arm x86 mips + __swrite; # arm x86 mips + __swsetup; # arm x86 mips __udivdi3; # arm x86 mips __umoddi3; # x86 mips + _fwalk; # arm x86 mips + free_malloc_leak_info; + get_malloc_leak_info; gMallocLeakZygoteChild; SHA1Final; # arm x86 mips SHA1Init; # arm x86 mips diff --git a/libc/libc.mips.map b/libc/libc.mips.map index 488dfa8a9..a80e70c6b 100644 --- a/libc/libc.mips.map +++ b/libc/libc.mips.map @@ -37,15 +37,10 @@ LIBC { __freadable; __fsetlocking; __fstatfs64; # arm x86 mips - __futex_wait; # arm x86 mips nobrillo - __futex_wake; # arm x86 mips nobrillo __fwritable; __get_h_errno; - __get_thread; # arm x86 mips nobrillo - __get_tls; # arm x86 mips nobrillo __getcpu; # arm x86 mips __getcwd; # arm x86 mips - __getdents64; # arm x86 mips __getpid; # arm x86 mips __getpriority; # arm x86 mips __gnu_basename; @@ -100,7 +95,6 @@ LIBC { __ns_skiprr; # arm x86 mips __ns_sprintrr; # arm x86 mips __ns_sprintrrf; # arm x86 mips - __open; # arm x86 mips nobrillo __open_2; __openat; # arm x86 mips __openat_2; @@ -117,8 +111,6 @@ LIBC { __p_time; __p_type; __p_type_syms; - __page_shift; # arm x86 mips nobrillo - __page_size; # arm x86 mips nobrillo __poll_chk; __ppoll; # arm x86 mips __ppoll_chk; @@ -167,27 +159,15 @@ LIBC { __sched_cpucount; __sched_cpufree; __sched_getaffinity; # arm x86 mips - __sclose; # arm x86 mips - __sdidinit; # arm x86 mips nobrillo __set_errno; # arm x86 mips nobrillo __set_tid_address; # arm x86 mips __set_tls; # arm mips __sF; - __sflags; # arm x86 mips - __sflush; # arm x86 mips - __sfp; # arm x86 mips - __sglue; # arm x86 mips __sigaction; # arm x86 mips __signalfd4; # arm x86 mips - __sinit; # arm x86 mips nobrillo - __smakebuf; # arm x86 mips __snprintf_chk; __socket; # arm x86 mips __sprintf_chk; - __sread; # arm x86 mips - __srefill; # arm x86 mips - __srget; # arm x86 mips - __sseek; # arm x86 mips __stack_chk_fail; __stack_chk_guard; __statfs64; # arm x86 mips @@ -204,9 +184,6 @@ LIBC { __strncpy_chk; __strncpy_chk2; __strrchr_chk; - __swbuf; # arm x86 mips - __swrite; # arm x86 mips - __swsetup; # arm x86 mips __sym_ntop; __sym_ntos; __sym_ston; @@ -233,14 +210,12 @@ LIBC { __umask_chk; __vsnprintf_chk; __vsprintf_chk; - __wait4; # arm x86 mips nobrillo __waitid; # arm x86 mips _ctype_; _Exit; _exit; _flush_cache; # mips _flushlbf; - _fwalk; # arm x86 mips _getlong; _getshort; _longjmp; @@ -422,7 +397,6 @@ LIBC { fputws; fread; free; - free_malloc_leak_info; freeaddrinfo; freelocale; fremovexattr; @@ -464,7 +438,6 @@ LIBC { fwscanf; gai_strerror; get_avphys_pages; - get_malloc_leak_info; get_nprocs; get_nprocs_conf; get_phys_pages; @@ -1299,13 +1272,40 @@ LIBC_PRIVATE { __accept4; # arm x86 mips __bionic_brk; # arm x86 mips __divdi3; # arm x86 mips + __futex_wait; # arm x86 mips nobrillo + __futex_wake; # arm x86 mips nobrillo + __get_thread; # arm x86 mips nobrillo + __get_tls; # arm x86 mips nobrillo + __getdents64; # arm x86 mips + __open; # arm x86 mips nobrillo + __page_shift; # arm x86 mips nobrillo + __page_size; # arm x86 mips nobrillo __popcountsi2; # arm x86 mips + __sclose; # arm x86 mips + __sdidinit; # arm x86 mips nobrillo + __sflags; # arm x86 mips + __sflush; # arm x86 mips + __sfp; # arm x86 mips + __sglue; # arm x86 mips + __sinit; # arm x86 mips nobrillo + __smakebuf; # arm x86 mips + __sread; # arm x86 mips + __srefill; # arm x86 mips + __srget; # arm x86 mips + __sseek; # arm x86 mips + __swbuf; # arm x86 mips + __swrite; # arm x86 mips + __swsetup; # arm x86 mips __udivdi3; # arm x86 mips __umoddi3; # x86 mips + __wait4; # arm x86 mips nobrillo + _fwalk; # arm x86 mips dlmalloc; # arm x86 mips nobrillo dlmalloc_inspect_all; # arm x86 mips nobrillo dlmalloc_trim; # arm x86 mips nobrillo dlmalloc_usable_size; # arm x86 mips nobrillo + free_malloc_leak_info; + get_malloc_leak_info; gMallocLeakZygoteChild; SHA1Final; # arm x86 mips SHA1Init; # arm x86 mips diff --git a/libc/libc.mips64.map b/libc/libc.mips64.map index 8fa46a84c..e54bef622 100644 --- a/libc/libc.mips64.map +++ b/libc/libc.mips64.map @@ -316,7 +316,6 @@ LIBC { fputws; fread; free; - free_malloc_leak_info; freeaddrinfo; freelocale; fremovexattr; @@ -357,7 +356,6 @@ LIBC { fwscanf; gai_strerror; get_avphys_pages; - get_malloc_leak_info; get_nprocs; get_nprocs_conf; get_phys_pages; @@ -1181,5 +1179,7 @@ LIBC_N { LIBC_PRIVATE { global: + free_malloc_leak_info; + get_malloc_leak_info; gMallocLeakZygoteChild; } LIBC_N; diff --git a/libc/libc.x86.brillo.map b/libc/libc.x86.brillo.map index 2b5cd78dd..82df4a4d0 100644 --- a/libc/libc.x86.brillo.map +++ b/libc/libc.x86.brillo.map @@ -41,7 +41,6 @@ LIBC { __get_h_errno; __getcpu; # arm x86 mips __getcwd; # arm x86 mips - __getdents64; # arm x86 mips __getpid; # arm x86 mips __getpriority; # arm x86 mips __gnu_basename; @@ -159,24 +158,14 @@ LIBC { __sched_cpucount; __sched_cpufree; __sched_getaffinity; # arm x86 mips - __sclose; # arm x86 mips __set_thread_area; # x86 __set_tid_address; # arm x86 mips __sF; - __sflags; # arm x86 mips - __sflush; # arm x86 mips - __sfp; # arm x86 mips - __sglue; # arm x86 mips __sigaction; # arm x86 mips __signalfd4; # arm x86 mips - __smakebuf; # arm x86 mips __snprintf_chk; __socket; # arm x86 mips __sprintf_chk; - __sread; # arm x86 mips - __srefill; # arm x86 mips - __srget; # arm x86 mips - __sseek; # arm x86 mips __stack_chk_fail; __stack_chk_guard; __statfs64; # arm x86 mips @@ -193,9 +182,6 @@ LIBC { __strncpy_chk; __strncpy_chk2; __strrchr_chk; - __swbuf; # arm x86 mips - __swrite; # arm x86 mips - __swsetup; # arm x86 mips __sym_ntop; __sym_ntos; __sym_ston; @@ -227,7 +213,6 @@ LIBC { _Exit; _exit; _flushlbf; - _fwalk; # arm x86 mips _getlong; _getshort; _longjmp; @@ -402,7 +387,6 @@ LIBC { fputws; fread; free; - free_malloc_leak_info; freeaddrinfo; freelocale; fremovexattr; @@ -443,7 +427,6 @@ LIBC { fwscanf; gai_strerror; get_avphys_pages; - get_malloc_leak_info; get_nprocs; get_nprocs_conf; get_phys_pages; @@ -1264,9 +1247,26 @@ LIBC_PRIVATE { __bionic_brk; # arm x86 mips __bionic_libgcc_compat_symbols; # arm x86 __divdi3; # arm x86 mips + __getdents64; # arm x86 mips __popcountsi2; # arm x86 mips + __sclose; # arm x86 mips + __sflags; # arm x86 mips + __sflush; # arm x86 mips + __sfp; # arm x86 mips + __sglue; # arm x86 mips + __smakebuf; # arm x86 mips + __sread; # arm x86 mips + __srefill; # arm x86 mips + __srget; # arm x86 mips + __sseek; # arm x86 mips + __swbuf; # arm x86 mips + __swrite; # arm x86 mips + __swsetup; # arm x86 mips __udivdi3; # arm x86 mips __umoddi3; # x86 mips + _fwalk; # arm x86 mips + free_malloc_leak_info; + get_malloc_leak_info; gMallocLeakZygoteChild; SHA1Final; # arm x86 mips SHA1Init; # arm x86 mips diff --git a/libc/libc.x86.map b/libc/libc.x86.map index 990dd96c1..e0446537a 100644 --- a/libc/libc.x86.map +++ b/libc/libc.x86.map @@ -37,15 +37,10 @@ LIBC { __freadable; __fsetlocking; __fstatfs64; # arm x86 mips - __futex_wait; # arm x86 mips nobrillo - __futex_wake; # arm x86 mips nobrillo __fwritable; __get_h_errno; - __get_thread; # arm x86 mips nobrillo - __get_tls; # arm x86 mips nobrillo __getcpu; # arm x86 mips __getcwd; # arm x86 mips - __getdents64; # arm x86 mips __getpid; # arm x86 mips __getpriority; # arm x86 mips __gnu_basename; @@ -100,7 +95,6 @@ LIBC { __ns_skiprr; # arm x86 mips __ns_sprintrr; # arm x86 mips __ns_sprintrrf; # arm x86 mips - __open; # arm x86 mips nobrillo __open_2; __openat; # arm x86 mips __openat_2; @@ -117,8 +111,6 @@ LIBC { __p_time; __p_type; __p_type_syms; - __page_shift; # arm x86 mips nobrillo - __page_size; # arm x86 mips nobrillo __poll_chk; __ppoll; # arm x86 mips __ppoll_chk; @@ -167,27 +159,15 @@ LIBC { __sched_cpucount; __sched_cpufree; __sched_getaffinity; # arm x86 mips - __sclose; # arm x86 mips - __sdidinit; # arm x86 mips nobrillo __set_errno; # arm x86 mips nobrillo __set_thread_area; # x86 __set_tid_address; # arm x86 mips __sF; - __sflags; # arm x86 mips - __sflush; # arm x86 mips - __sfp; # arm x86 mips - __sglue; # arm x86 mips __sigaction; # arm x86 mips __signalfd4; # arm x86 mips - __sinit; # arm x86 mips nobrillo - __smakebuf; # arm x86 mips __snprintf_chk; __socket; # arm x86 mips __sprintf_chk; - __sread; # arm x86 mips - __srefill; # arm x86 mips - __srget; # arm x86 mips - __sseek; # arm x86 mips __stack_chk_fail; __stack_chk_guard; __statfs64; # arm x86 mips @@ -204,9 +184,6 @@ LIBC { __strncpy_chk; __strncpy_chk2; __strrchr_chk; - __swbuf; # arm x86 mips - __swrite; # arm x86 mips - __swsetup; # arm x86 mips __sym_ntop; __sym_ntos; __sym_ston; @@ -233,13 +210,11 @@ LIBC { __umask_chk; __vsnprintf_chk; __vsprintf_chk; - __wait4; # arm x86 mips nobrillo __waitid; # arm x86 mips _ctype_; _Exit; _exit; _flushlbf; - _fwalk; # arm x86 mips _getlong; _getshort; _longjmp; @@ -420,7 +395,6 @@ LIBC { fputws; fread; free; - free_malloc_leak_info; freeaddrinfo; freelocale; fremovexattr; @@ -462,7 +436,6 @@ LIBC { fwscanf; gai_strerror; get_avphys_pages; - get_malloc_leak_info; get_nprocs; get_nprocs_conf; get_phys_pages; @@ -1298,13 +1271,40 @@ LIBC_PRIVATE { __bionic_brk; # arm x86 mips __bionic_libgcc_compat_symbols; # arm x86 __divdi3; # arm x86 mips + __futex_wait; # arm x86 mips nobrillo + __futex_wake; # arm x86 mips nobrillo + __get_thread; # arm x86 mips nobrillo + __get_tls; # arm x86 mips nobrillo + __getdents64; # arm x86 mips + __open; # arm x86 mips nobrillo + __page_shift; # arm x86 mips nobrillo + __page_size; # arm x86 mips nobrillo __popcountsi2; # arm x86 mips + __sclose; # arm x86 mips + __sdidinit; # arm x86 mips nobrillo + __sflags; # arm x86 mips + __sflush; # arm x86 mips + __sfp; # arm x86 mips + __sglue; # arm x86 mips + __sinit; # arm x86 mips nobrillo + __smakebuf; # arm x86 mips + __sread; # arm x86 mips + __srefill; # arm x86 mips + __srget; # arm x86 mips + __sseek; # arm x86 mips + __swbuf; # arm x86 mips + __swrite; # arm x86 mips + __swsetup; # arm x86 mips __udivdi3; # arm x86 mips __umoddi3; # x86 mips + __wait4; # arm x86 mips nobrillo + _fwalk; # arm x86 mips dlmalloc; # arm x86 mips nobrillo dlmalloc_inspect_all; # arm x86 mips nobrillo dlmalloc_trim; # arm x86 mips nobrillo dlmalloc_usable_size; # arm x86 mips nobrillo + free_malloc_leak_info; + get_malloc_leak_info; gMallocLeakZygoteChild; SHA1Final; # arm x86 mips SHA1Init; # arm x86 mips diff --git a/libc/libc.x86_64.map b/libc/libc.x86_64.map index 8fa46a84c..e54bef622 100644 --- a/libc/libc.x86_64.map +++ b/libc/libc.x86_64.map @@ -316,7 +316,6 @@ LIBC { fputws; fread; free; - free_malloc_leak_info; freeaddrinfo; freelocale; fremovexattr; @@ -357,7 +356,6 @@ LIBC { fwscanf; gai_strerror; get_avphys_pages; - get_malloc_leak_info; get_nprocs; get_nprocs_conf; get_phys_pages; @@ -1181,5 +1179,7 @@ LIBC_N { LIBC_PRIVATE { global: + free_malloc_leak_info; + get_malloc_leak_info; gMallocLeakZygoteChild; } LIBC_N;