From 7a8f45e302b4518da518b48ab54ab43249d606f1 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 2 Apr 2018 22:07:28 +0000 Subject: hurd: Avoid some libc.so PLTs * hurd/catch-signal.c (hurd_catch_signal): Rename to __hurd_catch_signal. (hurd_catch_signal): New strong alias. (hurd_safe_memset, hurd_safe_copyout, hurd_safe_copyin): Call __hurd_catch_signal instead of hurd_catch_signal. * hurd/exc2signal.c (_hurd_exception2signal): Add hidden def. * hurd/hurdexec.c (_hurd_init): Add hidden def. * hurd/hurdinit.c (_hurd_init): Add hidden def. * hurd/hurdsig.c: Include . (_hurd_thread_sigstate): Add hidden def. (_hurd_internal_post_signal): Use __mutex_unlock instead of mutex_unlock. * hurd/intern-fd.c (_hurd_intern_fd): Add hidden def. * hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Add hidden def. * hurd/path-lookup.c (hurd_file_name_path_lookup): Rename to __hurd_file_name_path_lookup. (hurd_file_name_path_lookup): New strong alias. (file_name_path_lookup): Call __hurd_file_name_path_lookup instead of hurd_file_name_path_lookup. * mach/errstring.c (mach_error_type): Add hidden def. * mach/msg-destroy.c (__mach_msg_destroy): Add hidden def. * mach/mutex-init.c (__mutex_init): Add hidden def. * mach/spin-lock.c (__spin_lock_locked, __spin_lock, __spin_unlock, __spin_try_lock, __mutex_lock, __mutex_trylock): Add hidden defs. * mach/spin-solid.c (__spin_lock_solid): Add hidden def. * sysdeps/mach/hurd/getcwd.c (_hurd_canonicalize_directory_name_internal): Rename to __hurd_canonicalize_directory_name_internal. (_hurd_canonicalize_directory_name_internal): New strong alias. (__canonicalize_directory_name_internal, __getcwd): Call __hurd_canonicalize_directory_name_internal instead of _hurd_canonicalize_directory_name_internal. * sysdeps/mach/hurd/mig-reply.c: Include . (__mig_get_reply_port, __mig_dealloc_reply_port, __mig_init): Add hidden defs. * sysdeps/hurd/include/hurd.h: New file. * sysdeps/hurd/include/hurd/fd.h: New file. * sysdeps/hurd/include/hurd/signal.h: New file. * sysdeps/mach/include/lock-intern.h: New file. * sysdeps/mach/include/mach.h: New file. * sysdeps/mach/include/mach/mig_support.h: New file. * sysdeps/mach/include/mach_error.h: New file. --- hurd/catch-signal.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'hurd/catch-signal.c') diff --git a/hurd/catch-signal.c b/hurd/catch-signal.c index b1e373992b..56ce86532d 100644 --- a/hurd/catch-signal.c +++ b/hurd/catch-signal.c @@ -22,10 +22,10 @@ #include error_t -hurd_catch_signal (sigset_t sigset, - unsigned long int first, unsigned long int last, - error_t (*operate) (struct hurd_signal_preemptor *), - sighandler_t handler) +__hurd_catch_signal (sigset_t sigset, + unsigned long int first, unsigned long int last, + error_t (*operate) (struct hurd_signal_preemptor *), + sighandler_t handler) { /* We need to restore the signal mask, because otherwise the signal-handling code will have blocked the caught signal and for @@ -73,6 +73,7 @@ hurd_catch_signal (sigset_t sigset, return error; } +strong_alias (__hurd_catch_signal, hurd_catch_signal) error_t @@ -83,9 +84,9 @@ hurd_safe_memset (void *dest, int byte, size_t nbytes) memset (dest, byte, nbytes); return 0; } - return hurd_catch_signal (sigmask (SIGBUS) | sigmask (SIGSEGV), - (vm_address_t) dest, (vm_address_t) dest + nbytes, - &operate, SIG_ERR); + return __hurd_catch_signal (sigmask (SIGBUS) | sigmask (SIGSEGV), + (vm_address_t) dest, (vm_address_t) dest + nbytes, + &operate, SIG_ERR); } @@ -97,9 +98,9 @@ hurd_safe_copyout (void *dest, const void *src, size_t nbytes) memcpy (dest, src, nbytes); return 0; } - return hurd_catch_signal (sigmask (SIGBUS) | sigmask (SIGSEGV), - (vm_address_t) dest, (vm_address_t) dest + nbytes, - &operate, SIG_ERR); + return __hurd_catch_signal (sigmask (SIGBUS) | sigmask (SIGSEGV), + (vm_address_t) dest, (vm_address_t) dest + nbytes, + &operate, SIG_ERR); } error_t @@ -110,9 +111,9 @@ hurd_safe_copyin (void *dest, const void *src, size_t nbytes) memcpy (dest, src, nbytes); return 0; } - return hurd_catch_signal (sigmask (SIGBUS) | sigmask (SIGSEGV), - (vm_address_t) src, (vm_address_t) src + nbytes, - &operate, SIG_ERR); + return __hurd_catch_signal (sigmask (SIGBUS) | sigmask (SIGSEGV), + (vm_address_t) src, (vm_address_t) src + nbytes, + &operate, SIG_ERR); } error_t -- cgit 1.4.1