about summary refs log tree commit diff stats
path: root/src/wrapped/wrappedlibc_private.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/wrapped/wrappedlibc_private.h')
-rw-r--r--src/wrapped/wrappedlibc_private.h1174
1 files changed, 677 insertions, 497 deletions
diff --git a/src/wrapped/wrappedlibc_private.h b/src/wrapped/wrappedlibc_private.h
index ceaef297..dc7fbc40 100644
--- a/src/wrapped/wrappedlibc_private.h
+++ b/src/wrapped/wrappedlibc_private.h
@@ -2,13 +2,6 @@
 #error Meh...
 #endif
 
-//socklen_t is u32
-// typedef unsigned long int nfds_t;
-// pid_t is S32
-// key_t is S32
-// uid_t is u32
-// gid_t is u32
-
 GO(a64l, lFp)
 GO(abort, vFv)
 //DATAB(__abort_msg, 
@@ -17,28 +10,28 @@ GO(accept, iFipp)
 GO(accept4, iFippi)
 GOW(access, iFpi)
 GO(acct, iFp)
-GOW(addmntent, iFpp)
+GOW(addmntent, iFSp)
 GOW(addseverity, iFip)
 GOW(adjtime, iFpp)
 GO(__adjtimex, iFp)
 GOW(adjtimex, iFp)
 //GOW(advance, 
 GO(alarm, uFu)
-GO(aligned_alloc, pFUU)
+GO(aligned_alloc, pFLL)
 GOW(alphasort, iFpp)
 GOW(alphasort64, iFpp)
 //GO(__arch_prctl, 
 //GOW(arch_prctl, 
-//DATA(argp_err_exit_status, 
-//GOW(argp_error, vF!pV)
-//GOW(argp_failure, vF!iipV)
-//GOW(argp_help, vF!pup)
-//GOW(argp_parse, iF!ipupp)
-//DATAB(argp_program_bug_address, 
-//DATAB(argp_program_version, 
-//DATAB(argp_program_version_hook, 
-//GOW(argp_state_help, vF!pu)
-//GOW(argp_usage, vF!)
+//DATA(argp_err_exit_status, 4)
+//GOWM(argp_error, vFppV)
+//GOWM(argp_failure, vFpiipV)
+//GOWM(argp_help, vFpSup)
+//GOWM(argp_parse, iFpipupp)
+//DATAB(argp_program_bug_address, 8)
+//DATAB(argp_program_version, 8)
+//DATAM(argp_program_version_hook, 8)
+//GOWM(argp_state_help, vFpSu)
+//GOWM(argp_usage, vFp)
 GOW(argz_add, iFppp)
 GOW(argz_add_sep, iFpppi)
 GOW(argz_append, iFpppL)
@@ -67,13 +60,13 @@ GO(atof, dFp)
 GO(atoi, iFp)
 GO(atol, lFp)
 GO(atoll, IFp)
-//GO(authdes_create, !Fpup!)
-//GO(authdes_getucred, iF!pppp)
-//GO(authdes_pk_create, !Fp!up!)
-//GO(_authenticate, uF!!)
-//GO(authnone_create, !Fv)
-//GO(authunix_create, !Fpuuip)
-//GO(authunix_create_default, !Fv)
+//GOM(authdes_create, pFpupp)
+//GO(authdes_getucred, "iF!pppp")
+//GOM(authdes_pk_create, pFppupp)
+//GOM(_authenticate, uFpp)
+//GOM(authnone_create, pFv)
+//GOM(authunix_create, pFpuuip)
+//GOM(authunix_create_default, pFv)
 //GO(__backtrace, 
 GOWM(backtrace, iFEpi)
 //GO(__backtrace_symbols, 
@@ -83,9 +76,9 @@ GOWM(backtrace_symbols_fd, vFEpii)
 GOW(basename, pFp)
 GO(bcmp, iFppL)
 GO(bcopy, vFppL)
-//GO(bdflush, // Deprecated
+//GO(bdflush, 
 GOW(bind, iFipu)
-//GO(bindresvport, iFi!)
+GO(bindresvport, iFip)
 GOW(bindtextdomain, pFpp)
 GOW(bind_textdomain_codeset, pFpp)
 GOW(brk, iFp)
@@ -95,10 +88,10 @@ GOM(bsearch, pFEppLLp)
 GOW(btowc, uFi)
 GO(__bzero, vFpL)
 GO(bzero, vFpL)
-//GO(c16rtomb, LFpW!)
+GO(c16rtomb, LFpWp)
 GOW(c32rtomb, LFpup)
 GOW(calloc, pFLL)
-//GO(callrpc, iFpLLL@p@p)
+//GOM(callrpc, iFpiiipppp)
 //GO(__call_tls_dtors, vFv)
 GOW(canonicalize_file_name, pFp)
 GO(capget, iFpp)
@@ -106,7 +99,11 @@ GO(capset, iFpp)
 GO(catclose, iFp)
 GO(catgets, pFpiip)
 GO(catopen, pFpi)
-//GO(cbc_crypt, // Deprecated
+#ifdef STATICBUILD
+//GO(cbc_crypt, iFppuup)
+#else
+GO(cbc_crypt, iFppuup)
+#endif
 GO(cfgetispeed, uFp)
 GO(cfgetospeed, uFp)
 GO(cfmakeraw, vFp)
@@ -115,43 +112,43 @@ GO(cfsetispeed, iFpu)
 GO(cfsetospeed, iFpu)
 GO(cfsetspeed, iFpu)
 GOW(chdir, iFp)
-DATA(__check_rhosts_file, sizeof(void*))
+DATA(__check_rhosts_file, 8)
 //GO(chflags, 
 //GO(__chk_fail, 
 GOW(chmod, iFpu)
 GOW(chown, iFpuu)
 GO(chroot, iFp)
 GOW(clearenv, iFv)
-GO(clearerr, vFp)
-GO(clearerr_unlocked, vFp)
+GO(clearerr, vFS)
+GO(clearerr_unlocked, vFS)
 #ifdef STATICBUILD
 //GO(clnt_broadcast, 
-//GO(clnt_create, !FpLLp)
+//GO(clnt_create, "!FpLLp")
 //GO(clnt_pcreateerror, vFp)
 //GO(clnt_perrno, vFu)
-//GO(clnt_perror, vF!p)
-//GO(clntraw_create, !FLL)
+//GO(clnt_perror, "vF!p")
+//GO(clntraw_create, "!FLL")
 //GO(clnt_spcreateerror, pFp)
 //GO(clnt_sperrno, pFu)
-//GO(clnt_sperror, pF!p)
-//GO(clnttcp_create, !F!LLpuu)
-//GO(clntudp_bufcreate, !F!LL?puu)
-//GO(clntudp_create, !F!LL?p)
-//GO(clntunix_create, !F!LLpuu)
+//GO(clnt_sperror, "pF!p")
+//GO(clnttcp_create, "!F!LLpuu")
+//GO(clntudp_bufcreate, "!F!LL?puu")
+//GO(clntudp_create, "!F!LL?p")
+//GO(clntunix_create, "!F!LLpuu")
 #else
-//GO(clnt_broadcast, 
-//GO(clnt_create, !FpLLp)
+//GOM(clnt_broadcast, uFLLLppppp)
+//GOM(clnt_create, pFpuup)
 GO(clnt_pcreateerror, vFp)
 GO(clnt_perrno, vFu)
-//GO(clnt_perror, vF!p)
-//GO(clntraw_create, !FLL)
+//GOM(clnt_perror, vFpp)
+//GOM(clntraw_create, pFLL)
 GO(clnt_spcreateerror, pFp)
 GO(clnt_sperrno, pFu)
-//GO(clnt_sperror, pF!p)
-//GO(clnttcp_create, !F!LLpuu)
-//GO(clntudp_bufcreate, !F!LL?puu)
-//GO(clntudp_create, !F!LL?p)
-//GO(clntunix_create, !F!LLpuu)
+//GOM(clnt_sperror, pFpp)
+//GOM(clnttcp_create, pFpLLpuu)
+//GO(clntudp_bufcreate, "!F!LL?puu")
+//GO(clntudp_create, "!F!LL?p")
+//GOM(clntunix_create, pFpLLpuu)
 #endif
 GO(clock, lFv)
 GO(clock_adjtime, iFip)
@@ -172,7 +169,7 @@ GOW(close, iFi)
 GOW(closedir, iFp)
 GO(closelog, vFv)
 //GO(__close_nocancel, 
-GO(close_range, iFuuu)
+GO(close_range, iFuui)
 GO(__cmsg_nxthdr, pFpp)
 GO(confstr, LFipL)
 GO(__confstr_chk, LFipLL)
@@ -193,21 +190,21 @@ GO(ctime_r, pFpp)
 //DATA(__ctype32_tolower, 
 //DATA(__ctype32_toupper, 
 #ifdef STATICBUILD
-//DATA(__ctype_b, sizeof(void*))
+//DATA(__ctype_b, 8)
 #else
-DATA(__ctype_b, sizeof(void*))
+DATA(__ctype_b, 8)
 #endif
 GO(__ctype_b_loc, pFv)
 GO(__ctype_get_mb_cur_max, LFv)
 //GO(__ctype_init, 
-DATAM(__ctype_tolower, sizeof(void*))
+DATAM(__ctype_tolower, 8)
 GO(__ctype_tolower_loc, pFv)
-DATAM(__ctype_toupper, sizeof(void*))
+DATAM(__ctype_toupper, 8)
 GO(__ctype_toupper_loc, pFv)
 //DATAB(__curbrk, 
 GO(cuserid, pFp)
 GOM(__cxa_atexit, iFEppp)
-//GO(__cxa_at_quick_exit, /* at_quick_exit has signature iF@ -> */ iF@pp)
+//GO(__cxa_at_quick_exit, "/* at_quick_exit has signature iF@ -> */ iF@pp")
 GOM(__cxa_finalize, vFEp)
 GOM(__cxa_thread_atexit_impl, iFEppp)
 //GO(__cyg_profile_func_enter, 
@@ -219,20 +216,25 @@ GO(__dcgettext, pFppi)
 GOW(dcgettext, pFppi)
 GOW(dcngettext, pFpppLi)
 //GO(__default_morecore, 
-//GO(delete_module, // Deprecated
-//GO(des_setparity, // Deprecated
+#ifdef STATICBUILD
+//GO(delete_module, 
+//GO(des_setparity, 
+#else
+//GO(delete_module, 
+GO(des_setparity, vFp)
+#endif
 GO(__dgettext, pFpp)
 GOW(dgettext, pFpp)
 GO(difftime, dFll)
 GO(dirfd, iFp)
 GO(dirname, pFp)
-GO(div, LFii)
+GO(div, UFii)
 //GO(_dl_addr, 
 //GO(_dl_catch_error, 
 //GO(_dl_catch_exception, 
 GOWM(dl_iterate_phdr, iFEpp)
 //GO(_dl_mcount_wrapper, 
-//GO(_dl_mcount_wrapper_check, 
+GO(_dl_mcount_wrapper_check, vFp)
 //DATAB(_dl_open_hook, 
 //DATAB(_dl_open_hook2, 
 //GO(_dl_signal_error, 
@@ -252,7 +254,11 @@ GO(__duplocale, pFp)
 GOW(duplocale, pFp)
 GO(dysize, iFi)
 GOW(eaccess, iFpi)
+#ifdef STATICBUILD
 //GO(ecb_crypt, 
+#else
+GO(ecb_crypt, iFppuu)
+#endif
 GO(ecvt, pFdipp)
 GOW(ecvt_r, iFdipppL)
 GO(endaliasent, vFv)
@@ -260,21 +266,25 @@ GO(endfsent, vFv)
 GO(endgrent, vFv)
 GO(endhostent, vFv)
 GO(__endmntent, iFp)
-GOW(endmntent, iFp)
+GOW(endmntent, iFS)
 GO(endnetent, vFv)
 GO(endnetgrent, vFv)
 GO(endprotoent, vFv)
 GO(endpwent, vFv)
 GO(endrpcent, vFv)
 GO(endservent, vFv)
+#ifdef STATICBUILD
 //GO(endsgent, 
+#else
+GO(endsgent, vFv)
+#endif
 GO(endspent, vFv)
 GOW(endttyent, iFv)
 GO(endusershell, vFv)
 GOW(endutent, vFv)
 GO(endutxent, vFv)
