am aec2c2dd: am ad3e8475: am 844bc1d3: Merge "Refresh 64-bit headers/libs (WW21)"

* commit 'aec2c2ddc9bdc28bd03e2656afce0b469168f0e1':
  Refresh 64-bit headers/libs (WW21)

ndk/platforms/android-20/arch-arm/symbols/libc.so.functions.txt

@@ -21,6 +21,14 @@ _Unwind_Resume_or_Rethrow
 _Unwind_VRS_Get
 _Unwind_VRS_Pop
 _Unwind_VRS_Set
+_ZdaPv
+_ZdaPvRKSt9nothrow_t
+_ZdlPv
+_ZdlPvRKSt9nothrow_t
+_Znaj
+_ZnajRKSt9nothrow_t
+_Znwj
+_ZnwjRKSt9nothrow_t
 __FD_CLR_chk
 __FD_ISSET_chk
 __FD_SET_chk
@@ -29,7 +37,7 @@ ___Unwind_ForcedUnwind
 ___Unwind_RaiseException
 ___Unwind_Resume
 ___Unwind_Resume_or_Rethrow
-__accept
+__accept4
 __adddf3
 __addsf3
 __aeabi_atexit
@@ -94,12 +102,10 @@ __aeabi_unwind_cpp_pr0
 __aeabi_unwind_cpp_pr1
 __aeabi_unwind_cpp_pr2
 __android_set_abort_message
-__arc4_getbyte
 __ashldi3
 __ashrdi3
 __assert
 __assert2
-__atexit_register_cleanup
 __atomic_cmpxchg
 __atomic_dec
 __atomic_inc
@@ -112,6 +118,10 @@ __cmpdf2
 __connect
 __cxa_atexit
 __cxa_finalize
+__cxa_guard_abort
+__cxa_guard_acquire
+__cxa_guard_release
+__cxa_pure_virtual
 __divdf3
 __divdi3
 __divsf3
@@ -136,7 +146,6 @@ __exit
 __extendsfdf2
 __fcntl64
 __fgets_chk
-__fgetwc_unlock
 __findenv
 __fixdfsi
 __fixsfsi
@@ -155,17 +164,11 @@ __fpclassify
 __fpclassifyd
 __fpclassifyf
 __fpclassifyl
-__fputwc_unlock
 __fstatfs64
-__futex_syscall3
-__futex_syscall4
 __futex_wait
-__futex_wait_ex
 __futex_wake
-__futex_wake_ex
 __gedf2
 __get_h_errno
-__get_sp
 __get_tls
 __getcpu
 __getcwd
@@ -328,24 +331,16 @@ __sched_cpualloc
 __sched_cpucount
 __sched_cpufree
 __sched_getaffinity
-__sclose
 __set_errno
 __set_tid_address
 __set_tls
-__sflags
-__sflush
-__sflush_locked
-__sfp
-__sfvwrite
 __sigaction
-__sinit
+__signalfd4
-__smakebuf
 __snprintf_chk
+__socket
 __sprintf_chk
-__sread
 __srefill
 __srget
-__sseek
 __stack_chk_fail
 __statfs64
 __stpcpy_chk
@@ -363,26 +358,18 @@ __strncpy_chk2
 __strrchr_chk
 __subdf3
 __subsf3
-__svfscanf
 __swbuf
-__swhatbuf
-__swrite
-__swsetup
 __sym_ntop
 __sym_ntos
 __sym_ston
-__syslog
 __system_properties_init
 __system_property_add
 __system_property_area_init
 __system_property_find
-__system_property_find_compat
 __system_property_find_nth
 __system_property_foreach
-__system_property_foreach_compat
 __system_property_get
 __system_property_read
-__system_property_read_compat
 __system_property_serial
 __system_property_set
 __system_property_set_filename
@@ -397,20 +384,13 @@ __truncdfsf2
 __udivdi3
 __udivsi3
 __umask_chk
-__ungetwc
 __unorddf2
 __unordsf2
-__vfprintf
-__vfwprintf
-__vfwscanf
 __vsnprintf_chk
 __vsprintf_chk
 __wait4
 __waitid
-_cleanup
 _exit
-_exit_with_stack_teardown
-_fwalk
 _getlong
 _getshort
 _longjmp
@@ -525,6 +505,7 @@ dlrealloc
 dlrealloc_in_place
 dlvalloc
 dn_expand
+dprintf
 drand48
 dup
 dup2
@@ -633,7 +614,6 @@ ftw
 ftw64
 funlockfile
 funopen
-futex
 futimens
 fwide
 fwprintf
@@ -884,7 +864,6 @@ openlog_r
 pathconf
 pause
 pclose
-perf_event_open
 perror
 personality
 pipe
@@ -1116,7 +1095,6 @@ sigismember
 siglongjmp
 signal
 signalfd
-signalfd4
 sigpending
 sigprocmask
 sigsetjmp
@@ -1261,6 +1239,7 @@ utimes
 utmpname
 valloc
 vasprintf
+vdprintf
 verr
 verrx
 vfdprintf

ndk/platforms/android-20/arch-arm/symbols/libc.so.variables.txt

@@ -1,6 +1,7 @@
 _C_ctype_
 _C_tolower_
 _C_toupper_
+_ZSt7nothrow
 __atexit
 __atexit_invalid
 __bionic_brk
@@ -9,7 +10,6 @@ __dso_handle
 __isthreaded
 __libc_malloc_default_dispatch
 __libc_malloc_dispatch
-__netdClientDispatch
 __p_cert_syms
 __p_class_syms
 __p_key_syms
@@ -23,8 +23,6 @@ __rand48_add
 __rand48_mult
 __rand48_seed
 __sF
-__sdidinit
-__sglue
 __stack_chk_guard
 __system_property_area__
 _ctype_
@@ -33,10 +31,6 @@ _tolower_tab_
 _toupper_tab_
 daylight
 environ
-g_allocations_mutex
-g_hash_table
-g_malloc_debug_backlog
-g_malloc_debug_level
 h_errlist
 h_nerr
 optarg

ndk/platforms/android-20/arch-arm/symbols/libm.so.functions.txt

@@ -13,7 +13,6 @@ __aeabi_fcmple
 __aeabi_fcmplt
 __cmpsf2
 __eqsf2
-__exp__D
 __fixdfdi
 __fixsfdi
 __fixunsdfdi
@@ -21,27 +20,12 @@ __fixunsdfsi
 __fixunssfdi
 __gesf2
 __gtsf2
-__ieee754_rem_pio2
-__ieee754_rem_pio2f
-__kernel_cos
-__kernel_cosdf
-__kernel_rem_pio2
-__kernel_sin
-__kernel_sindf
-__kernel_tan
-__kernel_tandf
-__ldexp_cexp
-__ldexp_cexpf
-__ldexp_exp
-__ldexp_expf
 __lesf2
-__log__D
 __ltsf2
 __nesf2
 __signbit
 __signbitf
 __signbitl
-_scan_nan
 acos
 acosf
 acosh
@@ -63,27 +47,13 @@ atanh
 atanhf
 atanhl
 atanl
-cabs
-cabsf
 cabsl
-carg
-cargf
 cbrt
 cbrtf
 cbrtl
-ccos
-ccosf
-ccosh
-ccoshf
 ceil
 ceilf
 ceill
-cexp
-cexpf
-cimag
-cimagf
-conj
-conjf
 copysign
 copysignf
 copysignl
@@ -93,22 +63,8 @@ cosh
 coshf
 coshl
 cosl
-cproj
-cprojf
 cprojl
-creal
-crealf
-csin
-csinf
-csinh
-csinhf
-csqrt
-csqrtf
 csqrtl
-ctan
-ctanf
-ctanh
-ctanhf
 drem
 dremf
 erf
@@ -176,14 +132,6 @@ hypotl
 ilogb
 ilogbf
 ilogbl
-imprecise_coshl
-imprecise_erfcl
-imprecise_erfl
-imprecise_lgammal
-imprecise_powl
-imprecise_sinhl
-imprecise_tanhl
-imprecise_tgammal
 j0
 j0f
 j1

ndk/platforms/android-20/arch-arm/symbols/libstdc++.so.functions.txt

@@ -1,23 +1 @@
-_ZN9type_infoC1ERKS_
+__this_library_is_now_part_of_libc
-_ZN9type_infoC1Ev
-_ZN9type_infoC2ERKS_
-_ZN9type_infoC2Ev
-_ZN9type_infoD0Ev
-_ZN9type_infoD1Ev
-_ZN9type_infoD2Ev
-_ZNK9type_info4nameEv
-_ZNK9type_info6beforeERKS_
-_ZNK9type_infoeqERKS_
-_ZNK9type_infoneERKS_
-_ZdaPv
-_ZdaPvRKSt9nothrow_t
-_ZdlPv
-_ZdlPvRKSt9nothrow_t
-_Znam
-_ZnamRKSt9nothrow_t
-_Znwm
-_ZnwmRKSt9nothrow_t
-__cxa_guard_abort
-__cxa_guard_acquire
-__cxa_guard_release
-__cxa_pure_virtual

ndk/platforms/android-20/arch-arm/symbols/libstdc++.so.variables.txt

@@ -1,2 +1 @@
-_ZSt7nothrow
+
-_ZTV9type_info

ndk/platforms/android-20/arch-arm/symbols/libz.so.functions.txt

@@ -0,0 +1,130 @@
+_Unwind_Backtrace
+_Unwind_Complete
+_Unwind_DeleteException
+_Unwind_ForcedUnwind
+_Unwind_GetCFA
+_Unwind_GetDataRelBase
+_Unwind_GetLanguageSpecificData
+_Unwind_GetRegionStart
+_Unwind_GetTextRelBase
+_Unwind_RaiseException
+_Unwind_Resume
+_Unwind_Resume_or_Rethrow
+_Unwind_VRS_Get
+_Unwind_VRS_Pop
+_Unwind_VRS_Set
+___Unwind_Backtrace
+___Unwind_ForcedUnwind
+___Unwind_RaiseException
+___Unwind_Resume
+___Unwind_Resume_or_Rethrow
+__aeabi_unwind_cpp_pr0
+__aeabi_unwind_cpp_pr1
+__aeabi_unwind_cpp_pr2
+__gnu_Unwind_Backtrace
+__gnu_Unwind_ForcedUnwind
+__gnu_Unwind_RaiseException
+__gnu_Unwind_Restore_VFP
+__gnu_Unwind_Restore_VFP_D
+__gnu_Unwind_Restore_VFP_D_16_to_31
+__gnu_Unwind_Restore_WMMXC
+__gnu_Unwind_Restore_WMMXD
+__gnu_Unwind_Resume
+__gnu_Unwind_Resume_or_Rethrow
+__gnu_Unwind_Save_VFP
+__gnu_Unwind_Save_VFP_D
+__gnu_Unwind_Save_VFP_D_16_to_31
+__gnu_Unwind_Save_WMMXC
+__gnu_Unwind_Save_WMMXD
+__gnu_unwind_execute
+__gnu_unwind_frame
+__restore_core_regs
+_tr_align
+_tr_flush_bits
+_tr_flush_block
+_tr_init
+_tr_stored_block
+_tr_tally
+adler32
+adler32_combine
+adler32_combine64
+compress
+compress2
+compressBound
+crc32
+crc32_combine
+crc32_combine64
+deflate
+deflateBound
+deflateCopy
+deflateEnd
+deflateInit2_
+deflateInit_
+deflateParams
+deflatePending
+deflatePrime
+deflateReset
+deflateResetKeep
+deflateSetDictionary
+deflateSetHeader
+deflateTune
+get_crc_table
+gz_error
+gzbuffer
+gzclearerr
+gzclose
+gzclose_r
+gzclose_w
+gzdirect
+gzdopen
+gzeof
+gzerror
+gzflush
+gzgetc
+gzgetc_
+gzgets
+gzoffset
+gzoffset64
+gzopen
+gzopen64
+gzprintf
+gzputc
+gzputs
+gzread
+gzrewind
+gzseek
+gzseek64
+gzsetparams
+gztell
+gztell64
+gzungetc
+gzvprintf
+gzwrite
+inflate
+inflateBack
+inflateBackEnd
+inflateBackInit_
+inflateCopy
+inflateEnd
+inflateGetDictionary
+inflateGetHeader
+inflateInit2_
+inflateInit_
+inflateMark
+inflatePrime
+inflateReset
+inflateReset2
+inflateResetKeep
+inflateSetDictionary
+inflateSync
+inflateSyncPoint
+inflateUndermine
+inflate_fast
+inflate_table
+restore_core_regs
+uncompress
+zError
+zcalloc
+zcfree
+zlibCompileFlags
+zlibVersion

