diff options
| author | Roland McGrath <roland@gnu.org> | 2005-09-08 22:36:54 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-09-08 22:36:54 +0000 |
| commit | 648068ce8f7d2f05b3ad93e1827083f8369aa4bd (patch) | |
| tree | d965d39e4f82b4453cb2b8cf45260a76f48434c4 | |
| parent | a3615024b9b204a124429a73d82827b189faaada (diff) | |
| download | glibc-648068ce8f7d2f05b3ad93e1827083f8369aa4bd.tar.gz glibc-648068ce8f7d2f05b3ad93e1827083f8369aa4bd.tar.xz glibc-648068ce8f7d2f05b3ad93e1827083f8369aa4bd.zip | |
2005-09-08 Roland McGrath <roland@redhat.com>
* sysdeps/generic/dl-sysdep.c (_dl_important_hwcaps): Decode DSOCAPS properly, first byte is bit number in mask. Skip disabled caps.
| -rw-r--r-- | sysdeps/generic/dl-sysdep.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c index 6ac0d95ea6..985e2b8f77 100644 --- a/sysdeps/generic/dl-sysdep.c +++ b/sysdeps/generic/dl-sysdep.c @@ -393,7 +393,7 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz, cnt += *p++; ++p; /* Skip mask word. */ dsocaps = (const char *) p; - dsocapslen = note->datalen - sizeof *p; + dsocapslen = note->datalen - sizeof *p * 2; break; } note = ((const void *) (note + 1) @@ -431,14 +431,23 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz, #if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO if (dsocaps != NULL) { - GLRO(dl_hwcap) |= ((uint64_t) ((const ElfW(Word) *) dsocaps)[-1] - << _DL_FIRST_EXTRA); - for (const char *p = dsocaps; - p < dsocaps + dsocapslen; - p += temp[m++].len + 1) + const ElfW(Word) mask = ((const ElfW(Word) *) dsocaps)[-1]; + GLRO(dl_hwcap) |= (uint64_t) mask << _DL_FIRST_EXTRA; + size_t len; + for (const char *p = dsocaps; p < dsocaps + dsocapslen; p += len + 1) { - temp[m].str = p; - temp[m].len = strlen (p); + uint_fast8_t bit = *p++; + len = strlen (p); + + /* Skip entries that are not enabled in the mask word. */ + if (__builtin_expect (mask & ((ElfW(Word)) 1 << bit), 1)) + { + temp[m].str = p; + temp[m].len = len; + ++m; + } + else + --cnt; } } #endif |