-DATAM(environ, sizeof(void*))
-DATAM(__environ, sizeof(void*))
+DATAM(environ, 8)
+DATAM(__environ, 8)
 GO(envz_add, iFpppp)
 GO(envz_entry, pFpLp)
 GO(envz_get, pFpLp)
@@ -288,7 +298,7 @@ GO(epoll_ctl, iFiiip)
 GO(epoll_pwait, iFipiip)
 GO(epoll_wait, iFipii)
 #else
-GOM(epoll_ctl, iFEiiip)   // struct epoll_event is 12byte on x86_64 and 16bytes (8bytes aligned) on arm64
+GOM(epoll_ctl, iFEiiip)
 GOM(epoll_pwait, iFEipiip)
 GOM(epoll_wait, iFEipii)
 #endif
@@ -298,22 +308,32 @@ GOM(err, vFEipV)
 //DATAB(errno, 
 GO(__errno_location, pFv)
 GOW(error, vFiipV)
-//GOW(error_at_line, vFiipupV)
-//DATAB(error_message_count, 
-//DATAB(error_one_per_line, 
-//DATAB(error_print_progname, 
+//GOWM(error_at_line, vFiipupV)
+//DATAB(error_message_count, 4)
+//DATAB(error_one_per_line, 4)
+//DATAM(error_print_progname, 8)
 GOM(errx, vFEipV)
-//GO(ether_aton, !Fp)
-//GO(ether_aton_r, !Fp!)
-//GO(ether_hostton, iFp!)
-//GO(ether_line, iFp!p)
-//GO(ether_ntoa, pF!)
-//GO(ether_ntoa_r, pF!p)
-//GO(ether_ntohost, iFp!)
+#ifdef STATICBUILD
+//GO(ether_aton, pFp)
+//GO(ether_aton_r, pFpp)
+//GO(ether_hostton, iFpp)
+//GO(ether_line, iFppp)
+//GO(ether_ntoa, pFp)
+//GO(ether_ntoa_r, pFpp)
+//GO(ether_ntohost, iFpp)
+#else
+GO(ether_aton, pFp)
+GO(ether_aton_r, pFpp)
+GO(ether_hostton, iFpp)
+GO(ether_line, iFppp)
+GO(ether_ntoa, pFp)
+GO(ether_ntoa_r, pFpp)
+GO(ether_ntohost, iFpp)
+#endif
 GOW(euidaccess, iFpi)
 GO(eventfd, iFui)
 GO(eventfd_read, iFip)
-GO(eventfd_write, iFiL)
+GO(eventfd_write, iFiU)
 GOM(execl, iFEpV) // First argument is also part of the variadic
 GOM(execle, iFEpV) // First argument is also part of the variadic
 GOM(execlp, iFEpV) // First argument is also part of the variadic
@@ -321,16 +341,16 @@ GOM(execv, iFEpp)
 GOM(execve, iFEppp)
 GOM(execvp, iFEpp)
 GOW(execvpe, iFppp)
-GO(_exit, vFi)  // immediate exit
+GO(_exit, vFi)
 GOM(exit, vFEi)
 GOW(_Exit, vFi)
 GO(explicit_bzero, vFpL)
 GO(__explicit_bzero_chk, vFpLL)
 GO(faccessat, iFipii)
 GOW(fallocate, iFiill)
-GO(fallocate64, iFiill)
+GO(fallocate64, iFiiII)
 GO(fanotify_init, iFuu)
-GO(fanotify_mark, iFiuLip)
+GO(fanotify_mark, iFiuUip)
 //GO(fattach, 
 GO(__fbufsize, LFp)
 GOW(fchdir, iFi)
@@ -339,7 +359,7 @@ GOW(fchmod, iFiu)
 GO(fchmodat, iFipui)
 GOW(fchown, iFiuu)
 GO(fchownat, iFipuui)
-GO(fclose, iFp)
+GO(fclose, iFS)
 GOW(fcloseall, iFv)
 GOWM(__fcntl, iFEiiN)
 GOWM(fcntl, iFEiiN)
@@ -350,41 +370,46 @@ GO(fdatasync, iFi)
 GO(__fdelt_chk, LFL)
 //GO(__fdelt_warn, 
 //GO(fdetach, 
-GO(fdopen, pFip)
+GO(fdopen, SFip)
 GOW(fdopendir, pFi)
 //GO(__fentry__, 
-GOW(feof, iFp)
-GOW(feof_unlocked, iFp)
-GOW(ferror, iFp)
-GOW(ferror_unlocked, iFp)
+GOW(feof, iFS)
+GOW(feof_unlocked, iFS)
+GOW(ferror, iFS)
+GOW(ferror_unlocked, iFS)
 GO(fexecve, iFipp)
 GOW(fflush, iFS)
 GO(fflush_unlocked, iFS)
 //GO(__ffs, 
 GO(ffs, iFi)
-GO(ffsl, iFI)
+GO(ffsl, iFl)
 GO(ffsll, iFI)
-GOW(fgetc, iFp)
-GOW(fgetc_unlocked, iFp)
-GO(fgetgrent, pFp)
-GOW(fgetgrent_r, iFpppLp)
-GO(fgetpos, iFpp)
-GO(fgetpos64, iFpp)
-GO(fgetpwent, pFp)
-GOW(fgetpwent_r, iFpppLp)
-GOW(fgets, pFpip)
+GOW(fgetc, iFS)
+GOW(fgetc_unlocked, iFS)
+GO(fgetgrent, pFS)
+GOW(fgetgrent_r, iFSppLp)
+GO(fgetpos, iFSp)
+GO(fgetpos64, iFSp)
+GO(fgetpwent, pFS)
+GOW(fgetpwent_r, iFSppLp)
+GOW(fgets, pFpiS)
 GO(__fgets_chk, pFpLip)
+#ifdef STATICBUILD
 //GO(fgetsgent, 
 //GOW(fgetsgent_r, 
-GO(fgetspent, pFp)
-GOW(fgetspent_r, iFpppLp)
-GOW(fgets_unlocked, pFpip)
+#else
+GO(fgetsgent, pFS)
+GOW(fgetsgent_r, iFSppLp)
+#endif
+GO(fgetspent, pFS)
+GOW(fgetspent_r, iFSppLp)
+GOW(fgets_unlocked, pFpiS)
 //GO(__fgets_unlocked_chk, 
-GOW(fgetwc, uFp)
-GOW(fgetwc_unlocked, uFp)
-GO(fgetws, pFpip)
+GOW(fgetwc, uFS)
+GOW(fgetwc_unlocked, uFS)
+GO(fgetws, pFpiS)
 //GO(__fgetws_chk, 
-GO(fgetws_unlocked, pFpip)
+GO(fgetws_unlocked, pFpiS)
 //GO(__fgetws_unlocked_chk, 
 GO(fgetxattr, lFippL)
 GOW(fileno, iFS)
@@ -398,36 +423,36 @@ GOWD(finitel, iFD, finite)
 GO(__flbf, iFp)
 GO(flistxattr, lFipL)
 GOW(flock, iFii)
-GOW(flockfile, vFp)
+GOW(flockfile, vFS)
 GOW(_flushlbf, vFv)
-GO(fmemopen, pFpLp)
+GO(fmemopen, SFpLp)
 GO(fmtmsg, iFlpippp)
 GO(fnmatch, iFppi)
-GOM(fopen, pFEpp)
-GOWM(fopen64, pFEpp)
+GOM(fopen, SFEpp)
+GOWM(fopen64, SFEpp)
 GOM(fopencookie, pFEppV)
 //GO(__fork, 
 GOWM(fork, iFEv)
 //GO(__fortify_fail, 
 GO(fpathconf, lFii)
 GO(__fpending, LFp)
-GOM(fprintf, iFEppV)
+GOM(fprintf, iFESpV)
 GOM(__fprintf_chk, iFEpipV)
 //DATA(__fpu_control, 
 GO(__fpurge, vFp)
-GO(fputc, iFip)
-GO(fputc_unlocked, iFip)
-GOW(fputs, iFpp)
-GOW(fputs_unlocked, iFpp)
-GO(fputwc, uFip)
-GO(fputwc_unlocked, uFip)
-GO(fputws, iFpp)
-GO(fputws_unlocked, iFpp)
-GO(fread, LFpLLp)
+GO(fputc, iFiS)
+GO(fputc_unlocked, iFiS)
+GOW(fputs, iFpS)
+GOW(fputs_unlocked, iFpS)
+GO(fputwc, uFiS)
+GO(fputwc_unlocked, uFiS)
+GO(fputws, iFpS)
+GO(fputws_unlocked, iFpS)
+GO(fread, LFpLLS)
 GO(__freadable, iFp)
 GO(__fread_chk, LFpLLLp)
 GO(__freading, iFp)
-GO(fread_unlocked, LFpLLp)
+GO(fread_unlocked, LFpLLS)
 GO(__fread_unlocked_chk, LFpLLLp)
 GO(free, vFp)
 GO(freeaddrinfo, vFp)
@@ -435,19 +460,19 @@ GOW(freeifaddrs, vFp)
 GO(__freelocale, vFp)
 GOW(freelocale, vFp)
 GO(fremovexattr, iFip)
-GO(freopen, pFppp)
-GO(freopen64, pFppp)
+GO(freopen, SFppS)
+GO(freopen64, SFppS)
 GOW(frexp, dFdp)
 GOW(frexpf, fFfp)
 GOWD(frexpl, DFDp, frexp)
-GOM(fscanf, iFEppV)
-GO(fseek, iFpli)
-GO(fseeko, iFpIi)
+GOM(fscanf, iFESpV)
+GO(fseek, iFSli)
+GO(fseeko, iFSli)
 GO(__fseeko64, iFpli)
-GO(fseeko64, iFpli)
+GO(fseeko64, iFSIi)
 GO(__fsetlocking, iFpi)
-GO(fsetpos, iFpp)
-GO(fsetpos64, iFpp)
+GO(fsetpos, iFSp)
+GO(fsetpos64, iFSp)
 GO(fsetxattr, iFippLi)
 GOM(fstat, iFEip)
 GOM(fstat64, iFEip)
@@ -458,15 +483,15 @@ GOW(fstatfs64, iFip)
 GOW(fstatvfs, iFip)
 GOW(fstatvfs64, iFip)
 GO(fsync, iFi)
-GO(ftell, lFp)
-GO(ftello, IFp)
+GO(ftell, lFS)
+GO(ftello, lFS)
 GO(__ftello64, lFp)
-GO(ftello64, lFp)
+GO(ftello64, IFS)
 GO(ftime, iFp)
 GO(ftok, iFpi)
-GO(ftruncate, iFiI)
-GO(ftruncate64, iFil)
-GOW(ftrylockfile, iFp)
+GO(ftruncate, iFil)
+GO(ftruncate64, iFiI)
+GOW(ftrylockfile, iFS)
 GOW(fts64_children, pFpi)
 GOW(fts64_close, iFp)
 GOWM(fts64_open, pFEpip)
@@ -479,18 +504,18 @@ GO(fts_read, pFp)
 GO(fts_set, iFppi)
 GOM(ftw, iFEppi)
 GOM(ftw64, iFEppi)
-GOW(funlockfile, vFp)
+GOW(funlockfile, vFS)
 GO(futimens, iFip)
 GOW(futimes, iFip)
 GO(futimesat, iFipp)
-GO(fwide, iFpi)
-GOWM(fwprintf, iFEppV)
+GO(fwide, iFSi)
+GOWM(fwprintf, iFESpV)
 GOM(__fwprintf_chk, iFEpipV)
 GO(__fwritable, iFp)
-GO(fwrite, LFpLLp)
-GO(fwrite_unlocked, LFpLLp)
+GO(fwrite, LFpLLS)
+GO(fwrite_unlocked, LFpLLS)
 GO(__fwriting, iFp)
-//GO(fwscanf, iFppV)
+//GOM(fwscanf, iFSpV)
 GOM(__fxstat, iFEiip)
 GOM(__fxstat64, iFEiip)
 GOM(__fxstatat, iFEiippi)
@@ -506,7 +531,7 @@ GO(gai_suspend, iFpip)
 //GO(__gconv_transliterate, 
 GO(gcvt, pFdip)
 GO(getaddrinfo, iFpppp)
-GO(getaddrinfo_a, iFipip)
+//GOM(getaddrinfo_a, iFipip)
 GO(getaliasbyname, pFp)
 GO(getaliasbyname_r, iFpppLp)
 GO(getaliasent, pFv)