ndk/platforms/android-20/arch-arm/symbols/libz.so.variables.txt

@@ -0,0 +1,5 @@
+_dist_code
+_length_code
+deflate_copyright
+inflate_copyright
+z_errmsg

ndk/platforms/android-20/arch-arm64/symbols/libc.so.functions.txt

@@ -24,11 +24,18 @@ _Unwind_Resume
 _Unwind_Resume_or_Rethrow
 _Unwind_SetGR
 _Unwind_SetIP
+_ZdaPv
+_ZdaPvRKSt9nothrow_t
+_ZdlPv
+_ZdlPvRKSt9nothrow_t
+_Znam
+_ZnamRKSt9nothrow_t
+_Znwm
+_ZnwmRKSt9nothrow_t
 __FD_CLR_chk
 __FD_ISSET_chk
 __FD_SET_chk
 __android_set_abort_message
-__arc4_getbyte
 __assert
 __assert2
 __b64_ntop
@@ -36,6 +43,10 @@ __b64_pton
 __bionic_name_mem
 __cxa_atexit
 __cxa_finalize
+__cxa_guard_abort
+__cxa_guard_acquire
+__cxa_guard_release
+__cxa_pure_virtual
 __deregister_frame
 __deregister_frame_info
 __deregister_frame_info_bases
@@ -54,7 +65,6 @@ __evTimeSpec
 __evTimeVal
 __evUTCTime
 __fgets_chk
-__fgetwc_unlock
 __findenv
 __fp_nquery
 __fp_query
@@ -62,16 +72,8 @@ __fpclassify
 __fpclassifyd
 __fpclassifyf
 __fpclassifyl
-__fputwc_unlock
 __frame_state_for
-__futex_syscall3
-__futex_syscall4
-__futex_wait
-__futex_wait_ex
-__futex_wake
-__futex_wake_ex
 __get_h_errno
-__get_sp
 __hostalias
 __isfinite
 __isfinitef
@@ -193,22 +195,10 @@ __res_vinit
 __sched_cpualloc
 __sched_cpucount
 __sched_cpufree
-__sclose
-__set_tls
-__sflags
-__sflush
-__sflush_locked
-__sfp
 __sfp_handle_exceptions
-__sfvwrite
-__sinit
-__smakebuf
 __snprintf_chk
 __sprintf_chk
-__sread
 __srefill
-__srget
-__sseek
 __stack_chk_fail
 __stpcpy_chk
 __stpncpy_chk
@@ -223,11 +213,6 @@ __strncat_chk
 __strncpy_chk
 __strncpy_chk2
 __strrchr_chk
-__svfscanf
-__swbuf
-__swhatbuf
-__swrite
-__swsetup
 __sym_ntop
 __sym_ntos
 __sym_ston
@@ -235,29 +220,19 @@ __system_properties_init
 __system_property_add
 __system_property_area_init
 __system_property_find
-__system_property_find_compat
 __system_property_find_nth
 __system_property_foreach
-__system_property_foreach_compat
 __system_property_get
 __system_property_read
-__system_property_read_compat
 __system_property_serial
 __system_property_set
 __system_property_set_filename
 __system_property_update
 __system_property_wait_any
 __umask_chk
-__ungetwc
-__vfprintf
-__vfwprintf
-__vfwscanf
 __vsnprintf_chk
 __vsprintf_chk
-_cleanup
 _exit
-_exit_with_stack_teardown
-_fwalk
 _getlong
 _getshort
 _longjmp
@@ -366,6 +341,7 @@ dlrealloc
 dlrealloc_in_place
 dlvalloc
 dn_expand
+dprintf
 drand48
 dup
 dup2
@@ -412,7 +388,6 @@ fcntl
 fdatasync
 fdopen
 fdopendir
-fdprintf
 feof
 ferror
 fflush
@@ -474,7 +449,6 @@ ftw
 ftw64
 funlockfile
 funopen
-futex
 futimens
 fwide
 fwprintf
@@ -719,7 +693,6 @@ openlog_r
 pathconf
 pause
 pclose
-perf_event_open
 perror
 personality
 pipe
@@ -944,7 +917,6 @@ sigismember
 siglongjmp
 signal
 signalfd
-signalfd4
 sigpending
 sigprocmask
 sigsetjmp
@@ -1050,7 +1022,6 @@ timerfd_create
 timerfd_gettime
 timerfd_settime
 times
-tkill
 tmpfile
 tmpnam
 toascii
@@ -1084,9 +1055,9 @@ utimes
 utmpname
 valloc
 vasprintf
+vdprintf
 verr
 verrx
-vfdprintf
 vfork
 vfprintf
 vfscanf

ndk/platforms/android-20/arch-arm64/symbols/libc.so.variables.txt

@@ -1,25 +1,22 @@
 _C_ctype_
 _C_tolower_
 _C_toupper_
+_ZSt7nothrow
 __atexit
 __atexit_invalid
 __isthreaded
 __libc_malloc_default_dispatch
 __libc_malloc_dispatch
-__netdClientDispatch
 __p_cert_syms
 __p_class_syms
 __p_key_syms
 __p_rcode_syms
 __p_type_syms
-__popcount_tab
 __progname
 __rand48_add
 __rand48_mult
 __rand48_seed
 __sF
-__sdidinit
-__sglue
 __stack_chk_guard
 __system_property_area__
 _ctype_
@@ -28,10 +25,6 @@ _tolower_tab_
 _toupper_tab_
 daylight
 environ
-g_allocations_mutex
-g_hash_table
-g_malloc_debug_backlog
-g_malloc_debug_level
 h_errlist
 h_nerr
 optarg

ndk/platforms/android-20/arch-arm64/symbols/libm.so.functions.txt

@@ -1,7 +1,6 @@
 __addtf3
 __divtf3
 __eqtf2
-__exp__D
 __extenddftf2
 __extendsftf2
 __fixtfdi
@@ -9,24 +8,7 @@ __fixtfsi
 __floatsitf
 __getf2
 __gttf2
-__ieee754_rem_pio2
-__ieee754_rem_pio2f
-__kernel_cos
-__kernel_cosdf
-__kernel_cosl
-__kernel_rem_pio2
-__kernel_sin
-__kernel_sindf
-__kernel_sinl
-__kernel_tan
-__kernel_tandf
-__kernel_tanl
-__ldexp_cexp
-__ldexp_cexpf
-__ldexp_exp
-__ldexp_expf
 __letf2
-__log__D
 __lttf2
 __netf2
 __signbit
@@ -35,7 +17,6 @@ __signbitl
 __subtf3
 __trunctfdf2
 __trunctfsf2
-_scan_nan
 acos
 acosf
 acosh
@@ -57,26 +38,12 @@ atanh
 atanhf
 atanhl
 atanl
-cabs
-cabsf
-carg
-cargf
 cbrt
 cbrtf
 cbrtl
-ccos
-ccosf
-ccosh
-ccoshf
 ceil
 ceilf
 ceill
-cexp
-cexpf
-cimag
-cimagf
-conj
-conjf
 copysign
 copysignf
 copysignl
@@ -86,20 +53,6 @@ cosh
 coshf
 coshl
 cosl
-cproj
-cprojf
-creal
-crealf
-csin
-csinf
-csinh
-csinhf
-csqrt
-csqrtf
-ctan
-ctanf
-ctanh
-ctanhf
 drem
 dremf
 erf
@@ -167,14 +120,6 @@ hypotl
 ilogb
 ilogbf
 ilogbl
-imprecise_coshl
-imprecise_erfcl
-imprecise_erfl
-imprecise_lgammal
-imprecise_powl
-imprecise_sinhl
-imprecise_tanhl
-imprecise_tgammal
 j0
 j0f
 j1

ndk/platforms/android-20/arch-arm64/symbols/libm.so.variables.txt

@@ -1,25 +1,2 @@
-_ItL_aT
-_ItL_atanhi
-_ItL_atanlo
-_ItL_pS0
-_ItL_pS1
-_ItL_pS2
-_ItL_pS3
-_ItL_pS4
-_ItL_pS5
-_ItL_pS6
-_ItL_pS7
-_ItL_pS8
-_ItL_pS9
-_ItL_pi_lo
-_ItL_qS1
-_ItL_qS2
-_ItL_qS3
-_ItL_qS4
-_ItL_qS5
-_ItL_qS6
-_ItL_qS7
-_ItL_qS8
-_ItL_qS9
 __fe_dfl_env
 signgam

ndk/platforms/android-20/arch-arm64/symbols/libstdc++.so.functions.txt

@@ -1,23 +1 @@
-_ZN9type_infoC1ERKS_
+__this_library_is_now_part_of_libc
-_ZN9type_infoC1Ev
-_ZN9type_infoC2ERKS_
-_ZN9type_infoC2Ev
-_ZN9type_infoD0Ev
-_ZN9type_infoD1Ev
-_ZN9type_infoD2Ev
-_ZNK9type_info4nameEv
-_ZNK9type_info6beforeERKS_
-_ZNK9type_infoeqERKS_
-_ZNK9type_infoneERKS_
-_ZdaPv
-_ZdaPvRKSt9nothrow_t
-_ZdlPv
-_ZdlPvRKSt9nothrow_t
-_Znam
-_ZnamRKSt9nothrow_t
-_Znwm
-_ZnwmRKSt9nothrow_t
-__cxa_guard_abort
-__cxa_guard_acquire
-__cxa_guard_release
-__cxa_pure_virtual

ndk/platforms/android-20/arch-arm64/symbols/libstdc++.so.variables.txt

@@ -1,2 +1 @@
-_ZSt7nothrow
+
-_ZTV9type_info

ndk/platforms/android-20/arch-arm64/symbols/libz.so.functions.txt

@@ -0,0 +1,88 @@
+_tr_align
+_tr_flush_bits
+_tr_flush_block
+_tr_init
+_tr_stored_block
+_tr_tally
+adler32
+adler32_combine
+adler32_combine64
+compress
+compress2
+compressBound
+crc32
+crc32_combine
+crc32_combine64
+deflate
+deflateBound
+deflateCopy
+deflateEnd
+deflateInit2_
+deflateInit_
+deflateParams
+deflatePending
+deflatePrime
+deflateReset
+deflateResetKeep
+deflateSetDictionary
+deflateSetHeader
+deflateTune
+get_crc_table
+gz_error
+gzbuffer
+gzclearerr
+gzclose
+gzclose_r
+gzclose_w
+gzdirect
+gzdopen
+gzeof
+gzerror
+gzflush
+gzgetc
+gzgetc_
+gzgets
+gzoffset
+gzoffset64
+gzopen
+gzopen64
+gzprintf
+gzputc
+gzputs
+gzread
+gzrewind
+gzseek
+gzseek64
+gzsetparams
+gztell
+gztell64
+gzungetc
+gzvprintf
+gzwrite
+inflate
+inflateBack
+inflateBackEnd
+inflateBackInit_
+inflateCopy
+inflateEnd
+inflateGetDictionary
+inflateGetHeader
+inflateInit2_
+inflateInit_
+inflateMark
+inflatePrime
+inflateReset
+inflateReset2
+inflateResetKeep
+inflateSetDictionary
+inflateSync
+inflateSyncPoint
+inflateUndermine
+inflate_fast
+inflate_table
+uncompress
+zError
+zcalloc
+zcfree
+zlibCompileFlags
+zlibVersion

