fixed tools/apbuild/buildlist to work on modern systems with multulib; flac/ogg static link WIP

2 files changed, 24 insertions, 35 deletions

diff --git a/tools/apbuild/apsymbols.h.x86_64 b/tools/apbuild/apsymbols.h.x86_64
index 3ab2c8c4..9d34240b 100644
--- a/tools/apbuild/apsymbols.h.x86_64
+++ b/tools/apbuild/apsymbols.h.x86_64
@@ -6,11 +6,6 @@ APBUILD_NOTE_METADATA("apbuild.version=" APBUILD_VERSION);
 #endif
 
 /* apbuild generated symbol exclusion list */
-__asm__(".symver __exp_finite,exp@GLIBC_2.2.5");
-__asm__(".symver __acosf_finite,acosf@GLIBC_2.2.5");
-__asm__(".symver __log_finite,log@GLIBC_2.2.5");
-__asm__(".symver __pow_finite,pow@GLIBC_2.2.5");
-__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
 __asm__(".symver clnt_pcreateerror,clnt_pcreateerror@GLIBC_2.2.5");
 __asm__(".symver clnt_spcreateerror,clnt_spcreateerror@GLIBC_2.2.5");
 __asm__(".symver feupdateenv,feupdateenv@GLIBC_2.2.5");
@@ -20,6 +15,7 @@ __asm__(".symver mkostemps,mkostemps@GLIBC_2.11");
 __asm__(".symver mkostemps64,mkostemps64@GLIBC_2.11");
 __asm__(".symver nftw,nftw@GLIBC_2.2.5");
 __asm__(".symver nftw64,nftw64@GLIBC_2.2.5");
+__asm__(".symver __ppoll_chk,__ppoll_chk@GLIBC_2.16");
 __asm__(".symver pthread_cond_broadcast,pthread_cond_broadcast@GLIBC_2.2.5");
 __asm__(".symver pthread_cond_destroy,pthread_cond_destroy@GLIBC_2.2.5");
 __asm__(".symver pthread_cond_init,pthread_cond_init@GLIBC_2.2.5");
@@ -31,14 +27,6 @@ __asm__(".symver rpc_createerr,rpc_createerr@GLIBC_2.2.5");
 __asm__(".symver __rpc_thread_createerr,__rpc_thread_createerr@GLIBC_2.2.5");
 __asm__(".symver __strtoll_l,__strtoll_l@GLIBC_2.2.5");
 __asm__(".symver __strtoull_l,__strtoull_l@GLIBC_2.2.5");
-/*__asm__(".symver _sys_errlist,_sys_errlist@GLIBC_2.3");
-__asm__(".symver sys_errlist,sys_errlist@GLIBC_2.3");*/
-__asm__(".symver _sys_errlist,_sys_errlist@GLIBC_2.2.5");
-__asm__(".symver sys_errlist,sys_errlist@GLIBC_2.2.5");
-/*__asm__(".symver _sys_nerr,_sys_nerr@GLIBC_2.3");
-__asm__(".symver sys_nerr,sys_nerr@GLIBC_2.3");*/
-__asm__(".symver _sys_nerr,_sys_nerr@GLIBC_2.2.5");
-__asm__(".symver sys_nerr,sys_nerr@GLIBC_2.2.5");
 __asm__(".symver sys_sigabbrev,sys_sigabbrev@GLIBC_2.2.5");
 __asm__(".symver _sys_siglist,_sys_siglist@GLIBC_2.2.5");
 __asm__(".symver sys_siglist,sys_siglist@GLIBC_2.2.5");
