Skip to content

Commit

Permalink
* elf/dl-sysdep.c (_dl_show_auxv): Add support for AT_BASE_PLATFORM.
Browse files Browse the repository at this point in the history
	* elf/dl-sysdep.c (auxvars): Compress data structure.
  • Loading branch information
Ulrich Drepper committed Mar 14, 2009
1 parent f81ce28 commit f53713a
Show file tree
Hide file tree
Showing 6 changed files with 249 additions and 29 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
2009-03-11 Carlos Eduardo Seo <cseo@linux.vnet.ibm.com>

* elf/dl-sysdep.c (_dl_show_auxv): Add support for AT_BASE_PLATFORM.

2009-03-14 Ulrich Drepper <drepper@redhat.com>

* elf/dl-sysdep.c (auxvars): Compress data structure.

* sysdeps/i386/dl-machine.h (elf_machine_rel): Implement
STT_GNU_IFUNC handling.
(elf_machine_rela): Likewise.
Expand Down
59 changes: 30 additions & 29 deletions elf/dl-sysdep.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,36 +269,37 @@ _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_EXECFN - 2] = { "AT_EXECFN: ", str },
[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_RANDOM - 2] = { "AT_RANDOM: 0x", hex },
[AT_EXECFD - 2] = { "EXECFD: ", dec },
[AT_EXECFN - 2] = { "EXECFN: ", str },
[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 },
[AT_RANDOM - 2] = { "RANDOM: 0x", hex },
};
unsigned int idx = (unsigned int) (av->a_type - 2);

Expand Down Expand Up @@ -327,7 +328,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;
}
Expand Down
1 change: 1 addition & 0 deletions locale/iso-639.def
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,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)
Expand Down
6 changes: 6 additions & 0 deletions localedata/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2009-03-14 Ulrich Drepper <drepper@redhat.com>

* SUPPORTED (SUPPORTED-LOCALES): Add nan_TW@latin.
* locales/nan_TW@latin: New file.
Contributed by Arne Goetje.

2009-02-11 Ulrich Drepper <drepper@redhat.com>

* locales/iso14651_t1_common: Add rules for sorting Malayalam.
Expand Down
1 change: 1 addition & 0 deletions localedata/SUPPORTED
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,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 \
Expand Down
205 changes: 205 additions & 0 deletions localedata/locales/nan_TW@latin
Original file line number Diff line number Diff line change
@@ -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 <oo> from "<U006F><U0358>"
collating-element <OO> from "<U004F><U0358>"
collating-element <nn> from "<U207F>"

collating-symbol <CAP-MIN>
collating-symbol <MIN-CAP>

reorder-after <MIN>
<MIN-CAP>
reorder-after <CAP>
<CAP-MIN>

reorder-after <U006E>
<oo>
reorder-after <U004E>
<OO>
reorder-after <U007A>
<nn>
reorder-after <U005A>
<nn>

reorder-end

END LC_COLLATE

LC_MONETARY
copy "zh_TW"
END LC_MONETARY

LC_NUMERIC
copy "zh_TW"
END LC_NUMERIC