ndk/platforms/android-20/arch-arm64/symbols/libz.so.variables.txt

@@ -0,0 +1,5 @@
+_dist_code
+_length_code
+deflate_copyright
+inflate_copyright
+z_errmsg

ndk/platforms/android-20/arch-mips/symbols/libc.so.functions.txt

@@ -24,12 +24,19 @@ _Unwind_Resume
 _Unwind_Resume_or_Rethrow
 _Unwind_SetGR
 _Unwind_SetIP
+_ZdaPv
+_ZdaPvRKSt9nothrow_t
+_ZdlPv
+_ZdlPvRKSt9nothrow_t
+_Znaj
+_ZnajRKSt9nothrow_t
+_Znwj
+_ZnwjRKSt9nothrow_t
 __FD_CLR_chk
 __FD_ISSET_chk
 __FD_SET_chk
-__accept
+__accept4
 __android_set_abort_message
-__arc4_getbyte
 __assert
 __assert2
 __b64_ntop
@@ -39,6 +46,10 @@ __brk
 __connect
 __cxa_atexit
 __cxa_finalize
+__cxa_guard_abort
+__cxa_guard_acquire
+__cxa_guard_release
+__cxa_pure_virtual
 __deregister_frame
 __deregister_frame_info
 __deregister_frame_info_bases
@@ -61,7 +72,6 @@ __evUTCTime
 __exit
 __fcntl64
 __fgets_chk
-__fgetwc_unlock
 __findenv
 __fp_nquery
 __fp_query
@@ -69,17 +79,11 @@ __fpclassify
 __fpclassifyd
 __fpclassifyf
 __fpclassifyl
-__fputwc_unlock
 __frame_state_for
 __fstatfs64
-__futex_syscall3
-__futex_syscall4
 __futex_wait
-__futex_wait_ex
 __futex_wake
-__futex_wake_ex
 __get_h_errno
-__get_sp
 __get_tls
 __getcpu
 __getcwd
@@ -220,24 +224,16 @@ __sched_cpualloc
 __sched_cpucount
 __sched_cpufree
 __sched_getaffinity
-__sclose
 __set_errno
 __set_tid_address
 __set_tls
-__sflags
-__sflush
-__sflush_locked
-__sfp
-__sfvwrite
 __sigaction
-__sinit
+__signalfd4
-__smakebuf
 __snprintf_chk
+__socket
 __sprintf_chk
-__sread
 __srefill
 __srget
-__sseek
 __stack_chk_fail
 __statfs64
 __stpcpy_chk
@@ -253,26 +249,18 @@ __strncat_chk
 __strncpy_chk
 __strncpy_chk2
 __strrchr_chk
-__svfscanf
 __swbuf
-__swhatbuf
-__swrite
-__swsetup
 __sym_ntop
 __sym_ntos
 __sym_ston
-__syslog
 __system_properties_init
 __system_property_add
 __system_property_area_init
 __system_property_find
-__system_property_find_compat
 __system_property_find_nth
 __system_property_foreach
-__system_property_foreach_compat
 __system_property_get
 __system_property_read
-__system_property_read_compat
 __system_property_serial
 __system_property_set
 __system_property_set_filename
@@ -286,19 +274,12 @@ __timer_settime
 __udivdi3
 __umask_chk
 __umoddi3
-__ungetwc
-__vfprintf
-__vfwprintf
-__vfwscanf
 __vsnprintf_chk
 __vsprintf_chk
 __wait4
 __waitid
-_cleanup
 _exit
-_exit_with_stack_teardown
 _flush_cache
-_fwalk
 _getlong
 _getshort
 _longjmp
@@ -414,6 +395,7 @@ dlrealloc
 dlrealloc_in_place
 dlvalloc
 dn_expand
+dprintf
 drand48
 dup
 dup2
@@ -522,7 +504,6 @@ ftw
 ftw64
 funlockfile
 funopen
-futex
 futimens
 fwide
 fwprintf
@@ -773,7 +754,6 @@ openlog_r
 pathconf
 pause
 pclose
-perf_event_open
 perror
 personality
 pipe
@@ -1004,7 +984,6 @@ sigismember
 siglongjmp
 signal
 signalfd
-signalfd4
 sigpending
 sigprocmask
 sigsetjmp
@@ -1149,6 +1128,7 @@ utimes
 utmpname
 valloc
 vasprintf
+vdprintf
 verr
 verrx
 vfdprintf

ndk/platforms/android-20/arch-mips/symbols/libc.so.variables.txt

@@ -1,13 +1,13 @@
 _C_ctype_
 _C_tolower_
 _C_toupper_
+_ZSt7nothrow
 __atexit
 __atexit_invalid
 __bionic_brk
 __isthreaded
 __libc_malloc_default_dispatch
 __libc_malloc_dispatch
-__netdClientDispatch
 __p_cert_syms
 __p_class_syms
 __p_key_syms
@@ -21,8 +21,6 @@ __rand48_add
 __rand48_mult
 __rand48_seed
 __sF
-__sdidinit
-__sglue
 __stack_chk_guard
 __system_property_area__
 _ctype_
@@ -31,10 +29,6 @@ _tolower_tab_
 _toupper_tab_
 daylight
 environ
-g_allocations_mutex
-g_hash_table
-g_malloc_debug_backlog
-g_malloc_debug_level
 h_errlist
 h_nerr
 optarg

ndk/platforms/android-20/arch-mips/symbols/libm.so.functions.txt

@@ -1,26 +1,10 @@
-__exp__D
 __fixdfdi
 __fixsfdi
 __fixunsdfdi
 __fixunssfdi
-__ieee754_rem_pio2
-__ieee754_rem_pio2f
-__kernel_cos
-__kernel_cosdf
-__kernel_rem_pio2
-__kernel_sin
-__kernel_sindf
-__kernel_tan
-__kernel_tandf
-__ldexp_cexp
-__ldexp_cexpf
-__ldexp_exp
-__ldexp_expf
-__log__D
 __signbit
 __signbitf
 __signbitl
-_scan_nan
 acos
 acosf
 acosh
@@ -42,27 +26,13 @@ atanh
 atanhf
 atanhl
 atanl
-cabs
-cabsf
 cabsl
-carg
-cargf
 cbrt
 cbrtf
 cbrtl
-ccos
-ccosf
-ccosh
-ccoshf
 ceil
 ceilf
 ceill
-cexp
-cexpf
-cimag
-cimagf
-conj
-conjf
 copysign
 copysignf
 copysignl
@@ -72,22 +42,8 @@ cosh
 coshf
 coshl
 cosl
-cproj
-cprojf
 cprojl
-creal
-crealf
-csin
-csinf
-csinh
-csinhf
-csqrt
-csqrtf
 csqrtl
-ctan
-ctanf
-ctanh
-ctanhf
 drem
 dremf
 erf
@@ -155,14 +111,6 @@ hypotl
 ilogb
 ilogbf
 ilogbl
-imprecise_coshl
-imprecise_erfcl
-imprecise_erfl
-imprecise_lgammal
-imprecise_powl
-imprecise_sinhl
-imprecise_tanhl
-imprecise_tgammal
 j0
 j0f
 j1

ndk/platforms/android-20/arch-mips/symbols/libstdc++.so.functions.txt

@@ -1,23 +1 @@
-_ZN9type_infoC1ERKS_
+__this_library_is_now_part_of_libc
-_ZN9type_infoC1Ev
-_ZN9type_infoC2ERKS_
-_ZN9type_infoC2Ev
-_ZN9type_infoD0Ev
-_ZN9type_infoD1Ev
-_ZN9type_infoD2Ev
-_ZNK9type_info4nameEv
-_ZNK9type_info6beforeERKS_
-_ZNK9type_infoeqERKS_
-_ZNK9type_infoneERKS_
-_ZdaPv
-_ZdaPvRKSt9nothrow_t
-_ZdlPv
-_ZdlPvRKSt9nothrow_t
-_Znam
-_ZnamRKSt9nothrow_t
-_Znwm
-_ZnwmRKSt9nothrow_t
-__cxa_guard_abort
-__cxa_guard_acquire
-__cxa_guard_release
-__cxa_pure_virtual

ndk/platforms/android-20/arch-mips/symbols/libstdc++.so.variables.txt

@@ -1,2 +1 @@
-_ZSt7nothrow
+
-_ZTV9type_info

ndk/platforms/android-20/arch-mips/symbols/libz.so.functions.txt

@@ -0,0 +1,88 @@
+_tr_align
+_tr_flush_bits
+_tr_flush_block
+_tr_init
+_tr_stored_block
+_tr_tally
+adler32
+adler32_combine
+adler32_combine64
+compress
+compress2
+compressBound
+crc32
+crc32_combine
+crc32_combine64
+deflate
+deflateBound
+deflateCopy
+deflateEnd
+deflateInit2_
+deflateInit_
+deflateParams
+deflatePending
+deflatePrime
+deflateReset
+deflateResetKeep
+deflateSetDictionary
+deflateSetHeader
+deflateTune
+get_crc_table
+gz_error
+gzbuffer
+gzclearerr
+gzclose
+gzclose_r
+gzclose_w
+gzdirect
+gzdopen
+gzeof
+gzerror
+gzflush
+gzgetc
+gzgetc_
+gzgets
+gzoffset
+gzoffset64
+gzopen
+gzopen64
+gzprintf
+gzputc
+gzputs
+gzread
+gzrewind
+gzseek
+gzseek64
+gzsetparams
+gztell
+gztell64
+gzungetc
+gzvprintf
+gzwrite
+inflate
+inflateBack
+inflateBackEnd
+inflateBackInit_
+inflateCopy
+inflateEnd
+inflateGetDictionary
+inflateGetHeader
+inflateInit2_
+inflateInit_
+inflateMark
+inflatePrime
+inflateReset
+inflateReset2
+inflateResetKeep
+inflateSetDictionary
+inflateSync
+inflateSyncPoint
+inflateUndermine
+inflate_fast
+inflate_table
+uncompress
+zError
+zcalloc
+zcfree
+zlibCompileFlags
+zlibVersion

ndk/platforms/android-20/arch-mips/symbols/libz.so.variables.txt

@@ -0,0 +1,5 @@
+_dist_code
+_length_code
+deflate_copyright
+inflate_copyright
+z_errmsg

ndk/platforms/android-20/arch-mips64/symbols/libc.so.functions.txt

@@ -24,20 +24,30 @@ _Unwind_Resume
 _Unwind_Resume_or_Rethrow
 _Unwind_SetGR
 _Unwind_SetIP
+_ZdaPv
+_ZdaPvRKSt9nothrow_t
+_ZdlPv
+_ZdlPvRKSt9nothrow_t
+_Znam
+_ZnamRKSt9nothrow_t
+_Znwm
+_ZnwmRKSt9nothrow_t
 __FD_CLR_chk
 __FD_ISSET_chk
 __FD_SET_chk
 __android_set_abort_message
-__arc4_getbyte
 __ashlti3
 __assert
 __assert2