@@ -514,22 +539,22 @@ GO(getaliasent_r, iFppLp)
 //GO(__getauxval, 
 GOWM(getauxval, LFEL)
 GOW(get_avphys_pages, lFv)
-GOW(getc, iFp)
+GOW(getc, iFS)
 GO(getchar, iFv)
 GO(getchar_unlocked, iFv)
 GOWM(getcontext, iFEp)
 GOW(getcpu, iFpp)
-GOW(getc_unlocked, iFp)
+GOW(getc_unlocked, iFS)
 GO(get_current_dir_name, pFv)
 GO(getcwd, pFpL)
 GO(__getcwd_chk, pFpLL)
 GO(getdate, pFp)
-//DATAB(getdate_err, 
+//DATAB(getdate_err, 4)
 GOW(getdate_r, iFpp)
-GOW(__getdelim, lFppip)
-GO(getdelim, lFppip)
+GOW(__getdelim, lFppiS)
+GO(getdelim, lFppiS)
 GO(getdents64, lFipL)
-GO(getdirentries, IFipUp)
+GO(getdirentries, lFipLp)
 GO(getdirentries64, lFipLp)
 GO(getdomainname, iFpL)
 //GO(__getdomainname_chk, 
@@ -563,26 +588,35 @@ GO(gethostid, lFv)
 GOW(gethostname, iFpL)
 //GO(__gethostname_chk, 
 GOW(getifaddrs, iFp)
-//GO(getipv4sourcefilter, iFi??pp!)
+GO(getipv4sourcefilter, iFiuuppp)
 GOW(getitimer, iFup)
-//GO(get_kernel_syms, // Deprecated
-GO(getline, lFppp)
+#ifdef STATICBUILD
+//GO(get_kernel_syms, 
+#else
+//GO(get_kernel_syms, 
+#endif
+GO(getline, lFppS)
 GO(getloadavg, iFpi)
 GO(getlogin, pFv)
 GOW(getlogin_r, iFpL)
 //GO(__getlogin_r_chk, 
-GO(getmntent, pFp)
+GO(getmntent, pFS)
 GO(__getmntent_r, pFpppi)
-GOW(getmntent_r, pFpppi)
-//GO(getmsg, // Deprecated
-//GO(get_myaddress, vF!)
+GOW(getmntent_r, pFSppi)
+#ifdef STATICBUILD
+//GO(getmsg, 
+//GO(get_myaddress, iFp)
+#else
+//GO(getmsg, 
+GO(get_myaddress, iFp)
+#endif
 GO(getnameinfo, iFpupupui)
-//GO(getnetbyaddr, !Fui)
-//GO(getnetbyaddr_r, iFui!pL!p)
-//GO(getnetbyname, !Fp)
-//GO(getnetbyname_r, iFp!pL!p)
-//GO(getnetent, !Fv)
-//GO(getnetent_r, iF!pL!p)
+GO(getnetbyaddr, pFui)
+GO(getnetbyaddr_r, iFuippLpp)
+GO(getnetbyname, pFp)
+GO(getnetbyname_r, iFpppLpp)
+GO(getnetent, pFv)
+GO(getnetent_r, iFppLpp)
 GO(getnetgrent, iFppp)
 GOW(getnetgrent_r, iFppppL)
 #ifdef STATICBUILD
@@ -605,7 +639,7 @@ GO(getpgrp, iFv)
 GOW(get_phys_pages, lFv)
 GO(__getpid, iFv)
 GO(getpid, iFv)
-//GO(getpmsg, // Deprecated
+//GO(getpmsg, 
 GOW(getppid, iFv)
 GOW(getpriority, iFuu)
 GO(getprotobyname, pFp)
@@ -642,10 +676,10 @@ GO(getrpcent_r, iFppLp)
 #ifdef STATICBUILD
 //GO(getrpcport, 
 #else
-GO(getrpcport, iFpLLu)
+GO(getrpcport, iFpiii)
 #endif
 GOW(getrusage, iFip)
-//GOW(gets, // Deprecated
+//GOW(gets, 
 //GO(__gets_chk, 
 #ifdef STATICBUILD
 //GO(getsecretkey, 
@@ -657,15 +691,22 @@ GO(getservbyname_r, iFppppLp)
 GO(getservbyport, pFip)
 GO(getservbyport_r, iFipppLp)
 GO(getservent, pFv)
-//GO(getservent_r, iF!pL!)
+GO(getservent_r, iFppLp)
+#ifdef STATICBUILD
 //GO(getsgent, 
 //GO(getsgent_r, 
 //GO(getsgnam, 
 //GO(getsgnam_r, 
+#else
+GO(getsgent, pFv)
+GO(getsgent_r, iFppLp)
+GO(getsgnam, pFp)
+GO(getsgnam_r, iFpppLp)
+#endif
 GO(getsid, iFi)
 GOW(getsockname, iFipp)
 GOW(getsockopt, iFiiipp)
-//GO(getsourcefilter, iFiupupp!)
+GO(getsourcefilter, iFiupuppp)
 GO(getspent, pFv)
 GO(getspent_r, iFppLp)
 GO(getspnam, pFp)
@@ -690,11 +731,11 @@ GO(getutmpx, vFpp)
 GO(getutxent, pFv)
 GO(getutxid, pFp)
 GO(getutxline, pFp)
-GO(getw, iFp)
-GOW(getwc, uFp)
+GO(getw, iFS)
+GOW(getwc, uFS)
 GO(getwchar, uFv)
 GO(getwchar_unlocked, uFv)
-GOW(getwc_unlocked, uFp)
+GOW(getwc_unlocked, uFS)
 GO(getwd, pFp)
 //GO(__getwd_chk, 
 GO(getxattr, lFpppL)
@@ -706,20 +747,20 @@ GOW(glob_pattern_p, iFpi)
 GO(gmtime, pFp)
 GO(__gmtime_r, pFpp)
 GOW(gmtime_r, pFpp)
-GOW(gnu_dev_major, uFL)
-GOW(gnu_dev_makedev, LFuu)
-GOW(gnu_dev_minor, uFL)
+GOW(gnu_dev_major, uFU)
+GOW(gnu_dev_makedev, UFuu)
+GOW(gnu_dev_minor, uFU)
 GOW(gnu_get_libc_release, pFv)
 GOW(gnu_get_libc_version, pFv)
 GO(grantpt, iFi)
 GOW(group_member, iFu)
 GOW(gsignal, iFi)
-//GO(gtty, // Deprecated
+//GO(gtty, 
 GOW(hasmntopt, pFpp)
-GO(hcreate, iFU)
-//GOW(hcreate_r, iFL!)
+GO(hcreate, iFL)
+GOW(hcreate_r, iFLp)
 GOW(hdestroy, vFv)
-//GOW(hdestroy_r, vF!)
+GOW(hdestroy_r, vFp)
 //DATA(h_errlist, 
 //DATAB(__h_errno, 
 GO(__h_errno_location, pFv)
@@ -729,8 +770,8 @@ GO(herror, vFp)
 #else
 GO(host2netname, iFppp)
 #endif
-//GO(hsearch, pF?u)
-//GOW(hsearch_r, iF?up!)
+//GO(hsearch, "pF?u")
+//GOW(hsearch_r, "iF?up!")
 GO(hstrerror, pFi)
 GO(htonl, uFu)
 GO(htons, WFW)
@@ -743,10 +784,10 @@ GOW(if_freenameindex, vFp)
 GOW(if_indextoname, pFup)
 GOW(if_nameindex, pFv)
 GOW(if_nametoindex, uFp)
-GOW(imaxabs, lFl)
-GOW(imaxdiv, IFII)
-DATA(in6addr_any, 16)  // type V
-DATA(in6addr_loopback, 16)  //type V
+GOW(imaxabs, IFI)
+GOW(imaxdiv, HFII)
+DATAV(in6addr_any, 16)
+DATAV(in6addr_loopback, 16)
 GO(index, pFpi)
 GO(inet6_opt_append, iFpuiCuCp)
 GO(inet6_opt_find, iFpuiCpp)
@@ -761,8 +802,8 @@ GO(inet6_option_next, iFpp)
 GO(inet6_option_space, iFi)
 GO(inet6_opt_next, iFpuippp)
 GO(inet6_opt_set_val, iFpipu)
-//GO(inet6_rth_add, iFp!)
-//GO(inet6_rth_getaddr, !Fpi)
+GO(inet6_rth_add, iFpp)
+GO(inet6_rth_getaddr, pFpi)
 GO(inet6_rth_init, pFpuii)
 GO(inet6_rth_reverse, iFpp)
 GO(inet6_rth_segments, iFp)
@@ -771,18 +812,18 @@ GO(inet6_rth_space, uFii)
 GOW(inet_addr, uFp)
 GOW(inet_aton, iFpp)
 //GO(__inet_aton_exact, 
-//GO(inet_lnaof, uF?)
-//GOW(inet_makeaddr, ?Fuu)
-//GO(inet_netof, uF?)
+GO(inet_lnaof, uFu)
+GOW(inet_makeaddr, UFuu)
+GO(inet_netof, uFu)
 GO(inet_network, uFp)
 GO(inet_nsap_addr, uFppi)
 GO(inet_nsap_ntoa, pFipp)
-GO(inet_ntoa, pFu) // Really?
+GO(inet_ntoa, pFu)
 GO(inet_ntop, pFippu)
 GOW(inet_pton, iFipp)
 //GO(__inet_pton_length, 
 GO(initgroups, iFpu)
-//GO(init_module, // Deprecated
+//GO(init_module, 
 GO(initstate, pFupL)
 GO(initstate_r, iFupLp)
 GO(innetgr, iFpppp)
@@ -824,7 +865,7 @@ GO(_IO_file_doallocate, iFS)
 //GO(_IO_file_finish, 
 GO(_IO_file_fopen, pFSppi)
 GO(_IO_file_init, vFS)
-DATA(_IO_file_jumps, sizeof(void*))
+DATA(_IO_file_jumps, 8)
 GO(_IO_file_open, pFSpiiii)
 GO(_IO_file_overflow, iFSi)
 GO(_IO_file_read, lFSpl)
@@ -864,7 +905,7 @@ GO(_IO_init_marker, vFpS)
 //GO(_IO_iter_next, 
 //GO(_IO_least_wmarker, 
 GO(_IO_link_in, vFp)
-DATA(_IO_list_all, sizeof(void*))
+DATA(_IO_list_all, 8)
 //GO(_IO_list_lock, 
 //GO(_IO_list_resetlock, 
 //GO(_IO_list_unlock, 
@@ -936,29 +977,29 @@ GO(iruserok, iFuipp)
 GO(iruserok_af, iFpippW)
 GO(isalnum, iFi)
 //GO(__isalnum_l, 
-//GOW(isalnum_l, iFi!)
+GOW(isalnum_l, iFip)
 GO(isalpha, iFi)
 //GO(__isalpha_l, 
 GOW(isalpha_l, iFip)
 GO(isascii, iFi)
 //GOW(__isascii_l, 
-//GO(isastream, // Deprecated
+//GO(isastream, 
 GOW(isatty, iFi)
 GO(isblank, iFi)
 //GO(__isblank_l, 
-//GOW(isblank_l, iFi!)
+GOW(isblank_l, iFip)
 GO(iscntrl, iFi)
 //GO(__iscntrl_l, 
-//GOW(iscntrl_l, iFi!)
+GOW(iscntrl_l, iFip)
 //GO(__isctype, 
 GOW(isctype, iFii)
 GO(isdigit, iFi)
 //GO(__isdigit_l, 
-//GOW(isdigit_l, iFi!)
+GOW(isdigit_l, iFip)
 GO(isfdtype, iFii)
 GO(isgraph, iFi)
 //GO(__isgraph_l, 
-//GOW(isgraph_l, iFi!)
+GOW(isgraph_l, iFip)
 GO(__isinf, iFd)
 GOW(isinf, iFd)
 GO(__isinff, iFf)
@@ -967,7 +1008,7 @@ GOD(__isinfl, iFD, __isinf)
 GOWD(isinfl, iFD, isinf)
 GO(islower, iFi)
 //GO(__islower_l, 
-//GOW(islower_l, iFi!)
+GOW(islower_l, iFip)
 GO(__isnan, iFd)
 GOW(isnan, iFd)
 GO(__isnanf, iFf)
