Merge changes Iaa2aba28,I3ed36a15

am: 6a8ad129ef

* commit '6a8ad129ef54a4748b00c458443ed62dcac433f8':
  android-18: Cleanup libm symbols
  android-18: Cleanup libc symbols for x86/mips

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

@@ -33,6 +33,9 @@ __floatunsidf
 __floatunsisf
 __fp_nquery
 __fp_query
+__fpclassifyd
+__fpclassifyf
+__fpclassifyl
 __fstatfs64
 __futex_wait
 __futex_wake
@@ -46,6 +49,16 @@ __gnu_uldivmod_helper
 __gtdf2
 __hostalias
 __ioctl
+__isfinite
+__isfinitef
+__isfinitel
+__isinf
+__isinff
+__isinfl
+__isnanl
+__isnormal
+__isnormalf
+__isnormall
 __ledf2
 __libc_init
 __llseek
@@ -405,6 +418,8 @@ iscntrl
 isdigit
 isgraph
 islower
+isnan
+isnanf
 isprint
 ispunct
 issetugid

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

@@ -1,53 +1,6 @@
-__addsf3
-__aeabi_dcmpun
-__aeabi_f2iz
-__aeabi_fadd
-__aeabi_fcmpun
-__aeabi_fdiv
-__aeabi_fmul
-__aeabi_frsub
-__aeabi_fsub
-__aeabi_i2f
-__aeabi_l2f
-__aeabi_ui2f
-__aeabi_ul2f
-__divsf3
-__exp__D
-__fixsfsi
-__floatdisf
-__floatsisf
-__floatundisf
-__floatunsisf
-__fpclassifyd
-__fpclassifyf
-__fpclassifyl
-__ieee754_rem_pio2
-__ieee754_rem_pio2f
-__isfinite
-__isfinitef
-__isfinitel
-__isinf
-__isinff
-__isinfl
-__isnanl
-__isnormal
-__isnormalf
-__isnormall
-__kernel_cos
-__kernel_cosdf
-__kernel_rem_pio2
-__kernel_sin
-__kernel_sindf
-__kernel_tan
-__kernel_tandf
-__log__D
-__mulsf3
 __signbit
 __signbitf
 __signbitl
-__subsf3
-__unorddf2
-__unordsf2
 acos
 acosf
 acosh
@@ -118,15 +71,12 @@ hypotf
 ilogb
 ilogbf
 ilogbl
-isnan
-isnanf
 j0
 j0f
 j1
 j1f
 jn
 jnf
-ldexp
 ldexpf
 ldexpl
 lgamma

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

@@ -1,63 +1,44 @@
-MD5_Final
-MD5_Init
-MD5_Update
-__arc4_getbyte
 __assert
 __assert2
-__atexit_register_cleanup
-__atomic_cmpxchg
-__atomic_dec
-__atomic_inc
-__atomic_swap
 __b64_ntop
 __b64_pton
 __brk
-__clone_thread_start
 __cxa_atexit
 __cxa_finalize
 __dn_comp
 __dn_count_labels
 __dn_skipname
-__dorand48
 __errno
-__evAddTime
-__evCmpTime
-__evConsIovec
-__evConsTime
-__evNowTime
-__evSubTime
-__evTimeSpec
-__evTimeVal
-__evUTCTime
-__fcntl
 __fcntl64
-__findenv
-__fork
 __fp_nquery
 __fp_query
+__fpclassifyd
+__fpclassifyf
+__fpclassifyl
 __fstatfs64
-__futex_syscall3
-__futex_syscall4
 __futex_wait
-__futex_wait_ex
 __futex_wake
-__futex_wake_ex
 __get_h_errno
-__get_sp
-__get_stack_base
 __get_thread
 __get_tls
 __getcwd
 __getpriority
 __hostalias
-__init_tls
 __ioctl
