Fix PLT use due to __libc_alloca_cutoff.

(cherry picked from commit a85b5cb4d4a5fc56e2b38638d270bf2daa67eb6c)

diff --git a/ChangeLog b/ChangeLog
index 5525f1fa5e31bbdb45850a03f0da6f5a003be33e..68fec19b03eccb4b6b8f3354883c780e4ad758f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
        [BZ #10484]
        * nss/nss_files/files-hosts.c (HOST_DB_LOOKUP): Handle overflows of
        temporary buffer used to handle multi lookups locally.
+       * include/alloca.h: Add libc_hidden_proto for __libc_alloca_cutoff.
 
 2011-01-12  Ulrich Drepper  <drepper@gmail.com>
 

diff --git a/include/alloca.h b/include/alloca.h
index 9a4b5c7da0377c8e40c9d43791579f7bcacaa88e..b99c3d152b63347a6ff1a9f29b7a6136b4b552c2 100644 (file)
--- a/include/alloca.h
+++ b/include/alloca.h
@@ -14,6 +14,7 @@ extern void *__alloca (size_t __size);
 
 extern int __libc_use_alloca (size_t size) __attribute__ ((const));
 extern int __libc_alloca_cutoff (size_t size) __attribute__ ((const));
+libc_hidden_proto (__libc_alloca_cutoff)
 
 #define __MAX_ALLOCA_CUTOFF    65536
 

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 1b9b21c04e0775af3f8a02f8e8a524fc29297ea7..aeb7183166e27b77c9637ba97e2e77e93a76f009 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -2,6 +2,7 @@
 
        [BZ #10484]
        * Versions [libc] (GLIBC_PRIVATE): Export __libc_alloca_cutoff.
+       * alloca_cutoff.c: Add libc_hidden_def.
 
 2010-08-12  H.J. Lu  <hongjiu.lu@intel.com>
 

diff --git a/nptl/alloca_cutoff.c b/nptl/alloca_cutoff.c
index ba26ceba3db5d29d4c4689dbf1c4c676860bb76d..bbd930a2404d18d89a832384e9a9d718696fa957 100644 (file)
--- a/nptl/alloca_cutoff.c
+++ b/nptl/alloca_cutoff.c
@@ -1,5 +1,5 @@
 /* Determine whether block of given size can be allocated on the stack or not.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2011 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
@@ -34,3 +34,4 @@ __libc_alloca_cutoff (size_t size)
                          assume the maximum available stack space.  */
                       ?: __MAX_ALLOCA_CUTOFF * 4));
 }
+libc_hidden_def (__libc_alloca_cutoff)