diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/i386/dl-procinfo.c | 16 | ||||
| -rw-r--r-- | sysdeps/x86/dl-procinfo.c | 52 | ||||
| -rw-r--r-- | sysdeps/x86_64/dl-procinfo.c | 14 |
4 files changed, 61 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog index 134da608a2..ce57b65f14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2017-04-10 H.J. Lu <hongjiu.lu@intel.com> + + * sysdeps/i386/dl-procinfo.c: Include + <sysdeps/x86/dl-procinfo.c>. + * sysdeps/x86_64/dl-procinfo.c: Likewise. + * sysdeps/x86/dl-procinfo.c: New file. + 2017-04-10 Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> * sysdeps/generic/math_private.h: Remove declarations of diff --git a/sysdeps/i386/dl-procinfo.c b/sysdeps/i386/dl-procinfo.c index cec7dccfb8..b83283004e 100644 --- a/sysdeps/i386/dl-procinfo.c +++ b/sysdeps/i386/dl-procinfo.c @@ -43,21 +43,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 diff --git a/sysdeps/x86/dl-procinfo.c b/sysdeps/x86/dl-procinfo.c new file mode 100644 index 0000000000..9d154bfc62 --- /dev/null +++ b/sysdeps/x86/dl-procinfo.c @@ -0,0 +1,52 @@ +/* Data for x86 version of processor capability information. + Copyright (C) 2017 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 + <http://www.gnu.org/licenses/>. */ + +/* 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. + */ + +#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 diff --git a/sysdeps/x86_64/dl-procinfo.c b/sysdeps/x86_64/dl-procinfo.c index a76624fb06..17ae800a37 100644 --- a/sysdeps/x86_64/dl-procinfo.c +++ b/sysdeps/x86_64/dl-procinfo.c @@ -39,19 +39,7 @@ # define PROCINFO_CLASS #endif -#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 +#include <sysdeps/x86/dl-procinfo.c> #undef PROCINFO_DECL #undef PROCINFO_CLASS |