[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r14362 - in /fsf/trunk/libc: ./ debug/ iconvdata/ malloc/
- To: commits@xxxxxxxxxx
- Subject: [commits] r14362 - in /fsf/trunk/libc: ./ debug/ iconvdata/ malloc/
- From: eglibc@xxxxxxxxxx
- Date: Wed, 29 Jun 2011 07:02:37 -0000
Author: eglibc
Date: Wed Jun 29 00:02:35 2011
New Revision: 14362
Log:
Import glibc-mainline for 2011-06-29
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/NEWS
fsf/trunk/libc/config.make.in
fsf/trunk/libc/configure
fsf/trunk/libc/configure.in
fsf/trunk/libc/debug/xtrace.sh
fsf/trunk/libc/iconvdata/gb18030.c
fsf/trunk/libc/malloc/Makefile
fsf/trunk/libc/malloc/memusage.sh
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Jun 29 00:02:35 2011
@@ -1,3 +1,19 @@
+2011-06-28 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ [BZ #12935]
+ * malloc/memusage.sh: Fix quoting in message.
+ * debug/xtrace.sh: Likewise.
+
+ * configure.in: Remove support for --experimental-malloc option, make
+ it the default.
+ * config.make.in: Likewise.
+ * malloc/Makefile: Likewise.
+
+2011-06-27 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP
+ two-byte characters.
+
2011-06-27 Roland McGrath <roland@xxxxxxxxxxxxx>
* configure.in (NO_CTORS_DTORS_SECTIONS): Give this check its own
Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Wed Jun 29 00:02:35 2011
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes. 2011-6-24
+GNU C Library NEWS -- history of user-visible changes. 2011-6-28
Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
See the end for copying conditions.
@@ -9,7 +9,7 @@
* The following bugs are resolved with this release:
- 12874, 12885, 12907
+ 12874, 12885, 12907, 12935
* New program pldd to list loaded object of a process
Implemented by Ulrich Drepper.
Modified: fsf/trunk/libc/config.make.in
==============================================================================
--- fsf/trunk/libc/config.make.in (original)
+++ fsf/trunk/libc/config.make.in Wed Jun 29 00:02:35 2011
@@ -85,8 +85,6 @@
sizeof-long-double = @sizeof_long_double@
-experimental-malloc = @experimental_malloc@
-
nss-crypt = @libc_cv_nss_crypt@
# Configuration options.
Modified: fsf/trunk/libc/configure
==============================================================================
--- fsf/trunk/libc/configure (original)
+++ fsf/trunk/libc/configure Wed Jun 29 00:02:35 2011
@@ -691,7 +691,6 @@
add_on_subdirs
add_ons
libc_cv_nss_crypt
-experimental_malloc
all_warnings
force_install
bindnow
@@ -790,7 +789,6 @@
enable_kernel
enable_all_warnings
enable_multi_arch
-enable_experimental_malloc
enable_nss_crypt
with_cpu
'
@@ -1450,8 +1448,6 @@
--enable-all-warnings enable all useful warnings gcc can issue
--enable-multi-arch enable single DSO with optimizations for multiple
architectures
- --enable-experimental-malloc
- enable experimental malloc features
--enable-nss-crypt enable libcrypt to use nss
Optional Packages:
@@ -3764,13 +3760,6 @@
else
multi_arch=default
fi
-
-
-# Check whether --enable-experimental-malloc was given.
-if test "${enable_experimental_malloc+set}" = set; then :
- enableval=$enable_experimental_malloc; experimental_malloc=$enableval
-fi
-
# Check whether --enable-nss-crypt was given.
Modified: fsf/trunk/libc/configure.in
==============================================================================
--- fsf/trunk/libc/configure.in (original)
+++ fsf/trunk/libc/configure.in Wed Jun 29 00:02:35 2011
@@ -273,13 +273,6 @@
[enable single DSO with optimizations for multiple architectures]),
[multi_arch=$enableval],
[multi_arch=default])
-
-AC_ARG_ENABLE([experimental-malloc],
- AC_HELP_STRING([--enable-experimental-malloc],
- [enable experimental malloc features]),
- [experimental_malloc=$enableval],
- [])
-AC_SUBST(experimental_malloc)
AC_ARG_ENABLE([nss-crypt],
AC_HELP_STRING([--enable-nss-crypt],
Modified: fsf/trunk/libc/debug/xtrace.sh
==============================================================================
--- fsf/trunk/libc/debug/xtrace.sh (original)
+++ fsf/trunk/libc/debug/xtrace.sh Wed Jun 29 00:02:35 2011
@@ -30,7 +30,7 @@
# Refer to --help option.
help_info() {
- printf >&2 $"Try \`%s --help' or `%s --usage' for more information.\n" xtrace xtrace
+ printf >&2 $"Try \`%s --help' or \`%s --usage' for more information.\n" xtrace xtrace
exit 1
}
Modified: fsf/trunk/libc/iconvdata/gb18030.c
==============================================================================
--- fsf/trunk/libc/iconvdata/gb18030.c (original)
+++ fsf/trunk/libc/iconvdata/gb18030.c Wed Jun 29 00:02:35 2011
@@ -18233,17 +18233,17 @@
len = 0; \
} \
else if (ch == 0x20087) \
- idx = 0xfe51; \
+ cp = (const unsigned char *) "\xfe\x51"; \
else if (ch == 0x20089) \
- idx = 0xfe52; \
+ cp = (const unsigned char *) "\xfe\x52"; \
else if (ch == 0x200CC) \
- idx = 0xfe53; \
+ cp = (const unsigned char *) "\xfe\x53"; \
else if (ch == 0x215d7) \
- idx = 0xfe6c; \
+ cp = (const unsigned char *) "\xfe\x6c"; \
else if (ch == 0x2298F) \
- idx = 0xfe76; \
+ cp = (const unsigned char *) "\xfe\x76"; \
else if (ch == 0x241FE) \
- idx = 0xfe91; \
+ cp = (const unsigned char *) "\xfe\x91"; \
else \
len = 0; \
\
Modified: fsf/trunk/libc/malloc/Makefile
==============================================================================
--- fsf/trunk/libc/malloc/Makefile (original)
+++ fsf/trunk/libc/malloc/Makefile Wed Jun 29 00:02:35 2011
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009
+# Copyright (C) 1991-1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009, 2011
# Free Software Foundation, Inc.
# This file is part of the GNU C Library.
@@ -125,9 +125,7 @@
tst-mcheck-ENV = MALLOC_CHECK_=3
-ifeq ($(experimental-malloc),yes)
CPPFLAGS-malloc.c += -DPER_THREAD -DATOMIC_FASTBINS
-endif
# Uncomment this for test releases. For public releases it is too expensive.
#CPPFLAGS-malloc.o += -DMALLOC_DEBUG=1
Modified: fsf/trunk/libc/malloc/memusage.sh
==============================================================================
--- fsf/trunk/libc/malloc/memusage.sh (original)
+++ fsf/trunk/libc/malloc/memusage.sh Wed Jun 29 00:02:35 2011
@@ -24,7 +24,7 @@
# Print usage message.
do_usage() {
- printf >&2 $"Try \`%s --help' or `%s --usage' for more information.\n" memusage memusage
+ printf >&2 $"Try \`%s --help' or \`%s --usage' for more information.\n" memusage memusage
exit 1
}