diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-04-02 19:07:52 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-04-02 19:07:52 +0000 |
commit | dba2bdbe75bcb62e62133b7c4a807a2c45c098a7 (patch) | |
tree | 686b67d01629f943b7401323bf19887445105232 /mach | |
parent | hurd: Avoid local PLTs in libpthread. (diff) | |
download | glibc-dba2bdbe75bcb62e62133b7c4a807a2c45c098a7.tar.gz glibc-dba2bdbe75bcb62e62133b7c4a807a2c45c098a7.tar.bz2 glibc-dba2bdbe75bcb62e62133b7c4a807a2c45c098a7.zip |
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 <libioP.h>.
(_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 <libioP.h>.
(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.
Diffstat (limited to 'mach')
-rw-r--r-- | mach/devstream.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mach/devstream.c b/mach/devstream.c index 21d9f7bda3..505b6573ae 100644 --- a/mach/devstream.c +++ b/mach/devstream.c @@ -22,6 +22,7 @@ #include <device/device.h> #include <errno.h> #include <string.h> +#include <libioP.h> static ssize_t @@ -111,7 +112,7 @@ devstream_read (void *cookie, char *buffer, size_t to_read) static int dealloc_ref (void *cookie) { - if (mach_port_deallocate (mach_task_self (), (mach_port_t) cookie)) + if (__mach_port_deallocate (mach_task_self (), (mach_port_t) cookie)) { errno = EINVAL; return -1; @@ -130,13 +131,13 @@ mach_open_devstream (mach_port_t dev, const char *mode) return NULL; } - stream = fopencookie ((void *) dev, mode, - (cookie_io_functions_t) { write: devstream_write, - read: devstream_read, - close: dealloc_ref }); + stream = _IO_fopencookie ((void *) dev, mode, + (cookie_io_functions_t) { write: devstream_write, + read: devstream_read, + close: dealloc_ref }); if (stream == NULL) { - mach_port_deallocate (mach_task_self (), dev); + __mach_port_deallocate (mach_task_self (), dev); return NULL; } |