[commits] r11429 - in /fsf/trunk/libc/nptl: ChangeLog sysdeps/pthread/allocalim.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Sep  4 00:03:32 2010
New Revision: 11429

Log:
Import glibc-mainline for 2010-09-04

Modified:
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/sysdeps/pthread/allocalim.h

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Sat Sep  4 00:03:32 2010
@@ -1,3 +1,8 @@
+2010-09-03  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* sysdeps/pthread/allocalim.h (__libc_use_alloca): Expect blocks are
+	small.
+
 2010-08-10  Dinakar Guniguntala  <dino@xxxxxxxxxx>
 	    Stefan Hajnoczi  <stefanha@xxxxxxxxxxxxxxxxxx>
 

Modified: fsf/trunk/libc/nptl/sysdeps/pthread/allocalim.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/pthread/allocalim.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/pthread/allocalim.h Sat Sep  4 00:03:32 2010
@@ -1,5 +1,5 @@
 /* Determine whether block of given size can be allocated on the stack or not.
-   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -26,5 +26,5 @@
 __libc_use_alloca (size_t size)
 {
   return (__builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1)
-	  || __libc_alloca_cutoff (size));
+	  || __builtin_expect (__libc_alloca_cutoff (size), 1));
 }