diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-06-04 15:48:26 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-06-04 15:48:26 +0000 |
commit | 8548b3be8c48bf62bd4e20fb0ee958338b01bc6c (patch) | |
tree | 874deff152fded2f5b50110ee6d488d42605bb01 /libc/elf/dl-hwcaps.c | |
parent | eab7f6089510455a9b26643c64da331749a15650 (diff) | |
download | eglibc2-8548b3be8c48bf62bd4e20fb0ee958338b01bc6c.tar.gz |
Merge changes between r23097 and r23217 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@23218 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/elf/dl-hwcaps.c')
-rw-r--r-- | libc/elf/dl-hwcaps.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/elf/dl-hwcaps.c b/libc/elf/dl-hwcaps.c index 1b7fe52a6..94cbf6cc2 100644 --- a/libc/elf/dl-hwcaps.c +++ b/libc/elf/dl-hwcaps.c @@ -68,9 +68,9 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz, + GLRO(dl_sysinfo_map)->l_addr); /* The standard ELF note layout is exactly as the anonymous struct. The next element is a variable length vendor name of length - VENDORLEN (with a real length rounded to ElfW(Addr)), followed + VENDORLEN (with a real length rounded to ElfW(Word)), followed by the data of length DATALEN (with a real length rounded to - ElfW(Addr)). */ + ElfW(Word)). */ const struct { ElfW(Word) vendorlen; |