[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r3677 - in /fsf/trunk/libc: ./ include/ locale/programs/ localedata/ localedata/locales/ malloc/
- To: commits@xxxxxxxxxx
- Subject: [commits] r3677 - in /fsf/trunk/libc: ./ include/ locale/programs/ localedata/ localedata/locales/ malloc/
- From: eglibc@xxxxxxxxxx
- Date: Tue, 02 Oct 2007 07:03:45 -0000
Author: eglibc
Date: Tue Oct 2 00:03:42 2007
New Revision: 3677
Log:
Import glibc-mainline for 2007-10-02
Added:
fsf/trunk/libc/localedata/locales/ber_MA
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/include/stdio_ext.h
fsf/trunk/libc/locale/programs/ld-collate.c
fsf/trunk/libc/localedata/ChangeLog
fsf/trunk/libc/localedata/SUPPORTED
fsf/trunk/libc/localedata/locales/am_ET
fsf/trunk/libc/localedata/locales/oc_FR
fsf/trunk/libc/malloc/malloc.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Oct 2 00:03:42 2007
@@ -1,3 +1,15 @@
+2007-10-01 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #5071]
+ * malloc/malloc.c (mremap_chunk): Avoid resizing of new block has
+ the same number of pages.
+ Patch by Tomash Brechko <tomash.brechko@xxxxxxxxx>.
+
+ * locale/programs/ld-collate.c (collate_read): After initial copy
+ statement, continue in state 0.
+
+ * include/stdio_ext.h (__fsetlocking): Define as macro.
+
2007-09-30 Ulrich Drepper <drepper@xxxxxxxxxx>
* locale/programs/ld-collate.c (collate_finish): Compare all bytes
Modified: fsf/trunk/libc/include/stdio_ext.h
==============================================================================
--- fsf/trunk/libc/include/stdio_ext.h (original)
+++ fsf/trunk/libc/include/stdio_ext.h Tue Oct 2 00:03:42 2007
@@ -4,8 +4,19 @@
extern int __fsetlocking_internal (FILE *__fp, int __type) attribute_hidden;
-#ifndef NOT_IN_libc
-# define __fsetlocking(fp, type) INTUSE(__fsetlocking) (fp, type)
-#endif
+#define __fsetlocking(fp, type) \
+ ({ int __result = ((fp->_flags & _IO_USER_LOCK) \
+ ? FSETLOCKING_BYCALLER : FSETLOCKING_INTERNAL); \
+ \
+ if (type != FSETLOCKING_QUERY) \
+ { \
+ fp->_flags &= ~_IO_USER_LOCK; \
+ if (type == FSETLOCKING_BYCALLER) \
+ fp->_flags |= _IO_USER_LOCK; \
+ } \
+ \
+ __result; \
+ })
+
#endif
Modified: fsf/trunk/libc/locale/programs/ld-collate.c
==============================================================================
--- fsf/trunk/libc/locale/programs/ld-collate.c (original)
+++ fsf/trunk/libc/locale/programs/ld-collate.c Tue Oct 2 00:03:42 2007
@@ -2660,7 +2660,6 @@
if (nowtok == tok_copy)
{
- state = 2;
now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_string)
{
@@ -3327,7 +3326,9 @@
was_ellipsis = tok_none;
}
}
- else if (state != 2 && state != 3)
+ else if (state == 0 && copy_locale == NULL)
+ goto err_label;
+ else if (state != 0 && state != 2 && state != 3)
goto err_label;
state = 3;
@@ -3796,7 +3797,7 @@
/* Next we assume `LC_COLLATE'. */
if (!ignore_content)
{
- if (state == 0)
+ if (state == 0 && copy_locale == NULL)
/* We must either see a copy statement or have
ordering values. */
lr_error (ldfile,
Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Tue Oct 2 00:03:42 2007
@@ -1,3 +1,12 @@
+2007-10-01 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #4941]
+ * locales/oc_FR: Fix Thursday abday and August mon and abmon data.
+
+ * SUPPORTED (SUPPORTED-LOCALES): Add ber_MA.UTF-8.
+
+ * locales/am_ET (LC_COLLATE): Define new script after copy.
+
2007-09-30 Ulrich Drepper <drepper@xxxxxxxxxx>
* locales/cs_SR: Removed.
@@ -20,10 +29,12 @@
* locales/cs_CZ: Sort lowercase before uppercase.
* locales/en_GB: Change first weekday and workday to Monday.
- * locales/da_DK: Likewise.
- * locales/et_EE: Likewise.
* locales/nb_NO: Likewise.
* locales/nn_NO: Likewise.
+ [BZ #4833]
+ * locales/da_DK: Likewise.
+ [BZ #4705]
+ * locales/et_EE: Likewise.
* locales/iso14651_t1_common: Add rules for Georgian.
Modified: fsf/trunk/libc/localedata/SUPPORTED
==============================================================================
--- fsf/trunk/libc/localedata/SUPPORTED (original)
+++ fsf/trunk/libc/localedata/SUPPORTED Tue Oct 2 00:03:42 2007
@@ -54,6 +54,7 @@
be_BY/CP1251 \
be_BY@latin/UTF-8 \
ber_DZ/UTF-8 \
+ber_MA/UTF-8 \
bg_BG.UTF-8/UTF-8 \
bg_BG/CP1251 \
bn_BD/UTF-8 \
Modified: fsf/trunk/libc/localedata/locales/am_ET
==============================================================================
--- fsf/trunk/libc/localedata/locales/am_ET (original)
+++ fsf/trunk/libc/localedata/locales/am_ET Tue Oct 2 00:03:42 2007
@@ -56,13 +56,13 @@
LC_COLLATE
%
+% Copy the template from ISO/IEC 14651
+%
+copy "iso14651_t1"
+%
% The ETHIOPIC script declaration must come first.
%
script <ETHIOPIC>
-%
-% Copy the template from ISO/IEC 14651
-%
-copy "iso14651_t1"
%
% Correcting Unicode's linguistic ordering to the traditional.
%
Added: fsf/trunk/libc/localedata/locales/ber_MA
==============================================================================
--- fsf/trunk/libc/localedata/locales/ber_MA (added)
+++ fsf/trunk/libc/localedata/locales/ber_MA Tue Oct 2 00:03:42 2007
@@ -1,0 +1,229 @@
+comment_char %
+escape_char /
+%
+% Amazigh Language Locale for Morocco (tifinagh)
+% Source:
+% Contact: Pablo Saratxaga
+% Email: <pablo@xxxxxxxxxxxxxxxx>
+% Language: ber
+% Territory: MA
+% Revision: 0.1
+% Date: 2004-06-26
+% Application: general
+% Users: general
+% Charset: UTF-8
+% Distribution and use is free, also
+% for commercial purposes.
+
+LC_IDENTIFICATION
+title "Amazigh language locale for Morocco (tifinagh)"
+source ""
+address ""
+contact "Pablo Saratxaga"
+email "pablo@xxxxxxxxxxxxxxxx"
+tel ""
+fax ""
+language "Amazigh"
+territory "Morocco"
+revision "0.1"
+date "2002-06-26"
+
+category ber_MA:2000;LC_IDENTIFICATION
+category ber_MA:2000;LC_CTYPE
+category ber_MA:2000;LC_COLLATE
+category ber_MA:2000;LC_TIME
+category ber_MA:2000;LC_NUMERIC
+category ber_MA:2000;LC_PAPER
+category ber_MA:2000;LC_TELEPHONE
+category ber_MA:2000;LC_MEASUREMENT
+category ber_MA:2000;LC_ADDRESS
+category ber_MA:2000;LC_MONETARY
+category ber_MA:2000;LC_MESSAGES
+
+END LC_IDENTIFICATION
+
+%
+% TODO: fix LC_TIME, LC_MONETARY, LC_MESSAGES, LC_NAME, LC_ADDRESS
+
+LC_COLLATE
+
+copy "iso14651_t1"
+
+collating-symbol <TIF-GW>
+collating-symbol <TIF-KW>
+
+collating-element <TIF-G-W> from "<U2D33><U2D6F>"
+collating-element <TIF-K-W> from "<U2D3D><U2D6F>"
+
+reorder-after <TIF-G>
+<TIF-GW>
+reorder-after <TIF-K>
+<TIF-KW>
+reorder-after <U2D33>
+<TIF-G-W> <TIF-GW>;<PCT>;<MIN>;IGNORE
+reorder-after <U2D37>
+<U2D35> "<TIF-D><TIF-J>";"<LIG><PCL>";"<MIN><MIN>";IGNORE
+<U2D36> "<TIF-D><TIF-J>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
+reorder-after <U2D3D>
+<TIF-K-W> <TIF-KW>;<PCT>;<MIN>;IGNORE
+reorder-after <U2D5C>
+<U2D5E> "<TIF-T><TIF-C>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
+reorder-end
+
+% Moroccan sorting standard requires tifinagh to come
+% before latin script
+reorder-sections-after <SPECIAL>
+<TIFINAGH>
+reorder-sections-end
+END LC_COLLATE
+
+LC_CTYPE
+copy "i18n"
+
+translit_start
+include "translit_combining";""
+translit_end
+END LC_CTYPE
+
+LC_MESSAGES
+% FIXME: yes/no
+yesstr "<U0062><U0259><U006C><U0069>"
+nostr "<U0079><U006F><U0078>"
+yesexpr "<U005E><U005B><U0042><U0062><U005D><U002E><U002A>"
+noexpr "<U005E><U005B><U0059><U0079><U004E><U006E><U005D><U002E><U002A>"
+END LC_MESSAGES
+
+LC_MONETARY
+% This is the POSIX Locale definition the LC_MONETARY category.
+% These are generated based on XML base Locale difintion file
+% for IBM Class for Unicode/Java
+%
+int_curr_symbol "<U004D><U0041><U0044><U0020>"
+currency_symbol "<U2D37><U002E><U2D4E><U002E>"
+mon_decimal_point "<U002E>"
+mon_thousands_sep "<U002C>"
+mon_grouping 3
+positive_sign ""
+negative_sign "<U002D>"
+int_frac_digits 3
+frac_digits 3
+p_cs_precedes 1
+p_sep_by_space 1
+n_cs_precedes 1
+n_sep_by_space 1
+p_sign_posn 1
+n_sign_posn 2
+%
+END LC_MONETARY
+
+
+LC_NUMERIC
+% This is the POSIX Locale definition for the LC_NUMERIC category.
+%
+decimal_point "<U002E>"
+thousands_sep "<U002C>"
+grouping 3
+%
+END LC_NUMERIC
+
+% FIXME
+LC_TIME
+day "<U0062><U0061><U007A><U0061><U0072><U0020><U0067><U00FC><U006E><U00FC>";/
+ "<U0062><U0069><U0072><U0069><U006E><U0063><U0069><U0020><U0067><U00FC><U006E>";/
+ "<U0069><U006B><U0069><U006E><U0063><U0069><U0020><U0067><U00FC><U006E>";/
+ "<U00FC><U00E7><U00FC><U006E><U0063><U00FC><U0020><U0067><U00FC><U006E>";/
+ "<U0064><U00F6><U0072><U0064><U00FC><U006E><U0063><U00FC><U0020><U0067><U00FC><U006E>";/
+ "<U0062><U0065><U015F><U0069><U006E><U0063><U0069><U0020><U0067><U00FC><U006E>";/
+ "<U0061><U006C><U0074><U0131><U006E><U0063><U0131><U0020><U0067><U00FC><U006E>"
+abday "<U0062><U0061><U007A>";/
+ "<U0062><U0069><U0072>";/
+ "<U0069><U006B><U0069>";/
+ "<U00FC><U00E7><U00FC>";/
+ "<U0064><U00F6><U0072>";/
+ "<U0062><U0065><U015F>";/
+ "<U0061><U006C><U0074>"
+mon "<U0079><U0061><U006E><U0076><U0061><U0072>";/
+ "<U0066><U0065><U0076><U0072><U0061><U006C>";/
+ "<U006D><U0061><U0072><U0074>";/
+ "<U0061><U0070><U0072><U0065><U006C>";/
+ "<U006D><U0061><U0079>";/
+ "<U0069><U0079><U0075><U006E>";/
+ "<U0069><U0079><U0075><U006C>";/
+ "<U0061><U0076><U0071><U0075><U0073><U0074>";/
+ "<U0073><U0065><U006E><U0074><U0079><U0061><U0062><U0072>";/
+ "<U006F><U006B><U0074><U0079><U0061><U0062><U0072>";/
+ "<U006E><U006F><U0079><U0061><U0062><U0072>";/
+ "<U0064><U0065><U006B><U0061><U0062><U0072>"
+abmon "<U0059><U0061><U006E>";/
+ "<U0046><U0065><U0076>";/
+ "<U004D><U0061><U0072>";/
+ "<U0041><U0070><U0072>";/
+ "<U004D><U0061><U0079>";/
+ "<U0130><U0079><U006E>";/
+ "<U0130><U0079><U006C>";/
+ "<U0041><U0076><U0071>";/
+ "<U0053><U0065><U006E>";/
+ "<U004F><U006B><U0074>";/
+ "<U004E><U006F><U0079>";/
+ "<U0044><U0065><U006B>"
+d_t_fmt "<U0025><U0041><U002C><U0020><U0025><U0064><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054>"
+d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059>"
+t_fmt "<U0025><U0054>"
+am_pm "";""
+t_fmt_ampm ""
+END LC_TIME
+
+LC_PAPER
+height 297
+width 210
+END LC_PAPER
+
+LC_MEASUREMENT
+measurement 1
+END LC_MEASUREMENT
+
+LC_NAME
+% This is the ISO_IEC TR14652 Locale definition for the
+% LC_NAME category.
+%
+name_fmt "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074>/
+<U0025><U0067>"
+name_gen "<U002D><U0073><U0061><U006E>"
+name_mr "<U004D><U0072><U002E>"
+name_mrs "<U004D><U0072><U0073><U002E>"
+name_miss "<U004D><U0069><U0073><U0073><U002E>"
+name_ms "<U004D><U0073><U002E>"
+
+END LC_NAME
+
+
+LC_ADDRESS
+% This is the ISO_IEC TR14652 Locale definition for the
+% LC_ADDRESS
+postal_fmt "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
+<U0025><U0062><U0025><U0065><U0025><U0072>"
+
+%country_name ""
+%country_post ""
+country_ab2 "<U004D><U0041>"
+country_ab3 "<U004D><U0041><U0052>"
+country_num 504
+%country_isbn ""
+%country_car ""
+lang_name "<U2D5C><U2D30><U2D4E><U2D30><U2D49><U2D56><U2D5C>"
+% lang_ab
+lang_term "<U0062><U0065><U0072>"
+lang_lib "<U0062><U0065><U0072>"
+
+
+END LC_ADDRESS
+
+
+LC_TELEPHONE
+% This is the ISO_IEC TR14652 Locale definition for the
+%
+tel_int_fmt "<U002B><U0025><U0063><U0020><U003B><U0025><U0061><U0020>/
+<U003B><U0025><U006C>"
+int_prefix "<U0032><U0031><U0032>"
+
+END LC_TELEPHONE
Modified: fsf/trunk/libc/localedata/locales/oc_FR
==============================================================================
--- fsf/trunk/libc/localedata/locales/oc_FR (original)
+++ fsf/trunk/libc/localedata/locales/oc_FR Tue Oct 2 00:03:42 2007
@@ -91,7 +91,7 @@
LC_TIME
abday "<U0064><U0069><U006D>";"<U006C><U0075><U006E>";/
"<U006D><U0061><U0072>";"<U006D><U0065><U0063>";/
- "<U006A><U00F3><U0075>";"<U0076><U0065><U006E>";/
+ "<U006A><U00F2><U0075>";"<U0076><U0065><U006E>";/
"<U0073><U0061><U0062>"
day "<U0064><U0069><U006D><U0065><U006E><U0067><U0065>";/
"<U0064><U0069><U006C><U0075><U006E><U0073>";/
@@ -103,7 +103,7 @@
abmon "<U0067><U0065><U006E>";"<U0066><U0065><U0062>";/
"<U006D><U0061><U0072>";"<U0061><U0062><U0072>";/
"<U006D><U0061><U0069>";"<U006A><U0075><U006E>";/
- "<U006A><U0075><U006C>";"<U0061><U0067><U00F3>";/
+ "<U006A><U0075><U006C>";"<U0061><U0067><U006F>";/
"<U0073><U0065><U0074>";"<U006F><U0063><U0074>";/
"<U006E><U006F><U0076>";"<U0064><U0065><U0063>"
mon "<U0067><U0065><U006E><U0069><U00E8><U0072>";/
@@ -113,7 +113,7 @@
"<U006D><U0061><U0069>";/
"<U006A><U0075><U006E><U0068>";/
"<U006A><U0075><U006C><U0068><U0065><U0074>";/
- "<U0061><U0067><U00F3><U0073><U0074>";/
+ "<U0061><U0067><U006F><U0073><U0074>";/
"<U0073><U0065><U0074><U0065><U006D><U0062><U0072><U0065>";/
"<U006F><U0063><U0074><U006F><U0062><U0072><U0065>";/
"<U006E><U006F><U0076><U0065><U006D><U0062><U0072><U0065>";/
Modified: fsf/trunk/libc/malloc/malloc.c
==============================================================================
--- fsf/trunk/libc/malloc/malloc.c (original)
+++ fsf/trunk/libc/malloc/malloc.c Tue Oct 2 00:03:42 2007
@@ -3503,6 +3503,10 @@
/* Note the extra SIZE_SZ overhead as in mmap_chunk(). */
new_size = (new_size + offset + SIZE_SZ + page_mask) & ~page_mask;
+ /* No need to remap if the number of pages does not change. */
+ if (size + offset == new_size)
+ return p;
+
cp = (char *)mremap((char *)p - offset, size + offset, new_size,
MREMAP_MAYMOVE);