From c87aec9015347c57816230164f8dee078f969ce0 Mon Sep 17 00:00:00 2001 From: John Marino Date: Sun, 6 Sep 2015 20:06:42 +0200 Subject: [PATCH] Fix libc symbol maps after build test The following modifications (typos, bugs, missing symbols, extra symbols) allows buildworld to complete with libc versioning turned on (a first). After performance verification via dports bulk build, the versioning will be activated. --- lib/libc/citrus/Symbol.map | 12 ++++----- lib/libc/gen/Symbol.map | 4 +-- lib/libc/locale/Symbol.map | 2 -- lib/libc/stdio/Symbol.map | 1 - lib/libc/stdlib/Symbol.map | 1 - lib/libc/stdtime/Symbol.map | 1 + lib/libc/sys/Symbol.map | 19 ++++++++------ lib/libc/sysvipc/Symbol.map | 1 + lib/libc/tre-regex/Makefile.inc | 2 +- lib/libc/tre-regex/Symbol.map | 28 ++++++++++----------- lib/libc/upmap/Symbol.map | 10 -------- lib/libc/x86_64/Symbol.map | 9 +------ lib/libc/xdr/Symbol.map | 44 --------------------------------- lib/libc/yp/Symbol.map | 12 --------- 14 files changed, 36 insertions(+), 110 deletions(-) diff --git a/lib/libc/citrus/Symbol.map b/lib/libc/citrus/Symbol.map index 0e80c9bbb7..4e498152f8 100644 --- a/lib/libc/citrus/Symbol.map +++ b/lib/libc/citrus/Symbol.map @@ -27,10 +27,10 @@ DFprivate_1.0 { _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_add16_by_string; + _citrus_db_factory_add32_by_string; + _citrus_db_factory_add8_by_string; _citrus_db_factory_add_by_string; _citrus_db_factory_add_string_by_string; _citrus_db_factory_calc_size; @@ -40,10 +40,10 @@ DFprivate_1.0 { _citrus_db_get_entry; _citrus_db_get_number_of_entries; _citrus_db_hash_std; - _citrus_db_lookup16_by_string; - _citrus_db_lookup32_by_st; - _citrus_db_lookup8_by_string; _citrus_db_lookup; + _citrus_db_lookup8_by_string; + _citrus_db_lookup16_by_string; + _citrus_db_lookup32_by_string; _citrus_db_lookup_by_string; _citrus_db_lookup_string_by_string; _citrus_db_open; diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index d9a49f3cb1..efe18cd4e5 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -118,7 +118,6 @@ DF404.0 { pthread_testcancel; pthread_timedjoin_np; pthread_yield; - sched_yield; sem_close; sem_destroy; sem_getvalue; @@ -270,7 +269,6 @@ DF404.0 { getgrouplist; gethostname; getloadavg; - getlogin; getlogin_r; getmntinfo; getmntvinfo; @@ -356,6 +354,7 @@ DF404.0 { scandir; seed48; seekdir; + semctl; setcontext; setdomainname; setfsent; @@ -560,7 +559,6 @@ DFprivate_1.0 { _pthread_testcancel; _pthread_timedjoin_np; _pthread_yield; - _sched_yield; _sem_close; _sem_destroy; _sem_getvalue; diff --git a/lib/libc/locale/Symbol.map b/lib/libc/locale/Symbol.map index c91d93395c..6aa26afacc 100644 --- a/lib/libc/locale/Symbol.map +++ b/lib/libc/locale/Symbol.map @@ -105,8 +105,6 @@ DF404.0 { iswpunct_l; iswrune; iswrune_l; - iswctype; - iswctype_l; iswspace; iswspace_l; iswspecial; diff --git a/lib/libc/stdio/Symbol.map b/lib/libc/stdio/Symbol.map index a7d5128e6f..4d1650f3d5 100644 --- a/lib/libc/stdio/Symbol.map +++ b/lib/libc/stdio/Symbol.map @@ -1,6 +1,5 @@ DF404.0 { __fpending; - __isthreaded; __srget; __stderrp; __stdinp; diff --git a/lib/libc/stdlib/Symbol.map b/lib/libc/stdlib/Symbol.map index fd174c8dcf..f6a6cb02b8 100644 --- a/lib/libc/stdlib/Symbol.map +++ b/lib/libc/stdlib/Symbol.map @@ -22,7 +22,6 @@ DF404.0 { calloc; div; environ; - exit; free; getenv; getopt; diff --git a/lib/libc/stdtime/Symbol.map b/lib/libc/stdtime/Symbol.map index db3acb1603..22a69306f2 100644 --- a/lib/libc/stdtime/Symbol.map +++ b/lib/libc/stdtime/Symbol.map @@ -11,6 +11,7 @@ DF404.0 { asctime_r; ctime; ctime_r; + daylight; difftime; gmtime; gmtime_r; diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map index 22bb04da13..593a67eee1 100644 --- a/lib/libc/sys/Symbol.map +++ b/lib/libc/sys/Symbol.map @@ -211,10 +211,11 @@ DF404.0 { rfork; rmdir; rtprio; - sched_get_priority_; + sched_get_priority_max; + sched_get_priority_min; sched_getparam; sched_getscheduler; - sched_rr_get_interv; + sched_rr_get_interval; sched_setparam; sched_setscheduler; sched_yield; @@ -303,7 +304,7 @@ DF404.0 { DFprivate_1.0 { __fork; -/* SYSCALLS */; +/* SYSCALLS */ __sys___acl_aclcheck_fd; __sys___acl_aclcheck_file; __sys___acl_delete_fd; @@ -505,10 +506,11 @@ DFprivate_1.0 { __sys_rfork; __sys_rmdir; __sys_rtprio; - __sys_sched_get_priority_; + __sys_sched_get_priority_max; + __sys_sched_get_priority_min; __sys_sched_getparam; __sys_sched_getscheduler; - __sys_sched_rr_get_interv; + __sys_sched_rr_get_interval; __sys_sched_setparam; __sys_sched_setscheduler; __sys_sched_yield; @@ -593,7 +595,7 @@ DFprivate_1.0 { __sys_write; __sys_writev; -/* SYSCALLS */; +/* SYSCALLS */ ___acl_aclcheck_fd; ___acl_aclcheck_file; ___acl_delete_fd; @@ -795,10 +797,11 @@ DFprivate_1.0 { _rfork; _rmdir; _rtprio; - _sched_get_priority_; + _sched_get_priority_max; + _sched_get_priority_min; _sched_getparam; _sched_getscheduler; - _sched_rr_get_interv; + _sched_rr_get_interval; _sched_setparam; _sched_setscheduler; _sched_yield; diff --git a/lib/libc/sysvipc/Symbol.map b/lib/libc/sysvipc/Symbol.map index 41a8fb9b8f..d4a55092a2 100644 --- a/lib/libc/sysvipc/Symbol.map +++ b/lib/libc/sysvipc/Symbol.map @@ -8,6 +8,7 @@ DF404.0 { is_sysvinit; lock_resources; lock_undo; + msginfo; receive_fd; receive_message; receive_msg_with_cred; diff --git a/lib/libc/tre-regex/Makefile.inc b/lib/libc/tre-regex/Makefile.inc index de72c13e51..effb7f9c54 100644 --- a/lib/libc/tre-regex/Makefile.inc +++ b/lib/libc/tre-regex/Makefile.inc @@ -2,7 +2,7 @@ TRESRC= ${.CURDIR}/../../contrib/tre/lib .PATH: ${TRESRC} ${.CURDIR}/../libc/tre-regex -CMAPS+= ${.CURDIR}/regex/Symbol.map +CMAPS+= ${.CURDIR}/tre-regex/Symbol.map SRCS+= tre-ast.c \ tre-compile.c \ diff --git a/lib/libc/tre-regex/Symbol.map b/lib/libc/tre-regex/Symbol.map index 5e89716fa4..558cf1a5cb 100644 --- a/lib/libc/tre-regex/Symbol.map +++ b/lib/libc/tre-regex/Symbol.map @@ -1,20 +1,20 @@ DF404.0 { regcomp; - regcomp_l + regcomp_l; regerror; regexec; regfree; - regncomp - regncomp_l - regnexec - regwcomp - regwcomp_l - regwexec - regwncomp - regwncomp_l - regwnexec - tre_version - tre_config - tre_have_backrefs - tre_have_approx + regncomp; + regncomp_l; + regnexec; + regwcomp; + regwcomp_l; + regwexec; + regwncomp; + regwncomp_l; + regwnexec; + tre_version; + tre_config; + tre_have_backrefs; + tre_have_approx; }; diff --git a/lib/libc/upmap/Symbol.map b/lib/libc/upmap/Symbol.map index 26c05c9fc3..35e5086c90 100644 --- a/lib/libc/upmap/Symbol.map +++ b/lib/libc/upmap/Symbol.map @@ -1,15 +1,5 @@ -DF404.0 { - clock_gettime - getpid -}; - DFprivate_1.0 { __kpmap_map; __upmap_map; __ukp_spt; }; - -/*** weak ** - * __clock_gettime; - * __getpid; - */ diff --git a/lib/libc/x86_64/Symbol.map b/lib/libc/x86_64/Symbol.map index 13936f1e44..f5fccccea9 100644 --- a/lib/libc/x86_64/Symbol.map +++ b/lib/libc/x86_64/Symbol.map @@ -1,7 +1,4 @@ DF404.0 { - /* PSEUDO syscalls */ - _exit; - _setjmp; _longjmp; .mcount; @@ -32,11 +29,6 @@ DF404.0 { }; DFprivate_1.0 { - /* PSEUDO syscalls */ - _getlogin; - __sys_exit; - __sys_getlogin; - ___longjmp; __flt_rounds; __infinity; @@ -46,6 +38,7 @@ DFprivate_1.0 { __longjmp; __nan; __siglongjmp; + __signbitl; _DYNAMIC; _brk; _end; diff --git a/lib/libc/xdr/Symbol.map b/lib/libc/xdr/Symbol.map index 32803092f7..0810b91cb6 100644 --- a/lib/libc/xdr/Symbol.map +++ b/lib/libc/xdr/Symbol.map @@ -48,47 +48,3 @@ DFprivate_1.0 { __xdrrec_getrec; __xdrrec_setnonblock; }; - -/*** STATIC *** - * xdrmem_destroy - * xdrmem_getlong_aligned - * xdrmem_putlong_aligned - * xdrmem_getlong_unaligned - * xdrmem_putlong_unaligned - * xdrmem_getbytes - * xdrmem_putbytes - * xdrmem_getpos - * xdrmem_setpos - * xdrmem_inline_aligned - * xdrmem_inline_unaligned - * xdrrec_getlong - * xdrrec_putlong - * xdrrec_getbytes - * xdrrec_putbytes - * xdrrec_getpos - * xdrrec_setpos - * xdrrec_inline - * xdrrec_destroy - * fix_buf_size - * flush_out - * fill_input_buf - * get_input_bytes - * set_input_fragment - * skip_input_bytes - * realloc_stream - * x_putlong - * x_putbytes - * x_getpostn - * x_setpostn - * x_inline - * harmless - * x_destroy - * xdrstdio_destroy - * xdrstdio_getlong - * xdrstdio_putlong - * xdrstdio_getbytes - * xdrstdio_putbytes - * xdrstdio_getpos - * xdrstdio_setpos - * xdrstdio_inline - * / diff --git a/lib/libc/yp/Symbol.map b/lib/libc/yp/Symbol.map index 4b9eb40cf3..c892c85857 100644 --- a/lib/libc/yp/Symbol.map +++ b/lib/libc/yp/Symbol.map @@ -19,15 +19,3 @@ DF404.0 { ypresp_allfn; ypresp_data; }; - -/*** static *** - * _yp_unbind - * yp_bind_locked - * yp_unbind_locked - * yp_get_default_domain_locked - * ypmatch_cache_delete - * ypmatch_cache_flush - * ypmatch_cache_expire - * ypmatch_cache_insert - * ypmatch_cache_lookup - */ -- 2.41.0