-__atexit_register_cleanup
 __b64_ntop
 __b64_pton
 __bionic_name_mem
 __cxa_atexit
 __cxa_finalize
+__cxa_guard_abort
+__cxa_guard_acquire
+__cxa_guard_release
+__cxa_pure_virtual
 __deregister_frame
 __deregister_frame_info
 __deregister_frame_info_bases
@@ -56,7 +66,6 @@ __evTimeSpec
 __evTimeVal
 __evUTCTime
 __fgets_chk
-__fgetwc_unlock
 __findenv
 __fp_nquery
 __fp_query
@@ -64,16 +73,8 @@ __fpclassify
 __fpclassifyd
 __fpclassifyf
 __fpclassifyl
-__fputwc_unlock
 __frame_state_for
-__futex_syscall3
-__futex_syscall4
-__futex_wait
-__futex_wait_ex
-__futex_wake
-__futex_wake_ex
 __get_h_errno
-__get_sp
 __hostalias
 __isfinite
 __isfinitef
@@ -197,20 +198,9 @@ __res_vinit
 __sched_cpualloc
 __sched_cpucount
 __sched_cpufree
-__sclose
-__sflags
-__sflush
-__sflush_locked
-__sfp
-__sfvwrite
-__sinit
-__smakebuf
 __snprintf_chk
 __sprintf_chk
-__sread
 __srefill
-__srget
-__sseek
 __stack_chk_fail
 __stpcpy_chk
 __stpncpy_chk
@@ -225,11 +215,6 @@ __strncat_chk
 __strncpy_chk
 __strncpy_chk2
 __strrchr_chk
-__svfscanf
-__swbuf
-__swhatbuf
-__swrite
-__swsetup
 __sym_ntop
 __sym_ntos
 __sym_ston
@@ -237,31 +222,21 @@ __system_properties_init
 __system_property_add
 __system_property_area_init
 __system_property_find
-__system_property_find_compat
 __system_property_find_nth
 __system_property_foreach
-__system_property_foreach_compat
 __system_property_get
 __system_property_read
-__system_property_read_compat
 __system_property_serial
 __system_property_set
 __system_property_set_filename
 __system_property_update
 __system_property_wait_any
 __umask_chk
-__ungetwc
 __unpack_t
-__vfprintf
-__vfwprintf
-__vfwscanf
 __vsnprintf_chk
 __vsprintf_chk
-_cleanup
 _exit
-_exit_with_stack_teardown
 _flush_cache
-_fwalk
 _getlong
 _getshort
 _longjmp
@@ -370,6 +345,7 @@ dlrealloc
 dlrealloc_in_place
 dlvalloc
 dn_expand
+dprintf
 drand48
 dup
 dup2
@@ -416,7 +392,6 @@ fcntl
 fdatasync
 fdopen
 fdopendir
-fdprintf
 feof
 ferror
 fflush
@@ -478,7 +453,6 @@ ftw
 ftw64
 funlockfile
 funopen
-futex
 futimens
 fwide
 fwprintf
@@ -723,7 +697,6 @@ openlog_r
 pathconf
 pause
 pclose
-perf_event_open
 perror
 personality
 pipe
@@ -948,7 +921,6 @@ sigismember
 siglongjmp
 signal
 signalfd
-signalfd4
 sigpending
 sigprocmask
 sigsetjmp
@@ -1054,7 +1026,6 @@ timerfd_create
 timerfd_gettime
 timerfd_settime
 times
-tkill
 tmpfile
 tmpnam
 toascii
@@ -1088,9 +1059,9 @@ utimes
 utmpname
 valloc
 vasprintf
+vdprintf
 verr
 verrx
-vfdprintf
 vfork
 vfprintf
 vfscanf

ndk/platforms/android-20/arch-mips64/symbols/libc.so.variables.txt

@@ -1,12 +1,12 @@
 _C_ctype_
 _C_tolower_
 _C_toupper_
+_ZSt7nothrow
 __atexit
 __atexit_invalid
 __isthreaded
 __libc_malloc_default_dispatch
 __libc_malloc_dispatch
-__netdClientDispatch
 __p_cert_syms
 __p_class_syms
 __p_key_syms
@@ -18,8 +18,6 @@ __rand48_add
 __rand48_mult
 __rand48_seed
 __sF
-__sdidinit
-__sglue
 __stack_chk_guard
 __system_property_area__
 __thenan_tf
@@ -29,10 +27,6 @@ _tolower_tab_
 _toupper_tab_
 daylight
 environ
-g_allocations_mutex
-g_hash_table
-g_malloc_debug_backlog
-g_malloc_debug_level
 h_errlist
 h_nerr
 optarg

ndk/platforms/android-20/arch-mips64/symbols/libm.so.functions.txt

@@ -1,8 +1,6 @@
 __addtf3
-__ashlti3
 __divtf3
 __eqtf2
-__exp__D
 __extenddftf2
 __extendsftf2
 __fixtfdi
@@ -15,34 +13,14 @@ __floatunsitf
 __fpcmp_parts_t
 __getf2
 __gttf2
-__ieee754_rem_pio2
-__ieee754_rem_pio2f
-__kernel_cos
-__kernel_cosdf
-__kernel_cosl
-__kernel_rem_pio2
-__kernel_sin
-__kernel_sindf
-__kernel_sinl
-__kernel_tan
-__kernel_tandf
-__kernel_tanl
-__ldexp_cexp
-__ldexp_cexpf
-__ldexp_exp
-__ldexp_expf
 __letf2
-__log__D
-__lshrti3
 __lttf2
 __make_dp
 __make_fp
 __make_tp
-__multf3
 __netf2
 __pack_d
 __pack_f
-__pack_t
 __signbit
 __signbitf
 __signbitl
@@ -51,8 +29,6 @@ __trunctfdf2
 __trunctfsf2
 __unpack_d
 __unpack_f
-__unpack_t
-_scan_nan
 acos
 acosf
 acosh
@@ -74,26 +50,12 @@ atanh
 atanhf
 atanhl
 atanl
-cabs
-cabsf
-carg
-cargf
 cbrt
 cbrtf
 cbrtl
-ccos
-ccosf
-ccosh
-ccoshf
 ceil
 ceilf
 ceill
-cexp
-cexpf
-cimag
-cimagf
-conj
-conjf
 copysign
 copysignf
 copysignl
@@ -103,20 +65,6 @@ cosh
 coshf
 coshl
 cosl
-cproj
-cprojf
-creal
-crealf
-csin
-csinf
-csinh
-csinhf
-csqrt
-csqrtf
-ctan
-ctanf
-ctanh
-ctanhf
 drem
 dremf
 erf
@@ -184,14 +132,6 @@ hypotl
 ilogb
 ilogbf
 ilogbl
-imprecise_coshl
-imprecise_erfcl
-imprecise_erfl
-imprecise_lgammal
-imprecise_powl
-imprecise_sinhl
-imprecise_tanhl
-imprecise_tgammal
 j0
 j0f
 j1

ndk/platforms/android-20/arch-mips64/symbols/libm.so.variables.txt

@@ -1,26 +1,2 @@
-_ItL_aT
-_ItL_atanhi
-_ItL_atanlo
-_ItL_pS0
-_ItL_pS1
-_ItL_pS2
-_ItL_pS3
-_ItL_pS4
-_ItL_pS5
-_ItL_pS6
-_ItL_pS7
-_ItL_pS8
-_ItL_pS9
-_ItL_pi_lo
-_ItL_qS1
-_ItL_qS2
-_ItL_qS3
-_ItL_qS4
-_ItL_qS5
-_ItL_qS6
-_ItL_qS7
-_ItL_qS8
-_ItL_qS9
 __fe_dfl_env
-__thenan_tf
 signgam

ndk/platforms/android-20/arch-mips64/symbols/libstdc++.so.functions.txt

@@ -1,23 +1 @@
-_ZN9type_infoC1ERKS_
+__this_library_is_now_part_of_libc
-_ZN9type_infoC1Ev
-_ZN9type_infoC2ERKS_
-_ZN9type_infoC2Ev
-_ZN9type_infoD0Ev
-_ZN9type_infoD1Ev
-_ZN9type_infoD2Ev
-_ZNK9type_info4nameEv
-_ZNK9type_info6beforeERKS_
-_ZNK9type_infoeqERKS_
-_ZNK9type_infoneERKS_
-_ZdaPv
-_ZdaPvRKSt9nothrow_t
-_ZdlPv
-_ZdlPvRKSt9nothrow_t
-_Znam
-_ZnamRKSt9nothrow_t
-_Znwm
-_ZnwmRKSt9nothrow_t
-__cxa_guard_abort
-__cxa_guard_acquire
-__cxa_guard_release
-__cxa_pure_virtual

ndk/platforms/android-20/arch-mips64/symbols/libstdc++.so.variables.txt

@@ -1,2 +1 @@
-_ZSt7nothrow
+
-_ZTV9type_info

ndk/platforms/android-20/arch-mips64/symbols/libz.so.functions.txt

@@ -0,0 +1,88 @@
+_tr_align
+_tr_flush_bits
+_tr_flush_block
+_tr_init
+_tr_stored_block
+_tr_tally
+adler32
+adler32_combine
+adler32_combine64
+compress
+compress2
+compressBound
+crc32
+crc32_combine
+crc32_combine64
+deflate
+deflateBound
+deflateCopy
+deflateEnd
+deflateInit2_
+deflateInit_
+deflateParams
+deflatePending
+deflatePrime
+deflateReset
+deflateResetKeep
+deflateSetDictionary
+deflateSetHeader
+deflateTune
+get_crc_table
+gz_error
+gzbuffer
+gzclearerr
+gzclose
+gzclose_r
+gzclose_w
+gzdirect
+gzdopen
+gzeof
+gzerror
+gzflush
+gzgetc
+gzgetc_
+gzgets
+gzoffset
+gzoffset64
+gzopen
+gzopen64
+gzprintf
+gzputc
+gzputs
+gzread
+gzrewind
+gzseek
+gzseek64
+gzsetparams
+gztell
+gztell64
+gzungetc
+gzvprintf
+gzwrite
+inflate
+inflateBack
+inflateBackEnd
+inflateBackInit_
+inflateCopy
+inflateEnd
+inflateGetDictionary
+inflateGetHeader
+inflateInit2_
+inflateInit_
+inflateMark
+inflatePrime
+inflateReset
+inflateReset2
+inflateResetKeep
+inflateSetDictionary
+inflateSync
+inflateSyncPoint
+inflateUndermine
+inflate_fast
+inflate_table
+uncompress
+zError
+zcalloc
+zcfree
+zlibCompileFlags
+zlibVersion

ndk/platforms/android-20/arch-mips64/symbols/libz.so.variables.txt

@@ -0,0 +1,5 @@
+_dist_code
+_length_code
+deflate_copyright
+inflate_copyright
+z_errmsg

ndk/platforms/android-20/arch-x86/symbols/libc.so.functions.txt

@@ -24,12 +24,19 @@ _Unwind_Resume
 _Unwind_Resume_or_Rethrow
 _Unwind_SetGR
 _Unwind_SetIP
+_ZdaPv
+_ZdaPvRKSt9nothrow_t
+_ZdlPv
+_ZdlPvRKSt9nothrow_t
+_Znaj
+_ZnajRKSt9nothrow_t
+_Znwj
+_ZnwjRKSt9nothrow_t
 __FD_CLR_chk
 __FD_ISSET_chk
 __FD_SET_chk
-__accept
+__accept4
 __android_set_abort_message
-__arc4_getbyte
 __assert
 __assert2
 __b64_ntop