@@ -980,7 +1021,7 @@ GO2(__isoc23_strtol, lFppi, strtol)
 GO2(__isoc23_strtoll, IFppi, strtoll)
 GO2(__isoc23_strtoul, LFppi, strtoul)
 GO2(__isoc23_strtoull, UFppi, strtoull)
-GO2(__isoc23_wcstol, LFppi, wcstol)
+GO2(__isoc23_wcstol, lFppi, wcstol)
 GOM(__isoc99_fscanf, iFEppV)
 //GO(__isoc99_fwscanf, iFppV)
 GOM(__isoc99_scanf, iFEpV)
@@ -995,16 +1036,16 @@ GOM(__isoc99_vswscanf, iFEppA)
 //GO(__isoc99_wscanf, iFpV)
 GO(isprint, iFi)
 //GO(__isprint_l, 
-//GOW(isprint_l, iFi!)
+GOW(isprint_l, iFip)
 GO(ispunct, iFi)
 //GO(__ispunct_l, 
-//GOW(ispunct_l, iFi!)
+GOW(ispunct_l, iFip)
 GO(isspace, iFi)
 //GO(__isspace_l, 
-//GOW(isspace_l, iFi!)
+GOW(isspace_l, iFip)
 GO(isupper, iFi)
 //GO(__isupper_l, 
-//GOW(isupper_l, iFi!)
+GOW(isupper_l, iFip)
 GOW(iswalnum, iFu)
 //GO(__iswalnum_l, 
 GOW(iswalnum_l, iFup)
@@ -1051,15 +1092,29 @@ GOW(isxdigit_l, iFip)
 //GO(__ivaliduser, 
 GO(jrand48, lFp)
 GOW(jrand48_r, iFppp)
-//GO(key_decryptsession, iFp!)
-//GO(key_decryptsession_pk, iFp!!)
+#ifdef STATICBUILD
+//GO(key_decryptsession, iFpp)
+//GO(key_decryptsession_pk, "iFp!!")
+#else
+GO(key_decryptsession, iFpp)
+//GO(key_decryptsession_pk, "iFp!!")
+#endif
 //DATAB(__key_decryptsession_pk_LOCAL, 
-//GO(key_encryptsession, iFp!)
-//GO(key_encryptsession_pk, iFp!!)
+#ifdef STATICBUILD
+//GO(key_encryptsession, iFpp)
+//GO(key_encryptsession_pk, "iFp!!")
+#else
+GO(key_encryptsession, iFpp)
+//GO(key_encryptsession_pk, "iFp!!")
+#endif
 //DATAB(__key_encryptsession_pk_LOCAL, 
-//GO(key_gendes, iF!)
+#ifdef STATICBUILD
+//GO(key_gendes, iFp)
+#else
+GO(key_gendes, iFp)
+#endif
 //DATAB(__key_gendes_LOCAL, 
-//GO(key_get_conv, iFp!)
+//GO(key_get_conv, "iFp!")
 #ifdef STATICBUILD
 //GO(key_secretkey_is_set, 
 //GO(key_setnet, 
@@ -1149,16 +1204,16 @@ GO(listxattr, lFppL)
 GO(llabs, IFI)
 GO(lldiv, HFII)
 GO(llistxattr, lFppL)
-//GO(llseek, // Deprecated
+//GO(llseek, 
 //DATAB(loc1, 
 //DATAB(loc2, 
 GO(localeconv, pFv)
 GO(localtime, pFp)
 GO2(localtime64, pFp, localtime)
 GOW(localtime_r, pFpp)
-GO2(localtime64_r, pFpp, localtime_r)   //Weak
-GO(lockf, iFiiI)
-GO(lockf64, iFiil)
+GOW2(localtime64_r, pFpp, localtime_r)
+GO(lockf, iFiil)
+GO(lockf64, iFiiI)
 //DATAB(locs, 
 GOWM(_longjmp, vFEpi)
 GOWM(longjmp, vFEpi)
@@ -1168,8 +1223,8 @@ GO(lrand48_r, iFpp)
 GO(lremovexattr, iFpp)
 GOM(lsearch, pFEpppLp)
 GO(__lseek, IFiIi)
-GO(lseek, IFiIi)
-GO(lseek64, lFili)
+GO(lseek, lFili)
+GO(lseek64, IFiIi)
 GO(lsetxattr, iFpppLi)
 GOM(lstat, iFEpp)
 GOM(lstat64, iFEpp)
@@ -1178,21 +1233,21 @@ GOM(__lxstat, iFEipp)
 GOM(__lxstat64, iFEipp)
 GO(__madvise, iFpLi)
 GOW(madvise, iFpLi)
-GOWM(makecontext, iFEppiV)
+GOWM(makecontext, vFEppiV)
 GOWM(mallinfo, pFEp)
 GO(malloc, pFL)
-//GO(malloc_get_state, // Obsolete
-GOW(malloc_info, iFip)
-//GO(malloc_set_state, // Obsolete
+//GO(malloc_get_state, 
+GOW(malloc_info, iFiS)
+//GO(malloc_set_state, 
 GOW(malloc_stats, vFv)
 GO(malloc_trim, iFL)
 GO(malloc_usable_size, LFp)
 GOW(mallopt, iFii)
 //DATAB(mallwatch, 
-GO(mblen, iFpU)
+GO(mblen, iFpL)
 GO(__mbrlen, LFpLp)
 GO(mbrlen, LFpLp)
-//GO(mbrtoc16, LFppL!)
+GO(mbrtoc16, LFppLp)
 GOW(mbrtoc32, LFppLp)
 GO(__mbrtowc, LFppLp)
 GO(mbrtowc, LFppLp)
@@ -1204,9 +1259,9 @@ GO(__mbsrtowcs_chk, LFppLpL)
 GO(mbstowcs, LFppL)
 GO(__mbstowcs_chk, LFppLL)
 GO(mbtowc, iFppL)
-//GO(mcheck, iF@)
+//GOM(mcheck, iFp)
 GO(mcheck_check_all, vFv)
-//GO(mcheck_pedantic, iF@)
+//GOM(mcheck_pedantic, iFp)
 //GO(_mcleanup, 
 GO(_mcount, vFpp)
 GO2(mcount, vFpp, _mcount)
@@ -1220,7 +1275,7 @@ GO(__memcpy_chk, pFppLL)
 GO(memfd_create, iFpu)
 GO(memfrob, pFpL)
 GO(memmem, pFpLpL)
-GO(memmove, pFppU)
+GO(memmove, pFppL)
 GO(__memmove_chk, pFppLL)
 GO(__mempcpy, pFppL)
 GO(mempcpy, pFppL)
@@ -1236,8 +1291,8 @@ GO(mkdirat, iFipu)
 GO(mkdtemp, pFp)
 GO(mkfifo, iFpu)
 GO(mkfifoat, iFipu)
-GO(mknod, iFpuL)
-GO(mknodat, iFipuL)
+GO(mknod, iFpuU)
+GO(mknodat, iFipuU)
 GO(mkostemp, iFpi)
 GOW(mkostemp64, iFpi)
 GO(mkostemps, iFpii)
@@ -1254,22 +1309,22 @@ GO(mlock2, iFpLu)
 GO(mlockall, iFi)
 //GO(__mmap, 
 GOWM(mmap, pFEpLiiil)
-GOWM(mmap64, pFEpLiiil)
+GOWM(mmap64, pFEpLiiiI)
 GOW(modf, dFdp)
 GOW(modff, fFfp)
 GOWD(modfl, DFDp, modf)
-//GOW(modify_ldt, // Deprecated
+//GOW(modify_ldt, 
 //GOW(moncontrol, 
 //GO(__monstartup, 
 //GOW(monstartup, 
-//DATA(__morecore, // Compat-only
+//DATA(__morecore, 
 GOW(mount, iFpppLp)
 GO(mprobe, iFp)
 //GO(__mprotect, 
 GOWM(mprotect, iFEpLi)
-GO(mrand48, IFv)
+GO(mrand48, lFv)
 GO(mrand48_r, iFpp)
-GOM(mremap, pFEpLLiN) //weal
+GOWM(mremap, pFEpLLiN)
 GO(msgctl, iFiip)
 GO(msgget, iFii)
 GOW(msgrcv, lFipLli)
@@ -1295,8 +1350,8 @@ GO(netname2user, iFppppp)
 #endif
 GO(__newlocale, pFipp)
 GOW(newlocale, pFipp)
-//GO(nfsservctl, // Deprecated
-//GO(nftw, iFp@ii)
+//GO(nfsservctl, 
+//GOM(nftw, iFppii)
 GOM(nftw64, iFEppii)
 GOW(ngettext, pFppL)
 GO(nice, iFi)
@@ -1330,29 +1385,29 @@ GOW(nrand48_r, iFppp)
 GOW(ntohl, uFu)
 GOW(ntohs, WFW)
 GOW(ntp_adjtime, iFp)
-//GO(ntp_gettime, iF!)
-//GO(ntp_gettimex, iF!)
-//DATAB(_null_auth, 
+//GO(ntp_gettime, "iF!")
+GO(ntp_gettimex, iFp)
+//DATAB(_null_auth, 24)
 //DATAB(_obstack, 
 //GO(_obstack_allocated_p, 
-//DATA(obstack_alloc_failed_handler, 
-GOM(_obstack_begin, iFpLLpp)
-//GO(_obstack_begin_1, 
-//DATA(obstack_exit_failure, 
+//DATAM(obstack_alloc_failed_handler, 8)
+GOM(_obstack_begin, iFpiipp)
+//GOM(_obstack_begin_1, iFpiippp)
+//DATA(obstack_exit_failure, 4)
 GOM(_obstack_free, vFpp)
 GOM(obstack_free, vFpp)
-//GO(_obstack_memory_used, 
+//GOM(_obstack_memory_used, iFp)
 GOM(_obstack_newchunk, vFEpi)
-//GOW(obstack_printf, iFppV)
+//GOWM(obstack_printf, iFppV)
 //GO(__obstack_printf_chk, 
 GOWM(obstack_vprintf, iFEppA)
 //GO(__obstack_vprintf_chk, 
-//GOW(on_exit, iF@p)
-GOWM(__open, iFEpOu)
-GOWM(open, iFEpOu)
+//GOWM(on_exit, iFpp)
+GOWM(__open, iFEpON)
+GOWM(open, iFEpON)
 GO(__open_2, iFpO)
 //GOW(__open64, 
-GOWM(open64, iFEpOu)
+GOWM(open64, iFEpON)
 GO(__open64_2, iFpO)
 //GO(__open64_nocancel, 
 GOW(openat, iFipON)
@@ -1363,49 +1418,56 @@ GO(open_by_handle_at, iFipi)
 //GO(__open_catalog, 
 GOW(opendir, pFp)
 GO(openlog, vFpii)
-GOW(open_memstream, pFpp)
+GOW(open_memstream, SFpp)
 //GO(__open_nocancel, 
-GO(open_wmemstream, pFpp)
-DATA(optarg, sizeof(void*))
-DATA(opterr, sizeof(int))
-DATA(optind, sizeof(int))
-DATA(optopt, sizeof(int))
-GO(__overflow, iFpi)
+GO(open_wmemstream, SFpp)
+DATA(optarg, 8)
+DATA(opterr, 4)
+DATA(optind, 4)
+DATA(optopt, 4)
+GO(__overflow, iFSi)
 GO(parse_printf_format, LFpLp)
-//GO(passwd2des, // Deprecated
+#ifdef STATICBUILD
+//GO(passwd2des, 
+#else
+GO(passwd2des, vFpp)
+#endif
 GO(pathconf, lFpi)
 GOW(pause, iFv)
 //GO(__pause_nocancel, 
-GO(pclose, iFp)
+GO(pclose, iFS)
 GO(perror, vFp)
 GOW(personality, iFL)
 GO(__pipe, iFp)
 GOW(pipe, iFp)
 GO(pipe2, iFpO)
-//GO(pivot_root, // Deprecated
+//GO(pivot_root, 
 GO(pkey_alloc, iFuu)
 GO(pkey_free, iFi)
 GO(pkey_get, iFi)
 GO(pkey_mprotect, iFpLii)
 GO(pkey_set, iFiu)
-//GO(pmap_getmaps, pF!)
-//GO(pmap_getport, WF!LLu)
-//GO(pmap_rmtcall, uF!LLL@p@p?p)
 #ifdef STATICBUILD
