mirror of git://sourceware.org/git/glibc.git
elf: Remove platform strings in dl-procinfo.c
Remove the platform strings in dl-procinfo.c where also the implementation of _dl_string_platform() was removed. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
Stefan Liebler
parent
8faada8302
commit
374c8b4483
|
|
@ -1,62 +0,0 @@
|
||||||
/* Data for Alpha version of processor capability information.
|
|
||||||
Copyright (C) 2008-2024 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
|
|
||||||
modify it under the terms of the GNU Lesser General Public
|
|
||||||
License as published by the Free Software Foundation; either
|
|
||||||
version 2.1 of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
The GNU C Library is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
Lesser General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Lesser General Public
|
|
||||||
License along with the GNU C Library. If not, see
|
|
||||||
<https://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
/* This information must be kept in sync with the _DL_PLATFORM_COUNT
|
|
||||||
definitions in procinfo.h.
|
|
||||||
|
|
||||||
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
|
|
||||||
necessary if we want to avoid duplicating the information. There
|
|
||||||
are three different modes:
|
|
||||||
|
|
||||||
- PROCINFO_DECL is defined. This means we are only interested in
|
|
||||||
declarations.
|
|
||||||
|
|
||||||
- PROCINFO_DECL is not defined:
|
|
||||||
|
|
||||||
+ if SHARED is defined the file is included in an array
|
|
||||||
initializer. The .element = { ... } syntax is needed.
|
|
||||||
|
|
||||||
+ if SHARED is not defined a normal array initialization is
|
|
||||||
needed.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef PROCINFO_CLASS
|
|
||||||
#define PROCINFO_CLASS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !defined PROCINFO_DECL && defined SHARED
|
|
||||||
._dl_alpha_platforms
|
|
||||||
#else
|
|
||||||
PROCINFO_CLASS const char _dl_alpha_platforms[5][5]
|
|
||||||
#endif
|
|
||||||
#ifndef PROCINFO_DECL
|
|
||||||
= {
|
|
||||||
"ev4", "ev5", "ev56", "ev6", "ev67"
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#if !defined SHARED || defined PROCINFO_DECL
|
|
||||||
;
|
|
||||||
#else
|
|
||||||
,
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#undef PROCINFO_DECL
|
|
||||||
#undef PROCINFO_CLASS
|
|
||||||
|
|
@ -1,62 +0,0 @@
|
||||||
/* Data for C-SKY version of processor capability information.
|
|
||||||
Copyright (C) 2018-2024 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
|
|
||||||
modify it under the terms of the GNU Lesser General Public
|
|
||||||
License as published by the Free Software Foundation; either
|
|
||||||
version 2.1 of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
The GNU C Library is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
Lesser General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Lesser General Public
|
|
||||||
License along with the GNU C Library. If not, see
|
|
||||||
<https://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
/* This information must be kept in sync with the _DL_PLATFORM_COUNT
|
|
||||||
definitions in procinfo.h.
|
|
||||||
|
|
||||||
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
|
|
||||||
necessary if we want to avoid duplicating the information. There
|
|
||||||
are three different modes:
|
|
||||||
|
|
||||||
- PROCINFO_DECL is defined. This means we are only interested in
|
|
||||||
declarations.
|
|
||||||
|
|
||||||
- PROCINFO_DECL is not defined:
|
|
||||||
|
|
||||||
+ if SHARED is defined the file is included in an array
|
|
||||||
initializer. The .element = { ... } syntax is needed.
|
|
||||||
|
|
||||||
+ if SHARED is not defined a normal array initialization is
|
|
||||||
needed.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef PROCINFO_CLASS
|
|
||||||
# define PROCINFO_CLASS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !defined PROCINFO_DECL && defined SHARED
|
|
||||||
._dl_csky_platforms
|
|
||||||
#else
|
|
||||||
PROCINFO_CLASS const char _dl_csky_platforms[4][6]
|
|
||||||
#endif
|
|
||||||
#ifndef PROCINFO_DECL
|
|
||||||
= {
|
|
||||||
"ck610", "ck807", "ck810", "ck860"
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#if !defined SHARED || defined PROCINFO_DECL
|
|
||||||
;
|
|
||||||
#else
|
|
||||||
,
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#undef PROCINFO_DECL
|
|
||||||
#undef PROCINFO_CLASS
|
|
||||||
|
|
@ -16,47 +16,12 @@
|
||||||
License along with the GNU C Library. If not, see
|
License along with the GNU C Library. If not, see
|
||||||
<https://www.gnu.org/licenses/>. */
|
<https://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
/* This information must be kept in sync with the _DL_PLATFORM_COUNT
|
/* Note:
|
||||||
definitions in procinfo.h.
|
When compiling elf/ldconfig.c, PROCINFO_CLASS is defined to static.
|
||||||
|
This dl-procinfo.c is included in sysdeps/generic/ldsodefs.h.
|
||||||
If anything should be added here check whether the size of each string
|
Afterwards, if not yet defined, PROCINFO_CLASS is defined to EXTERN
|
||||||
is still ok with the given array size.
|
just before dl-vdso-setup.c is included. A "static" _dl_vdso_xyz
|
||||||
|
function prototype would lead to gcc warnings/errors: defined but
|
||||||
All the #ifdefs in the definitions are quite irritating but
|
not used. */
|
||||||
necessary if we want to avoid duplicating the information. There
|
|
||||||
are three different modes:
|
|
||||||
|
|
||||||
- PROCINFO_DECL is defined. This means we are only interested in
|
|
||||||
declarations.
|
|
||||||
|
|
||||||
- PROCINFO_DECL is not defined:
|
|
||||||
|
|
||||||
+ if SHARED is defined the file is included in an array
|
|
||||||
initializer. The .element = { ... } syntax is needed.
|
|
||||||
|
|
||||||
+ if SHARED is not defined a normal array initialization is
|
|
||||||
needed.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef PROCINFO_CLASS
|
|
||||||
#define PROCINFO_CLASS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !defined PROCINFO_DECL && defined SHARED
|
|
||||||
._dl_mips_platforms
|
|
||||||
#else
|
|
||||||
PROCINFO_CLASS const char _dl_mips_platforms[4][11]
|
|
||||||
#endif
|
|
||||||
#ifndef PROCINFO_DECL
|
|
||||||
= {
|
|
||||||
"loongson2e", "loongson2f", "octeon", "octeon2"
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#if !defined SHARED || defined PROCINFO_DECL
|
|
||||||
;
|
|
||||||
#else
|
|
||||||
,
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#undef PROCINFO_DECL
|
#undef PROCINFO_DECL
|
||||||
#undef PROCINFO_CLASS
|
#undef PROCINFO_CLASS
|
||||||
|
|
|
||||||
|
|
@ -24,9 +24,3 @@ const char _dl_s390_cap_flags[_DL_HWCAP_COUNT][9] =
|
||||||
"highgprs", "te", "vx", "vxd", "vxe", "gs", "vxe2", "vxp", "sort", "dflt",
|
"highgprs", "te", "vx", "vxd", "vxe", "gs", "vxe2", "vxp", "sort", "dflt",
|
||||||
"vxp2", "nnpa", "pcimio", "sie"
|
"vxp2", "nnpa", "pcimio", "sie"
|
||||||
};
|
};
|
||||||
|
|
||||||
const char _dl_s390_platforms[_DL_PLATFORMS_COUNT][7] =
|
|
||||||
{
|
|
||||||
"g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12", "z13", "z14", "z15",
|
|
||||||
"z16"
|
|
||||||
};
|
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,6 @@
|
||||||
extern const char _dl_s390_cap_flags[_DL_HWCAP_COUNT][9] attribute_hidden;
|
extern const char _dl_s390_cap_flags[_DL_HWCAP_COUNT][9] attribute_hidden;
|
||||||
|
|
||||||
#define _DL_PLATFORMS_COUNT 11
|
#define _DL_PLATFORMS_COUNT 11
|
||||||
extern const char _dl_s390_platforms[_DL_PLATFORMS_COUNT][7] attribute_hidden;
|
|
||||||
|
|
||||||
/* The kernel provides up to 32 capability bits with elf_hwcap. */
|
/* The kernel provides up to 32 capability bits with elf_hwcap. */
|
||||||
#define _DL_FIRST_PLATFORM 32
|
#define _DL_FIRST_PLATFORM 32
|
||||||
|
|
|
||||||
|
|
@ -71,22 +71,6 @@ PROCINFO_CLASS const char _dl_x86_hwcap_flags[3][9]
|
||||||
,
|
,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined PROCINFO_DECL && defined SHARED
|
|
||||||
._dl_x86_platforms
|
|
||||||
#else
|
|
||||||
PROCINFO_CLASS const char _dl_x86_platforms[4][9]
|
|
||||||
#endif
|
|
||||||
#ifndef PROCINFO_DECL
|
|
||||||
= {
|
|
||||||
"i586", "i686", "haswell", "xeon_phi"
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#if !defined SHARED || defined PROCINFO_DECL
|
|
||||||
;
|
|
||||||
#else
|
|
||||||
,
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined SHARED && !IS_IN (ldconfig)
|
#if defined SHARED && !IS_IN (ldconfig)
|
||||||
# if !defined PROCINFO_DECL
|
# if !defined PROCINFO_DECL
|
||||||
._dl_x86_tlsdesc_dynamic
|
._dl_x86_tlsdesc_dynamic
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue