diff options
| author | Roland McGrath <roland@redhat.com> | 2010-01-07 15:42:52 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@redhat.com> | 2010-01-07 15:43:10 -0800 |
| commit | 4472e1de3020a95d4823a9a209b02a250adc7baa (patch) | |
| tree | ac3560b1e9de873091ae0b796d96b2a14c6fb83f | |
| parent | 44dcc00292b965b3b6bff8415175d6a3e290aab7 (diff) | |
| download | glibc-4472e1de3020a95d4823a9a209b02a250adc7baa.tar.gz glibc-4472e1de3020a95d4823a9a209b02a250adc7baa.tar.xz glibc-4472e1de3020a95d4823a9a209b02a250adc7baa.zip | |
Use NT_GNU_HWCAP instead of literal 2.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/dl-sysdep.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 6cbc86d2ca..dbdf9214ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-01-07 Roland McGrath <roland@redhat.com> + + * elf/dl-sysdep.c (_dl_important_hwcaps): Use NT_GNU_HWCAP instead of + literal 2. + 2010-01-06 Ulrich Drepper <drepper@redhat.com> * dirent/dirent.h: Fix typo in feature selection macro use. diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c index 5700272f10..49c5dfb27d 100644 --- a/elf/dl-sysdep.c +++ b/elf/dl-sysdep.c @@ -1,5 +1,6 @@ /* Operating system support for run-time dynamic linker. Generic Unix version. - Copyright (C) 1995-1998, 2000-2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1995-1998,2000-2008,2009,2010 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -390,7 +391,7 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz, while ((ElfW(Addr)) (note + 1) - start < phdr[i].p_memsz) { #define ROUND(len) (((len) + sizeof (ElfW(Word)) - 1) & -sizeof (ElfW(Word))) - if (note->type == 2 + if (note->type == NT_GNU_HWCAP && note->vendorlen == sizeof "GNU" && !memcmp ((note + 1), "GNU", sizeof "GNU") && note->datalen > 2 * sizeof (ElfW(Word)) + 2) |