-__libc_fini
+__isfinite
+__isfinitef
+__isfinitel
+__isinf
+__isinff
+__isinfl
+__isnanl
+__isnormal
+__isnormalf
+__isnormall
 __libc_init
 __llseek
 __loc_aton
 __loc_ntoa
-__memcmp16
 __mmap2
 __ns_format_ttl
 __ns_get16
@@ -92,69 +73,43 @@ __p_option
 __p_query
 __p_rcode
 __p_secstodate
-__p_section
-__p_sockun
 __p_time
 __p_type
 __pthread_cleanup_pop
 __pthread_cleanup_push
-__pthread_clone
-__pthread_cond_timedwait
-__pthread_cond_timedwait_relative
 __ptrace
 __putlong
 __putshort
 __reboot
 __res_close
 __res_dnok
-__res_get_nibblesuffix
-__res_get_nibblesuffix2
-__res_get_state
-__res_get_static
-__res_getservers
 __res_hnok
 __res_hostalias
 __res_isourserver
 __res_mailok
 __res_nameinquery
-__res_nametoclass
-__res_nametotype
 __res_nclose
-__res_ndestroy
 __res_ninit
 __res_nmkquery
-__res_nopt
 __res_nquery
 __res_nquerydomain
 __res_nsearch
 __res_nsend
-__res_opt
 __res_ownok
-__res_pquery
-__res_put_state
 __res_queriesmatch
 __res_querydomain
-__res_randomid
 __res_send
 __res_send_setqhook
 __res_send_setrhook
-__res_setservers
-__res_vinit
 __rt_sigaction
 __rt_sigprocmask
 __rt_sigtimedwait
 __sclose
-__set_thread_area
 __set_tls
-__setresuid
-__setreuid
-__setuid
 __sflags
 __sflush
 __sfp
-__sigsuspend
 __sinit
-__slbexpand
 __smakebuf
 __sread
 __srefill
@@ -163,21 +118,16 @@ __sseek
 __stack_chk_fail
 __statfs64
 __swbuf
-__swhatbuf
 __swrite
 __swsetup
 __sym_ntop
 __sym_ntos
 __sym_ston
-__sys_clone
-__syslog
 __system_properties_init
 __system_property_find
 __system_property_find_nth
 __system_property_get
 __system_property_read
-__system_property_wait
-__thread_entry
 __timer_create
 __timer_delete
 __timer_getoverrun
@@ -185,20 +135,13 @@ __timer_gettime
 __timer_settime
 __wait4
 __waitid
-_cleanup
-_dorand48
 _exit
-_exit_thread
-_exit_with_stack_teardown
 _flush_cache
 _fwalk
 _getlong
 _getshort
-_init_thread
 _longjmp
 _setjmp
-_thread_created_hook
-_waitpid
 abort
 accept
 access
@@ -247,9 +190,7 @@ clone
 close
 closedir
 closelog
-closelog_r
 connect
-cpuacct_add
 creat
 ctime
 ctime64
@@ -262,26 +203,12 @@ dirfd
 dirname
 dirname_r
 div
-dlcalloc
-dlfree
-dlindependent_calloc
-dlindependent_comalloc
-dlmallinfo
-dlmalloc_footprint
-dlmalloc_max_footprint
-dlmalloc_stats
-dlmallopt
-dlmemalign
-dlpvalloc
-dlrealloc
-dlvalloc
 dn_expand
 drand48
 dup
 dup2
 endpwent
 endservent
-endusershell
 endutent
 epoll_create
 epoll_ctl
@@ -336,7 +263,6 @@ fputws
 fread
 free
 freeaddrinfo
-freedtoa
 freopen
 fscanf
 fseek
@@ -360,7 +286,6 @@ fts_read
 fts_set
 funlockfile
 funopen
-futex
 fwide
 fwprintf
 fwrite
@@ -417,13 +342,11 @@ gets
 getservbyname
 getservbyport
 getservent
-getservent_r
 getsockname
 getsockopt
 gettid
 gettimeofday
 getuid