@@ -39,6 +46,10 @@ __brk
 __connect
 __cxa_atexit
 __cxa_finalize
+__cxa_guard_abort
+__cxa_guard_acquire
+__cxa_guard_release
+__cxa_pure_virtual
 __deregister_frame
 __deregister_frame_info
 __deregister_frame_info_bases
@@ -61,7 +72,6 @@ __evUTCTime
 __exit
 __fcntl64
 __fgets_chk
-__fgetwc_unlock
 __findenv
 __fp_nquery
 __fp_query
@@ -69,17 +79,11 @@ __fpclassify
 __fpclassifyd
 __fpclassifyf
 __fpclassifyl
-__fputwc_unlock
 __frame_state_for
 __fstatfs64
-__futex_syscall3
-__futex_syscall4
 __futex_wait
-__futex_wait_ex
 __futex_wake
-__futex_wake_ex
 __get_h_errno
-__get_sp
 __get_tls
 __getcpu
 __getcwd
@@ -220,25 +224,16 @@ __sched_cpualloc
 __sched_cpucount
 __sched_cpufree
 __sched_getaffinity
-__sclose
 __set_errno
 __set_thread_area
 __set_tid_address
-__set_tls
-__sflags
-__sflush
-__sflush_locked
-__sfp
-__sfvwrite
 __sigaction
-__sinit
+__signalfd4
-__smakebuf
 __snprintf_chk
+__socket
 __sprintf_chk
-__sread
 __srefill
 __srget
-__sseek
 __stack_chk_fail
 __statfs64
 __stpcpy_chk
@@ -254,26 +249,18 @@ __strncat_chk
 __strncpy_chk
 __strncpy_chk2
 __strrchr_chk
-__svfscanf
 __swbuf
-__swhatbuf
-__swrite
-__swsetup
 __sym_ntop
 __sym_ntos
 __sym_ston
-__syslog
 __system_properties_init
 __system_property_add
 __system_property_area_init
 __system_property_find
-__system_property_find_compat
 __system_property_find_nth
 __system_property_foreach
-__system_property_foreach_compat
 __system_property_get
 __system_property_read
-__system_property_read_compat
 __system_property_serial
 __system_property_set
 __system_property_set_filename
@@ -287,18 +274,11 @@ __timer_settime
 __udivdi3
 __umask_chk
 __umoddi3
-__ungetwc
-__vfprintf
-__vfwprintf
-__vfwscanf
 __vsnprintf_chk
 __vsprintf_chk
 __wait4
 __waitid
-_cleanup
 _exit
-_exit_with_stack_teardown
-_fwalk
 _getlong
 _getshort
 _longjmp
@@ -411,6 +391,7 @@ dlrealloc
 dlrealloc_in_place
 dlvalloc
 dn_expand
+dprintf
 drand48
 dup
 dup2
@@ -519,7 +500,6 @@ ftw
 ftw64
 funlockfile
 funopen
-futex
 futimens
 fwide
 fwprintf
@@ -770,7 +750,6 @@ openlog_r
 pathconf
 pause
 pclose
-perf_event_open
 perror
 personality
 pipe
@@ -1001,7 +980,6 @@ sigismember
 siglongjmp
 signal
 signalfd
-signalfd4
 sigpending
 sigprocmask
 sigsetjmp
@@ -1146,6 +1124,7 @@ utimes
 utmpname
 valloc
 vasprintf
+vdprintf
 verr
 verrx
 vfdprintf

ndk/platforms/android-20/arch-x86/symbols/libc.so.variables.txt

@@ -1,13 +1,13 @@
 _C_ctype_
 _C_tolower_
 _C_toupper_
+_ZSt7nothrow
 __atexit
 __atexit_invalid
 __bionic_brk
 __isthreaded
 __libc_malloc_default_dispatch
 __libc_malloc_dispatch
-__netdClientDispatch
 __p_cert_syms
 __p_class_syms
 __p_key_syms
@@ -21,8 +21,6 @@ __rand48_add
 __rand48_mult
 __rand48_seed
 __sF
-__sdidinit
-__sglue
 __stack_chk_guard
 __system_property_area__
 _ctype_
@@ -31,10 +29,6 @@ _tolower_tab_
 _toupper_tab_
 daylight
 environ
-g_allocations_mutex
-g_hash_table
-g_malloc_debug_backlog
-g_malloc_debug_level
 h_errlist
 h_nerr
 optarg

ndk/platforms/android-20/arch-x86/symbols/libm.so.functions.txt

@@ -1,22 +1,6 @@
-__exp__D
-__ieee754_rem_pio2
-__ieee754_rem_pio2f
-__kernel_cos
-__kernel_cosdf
-__kernel_rem_pio2
-__kernel_sin
-__kernel_sindf
-__kernel_tan
-__kernel_tandf
-__ldexp_cexp
-__ldexp_cexpf
-__ldexp_exp
-__ldexp_expf
-__log__D
 __signbit
 __signbitf
 __signbitl
-_scan_nan
 acos
 acosf
 acosh
@@ -38,27 +22,13 @@ atanh
 atanhf
 atanhl
 atanl
-cabs
-cabsf
 cabsl
-carg
-cargf
 cbrt
 cbrtf
 cbrtl
-ccos
-ccosf
-ccosh
-ccoshf
 ceil
 ceilf
 ceill
-cexp
-cexpf
-cimag
-cimagf
-conj
-conjf
 copysign
 copysignf
 copysignl
@@ -68,22 +38,8 @@ cosh
 coshf
 coshl
 cosl
-cproj
-cprojf
 cprojl
-creal
-crealf
-csin
-csinf
-csinh
-csinhf
-csqrt
-csqrtf
 csqrtl
-ctan
-ctanf
-ctanh
-ctanhf
 drem
 dremf
 erf
@@ -151,14 +107,6 @@ hypotl
 ilogb
 ilogbf
 ilogbl
-imprecise_coshl
-imprecise_erfcl
-imprecise_erfl
-imprecise_lgammal
-imprecise_powl
-imprecise_sinhl
-imprecise_tanhl
-imprecise_tgammal
 j0
 j0f
 j1

ndk/platforms/android-20/arch-x86/symbols/libm.so.variables.txt

@@ -1,3 +1,2 @@
 __fe_dfl_env
-__has_sse
 signgam

ndk/platforms/android-20/arch-x86/symbols/libstdc++.so.functions.txt

@@ -1,23 +1 @@
-_ZN9type_infoC1ERKS_
+__this_library_is_now_part_of_libc
-_ZN9type_infoC1Ev
-_ZN9type_infoC2ERKS_
-_ZN9type_infoC2Ev
-_ZN9type_infoD0Ev
-_ZN9type_infoD1Ev
-_ZN9type_infoD2Ev
-_ZNK9type_info4nameEv
-_ZNK9type_info6beforeERKS_
-_ZNK9type_infoeqERKS_
-_ZNK9type_infoneERKS_
-_ZdaPv
-_ZdaPvRKSt9nothrow_t
-_ZdlPv
-_ZdlPvRKSt9nothrow_t
-_Znam
-_ZnamRKSt9nothrow_t
-_Znwm
-_ZnwmRKSt9nothrow_t
-__cxa_guard_abort
-__cxa_guard_acquire
-__cxa_guard_release
-__cxa_pure_virtual

ndk/platforms/android-20/arch-x86/symbols/libstdc++.so.variables.txt

@@ -1,2 +1 @@
-_ZSt7nothrow
+
-_ZTV9type_info

ndk/platforms/android-20/arch-x86/symbols/libz.so.functions.txt

@@ -0,0 +1,88 @@
+_tr_align
+_tr_flush_bits
+_tr_flush_block
+_tr_init
+_tr_stored_block
+_tr_tally
+adler32
+adler32_combine
+adler32_combine64
+compress
+compress2
+compressBound
+crc32
+crc32_combine
+crc32_combine64
+deflate
+deflateBound
+deflateCopy
+deflateEnd
+deflateInit2_
+deflateInit_
+deflateParams
+deflatePending
+deflatePrime
+deflateReset
+deflateResetKeep
+deflateSetDictionary
+deflateSetHeader
+deflateTune
+get_crc_table
+gz_error
+gzbuffer
+gzclearerr
+gzclose
+gzclose_r
+gzclose_w
+gzdirect
+gzdopen
+gzeof
+gzerror
+gzflush
+gzgetc
+gzgetc_
+gzgets
+gzoffset
+gzoffset64
+gzopen
+gzopen64
+gzprintf
+gzputc
+gzputs
+gzread
+gzrewind
+gzseek
+gzseek64
+gzsetparams
+gztell
+gztell64
+gzungetc
+gzvprintf
+gzwrite
+inflate
+inflateBack
+inflateBackEnd
+inflateBackInit_
+inflateCopy
+inflateEnd
+inflateGetDictionary
+inflateGetHeader
+inflateInit2_
+inflateInit_
+inflateMark
+inflatePrime
+inflateReset
+inflateReset2
+inflateResetKeep
+inflateSetDictionary
+inflateSync
+inflateSyncPoint
+inflateUndermine
+inflate_fast
+inflate_table
+uncompress
+zError
+zcalloc
+zcfree
+zlibCompileFlags
+zlibVersion

ndk/platforms/android-20/arch-x86/symbols/libz.so.variables.txt

@@ -0,0 +1,5 @@
+_dist_code
+_length_code
+deflate_copyright
+inflate_copyright
+z_errmsg

ndk/platforms/android-20/arch-x86_64/symbols/libc.so.functions.txt

@@ -24,11 +24,18 @@ _Unwind_Resume
 _Unwind_Resume_or_Rethrow
 _Unwind_SetGR
 _Unwind_SetIP
+_ZdaPv
+_ZdaPvRKSt9nothrow_t
+_ZdlPv
+_ZdlPvRKSt9nothrow_t
+_Znam
+_ZnamRKSt9nothrow_t
+_Znwm
+_ZnwmRKSt9nothrow_t
 __FD_CLR_chk
 __FD_ISSET_chk
 __FD_SET_chk
 __android_set_abort_message
-__arc4_getbyte
 __assert
 __assert2
 __b64_ntop
@@ -36,6 +43,10 @@ __b64_pton
 __bionic_name_mem
 __cxa_atexit
 __cxa_finalize
+__cxa_guard_abort
+__cxa_guard_acquire
+__cxa_guard_release
+__cxa_pure_virtual
 __deregister_frame
 __deregister_frame_info
 __deregister_frame_info_bases
@@ -54,7 +65,6 @@ __evTimeSpec
 __evTimeVal
 __evUTCTime
 __fgets_chk
-__fgetwc_unlock
 __findenv
 __fp_nquery
 __fp_query
@@ -62,16 +72,8 @@ __fpclassify
 __fpclassifyd
 __fpclassifyf
 __fpclassifyl
-__fputwc_unlock
 __frame_state_for
-__futex_syscall3
-__futex_syscall4
-__futex_wait
-__futex_wait_ex
-__futex_wake
-__futex_wake_ex
 __get_h_errno
-__get_sp
 __hostalias
 __isfinite
 __isfinitef
@@ -193,22 +195,10 @@ __res_vinit
 __sched_cpualloc
 __sched_cpucount
 __sched_cpufree
-__sclose
-__set_tls
-__sflags
-__sflush
-__sflush_locked
-__sfp
 __sfp_handle_exceptions
-__sfvwrite
-__sinit
-__smakebuf
 __snprintf_chk
 __sprintf_chk
-__sread
 __srefill
-__srget
-__sseek
 __stack_chk_fail
 __stpcpy_chk
 __stpncpy_chk
@@ -223,11 +213,6 @@ __strncat_chk
 __strncpy_chk
 __strncpy_chk2
 __strrchr_chk