LC_TIME
abday "<U006C><U0070>";/
"<U0070><U0031>";/
"<U0070><U0032>";/
"<U0070><U0033>";/
"<U0070><U0034>";/
"<U0070><U0035>";/
"<U0070><U0036>"
day "<U006C><U00E9><U002D><U0070><U00E0><U0069><U002D><U006A><U0069><U030D><U0074>";/
"<U0070><U00E0><U0069><U002D><U0069><U0074>";/
"<U0070><U00E0><U0069><U002D><U006A><U012B>";/
"<U0070><U00E0><U0069><U002D><U0073><U0061><U207F>";/
"<U0070><U00E0><U0069><U002D><U0073><U00EC>";/
"<U0070><U00E0><U0069><U002D><U0067><U014D><U0358>";/
"<U0070><U00E0><U0069><U002D><U006C><U0061><U030D><U006B>"
abmon "<U0031><U0067>";/
"<U0032><U0067>";/
"<U0033><U0067>";/
"<U0034><U0067>";/
"<U0035><U0067>";/
"<U0036><U0067>";/
"<U0037><U0067>";/
"<U0038><U0067>";/
"<U0039><U0067>";/
"<U0031><U0030><U0067>";/
"<U0031><U0031><U0067>";/
"<U0031><U0032><U0067>"
mon "<U0031><U0067><U006F><U0065><U030D><U0068>";/
"<U0032><U0067><U006F><U0065><U030D><U0068>";/
"<U0033><U0067><U006F><U0065><U030D><U0068>";/
"<U0034><U0067><U006F><U0065><U030D><U0068>";/
"<U0035><U0067><U006F><U0065><U030D><U0068>";/
"<U0036><U0067><U006F><U0065><U030D><U0068>";/
"<U0037><U0067><U006F><U0065><U030D><U0068>";/
"<U0038><U0067><U006F><U0065><U030D><U0068>";/
"<U0039><U0067><U006F><U0065><U030D><U0068>";/
"<U0031><U0030><U0067><U006F><U0065><U030D><U0068>";/
"<U0031><U0031><U0067><U006F><U0065><U030D><U0068>";/
"<U0031><U0032><U0067><U006F><U0065><U030D><U0068>"
%
d_t_fmt "<U0025><U0059><U0020><U0025><U0062><U0020><U0025><U0064><U0020><U0028><U0025><U0061><U0029><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A>"
d_fmt "<U0025><U0046>"
t_fmt "<U0025><U0072>"
am_pm "<U0074><U00E9><U006E><U0067><U002D><U0070><U006F><U0358>";"<U0113><U002D><U0070><U006F><U0358>"
t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070>"
timezone "<U0054><U0053><U0054><U002D><U0038>"
date_fmt "<U0025><U0059><U0020><U0025><U0062><U0020><U0025><U0064><U0020><U0028><U0025><U0061><U0029><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A>"
END LC_TIME

LC_MESSAGES

% "^[sS].*" for "Yes"
yesexpr "<U005E><U005B><U0073><U0053><U005D><U002E><U002A>"

% "^[mM].*" for "No"
noexpr "<U005E><U005B><U006D><U004D><U005D><U002E><U002A>"

% "Sī" for "Yes"
yesstr "<U0053><U012B>"

% "M̄-sī" for "No"
nostr "<U004D><U0304><U002D><U0053><U012B>"

END LC_MESSAGES

LC_PAPER
height 297
width 210
END LC_PAPER

LC_MEASUREMENT
measurement 1
END LC_MEASUREMENT

LC_NAME
%FIXME
name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
<U0025><U006D><U0025><U0074><U0025><U0066>"
name_miss "<U006B><U006F><U0358><U002D><U006E><U0069><U00FB>"
name_mr "<U0073><U0069><U0061><U006E><U002D><U0073><U0069><U207F>"
name_mrs "<U006C><U00FA><U002D><U0073><U016B>"
name_ms "<U0073><U0069><U00F3><U002D><U0063><U0068><U0069><U00E1>"
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 "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0072>/
<U0020><U0025><U0065><U0020><U0025><U0068><U0020><U0025><U0073><U0025>/
<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
<U004E><U0025><U0063><U0025><U004E>"
% 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 "<U0054><U00E2><U0069><U002D><U006F><U00E2><U006E>"
%country_post "FIXME"
country_ab2 "<U0054><U0057>"
country_ab3 "<U0054><U0057><U004E>"
country_num 158
%country_car "FIXME"
country_isbn "<U0039><U0035><U0037>"
%lang_name "Bân-lâm-gú, Hō-ló-oē"
lang_name "<U0042><U00E2><U006E><U002D><U006C><U00E2><U006D><U002D><U0067><U00FA><U002C><U0020><U0048><U014D><U002D><U006C><U00F3><U002D><U006F><U0113>"
lang_term "<U006E><U0061><U006E>"
lang_lib "<U006E><U0061><U006E>"
END LC_ADDRESS

LC_TELEPHONE
copy "zh_TW"
END LC_TELEPHONE

0 comments on commit f53713a

Please sign in to comment.