From 865d953fc91d50b2693ab31ef7867ddac9f43ad2 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 14 Dec 2004 21:25:41 +0000 Subject: [PATCH] Update. 2004-10-06 Alan Modra * sysdeps/powerpc/powerpc64/ppc-mcount.S (PROF): Don't undef. * sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S: Invoke CALL_MOUNT. * sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S: Likewise. --- ChangeLog | 12 + localedata/ChangeLog | 4 + localedata/locales/en_ZA | 211 ++++++++++++++++-- sysdeps/powerpc/powerpc64/ppc-mcount.S | 5 - .../unix/sysv/linux/powerpc/powerpc64/brk.S | 1 + .../unix/sysv/linux/powerpc/powerpc64/clone.S | 1 + .../sysv/linux/powerpc/powerpc64/getcontext.S | 2 + .../linux/powerpc/powerpc64/makecontext.S | 1 + .../sysv/linux/powerpc/powerpc64/setcontext.S | 2 + .../sysv/linux/powerpc/powerpc64/socket.S | 1 + .../linux/powerpc/powerpc64/swapcontext.S | 2 + .../unix/sysv/linux/powerpc/powerpc64/vfork.S | 1 + 12 files changed, 224 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index a33df5d4f7..c2b87d0858 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2004-10-06 Alan Modra + + * sysdeps/powerpc/powerpc64/ppc-mcount.S (PROF): Don't undef. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S: Invoke CALL_MOUNT. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S: Likewise. + 2004-10-19 Wolfram Gloger * malloc/hooks.c (mem2chunk_check, top_check): Handle diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 392833f6a0..ed069d80af 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,7 @@ +2004-12-14 Ulrich Drepper + + * locales/en_ZA: Update by Dwayne Bailey. + 2004-11-27 Ulrich Drepper * locales/pa_IN: Add some missing fields and fix some spelling diff --git a/localedata/locales/en_ZA b/localedata/locales/en_ZA index 2b6d160322..6e0c232bc2 100644 --- a/localedata/locales/en_ZA +++ b/localedata/locales/en_ZA @@ -2,14 +2,14 @@ escape_char / comment_char % % English language locale for South Africa -% Source: Zuza Software Foundation +% Source: Zuza Software Foundation (Translate.org.za) % Email: dwayne@translate.org.za -% Tel: +27 21 4487827 -% Fax: +27 21 4489574 +% Tel: +27 12 3430389 +% Fax: +27 12 3430389 % Language: en % Territory: ZA -% Revision: 1.1 -% Date: 2003-03-14 +% Revision: 1.2 +% Date: 2003-10-27 % Users: general % Repertoiremap: mnemonic,ds % Charset: ISO-8859-1 @@ -17,6 +17,20 @@ comment_char % % for commercial purposes. % % Changelog +% 1.2 (2004-10-27): +% 2004-10-27 Dwayne Bailey +% - Remove .* from LC_MESSAGES yes/noexpr +% - Change contact details and add Translate.org.za +% to project name +% 2004-03-30 Dwayne Bailey +% - Added country_post +% - Added abbreviation to LC_IDENTIFICATION +% 2003-05-17 Dwayne Bailey +% - Add lang_ab, lang_term +% - Add various comments for reference documents +% - Add country_isbn, country_car, country_ab2, +% country_ab3, country_num +% - Add name_* for all salutations % 1.1 (2003-03-14): % - Updated maintainer to Zuza Software Foundation % - Changed %x for LC_TIME to use dd/mm/ccyy @@ -27,16 +41,19 @@ comment_char % LC_IDENTIFICATION title "English locale for South Africa" -source "Zuza Software Foundation" -address "Box 13412, Mowbray, 7701, South Africa" +source "Zuza Software Foundation (Translate.org.za)" +address "Box 28364, Sunnyside, 0132, South Africa" contact "Dwayne Bailey" email "dwayne@translate.org.za" -tel "+27 21 448 7827" -fax "+27 21 448 9574" +tel "+27 12 343 0389" +fax "+27 12 343 0389" language "English" territory "South Africa" -revision "1.1" -date "2003-03-14" +% audience "" +% application "" +abbreviation "Translate.org.za" +revision "1.2" +date "2003-10-27" % category "en_ZA:2003";LC_IDENTIFICATION category "en_ZA:2000";LC_CTYPE @@ -47,7 +64,7 @@ category "en_ZA:2000";LC_MONETARY category "en_ZA:2003";LC_MESSAGES category "en_ZA:2000";LC_PAPER category "en_ZA:2000";LC_MEASUREMENT -category "en_ZA:2000";LC_NAME +category "en_ZA:2003";LC_NAME category "en_ZA:2003";LC_ADDRESS category "en_ZA:2003";LC_TELEPHONE @@ -62,12 +79,23 @@ copy "iso14651_t1" END LC_COLLATE LC_MONETARY +% ISO 4217 Currency and fund codes +% http://www.bsi-global.com/Technical+Information/Publications/_Publications/tig90.xalter +% "ZAR " int_curr_symbol "" + +% "R" currency_symbol "" + +% "." mon_decimal_point "" + +% "," mon_thousands_sep "" mon_grouping 3;3 positive_sign "" + +% "-" negative_sign "" int_frac_digits 2 frac_digits 2 @@ -80,16 +108,24 @@ n_sign_posn 1 END LC_MONETARY LC_NUMERIC +% "." decimal_point "" + +% "," thousands_sep "" grouping 3;3 END LC_NUMERIC LC_TIME +% abday - The abbreviations for the week days: +% - Sun, Mon, Tue, Wed, Thu, Fri, Sat abday "";"";/ "";"";/ "";"";/ "" + +% day - The full names of the week days: +% - Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday day "";/ "";/ "";/ @@ -97,12 +133,19 @@ day "";/ "";/ "";/ "" + +% abmon - The abbreviations for the months +% - Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec abmon "";"";/ "";"";/ "";"";/ "";"";/ "";"";/ "";"" + +% mon - The full names of the months - +% - January, February, March, April, May, June +% July, August, September, October, November, December mon "";/ "";/ "";/ @@ -115,19 +158,57 @@ mon "";/ "";/ "";/ "" + +% Abreviated date and time representation to be referenced by the "%c" field descriptor - +% +% "%a" (short weekday name), +% "%d" (day of month as a decimal number), +% "%b" (short month name), +% "%Y" (year with century as a decimal number), +% "%T" (24-hour clock time in format HH:MM:SS), +% "%Z" (Time zone name) d_t_fmt "" + +% Date representation to be referenced by the "%x" field descriptor - +% "%d/%m/%Y", day/month/year as decimal numbers (01/01/2000). d_fmt "" + +% Time representation to be referenced by the "%X" field descriptor - +% "%T" (24-hour clock time in format HH:MM:SS) t_fmt "" + +% Define representation of ante meridiem and post meridiem strings - +% The "" mean default to "AM" and "PM". am_pm "";"" + +% Define time representation in 12-hour format with "am_pm", to be referenced by the "%r" +% The "" means that this format is not supported. t_fmt_ampm "" + +% Date representation not described in ISO/IEC 14652. Comes out as - +% "%a %b %e %H:%M:%S %Z %Y" which is default "date" command output +% +% %a - abbreviated weekday name, +% %b - abreviated month name, +% %e - day of month as a decimal number with leading space (1 to 31), +% %H - hour (24-hour clock) as a decimal number (00 to 23), +% %M - minute as a decimal number (00 to 59), +% %S - seconds as a decimal number (00 to 59), +% %Z - time-zone name, +% %Y - year with century as a decimal number,e.g. 2001. date_fmt "/ / " END LC_TIME LC_MESSAGES -yesexpr "" -noexpr "" +% The affirmative response - +% "^[yY]" +yesexpr "" + +% The negative response - +% "^[nN]" +noexpr "" END LC_MESSAGES LC_PAPER @@ -136,10 +217,26 @@ width 210 END LC_PAPER LC_TELEPHONE +% Representation of telephone number for international use - +% "+%c %a %l", which is +% "+%c - country code", +% "%a - area code without the prefix (often 0)", +% "%l local number". tel_int_fmt "/ " + +% Represntation of telephone number for domestic use - +% "(%A) %l", which is +% %A - area code with national prefix +% %l - local number". tel_dom_fmt "" + +% Prefix for making international calls +% "09" int_select "" + +% International dialing code +% "27" int_prefix "" END LC_TELEPHONE @@ -149,20 +246,106 @@ measurement 1 END LC_MEASUREMENT LC_NAME +% Format for addressing a person. +% "%d%t%g%t%m%t%f" +% +% "Salutation", +% "Empty string, or ", +% "First given name", +% "Empty string, or ", +% "Middle names", +% "Empty string, or ", +% "Clan names" name_fmt "/ " + +% General salutation for any sex +% (no term) +name_gen "" + +% Salutation for unmarried females +% "Miss" +name_miss "" + +% Salutation for males +% "Mr" +name_mr "" + +% Salutation for married females +% "Mrs" +name_mrs "" + +% Salutation valid for all females +% "Ms" +name_ms "" END LC_NAME LC_ADDRESS +% Representation of postal addresses (minus the addressee's name) in South +% Africa. (Ignored for now) +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% +% "firm name", +% "end of line", +% "C/O address", +% "end of line", +% "department name", +% "Building name", +% "end of line", +% "street or block name", +% "space", +% "house number or designation", +% "space", +% "floor number", +% "space", +% "room number, door designation", +% "end of line", +% "postal code", +% "space", +% "town, city", +% "end of line", +% "country designation for the keyword", +% "end of line postal_fmt "/ / / / " + +% Country name in English - "South Africa" country_name "/ " + +% Language name in English - "English" lang_name "" + +% CEPT MAILCODES are suggested +% Alternatively use the code found on your countries postal item tracking number +% "ZA" +country_post "" + +% UN Geneve 1949:68 Distinguishing signs of vehicles in international traffic +% http://www.unece.org/trans/conventn/disting-signs-5-2001.pdf +% "ZA" +country_car "" + +% ISO 2108 +% http://www.isbn-international.org/html/prefix/prefa.htm +country_isbn 0 + +% ISO 639 language abbreviations: +% 639-1 2 letter, 639-2 3 letter terminology +% http://www.loc.gov/standards/iso639-2/englagn.html +% "en", "eng" +lang_ab "" +lang_term "" +lang_lib "" + +% ISO 3166 country number and 2 and 3 letter abreviations +% http://www.unicode.org/onlinedat/countries.html +% "ZA", "ZAF" country_ab2 "" country_ab3 "" country_num 710 + END LC_ADDRESS diff --git a/sysdeps/powerpc/powerpc64/ppc-mcount.S b/sysdeps/powerpc/powerpc64/ppc-mcount.S index eaa586a0d8..46cb9fdc8a 100644 --- a/sysdeps/powerpc/powerpc64/ppc-mcount.S +++ b/sysdeps/powerpc/powerpc64/ppc-mcount.S @@ -17,11 +17,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -/* This would be bad. */ -#ifdef PROF -#undef PROF -#endif - #include /* We don't need to save the parameter-passing registers as gcc takes care of that for us. Thus this function looks fairly normal. diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S index 233697bf5e..3f74f55271 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/brk.S @@ -29,6 +29,7 @@ .tc __curbrk[TC],__curbrk .section ".text" ENTRY (BP_SYM (__brk)) + CALL_MCOUNT 1 DISCARD_BOUNDS (r3) /* the bounds are meaningless, so toss 'em. */ stdu r1,-64(r1) diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S index 1386b2fa22..71e9a84e60 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S @@ -32,6 +32,7 @@ void *tls [r8], void *child_tid [r9]); */ ENTRY (BP_SYM (__clone)) + CALL_MCOUNT 7 /* GKM FIXME: add bounds checks, where sensible. */ DISCARD_BOUNDS (r4) DISCARD_BOUNDS (r6) diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S index 851a171fa3..0f392366eb 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S @@ -30,6 +30,7 @@ #if SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4) ENTRY(__novec_getcontext) + CALL_MCOUNT 1 #ifdef __ASSUME_NEW_RT_SIGRETURN_SYSCALL std r0,(SIGCONTEXT_GP_REGS+(PT_R0*8))(r3) std r1,(SIGCONTEXT_GP_REGS+(PT_R1*8))(r3) @@ -167,6 +168,7 @@ compat_symbol (libc, __novec_getcontext, getcontext, GLIBC_2_3) .machine "altivec" ENTRY(__getcontext) + CALL_MCOUNT 1 #ifdef __ASSUME_NEW_RT_SIGRETURN_SYSCALL std r0,(SIGCONTEXT_GP_REGS+(PT_R0*8))(r3) std r1,(SIGCONTEXT_GP_REGS+(PT_R1*8))(r3) diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S index adfeb3ee72..8034559200 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S @@ -26,6 +26,7 @@ #include ENTRY(__makecontext) + CALL_MCOUNT 3 #ifdef __ASSUME_NEW_RT_SIGRETURN_SYSCALL /* Save parameters into the parameter save area of callers frame. */ std r3,FRAME_PARM1_SAVE(r1) /* ucontext_t *ucp */ diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S index 278489fb36..6514f442a6 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S @@ -29,6 +29,7 @@ #if SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4) ENTRY(__novec_setcontext) + CALL_MCOUNT 1 #ifdef __ASSUME_NEW_RT_SIGRETURN_SYSCALL mflr r0 std r31,-8(1) @@ -194,6 +195,7 @@ compat_symbol (libc, __novec_setcontext, setcontext, GLIBC_2_3) .machine "altivec" ENTRY(__setcontext) + CALL_MCOUNT 1 #ifdef __ASSUME_NEW_RT_SIGRETURN_SYSCALL mflr r0 std r31,-8(1) diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S index a6dbcea24f..ec3ab5d9e6 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S @@ -51,6 +51,7 @@ .text ENTRY(__socket) + CALL_MCOUNT NARGS cfi_startproc stdu r1,-144(r1) cfi_adjust_cfa_offset(144) diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S index ad1ba6963b..6644c8abff 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S @@ -29,6 +29,7 @@ #if SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4) ENTRY(__novec_swapcontext) + CALL_MCOUNT 2 #ifdef __ASSUME_NEW_RT_SIGRETURN_SYSCALL std r0,(SIGCONTEXT_GP_REGS+(PT_R0*8))(r3) std r1,(SIGCONTEXT_GP_REGS+(PT_R1*8))(r3) @@ -289,6 +290,7 @@ compat_symbol (libc, __novec_swapcontext, swapcontext, GLIBC_2_3) .machine "altivec" ENTRY(__swapcontext) + CALL_MCOUNT 2 #ifdef __ASSUME_NEW_RT_SIGRETURN_SYSCALL std r0,(SIGCONTEXT_GP_REGS+(PT_R0*8))(r3) std r1,(SIGCONTEXT_GP_REGS+(PT_R1*8))(r3) diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S index d36b917e1c..2f5df38cf8 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S @@ -27,6 +27,7 @@ and the process ID of the new process to the old process. */ ENTRY (__vfork) + CALL_MCOUNT 0 #ifdef __NR_vfork