-__svfscanf
-__swbuf
-__swhatbuf
-__swrite
-__swsetup
 __sym_ntop
 __sym_ntos
 __sym_ston
@@ -235,29 +220,19 @@ __system_properties_init
 __system_property_add
 __system_property_area_init
 __system_property_find
-__system_property_find_compat
 __system_property_find_nth
 __system_property_foreach
-__system_property_foreach_compat
 __system_property_get
 __system_property_read
-__system_property_read_compat
 __system_property_serial
 __system_property_set
 __system_property_set_filename
 __system_property_update
 __system_property_wait_any
 __umask_chk
-__ungetwc
-__vfprintf
-__vfwprintf
-__vfwscanf
 __vsnprintf_chk
 __vsprintf_chk
-_cleanup
 _exit
-_exit_with_stack_teardown
-_fwalk
 _getlong
 _getshort
 _longjmp
@@ -366,6 +341,7 @@ dlrealloc
 dlrealloc_in_place
 dlvalloc
 dn_expand
+dprintf
 drand48
 dup
 dup2
@@ -412,7 +388,6 @@ fcntl
 fdatasync
 fdopen
 fdopendir
-fdprintf
 feof
 ferror
 fflush
@@ -474,7 +449,6 @@ ftw
 ftw64
 funlockfile
 funopen
-futex
 futimens
 fwide
 fwprintf
@@ -719,7 +693,6 @@ openlog_r
 pathconf
 pause
 pclose
-perf_event_open
 perror
 personality
 pipe
@@ -944,7 +917,6 @@ sigismember
 siglongjmp
 signal
 signalfd
-signalfd4
 sigpending
 sigprocmask
 sigsetjmp
@@ -1050,7 +1022,6 @@ timerfd_create
 timerfd_gettime
 timerfd_settime
 times
-tkill
 tmpfile
 tmpnam
 toascii
@@ -1084,9 +1055,9 @@ utimes
 utmpname
 valloc
 vasprintf
+vdprintf
 verr
 verrx
-vfdprintf
 vfork
 vfprintf
 vfscanf

ndk/platforms/android-20/arch-x86_64/symbols/libc.so.variables.txt

@@ -1,12 +1,12 @@
 _C_ctype_
 _C_tolower_
 _C_toupper_
+_ZSt7nothrow
 __atexit
 __atexit_invalid
 __isthreaded
 __libc_malloc_default_dispatch
 __libc_malloc_dispatch
-__netdClientDispatch
 __p_cert_syms
 __p_class_syms
 __p_key_syms
@@ -18,8 +18,6 @@ __rand48_add
 __rand48_mult
 __rand48_seed
 __sF
-__sdidinit
-__sglue
 __stack_chk_guard
 __system_property_area__
 _ctype_
@@ -28,10 +26,6 @@ _tolower_tab_
 _toupper_tab_
 daylight
 environ
-g_allocations_mutex
-g_hash_table
-g_malloc_debug_backlog
-g_malloc_debug_level
 h_errlist
 h_nerr
 optarg

ndk/platforms/android-20/arch-x86_64/symbols/libm.so.functions.txt

@@ -1,7 +1,6 @@
 __addtf3
 __divtf3
 __eqtf2
-__exp__D
 __extenddftf2
 __extendsftf2
 __fixtfdi
@@ -9,35 +8,15 @@ __fixtfsi
 __floatsitf
 __getf2
 __gttf2
-__ieee754_rem_pio2
-__ieee754_rem_pio2f
-__kernel_cos
-__kernel_cosdf
-__kernel_cosl
-__kernel_rem_pio2
-__kernel_sin
-__kernel_sindf
-__kernel_sinl
-__kernel_tan
-__kernel_tandf
-__kernel_tanl
-__ldexp_cexp
-__ldexp_cexpf
-__ldexp_exp
-__ldexp_expf
 __letf2
-__log__D
 __lttf2
-__multf3
 __netf2
-__sfp_handle_exceptions
 __signbit
 __signbitf
 __signbitl
 __subtf3
 __trunctfdf2
 __trunctfsf2
-_scan_nan
 acos
 acosf
 acosh
@@ -59,26 +38,12 @@ atanh
 atanhf
 atanhl
 atanl
-cabs
-cabsf
-carg
-cargf
 cbrt
 cbrtf
 cbrtl
-ccos
-ccosf
-ccosh
-ccoshf
 ceil
 ceilf
 ceill
-cexp
-cexpf
-cimag
-cimagf
-conj
-conjf
 copysign
 copysignf
 copysignl
@@ -88,20 +53,6 @@ cosh
 coshf
 coshl
 cosl
-cproj
-cprojf
-creal
-crealf
-csin
-csinf
-csinh
-csinhf
-csqrt
-csqrtf
-ctan
-ctanf
-ctanh
-ctanhf
 drem
 dremf
 erf
@@ -169,14 +120,6 @@ hypotl
 ilogb
 ilogbf
 ilogbl
-imprecise_coshl
-imprecise_erfcl
-imprecise_erfl
-imprecise_lgammal
-imprecise_powl
-imprecise_sinhl
-imprecise_tanhl
-imprecise_tgammal
 j0
 j0f
 j1

ndk/platforms/android-20/arch-x86_64/symbols/libm.so.variables.txt

@@ -1,25 +1,2 @@
-_ItL_aT
-_ItL_atanhi
-_ItL_atanlo
-_ItL_pS0
-_ItL_pS1
-_ItL_pS2
-_ItL_pS3
-_ItL_pS4
-_ItL_pS5
-_ItL_pS6
-_ItL_pS7
-_ItL_pS8
-_ItL_pS9
-_ItL_pi_lo
-_ItL_qS1
-_ItL_qS2
-_ItL_qS3
-_ItL_qS4
-_ItL_qS5
-_ItL_qS6
-_ItL_qS7
-_ItL_qS8
-_ItL_qS9
 __fe_dfl_env
 signgam

ndk/platforms/android-20/arch-x86_64/symbols/libstdc++.so.functions.txt

@@ -1,23 +1 @@
-_ZN9type_infoC1ERKS_
+__this_library_is_now_part_of_libc
-_ZN9type_infoC1Ev
-_ZN9type_infoC2ERKS_
-_ZN9type_infoC2Ev
-_ZN9type_infoD0Ev
-_ZN9type_infoD1Ev
-_ZN9type_infoD2Ev
-_ZNK9type_info4nameEv
-_ZNK9type_info6beforeERKS_
-_ZNK9type_infoeqERKS_
-_ZNK9type_infoneERKS_
-_ZdaPv
-_ZdaPvRKSt9nothrow_t
-_ZdlPv
-_ZdlPvRKSt9nothrow_t
-_Znam
-_ZnamRKSt9nothrow_t
-_Znwm
-_ZnwmRKSt9nothrow_t
-__cxa_guard_abort
-__cxa_guard_acquire
-__cxa_guard_release
-__cxa_pure_virtual

ndk/platforms/android-20/arch-x86_64/symbols/libstdc++.so.variables.txt

@@ -1,2 +1 @@
-_ZSt7nothrow
+
-_ZTV9type_info

ndk/platforms/android-20/arch-x86_64/symbols/libz.so.functions.txt

@@ -0,0 +1,88 @@
+_tr_align
+_tr_flush_bits
+_tr_flush_block
+_tr_init
+_tr_stored_block
+_tr_tally
+adler32
+adler32_combine
+adler32_combine64
+compress
+compress2
+compressBound
+crc32
+crc32_combine
+crc32_combine64
+deflate
+deflateBound
+deflateCopy
+deflateEnd
+deflateInit2_
+deflateInit_
+deflateParams
+deflatePending
+deflatePrime
+deflateReset
+deflateResetKeep
+deflateSetDictionary
+deflateSetHeader
+deflateTune
+get_crc_table
+gz_error
+gzbuffer
+gzclearerr
+gzclose
+gzclose_r
+gzclose_w
+gzdirect
+gzdopen
+gzeof
+gzerror
+gzflush
+gzgetc
+gzgetc_
+gzgets
+gzoffset
+gzoffset64
+gzopen
+gzopen64
+gzprintf
+gzputc
+gzputs
+gzread
+gzrewind
+gzseek
+gzseek64
+gzsetparams
+gztell
+gztell64
+gzungetc
+gzvprintf
+gzwrite
+inflate
+inflateBack
+inflateBackEnd
+inflateBackInit_
+inflateCopy
+inflateEnd
+inflateGetDictionary
+inflateGetHeader
+inflateInit2_
+inflateInit_
+inflateMark
+inflatePrime
+inflateReset
+inflateReset2
+inflateResetKeep
+inflateSetDictionary
+inflateSync
+inflateSyncPoint
+inflateUndermine
+inflate_fast
+inflate_table
+uncompress
+zError
+zcalloc
+zcfree
+zlibCompileFlags
+zlibVersion

ndk/platforms/android-20/arch-x86_64/symbols/libz.so.variables.txt

@@ -0,0 +1,5 @@
+_dist_code
+_length_code
+deflate_copyright
+inflate_copyright
+z_errmsg

ndk/platforms/android-20/include/dlfcn.h

@@ -50,15 +50,29 @@ extern void*        dlsym(void*  handle, const char*  symbol);
 extern int          dladdr(const void* addr, Dl_info *info);
 
 enum {
+#if defined(__LP64__)
+  RTLD_NOW  = 2,
+#else
   RTLD_NOW  = 0,
+#endif
   RTLD_LAZY = 1,
 
   RTLD_LOCAL  = 0,
+#if defined(__LP64__)
+  RTLD_GLOBAL = 0x00100,
+#else
   RTLD_GLOBAL = 2,
+#endif
+  RTLD_NOLOAD = 4,
 };
 
+#if defined (__LP64__)
+#define RTLD_DEFAULT  ((void*) 0)
+#define RTLD_NEXT     ((void*) -1L)
+#else
 #define RTLD_DEFAULT  ((void*) 0xffffffff)
 #define RTLD_NEXT     ((void*) 0xfffffffe)
+#endif
 
 __END_DECLS
 

ndk/platforms/android-20/include/fenv.h

@@ -34,6 +34,7 @@
 #include <machine/fenv.h>
 
 __BEGIN_DECLS
+#pragma GCC visibility push(default)
 
 int feclearexcept(int);
 int fegetexceptflag(fexcept_t *, int);
@@ -64,6 +65,7 @@ int fegetexcept(void);
 extern const fenv_t __fe_dfl_env;
 #define FE_DFL_ENV  (&__fe_dfl_env)
 
+#pragma GCC visibility pop
 __END_DECLS
 
 #endif  /* ! _FENV_H_ */

ndk/platforms/android-20/include/math.h

@@ -20,6 +20,9 @@
 #include <sys/cdefs.h>
 #include <limits.h>
 
+__BEGIN_DECLS
+#pragma GCC visibility push(default)
+
 /*
  * ANSI/POSIX
  */
@@ -165,7 +168,7 @@ extern int signgam;
  * effect of raising floating-point exceptions, so they are not declared
  * as __pure2.  In C99, FENV_ACCESS affects the purity of these functions.
  */
-__BEGIN_DECLS
+
 /*
  * ANSI/POSIX
  */
@@ -282,6 +285,7 @@ double	trunc(double);
 double	drem(double, double);
 int	finite(double) __pure2;
 int	isnanf(float) __pure2;
+long double significandl(long double);
 
 /*
  * Reentrant version of gamma & lgamma; passes signgam back by reference
@@ -464,6 +468,7 @@ void sincosf(float, float*, float*);
 void sincosl(long double, long double*, long double*);
 #endif /* _GNU_SOURCE */
 
+#pragma GCC visibility pop
 __END_DECLS
 
 #endif /* !_MATH_H_ */