@@ -71,8 +59,8 @@ __asm__(".symver readlinkat,readlinkat@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver __wctomb_chk,__wctomb_chk@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver __readlink_chk,__readlink_chk@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver setipv4sourcefilter,setipv4sourcefilter@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver __isoc99_sscanf,__isoc99_sscanf@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver __getlogin_r_chk,__getlogin_r_chk@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver __isoc99_sscanf,__isoc99_sscanf@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver sync_file_range,sync_file_range@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver __open64_2,__open64_2@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver inet6_rth_init,inet6_rth_init@GLIBC_DONT_USE_THIS_SYMBOL");
@@ -101,14 +89,14 @@ __asm__(".symver __confstr_chk,__confstr_chk@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver __wcsncat_chk,__wcsncat_chk@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver setsourcefilter,setsourcefilter@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver xdr_u_quad_t,xdr_u_quad_t@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver __fread_unlocked_chk,__fread_unlocked_chk@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver eaccess,eaccess@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver __fread_unlocked_chk,__fread_unlocked_chk@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver inet6_option_alloc,inet6_option_alloc@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver __openat64_2,__openat64_2@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver sched_setaffinity,sched_setaffinity@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver inet6_option_append,inet6_option_append@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver futimens,futimens@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver renameat,renameat@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver futimens,futimens@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver __wmemset_chk,__wmemset_chk@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver inet6_opt_get_val,inet6_opt_get_val@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver unshare,unshare@GLIBC_DONT_USE_THIS_SYMBOL");
@@ -173,8 +161,8 @@ __asm__(".symver splice,splice@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver eventfd_write,eventfd_write@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver vmsplice,vmsplice@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver getsourcefilter,getsourcefilter@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver __isoc99_vwscanf,__isoc99_vwscanf@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver epoll_ctl,epoll_ctl@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver __isoc99_vwscanf,__isoc99_vwscanf@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver gnu_dev_minor,gnu_dev_minor@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver __memcpy_chk,__memcpy_chk@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver __isoc99_vfscanf,__isoc99_vfscanf@GLIBC_DONT_USE_THIS_SYMBOL");
@@ -210,7 +198,6 @@ __asm__(".symver pipe2,pipe2@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver __strcat_chk,__strcat_chk@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver faccessat,faccessat@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver __asprintf_chk,__asprintf_chk@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver ppoll,ppoll@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver __recvfrom_chk,__recvfrom_chk@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver inet6_opt_set_val,inet6_opt_set_val@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver __ptsname_r_chk,__ptsname_r_chk@GLIBC_DONT_USE_THIS_SYMBOL");
@@ -224,29 +211,29 @@ __asm__(".symver __readlinkat_chk,__readlinkat_chk@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver dlinfo,dlinfo@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver dladdr1,dladdr1@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver dlmopen,dlmopen@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver pthread_mutexattr_getprotocol,pthread_mutexattr_getprotocol@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver pthread_mutex_setprioceiling,pthread_mutex_setprioceiling@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver pthread_mutexattr_setprioceiling,pthread_mutexattr_setprioceiling@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver pthread_getaffinity_np,pthread_getaffinity_np@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver __pthread_cleanup_routine,__pthread_cleanup_routine@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver pthread_condattr_setclock,pthread_condattr_setclock@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver pthread_mutex_getprioceiling,pthread_mutex_getprioceiling@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver pthread_tryjoin_np,pthread_tryjoin_np@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver __pthread_register_cancel_defer,__pthread_register_cancel_defer@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver pthread_timedjoin_np,pthread_timedjoin_np@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver __pthread_unregister_cancel_restore,__pthread_unregister_cancel_restore@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver pthread_mutexattr_setprioceiling,pthread_mutexattr_setprioceiling@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver pthread_mutexattr_getprotocol,pthread_mutexattr_getprotocol@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver pthread_attr_setaffinity_np,pthread_attr_setaffinity_np@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver __pthread_cleanup_routine,__pthread_cleanup_routine@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver pthread_barrierattr_getpshared,pthread_barrierattr_getpshared@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver pthread_condattr_getclock,pthread_condattr_getclock@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver __pthread_register_cancel_defer,__pthread_register_cancel_defer@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver pthread_mutexattr_setprotocol,pthread_mutexattr_setprotocol@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver __pthread_unwind_next,__pthread_unwind_next@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver pthread_timedjoin_np,pthread_timedjoin_np@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver pthread_setschedprio,pthread_setschedprio@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver pthread_mutex_consistent_np,pthread_mutex_consistent_np@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver pthread_attr_getaffinity_np,pthread_attr_getaffinity_np@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver pthread_setaffinity_np,pthread_setaffinity_np@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver pthread_mutex_getprioceiling,pthread_mutex_getprioceiling@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver pthread_mutexattr_getrobust_np,pthread_mutexattr_getrobust_np@GLIBC_DONT_USE_THIS_SYMBOL");
+__asm__(".symver pthread_mutex_setprioceiling,pthread_mutex_setprioceiling@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver pthread_mutexattr_getprioceiling,pthread_mutexattr_getprioceiling@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver pthread_attr_getaffinity_np,pthread_attr_getaffinity_np@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver pthread_barrierattr_getpshared,pthread_barrierattr_getpshared@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver pthread_condattr_setclock,pthread_condattr_setclock@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver pthread_tryjoin_np,pthread_tryjoin_np@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver pthread_setschedprio,pthread_setschedprio@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver pthread_getaffinity_np,pthread_getaffinity_np@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver pthread_mutexattr_setrobust_np,pthread_mutexattr_setrobust_np@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver pthread_mutexattr_getrobust_np,pthread_mutexattr_getrobust_np@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver pthread_mutexattr_setprotocol,pthread_mutexattr_setprotocol@GLIBC_DONT_USE_THIS_SYMBOL");
-__asm__(".symver pthread_mutex_consistent_np,pthread_mutex_consistent_np@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver ns_put16,ns_put16@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver ns_initparse,ns_initparse@GLIBC_DONT_USE_THIS_SYMBOL");
 __asm__(".symver __p_rcode,__p_rcode@GLIBC_DONT_USE_THIS_SYMBOL");
diff --git a/tools/apbuild/buildlist b/tools/apbuild/buildlist
index 24e789fd..be6443c2 100755
--- a/tools/apbuild/buildlist
+++ b/tools/apbuild/buildlist
@@ -5,7 +5,9 @@
 
 if [ -e syms ]; then rm syms; fi
 if [ -e allsym ]; then rm allsym; fi
-for f in /lib/*; do
+
+host=`gcc -v 2>&1 | grep 'Target:' | sed 's/Target: //'`
+for f in /lib/* /lib/$host/*; do
     if [ ! -f $f ]; then continue; fi
     readelf -s --wide $f >>syms
     objdump -T $f | grep "GLIBC_" | sed 's/\(.*\)GLIBC_//; s/)//' | grep -v PRIVATE | column -t >>allsym