-getusershell
 getutent
 getwc
 getwchar
@@ -449,8 +372,6 @@ inotify_add_watch
 inotify_init
 inotify_rm_watch
 ioctl
-ioprio_get
-ioprio_set
 isalnum
 isalpha
 isascii
@@ -460,6 +381,8 @@ iscntrl
 isdigit
 isgraph
 islower
+isnan
+isnanf
 isprint
 ispunct
 issetugid
@@ -493,7 +416,6 @@ localtime64
 localtime64_r
 localtime_r
 longjmp
-longjmperror
 lrand48
 lseek
 lseek64
@@ -501,7 +423,6 @@ lstat
 madvise
 mallinfo
 malloc
-malloc_debug_init
 mbrlen
 mbrtowc
 mbsinit
@@ -544,7 +465,6 @@ open
 openat
 opendir
 openlog
-openlog_r
 pathconf
 pause
 pclose
@@ -715,7 +635,6 @@ setjmp
 setlinebuf
 setlocale
 setlogmask
-setlogmask_r
 setpgid
 setpgrp
 setpriority
@@ -729,7 +648,6 @@ setsid
 setsockopt
 settimeofday
 setuid
-setusershell
 setutent
 setvbuf
 shutdown
@@ -765,7 +683,6 @@ strdup
 strerror
 strerror_r
 strftime
-strftime_tz
 strlcat
 strlcpy
 strlen
@@ -803,7 +720,6 @@ syscall
 sysconf
 sysinfo
 syslog
-syslog_r
 system
 sysv_signal
 tcgetpgrp
@@ -861,7 +777,6 @@ vsprintf
 vsscanf
 vswprintf
 vsyslog
-vsyslog_r
 vwarn
 vwarnx
 vwprintf

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

@@ -1,35 +1,19 @@
-_C_ctype_
-_C_tolower_
-_C_toupper_
-__atexit
-__atexit_invalid
 __isthreaded
-__libc_malloc_default_dispatch
-__libc_malloc_dispatch
-__p_cert_syms
 __p_class_syms
-__p_key_syms
-__p_rcode_syms
 __p_type_syms
 __page_shift
 __page_size
 __progname
-__rand48_add
-__rand48_mult
-__rand48_seed
 __sF
 __sdidinit
 __sglue
 __stack_chk_guard
 __system_property_area__
 _ctype_
-_ns_flagdata
 _tolower_tab_
 _toupper_tab_
 daylight
 environ
-h_errlist
-h_nerr
 optarg
 opterr
 optind

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

@@ -1,27 +1,3 @@
-__exp__D
-__fpclassifyd
-__fpclassifyf
-__fpclassifyl
-__ieee754_rem_pio2
-__ieee754_rem_pio2f
-__isfinite
-__isfinitef
-__isfinitel
-__isinf
-__isinff
-__isinfl
-__isnanl
-__isnormal
-__isnormalf
-__isnormall
-__kernel_cos
-__kernel_cosdf
-__kernel_rem_pio2
-__kernel_sin
-__kernel_sindf
-__kernel_tan
-__kernel_tandf
-__log__D
 __signbit
 __signbitf
 __signbitl
@@ -95,15 +71,12 @@ hypotf
 ilogb
 ilogbf
 ilogbl
-isnan
-isnanf
 j0
 j0f
 j1
 j1f
 jn
 jnf
-ldexp
 ldexpf
 ldexpl
 lgamma

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

@@ -1,10 +1,5 @@
-MD5_Final
-MD5_Init
-MD5_Update
-__arc4_getbyte
 __assert
 __assert2
-__atexit_register_cleanup
 __b64_ntop
 __b64_pton
 __brk
@@ -14,41 +9,33 @@ __divdi3
 __dn_comp
 __dn_count_labels
 __dn_skipname
-__dorand48
 __errno
-__evAddTime
-__evCmpTime
-__evConsIovec
-__evConsTime
-__evNowTime
-__evSubTime
-__evTimeSpec
-__evTimeVal
-__evUTCTime
-__fcntl
 __fcntl64
