mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-27 05:00:15 +00:00
a058c7c839
18 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Mike Frysinger
|
0a410e76f5 |
localedata: CLDRv29: update LC_TIME week/first_week,workday fields
I've spot checked a number of these, including some that were def wrong (like ff_SN). It also fixes all open week-related bugs. Since ff_SN is the only one that changes its base date, I also made sure that its ordering of day translations were correct. Looks like another case Petr brought up where the week field was not actually checked against the day arrays. I also took the opportunity to drop first_weekday/first_workday when the value aligned with the defaults (1 & 2 respectively). This didn't impact too many locales In practice because the majority omitted them already. A few locales were defining some values incorrectly for their region: ak_GH: week: changing [7, 19971130, 7] to [7, 19971130, 1] ak_GH: first_weekday: changing 1 to 2 ayc_PE: week: changing [7, 19971130, 7] to [7, 19971130, 1] bem_ZM: week: changing [7, 19971130, 4] to [7, 19971130, 1] bem_ZM: first_weekday: changing 1 to 2 en_IE: first_weekday: changing 2 to 1 en_US: week: changing [7, 19971130, 7] to [7, 19971130, 1] es_CO: first_weekday: changing 2 to 1 es_ES: week: changing [7, 19971130, 5] to [7, 19971130, 4] ff_SN: week: changing [7, 19971129, 1] to [7, 19971130, 1] ff_SN: first_weekday: changing 1 to 2 ga_IE: first_weekday: changing 2 to 1 ht_HT: week: changing [7, 19971130, 7] to [7, 19971130, 1] ht_HT: first_weekday: changing 1 to 2 mk_MK: week: changing [7, 19971130, 4] to [7, 19971130, 1] mt_MT: first_weekday: changing 2 to 1 quz_PE: week: changing [7, 19971130, 7] to [7, 19971130, 1] sr_ME: week: changing [7, 19971130, 4] to [7, 19971130, 1] sr_RS: week: changing [7, 19971130, 4] to [7, 19971130, 1] sr_RS@latin: week: changing [7, 19971130, 4] to [7, 19971130, 1] sw_KE: week: changing [7, 19971130, 4] to [7, 19971130, 1] sw_KE: first_weekday: changing 2 to 1 uk_UA: week: changing [7, 19971130, 4] to [7, 19971130, 1] unm_US: week: changing [7, 19971130, 4] to [7, 19971130, 1] Some locales were copying locales that had the wrong week settings, so that content had to be duplicated so the values could be adjusted: el_CY: week: setting to [7, 19971130, 1] en_AG: week: setting to [7, 19971130, 1] en_AG: first_weekday: changing 2 to 1 en_ZM: week: setting to [7, 19971130, 1] es_CU: week: setting to [7, 19971130, 1] nl_AW: week: setting to [7, 19971130, 1] sw_TZ: first_weekday: setting to 2 ta_LK: first_weekday: setting to 2 The majority of locales were omitting the week field thus getting the default [7, 19971130, 0 (localedef) / 7 (ISO standard)]. Unfortunately, neither of those are used by any locales, so we end up having to define the field just to se the ndays field. In practice, this rarely matters due to it usage, and the first two fields match the defaults. aa_DJ: setting to [7, 19971130, 1] aa_ER: setting to [7, 19971130, 1] aa_ER@saaho: setting to [7, 19971130, 1] aa_ET: setting to [7, 19971130, 1] af_ZA: setting to [7, 19971130, 1] am_ET: setting to [7, 19971130, 1] an_ES: setting to [7, 19971130, 4] anp_IN: setting to [7, 19971130, 1] ar_AE: setting to [7, 19971130, 1] ar_BH: setting to [7, 19971130, 1] ar_DZ: setting to [7, 19971130, 1] ar_EG: setting to [7, 19971130, 1] ar_IN: setting to [7, 19971130, 1] ar_IQ: setting to [7, 19971130, 1] ar_JO: setting to [7, 19971130, 1] ar_KW: setting to [7, 19971130, 1] ar_LB: setting to [7, 19971130, 1] ar_LY: setting to [7, 19971130, 1] ar_MA: setting to [7, 19971130, 1] ar_OM: setting to [7, 19971130, 1] ar_QA: setting to [7, 19971130, 1] ar_SA: setting to [7, 19971130, 1] ar_SD: setting to [7, 19971130, 1] ar_SS: setting to [7, 19971130, 1] ar_SY: setting to [7, 19971130, 1] ar_TN: setting to [7, 19971130, 1] ar_YE: setting to [7, 19971130, 1] as_IN: setting to [7, 19971130, 1] ast_ES: setting to [7, 19971130, 4] az_AZ: setting to [7, 19971130, 1] be_BY: setting to [7, 19971130, 1] be_BY@latin: setting to [7, 19971130, 1] ber_DZ: setting to [7, 19971130, 1] ber_MA: setting to [7, 19971130, 1] bg_BG: setting to [7, 19971130, 4] bhb_IN: setting to [7, 19971130, 1] bho_IN: setting to [7, 19971130, 1] bn_BD: setting to [7, 19971130, 1] bn_IN: setting to [7, 19971130, 1] bo_CN: setting to [7, 19971130, 1] br_FR: setting to [7, 19971130, 4] brx_IN: setting to [7, 19971130, 1] bs_BA: setting to [7, 19971130, 1] byn_ER: setting to [7, 19971130, 1] ca_AD: setting to [7, 19971130, 4] ca_ES: setting to [7, 19971130, 4] ca_ES@euro: setting to [7, 19971130, 4] ca_FR: setting to [7, 19971130, 4] ca_IT: setting to [7, 19971130, 4] ce_RU: setting to [7, 19971130, 1] cmn_TW: setting to [7, 19971130, 1] crh_UA: setting to [7, 19971130, 1] cv_RU: setting to [7, 19971130, 1] cy_GB: setting to [7, 19971130, 4] de_BE: setting to [7, 19971130, 4] de_LU: setting to [7, 19971130, 4] doi_IN: setting to [7, 19971130, 1] dv_MV: setting to [7, 19971130, 1] dz_BT: setting to [7, 19971130, 1] el_GR: setting to [7, 19971130, 4] el_GR@euro: setting to [7, 19971130, 4] en_AU: setting to [7, 19971130, 1] en_BW: setting to [7, 19971130, 1] en_CA: setting to [7, 19971130, 1] en_HK: setting to [7, 19971130, 1] en_IE: setting to [7, 19971130, 4] en_IN: setting to [7, 19971130, 1] en_NG: setting to [7, 19971130, 1] en_NZ: setting to [7, 19971130, 1] en_PH: setting to [7, 19971130, 1] en_SG: setting to [7, 19971130, 1] en_ZA: setting to [7, 19971130, 1] en_ZW: setting to [7, 19971130, 1] es_AR: setting to [7, 19971130, 1] es_BO: setting to [7, 19971130, 1] es_CL: setting to [7, 19971130, 1] es_CO: setting to [7, 19971130, 1] es_CR: setting to [7, 19971130, 1] es_DO: setting to [7, 19971130, 1] es_EC: setting to [7, 19971130, 1] es_ES@euro: setting to [7, 19971130, 4] es_GT: setting to [7, 19971130, 1] es_HN: setting to [7, 19971130, 1] es_MX: setting to [7, 19971130, 1] es_NI: setting to [7, 19971130, 1] es_PA: setting to [7, 19971130, 1] es_PE: setting to [7, 19971130, 1] es_PR: setting to [7, 19971130, 1] es_PY: setting to [7, 19971130, 1] es_SV: setting to [7, 19971130, 1] es_US: setting to [7, 19971130, 1] es_UY: setting to [7, 19971130, 1] es_VE: setting to [7, 19971130, 1] eu_ES: setting to [7, 19971130, 4] fa_IR: setting to [7, 19971130, 1] fil_PH: setting to [7, 19971130, 1] fo_FO: setting to [7, 19971130, 4] fr_CA: setting to [7, 19971130, 1] fr_CH: setting to [7, 19971130, 4] fr_LU: setting to [7, 19971130, 4] fy_NL: setting to [7, 19971130, 4] ga_IE: setting to [7, 19971130, 4] gd_GB: setting to [7, 19971130, 4] gez_ER: setting to [7, 19971130, 1] gez_ET: setting to [7, 19971130, 1] gl_ES: setting to [7, 19971130, 4] gu_IN: setting to [7, 19971130, 1] gv_GB: setting to [7, 19971130, 4] hak_TW: setting to [7, 19971130, 1] ha_NG: setting to [7, 19971130, 1] he_IL: setting to [7, 19971130, 1] hi_IN: setting to [7, 19971130, 1] hne_IN: setting to [7, 19971130, 1] hr_HR: setting to [7, 19971130, 1] hy_AM: setting to [7, 19971130, 1] id_ID: setting to [7, 19971130, 1] ig_NG: setting to [7, 19971130, 1] ik_CA: setting to [7, 19971130, 1] is_IS: setting to [7, 19971130, 4] it_CH: setting to [7, 19971130, 4] it_IT: setting to [7, 19971130, 4] it_IT@euro: setting to [7, 19971130, 4] iu_CA: setting to [7, 19971130, 1] ja_JP: setting to [7, 19971130, 1] ka_GE: setting to [7, 19971130, 1] kk_KZ: setting to [7, 19971130, 1] kl_GL: setting to [7, 19971130, 1] km_KH: setting to [7, 19971130, 1] kn_IN: setting to [7, 19971130, 1] kok_IN: setting to [7, 19971130, 1] ko_KR: setting to [7, 19971130, 1] ks_IN: setting to [7, 19971130, 1] ks_IN@devanagari: setting to [7, 19971130, 1] ku_TR: setting to [7, 19971130, 1] kw_GB: setting to [7, 19971130, 4] ky_KG: setting to [7, 19971130, 1] lg_UG: setting to [7, 19971130, 1] lij_IT: setting to [7, 19971130, 4] lo_LA: setting to [7, 19971130, 1] lt_LT: setting to [7, 19971130, 4] lv_LV: setting to [7, 19971130, 1] lzh_TW: setting to [7, 19971130, 1] mag_IN: setting to [7, 19971130, 1] mai_IN: setting to [7, 19971130, 1] mg_MG: setting to [7, 19971130, 1] mhr_RU: setting to [7, 19971130, 1] mi_NZ: setting to [7, 19971130, 1] ml_IN: setting to [7, 19971130, 1] mni_IN: setting to [7, 19971130, 1] mn_MN: setting to [7, 19971130, 1] mr_IN: setting to [7, 19971130, 1] ms_MY: setting to [7, 19971130, 1] mt_MT: setting to [7, 19971130, 1] my_MM: setting to [7, 19971130, 1] nan_TW: setting to [7, 19971130, 1] nan_TW@latin: setting to [7, 19971130, 1] ne_NP: setting to [7, 19971130, 1] nhn_MX: setting to [7, 19971130, 1] niu_NU: setting to [7, 19971130, 1] niu_NZ: setting to [7, 19971130, 1] nl_BE: setting to [7, 19971130, 4] nl_BE@euro: setting to [7, 19971130, 4] nr_ZA: setting to [7, 19971130, 1] nso_ZA: setting to [7, 19971130, 1] oc_FR: setting to [7, 19971130, 4] om_ET: setting to [7, 19971130, 1] om_KE: setting to [7, 19971130, 1] or_IN: setting to [7, 19971130, 1] os_RU: setting to [7, 19971130, 1] pa_IN: setting to [7, 19971130, 1] pap_AW: setting to [7, 19971130, 1] pap_CW: setting to [7, 19971130, 1] pa_PK: setting to [7, 19971130, 1] ps_AF: setting to [7, 19971130, 1] pt_BR: setting to [7, 19971130, 1] pt_PT: setting to [7, 19971130, 4] pt_PT@euro: setting to [7, 19971130, 4] raj_IN: setting to [7, 19971130, 1] ro_RO: setting to [7, 19971130, 1] ru_RU: setting to [7, 19971130, 1] ru_UA: setting to [7, 19971130, 1] rw_RW: setting to [7, 19971130, 1] sa_IN: setting to [7, 19971130, 1] sat_IN: setting to [7, 19971130, 1] sd_IN: setting to [7, 19971130, 1] sd_IN@devanagari: setting to [7, 19971130, 1] se_NO: setting to [7, 19971130, 4] shs_CA: setting to [7, 19971130, 1] sid_ET: setting to [7, 19971130, 1] si_LK: setting to [7, 19971130, 1] sl_SI: setting to [7, 19971130, 1] so_DJ: setting to [7, 19971130, 1] so_ET: setting to [7, 19971130, 1] so_KE: setting to [7, 19971130, 1] so_SO: setting to [7, 19971130, 1] sq_AL: setting to [7, 19971130, 1] ss_ZA: setting to [7, 19971130, 1] st_ZA: setting to [7, 19971130, 1] sv_FI: setting to [7, 19971130, 4] sv_SE: setting to [7, 19971130, 4] ta_IN: setting to [7, 19971130, 1] tcy_IN: setting to [7, 19971130, 1] te_IN: setting to [7, 19971130, 1] tg_TJ: setting to [7, 19971130, 1] the_NP: setting to [7, 19971130, 1] th_TH: setting to [7, 19971130, 1] ti_ER: setting to [7, 19971130, 1] ti_ET: setting to [7, 19971130, 1] tig_ER: setting to [7, 19971130, 1] tk_TM: setting to [7, 19971130, 1] tl_PH: setting to [7, 19971130, 1] tn_ZA: setting to [7, 19971130, 1] tr_CY: setting to [7, 19971130, 1] tr_TR: setting to [7, 19971130, 1] ts_ZA: setting to [7, 19971130, 1] tt_RU: setting to [7, 19971130, 1] tt_RU@iqtelif: setting to [7, 19971130, 1] ug_CN: setting to [7, 19971130, 1] ur_IN: setting to [7, 19971130, 1] ur_PK: setting to [7, 19971130, 1] uz_UZ: setting to [7, 19971130, 1] uz_UZ@cyrillic: setting to [7, 19971130, 1] ve_ZA: setting to [7, 19971130, 1] vi_VN: setting to [7, 19971130, 1] wa_BE: setting to [7, 19971130, 4] wal_ET: setting to [7, 19971130, 1] wo_SN: setting to [7, 19971130, 1] xh_ZA: setting to [7, 19971130, 1] yi_US: setting to [7, 19971130, 1] yo_NG: setting to [7, 19971130, 1] yue_HK: setting to [7, 19971130, 1] zh_CN: setting to [7, 19971130, 1] zh_HK: setting to [7, 19971130, 1] zh_SG: setting to [7, 19971130, 1] zh_TW: setting to [7, 19971130, 1] zu_ZA: setting to [7, 19971130, 1] Finally, set first_weekday in all the locales that were omitting it and wanted something other than the default of 1. aa_DJ: setting to 7 aa_ER: setting to 2 aa_ER@saaho: setting to 2 ar_AE: setting to 7 ar_BH: setting to 7 ar_DZ: setting to 7 ar_EG: setting to 7 ar_IQ: setting to 7 ar_JO: setting to 7 ar_KW: setting to 7 ar_LB: setting to 2 ar_LY: setting to 7 ar_MA: setting to 7 ar_OM: setting to 7 ar_QA: setting to 7 ar_SD: setting to 7 ar_SS: setting to 2 ar_SY: setting to 7 az_AZ: setting to 2 be_BY: setting to 2 be_BY@latin: setting to 2 ber_DZ: setting to 7 ber_MA: setting to 7 bn_BD: setting to 6 bs_BA: setting to 2 byn_ER: setting to 2 dv_MV: setting to 6 en_NG: setting to 2 es_BO: setting to 2 es_CL: setting to 2 es_EC: setting to 2 es_UY: setting to 2 fo_FO: setting to 2 fr_CH: setting to 2 gd_GB: setting to 2 gez_ER: setting to 2 ha_NG: setting to 2 hr_HR: setting to 2 hy_AM: setting to 2 ig_NG: setting to 2 is_IS: setting to 2 it_CH: setting to 2 ka_GE: setting to 2 kk_KZ: setting to 2 kl_GL: setting to 2 ku_TR: setting to 2 ky_KG: setting to 2 lg_UG: setting to 2 mg_MG: setting to 2 mn_MN: setting to 2 ms_MY: setting to 2 niu_NU: setting to 2 pap_AW: setting to 2 pap_CW: setting to 2 pt_PT: setting to 2 pt_PT@euro: setting to 2 rw_RW: setting to 2 se_NO: setting to 2 si_LK: setting to 2 so_DJ: setting to 7 so_SO: setting to 2 sq_AL: setting to 2 tg_TJ: setting to 2 ti_ER: setting to 2 tig_ER: setting to 2 tk_TM: setting to 2 tt_RU: setting to 2 tt_RU@iqtelif: setting to 2 uz_UZ: setting to 2 uz_UZ@cyrillic: setting to 2 vi_VN: setting to 2 wo_SN: setting to 2 yo_NG: setting to 2 |
||
|
Mike Frysinger
|
36f91a5db6 |
localedata: fix LC_TELEPHONE in a few locales
A bunch of locales were copying the wrong source locale -- looks like they were basically TODOs from the original imports. This lead to bad values for int_prefix for them. |
||
|
Mike Frysinger
|
3544cbc8f4 |
localedata: LC_IDENTIFICATION: delete uncommon fields
Very few locales set audience/application/abbreviation, and even the ones that do, set them largely to default/useless values. Drop them from the few locales until we decide we want to set these everywhere (to something useful). |
||
|
Mike Frysinger
|
1a06eee869 |
localedata: LC_IDENTIFICATION.category: set to ISO 30112 2014 standard
The ISO 30112 standard defines the valid values for the category keyword as only a few options: posix:1993 i18n:2004 i18n:2012 The vast majority of locales had changed the "i18n" string to the name of its own locale (e.g. "ak_GH:2013") as well as tweaking the date (presumably thinking it should be the date of submission). Convert all of them to "i18n:2012" for consistency. A follow up change will update localedef to actually check/validate the field. |
||
|
Mike Frysinger
|
1c20cb2098 |
localedata: LC_MEASUREMENT: use copy directives everywhere
There are only two measurement systems that locales use: US and metric. For the former, move to copying the en_US locale, while for the latter, move to copying the i18n locale. This lets us clean up all the stray comments like FIXME. There should be no functional differences here. |
||
|
Mike Frysinger
|
a4cea54b12 |
localedata: standardize copyright/license information [BZ #11213]
Use the language from the FSF in all locale files to disclaim any license/copyright on locale data. See https://sourceware.org/ml/libc-locales/2013-q1/msg00048.html |
||
|
Mike Frysinger
|
6bc81cf205 |
localedata: standardize first few lines
Purely a style touchup to make sure the headers all look the same. |
||
Florian Weimer
|
ff889b1965 | Remove trailing newline from date_fmt in Serbian locales [BZ #19581] | ||
Marko Myllynen
|
441c3b59d1 |
Fix lang_lib/lang_term as per ISO 639-2 [BZ #16973]
lang_lib (which reflects ISO 639-2/B (bibliographic) codes) and lang_term (which reflects ISO 639-2/T (terminology) codes) should be identical except for those languages for which ISO 639-2 specifies separate bibliographic/terminology values. I used this Library of Congress page as the source: http://www.loc.gov/standards/iso639-2/php/code_list.php |
||
Chris Leonard
|
8f18faed2e | [BZ #16103] LC_MEASUREMENT review and standardization | ||
Ulrich Drepper
|
3873630cd8 |
* locales/cs.CZ: Change week[2] to 19971130, change first_weekday and
first_workday to 2. * locales/da_DK: Likewise. * locales/de_DE: Likewise. * locales/fr_FR: Likewise. * locales/fur_IT: Likewise. * locales/fy_DE: Likewise. * locales/ht_HT: Likewise. * locales/hu_HU: Likewise. * locales/li_BE: Likewise. * locales/li_NL: Likewise. * locales/mk_MK: Likewise. * locales/nb_NO: Likewise. * locales/nds_DE: Likewise. * locales/nds_NL: Likewise. * locales/nn_NO: Likewise. * locales/pl_PL: Likewise. * locales/sc_IT: Likewise. * locales/sk_SK: Likewise. * locales/uk_UA: Likewise. * locales/csb_PL: Change week[2] to 19971130. * locales/en_GB: Likewise. * locales/et_EE: Likewise. * locales/sr_ME: Set week to 7;19971130;4. * locales/sr_RS: Likewise. * locales/sr_RS@latin: Likewise. |
||
|
Ulrich Drepper
|
6daf1a2fb1 |
[BZ #6867]
* sysdeps/powerpc/elf/rtld-global-offsets.sym: Fix typo. |
||
|
Ulrich Drepper
|
93e6691446 | * locale/iso-3166.def: Update entry for Serbia. | ||
|
Ulrich Drepper
|
11bf311edc |
[BZ #2510, BZ #2830, BZ #3137, BZ #3313, BZ #3426, BZ #3465, BZ #3480, BZ #3483, BZ #3493, BZ #3514, BZ #3515, BZ #3664, BZ #3673, BZ #3674]
2007-01-11 Jakub Jelinek <jakub@redhat.com> * sysdeps/i386/soft-fp/sfp-machine.h: Remove. * sysdeps/x86_64/soft-fp/sfp-machine.h: Likewise. 2007-01-10 Ulrich Drepper <drepper@redhat.com> * io/fts.c: Make sure fts_cur is always valid after return from fts_read. Patch by Miloslav Trmac <mitr@redhat.com>. 2006-10-27 Richard Sandiford <richard@codesourcery.com> * elf/elf.h (R_MIPS_GLOB_DAT): Define. (R_MIPS_NUM): Bump by 1. 2007-01-03 Jakub Jelinek <jakub@redhat.com> * posix/execvp.c: Include alloca.h. (allocate_scripts_argv): Renamed to... (scripts_argv): ... this. Don't allocate buffer here nor count arguments. (execvp): Use alloca if possible. * posix/Makefile: Add rules to build and run tst-vfork3 test. * posix/tst-vfork3.c: New test. * stdlib/Makefile (tst-strtod3-ENV): Define. 2007-01-02 Ulrich Drepper <drepper@redhat.com> * posix/getconf.c: Update copyright year. * nss/getent.c: Likewise. * iconv/iconvconfig.c: Likewise. * iconv/iconv_prog.c: Likewise. * elf/ldconfig.c: Likewise. * catgets/gencat.c: Likewise. * csu/version.c: Likewise. * elf/ldd.bash.in: Likewise. * elf/sprof.c (print_version): Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * nscd/nscd.c (print_version): Likewise. * debug/xtrace.sh: Likewise. * malloc/memusage.sh: Likewise. * malloc/mtrace.pl: Likewise. * debug/catchsegv.sh: Likewise. 2006-12-24 Ulrich Drepper <drepper@redhat.com> * malloc/malloc.c (sYSMALLOc): Remove some unnecessary alignment attempts. 2006-12-23 Ulrich Drepper <drepper@redhat.com> * posix/wordexp.c: Remove some unnecessary tests. 2006-12-20 SUGIOKA Toshinobu <sugioka@itonet.co.jp> * sysdeps/unix/sysv/linux/sh/bits/shm.h: New file. * nss/getXXbyYY_r.c: Include atomic.h. (INTERNAL (REENTRANT_NAME)): Write startp after start_fct, add atomic_write_barrier () in between. 2006-11-28 Jakub Jelinek <jakub@redhat.com> * elf/dl-support.c: Include dl-procinfo.h. * sysdeps/powerpc/dl-procinfo.h (PPC_PLATFORM_POWER4, PPC_PLATFORM_PPC970, PPC_PLATFORM_POWER5, PPC_PLATFORM_POWER5_PLUS, PPC_PLATFORM_POWER6, PPC_PLATFORM_CELL_BE, PPC_PLATFORM_POWER6X): Define. (_dl_string_platform): Use PPC_PLATFORM_* macros instead of hardcoded constants. * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platform): Use PPC_PLATFORM_* macros for array designators. 2006-11-11 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_cap_flags): Add 3 new cap names to the beginning. (_dl_powerpc_platforms): Add "power6x". * sysdeps/powerpc/dl-procinfo.h (_DL_HWCAP_FIRST): Decrease. (HWCAP_IMPORTANT): Add PPC_FEATURE_HAS_DFP. (_DL_PLATFORMS_COUNT): Increase. (_dl_string_platform): Handle power6x case. * sysdeps/powerpc/sysdep.h (PPC_FEATURE_PA6T, PPC_FEATURE_HAS_DFP, PPC_FEATURE_POWER6_EXT): Define. (PPC_FEATURE_POWER5, PPC_FEATURE_POWER5_PLUS): Correct Comment. [-2^31 .. 2^31) range. * sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_RELATIME. * sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags): Handle relatime mount option. 2006-12-13 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Include kernel-features.h. 2006-12-11 Ulrich Drepper <drepper@redhat.com> * stdlib/strtod_l.c (____STRTOF_INTERNAL): Parse thousand separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. [BZ #3664] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix test to recognize empty parsed strings. * stdlib/Makefile (tests): Add tst-strtod2. * stdlib/tst-strtod2.c: New file. [BZ #3673] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix exp_limit computation. * stdlib/Makefile (tests): Add tst-atof2. * stdlib/tst-atof2.c: New file. [BZ #3674] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Adjust exponent value correctly if removing trailing zero of hex-float. * stdlib/Makefile (tests): Add tst-atof1. * stdlib/tst-atof1.c: New file. * misc/mntent_r.c (__hasmntopt): Check p[optlen] even when p == rest. Start searching for next comma at p rather than rest. * misc/Makefile (tests): Add tst-mntent2. * misc/tst-mntent2.c: New test. 2006-12-08 Ulrich Drepper <drepper@redhat.com> * malloc/memusage.c: Handle realloc with new size of zero and non-NULL pointer correctly. (me): Really write first record twice. (struct entry): Make format bi-arch safe. (dest): Write out more realloc statistics. * malloc/memusagestat.c (struct entry): Make format bi-arch safe. 2006-12-05 Jakub Jelinek <jakub@redhat.com> * nis/nis_subr.c (nis_getnames): Revert last change. 2006-12-03 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/unix/sysv/linux/sh/sys/io.h: Removed. 2006-11-30 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/i386/i686/memcmp.S: Use jump table as the base of jump table entries. 2006-11-30 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/i386/clone.S: Provide CFI for the outermost `clone' function to ensure proper unwinding stop of gdb. * sysdeps/unix/sysv/linux/x86_64/clone.S: Likewise. 2006-12-01 Ulrich Drepper <drepper@redhat.com> * nscd/nscd.init: Remove obsolete and commented-out -S option handling. 2006-11-23 Jakub Jelinek <jakub@redhat.com> [BZ #3514] * manual/string.texi (strncmp): Fix pastos from wcscmp description. [BZ #3515] * manual/string.texi (strtok): Remove duplicate paragraph. 2006-12-01 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with libgcc not supporting `rflags' unwinding (register # >= 17). 2006-11-30 Jakub Jelinek <jakub@redhat.com> * sunrpc/svc_run.c (svc_run): Set my_pollfd to new_pollfd if realloc succeeded. 2006-11-29 Daniel Jacobowitz <dan@codesourcery.com> Jakub Jelinek <jakub@redhat.com> Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c (restore_rt): Add correct unwind information. * sysdeps/unix/sysv/linux/x86_64/Makefile: Provide symbols for 'restore_rt' even in the 'signal' directory. * sysdeps/unix/sysv/linux/x86_64/ucontext_i.sym: Extend the regs list. malloc crashed. Don't allocate memory unnecessarily in each loop. 2006-10-21 Jakub Jelinek <jakub@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Fix last change. 2006-11-20 Ulrich Drepper <drepper@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Optimize a bit. 2006-11-18 Bruno Haible <bruno@clisp.org> * sysdeps/unix/sysv/linux/i386/getgroups.c (__getgroups): Invoke __sysconf only after having tried to call getgroups32. 2006-11-19 Ulrich Drepper <drepper@redhat.com> * nss/nss_files/files-hosts.c (LINE_PARSER): Support IPv6-style addresses for IPv4 queries if they can be mapped. 2006-11-16 Jakub Jelinek <jakub@redhat.com> * sysdeps/x86_64/fpu/s_copysignf.S (__copysignf): Switch to .text. * sysdeps/x86_64/fpu/s_copysign.S (__copysign): Likewise. (signmask): Add .size directive. (othermask): Add .type directive. 2006-11-14 Ulrich Drepper <drepper@redhat.com> * po/nl.po: Update from translation team. * timezone/zdump.c: Redo fix for BZ #3137. 2006-11-14 Jakub Jelinek <jakub@redhat.com> * nss/nss_files/files-alias.c (get_next_alias): Set line back to first_unused after parsing :include: file. * timezone/africa: Update from tzdata2006o. * timezone/antarctica: Likewise. * timezone/asia: Likewise. * timezone/australasia: Likewise. * timezone/backward: Likewise. * timezone/europe: Likewise. * timezone/iso3166.tab: Likewise. * timezone/northamerica: Likewise. * timezone/southamerica: Likewise. * timezone/zone.tab: Likewise. * time/tzfile.c (__tzfile_read): Extend to handle new file format on machines with 64-bit time_t. * timezone/checktab.awk: Update from tzcode2006o. * timezone/ialloc.c: Likewise. * timezone/private.h: Likewise. * timezone/scheck.c: Likewise. * timezone/tzfile.h: Likewise. * timezone/tzselect.ksh: Likewise. * timezone/zdump.c: Likewise. * timezone/zic.c: Likewise. [BZ #3483] * elf/ldconfig.c (main): Call setlocale and textdomain. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. [BZ #3480] * manual/argp.texi: Fix typos. * manual/charset.texi: Likewise. * manual/errno.texi: Likewise. * manual/filesys.texi: Likewise. * manual/lang.texi: Likewise. * manual/maint.texi: Likewise. * manual/memory.texi: Likewise. * manual/message.texi: Likewise. * manual/resource.texi: Likewise. * manual/search.texi: Likewise. * manual/signal.texi: Likewise. * manual/startup.texi: Likewise. * manual/stdio.texi: Likewise. * manual/sysinfo.texi: Likewise. * manual/syslog.texi: Likewise. * manual/time.texi: Likewise. Patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>. [BZ #3465] * sunrpc/clnt_raw.c: Minimal message improvements. * sunrpc/pm_getmaps.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/nis_print_group_entry.c: Likewise. * locale/programs/repertoire.c: Likewise. * locale/programs/charmap.c: Likewise. * malloc/memusage.sh: Likewise. * elf/dl-deps.c: Likewise. * locale/programs/ld-collate.c: Likewise. * libio/vswprintf.c: Likewise. * malloc/memusagestat.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/rpc_main.c: Likewise. * nscd/cache.c: Likewise. * locale/programs/repertoire.c: Unify output messages. * locale/programs/charmap.c: Likewise. * locale/programs/ld-ctype.c: Likewise. * locale/programs/ld-monetary.c: Likewise. * locale/programs/ld-numeric.c: Likewise. * locale/programs/ld-time.c: Likewise. * elf/ldconfig.c: Likewise. * nscd/selinux.c: Likewise. * elf/cache.c: Likewise. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. 2006-11-10 Jakub Jelinek <jakub@redhat.com> * string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization if N is one bigger than return value. * string/tst-strxfrm2.c (do_test): Also test strxfrm with l1 + 1 and l1 last arguments, if buf is defined, verify the return value equals to strlen (buf) and verify no byte beyond passed length is modified. 2006-11-10 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. * sysdeps/gnu/siglist.c (__old_sys_siglist, __old_sys_sigabbrev): Use __new_sys_siglist instead of _sys_siglist_internal as second macro argument. (_old_sys_siglist): Use declare_symbol_alias macro instead of strong_alias. 2006-11-09 Ulrich Drepper <drepper@redhat.com> [BZ #3493] * posix/unistd.h (sysconf): Remove const attribute. * sysdeps/posix/getaddrinfo.c (getaddrinfo): Fix test for temporary or deprecated addresses. Patch by Sridhar Samudrala <sri@us.ibm.com>. * string/Makefile (tests): Add tst-strxfrm2. * string/tst-strxfrm2.c: New file. 2006-10-09 Jakub Jelinek <jakub@redhat.com> * elf/dl-debug.c (_dl_debug_initialize): Check r->r_map for 0 rather than r->r_brk. * string/strxfrm_l.c (STRXFRM): Do the trailing \1 removal optimization even if needed > n. 2006-11-07 Jakub Jelinek <jakub@redhat.com> * include/libc-symbols.h (declare_symbol): Rename to... (declare_symbol_alias): ... this. Add ORIGINAL argument, imply strong_alias (ORIGINAL, SYMBOL) in asm to make sure it preceedes .size directive. * sysdeps/gnu/errlist-compat.awk: Adjust for declare_symbol_alias changes. * sysdeps/gnu/siglist.c: Likewise. 2006-11-03 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/fpu/bits/mathinline.h [__LIBC_INTERNAL_MATH_INLINES]: Moved to ... * sysdeps/powerpc/fpu/math_private.h: ...here. New file. 2006-11-05 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Update handling of cache descriptor 0x49 for new models. * sysdeps/unix/sysv/linux/x86_64/sysconf.c (intel_check_word): Likewise. 2006-11-02 Ulrich Drepper <drepper@redhat.com> * configure.in: Work around ld --help change and avoid -z relro test completely if the architecture doesn't care about security. 2006-11-01 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. 2006-10-31 Ulrich Drepper <drepper@redhat.com> * stdlib/atexit.c (atexit): Don't mark as hidden when used to generate compatibility version. 2006-10-29 Ulrich Drepper <drepper@redhat.com> * configure.in: Relax -z relro requirement a bit. * po/sv.po: Update from translation team. 2006-10-29 Jakub Jelinek <jakub@redhat.com> * elf/dl-sym.c (do_sym): Use RTLD_SINGLE_THREAD_P. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Likewise. * elf/dl-close.c (_dl_close_worker): Likewise. * elf/dl-open.c (_dl_open_worker): Likewise. * sysdeps/generic/sysdep-cancel.h (RTLD_SINGLE_THREAD_P): Define. * configure.in: Require assembler support for visibility, compiler support for visibility and aliases, linker support for various -z options. * Makeconfig: Remove conditional code which now is unnecessary. * config.h.in: Likewise. * config.make.in: Likewise. * dlfcn/Makefile: Likewise. * elf/Makefile: Likewise. * elf/dl-load.c: Likewise. * elf/rtld.c: Likewise. * include/libc-symbols.h: Likewise. * include/stdio.h: Likewise. * io/Makefile: Likewise. * io/fstat.c: Likewise. * io/fstat64.c: Likewise. * io/fstatat.c: Likewise. * io/fstatat64.c: Likewise. * io/lstat.c: Likewise. * io/lstat64.c: Likewise. * io/mknod.c: Likewise. * io/mknodat.c: Likewise. * io/stat.c: Likewise. * io/stat64.c: Likewise. * libio/stdio.c: Likewise. * nscd/Makefile: Likewise. * stdlib/Makefile: Likewise. * stdlib/atexit.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/i386/sysdep.h: Likewise. * sysdeps/i386/i686/memcmp.S: Likewise. * sysdeps/powerpc/powerpc32/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise. * Makerules: USE_TLS support is now default. * tls.make.c: Likewise. * csu/Versions: Likewise. * csu/libc-start.c: Likewise. * csu/libc-tls.c: Likewise. * csu/version.c: Likewise. * dlfcn/dlinfo.c: Likewise. * elf/dl-addr.c: Likewise. * elf/dl-cache.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-object.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-sysdep.c: Likewise. * elf/dl-tls.c: Likewise. * elf/ldconfig.c: Likewise. * elf/rtld.c: Likewise. * elf/tst-tls-dlinfo.c: Likewise. * elf/tst-tls1.c: Likewise. * elf/tst-tls10.h: Likewise. * elf/tst-tls14.c: Likewise. * elf/tst-tls2.c: Likewise. * elf/tst-tls3.c: Likewise. * elf/tst-tls4.c: Likewise. * elf/tst-tls5.c: Likewise. * elf/tst-tls6.c: Likewise. * elf/tst-tls7.c: Likewise. * elf/tst-tls8.c: Likewise. * elf/tst-tls9.c: Likewise. * elf/tst-tlsmod1.c: Likewise. * elf/tst-tlsmod13.c: Likewise. * elf/tst-tlsmod13a.c: Likewise. * elf/tst-tlsmod14a.c: Likewise. * elf/tst-tlsmod2.c: Likewise. * elf/tst-tlsmod3.c: Likewise. * elf/tst-tlsmod4.c: Likewise. * elf/tst-tlsmod5.c: Likewise. * elf/tst-tlsmod6.c: Likewise. * include/errno.h: Likewise. * include/link.h: Likewise. * include/tls.h: Likewise. * locale/global-locale.c: Likewise. * locale/localeinfo.h: Likewise. * malloc/arena.c: Likewise. * malloc/hooks.c: Likewise. * malloc/malloc.c: Likewise. * resolv/Versions: Likewise. * sysdeps/alpha/dl-machine.h: Likewise. * sysdeps/alpha/libc-tls.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/tls.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/ia64/dl-machine.h: Likewise. * sysdeps/ia64/libc-tls.c: Likewise. * sysdeps/mach/hurd/fork.c: Likewise. * sysdeps/mach/hurd/i386/tls.h: Likewise. * sysdeps/powerpc/powerpc32/dl-machine.c: Likwise. * sysdeps/powerpc/powerpc32/dl-machine.h: Likewise. * sysdeps/powerpc/powerpc64/dl-machine.h: Likewise. * sysdeps/s390/libc-tls.c: Likewise. * sysdeps/s390/s390-32/dl-machine.h: Likewise. * sysdeps/s390/s390-64/dl-machine.h: Likewise. * sysdeps/sh/dl-machine.h: Likewise. * sysdeps/sparc/sparc32/dl-machine.h: Likewise. * sysdeps/sparc/sparc64/dl-machine.h: Likewise. * sysdeps/x86_64/dl-machine.h: Likewise. [BZ #3426] * stdlib/stdlib.h: Adjust comment for canonicalize_file_name to reality. 2006-10-27 Jakub Jelinek <jakub@redhat.com> * elf/dl-lookup.c (_dl_debug_bindings): Remove unused symbol_scope argument. (_dl_lookup_symbol_x): Adjust caller. * sysdeps/generic/ldsodefs.h (struct link_namespaces): Remove _ns_global_scope. * elf/rtld.c (dl_main): Don't initialize _ns_global_scope. * elf/dl-libc.c: Revert l_scope name changes. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * elf/dl-close.c (_dl_close): Likewise. * elf/dl-open.c (dl_open_worker): Likewise. If not SINGLE_THREAD_P, always use __rtld_mrlock_{change,done}. Always free old scope list here if not l_scope_mem. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Revert l_scope name change. Never free scope list here. Just __rtld_mrlock_lock before the lookup and __rtld_mrlock_unlock it after the lookup. * elf/dl-sym.c: Likewise. * include/link.h (struct r_scoperec): Remove. (struct link_map): Replace l_scoperec with l_scope, l_scoperec_mem with l_scope_mem and l_scoperec_lock with l_scope_lock. 2006-10-25 Ulrich Drepper <drepper@redhat.com> * sysdeps/gnu/netinet/tcp.h: Define TCP_CONGESTION. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * configure.in: Disable building profile libraries by default. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * elf/dl-lookup.c (_dl_lookup_symbol_x): Add warning to _dl_lookup_symbol_x code. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * elf/dl-runtime.c: Include sysdep-cancel.h. (_dl_fixup, _dl_profile_fixup): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-sym.c: Include sysdep-cancel.h. (do_sym): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-close.c: Include sysdep-cancel.h. (_dl_close): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-open.c: Include sysdep-cancel.h. (dl_open_worker): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. 2006-10-17 Jakub Jelinek <jakub@redhat.com> [BZ #3313] * malloc/malloc.c (malloc_consolidate): Set maxfb to address of last fastbin rather than end of fastbin array. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/i486/bits/atomic.h (catomic_decrement): Use correct body macro. * sysdeps/x86_64/bits/atomic.h (__arch_c_compare_and_exchange_val_64_acq): Add missing casts. (catomic_decrement): Use correct body macro. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * include/atomic.h: Add a unique prefix to all local variables in macros. * csu/tst-atomic.c (do_test): Test also catomic_* macros. 2006-10-14 Ulrich Drepper <drepper@redhat.com> * resolv/arpa/nameser.h: Document that ns_t_a6 is deprecated. [BZ #3313] * malloc/malloc.c (malloc_consolidate): Don't use get_fast_max to determine highest fast bin to consolidate, always look into all of them. (do_check_malloc_state): Only require for empty bins for large sizes in main arena. * libio/stdio.h: Add more __wur attributes. 2006-11-12 Andreas Jaeger <aj@suse.de> [BZ #2510] * manual/search.texi (Hash Search Function): Clarify. (Array Search Function): Clarify. 2006-11-12 Joseph Myers <joseph@codesourcery.com> [BZ #2830] * math/atest-exp.c (main): Cast hex value to mp_limb_t before shifting. * math/atest-exp2.c (read_mpn_hex): Likewise. * math/atest-sincos.c (main): Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Add epoll_pwait. * sysdeps/unix/sysv/linux/sys/epoll.h: Declare epoll_pwait. * sysdeps/unix/sysv/linux/Versions (libc): Add epoll_pwait for version GLIBC_2.6. * Versions.def: Add GLIBC_2.6 for libc. * sysdeps/i386/i486/bits/atomic.h: Add catomic_* support. 2006-10-11 Jakub Jelinek <jakub@redhat.com> * malloc/malloc.c (_int_malloc): Remove unused any_larger variable. * nis/nis_defaults.c (__nis_default_access): Don't call getenv twice. * nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv. * sysdeps/generic/unsecvars.h: Add NIS_PATH. 2006-10-11 Ulrich Drepper <drepper@redhat.com> * include/atomic.c: Define catomic_* operations. * sysdeps/x86_64/bits/atomic.h: Likewise. Fix a few minor problems. * stdlib/cxa_finalize.c: Use catomic_* operations instead of atomic_*. * malloc/memusage.c: Likewise. * gmon/mcount.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-profile.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-runtime.c: Likewise. * elf/dl-fptr.c: Likewise. * resolv/res_libc.c: Likewise. 2006-10-10 Roland McGrath <roland@frob.com> * sysdeps/mach/hurd/utimes.c: Use a union to avoid an improper cast. * sysdeps/mach/hurd/futimes.c: Likewise. * sysdeps/mach/hurd/lutimes.c: Likewise. 2006-10-09 Ulrich Drepper <drepper@redhat.com> Jakub Jelinek <jakub@redhat.com> Implement reference counting of scope records. * elf/dl-close.c (_dl_close): Remove all scopes from removed objects from the list in objects which remain. Always allocate new scope record. * elf/dl-open.c (dl_open_worker): When growing array for scopes, don't resize, allocate a new one. * elf/dl-runtime.c: Update reference counters before using a scope array. * elf/dl-sym.c: Likewise. * elf/dl-libc.c: Adjust for l_scope name change. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * include/link.h: Include <rtld-lowlevel.h>. Define struct r_scoperec. Replace r_scope with pointer to r_scoperec structure. Add l_scoperec_lock. * sysdeps/generic/ldsodefs.h: Include <rtld-lowlevel.h>. * sysdeps/generic/rtld-lowlevel.h: New file. * include/atomic.h: Rename atomic_and to atomic_and_val and atomic_or to atomic_or_val. Define new macros atomic_and and atomic_or which do not return values. * sysdeps/x86_64/bits/atomic.h: Define atomic_and and atomic_or. Various cleanups. * sysdeps/i386/i486/bits/atomic.h: Likewise. * po/sv.po: Update from translation team. 2006-10-07 Ulrich Drepper <drepper@redhat.com> * Versions.def: Add GLIBC_2.6 to libpthread. * include/shlib-compat.h (SHLIB_COMPAT): Expand parameters before use. (versioned_symbol): Likewise. (compat_symbol): Likewise. * po/tr.po: Update from translation team. * nis/Banner: Removed. It's been integral part forever and the author info is incomplete anyway. * libio/Banner: Likewise. 2006-10-06 Ulrich Drepper <drepper@redhat.com> * version.h (VERSION): Bump to 2.5.90 for new development tree. |
||
Jakub Jelinek
|
32c075e1f0 | . | ||
|
Ulrich Drepper
|
88cc61e84e |
* version.h (RELEASE): Bump to 2.5.
* README: Regenerated. |
||
|
Ulrich Drepper
|
a334319f65 | (CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4. | ||
|
Jakub Jelinek
|
0ecb606cb6 | 2.5-18.1 |