aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-08-14 22:21:54 -0400
committerUlrich Drepper <drepper@gmail.com>2011-08-14 22:21:54 -0400
commitf3ed22607e8bf724b697c16876dbb76bb2418db6 (patch)
treef496a9d8b5e41e850f613669bad6d066d0af0cf8 /ChangeLog
parenta60df2c3db52b66fd3190c92ad9bc9b972e0d1fc (diff)
parent69f630971184cae39d578709089d175c4b743390 (diff)
downloadglibc-f3ed22607e8bf724b697c16876dbb76bb2418db6.tar
glibc-f3ed22607e8bf724b697c16876dbb76bb2418db6.tar.gz
glibc-f3ed22607e8bf724b697c16876dbb76bb2418db6.tar.bz2
glibc-f3ed22607e8bf724b697c16876dbb76bb2418db6.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog20
1 files changed, 20 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index eaa7b7e0d4..4092e509ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,26 @@
* nscd/servicescache.c (cache_addserv): Make sure written is always
initialized.
+2011-08-14 Roland McGrath <roland@hack.frob.com>
+
+ * string/strncat.c (STRNCAT): Use prototype definition.
+
+ * locale/Makefile (locale-CPPFLAGS): Renamed CPPFLAGS-locale-programs.
+ (locale-CPPFLAGS): New variable; put LOCALEDIR, LOCALE_ALIAS_PATH and
+ -Iprograms here.
+ (cppflags-iterator.mk sequence): Use locale-programs in place of nonlib.
+ (localedef-modules): Add localedef.
+ (locale-modules): Add locale.
+
+ * sysdeps/generic/ldsodefs.h (struct unique_sym): Add a const.
+ * elf/rtld.c (dl_main): Invert order of assignment in last change,
+ to avoid a warning.
+
+2011-08-14 David S. Miller <davem@davemloft.net>
+
+ * sysdeps/unix/sysv/linux/sparc/bits/resource.h (RLIM_INFINITY,
+ RLIM64_INFINITY): Fix 64-bit values for 32-bit sparc.
+
2011-08-13 Ulrich Drepper <drepper@gmail.com>
* elf/dl-open.c: Rename show_scope to _dl_schow_scope and export.