diff options
Diffstat (limited to 'sysdeps/i386/dl-procinfo.c')
-rw-r--r-- | sysdeps/i386/dl-procinfo.c | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/sysdeps/i386/dl-procinfo.c b/sysdeps/i386/dl-procinfo.c index ffa6b9da0a..cd779e3078 100644 --- a/sysdeps/i386/dl-procinfo.c +++ b/sysdeps/i386/dl-procinfo.c @@ -1,5 +1,5 @@ /* Data for i386 version of processor capability information. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. @@ -17,10 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* This information must be kept in sync with the _DL_HWCAP_COUNT and - _DL_PLATFORM_COUNT definitions in procinfo.h. - - If anything should be added here check whether the size of each string +/* If anything should be added here check whether the size of each string is still ok with the given array size. All the #ifdefs in the definitions are quite irritating but @@ -43,21 +40,7 @@ # define PROCINFO_CLASS #endif -#if !IS_IN (ldconfig) -# if !defined PROCINFO_DECL && defined SHARED - ._dl_x86_cpu_features -# else -PROCINFO_CLASS struct cpu_features _dl_x86_cpu_features -# endif -# ifndef PROCINFO_DECL -= { } -# endif -# if !defined SHARED || defined PROCINFO_DECL -; -# else -, -# endif -#endif +#include <sysdeps/x86/dl-procinfo.c> #if !defined PROCINFO_DECL && defined SHARED ._dl_x86_cap_flags @@ -78,21 +61,5 @@ PROCINFO_CLASS const char _dl_x86_cap_flags[32][8] , #endif -#if !defined PROCINFO_DECL && defined SHARED - ._dl_x86_platforms -#else -PROCINFO_CLASS const char _dl_x86_platforms[4][5] -#endif -#ifndef PROCINFO_DECL -= { - "i386", "i486", "i586", "i686" - } -#endif -#if !defined SHARED || defined PROCINFO_DECL -; -#else -, -#endif - #undef PROCINFO_DECL #undef PROCINFO_CLASS |