From 504417ac9745bc83124f6719fd7c784c41d7924a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 14 Oct 2005 23:42:04 +0000 Subject: [PATCH] [BZ #804] * malloc/tst-mtrace.sh: Work around for bootstraping. --- ChangeLog | 3 + localedata/ChangeLog | 4 ++ localedata/locales/te_IN | 108 ++++++++++++++++------------- localedata/locales/vi_VN | 146 ++++++++++++++++++++++++++++----------- malloc/tst-mtrace.sh | 5 +- 5 files changed, 175 insertions(+), 91 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c0c427408..19a63525c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-10-14 Ulrich Drepper + [BZ #804] + * malloc/tst-mtrace.sh: Work around for bootstraping. + * locale/programs/ld-collate.c (collate_output): Fix counting of elements. Don't limit table size. Use correct secondary hash function. diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 117cab64bb..05ab73fd59 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,5 +1,9 @@ 2005-10-14 Ulrich Drepper + [BZ #448] + * locales/vi_VN: Several fixes. + Patch by Nguyen Thai Ngoc Duy . + [BZ #428] * locales/te_IN: Several fixes. Patch by Sunil Mohan Adapa . diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN index f6c2bfd573..ffd039b7fe 100644 --- a/localedata/locales/te_IN +++ b/localedata/locales/te_IN @@ -3,6 +3,8 @@ escape_char / % Telugu language locale for India. % Contributed by Kentaroh Noji and % Tetsuji Orita . +% +% Updated by Sunil Mohan Adapa LC_IDENTIFICATION title "Telugu language locale for India" @@ -14,20 +16,20 @@ tel "" fax "" language "Telugu" territory "India" -revision "0.92b" -date "2000,October 12" +revision "0.95" +date "2004-10-05" % -category "te_IN:2000";LC_IDENTIFICATION -category "te_IN:2000";LC_CTYPE -category "te_IN:2000";LC_COLLATE -category "te_IN:2000";LC_TIME -category "te_IN:2000";LC_NUMERIC -category "te_IN:2000";LC_MONETARY -category "te_IN:2000";LC_MESSAGES -category "te_IN:2000";LC_PAPER -category "te_IN:2000";LC_NAME -category "te_IN:2000";LC_ADDRESS -category "te_IN:2000";LC_TELEPHONE +category "i18n:2003";LC_IDENTIFICATION +category "i18n:2003";LC_CTYPE +category "i18n:2003";LC_COLLATE +category "i18n:2003";LC_TIME +category "posix:1993";LC_NUMERIC +category "i18n:2003";LC_MONETARY +category "i18n:2003";LC_MESSAGES +category "i18n:2003";LC_PAPER +category "i18n:2003";LC_NAME +category "i18n:2003";LC_ADDRESS +category "i18n:2003";LC_TELEPHONE END LC_IDENTIFICATION @@ -50,18 +52,18 @@ LC_MONETARY % for IBM Class for Unicode. % int_curr_symbol "" -currency_symbol "" +currency_symbol "" mon_decimal_point "" mon_thousands_sep "" -mon_grouping 2;3 +mon_grouping 3;2 positive_sign "" negative_sign "" int_frac_digits 2 frac_digits 2 p_cs_precedes 1 -p_sep_by_space 1 +p_sep_by_space 0 n_cs_precedes 1 -n_sep_by_space 1 +n_sep_by_space 0 p_sign_posn 1 n_sign_posn 1 % @@ -73,7 +75,7 @@ LC_NUMERIC % decimal_point "" thousands_sep "" -grouping 2;3 +grouping 3;2 % END LC_NUMERIC @@ -103,34 +105,35 @@ abmon "";"< "";"";/ "";"";/ "";"";/ - "";"";/ - "";"" + "";"";/ + "";"" % Full month names (%B) mon "";"";/ "";"";/ "";"";/ "";"";/ - "";"";/ - "";"" + "";"";/ + "";"" % % Equivalent of AM PM -am_pm "";"" +am_pm "";"" % % Appropriate date and time representation -% %A %d %b %Y %I:%M:%S %Z -d_t_fmt "" +% %B %d %A %Y %p%I.%M.%S %Z +d_t_fmt "" % % Appropriate date representation -% %A %d %b %Y -d_fmt "" +% %B %d %A %Y +d_fmt "" % % Appropriate time representation -% %I:%M:%S %Z -t_fmt "" +% %p%I.%M.%S %Z +t_fmt "" % % Appropriate 12 h time representation (%r) -t_fmt_ampm "" +% %p%I.%M.%S %Z +t_fmt_ampm "" % END LC_TIME @@ -141,19 +144,14 @@ LC_MESSAGES % These are generated based on XML base Locale difintion file % for IBM Class for Unicode. % -% ^[\u0939\u093e\u0901] -yesexpr "" - % Syntax on Unicode Regular Expression Guidelines TR#18 -% yesexpr "" +% ^[yY\u0C05].* +yesexpr "" % -% ^[\u0928\u0939\u0940\u0902] -noexpr "" - % Syntax on Unicode Regular Expression Guidelines TR#18 -% noexpr "" -% +% ^[yY\u0C15].* +noexpr "" % yesstr "" @@ -174,12 +172,12 @@ LC_NAME % generated by IBM Basic CountryPack Transformer. % % -name_fmt "" +name_fmt "" name_gen "" -name_mr "" -name_mrs "" -name_miss "" -name_ms "" +name_mr "" +name_mrs "" +name_miss "" +name_ms "" END LC_NAME @@ -187,11 +185,25 @@ END LC_NAME LC_ADDRESS % This is the ISO_IEC TR14652 Locale definition for the LC_ADDRESS category % generated by IBM Basic CountryPack Transformer. -postal_fmt "" -country_ab2 "" -country_ab3 "" -country_num 356 +% postal_fmt "%n%N%a%N%d%N%f%N%r%t%e%N%h%t%b%N%s%t%l%N%T%t%z%N%S%N%c" +postal_fmt "/ +/ +/ +/ +/ +/ +/ +/ +/ +" +country_name "" +country_ab2 "" +country_ab3 "" +country_num 356 +lang_name "" +lang_ab "te" +lang_term "tel" END LC_ADDRESS diff --git a/localedata/locales/vi_VN b/localedata/locales/vi_VN index 7fc8018552..969d4ef766 100644 --- a/localedata/locales/vi_VN +++ b/localedata/locales/vi_VN @@ -2,16 +2,16 @@ escape_char / comment_char % % % Vietnamese language locale for Vietnam -% Source: TCVN table and info from vietnamese native speakers +% Source: glibc locale and info from vietnamese native speakers % Address: % Contact: Pablo Saratxaga -% Email: srtxg@chanae.alphanet.ch +% Email: pablo@mandrakesoft.com % Tel: % Fax: % Language: vi % Territory: VN -% Revision: 0.7 -% Date: 2003-02-06 +% Revision: 1.1 +% Date: 2004-01-09 % Users: general % Repertoiremap: % Charset: UTF-8 @@ -20,16 +20,16 @@ comment_char % LC_IDENTIFICATION title "Vietnamese language locale for Vietnam" -source "TCVN table and info from vietnamese native speakers" +source "glibc locale and info from vietnamese native speakers" address "" contact "Pablo Saratxaga" -email "srtxg@chanae.alphanet.ch" +email "pablo@mandrakesoft.com" tel "" fax "" language "Vietnamese" territory "Vietnam" -revision "0.6" -date "2001-01-29" +revision "1.1" +date "2004-01-09" % category "vi_VN:2000";LC_IDENTIFICATION category "vi_VN:2000";LC_CTYPE @@ -96,6 +96,7 @@ reorder-after reorder-after ;;;IGNORE + ;;;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -110,9 +111,10 @@ reorder-after >;;;IGNORE reorder-after ;;;IGNORE + ;;;IGNORE ;;;IGNORE ;;;IGNORE - ;;;IGNORE + ;;;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -132,6 +134,8 @@ reorder-after reorder-after ;;;IGNORE + ;;;IGNORE + ;;;IGNORE >;;;IGNORE >;;;IGNORE >;;;IGNORE @@ -140,6 +144,8 @@ reorder-after >;;;IGNORE reorder-after ;;;IGNORE + ;;;IGNORE + ;;;IGNORE >;;;IGNORE >;;;IGNORE >;;;IGNORE @@ -149,11 +155,14 @@ reorder-after reorder-after ;;;IGNORE + ;;;IGNORE reorder-after ;;;IGNORE + ;;;IGNORE reorder-after ;;;IGNORE + ;;;IGNORE >;;;IGNORE >;;;IGNORE >;;;IGNORE @@ -168,6 +177,7 @@ reorder-after ;;;IGNORE reorder-after ;;;IGNORE + ;;;IGNORE >;;;IGNORE >;;;IGNORE >;;;IGNORE @@ -183,6 +193,7 @@ reorder-after reorder-after ;;;IGNORE + ;;;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -191,6 +202,7 @@ reorder-after ;;;IGNORE reorder-after ;;;IGNORE + ;;;IGNORE ;;;IGNORE ;;;IGNORE ;;;IGNORE @@ -199,9 +211,15 @@ reorder-after ;;;IGNORE reorder-after + ;;;IGNORE ;;;IGNORE + ;;;IGNORE + ;;;IGNORE reorder-after + ;;;IGNORE ;;;IGNORE + ;;;IGNORE + ;;;IGNORE reorder-end @@ -232,35 +250,44 @@ grouping 3;3 END LC_NUMERIC LC_TIME -abday "";"";/ - "";"";/ - "";"";/ - "" -day "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -abmon "";"";/ - "";"";/ - "";"";/ - "";"";/ - "";"";/ - "";"" -mon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" +abday "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +day "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +abmon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +mon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" d_t_fmt "" d_fmt "" t_fmt "" @@ -272,9 +299,9 @@ END LC_TIME % yes: Va^ng / Da. % no: Kho^ng LC_MESSAGES -yesstr "" +yesstr "" nostr "" -yesexpr "" +yesexpr "" noexpr "" END LC_MESSAGES @@ -283,6 +310,45 @@ height 297 width 210 END LC_PAPER +LC_NAME +% This is the ISO_IEC TR14652 Locale definition for the +% LC_NAME category. +% +name_fmt "/ +" +name_gen "" +name_mr "" +name_mrs "" +name_miss "" +name_ms "" + +END LC_NAME + + +LC_ADDRESS +% This is the ISO_IEC TR14652 Locale definition for the +% LC_ADDRESS +postal_fmt "/ +" +country_name "" +lang_name "" + +country_ab2 "" +country_ab3 "" +country_num 704 +END LC_ADDRESS + + +LC_TELEPHONE +% This is the ISO_IEC TR14652 Locale definition for the +% +tel_int_fmt "/ +" +int_prefix "" +int_select "" + +END LC_TELEPHONE + LC_MEASUREMENT measurement 1 END LC_MEASUREMENT diff --git a/malloc/tst-mtrace.sh b/malloc/tst-mtrace.sh index d4fee2a357..771689a273 100755 --- a/malloc/tst-mtrace.sh +++ b/malloc/tst-mtrace.sh @@ -1,6 +1,6 @@ #! /bin/sh # Testing the mtrace function. -# Copyright (C) 2000 Free Software Foundation, Inc. +# Copyright (C) 2000, 2005 Free Software Foundation, Inc. # This file is part of the GNU C Library. # @@ -30,8 +30,7 @@ ${common_objpfx}elf/ld.so --library-path $common_objpfx \ ${common_objpfx}malloc/tst-mtrace || status=1 if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then - ${common_objpfx}malloc/mtrace ${common_objpfx}malloc/tst-mtrace \ - ${common_objpfx}malloc/tst-mtrace.leak \ + ${common_objpfx}malloc/mtrace ${common_objpfx}malloc/tst-mtrace.leak \ > ${common_objpfx}malloc/tst-mtrace.out|| status=1 fi