diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-01-13 14:01:56 -0500 |
|---|---|---|
| committer | Petr Baudis <pasky@suse.cz> | 2011-02-03 21:13:40 +0100 |
| commit | 28ef97b099c02ad0cc695807c0515d70855772f9 (patch) | |
| tree | efc62b94ac8c2ad44820107f36a0e3548a1008fe | |
| parent | 83e15ff7c24784a35518451daaada04b88dd9c3e (diff) | |
| download | glibc-28ef97b099c02ad0cc695807c0515d70855772f9.tar.gz glibc-28ef97b099c02ad0cc695807c0515d70855772f9.tar.xz glibc-28ef97b099c02ad0cc695807c0515d70855772f9.zip | |
Fix PLT use due to __libc_alloca_cutoff.
(cherry picked from commit a85b5cb4d4a5fc56e2b38638d270bf2daa67eb6c)
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | include/alloca.h | 1 | ||||
| -rw-r--r-- | nptl/ChangeLog | 1 | ||||
| -rw-r--r-- | nptl/alloca_cutoff.c | 3 |
4 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 5525f1fa5e..68fec19b03 100644 --- 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 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 1b9b21c04e..aeb7183166 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-08-12 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) |