-//GO(pmap_set, iFLLiW)
+//GO(pmap_getmaps, pFp)
+//GO(pmap_getport, WFpLLu)
+//GO(pmap_rmtcall, "uF!LLL@p@p?p")
+//GO(pmap_set, iFLLii)
 //GO(pmap_unset, iFLL)
 #else
-GO(pmap_set, iFLLiW)
+GO(pmap_getmaps, pFp)
+GO(pmap_getport, WFpLLu)
+//GO(pmap_rmtcall, "uF!LLL@p@p?p")
+GO(pmap_set, iFLLii)
 GO(pmap_unset, iFLL)
 #endif
 GO(__poll, iFpLi)
 GO(poll, iFpLi)
 GO(__poll_chk, iFpuiL)
-GO(popen, pFpp)
+GO(popen, SFpp)
 GO(posix_fadvise, iFilli)
-GO(posix_fadvise64, iFilli)
+GO(posix_fadvise64, iFiIIi)
 GO(posix_fallocate, iFill)
-GO(posix_fallocate64, iFill)
+GO(posix_fallocate64, iFiII)
 //GO(__posix_getopt, 
 GO(posix_madvise, iFpLi)
 GO(posix_memalign, iFpLL)
@@ -1436,28 +1498,28 @@ GOM(posix_spawnp, iFEpppppp)
 GO(ppoll, iFpLpp)
 GO(__ppoll_chk, iFpuppL)
 GOWM(prctl, iFEiLLLL)
-GO(pread, IFipUI)
+GO(pread, lFipLl)
 GOW(__pread64, lFipLI)
-GO(pread64, lFipLl)
+GO(pread64, lFipLI)
 //GO(__pread64_chk, 
 GO(__pread_chk, lFipLlL)
 GO(preadv, lFipil)
 GO(preadv2, lFipili)
-GO(preadv64, lFipil)
-GO(preadv64v2, lFipili)
+GO(preadv64, lFipiI)
+GO(preadv64v2, lFipiIi)
 GOM(printf, iFEpV)
 GOM(__printf_chk, iFEipV)
 //GO(__printf_fp, 
-//GO(printf_size, 
-//GO(printf_size_info, 
+GO(printf_size, iFSpp)
+GO(printf_size_info, iFpLp)
 GO(prlimit, iFiupp)
 GOW(prlimit64, iFiupp)
 GO(process_vm_readv, lFipLpLL)
 GO(process_vm_writev, lFipLpLL)
 GO(profil, iFpLLu)
 //GO(__profile_frequency, 
-DATA(__progname, sizeof(void*))
-DATA(__progname_full, sizeof(void))
+DATA(__progname, 8)
+DATA(__progname_full, 1)
 GOW(pselect, iFippppp)
 GO(psiginfo, vFpp)
 GO(psignal, vFip)
@@ -1473,33 +1535,37 @@ GOM(ptrace, lFEuipp)
 GO(ptsname, pFi)
 GOW(ptsname_r, iFipL)
 //GO(__ptsname_r_chk, 
-GOW(putc, iFip)
+GOW(putc, iFiS)
 GO(putchar, iFi)
 GO(putchar_unlocked, iFi)
-GOW(putc_unlocked, iFip)
+GOW(putc_unlocked, iFiS)
 GO(putenv, iFp)
-GO(putgrent, iFpp)
-//GO(putmsg, // Deprecated
-//GO(putpmsg, // Deprecated
-GO(putpwent, iFpp)
+GO(putgrent, iFpS)
+//GO(putmsg, 
+//GO(putpmsg, 
+GO(putpwent, iFpS)
 GOW(puts, iFp)
+#ifdef STATICBUILD
 //GO(putsgent, 
-GO(putspent, iFpp)
+#else
+GO(putsgent, iFpS)
+#endif
+GO(putspent, iFpS)
 GOW(pututline, pFp)
 GO(pututxline, pFp)
-GO(putw, iFip)
-GO(putwc, uFup)
-GO(putwchar, uFu)
-GO(putwchar_unlocked, uFu)
-GO(putwc_unlocked, uFup)
+GO(putw, iFiS)
+GO(putwc, uFiS)
+GO(putwchar, uFi)
+GO(putwchar_unlocked, uFi)
+GO(putwc_unlocked, uFiS)
 GO(pvalloc, pFL)
-GO(pwrite, IFipUI)
+GO(pwrite, lFipLl)
 //GOW(__pwrite64, 
-GO(pwrite64, lFipLl)
+GO(pwrite64, lFipLI)
 GO(pwritev, lFipil)
 GO(pwritev2, lFipili)
-GO(pwritev64, lFipil)
-GO(pwritev64v2, lFipili)
+GO(pwritev64, lFipiI)
+GO(pwritev64v2, lFipiIi)
 GOD(qecvt, pFDipp, ecvt)
 GOWD(qecvt_r, iFDipppL, ecvt_r)
 GOD(qfcvt, pFDipp, fcvt)
@@ -1507,7 +1573,7 @@ GOD(qfcvt_r, iFDipppL, fcvt_r)
 GOD(qgcvt, pFDip, gcvt)
 GOM(qsort, vFEpLLp)
 GOWM(qsort_r, vFEpLLpp)
-//GO(query_module, // Deprecated
+//GO(query_module, 
 GO(quick_exit, vFi)
 GO(quotactl, iFipip)
 GO(raise, iFi)
@@ -1522,14 +1588,14 @@ GO(rcmd_af, iFpWppppW)
 //DATAB(__rcmd_errstr, 
 GOW(__read, lFipL)
 GO(read, lFipL)
-GO(readahead, lFilL)
+GO(readahead, lFiIL)
 GO(__read_chk, lFipLL)
-GOW(readdir, pFp) // struct dirent is 280 bytes on x86_64 and ARM64
+GOW(readdir, pFp)
 GOW(readdir64, pFp)
 GOW(readdir64_r, iFppp)
 GOW(readdir_r, iFppp)
 GOWM(readlink, lFEppL)
-GOM(readlinkat, iFEippL)
+GOM(readlinkat, lFEippL)
 //GO(__readlinkat_chk, 
 //GO(__readlink_chk, 
 //GO(__read_nocancel, 
@@ -1539,7 +1605,7 @@ GO(reallocarray, pFpLL)
 GOM(realpath, pFEpp)
 GO2(__realpath_chk, pFEppv, my_realpath)
 GO(reboot, iFi)
-//GOW(re_comp, // Deprecated
+//GOW(re_comp, 
 GOW(re_compile_fastmap, iFp)
 GOW(re_compile_pattern, pFpLp)
 GOW(__recv, lFipLi)
@@ -1549,20 +1615,20 @@ GOW(recvfrom, lFipLipp)
 //GO(__recvfrom_chk, 
 GO(recvmmsg, iFipuip)
 GO(recvmsg, lFipi)
-//GOW(re_exec, // Deprecated
+//GOW(re_exec, 
 GOW(regcomp, iFppi)
 GOW(regerror, LFippL)
 GO(regexec, iFppLpi)
 GOW(regfree, vFp)
 GOM(__register_atfork, iFEpppp)
-//GOW(register_printf_function, 
+//GOWM(register_printf_function, iFipp)
 GOW(register_printf_modifier, iFp)
 GOWM(register_printf_specifier, iFEipp)
 GOWM(register_printf_type, iFEp)
-//GO(registerrpc, // Deprecated?
+//GOM(registerrpc, iFiiippp)
 GO(remap_file_pages, iFpLiLi)
-GOW(re_match, lFppllp)
-//GOW(re_match_2, iFppipii!i)
+GOW(re_match, iFppiip)
+GOW(re_match_2, iFppipiipi)
 //DATA(re_max_failures, 
 GO(remove, iFp)
 GO(removexattr, iFpp)
@@ -1571,9 +1637,9 @@ GO(rename, iFpp)
 GOW(renameat, iFipip)
 GOW(renameat2, iFipipu)
 //DATAB(_res, 
-GOW(re_search, lFpplllp)
-//GOW(re_search_2, iFppipiii!i)
-//GOW(re_set_registers, vFp!upp)
+GOW(re_search, iFppiiip)
+GOW(re_search_2, iFppipiiipi)
+GOW(re_set_registers, vFppupp)
 GOW(re_set_syntax, LFL)
 //DATAB(_res_hconf, 
 GO(__res_iclose, vFpi)
@@ -1586,11 +1652,15 @@ GO(res_nsearch, iFppiipi)
 //GO(__resolv_context_get_preinit, 
 //GO(__resolv_context_put, 
 //DATA(__resp, 
+#ifdef STATICBUILD
 //GO(__res_randomid, 
+#else
+GO(__res_randomid, uFv)
+#endif
 GO(__res_state, pFv)
-//DATAB(re_syntax_options, 
+//DATAB(re_syntax_options, 8)
 GOW(revoke, iFp)
-GO(rewind, vFp)
+GO(rewind, vFS)
 GOW(rewinddir, vFp)
 GO(rexec, iFpipppp)
 GO(rexec_af, iFpippppW)
@@ -1600,22 +1670,26 @@ GOW(rmdir, iFp)
 #ifdef STATICBUILD
 //DATAB(rpc_createerr, 
 //GO(_rpc_dtablesize, iFv)
-//GO(__rpc_thread_createerr, !Fv)
-//GO(__rpc_thread_svc_fdset, !Fv)
+//GO(__rpc_thread_createerr, "!Fv")
+//GO(__rpc_thread_svc_fdset, "!Fv")
 //GO(__rpc_thread_svc_max_pollfd, pFv)
 //GO(__rpc_thread_svc_pollfd, pFv)
 #else
 //DATAB(rpc_createerr, 
 GO(_rpc_dtablesize, iFv)
-//GO(__rpc_thread_createerr, !Fv)
-//GO(__rpc_thread_svc_fdset, !Fv)
+//GO(__rpc_thread_createerr, "!Fv")
+//GO(__rpc_thread_svc_fdset, "!Fv")
 GO(__rpc_thread_svc_max_pollfd, pFv)
 GO(__rpc_thread_svc_pollfd, pFv)
 #endif
 GO(rpmatch, iFp)
 GO(rresvport, iFp)
 GO(rresvport_af, iFpW)
-//GO(rtime, iF!!!)
+#ifdef STATICBUILD
+//GO(rtime, 
+#else
+GO(rtime, iFppp)
+#endif
 GO(ruserok, iFpipp)
 GO(ruserok_af, iFpippW)
 //GO(ruserpass, 
@@ -1627,8 +1701,8 @@ GOWD(scalbnl, DFDi, scalbn)
 GOWM(scandir, iFEpppp)
 GOWM(scandir64, iFEpppp)
 GOWM(scandirat, iFipppp)
-//GO(scandirat64, iFipp@@)
-//GO(scanf, iFpV)
+//GOM(scandirat64, iFipppp)
+GO(scanf, iFpV)
 GO(__sched_cpualloc, pFL)
 GO(__sched_cpucount, iFLp)
 GO(__sched_cpufree, vFp)
@@ -1669,13 +1743,13 @@ GOW(sendmmsg, iFipui)
 GO(sendmsg, lFipi)
 GOW(sendto, lFipLipu)
 GO(setaliasent, vFv)
-GO(setbuf, vFpp)
-GO(setbuffer, vFppL)
+GO(setbuf, vFSp)
+GO(setbuffer, vFSpL)
 GOWM(setcontext, iFEp)
 GO(setdomainname, iFpL)
 GO(setegid, iFu)
 GOW(setenv, iFppi)
-//GO(_seterr_reply, vF!!)
+//GOM(_seterr_reply, vFpp)
 GO(seteuid, iFu)
 GO(setfsent, iFv)
 GO(setfsgid, iFu)
@@ -1686,16 +1760,16 @@ GO(setgroups, iFLp)
 GO(sethostent, vFi)
 GO(sethostid, iFl)
 GO(sethostname, iFpL)
-//GO(setipv4sourcefilter, iFi??uu!)
+GO(setipv4sourcefilter, iFiuuuup)
 GOW(setitimer, iFupp)
 GOM(_setjmp, iFEp)
 GOM(setjmp, iFEp)
-GO(setlinebuf, vFp)
+GO(setlinebuf, vFS)
 GO(setlocale, pFip)
 GO(setlogin, iFp)
 GO(setlogmask, iFi)
 GO(__setmntent, pFpp)
