qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://sourceware.org/git/glibc

This commit is contained in:
Ulrich Drepper 2011-11-01 22:24:49 -04:00
parent 34372fc6d3 647776f663
commit d35dce5213
5 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2011-11-01 Andreas Schwab <schwab@linux-m68k.org>
* include/alloca.h (stackinfo_alloca_round): Define.
(extend_alloca): Use it.
[_STACK_GROWS_UP]: Correct check for adjacent allocation.
* elf/dl-deps.c (_dl_map_object_deps): Don't round alloca size
here.
* scripts/check-local-headers.sh: Ignore libaudit.h.
* nscd/Makefile (extra-objs): Make recursively expanded.
2011-11-01 Ulrich Drepper <drepper@gmail.com>
* sysdeps/x86_64/strcmp.S: Fix test for non-ASCII locales.

8
elf/dl-deps.c
View File

@ -221,15 +221,11 @@ _dl_map_object_deps (struct link_map *map,
if (l->l_searchlist.r_list == NULL && l->l_initfini == NULL
&& l != map && l->l_ldnum > 0)
{
/* 16-align so extend_alloca has a chance to re-use the space.
Note that extend_alloca is broken for recent versions of GCC
on x86: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50938 */
size_t new_size
= (l->l_ldnum * sizeof (struct link_map *) + 15) & ~15;
size_t new_size = l->l_ldnum * sizeof (struct link_map *);
if (new_size > needed_space_bytes)
needed_space
= extend_alloca (needed_space, needed_space_bytes, new_size);
= extend_alloca (needed_space, needed_space_bytes, new_size);
needed = needed_space;
}

10
include/alloca.h
View File

@ -20,9 +20,13 @@ libc_hidden_proto (__libc_alloca_cutoff)
#include <allocalim.h>
#ifndef stackinfo_alloca_round
# define stackinfo_alloca_round(l) (((l) + 15) & -16)
#endif
#if _STACK_GROWS_DOWN
# define extend_alloca(buf, len, newlen) \
(__typeof (buf)) ({ size_t __newlen = (newlen); \
(__typeof (buf)) ({ size_t __newlen = stackinfo_alloca_round (newlen); \
char *__newbuf = __alloca (__newlen); \
if (__newbuf + __newlen == (char *) buf) \
len += __newlen; \
@ -31,10 +35,10 @@ libc_hidden_proto (__libc_alloca_cutoff)
__newbuf; })
#elif _STACK_GROWS_UP
# define extend_alloca(buf, len, newlen) \
(__typeof (buf)) ({ size_t __newlen = (newlen); \
(__typeof (buf)) ({ size_t __newlen = stackinfo_alloca_round (newlen); \
char *__newbuf = __alloca (__newlen); \
char *__buf = (buf); \
if (__buf + __newlen == __newbuf) \
if (__buf + len == __newbuf) \
{ \
len += __newlen; \
__newbuf = __buf; \

2
nscd/Makefile
View File

@ -43,7 +43,7 @@ others += nscd
others-pie += nscd
install-sbin := nscd
extra-objs := $(nscd-modules:=.o)
extra-objs = $(nscd-modules:=.o)
endif

2
scripts/check-local-headers.sh
View File

@ -29,7 +29,7 @@ exec ${AWK} -v includedir="$includedir" '
BEGIN {
status = 0
exclude = "^" includedir \
"/(asm[-/]|linux/|selinux/|gd|nss3/|sys/capability\\.h)"
"/(asm[-/]|linux/|selinux/|gd|nss3/|sys/capability\\.h|libaudit\\.h)"
}
/^[^ ]/ && $1 ~ /.*:/ { obj = $1 }
{