ndk/platforms/android-20/include/pthread.h

@@ -94,16 +94,28 @@ typedef long pthread_condattr_t;
 typedef long pthread_rwlockattr_t;
 
 typedef struct {
-  pthread_mutex_t lock;
+#if !defined(__LP64__)
-  pthread_cond_t cond;
+  pthread_mutex_t __unused_lock;
-  int numLocks;
+  pthread_cond_t __unused_cond;
-  int writerThreadId;
+#endif
-  int pendingReaders;
+  volatile int32_t state; // 0=unlock, -1=writer lock, +n=reader lock
-  int pendingWriters;
+  volatile int32_t writer_thread_id;
-  void* __reserved[4];
+  volatile int32_t pending_readers;
+  volatile int32_t pending_writers;
+  int32_t attr;
+#ifdef __LP64__
+  char __reserved[36];
+#else
+  char __reserved[12];
+#endif
+
 } pthread_rwlock_t;
 
-#define PTHREAD_RWLOCK_INITIALIZER  { PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, 0, 0, 0, { NULL, NULL, NULL, NULL } }
+#ifdef __LP64__
+  #define PTHREAD_RWLOCK_INITIALIZER  { 0, 0, 0, 0, 0, { 0 } }
+#else
+  #define PTHREAD_RWLOCK_INITIALIZER  { PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, 0, 0, 0, 0, { 0 } }
+#endif
 
 typedef int pthread_key_t;
 typedef long pthread_t;

ndk/platforms/android-20/include/stdatomic.h

@@ -0,0 +1,420 @@
+/*-
+ * Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
+ *                    David Chisnall <theraven@FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _STDATOMIC_H_
+#define	_STDATOMIC_H_
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+#include <stdbool.h>
+
+#if __has_extension(c_atomic) || __has_extension(cxx_atomic)
+#define	__CLANG_ATOMICS
+#elif __GNUC_PREREQ__(4, 7)
+#define	__GNUC_ATOMICS
+#elif defined(__GNUC__)
+#define	__SYNC_ATOMICS
+#else
+#error "stdatomic.h does not support your compiler"
+#endif
+
+/*
+ * 7.17.1 Atomic lock-free macros.
+ */
+
+#ifdef __GCC_ATOMIC_BOOL_LOCK_FREE
+#define	ATOMIC_BOOL_LOCK_FREE		__GCC_ATOMIC_BOOL_LOCK_FREE
+#endif
+#ifdef __GCC_ATOMIC_CHAR_LOCK_FREE
+#define	ATOMIC_CHAR_LOCK_FREE		__GCC_ATOMIC_CHAR_LOCK_FREE
+#endif
+#ifdef __GCC_ATOMIC_CHAR16_T_LOCK_FREE
+#define	ATOMIC_CHAR16_T_LOCK_FREE	__GCC_ATOMIC_CHAR16_T_LOCK_FREE
+#endif
+#ifdef __GCC_ATOMIC_CHAR32_T_LOCK_FREE
+#define	ATOMIC_CHAR32_T_LOCK_FREE	__GCC_ATOMIC_CHAR32_T_LOCK_FREE
+#endif
+#ifdef __GCC_ATOMIC_WCHAR_T_LOCK_FREE
+#define	ATOMIC_WCHAR_T_LOCK_FREE	__GCC_ATOMIC_WCHAR_T_LOCK_FREE
+#endif
+#ifdef __GCC_ATOMIC_SHORT_LOCK_FREE
+#define	ATOMIC_SHORT_LOCK_FREE		__GCC_ATOMIC_SHORT_LOCK_FREE
+#endif
+#ifdef __GCC_ATOMIC_INT_LOCK_FREE
+#define	ATOMIC_INT_LOCK_FREE		__GCC_ATOMIC_INT_LOCK_FREE
+#endif
+#ifdef __GCC_ATOMIC_LONG_LOCK_FREE
+#define	ATOMIC_LONG_LOCK_FREE		__GCC_ATOMIC_LONG_LOCK_FREE
+#endif
+#ifdef __GCC_ATOMIC_LLONG_LOCK_FREE
+#define	ATOMIC_LLONG_LOCK_FREE		__GCC_ATOMIC_LLONG_LOCK_FREE
+#endif
+#ifdef __GCC_ATOMIC_POINTER_LOCK_FREE
+#define	ATOMIC_POINTER_LOCK_FREE	__GCC_ATOMIC_POINTER_LOCK_FREE
+#endif
+
+/*
+ * 7.17.2 Initialization.
+ */
+
+#if defined(__CLANG_ATOMICS)
+#define	ATOMIC_VAR_INIT(value)		(value)
+#define	atomic_init(obj, value)		__c11_atomic_init(obj, value)
+#else
+#define	ATOMIC_VAR_INIT(value)		{ .__val = (value) }
+#define	atomic_init(obj, value)		((void)((obj)->__val = (value)))
+#endif
+
+/*
+ * Clang and recent GCC both provide predefined macros for the memory
+ * orderings.  If we are using a compiler that doesn't define them, use the
+ * clang values - these will be ignored in the fallback path.
+ */
+
+#ifndef __ATOMIC_RELAXED
+#define __ATOMIC_RELAXED		0
+#endif
+#ifndef __ATOMIC_CONSUME
+#define __ATOMIC_CONSUME		1
+#endif
+#ifndef __ATOMIC_ACQUIRE
+#define __ATOMIC_ACQUIRE		2
+#endif
+#ifndef __ATOMIC_RELEASE
+#define __ATOMIC_RELEASE		3
+#endif
+#ifndef __ATOMIC_ACQ_REL
+#define __ATOMIC_ACQ_REL		4
+#endif
+#ifndef __ATOMIC_SEQ_CST
+#define __ATOMIC_SEQ_CST		5
+#endif
+
+/*
+ * 7.17.3 Order and consistency.
+ *
+ * The memory_order_* constants that denote the barrier behaviour of the
+ * atomic operations.
+ */
+
+typedef enum {
+	memory_order_relaxed = __ATOMIC_RELAXED,
+	memory_order_consume = __ATOMIC_CONSUME,
+	memory_order_acquire = __ATOMIC_ACQUIRE,
+	memory_order_release = __ATOMIC_RELEASE,
+	memory_order_acq_rel = __ATOMIC_ACQ_REL,
+	memory_order_seq_cst = __ATOMIC_SEQ_CST
+} memory_order;
+
+/*
+ * 7.17.4 Fences.
+ */
+
+static __inline void
+atomic_thread_fence(memory_order __order __unused)
+{
+
+#ifdef __CLANG_ATOMICS
+	__c11_atomic_thread_fence(__order);
+#elif defined(__GNUC_ATOMICS)
+	__atomic_thread_fence(__order);
+#else
+	__sync_synchronize();
+#endif
+}
+
+static __inline void
+atomic_signal_fence(memory_order __order __unused)
+{
+
+#ifdef __CLANG_ATOMICS
+	__c11_atomic_signal_fence(__order);
+#elif defined(__GNUC_ATOMICS)
+	__atomic_signal_fence(__order);
+#else
+	__asm volatile ("" ::: "memory");
+#endif
+}
+
+/*
+ * 7.17.5 Lock-free property.
+ */
+
+#if defined(_KERNEL)
+/* Atomics in kernelspace are always lock-free. */
+#define	atomic_is_lock_free(obj) \
+	((void)(obj), (_Bool)1)
+#elif defined(__CLANG_ATOMICS)
+#define	atomic_is_lock_free(obj) \
+	__atomic_is_lock_free(sizeof(*(obj)), obj)
+#elif defined(__GNUC_ATOMICS)
+#define	atomic_is_lock_free(obj) \
+	__atomic_is_lock_free(sizeof((obj)->__val), &(obj)->__val)
+#else
+#define	atomic_is_lock_free(obj) \
+	((void)(obj), sizeof((obj)->__val) <= sizeof(void *))
+#endif
+
+/*
+ * 7.17.6 Atomic integer types.
+ */
+
+#if !__has_extension(c_atomic) && !__has_extension(cxx_atomic)
+/*
+ * No native support for _Atomic(). Place object in structure to prevent
+ * most forms of direct non-atomic access.
+ */
+#define _Atomic(T)              struct { T volatile __val; }
+#endif
+
+typedef _Atomic(bool)			atomic_bool;
+typedef _Atomic(char)			atomic_char;
+typedef _Atomic(signed char)		atomic_schar;
+typedef _Atomic(unsigned char)		atomic_uchar;
+typedef _Atomic(short)			atomic_short;
+typedef _Atomic(unsigned short)		atomic_ushort;
+typedef _Atomic(int)			atomic_int;
+typedef _Atomic(unsigned int)		atomic_uint;
+typedef _Atomic(long)			atomic_long;
+typedef _Atomic(unsigned long)		atomic_ulong;
+typedef _Atomic(long long)		atomic_llong;
+typedef _Atomic(unsigned long long)	atomic_ullong;
+typedef _Atomic(char16_t)		atomic_char16_t;
+typedef _Atomic(char32_t)		atomic_char32_t;
+typedef _Atomic(wchar_t)		atomic_wchar_t;
+typedef _Atomic(int_least8_t)		atomic_int_least8_t;
+typedef _Atomic(uint_least8_t)	atomic_uint_least8_t;
+typedef _Atomic(int_least16_t)	atomic_int_least16_t;
+typedef _Atomic(uint_least16_t)	atomic_uint_least16_t;
+typedef _Atomic(int_least32_t)	atomic_int_least32_t;
+typedef _Atomic(uint_least32_t)	atomic_uint_least32_t;
+typedef _Atomic(int_least64_t)	atomic_int_least64_t;
+typedef _Atomic(uint_least64_t)	atomic_uint_least64_t;
+typedef _Atomic(int_fast8_t)		atomic_int_fast8_t;
+typedef _Atomic(uint_fast8_t)		atomic_uint_fast8_t;
+typedef _Atomic(int_fast16_t)		atomic_int_fast16_t;
+typedef _Atomic(uint_fast16_t)	atomic_uint_fast16_t;
+typedef _Atomic(int_fast32_t)		atomic_int_fast32_t;
+typedef _Atomic(uint_fast32_t)	atomic_uint_fast32_t;
+typedef _Atomic(int_fast64_t)		atomic_int_fast64_t;
+typedef _Atomic(uint_fast64_t)	atomic_uint_fast64_t;
+typedef _Atomic(intptr_t)		atomic_intptr_t;
+typedef _Atomic(uintptr_t)		atomic_uintptr_t;
+typedef _Atomic(size_t)		atomic_size_t;
+typedef _Atomic(ptrdiff_t)		atomic_ptrdiff_t;
+typedef _Atomic(intmax_t)		atomic_intmax_t;
+typedef _Atomic(uintmax_t)		atomic_uintmax_t;
+
+/*
+ * 7.17.7 Operations on atomic types.
+ */
+
+/*
+ * Compiler-specific operations.
+ */
+
+#if defined(__CLANG_ATOMICS)
+#define	atomic_compare_exchange_strong_explicit(object, expected,	\
+    desired, success, failure)						\
+	__c11_atomic_compare_exchange_strong(object, expected, desired,	\
+	    success, failure)
+#define	atomic_compare_exchange_weak_explicit(object, expected,		\
+    desired, success, failure)						\
+	__c11_atomic_compare_exchange_weak(object, expected, desired,	\
+	    success, failure)
+#define	atomic_exchange_explicit(object, desired, order)		\
+	__c11_atomic_exchange(object, desired, order)
+#define	atomic_fetch_add_explicit(object, operand, order)		\
+	__c11_atomic_fetch_add(object, operand, order)
+#define	atomic_fetch_and_explicit(object, operand, order)		\
+	__c11_atomic_fetch_and(object, operand, order)
+#define	atomic_fetch_or_explicit(object, operand, order)		\
+	__c11_atomic_fetch_or(object, operand, order)
+#define	atomic_fetch_sub_explicit(object, operand, order)		\
+	__c11_atomic_fetch_sub(object, operand, order)
+#define	atomic_fetch_xor_explicit(object, operand, order)		\
+	__c11_atomic_fetch_xor(object, operand, order)
+#define	atomic_load_explicit(object, order)				\
+	__c11_atomic_load(object, order)
+#define	atomic_store_explicit(object, desired, order)			\
+	__c11_atomic_store(object, desired, order)
+#elif defined(__GNUC_ATOMICS)
+#define	atomic_compare_exchange_strong_explicit(object, expected,	\
+    desired, success, failure)						\
+	__atomic_compare_exchange_n(&(object)->__val, expected,		\
+	    desired, 0, success, failure)
+#define	atomic_compare_exchange_weak_explicit(object, expected,		\
+    desired, success, failure)						\
+	__atomic_compare_exchange_n(&(object)->__val, expected,		\
+	    desired, 1, success, failure)
+#define	atomic_exchange_explicit(object, desired, order)		\
+	__atomic_exchange_n(&(object)->__val, desired, order)
+#define	atomic_fetch_add_explicit(object, operand, order)		\
+	__atomic_fetch_add(&(object)->__val, operand, order)
+#define	atomic_fetch_and_explicit(object, operand, order)		\
+	__atomic_fetch_and(&(object)->__val, operand, order)
+#define	atomic_fetch_or_explicit(object, operand, order)		\
+	__atomic_fetch_or(&(object)->__val, operand, order)
+#define	atomic_fetch_sub_explicit(object, operand, order)		\
+	__atomic_fetch_sub(&(object)->__val, operand, order)
+#define	atomic_fetch_xor_explicit(object, operand, order)		\
+	__atomic_fetch_xor(&(object)->__val, operand, order)
+#define	atomic_load_explicit(object, order)				\
+	__atomic_load_n(&(object)->__val, order)
+#define	atomic_store_explicit(object, desired, order)			\
+	__atomic_store_n(&(object)->__val, desired, order)
+#else
+#define	__atomic_apply_stride(object, operand) \
+	(((__typeof__((object)->__val))0) + (operand))
+#define	atomic_compare_exchange_strong_explicit(object, expected,	\
+    desired, success, failure)	__extension__ ({			\
+	__typeof__(expected) __ep = (expected);				\
+	__typeof__(*__ep) __e = *__ep;					\
+	(void)(success); (void)(failure);				\
+	(bool)((*__ep = __sync_val_compare_and_swap(&(object)->__val,	\
+	    __e, desired)) == __e);					\
+})
+#define	atomic_compare_exchange_weak_explicit(object, expected,		\
+    desired, success, failure)						\
+	atomic_compare_exchange_strong_explicit(object, expected,	\
+		desired, success, failure)
+#if __has_builtin(__sync_swap)
+/* Clang provides a full-barrier atomic exchange - use it if available. */
+#define	atomic_exchange_explicit(object, desired, order)		\
+	((void)(order), __sync_swap(&(object)->__val, desired))
+#else
+/*
+ * __sync_lock_test_and_set() is only an acquire barrier in theory (although in
+ * practice it is usually a full barrier) so we need an explicit barrier before
+ * it.
+ */
+#define	atomic_exchange_explicit(object, desired, order)		\
+__extension__ ({							\
+	__typeof__(object) __o = (object);				\
+	__typeof__(desired) __d = (desired);				\
+	(void)(order);							\
+	__sync_synchronize();						\
+	__sync_lock_test_and_set(&(__o)->__val, __d);			\
+})
+#endif
+#define	atomic_fetch_add_explicit(object, operand, order)		\
+	((void)(order), __sync_fetch_and_add(&(object)->__val,		\
+	    __atomic_apply_stride(object, operand)))
+#define	atomic_fetch_and_explicit(object, operand, order)		\
+	((void)(order), __sync_fetch_and_and(&(object)->__val, operand))
+#define	atomic_fetch_or_explicit(object, operand, order)		\
+	((void)(order), __sync_fetch_and_or(&(object)->__val, operand))
+#define	atomic_fetch_sub_explicit(object, operand, order)		\
+	((void)(order), __sync_fetch_and_sub(&(object)->__val,		\
+	    __atomic_apply_stride(object, operand)))
+#define	atomic_fetch_xor_explicit(object, operand, order)		\
+	((void)(order), __sync_fetch_and_xor(&(object)->__val, operand))
+#define	atomic_load_explicit(object, order)				\
+	((void)(order), __sync_fetch_and_add(&(object)->__val, 0))
+#define	atomic_store_explicit(object, desired, order)			\
+	((void)atomic_exchange_explicit(object, desired, order))
+#endif
+
+/*
+ * Convenience functions.
+ *
+ * Don't provide these in kernel space. In kernel space, we should be
+ * disciplined enough to always provide explicit barriers.
+ */
+
+#ifndef _KERNEL
+#define	atomic_compare_exchange_strong(object, expected, desired)	\
+	atomic_compare_exchange_strong_explicit(object, expected,	\
+	    desired, memory_order_seq_cst, memory_order_seq_cst)
+#define	atomic_compare_exchange_weak(object, expected, desired)		\
+	atomic_compare_exchange_weak_explicit(object, expected,		\
+	    desired, memory_order_seq_cst, memory_order_seq_cst)
+#define	atomic_exchange(object, desired)				\
+	atomic_exchange_explicit(object, desired, memory_order_seq_cst)
+#define	atomic_fetch_add(object, operand)				\
+	atomic_fetch_add_explicit(object, operand, memory_order_seq_cst)
+#define	atomic_fetch_and(object, operand)				\
+	atomic_fetch_and_explicit(object, operand, memory_order_seq_cst)
+#define	atomic_fetch_or(object, operand)				\
+	atomic_fetch_or_explicit(object, operand, memory_order_seq_cst)
+#define	atomic_fetch_sub(object, operand)				\
+	atomic_fetch_sub_explicit(object, operand, memory_order_seq_cst)
+#define	atomic_fetch_xor(object, operand)				\
+	atomic_fetch_xor_explicit(object, operand, memory_order_seq_cst)
+#define	atomic_load(object)						\
+	atomic_load_explicit(object, memory_order_seq_cst)
+#define	atomic_store(object, desired)					\
+	atomic_store_explicit(object, desired, memory_order_seq_cst)
+#endif /* !_KERNEL */
+
+/*
+ * 7.17.8 Atomic flag type and operations.
+ *
+ * XXX: Assume atomic_bool can be used as an atomic_flag. Is there some
+ * kind of compiler built-in type we could use?
+ */
+
+typedef struct {
+	atomic_bool	__flag;
+} atomic_flag;
+
+#define	ATOMIC_FLAG_INIT		{ ATOMIC_VAR_INIT(0) }
+
+static __inline bool
+atomic_flag_test_and_set_explicit(volatile atomic_flag *__object,
+    memory_order __order)
+{
+	return (atomic_exchange_explicit(&__object->__flag, 1, __order));
+}
+
+static __inline void
+atomic_flag_clear_explicit(volatile atomic_flag *__object, memory_order __order)
+{
+
+	atomic_store_explicit(&__object->__flag, 0, __order);
+}
+
+#ifndef _KERNEL
+static __inline bool
+atomic_flag_test_and_set(volatile atomic_flag *__object)
+{
+
+	return (atomic_flag_test_and_set_explicit(__object,
+	    memory_order_seq_cst));
+}
+
+static __inline void
+atomic_flag_clear(volatile atomic_flag *__object)
+{
+
+	atomic_flag_clear_explicit(__object, memory_order_seq_cst);
+}
+#endif /* !_KERNEL */
+
+#endif /* !_STDATOMIC_H_ */

