From d1e51157725a4defd46c298ce1026d0f5d48da3c Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Sat, 23 Feb 2013 09:52:40 +0100 Subject: libc: switch several users to unlikely() Signed-off-by: Bernhard Reutner-Fischer --- libc/sysdeps/linux/common/__rt_sigtimedwait.c | 4 ++-- libc/sysdeps/linux/common/sigprocmask.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libc/sysdeps/linux/common') diff --git a/libc/sysdeps/linux/common/__rt_sigtimedwait.c b/libc/sysdeps/linux/common/__rt_sigtimedwait.c index b45f5df1b..422a95201 100644 --- a/libc/sysdeps/linux/common/__rt_sigtimedwait.c +++ b/libc/sysdeps/linux/common/__rt_sigtimedwait.c @@ -28,9 +28,9 @@ int __NC(sigtimedwait)(const sigset_t *set, siginfo_t *info, # ifdef SIGCANCEL sigset_t tmpset; - if (set != NULL && (__builtin_expect (__sigismember (set, SIGCANCEL), 0) + if (set != NULL && (unlikely (__sigismember (set, SIGCANCEL)) # ifdef SIGSETXID - || __builtin_expect (__sigismember (set, SIGSETXID), 0) + || unlikely (__sigismember (set, SIGSETXID)) # endif )) { diff --git a/libc/sysdeps/linux/common/sigprocmask.c b/libc/sysdeps/linux/common/sigprocmask.c index 6eaf5fb3a..efe440fde 100644 --- a/libc/sysdeps/linux/common/sigprocmask.c +++ b/libc/sysdeps/linux/common/sigprocmask.c @@ -35,9 +35,9 @@ int sigprocmask(int how, const sigset_t * set, sigset_t * oldset) * The only thing we have to make sure here is that SIGCANCEL and * SIGSETXID are not blocked. */ - if (set != NULL && (__builtin_expect (__sigismember (set, SIGCANCEL), 0) + if (set != NULL && (unlikely (__sigismember (set, SIGCANCEL)) # ifdef SIGSETXID - || __builtin_expect (__sigismember (set, SIGSETXID), 0) + || unlikely (__sigismember (set, SIGSETXID)) # endif )) { @@ -70,9 +70,9 @@ int sigprocmask(int how, const sigset_t * set, sigset_t * oldset) * The only thing we have to make sure here is that SIGCANCEL and * SIGSETXID are not blocked. */ - if (set != NULL && (__builtin_expect (__sigismember (set, SIGCANCEL), 0) + if (set != NULL && (unlikely (__sigismember (set, SIGCANCEL)) # ifdef SIGSETXID - || __builtin_expect (__sigismember (set, SIGSETXID), 0) + || unlikely (__sigismember (set, SIGSETXID)) # endif )) { -- cgit v1.2.3