libc versioning: Add missing symbols, put rest in DFprivate_1_0
authorJohn Marino <draco@marino.st>
Tue, 2 Dec 2014 13:15:37 +0000 (14:15 +0100)
committerJohn Marino <draco@marino.st>
Tue, 2 Dec 2014 14:39:05 +0000 (15:39 +0100)
This builds, like the previous attempt, but all executables that pull in
libc segfault when errno is accessed, so libc versioning is not working.

18 files changed:
lib/libc/citrus/Symbol.map
lib/libc/db/Symbol.map
lib/libc/gdtoa/Symbol.map
lib/libc/gen/Symbol.map
lib/libc/iconv/Symbol.map
lib/libc/locale/Symbol.map
lib/libc/net/Symbol.map
lib/libc/nls/Symbol.map
lib/libc/resolv/Symbol.map
lib/libc/rpc/Symbol.map
lib/libc/stdio/Symbol.map
lib/libc/stdlib/Symbol.map
lib/libc/string/Symbol.map
lib/libc/sys/Symbol.map
lib/libc/sysvipc/Symbol.map
lib/libc/upmap/Symbol.map
lib/libc/xdr/Symbol.map
lib/libc/yp/Symbol.map

index e997f4c..0e80c9b 100644 (file)
@@ -1,4 +1,6 @@
 DFprivate_1.0 {
+    _citrus_NONE_stdenc_ops;
+    _citrus_NONE_stdenc_trait;
     _citrus_bcs_convert_to_lower;
     _citrus_bcs_convert_to_upper;
     _citrus_bcs_isalnum;
@@ -22,27 +24,47 @@ DFprivate_1.0 {
     _citrus_bcs_toupper;
     _citrus_bcs_trunc_rws_len;
     _citrus_bcs_trunc_ws_len;
-    _citrus_csmapper_open;
     _citrus_csmapper_close;
+    _citrus_csmapper_open;
+    _citrus_db_close;
+    _citrus_db_factory_add16_;
+    _citrus_db_factory_add32_by_string;
+    _citrus_db_factory_add8_b;
+    _citrus_db_factory_add;
     _citrus_db_factory_add_by_string;
     _citrus_db_factory_add_string_by_string;
-    _citrus_db_factory_add32_by_string;
     _citrus_db_factory_calc_size;
     _citrus_db_factory_create;
+    _citrus_db_factory_free;
     _citrus_db_factory_serialize;
-    _citrus_db_close;
     _citrus_db_get_entry;
     _citrus_db_get_number_of_entries;
     _citrus_db_hash_std;
-    _citrus_db_lookup;
     _citrus_db_lookup16_by_string;
+    _citrus_db_lookup32_by_st;
     _citrus_db_lookup8_by_string;
+    _citrus_db_lookup;
     _citrus_db_lookup_by_string;
     _citrus_db_lookup_string_by_string;
     _citrus_db_open;
+    _citrus_esdb_alias;
     _citrus_esdb_close;
+    _citrus_esdb_free_list;
+    _citrus_esdb_get_list;
     _citrus_esdb_open;
+    _citrus_find_getops;
+    _citrus_iconv_canonicaliz;
+    _citrus_iconv_close;
+    _citrus_iconv_open;
+    _citrus_load_module;
     _citrus_lookup_factory_convert;
+    _citrus_lookup_get_number;
+    _citrus_lookup_seq_close;
+    _citrus_lookup_seq_lookup;
+    _citrus_lookup_seq_next;
+    _citrus_lookup_seq_open;
+    _citrus_lookup_seq_rewind;
+    _citrus_lookup_simple;
     _citrus_map_file;
     _citrus_mapper_close;
     _citrus_mapper_convert;
@@ -81,6 +103,9 @@ DFprivate_1.0 {
     _citrus_prop_read_str;
     _citrus_prop_read_symbol;
     _citrus_stdenc_close;
+    _citrus_stdenc_default;
     _citrus_stdenc_open;
+    _citrus_unload_module;
     _citrus_unmap_file;
+    _string_hash_func;
 };
index 1b97bf0..36108fb 100644 (file)
@@ -21,14 +21,6 @@ DF402.0 {
     mpool_stat;
 };
 
-DFprivate_1.0 {
-    __bt_open;
-    __dbpanic;
-    __hash_open;
-    __rec_open;
-};
-
-/*
 DFprivate_1.0 {
     __add_ovflpage;
     __addel;
@@ -47,6 +39,7 @@ DFprivate_1.0 {
     __bt_free;
     __bt_get;
     __bt_new;
+    __bt_open;
     __bt_pgin;
     __bt_pgout;
     __bt_put;
@@ -59,6 +52,8 @@ DFprivate_1.0 {
     __buf_free;
     __buf_init;
     __call_hash;
+    __dbpanic;
+    __hash_open;
     __default_hash;
     __delpair;
     __expand_table;
@@ -67,6 +62,7 @@ DFprivate_1.0 {
     __find_last_page;
     __get_buf;
     __get_page;
+    __ibitmap;
     __log2;
     __ovfl_delete;
     __ovfl_get;
@@ -80,6 +76,7 @@ DFprivate_1.0 {
     __rec_fpipe;
     __rec_get;
     __rec_iput;
+    __rec_open;
     __rec_put;
     __rec_ret;
     __rec_search;
@@ -88,7 +85,4 @@ DFprivate_1.0 {
     __rec_vmap;
     __rec_vpipe;
     __reclaim_buf;
-    __split_page;
-    __ibitmap;
 };
-*/
index 03b7ed3..ce3df68 100644 (file)
@@ -1,5 +1,6 @@
 DF402.0 {
     strtod;
+    strtodg_l;
     strtof;
 
     /* DragonFly, not gdtoa */
@@ -8,13 +9,11 @@ DF402.0 {
 
 DFprivate_1.0 {
     __hexnan_D2A;
-};
-
-/*
-DFprivate_1.0 {
     __strtodg;
     __strtord;
     __strtorx;
+    __strtord_l;
+    __strtorx_l;
 
     __Balloc_D2A;
     __Bfree_D2A;
@@ -61,4 +60,3 @@ DFprivate_1.0 {
     __hldtoa;
     __ldtoa;
 };
-*/
index ae82562..0b3f794 100644 (file)
@@ -19,6 +19,10 @@ DF402.0 {
     arc4random_stir;
     arc4random_uniform;
     basename;
+    build_phdr_info;
+    cb_child;
+    cb_parent;
+    cb_prepare;
     cfgetispeed;
     cfgetospeed;
     cfmakeraw;
@@ -165,6 +169,7 @@ DF402.0 {
     lastlogx_db;
     lcong48;
     ldexp;
+    libc_dlopen;
     lockf;
     longjmperror;
     lrand48;
@@ -449,9 +454,6 @@ DF402.0 {
 };
 
 DFprivate_1.0 {
-#if defined(i386)
-    __libc_tls_get_addr;
-#endif
     ___getcwd;
     ___libc_tls_get_addr;
     __aout_fdnlist;
@@ -462,7 +464,14 @@ DFprivate_1.0 {
     __fdopendir2;
     __fmtcheck;
     __getcwd;
+    __getgroupmembership;
+    __gr_match_entry;
+    __gr_parse_entry;
     __libc_allocate_tls;
+    __libc_call_init;
+    __libc_free_tls;
+    __libc_tls_get_addr;
+    __libc_tls_get_addr_tcb;
     __opendir2;
     __pause;
     __progname;
@@ -475,6 +484,7 @@ DFprivate_1.0 {
     __usleep;
     __wait;
     __waitpid;
+    _DYNAMIC;
     _atomic_lock;
     _atomic_lock_stub;
     _dorand48;
@@ -482,8 +492,10 @@ DFprivate_1.0 {
     _get_mcontext;
     _getcontext;
     _libc_allocate_tls;
+    _libc_init_tls;
     _logname_valid;
     _makecontext;
+    _once;
     _pthread_atfork;
     _pthread_attr_destroy;
     _pthread_attr_get_np;
@@ -628,6 +640,10 @@ DFprivate_1.0 {
     _spinunlock;
     _spinunlock_stub;
     _swapcontext;
+    _thread_autoinit_dummy_decl;
+    _thread_autoinit_dummy_decl_stub;
+    _thread_init;
+    _thread_init_stub;
     _updwtmpx;
     _use_only_yp;
     _usleep;
@@ -635,26 +651,3 @@ DFprivate_1.0 {
     _waitpid;
     _warn;
 };
-
-/*
-DFprivate_1.0 {
-    __getgroupmembership;
-    __gr_match_entry;
-    __gr_parse_entry;
-    __libc_C_ctype_;
-    __libc_C_tolower_;
-    __libc_C_toupper_;
-    __libc_call_init;
-    __libc_free_tls;
-    __libc_tls_get_addr_tcb;
-    __libc_tolower_tab_;
-    __libc_toupper_tab_;
-    _libc_init_tls;
-    _thread_autoinit_dummy_decl;
-    _thread_autoinit_dummy_decl_stub;
-    _thread_init;
-    _thread_init_stub;
-    _tolower;
-    _toupper;
-};
-*/
index 418af51..a25754a 100644 (file)
@@ -1,5 +1,4 @@
 DF402.0 {
-    __iconv;
     _iconv_version;
     iconv;
     iconv_canonicalize;
@@ -10,3 +9,10 @@ DF402.0 {
     iconvctl;
     iconvlist;
 };
+
+DFprivate_1.0 {
+    __iconv;
+    __iconv_free_list;
+    __iconv_get_list;
+    _iconv_open;
+};
index a7823e2..a069666 100644 (file)
@@ -25,6 +25,7 @@ DF402.0 {
        __sbmaskrune_l;
        __sbtolower;
        __sbtoupper;
+       __thread_locale;
        __tolower;
        __toupper;
        __wcwidth;
@@ -203,8 +204,62 @@ DF402.0 {
 };
 
 DFprivate_1.0 {
-    _PathLocale;
     __detect_path_locale;
+    __collate_err;
+    __collate_load;
     __collate_load_error;
+    __collate_load_tables;
+    __collate_load_tables_l;
+    __collate_lookup;
+    __collate_strdup;
+    __collate_substitute;
     __collate_range_cmp;
+    __ctype_load;
+    __fix_locale_grouping_str;
+    __get_current_messages_locale;
+    __get_current_monetary_locale;
+    __get_current_numeric_locale;
+    __get_current_time_locale;
+    __get_locale_env;
+    __has_thread_locale;
+    __mbrtowc;
+    __mbsnrtowcs;
+    __mbsnrtowcs_std;
+    __mbsinit;
+    __messages_load;
+    __messages_load_locale;
+    __monetary_load;
+    __monetary_load_locale;
+    __numeric_load;
+    __numeric_load_locale;
+    __part_load_locale;
+    __set_thread_rune_locale;
+    __time_load;
+    __time_load_locale;
+    __xlocale_C_collate;
+    __xlocale_C_ctype;
+    __xlocale_C_locale;
+    __xlocale_global_collate;
+    __xlocale_global_ctype;
+    __xlocale_global_locale;
+    __xlocale_global_messages;
+    __xlocale_global_monetary;
+    __xlocale_global_numeric;
+    __xlocale_global_time;
+    __wcrtomb;
+    __wcsnrtombs;
+    __wcsnrtombs_std;
+    __wcwidth_l;
+    __wrap_setrunelocale;
+    _BIG5_init;
+    _EUC_init;
+    _GB18030_init;
+    _GB2312_init;
+    _GBK_init;
+    _MSKanji_init;
+    _Read_RuneMagi;
+    _UTF8_init;
+    _PathLocale;
+    _ascii_init;
+    _none_init;
 };
index 0be21a6..144c834 100644 (file)
@@ -106,6 +106,7 @@ DF402.0 {
     rresvport;
     rresvport_af;
     ruserok;
+    sctp_peeloff;
     send;
     sethostent;
     setnetent;
@@ -140,7 +141,6 @@ DFprivate_1.0 {
     __nss_compat_endpwent;
 };
 
-/*
 DFprivate_1.0 {
     __abandon_cached_mp_write_session;
     __cached_mp_read;
@@ -160,6 +160,7 @@ DFprivate_1.0 {
     __hostent_init;
     __netdata_init;
     __nsdefaultsrc;
+    __netdata_init;
     __netent_data_init;
     __nss_cache_handler;
     __nss_common_cache_read;
@@ -178,7 +179,6 @@ DFprivate_1.0 {
     __protodata_init;
     __protoent_data_init;
     __setprotoent_p;
-    __sys_sctp_peeloff;
     _dns_gethostbyaddr;
     _dns_gethostbyname;
     _dns_getnetbyaddr;
@@ -238,10 +238,9 @@ DFprivate_1.0 {
     _nsyytext;
     _nsyyval;
     _nsyywrap;
+    _sctp_peeloff;
     _sethostdnsent;
     _sethosthtent;
     _setnetdnsent;
     _setnethtent;
-    _sctp_peeloff;
 };
-*/
index 0e1b819..b527679 100644 (file)
@@ -3,11 +3,3 @@ DF402.0 {
     catgets;
     catopen;
 };
-
-/*
-DFprivate_1.0 {
-    _catclose;
-    _catgets;
-    _catopen;
-};
-*/
index f9bd124..2d44b9d 100644 (file)
@@ -103,7 +103,6 @@ DF402.0 {
     sym_ston;
 };
 
-/*
 DFprivate_1.0 {
     ___mtctxres;
     __guard;
@@ -113,4 +112,3 @@ DFprivate_1.0 {
     __res_nopt_rdata;
     _res_opcodes;
 };
-*/
index 9250b75..83ff8f3 100644 (file)
@@ -226,23 +226,18 @@ DF402.0 {
     xprt_unregister;
 };
 
-DFprivate_1.0 {
-    __des_crypt_LOCAL;
-    __key_decryptsession_pk_LOCAL;
-    __key_encryptsession_pk_LOCAL;
-    __key_gendes_LOCAL;
-    __svc_clean_idle;
-};
-
-/*
 DFprivate_1.0 {
     __authdes_ops_lock;
     __authnone_lock;
     __authsvc_lock;
     __clnt_fd_lock;
     __clntraw_lock;
+    __des_crypt_LOCAL;
     __dupreq_lock;
     __getpublickey_LOCAL;
+    __key_decryptsession_pk_LOCAL;
+    __key_encryptsession_pk_LOCAL;
+    __key_gendes_LOCAL;
     __loopnconf_lock;
     __ops_lock;
     __proglst_lock;
@@ -264,10 +259,11 @@ DFprivate_1.0 {
     __rpc_socktype2seman;
     __rpc_taddr2uaddr_af;
     __rpc_uaddr2taddr_af;
-    __rpcbaddr_cache_lock;
     __rpcb_findaddr_timed;
+    __rpcbaddr_cache_lock;
     __rpcgettp;
     __rpcsoc_lock;
+    __svc_clean_idle;
     __svc_fd_lock;
     __svc_lock;
     __svc_maxrec;
@@ -279,4 +275,3 @@ DFprivate_1.0 {
     _des_crypt_call;
     _get_next_token;
 };
-*/
index 2ad87ad..778158d 100644 (file)
@@ -27,6 +27,7 @@ DF402.0 {
     fgetwc;
     fgetwc_l;
     fgetwln;
+    fgetwln_l;
     fgetws;
     fgetws_l;
     fileno;
@@ -154,6 +155,14 @@ DF402.0 {
 };
 
 DFprivate_1.0 {
+    __fcloseall;
+    __fflush;
+    __fgetwc_mbs;
+    __find_arguments;
+    __find_warguments;
+    __fputwc;
+    __fread;
+    __freedtoa;
     __lowercase_hex;
     __printf_arginfo_chr;
     __printf_arginfo_errno;
@@ -179,35 +188,6 @@ DFprivate_1.0 {
     __printf_render_str;
     __printf_render_time;
     __printf_render_vis;
-    __uppercase_hex;
-    __use_xprintf;
-    __vfprintf;
-    __vfscanf;
-    __vfwprintf;
-    __vfwscanf;
-    __xvprintf;
-    _cleanup;
-    _fcookie;
-    _flockfile;
-    _flockfile_debug;
-    _flockfile_debug_stub;
-    _ftrylockfile;
-    _funlockfile;
-    register_printf_function;
-    register_printf_render;
-    register_printf_render_std;
-};
-
-/*
-DFprivate_1.0 {
-    __fcloseall;
-    __fgetwc_unlock;
-    __find_arguments;
-    __find_warguments;
-    __fflush;
-    __fputwc_unlock;
-    __fread;
-    __freedtoa;
     __sclose;
     __sdidinit;
     __sflags;
@@ -227,11 +207,28 @@ DFprivate_1.0 {
     __swrite;
     __swsetup;
     __ungetc;
+    __ungetwc;
+    __uppercase_hex;
+    __use_xprintf;
+    __vfprintf;
+    __vfscanf;
+    __vfwprintf;
+    __vfwscanf;
+    __xvprintf;
+    _cleanup;
+    _fcookie;
+    _flockfile;
+    _flockfile_debug;
+    _flockfile_debug_stub;
     _ftello;
+    _ftrylockfile;
+    _funlockfile;
     _fwalk;
     _mktemp;
     _sread;
     _sseek;
     _swrite;
+    register_printf_function;
+    register_printf_render;
+    register_printf_render_std;
 };
-*/
index 7763183..2ba2ce2 100644 (file)
@@ -104,14 +104,13 @@ DF402.0 {
     unsetenv;
 };
 
+/*
+ * ignore WEAK:  __pthread_cxa_finalize;
+ */
+
 DFprivate_1.0 {
+    __cleanup;
     __system;
     _nmalloc_thr_init;
     _system;
 };
-
-/*
-DFprivate_1.0 {
-    __cleanup;
-};
-*/
index f40a9ef..ca7dc2a 100644 (file)
@@ -92,5 +92,6 @@ DF402.0 {
 };
 
 DFprivate_1.0 {
+    __strchrnul;
     __strtok_r;
 };
index cf6985e..76b80be 100644 (file)
@@ -261,6 +261,8 @@ DF402.0 {
     varsym_list;
     varsym_set;
     vfork;
+    vmm_guest_ctl;
+    vmm_guest_sync_addr;
     vmspace_create;
     vmspace_ctl;
     vmspace_destroy;
@@ -447,6 +449,10 @@ DFprivate_1.0 {
     __sys_mq_timedreceive;
     __sys_mq_timedsend;
     __sys_mq_unlink;
+    __sys_msgctl;
+    __sys_msgget;
+    __sys_msgrcv;
+    __sys_msgsnd;
     __sys_msync;
     __sys_munlock;
     __sys_munlockall;
@@ -486,7 +492,10 @@ DFprivate_1.0 {
     __sys_sched_setparam;
     __sys_sched_setscheduler;
     __sys_sched_yield;
+    __sys_sctp_peeloff;
     __sys_select;
+    __sys_semget;
+    __sys_semop;
     __sys_sendfile;
     __sys_sendmsg;
     __sys_sendto;
@@ -549,6 +558,8 @@ DFprivate_1.0 {
     __sys_varsym_list;
     __sys_varsym_set;
     __sys_vfork;
+    __sys_vmm_guest_ctl;
+    __sys_vmm_guest_sync_addr;
     __sys_vmspace_create;
     __sys_vmspace_ctl;
     __sys_vmspace_destroy;
@@ -842,6 +853,8 @@ DFprivate_1.0 {
     _varsym_list;
     _varsym_set;
     _vfork;
+    _vmm_guest_ctl;
+    _vmm_guest_sync_addr;
     _vmspace_create;
     _vmspace_ctl;
     _vmspace_destroy;
index 2f4765a..6b1d21e 100644 (file)
@@ -55,6 +55,12 @@ DFprivate_1.0 {
     _hash_insert;
     _hash_lookup;
     _hash_remove;
+    _msgctl;
+    _msgget;
+    _msgrcv;
+    _msgsnd;
+    _semget;
+    _semop;
     _sysv_umtx_init;
     _sysv_umtx_lock;
     _sysv_umtx_unlock;
index bbde343..9f83eec 100644 (file)
@@ -1,5 +1,6 @@
 DF402.0 {
        __clock_gettime;
+       __getpid;
        __upmap_map;
        __kpmap_map;
        __ukp_spt;
index 69acd6c..3482346 100644 (file)
@@ -44,9 +44,7 @@ DF402.0 {
     xdrstdio_create;
 };
 
-/*
 DFprivate_1.0 {
     __xdrrec_getrec;
     __xdrrec_setnonblock;
 };
-*/
index c0d0fe2..52c8130 100644 (file)
@@ -18,9 +18,7 @@ DF402.0 {
     ypresp_data;
 };
 
-/*
 DFprivate_1.0 {
     _ypbindlist;
     _yplib_timeout;
 };
-*/