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 /sysdeps/mach | |
parent | f6fb29d22eefb208c0c7da463c31229d50ccbe01 (diff) | |
download | glibc-dba2bdbe75bcb62e62133b7c4a807a2c45c098a7.tar.gz glibc-dba2bdbe75bcb62e62133b7c4a807a2c45c098a7.tar.xz 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 'sysdeps/mach')
-rw-r--r-- | sysdeps/mach/hurd/ifreq.c | 2 | ||||
-rw-r--r-- | sysdeps/mach/hurd/ifreq.h | 2 | ||||
-rw-r--r-- | sysdeps/mach/hurd/ptrace.c | 2 | ||||
-rw-r--r-- | sysdeps/mach/hurd/sendfile64.c | 2 | ||||
-rw-r--r-- | sysdeps/mach/hurd/socketpair.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/mach/hurd/ifreq.c b/sysdeps/mach/hurd/ifreq.c index 10877824b2..70a906a83a 100644 --- a/sysdeps/mach/hurd/ifreq.c +++ b/sysdeps/mach/hurd/ifreq.c @@ -53,7 +53,7 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd) if (len % sizeof (struct ifreq) != 0) { - munmap (data, len); + __munmap (data, len); errno = EGRATUITOUS; goto out; } diff --git a/sysdeps/mach/hurd/ifreq.h b/sysdeps/mach/hurd/ifreq.h index 3c200664ee..3ab8d858b6 100644 --- a/sysdeps/mach/hurd/ifreq.h +++ b/sysdeps/mach/hurd/ifreq.h @@ -28,5 +28,5 @@ static inline void __if_freereq (struct ifreq *ifreqs, int num_ifs) { - munmap (ifreqs, num_ifs * sizeof (struct ifreq)); + __munmap (ifreqs, num_ifs * sizeof (struct ifreq)); } diff --git a/sysdeps/mach/hurd/ptrace.c b/sysdeps/mach/hurd/ptrace.c index ac3059bb90..d0268a3f98 100644 --- a/sysdeps/mach/hurd/ptrace.c +++ b/sysdeps/mach/hurd/ptrace.c @@ -155,7 +155,7 @@ ptrace (enum __ptrace_request request, ... ) va_end (ap); /* SIGKILL always just terminates the task, so normal kill is just the same when traced. */ - return kill (pid, SIGKILL); + return __kill (pid, SIGKILL); case PTRACE_SINGLESTEP: /* This is a machine-dependent kernel RPC on diff --git a/sysdeps/mach/hurd/sendfile64.c b/sysdeps/mach/hurd/sendfile64.c index dfd9c45daf..f69ccd4a79 100644 --- a/sysdeps/mach/hurd/sendfile64.c +++ b/sysdeps/mach/hurd/sendfile64.c @@ -47,7 +47,7 @@ sendfile64 (int out_fd, int in_fd, off64_t *offset, size_t count) return 0; err = HURD_DPORT_USE (out_fd, __io_write (port, data, datalen, (off_t) -1, &nwrote)); - munmap (data, datalen); + __munmap (data, datalen); if (err == 0) { if (offset) diff --git a/sysdeps/mach/hurd/socketpair.c b/sysdeps/mach/hurd/socketpair.c index 85e0f7400b..3b18c676c0 100644 --- a/sysdeps/mach/hurd/socketpair.c +++ b/sysdeps/mach/hurd/socketpair.c @@ -82,7 +82,7 @@ __socketpair (int domain, int type, int protocol, int fds[2]) if (d2 < 0) { err = errno; - (void) close (d1); + (void) __close (d1); return __hurd_fail (err); } |