From dba2bdbe75bcb62e62133b7c4a807a2c45c098a7 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 2 Apr 2018 19:07:52 +0000 Subject: hurd: Avoid some PLTs in libc and librt * hurd/hurdauth.c (_S_msg_add_auth): Call __vm_allocate and __vm_deallocate instead of vm_allocate and vm_deallocate. * hurd/hurdmsg.c (_S_msg_set_env_variable): Call __setenv instead of setenv. * hurd/hurdprio.c (_hurd_priority_which_map): Call __geteuid instead of geteuid. * hurd/path-lookup.c (file_name_path_scan): Call __strdup instead of strdup. * hurd/siginfo.c: Include . (_hurd_siginfo_handler): Call _IO_puts instead of puts. * hurd/xattr.c (_hurd_xattr_get, _hurd_xattr_set): Call __munmap instead of munmap. * io/fts.c (fts_build): Call __dirfd instead of dirfd. * mach/devstream.c: Include . (dealloc_ref): Call __mach_port_deallocate instead of mach_port_deallocate. (mach_open_devstream): Call _IO_fopencookie instead of fopencookie. Call __mach_port_deallocate instead of mach_port_deallocate. * stdlib/canonicalize.c (__realpath): Call __pathconf instead of pathconf. * sysdeps/mach/hurd/ifreq.c (__ifreq): Call __munmap instead of munmap. * sysdeps/mach/hurd/ifreq.h (__if_freereq): Likewise. * sysdeps/mach/hurd/ptrace.c (ptrace): Call __kill instead of kill. * sysdeps/mach/hurd/sendfile64.c (sendfile64): Call __munmap instead of munmap. * sysdeps/mach/hurd/socketpair.c (__socketpair): Call __close instead of close. * sysdeps/posix/clock_getres.c (realtime_getres): Call __sysconf instead of sysconf. * sysdeps/pthread/timer_gettime.c (timer_gettime): Call __clock_gettime instead of clock_gettime. * sysdeps/pthread/timer_routines.c (thread_func): Likewise. * sysdeps/pthread/timer_settime.c (timer_settime): Likewise. * sysdeps/unix/bsd/gtty.c (gtty): Call __ioctl instead of ioctl. * sysdeps/unix/bsd/stty.c (stty): Likewise. * sysdeps/unix/bsd/tcflow.c (tcflow): Call __tcgetattr instead of tcgetattr. * sysdeps/unix/clock_nanosleep.c (__clock_nanosleep): Call __clock_gettime and __nanosleep instead of clock_gettime and nanosleep. --- hurd/hurdauth.c | 16 ++++++++-------- hurd/hurdmsg.c | 2 +- hurd/hurdprio.c | 2 +- hurd/path-lookup.c | 2 +- hurd/siginfo.c | 3 ++- hurd/xattr.c | 6 +++--- 6 files changed, 16 insertions(+), 15 deletions(-) (limited to 'hurd') diff --git a/hurd/hurdauth.c b/hurd/hurdauth.c index ad315a27b7..1a7e67ea0e 100644 --- a/hurd/hurdauth.c +++ b/hurd/hurdauth.c @@ -52,8 +52,8 @@ _S_msg_add_auth (mach_port_t me, int i, j, k; vm_size_t offset; - urp = vm_allocate (mach_task_self (), (vm_address_t *) newlistp, - nexist + nnew * sizeof (uid_t), 1); + urp = __vm_allocate (mach_task_self (), (vm_address_t *) newlistp, + nexist + nnew * sizeof (uid_t), 1); if (urp) return urp; @@ -75,10 +75,10 @@ _S_msg_add_auth (mach_port_t me, offset = (round_page (nexist + nnew * sizeof (uid_t)) - round_page (j * sizeof (uid_t))); if (offset) - vm_deallocate (mach_task_self (), - (vm_address_t) (*newlistp - + (nexist + nnew * sizeof (uid_t))), - offset); + __vm_deallocate (mach_task_self (), + (vm_address_t) (*newlistp + + (nexist + nnew * sizeof (uid_t))), + offset); *newlistlen = j; return 0; } @@ -136,8 +136,8 @@ _S_msg_add_auth (mach_port_t me, #define freeup(array, len) \ if (array) \ - vm_deallocate (mach_task_self (), (vm_address_t) array, \ - len * sizeof (uid_t)); + __vm_deallocate (mach_task_self (), (vm_address_t) array, \ + len * sizeof (uid_t)); freeup (genuids, ngenuids); freeup (auxuids, nauxuids); diff --git a/hurd/hurdmsg.c b/hurd/hurdmsg.c index 5759af3411..63e5e81b87 100644 --- a/hurd/hurdmsg.c +++ b/hurd/hurdmsg.c @@ -344,7 +344,7 @@ _S_msg_set_env_variable (mach_port_t msgport, mach_port_t auth, { AUTHCHECK; - if (setenv (variable, value, replace)) /* XXX name space */ + if (__setenv (variable, value, replace)) /* XXX name space */ return errno; return 0; } diff --git a/hurd/hurdprio.c b/hurd/hurdprio.c index 5ff84b6f56..3783fe9397 100644 --- a/hurd/hurdprio.c +++ b/hurd/hurdprio.c @@ -50,7 +50,7 @@ _hurd_priority_which_map (enum __priority_which which, int who, case PRIO_USER: if (who == 0) - who = geteuid (); + who = __geteuid (); err = __USEPORT (PROC, __proc_getallpids (port, &pids, &npids)); for (i = 0; !err && i < npids; ++i) { diff --git a/hurd/path-lookup.c b/hurd/path-lookup.c index d3906e1c9b..389a8ccd1b 100644 --- a/hurd/path-lookup.c +++ b/hurd/path-lookup.c @@ -63,7 +63,7 @@ file_name_path_scan (const char *file_name, const char *path, if (err == 0) { if (prefixed_name) - *prefixed_name = strdup (pfxed_name); + *prefixed_name = __strdup (pfxed_name); return 0; } if (!real_err && err != ENOENT) diff --git a/hurd/siginfo.c b/hurd/siginfo.c index 65d8e4882e..75e02d5282 100644 --- a/hurd/siginfo.c +++ b/hurd/siginfo.c @@ -17,10 +17,11 @@ #include #include +#include void _hurd_siginfo_handler (int signo) { /* XXX */ - puts ("got a SIGINFO"); + _IO_puts ("got a SIGINFO"); } diff --git a/hurd/xattr.c b/hurd/xattr.c index c56bab07cb..23d9fcb691 100644 --- a/hurd/xattr.c +++ b/hurd/xattr.c @@ -67,14 +67,14 @@ _hurd_xattr_get (io_t port, const char *name, void *value, size_t *size) if (value != NULL && *size < bufsz) { if (buf != value) - munmap (buf, bufsz); + __munmap (buf, bufsz); return -ERANGE; } if (buf != value && bufsz > 0) { if (value != NULL) memcpy (value, buf, bufsz); - munmap (buf, bufsz); + __munmap (buf, bufsz); } *size = bufsz; return 0; @@ -150,7 +150,7 @@ _hurd_xattr_set (io_t port, const char *name, const void *value, size_t size, return err; if (bufsz > 0) { - munmap (buf, bufsz); + __munmap (buf, bufsz); return ENODATA; } } -- cgit v1.2.3