diff options
Diffstat (limited to 'sysdeps/powerpc/dl-procinfo.c')
| -rw-r--r-- | sysdeps/powerpc/dl-procinfo.c | 61 |
1 files changed, 24 insertions, 37 deletions
diff --git a/sysdeps/powerpc/dl-procinfo.c b/sysdeps/powerpc/dl-procinfo.c index 6e7850eebd..35cac2e249 100644 --- a/sysdeps/powerpc/dl-procinfo.c +++ b/sysdeps/powerpc/dl-procinfo.c @@ -1,5 +1,5 @@ /* Data for processor capability information. PowerPC version. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 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 @@ -16,8 +16,8 @@ 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. +/* This information must be kept in sync with the _DL_HWCAP_COUNT + definition in procinfo.h. If anything should be added here check whether the size of each string is still ok with the given array size. @@ -42,14 +42,31 @@ # define PROCINFO_CLASS #endif +#if !IS_IN (ldconfig) +# if !defined PROCINFO_DECL && defined SHARED + ._dl_powerpc_cpu_features +# else +PROCINFO_CLASS struct cpu_features _dl_powerpc_cpu_features +# endif +# ifndef PROCINFO_DECL += { } +# endif +# if !defined SHARED || defined PROCINFO_DECL +; +# else +, +# endif +#endif + #if !defined PROCINFO_DECL && defined SHARED ._dl_powerpc_cap_flags #else -PROCINFO_CLASS const char _dl_powerpc_cap_flags[60][10] +PROCINFO_CLASS const char _dl_powerpc_cap_flags[64][15] #endif #ifndef PROCINFO_DECL = { - "ppcle", "true_le", "archpmu", "vsx", + "ppcle", "true_le", "", "", + "", "", "archpmu", "vsx", "arch_2_06", "power6x", "dfp", "pa6t", "arch_2_05", "ic_snoop", "smt", "booke", "cellbe", "power5+", "power5", "power4", @@ -60,8 +77,8 @@ PROCINFO_CLASS const char _dl_powerpc_cap_flags[60][10] "", "", "", "", "", "", "", "", "", "", "", "", - "", "", "", "", - "", "", "ieee128", "arch_3_00", + "", "", "", "htm-no-suspend", + "scv", "darn", "ieee128", "arch_3_00", "htm-nosc", "vcrypto", "tar", "isel", "ebb", "dscr", "htm", "arch_2_07", } @@ -72,35 +89,5 @@ PROCINFO_CLASS const char _dl_powerpc_cap_flags[60][10] , #endif -#if !defined PROCINFO_DECL && defined SHARED - ._dl_powerpc_platforms -#else -PROCINFO_CLASS const char _dl_powerpc_platforms[15][12] -#endif -#ifndef PROCINFO_DECL -= { - [PPC_PLATFORM_POWER4] = "power4", - [PPC_PLATFORM_PPC970] = "ppc970", - [PPC_PLATFORM_POWER5] = "power5", - [PPC_PLATFORM_POWER5_PLUS] = "power5+", - [PPC_PLATFORM_POWER6] = "power6", - [PPC_PLATFORM_CELL_BE] = "ppc-cell-be", - [PPC_PLATFORM_POWER6X] = "power6x", - [PPC_PLATFORM_POWER7] = "power7", - [PPC_PLATFORM_PPCA2] = "ppca2", - [PPC_PLATFORM_PPC405] = "ppc405", - [PPC_PLATFORM_PPC440] = "ppc440", - [PPC_PLATFORM_PPC464] = "ppc464", - [PPC_PLATFORM_PPC476] = "ppc476", - [PPC_PLATFORM_POWER8] = "power8", - [PPC_PLATFORM_POWER9] = "power9" - } -#endif -#if !defined SHARED || defined PROCINFO_DECL -; -#else -, -#endif - #undef PROCINFO_DECL #undef PROCINFO_CLASS |