about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-01-29 22:21:46 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-01-29 23:00:17 +0100
commitba729de6436ea0a8af3ad80f9555cf3161c7694b (patch)
treea94d090f62be8d2fd61241e69876370031d6567e
parent1fd1e27ca7cac9a636cde2c7d19364caf0aaaf33 (diff)
downloadglibc-ba729de6436ea0a8af3ad80f9555cf3161c7694b.tar.gz
glibc-ba729de6436ea0a8af3ad80f9555cf3161c7694b.tar.xz
glibc-ba729de6436ea0a8af3ad80f9555cf3161c7694b.zip
allocalim.h: Fix codestyle
	* sysdeps/pthread/allocalim.h (__libc_use_alloca): Commute operands of
	|| to respect codestyle.
-rw-r--r--ChangeLog2
-rw-r--r--sysdeps/pthread/allocalim.h6
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f601029ea..c86e6a23e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@
 	* sysdeps/mach/hurd/i386/libresolv.abilist: New file.
 	* sysdeps/mach/hurd/i386/librt.abilist: New file.
 	* sysdeps/mach/hurd/i386/libutil.abilist: New file.
+	* sysdeps/pthread/allocalim.h (__libc_use_alloca): Commute operands of
+	|| to respect codestyle.
 
 2018-01-29  Darius Rad  <darius@bluespec.com>
 
diff --git a/sysdeps/pthread/allocalim.h b/sysdeps/pthread/allocalim.h
index fdae0c251f..38faf57b70 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 (
+  return (__builtin_expect (__libc_alloca_cutoff (size), 1)
 #ifdef PTHREAD_STACK_MIN
-          __builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1) ||
+          || __builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1)
 #endif
-          __builtin_expect (__libc_alloca_cutoff (size), 1));
+	  );
 }