diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-01-30 21:42:21 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-01-30 21:42:21 +0100 |
| commit | 407552cf0b1cc7b992c5a8ad7f29ba5ce6ac5dfc (patch) | |
| tree | 88f6385b87784d11988f1b854560134fd97f59a5 | |
| parent | d31a4a4803fab392e8111eec117dbb62531d202c (diff) | |
| download | glibc-407552cf0b1cc7b992c5a8ad7f29ba5ce6ac5dfc.tar.gz glibc-407552cf0b1cc7b992c5a8ad7f29ba5ce6ac5dfc.tar.xz glibc-407552cf0b1cc7b992c5a8ad7f29ba5ce6ac5dfc.zip | |
allocalim.h: use __glibc_likely instead of __builtin_expect
* sysdeps/pthread/allocalim.h (__libc_use_alloca): Use __glibc_likely instead of __builtin_expect.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | 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 <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 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 ); } |