From a32c7fb447ed82297343b2d7d6da84b57d3ebca1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 29 Jun 2002 17:20:10 +0000 Subject: [PATCH] Update. 2002-06-29 Ulrich Drepper * locales/en_AU: Add am/pm support. Patch partly by maffew@cat.org.au [PR libc/3911]. --- elf/do-rel.h | 2 +- localedata/ChangeLog | 5 +++++ localedata/locales/en_AU | 5 +++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/elf/do-rel.h b/elf/do-rel.h index 7f3b06acd2..bad102549b 100644 --- a/elf/do-rel.h +++ b/elf/do-rel.h @@ -70,7 +70,7 @@ elf_dynamic_do_rel (struct link_map *map, ElfW(Word) nrelative = (map->l_info[RELCOUNT_IDX] == NULL ? 0 : map->l_info[RELCOUNT_IDX]->d_un.d_val); const ElfW(Rel) *relative = r; - r = MIN (r + nrelative, end); + r = r + MIN (nrelative, relsize / sizeof (ElfW(Rel))); #ifndef RTLD_BOOTSTRAP /* This is defined in rtld.c, but nowhere in the static libc.a; make diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 1979c2392d..c6d86073e7 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,8 @@ +2002-06-29 Ulrich Drepper + + * locales/en_AU: Add am/pm support. + Patch partly by maffew@cat.org.au [PR libc/3911]. + 2002-05-15 Ulrich Drepper * locales/be_BY: Fix int_curr_symbol. diff --git a/localedata/locales/en_AU b/localedata/locales/en_AU index 3385fb00a4..ec8340cbb6 100644 --- a/localedata/locales/en_AU +++ b/localedata/locales/en_AU @@ -111,8 +111,9 @@ mon "";/ d_t_fmt "" d_fmt "" t_fmt "" -am_pm "";"" -t_fmt_ampm "" +am_pm "";"" +t_fmt_ampm "/ +" date_fmt "/ / "