From 407552cf0b1cc7b992c5a8ad7f29ba5ce6ac5dfc Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 30 Jan 2018 21:42:21 +0100 Subject: allocalim.h: use __glibc_likely instead of __builtin_expect * sysdeps/pthread/allocalim.h (__libc_use_alloca): Use __glibc_likely instead of __builtin_expect. --- ChangeLog | 5 +++++ sysdeps/pthread/allocalim.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c4868434c..06250f9007 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-01-30 Samuel Thibault * nss/bug17079.c (do_test): Use nss_files only for reading passwd diff --git a/sysdeps/pthread/allocalim.h b/sysdeps/pthread/allocalim.h index 38faf57b70..99f74838dd 100644 --- a/sysdeps/pthread/allocalim.h +++ b/sysdeps/pthread/allocalim.h @@ -24,9 +24,9 @@ extern __always_inline int __libc_use_alloca (size_t size) { - return (__builtin_expect (__libc_alloca_cutoff (size), 1) + return (__glibc_likely (__libc_alloca_cutoff (size)) #ifdef PTHREAD_STACK_MIN - || __builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1) + || __glibc_likely (size <= PTHREAD_STACK_MIN / 4) #endif ); } -- cgit v1.2.3