about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-01-13 14:01:56 -0500
committerUlrich Drepper <drepper@gmail.com>2011-01-13 14:01:56 -0500
commita85b5cb4d4a5fc56e2b38638d270bf2daa67eb6c (patch)
tree0c240f5120d99d2b239d83333b533505fe308a36
parentcfa28e560ef69372b9e15e9a2d924a0fbcfc7bca (diff)
downloadglibc-a85b5cb4d4a5fc56e2b38638d270bf2daa67eb6c.tar.gz
glibc-a85b5cb4d4a5fc56e2b38638d270bf2daa67eb6c.tar.xz
glibc-a85b5cb4d4a5fc56e2b38638d270bf2daa67eb6c.zip
Fix PLT use due to __libc_alloca_cutoff.
-rw-r--r--ChangeLog1
-rw-r--r--include/alloca.h1
-rw-r--r--nptl/ChangeLog1
-rw-r--r--nptl/alloca_cutoff.c3
4 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f477fed328..ea9b1cc75e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,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 9a4b5c7da0..b99c3d152b 100644
--- 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 97400e5b3a..22b820866b 100644
--- 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-10-13  H.J. Lu  <hongjiu.lu@intel.com>
 
diff --git a/nptl/alloca_cutoff.c b/nptl/alloca_cutoff.c
index ba26ceba3d..bbd930a240 100644
--- 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)