-GOW(setmntent, pFpp)
+GOW(setmntent, SFpp)
 GO(setnetent, vFi)
 GO(setnetgrent, iFp)
 GO(setns, iFii)
@@ -1713,10 +1787,14 @@ GOWM(setrlimit, iFEup)
 GOW(setrlimit64, iFup)
 GO(setrpcent, vFi)
 GO(setservent, vFi)
+#ifdef STATICBUILD
 //GO(setsgent, 
+#else
+GO(setsgent, vFv)
+#endif
 GOW(setsid, iFv)
 GOW(setsockopt, iFiiipu)
-//GO(setsourcefilter, iFiupuuu!)
+GO(setsourcefilter, iFiupuuup)
 GO(setspent, vFv)
 GOW(setstate, pFp)
 GOW(setstate_r, iFpp)
@@ -1726,10 +1804,15 @@ GOW(setuid, iFu)
 GO(setusershell, vFv)
 GOW(setutent, vFv)
 GO(setutxent, vFv)
-GO(setvbuf, iFppiL)
+GO(setvbuf, iFSpiL)
 GO(setxattr, iFpppLi)
-//GO(sgetsgent, 
-//GOW(sgetsgent_r, 
+#ifdef STATICBUILD
+//GO(sgetsgent, pFp)
+//GOW(sgetsgent_r, iFpppLp)
+#else
+GO(sgetsgent, pFp)
+GOW(sgetsgent_r, iFpppLp)
+#endif
 GO(sgetspent, pFp)
 GOW(sgetspent_r, iFpppLp)
 GO(shmat, pFipi)
@@ -1742,7 +1825,7 @@ GOWM(sigaction, iFEipp)
 GO(__sigaddset, iFpi)
 GO(sigaddset, iFpi)
 GOWM(sigaltstack, iFEpp)
-//GO(sigandset, 
+GO(sigandset, iFppp)
 GOW(sigblock, iFi)
 //GO(__sigdelset, 
 GO(sigdelset, iFpi)
@@ -1762,13 +1845,18 @@ GO(__signbit, iFd)
 GO(__signbitf, iFf)
 GOD(__signbitl, iFD, __signbit)
 GO(sigorset, iFppp)
+#ifdef STATICBUILD
 //GO(__sigpause, 
-//GOW(sigpause, // Deprecated
+//GOW(sigpause, 
+#else
+GO(__sigpause, iFii)
+//GOW(sigpause, 
+#endif
 GO(sigpending, iFp)
 GOW(sigprocmask, iFipp)
-//GOW(sigqueue, iFii?)
+//GOW(sigqueue, "iFii?")
 GO(sigrelse, iFi)
-//GOW(sigreturn, iF!)
+GOW(sigreturn, iFp)
 GOM(sigset, pFEip)
 GOM(__sigsetjmp, iFEpi)
 GOM(sigsetjmp, iFEpi)
@@ -1778,7 +1866,7 @@ GO(__sigsuspend, iFp)
 GOW(sigsuspend, iFp)
 GO(__sigtimedwait, iFppp)
 GOW(sigtimedwait, iFppp)
-//GO(sigvec, // Deprecated
+//GO(sigvec, 
 GOW(sigwait, iFpp)
 GOW(sigwaitinfo, iFpp)
 GOW(sleep, uFu)
@@ -1792,14 +1880,18 @@ GOW(socketpair, iFiiip)
 GO(splice, lFipipLu)
 GOM(sprintf, iFEppV)
 GOM(__sprintf_chk, iFEpilpV)
+#ifdef STATICBUILD
 //GOW(sprofil, 
+#else
+GOW(sprofil, iFpipu)
+#endif
 GOW(srand, vFu)
 GO(srand48, vFl)
 GO(srand48_r, iFlp)
 GOW(srandom, vFu)
 GOW(srandom_r, iFup)
 GOM(sscanf, iFEppV)
-//GOW(ssignal, @Fi@)
+//GOWM(ssignal, pFip)
 //GO(sstk, 
 GOM(__stack_chk_fail, vFEv)
 GOM(stat, iFEpp)
@@ -1810,9 +1902,9 @@ GOW(statfs64, iFpp)
 GOW(statvfs, iFpp)
 GOW(statvfs64, iFpp)
 GO(statx, iFipiup)
-DATA(stderr, sizeof(void*))
-DATA(stdin, sizeof(void*))
-DATA(stdout, sizeof(void*))
+DATA(stderr, 8)
+DATA(stdin, 8)
+DATA(stdout, 8)
 //GOW(step, 
 GOM(stime, iFEp)
 GO(__stpcpy, pFpp)
@@ -1849,8 +1941,13 @@ GO(strerror, pFi)
 GO(strerror_l, pFip)
 GO(__strerror_r, pFipL)
 GO(strerror_r, pFipL)
+#ifdef STATICBUILD
 //GO(strfmon, lFpLpV)
 //GO(__strfmon_l, 
+#else
+GO(strfmon, lFpLpV)
+//GO(__strfmon_l, 
+#endif
 GOW(strfmon_l, lFpLppdddddd)    // should be V, but only double are allowed...
 GO(strfromd, iFpLpd)
 GO(strfromf, iFpLpf)
@@ -1858,7 +1955,7 @@ GOD(strfromf128, iFpLpD, strfromf64)
 GO(strfromf32, iFpLpf)
 GO(strfromf32x, iFpLpd)
 GO(strfromf64, iFpLpd)
-GOD(strfromf64x, iFpLpD, strfromf64)
+GOD(strfromf64x, iFpLpD, strfromf32x)
 GOD(strfroml, iFpLpD, strfromd)
 GO(strfry, pFp)
 GO(strftime, LFpLpp)
@@ -1880,7 +1977,7 @@ GO(strpbrk, pFpp)
 //GO(__strpbrk_c2, 
 //GO(__strpbrk_c3, 
 GO(strptime, pFppp)
-//GOW(strptime_l, pFppp!)
+GOW(strptime_l, pFpppp)
 GO(strrchr, pFpi)
 GOW(strsep, pFpp)
 //GO(__strsep_1c, 
@@ -1904,19 +2001,19 @@ GOD(strtof128, DFpp, strtof64)
 //GOW(strtof128_l, 
 //GO(__strtof128_nan, 
 GOW(strtof32, fFpp)
-//GOW(strtof32_l, fFpp!)
+GOW(strtof32_l, fFppp)
 GOW(strtof32x, dFpp)
-//GOW(strtof32x_l, dFpp!)
+GOW(strtof32x_l, dFppp)
 GOW(strtof64, dFpp)
-//GOW(strtof64_l, dFpp!)
-GOWD(strtof64x, DFpp, strtof64)
-//GOW(strtof64x_l, DFpp!)
+GOW(strtof64_l, dFppp)
+GOWD(strtof64x, DFpp, strtof32x)
+GOWD(strtof64x_l, DFppp, strtof32x_l)
 GO(__strtof_internal, fFppi)
 GO(__strtof_l, fFppL)
 GOW(strtof_l, fFppp)
 //GO(__strtof_nan, 
-GO(strtoimax, lFppi)
-GO2(__isoc23_strtoimax, lFppi, strtoimax)
+GO(strtoimax, IFppi)
+GO2(__isoc23_strtoimax, IFppi, strtoimax)
 GO(strtok, pFpp)
 GO(__strtok_r, pFppp)
 GOW(strtok_r, pFppp)
@@ -1943,102 +2040,104 @@ GOW(strtoull, UFppi)
 GO(__strtoull_internal, UFppii)
 GOW(__strtoull_l, LFppip)
 GOW(strtoull_l, UFppip)
-GO(strtoumax, LFppi)
-GO2(__isoc23_strtoumax, LFppi, strtoumax)
+GO(strtoumax, UFppi)
+GO2(__isoc23_strtoumax, UFppi, strtoumax)
 GOW(strtouq, UFppi)
 //GO(__strverscmp, 
 GOW(strverscmp, iFpp)
 GO(strxfrm, LFppL)
 GO(__strxfrm_l, LFppLL)
 GO(strxfrm_l, LFppLp)
-//GO(stty, // Deprecated
+//GO(stty, 
 #ifdef STATICBUILD
 //DATAB(svcauthdes_stats, 
-//GO(svcerr_auth, vF!u)
-//GO(svcerr_decode, vF!)
-//GO(svcerr_noproc, vF!)
-//GO(svcerr_noprog, vF!)
-//GO(svcerr_progvers, vF!LL)
-//GO(svcerr_systemerr, vF!)
-//GO(svcerr_weakauth, vF!)
+//GO(svcerr_auth, "vF!u")
+//GO(svcerr_decode, "vF!")
+//GO(svcerr_noproc, "vF!")
+//GO(svcerr_noprog, "vF!")
+//GO(svcerr_progvers, "vF!uu")
+//GO(svcerr_systemerr, "vF!")
+//GO(svcerr_weakauth, "vF!")
 //GO(svc_exit, vFv)
-//GO(svcfd_create, !Fiuu)
+//GO(svcfd_create, "!Fiuu")
 //DATAB(svc_fdset, 
 //GO(svc_getreq, vFi)
 //GO(svc_getreq_common, vFi)
 //GO(svc_getreq_poll, vFpi)
-//GO(svc_getreqset, vF!)
+//GO(svc_getreqset, "vF!")
 //DATAB(svc_max_pollfd, 
 //DATAB(svc_pollfd, 
-//GO(svcraw_create, !Fv)
-//GO(svc_register, iF!LL@L)
+//GO(svcraw_create, "!Fv")
+//GO(svc_register, "iF!LL@i")
 //GO(svc_run, vFv)
-//GO(svc_sendreply, iF!@p)
-//GO(svctcp_create, !Fiuu)
-//GO(svcudp_bufcreate, !Fiuu)
-//GO(svcudp_create, !Fi)
+//GO(svc_sendreply, "iF!@p")
+//GO(svctcp_create, "!Fiuu")
+//GO(svcudp_bufcreate, "!Fiuu")
+//GO(svcudp_create, "!Fi")
 //GO(svcudp_enablecache, 
-//GO(svcunix_create, !Fiuup)
+//GO(svcunix_create, "!Fiuup")
 //GO(svcunixfd_create, 
 //GO(svc_unregister, vFLL)
 #else
 //DATAB(svcauthdes_stats, 
-//GO(svcerr_auth, vF!u)
-//GO(svcerr_decode, vF!)
-//GO(svcerr_noproc, vF!)
-//GO(svcerr_noprog, vF!)
-//GO(svcerr_progvers, vF!LL)
-//GO(svcerr_systemerr, vF!)
-//GO(svcerr_weakauth, vF!)
+//GOM(svcerr_auth, vFpu)
+//GOM(svcerr_decode, vFp)
+//GOM(svcerr_noproc, vFp)
+//GOM(svcerr_noprog, vFp)
+//GOM(svcerr_progvers, vFpuu)
+//GOM(svcerr_systemerr, vFp)
+//GOM(svcerr_weakauth, vFp)
 GO(svc_exit, vFv)
-//GO(svcfd_create, !Fiuu)
-//DATAB(svc_fdset, 
+//GOM(svcfd_create, pFiuu)
+//DATAB(svc_fdset, 128)
 GO(svc_getreq, vFi)
 GO(svc_getreq_common, vFi)
 GO(svc_getreq_poll, vFpi)
-//GO(svc_getreqset, vF!)
-//DATAB(svc_max_pollfd, 
-//DATAB(svc_pollfd, 
-//GO(svcraw_create, !Fv)
-//GO(svc_register, iF!LL@L)
+GO(svc_getreqset, vFp)
+//DATAB(svc_max_pollfd, 4)
+//DATAB(svc_pollfd, 8)
+//GOM(svcraw_create, pFv)
+//GOM(svc_register, iFpLLpi)
 GO(svc_run, vFv)
-//GO(svc_sendreply, iF!@p)
-//GO(svctcp_create, !Fiuu)
-//GO(svcudp_bufcreate, !Fiuu)
-//GO(svcudp_create, !Fi)
-//GO(svcudp_enablecache, 
-//GO(svcunix_create, !Fiuup)
-//GO(svcunixfd_create, 
+//GOM(svc_sendreply, iFppp)
+//GOM(svctcp_create, pFiuu)
+//GOM(svcudp_bufcreate, pFiuu)
+//GOM(svcudp_create, pFi)
+//GOM(svcudp_enablecache, iFpL)
+//GOM(svcunix_create, pFiuup)
+//GOM(svcunixfd_create, pFiuu)
 GO(svc_unregister, vFLL)
 #endif
 GO(swab, vFppl)
 GOWM(swapcontext, iFEpp)
