From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 30 Jan 2018 20:42:21 +0000 (+0100)
Subject: allocalim.h: use __glibc_likely instead of __builtin_expect
X-Git-Tag: glibc-2.27~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=407552cf0b1cc7b992c5a8ad7f29ba5ce6ac5dfc;p=thirdparty%2Fglibc.git

allocalim.h: use __glibc_likely instead of __builtin_expect

	* sysdeps/pthread/allocalim.h (__libc_use_alloca): Use __glibc_likely
	instead of __builtin_expect.
---

diff --git a/ChangeLog b/ChangeLog
index 3c4868434c2..06250f90075 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-30  Samuel Thibault  <samuel.thibault@ens-lyon.org
+
+	* sysdeps/pthread/allocalim.h (__libc_use_alloca): Use __glibc_likely
+	instead of __builtin_expect.
+
 2018-01-30  Florian Weimer  <fweimer@redhat.com>
 
 	* 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 38faf57b70a..99f74838dde 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
 	  );
 }