diff options
author | Ulrich Drepper <drepper@redhat.com> | 2005-09-30 00:05:01 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2005-09-30 00:05:01 +0000 |
commit | c293f2e542c129215d74effee75a5af7fef481d9 (patch) | |
tree | 05126228d60db676ae5b56e3ad36ca36f8f6fa84 | |
parent | 0fb3bd09c0012ec0022541d4053cc5c9eefa0014 (diff) | |
download | glibc-c293f2e542c129215d74effee75a5af7fef481d9.tar.gz glibc-c293f2e542c129215d74effee75a5af7fef481d9.tar.xz glibc-c293f2e542c129215d74effee75a5af7fef481d9.zip |
* elf/rtld.c [DL_ARGV_NOT_RELRO] (_dl_argc, _dl_skip_args):
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | localedata/ChangeLog | 6 | ||||
-rw-r--r-- | localedata/locales/en_US | 2 | ||||
-rw-r--r-- | localedata/locales/es_US | 12 |
4 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 2855a78b27..7c012c43c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -155,7 +155,7 @@ 2005-09-29 Alfred M. Szmidt <ams@gnu.org> - * elf/rtld.c [! DL_ARGV_NOT_RELRO] (_dl_argc, _dl_skip_args): + * elf/rtld.c [DL_ARGV_NOT_RELRO] (_dl_argc, _dl_skip_args): Don't use attribute_relro. 2005-09-29 Roland McGrath <roland@redhat.com> diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 1934f15632..5c6f3e6b82 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,9 @@ +2005-09-29 Ulrich Drepper <drepper@redhat.com> + + * locales/en_US: Fix postal_fmt. + * locales/es_US: Update LC_ADDRESS info from en_US. + Reported by FrankTang@gmail.com. + 2005-09-25 Ulrich Drepper <drepper@redhat.com> [BZ #811] diff --git a/localedata/locales/en_US b/localedata/locales/en_US index 7aaa09953a..b2ad72d5ce 100644 --- a/localedata/locales/en_US +++ b/localedata/locales/en_US @@ -151,7 +151,7 @@ LC_ADDRESS postal_fmt "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/ <U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0068>/ <U0020><U0025><U0073><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/ -<U004E><U0025><U0025><U0054><U0020><U0025><U007A><U0025>/ +<U004E><U0025><U0054><U002C><U0020><U0025><U0053><U0020><U0025><U007A><U0025>/ <U004E><U0025><U0063><U0025><U004E>" country_name "<U0055><U0053><U0041>" country_post "<U0055><U0053><U0041>" diff --git a/localedata/locales/es_US b/localedata/locales/es_US index 0b12c6e203..85e9d50ae8 100644 --- a/localedata/locales/es_US +++ b/localedata/locales/es_US @@ -2220,12 +2220,16 @@ name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/ END LC_NAME LC_ADDRESS -postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/ -<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/ -<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/ -<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/ +postal_fmt "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/ +<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0068>/ +<U0020><U0025><U0073><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/ +<U004E><U0025><U0054><U002C><U0020><U0025><U0053><U0020><U0025><U007A><U0025>/ <U004E><U0025><U0063><U0025><U004E>" +country_name "<U0055><U0053><U0041>" +country_post "<U0055><U0053><U0041>" country_ab2 "<U0055><U0053>" country_ab3 "<U0055><U0053><U0041>" country_num 840 +country_car "<U0055><U0053><U0041>" +country_isbn 0 END LC_ADDRESS |