-__findenv
-__fork
 __fp_nquery
 __fp_query
+__fpclassifyd
+__fpclassifyf
+__fpclassifyl
 __fstatfs64
-__futex_syscall3
-__futex_syscall4
 __futex_wait
-__futex_wait_ex
 __futex_wake
-__futex_wake_ex
 __get_h_errno
-__get_sp
-__get_stack_base
 __get_thread
 __get_tls
 __getcwd
 __getpriority
 __hostalias
-__init_tls
 __ioctl
-__libc_fini
+__isfinite
+__isfinitef
+__isfinitel
+__isinf
+__isinff
+__isinfl
+__isnanl
+__isnormal
+__isnormalf
+__isnormall
 __libc_init
 __llseek
 __loc_aton
@@ -88,69 +75,43 @@ __p_option
 __p_query
 __p_rcode
 __p_secstodate
-__p_section
-__p_sockun
 __p_time
 __p_type
 __pthread_cleanup_pop
 __pthread_cleanup_push
-__pthread_clone
-__pthread_cond_timedwait
-__pthread_cond_timedwait_relative
 __ptrace
 __putlong
 __putshort
 __reboot
 __res_close
 __res_dnok
-__res_get_nibblesuffix
-__res_get_nibblesuffix2
-__res_get_state
-__res_get_static
-__res_getservers
 __res_hnok
 __res_hostalias
 __res_isourserver
 __res_mailok
 __res_nameinquery
-__res_nametoclass
-__res_nametotype
 __res_nclose
-__res_ndestroy
 __res_ninit
 __res_nmkquery
-__res_nopt
 __res_nquery
 __res_nquerydomain
 __res_nsearch
 __res_nsend
-__res_opt
 __res_ownok
-__res_pquery
-__res_put_state
 __res_queriesmatch
 __res_querydomain
-__res_randomid
 __res_send
 __res_send_setqhook
 __res_send_setrhook
-__res_setservers
-__res_vinit
 __rt_sigaction
 __rt_sigprocmask
 __rt_sigtimedwait
 __sclose
 __set_thread_area
-__set_tls
-__setresuid
-__setreuid
-__setuid
 __sflags
 __sflush
 __sfp
-__sigsuspend
 __sinit
-__slbexpand
 __smakebuf
 __sread
 __srefill
@@ -159,21 +120,16 @@ __sseek
 __stack_chk_fail
 __statfs64
 __swbuf
-__swhatbuf
 __swrite
 __swsetup
 __sym_ntop
 __sym_ntos
 __sym_ston
-__sys_clone
-__syslog
 __system_properties_init
 __system_property_find
 __system_property_find_nth
 __system_property_get
 __system_property_read
-__system_property_wait
-__thread_entry
 __timer_create
 __timer_delete
 __timer_getoverrun
@@ -183,19 +139,12 @@ __udivdi3
 __umoddi3
 __wait4
 __waitid
-_cleanup
-_dorand48
 _exit
-_exit_thread
-_exit_with_stack_teardown
 _fwalk
 _getlong
 _getshort
-_init_thread
 _longjmp
 _setjmp
-_thread_created_hook
-_waitpid
 abort
 accept
 access
@@ -243,9 +192,7 @@ clone
 close
 closedir
 closelog
-closelog_r
 connect
-cpuacct_add
 creat
 ctime
 ctime64
@@ -258,26 +205,12 @@ dirfd
 dirname
 dirname_r
 div
-dlcalloc
-dlfree
-dlindependent_calloc
-dlindependent_comalloc
-dlmallinfo
-dlmalloc_footprint
-dlmalloc_max_footprint
-dlmalloc_stats
-dlmallopt
-dlmemalign
-dlpvalloc
-dlrealloc
-dlvalloc
 dn_expand
 drand48
 dup
 dup2
 endpwent
 endservent
