diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:03:01 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:03:01 +0000 |
commit | 14970231a38310b9561052a67b617138eeaad300 (patch) | |
tree | 35c201a651afa5d5e4fff241280081b3f88b9c2c /sysdeps/unix/sysv/linux/i386/dl-procinfo.h | |
parent | f08c7420b5e8b017a1a47b880a62b15bdc588f4d (diff) | |
parent | 25ead03a3712d57df2208fe82f3d316eb8faeaf6 (diff) |
Merge commit 'refs/top-bases/t/extern_inline' into t/extern_inline
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386/dl-procinfo.h')
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/dl-procinfo.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h index ed87322e57..b454367b72 100644 --- a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h @@ -1,5 +1,5 @@ /* Linux/i386 version of processor capability information handling macros. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -17,9 +17,9 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <sysdeps/i386/dl-procinfo.h> -#include <ldsodefs.h> - +#ifndef _DL_I386_PROCINFO_H +#define _DL_I386_PROCINFO_H 1 +#include <sysdeps/x86/dl-procinfo.h> #undef _dl_procinfo static inline int @@ -36,7 +36,7 @@ _dl_procinfo (unsigned int type, unsigned long int word) _dl_printf ("AT_HWCAP: "); - for (i = 0; i < _DL_HWCAP_COUNT; ++i) + for (i = 0; i < 32; ++i) if (word & (1 << i)) _dl_printf (" %s", GLRO(dl_x86_cap_flags)[i]); @@ -44,3 +44,4 @@ _dl_procinfo (unsigned int type, unsigned long int word) return 0; } +#endif |