+#ifdef STATICBUILD
 //GOW(swapoff, 
 //GOW(swapon, 
+#else
+GOW(swapoff, iFp)
+GOW(swapon, iFpi)
+#endif
 GOM(swprintf, iFEpLpV)
 GOM(__swprintf_chk, iFEpLiLpV)
 GOM(swscanf, iFEppV)
 GOW(symlink, iFpp)
 GO(symlinkat, iFpip)
 GO(sync, vFv)
-GO(sync_file_range, iFillu)
+GO(sync_file_range, iFiIIu)
 GO(syncfs, iFi)
 GOM(syscall, lFEv)
 GOM(__sysconf, lFEi)
-GOM(sysconf, IFEi)
+GOM(sysconf, lFEi)
 #ifdef STATICBUILD
 //GO(__sysctl, 
-//GO(sysctl, 
+//GOW(sysctl, 
+//DATA(_sys_errlist, 8)
+//DATA(sys_errlist, 8)
 #else
 GO(__sysctl, iFpipppL)
-GOW(sysctl, iFpipppL) // Deprecated
-#endif
-#ifdef STATICBUILD
-//DATA(_sys_errlist, sizeof(void*))
-//DATA(sys_errlist, sizeof(void*))
-#else
-DATA(_sys_errlist, sizeof(void*))
-DATA(sys_errlist, sizeof(void*))
+GOW(sysctl, iFpipppL)
+DATA(_sys_errlist, 8)
+DATA(sys_errlist, 8)
 #endif
 GOW(sysinfo, iFp)
 GOM(syslog, vFEipV)
@@ -2068,11 +2167,21 @@ GOW(textdomain, pFp)
 //GO(__tfind, 
 GOWM(tfind, pFEppp)
 GOW(tgkill, iFiii)
+#ifdef STATICBUILD
 //GO(thrd_current, 
-GO(thrd_exit, vFp)
+#else
+GO(thrd_current, LFv)
+#endif
+GO(thrd_exit, vFi)
+#ifdef STATICBUILD
 //GO(thrd_equal, 
 //GO(thrd_sleep, 
 //GO(thrd_yield, 
+#else
+GO(thrd_equal, iFLL)
+GO(thrd_sleep, iFpp)
+GO(thrd_yield, vFv)
+#endif
 GO(time, lFp)
 GO(timegm, lFp)
 GOW(timelocal, lFp)
@@ -2081,21 +2190,21 @@ GO(timerfd_gettime, iFip)
 GO(timerfd_settime, iFiipp)
 GOW(times, lFp)
 GO(timespec_get, iFpi)
-DATAB(__timezone, sizeof(void*))
-DATAV(timezone, sizeof(void*))
-GO(tmpfile, pFv)
-GOW(tmpfile64, pFv)
+DATAB(__timezone, 8)
+DATAV(timezone, 8)
+GO(tmpfile, SFv)
+GOW(tmpfile64, SFv)
 GO(tmpnam, pFp)
 GO(tmpnam_r, pFp)
 GO(toascii, iFi)
 //GOW(__toascii_l, 
 GO(_tolower, iFi)
 GO(tolower, iFi)
-//GO(__tolower_l, iFi!)
+GO(__tolower_l, iFip)
 GOW(tolower_l, iFip)
 GO(_toupper, iFi)
 GO(toupper, iFi)
-//GO(__toupper_l, iFi!)
+GO(__toupper_l, iFip)
 GOW(toupper_l, iFip)
 //GO(__towctrans, 
 GOW(towctrans, uFup)
@@ -2108,8 +2217,8 @@ GOW(towupper, uFu)
 GO(__towupper_l, iFip)
 GOW(towupper_l, uFup)
 //GO(tr_break, 
-GO(truncate, iFpI)
-GO(truncate64, iFpl)
+GO(truncate, iFpl)
+GO(truncate64, iFpI)
 //GO(__tsearch, 
 GOWM(tsearch, pFEppp)
 GO(ttyname, pFi)
@@ -2118,21 +2227,25 @@ GO(ttyname_r, iFipL)
 GO(ttyslot, iFv)
 //GO(__twalk, 
 GOWM(twalk, vFEpp)
-//GOW(twalk_r, vFp@p)
-DATA(__tzname, sizeof(void*))
-DATA(tzname, sizeof(void*)) //type V
+//GOWM(twalk_r, vFppp)
+DATA(__tzname, 16)
+DATAV(tzname, 16)
 GOW(tzset, vFv)
 GO(ualarm, uFuu)
-GO(__uflow, iFp)
+GO(__uflow, iFS)
 GOW(ulckpwdf, iFv)
-//GOW(ulimit, lFiV) // Deprecated
+#ifdef STATICBUILD
+//GOW(ulimit, lFiV)
+#else
+GOW(ulimit, lFiV)
+#endif
 GOW(umask, uFu)
 GOW(umount, iFp)
 GOW(umount2, iFpi)
 GOWM(uname, iFp)
 GO(__underflow, iFp)
-GOW(ungetc, iFip)
-GO(ungetwc, uFup)
+GOW(ungetc, iFiS)
+GO(ungetwc, uFuS)
 GOW(unlink, iFp)
 GO(unlinkat, iFipi)
 GO(unlockpt, iFi)
@@ -2140,7 +2253,7 @@ GOW(unsetenv, iFp)
 GO(unshare, iFi)
 GOW(updwtmp, vFpp)
 GO(updwtmpx, vFpp)
-//GO(uselib, // Deprecated
+//GO(uselib, 
 GO(__uselocale, pFp)
 GOW(uselocale, pFp)
 #ifdef STATICBUILD
@@ -2149,7 +2262,7 @@ GOW(uselocale, pFp)
 GO(user2netname, iFpup)
 #endif
 GO(usleep, iFu)
-//GO(ustat, // Deprecated
+//GO(ustat, 
 GO(utime, iFpp)
 GO(utimensat, iFippi)
 GOW(utimes, iFpp)
@@ -2160,21 +2273,21 @@ GOWM(vasprintf, iFEppA)
 GOM(__vasprintf_chk, iFEpipp)
 GOM(vdprintf, iFEipA)
 GOM(__vdprintf_chk, iFEiipA)
-//GO(verr, vFipA)
-//GO(verrx, vFipA)
+GO(verr, vFipA)
+GO(verrx, vFipA)
 GOW(versionsort, iFpp)
 GOW(versionsort64, iFpp)
 //GO(__vfork, 
 GOWM(vfork, iFEv)
-GOM(vfprintf, iFEppA)
+GOM(vfprintf, iFESpA)
 GOM(__vfprintf_chk, iFEpvpp)
 //GO(__vfscanf, 
-GOWM(vfscanf, iFEppA)
-GOWM(vfwprintf, iFEppA)
+GOWM(vfscanf, iFESpA)
+GOWM(vfwprintf, iFESpA)
 GOM(__vfwprintf_chk, iFEpipA)
-//GOW(vfwscanf, iFppA)
+GOW(vfwscanf, iFSpA)
 GO(vhangup, iFv)
-//GO(vlimit, // Deprecated
+//GO(vlimit, 
 GO(vmsplice, lFipLu)
 GOM(vprintf, iFEpA)
 GOM(__vprintf_chk, iFEvpp)
@@ -2191,12 +2304,12 @@ GOWM(__vswprintf_chk, iFEpuvvppp)
 GOM(vswscanf, iFEppA)
 GOM(vsyslog, vFEipA)
 GOM(__vsyslog_chk, vFEiipA)
-//GO(vtimes, // Deprecated
-//GO(vwarn, vFpA)
-//GO(vwarnx, vFpA)
+//GO(vtimes, 
+GO(vwarn, vFpA)
+GO(vwarnx, vFpA)
 GOM(vwprintf, iFEpA)
 //GO(__vwprintf_chk, 
-//GO(vwscanf, iFpA)
+GO(vwscanf, iFpA)
 GOW(__wait, iFp)
 GOW(wait, iFp)
 GOW(wait3, iFpip)
@@ -2210,15 +2323,15 @@ GOW(wcpcpy, pFpp)
 //GO(__wcpcpy_chk, 
 GO(wcpncpy, pFppL)
 //GO(__wcpncpy_chk, 
-GO(wcrtomb, LFpup)
+GO(wcrtomb, LFpip)
 GO(__wcrtomb_chk, LFpupL)
 GOW(wcscasecmp, iFpp)
 GO(__wcscasecmp_l, iFppp)
 GOW(wcscasecmp_l, iFppp)
 GOW(wcscat, pFpp)
 GO(__wcscat_chk, pFppL)
-GO(wcschr, pFpu)
-GO(wcschrnul, pFpu)
+GO(wcschr, pFpi)
+GO(wcschrnul, pFpi)
 GO(wcscmp, iFpp)
 GOW(wcscoll, iFpp)
 GO(__wcscoll_l, iFppp)
@@ -2233,7 +2346,7 @@ GO(wcsftime_l, LFpLppp)
 GO(wcslen, LFp)
 GO(wcsncasecmp, iFppL)
 //GO(__wcsncasecmp_l, 
-//GOW(wcsncasecmp_l, iFppL!)
+GOW(wcsncasecmp_l, iFppLp)
 GO(wcsncat, pFppL)
 GO(__wcsncat_chk, pFppLL)
 GO(wcsncmp, iFppL)
@@ -2243,7 +2356,7 @@ GO(wcsnlen, LFpL)
 GO(wcsnrtombs, LFppLLp)
 //GO(__wcsnrtombs_chk, 
 GO(wcspbrk, pFpp)
-GO(wcsrchr, pFpu)
+GO(wcsrchr, pFpi)
 GO(wcsrtombs, LFppLp)
 GO(__wcsrtombs_chk, LFppLpL)
 GO(wcsspn, LFpp)
@@ -2257,30 +2370,30 @@ GOD(wcstof128, DFpp, wcstof64)
 //GO(__wcstof128_internal, 
 //GOW(wcstof128_l, 
 GOW(wcstof32, fFpp)
-//GOW(wcstof32_l, fFpp!)
+GOW(wcstof32_l, fFppp)
 GOW(wcstof32x, dFpp)
-//GOW(wcstof32x_l, dFpp!)
+GOW(wcstof32x_l, dFppp)
 GOW(wcstof64, dFpp)
-//GOW(wcstof64_l, dFpp!)
-GOWD(wcstof64x, DFpp, wcstof64)
-//GOW(wcstof64x_l, DFpp!)
+GOW(wcstof64_l, dFppp)
+GOWD(wcstof64x, DFpp, wcstof32x)
+GOWD(wcstof64x_l, DFppp, wcstof32x_l)
 //GO(__wcstof_internal, 
 //GO(__wcstof_l, 
-//GOW(wcstof_l, fFpp!)
-GO(wcstoimax, lFppi)
+GOW(wcstof_l, fFppp)
+GO(wcstoimax, IFppi)
 GO(wcstok, pFppp)
 GO(wcstol, lFppi)
 GOD(wcstold, DFpp, wcstod)
 //GO(__wcstold_internal, 
 //GO(__wcstold_l, 
-//GOW(wcstold_l, DFpp!)
+GOWD(wcstold_l, DFppp, wcstod_l)
 //GO(__wcstol_internal, 
 //GO(__wcstol_l, 
 GOW(wcstol_l, lFppip)
 GOW(wcstoll, IFppi)
 //GO(__wcstoll_internal, 
 //GOW(__wcstoll_l, 
-//GOW(wcstoll_l, IFppi!)
+GOW(wcstoll_l, IFppip)
 GO(wcstombs, LFppL)
 //GO(__wcstombs_chk, 
 GOW(wcstoq, IFppi)
@@ -2291,8 +2404,8 @@ GOW(wcstoul_l, LFppip)
 GOW(wcstoull, UFppi)
 //GO(__wcstoull_internal, 
 //GOW(__wcstoull_l, 
-//GOW(wcstoull_l, UFppi!)
-GO(wcstoumax, LFppi)
+GOW(wcstoull_l, UFppip)
+GO(wcstoumax, UFppi)
 GOW(wcstouq, UFppi)
 GOW(wcswcs, pFpp)
 GO(wcswidth, iFpL)