-endusershell
 endutent
 epoll_create
 epoll_ctl
@@ -331,7 +264,6 @@ fputws
 fread
 free
 freeaddrinfo
-freedtoa
 freopen
 fscanf
 fseek
@@ -355,7 +287,6 @@ fts_read
 fts_set
 funlockfile
 funopen
-futex
 fwide
 fwprintf
 fwrite
@@ -412,13 +343,11 @@ gets
 getservbyname
 getservbyport
 getservent
-getservent_r
 getsockname
 getsockopt
 gettid
 gettimeofday
 getuid
-getusershell
 getutent
 getwc
 getwchar
@@ -444,8 +373,6 @@ inotify_add_watch
 inotify_init
 inotify_rm_watch
 ioctl
-ioprio_get
-ioprio_set
 isalnum
 isalpha
 isascii
@@ -455,6 +382,8 @@ iscntrl
 isdigit
 isgraph
 islower
+isnan
+isnanf
 isprint
 ispunct
 issetugid
@@ -488,7 +417,6 @@ localtime64
 localtime64_r
 localtime_r
 longjmp
-longjmperror
 lrand48
 lseek
 lseek64
@@ -496,7 +424,6 @@ lstat
 madvise
 mallinfo
 malloc
-malloc_debug_init
 mbrlen
 mbrtowc
 mbsinit
@@ -539,7 +466,6 @@ open
 openat
 opendir
 openlog
-openlog_r
 pathconf
 pause
 pclose
@@ -710,7 +636,6 @@ setjmp
 setlinebuf
 setlocale
 setlogmask
-setlogmask_r
 setpgid
 setpgrp
 setpriority
@@ -724,7 +649,6 @@ setsid
 setsockopt
 settimeofday
 setuid
-setusershell
 setutent
 setvbuf
 shutdown
@@ -760,7 +684,6 @@ strdup
 strerror
 strerror_r
 strftime
-strftime_tz
 strlcat
 strlcpy
 strlen
@@ -798,7 +721,6 @@ syscall
 sysconf
 sysinfo
 syslog
-syslog_r
 system
 sysv_signal
 tcgetpgrp
@@ -856,7 +778,6 @@ vsprintf
 vsscanf
 vswprintf
 vsyslog
-vsyslog_r
 vwarn
 vwarnx
 vwprintf

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

@@ -1,35 +1,19 @@
-_C_ctype_
-_C_tolower_
-_C_toupper_
-__atexit
-__atexit_invalid
 __isthreaded
-__libc_malloc_default_dispatch
-__libc_malloc_dispatch
-__p_cert_syms
 __p_class_syms
-__p_key_syms
-__p_rcode_syms
 __p_type_syms
 __page_shift
 __page_size
 __progname
-__rand48_add
-__rand48_mult
-__rand48_seed
 __sF
 __sdidinit
 __sglue
 __stack_chk_guard
 __system_property_area__
 _ctype_
-_ns_flagdata
 _tolower_tab_
 _toupper_tab_
 daylight
 environ
-h_errlist
-h_nerr
 optarg
 opterr
 optind

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

@@ -1,31 +1,6 @@
-__exp__D
-__fpclassifyd
-__fpclassifyf
-__fpclassifyl
-__ieee754_rem_pio2
-__ieee754_rem_pio2f
-__isfinite
-__isfinitef
-__isfinitel
-__isinf
-__isinff
-__isinfl
-__isnanl
-__isnormal
-__isnormalf
-__isnormall
-__kernel_cos
-__kernel_cosdf
-__kernel_rem_pio2
-__kernel_sin
-__kernel_sindf
-__kernel_tan
-__kernel_tandf
-__log__D
 __signbit
 __signbitf
 __signbitl
-_scan_nan
 acos
 acosf
 acosh
@@ -110,8 +85,6 @@ hypotf
 ilogb
 ilogbf
 ilogbl
-isnan
-isnanf
 j0
 j0f
 j1

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

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