From 11e1f64a3ed25433ff1e61ce361f4d26b262b9c3 Mon Sep 17 00:00:00 2001 From: "Ryan S. Arnold" Date: Fri, 24 Jul 2009 12:42:07 -0500 Subject: Add new AT_BASE_PLATFORM bits to AUXV. commit f53713a8e729c441aef2b4ccc7562306fc306fbe Author: Ulrich Drepper Date: Sat Mar 14 18:33:58 2009 +0000 * elf/dl-sysdep.c (_dl_show_auxv): Add support for AT_BASE_PLATFORM. * elf/dl-sysdep.c (auxvars): Compress data structure. --- elf/dl-sysdep.c | 55 +++++------ locale/iso-639.def | 1 + localedata/SUPPORTED | 1 + localedata/locales/nan_TW@latin | 205 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 235 insertions(+), 27 deletions(-) create mode 100644 localedata/locales/nan_TW@latin diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c index dd55905e14..ae720a7b83 100644 --- a/elf/dl-sysdep.c +++ b/elf/dl-sysdep.c @@ -265,34 +265,35 @@ _dl_show_auxv (void) { static const struct { - const char label[20]; - enum { unknown = 0, dec, hex, str, ignore } form; + const char label[17]; + enum { unknown = 0, dec, hex, str, ignore } form : 8; } auxvars[] = { - [AT_EXECFD - 2] = { "AT_EXECFD: ", dec }, - [AT_PHDR - 2] = { "AT_PHDR: 0x", hex }, - [AT_PHENT - 2] = { "AT_PHENT: ", dec }, - [AT_PHNUM - 2] = { "AT_PHNUM: ", dec }, - [AT_PAGESZ - 2] = { "AT_PAGESZ: ", dec }, - [AT_BASE - 2] = { "AT_BASE: 0x", hex }, - [AT_FLAGS - 2] = { "AT_FLAGS: 0x", hex }, - [AT_ENTRY - 2] = { "AT_ENTRY: 0x", hex }, - [AT_NOTELF - 2] = { "AT_NOTELF: ", hex }, - [AT_UID - 2] = { "AT_UID: ", dec }, - [AT_EUID - 2] = { "AT_EUID: ", dec }, - [AT_GID - 2] = { "AT_GID: ", dec }, - [AT_EGID - 2] = { "AT_EGID: ", dec }, - [AT_PLATFORM - 2] = { "AT_PLATFORM: ", str }, - [AT_HWCAP - 2] = { "AT_HWCAP: ", hex }, - [AT_CLKTCK - 2] = { "AT_CLKTCK: ", dec }, - [AT_FPUCW - 2] = { "AT_FPUCW: ", hex }, - [AT_DCACHEBSIZE - 2] = { "AT_DCACHEBSIZE: 0x", hex }, - [AT_ICACHEBSIZE - 2] = { "AT_ICACHEBSIZE: 0x", hex }, - [AT_UCACHEBSIZE - 2] = { "AT_UCACHEBSIZE: 0x", hex }, - [AT_IGNOREPPC - 2] = { "AT_IGNOREPPC", ignore }, - [AT_SECURE - 2] = { "AT_SECURE: ", dec }, - [AT_SYSINFO - 2] = { "AT_SYSINFO: 0x", hex }, - [AT_SYSINFO_EHDR - 2] = { "AT_SYSINFO_EHDR: 0x", hex }, + [AT_EXECFD - 2] = { "EXECFD: ", dec }, + [AT_PHDR - 2] = { "PHDR: 0x", hex }, + [AT_PHENT - 2] = { "PHENT: ", dec }, + [AT_PHNUM - 2] = { "PHNUM: ", dec }, + [AT_PAGESZ - 2] = { "PAGESZ: ", dec }, + [AT_BASE - 2] = { "BASE: 0x", hex }, + [AT_FLAGS - 2] = { "FLAGS: 0x", hex }, + [AT_ENTRY - 2] = { "ENTRY: 0x", hex }, + [AT_NOTELF - 2] = { "NOTELF: ", hex }, + [AT_UID - 2] = { "UID: ", dec }, + [AT_EUID - 2] = { "EUID: ", dec }, + [AT_GID - 2] = { "GID: ", dec }, + [AT_EGID - 2] = { "EGID: ", dec }, + [AT_PLATFORM - 2] = { "PLATFORM: ", str }, + [AT_HWCAP - 2] = { "HWCAP: ", hex }, + [AT_CLKTCK - 2] = { "CLKTCK: ", dec }, + [AT_FPUCW - 2] = { "FPUCW: ", hex }, + [AT_DCACHEBSIZE - 2] = { "DCACHEBSIZE: 0x", hex }, + [AT_ICACHEBSIZE - 2] = { "ICACHEBSIZE: 0x", hex }, + [AT_UCACHEBSIZE - 2] = { "UCACHEBSIZE: 0x", hex }, + [AT_IGNOREPPC - 2] = { "IGNOREPPC", ignore }, + [AT_SECURE - 2] = { "SECURE: ", dec }, + [AT_BASE_PLATFORM - 2] = { "BASE_PLATFORM:", str }, + [AT_SYSINFO - 2] = { "SYSINFO: 0x", hex }, + [AT_SYSINFO_EHDR - 2] = { "SYSINFO_EHDR: 0x", hex }, }; unsigned int idx = (unsigned int) (av->a_type - 2); @@ -321,7 +322,7 @@ _dl_show_auxv (void) val = _itoa ((unsigned long int) av->a_un.a_val, buf + sizeof buf - 1, 16, 0); - _dl_printf ("%s%s\n", auxvars[idx].label, val); + _dl_printf ("AT_%s%s\n", auxvars[idx].label, val); continue; } diff --git a/locale/iso-639.def b/locale/iso-639.def index 68a4c5ed39..12cbbd01d1 100644 --- a/locale/iso-639.def +++ b/locale/iso-639.def @@ -301,6 +301,7 @@ DEFINE_LANGUAGE_CODE3 ("Mayan languages", myn, myn) DEFINE_LANGUAGE_CODE3 ("Mende", men, men) DEFINE_LANGUAGE_CODE3 ("Mi'kmaq; Micmac", mic, mic) DEFINE_LANGUAGE_CODE3 ("Minangkabau", min, min) +DEFINE_LANGUAGE_CODE3 ("Min Nan", nan, nan) DEFINE_LANGUAGE_CODE3 ("Mirandese", mwl, mwl) DEFINE_LANGUAGE_CODE3 ("Miscellaneous languages", mis, mis) DEFINE_LANGUAGE_CODE3 ("Mohawk", moh, moh) diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED index e97c1a4856..884dd71e09 100644 --- a/localedata/SUPPORTED +++ b/localedata/SUPPORTED @@ -283,6 +283,7 @@ ms_MY.UTF-8/UTF-8 \ ms_MY/ISO-8859-1 \ mt_MT.UTF-8/UTF-8 \ mt_MT/ISO-8859-3 \ +nan_TW@latin/UTF-8 \ nb_NO.UTF-8/UTF-8 \ nb_NO/ISO-8859-1 \ nds_DE/UTF-8 \ diff --git a/localedata/locales/nan_TW@latin b/localedata/locales/nan_TW@latin new file mode 100644 index 0000000000..bf8a6cd903 --- /dev/null +++ b/localedata/locales/nan_TW@latin @@ -0,0 +1,205 @@ +comment_char % +escape_char / +% +% Minnan Language Locale for Taiwan +% Source: +% Contact: Arne Goetje +% Email: arne@ubuntu.com +% Language: nan +% Territory: TW +% Revision: 0.1 +% Date: 2008-06-16 +% Users: general +% Charset: UTF-8 +% Distribution and use is free, also +% for commercial purposes. + +LC_IDENTIFICATION +title "Minnan language locale for Taiwan" +source "" +address "" +contact "Arne Goetje" +email "arne@canonical.com" +tel "" +fax "" +language "Minnan" +territory "Taiwan" +revision "0.1" +date "2008-06-16" + +category "nan_TW@latin:2000";LC_IDENTIFICATION +category "nan_TW@latin:2000";LC_CTYPE +category "nan_TW@latin:2000";LC_COLLATE +category "nan_TW@latin:2000";LC_TIME +category "nan_TW@latin:2000";LC_NUMERIC +category "nan_TW@latin:2000";LC_PAPER +category "nan_TW@latin:2000";LC_TELEPHONE +category "nan_TW@latin:2000";LC_MEASUREMENT +category "nan_TW@latin:2000";LC_ADDRESS +category "nan_TW@latin:2000";LC_MESSAGES +category "nan_TW@latin:2000";LC_MONETARY + +END LC_IDENTIFICATION + +LC_CTYPE +copy "i18n" + +translit_start + +% accents are simply omitted if they cannot be represented. +include "translit_combining";"" + +translit_end + +END LC_CTYPE + +LC_COLLATE +copy "iso14651_t1" + +%% a b c d e f g h i j k l m n o o͘ p q r s t u v w x y z ⁿ + +collating-element from "" +collating-element from "" +collating-element from "" + +collating-symbol +collating-symbol + +reorder-after + +reorder-after + + +reorder-after + +reorder-after + +reorder-after + +reorder-after + + +reorder-end + +END LC_COLLATE + +LC_MONETARY +copy "zh_TW" +END LC_MONETARY + +LC_NUMERIC +copy "zh_TW" +END LC_NUMERIC + +LC_TIME +abday "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +day "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +abmon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +mon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +% +d_t_fmt "" +d_fmt "" +t_fmt "" +am_pm "";"" +t_fmt_ampm "" +timezone "" +date_fmt "" +END LC_TIME + +LC_MESSAGES + +% "^[sS].*" for "Yes" +yesexpr "" + +% "^[mM].*" for "No" +noexpr "" + +% "Sī" for "Yes" +yesstr "" + +% "M̄-sī" for "No" +nostr "" + +END LC_MESSAGES + +LC_PAPER +height 297 +width 210 +END LC_PAPER + +LC_MEASUREMENT +measurement 1 +END LC_MEASUREMENT + +LC_NAME +%FIXME +name_fmt "/ +" +name_miss "" +name_mr "" +name_mrs "" +name_ms "" +END LC_NAME + +LC_ADDRESS +% postal_fmt: "%f%N%a%N%d%N%b%N%r %e %h %s%N%z %T%N%c%N" +postal_fmt "/ +/ +/ +/ +" +% Reference: http://www.un.org/Depts/unsd/methods/m49alpha.htm +% http://www.isbn.spk-berlin.de/html/prefix.htm +% country_ab2: TW +% country_ab3: TWN +% country_isbn: 957 +country_name "" +%country_post "FIXME" +country_ab2 "" +country_ab3 "" +country_num 158 +%country_car "FIXME" +country_isbn "" +%lang_name "Bân-lâm-gú, Hō-ló-oē" +lang_name "" +lang_term "" +lang_lib "" +END LC_ADDRESS + +LC_TELEPHONE +copy "zh_TW" +END LC_TELEPHONE -- cgit 1.4.1