diff options
| -rw-r--r-- | elf/do-rel.h | 2 | ||||
| -rw-r--r-- | localedata/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 <drepper@redhat.com> + + * locales/en_AU: Add am/pm support. + Patch partly by maffew@cat.org.au [PR libc/3911]. + 2002-05-15 Ulrich Drepper <drepper@redhat.com> * 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 "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/ d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>" t_fmt "<U0025><U0054>" -am_pm "";"" -t_fmt_ampm "" +am_pm "<U0041><U004D>";"<U0050><U004D>" +t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ +<U0025><U0070>" date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ <U0025><U005A><U0020><U0025><U0059>" |