@@ -2300,7 +2413,7 @@ GO(wcsxfrm, LFppL)
 GO(__wcsxfrm_l, LFppLL)
 GO(wcsxfrm_l, LFppLp)
 GO(wctob, iFu)
-GO(wctomb, iFpu)
+GO(wctomb, iFpi)
 GO(__wctomb_chk, iFpuL)
 GOW(wctrans, pFp)
 //GO(__wctrans_l, 
@@ -2308,8 +2421,8 @@ GOW(wctrans_l, pFpp)
 GOW(wctype, LFp)
 GOW(wctype_l, LFpp)
 GO(__wctype_l, LFpp)
-GO(wcwidth, iFu)
-GO(wmemchr, pFpuL)
+GO(wcwidth, iFi)
+GO(wmemchr, pFpiL)
 GO(wmemcmp, iFppL)
 GOW(wmemcpy, pFppL)
 GO(__wmemcpy_chk, pFppLL)
@@ -2317,7 +2430,7 @@ GO(wmemmove, pFppL)
 GO(__wmemmove_chk, pFppLL)
 GOW(wmempcpy, pFppL)
 //GO(__wmempcpy_chk, 
-GO(wmemset, pFpuL)
+GO(wmemset, pFpiL)
 GO(__wmemset_chk, pFpuLL)
 GO(wordexp, iFppi)
 GO(wordfree, vFp)
@@ -2328,83 +2441,150 @@ GOW(__write, lFipL)
 GO(write, lFipL)
 //GO(__write_nocancel, 
 GOW(writev, lFipi)
-//GO(wscanf, iFpV)
+GO(wscanf, iFpV)
 //GO(__wuflow, 
 //GO(__wunderflow, 
-//GO(xdecrypt, // Deprecated
-//GO(xdr_accepted_reply, 
-//GO(xdr_array, iF!ppuu@)
+//GO(xdecrypt, 
+#ifdef STATICBUILD
+//GOM(xdr_accepted_reply, iFpp)
+//GOM(xdr_array, iFpppuup)
 //GO(xdr_authdes_cred, 
 //GO(xdr_authdes_verf, 
-//GO(xdr_authunix_parms, iF!!)
-//GO(xdr_bool, iF!p)
-//GO(xdr_bytes, iF!ppu)
-//GO(xdr_callhdr, iF!!)
-//GO(xdr_callmsg, iF!!)
-//GO(xdr_char, iF!p)
+//GOM(xdr_authunix_parms, iFpp)
+//GOM(xdr_bool, iFpp)
+//GOM(xdr_bytes, iFpppu)
+//GOM(xdr_callhdr, iFpp)
+//GOM(xdr_callmsg, iFpp)
+//GOM(xdr_char, iFpp)
 //GO(xdr_cryptkeyarg, 
 //GO(xdr_cryptkeyarg2, 
 //GO(xdr_cryptkeyres, 
-//GO(xdr_des_block, iF!!)
-//GO(xdr_double, iF!p)
-//GO(xdr_enum, iF!p)
-//GO(xdr_float, iF!p)
-//GO(xdr_free, vF@p)
+//GOM(xdr_des_block, iFpp)
+//GOM(xdr_double, iFpp)
+//GOM(xdr_enum, iFpp)
+//GOM(xdr_float, iFpp)
+//GOM(xdr_free, vFpp)
 //GO(xdr_getcredres, 
-//GO(xdr_hyper, iF!p)
-//GO(xdr_int, iF!p)
-//GO(xdr_int16_t, iF!p)
-//GO(xdr_int32_t, iF!p)
-//GO(xdr_int64_t, iF!p)
-//GO(xdr_int8_t, iF!p)
+//GOM(xdr_hyper, iFpp)
+//GOM(xdr_int, iFpp)
+//GOM(xdr_int16_t, iFpp)
+//GOM(xdr_int32_t, iFpp)
+//GOM(xdr_int64_t, iFpp)
+//GOM(xdr_int8_t, iFpp)
 //GO(xdr_keybuf, 
 //GO(xdr_key_netstarg, 
 //GO(xdr_key_netstres, 
 //GO(xdr_keystatus, 
-//GO(xdr_long, iF!p)
-//GO(xdr_longlong_t, iF!p)
-//GO(xdrmem_create, vF!puu)
+//GOM(xdr_long, iFpp)
+//GOM(xdr_longlong_t, iFpp)
+//GOM(xdrmem_create, vFppuu)
 //GO(xdr_netnamestr, 
-//GO(xdr_netobj, iF!!)
-//GO(xdr_opaque, iF!pu)
-//GO(xdr_opaque_auth, iF!!)
-//GO(xdr_pmap, 
-//GO(xdr_pmaplist, 
-//GO(xdr_pointer, iF!pu@)
-//GO(xdr_quad_t, iF!p)
-//GO(xdrrec_create, vF!uup@@)
-//GO(xdrrec_endofrecord, iF!i)
-//GO(xdrrec_eof, iF!)
-//GO(xdrrec_skiprecord, iF!)
-//GO(xdr_reference, iF!pu@)
-//GO(xdr_rejected_reply, 
-//GO(xdr_replymsg, iF!!)
+//GOM(xdr_netobj, iFpp)
+//GOM(xdr_opaque, iFppu)
+//GOM(xdr_opaque_auth, iFpp)
+//GOM(xdr_pmap, iFpp)
+//GOM(xdr_pmaplist, iFpp)
+//GOM(xdr_pointer, iFppup)
+//GOM(xdr_quad_t, iFpp)
+//GOM(xdrrec_create, vFpuuppp)
+//GOM(xdrrec_endofrecord, iFpi)
+//GOM(xdrrec_eof, iFp)
+//GOM(xdrrec_skiprecord, iFp)
+//GOM(xdr_reference, iFppup)
+//GOM(xdr_rejected_reply, iFpp)
+//GOM(xdr_replymsg, iFpp)
 //GO(xdr_rmtcall_args, 
 //GO(xdr_rmtcallres, 
-//GO(xdr_short, iF!p)
-//GO(xdr_sizeof, LF@p)
-//GO(xdrstdio_create, vF!pu)
-//GO(xdr_string, iF!pu)
-//GO(xdr_u_char, iF!p)
-//GO(xdr_u_hyper, iF!p)
-//GO(xdr_u_int, iF!p)
-//GO(xdr_uint16_t, iF!p)
-//GO(xdr_uint32_t, iF!p)
-//GO(xdr_uint64_t, iF!p)
-//GO(xdr_uint8_t, iF!p)
-//GO(xdr_u_long, iF!p)
-//GO(xdr_u_longlong_t, iF!p)
-//GO(xdr_union, iF!pp!@)
+//GOM(xdr_short, iFpp)
+//GOM(xdr_sizeof, LFpp)
+//GOM(xdrstdio_create, vFpSu)
+//GOM(xdr_string, iFppu)
+//GOM(xdr_u_char, iFpp)
+//GOM(xdr_u_hyper, iFpp)
+//GOM(xdr_u_int, iFpp)
+//GOM(xdr_uint16_t, iFpp)
+//GOM(xdr_uint32_t, iFpp)
+//GOM(xdr_uint64_t, iFpp)
+//GOM(xdr_uint8_t, iFpp)
+//GOM(xdr_u_long, iFpp)
+//GOM(xdr_u_longlong_t, iFpp)
+//GOM(xdr_union, iFppppp)
 //GO(xdr_unixcred, 
-//GO(xdr_u_quad_t, iF!p)
-//GO(xdr_u_short, iF!p)
-//GO(xdr_vector, iF!puu@)
-#ifdef STATICBUILD
+//GOM(xdr_u_quad_t, iFpp)
+//GOM(xdr_u_short, iFpp)
+//GOM(xdr_vector, iFppuup)
 //GO(xdr_void, 
-//GO(xdr_wrapstring, iF!p)
+//GO(xdr_wrapstring, "iF!p")
 #else
+//GOM(xdr_accepted_reply, iFpp)
+//GOM(xdr_array, iFpppuup)
+//GO(xdr_authdes_cred, 
+//GO(xdr_authdes_verf, 
+//GOM(xdr_authunix_parms, iFpp)
+//GOM(xdr_bool, iFpp)
+//GOM(xdr_bytes, iFpppu)
+//GOM(xdr_callhdr, iFpp)
+//GOM(xdr_callmsg, iFpp)
+//GOM(xdr_char, iFpp)
+GO(xdr_cryptkeyarg, iFv)
+GO(xdr_cryptkeyarg2, iFv)
+GO(xdr_cryptkeyres, iFv)
+//GOM(xdr_des_block, iFpp)
+//GOM(xdr_double, iFpp)
+//GOM(xdr_enum, iFpp)
+//GOM(xdr_float, iFpp)
+//GOM(xdr_free, vFpp)
+GO(xdr_getcredres, iFv)
+//GOM(xdr_hyper, iFpp)
+//GOM(xdr_int, iFpp)
+//GOM(xdr_int16_t, iFpp)
+//GOM(xdr_int32_t, iFpp)
+//GOM(xdr_int64_t, iFpp)
+//GOM(xdr_int8_t, iFpp)
+GO(xdr_keybuf, iFv)
+GO(xdr_key_netstarg, iFv)
+GO(xdr_key_netstres, iFv)
+GO(xdr_keystatus, iFv)
+//GOM(xdr_long, iFpp)
+//GOM(xdr_longlong_t, iFpp)
+//GOM(xdrmem_create, vFppuu)
+GO(xdr_netnamestr, iFv)
+//GOM(xdr_netobj, iFpp)
+//GOM(xdr_opaque, iFppu)
+//GOM(xdr_opaque_auth, iFpp)
+//GOM(xdr_pmap, iFpp)
+//GOM(xdr_pmaplist, iFpp)
+//GOM(xdr_pointer, iFppup)
+//GOM(xdr_quad_t, iFpp)
+//GOM(xdrrec_create, vFpuuppp)
+//GOM(xdrrec_endofrecord, iFpi)
+//GOM(xdrrec_eof, iFp)
+//GOM(xdrrec_skiprecord, iFp)
+//GOM(xdr_reference, iFppup)
+//GOM(xdr_rejected_reply, iFpp)
+//GOM(xdr_replymsg, iFpp)
+//GO(xdr_rmtcall_args, 
+//GO(xdr_rmtcallres, 
+//GOM(xdr_short, iFpp)
+//GOM(xdr_sizeof, LFpp)
+//GOM(xdrstdio_create, vFpSu)
+//GOM(xdr_string, iFppu)
+//GOM(xdr_u_char, iFpp)
+//GOM(xdr_u_hyper, iFpp)
+//GOM(xdr_u_int, iFpp)
+//GOM(xdr_uint16_t, iFpp)
+//GOM(xdr_uint32_t, iFpp)
+//GOM(xdr_uint64_t, iFpp)
+//GOM(xdr_uint8_t, iFpp)
+//GOM(xdr_u_long, iFpp)
+//GOM(xdr_u_longlong_t, iFpp)
+//GOM(xdr_union, iFppppp)
+GO(xdr_unixcred, iFv)
+//GOM(xdr_u_quad_t, iFpp)
+//GOM(xdr_u_short, iFpp)
+//GOM(xdr_vector, iFppuup)
 GO(xdr_void, iFv)
-//GO(xdr_wrapstring, iF!p)
+//GOM(xdr_wrapstring, iFpp)
 #endif
 //GO(xencrypt, 
 #ifdef STATICBUILD
@@ -2417,8 +2597,8 @@ GOM(__xmknodat, iFEiipup)
 GO(__xpg_basename, pFp)
 GOW(__xpg_sigpause, iFi)
 GO(__xpg_strerror_r, pFipL)
-//GO(xprt_register, vF!)
-//GO(xprt_unregister, vF!)
+//GOM(xprt_register, vFp)
+//GOM(xprt_unregister, vFp)
 GOM(__xstat, iFEipp)
 GOM(__xstat64, iFEipp)
 
@@ -2436,8 +2616,8 @@ GOM(strlcat, LFEppL)
 
 GOWM(__cxa_pure_virtual, vFEv)     // create a function to trap pure virtual call
 
-DATAM(program_invocation_name, sizeof(void*))
-DATAM(program_invocation_short_name, sizeof(void*))
+DATAM(program_invocation_name, 8)
+DATAM(program_invocation_short_name, 8)
 
 DATAM(__libc_single_threaded, 1)