ndk/platforms/android-20/include/stdio.h

@@ -250,6 +250,9 @@ int	 vfprintf(FILE * __restrict, const char * __restrict, __va_list)
 int	 vprintf(const char * __restrict, __va_list)
 		__printflike(1, 0);
 
+int dprintf(int, const char * __restrict, ...) __printflike(2, 3);
+int vdprintf(int, const char * __restrict, __va_list) __printflike(2, 0);
+
 #ifndef __AUDIT__
 char* gets(char*) __warnattr("gets is very unsafe; consider using fgets");
 int sprintf(char* __restrict, const char* __restrict, ...)
@@ -359,21 +362,6 @@ __END_DECLS
 #define	fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)
 #endif /* __BSD_VISIBLE */
 
-#ifdef _GNU_SOURCE
-/*
- * glibc defines dprintf(int, const char*, ...), which is poorly named
- * and likely to conflict with locally defined debugging printfs
- * fdprintf is a better name, and some programs that use fdprintf use a
- * #define fdprintf dprintf for compatibility
- */
-__BEGIN_DECLS
-int fdprintf(int, const char*, ...)
-		__printflike(2, 3);
-int vfdprintf(int, const char*, __va_list)
-		__printflike(2, 0);
-__END_DECLS
-#endif /* _GNU_SOURCE */
-
 #if defined(__BIONIC_FORTIFY)
 
 __BEGIN_DECLS

ndk/platforms/android-20/include/sys/cdefs.h

@@ -37,6 +37,24 @@
 #ifndef	_SYS_CDEFS_H_
 #define	_SYS_CDEFS_H_
 
+/*
+ * Testing against Clang-specific extensions.
+ */
+
+#ifndef __has_extension
+#define __has_extension         __has_feature
+#endif
+#ifndef __has_feature
+#define __has_feature(x)        0
+#endif
+#ifndef __has_include
+#define __has_include(x)        0
+#endif
+#ifndef __has_builtin
+#define __has_builtin(x)        0
+#endif
+
+
 /*
  * Macro to test if we're using a GNU C compiler of a specific vintage
  * or later, for e.g. features that appeared in a particular version

ndk/platforms/android-20/include/sys/ucontext.h

@@ -60,8 +60,6 @@ enum {
 typedef int greg_t;
 typedef greg_t gregset_t[NGREG];
 
-/* TODO: fpregset_t. */
-
 #include <asm/sigcontext.h>
 typedef struct sigcontext mcontext_t;
 
@@ -71,13 +69,12 @@ typedef struct ucontext {
   stack_t uc_stack;
   mcontext_t uc_mcontext;
   sigset_t uc_sigmask;
-  /* TODO: uc_regspace */
+  char __padding[128 - sizeof(sigset_t)];
+  unsigned long uc_regspace[128] __attribute__((__aligned__(8)));
 } ucontext_t;
 
 #elif defined(__aarch64__)
 
-/* TODO: gregset_t and fpregset_t. */
-
 #include <asm/sigcontext.h>
 typedef struct sigcontext mcontext_t;
 
@@ -201,6 +198,7 @@ typedef struct ucontext {
   stack_t uc_stack;
   mcontext_t uc_mcontext;
   sigset_t uc_sigmask;
+  char __padding[128 - sizeof(sigset_t)];
 } ucontext_t;
 
 #elif defined(__mips64__)

ndk/platforms/android-20/include/unistd.h

@@ -207,7 +207,7 @@ extern int setdomainname(const char *, size_t);
 
 /* Used to retry syscalls that can return EINTR. */
 #define TEMP_FAILURE_RETRY(exp) ({         \
-    typeof (exp) _rc;                      \
+    __typeof__(exp) _rc;                   \
     do {                                   \
         _rc = (exp);                       \
     } while (_rc == -1 && errno == EINTR); \