From patchwork Mon Apr 10 17:55:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lu, Hongjiu" X-Patchwork-Id: 19946 Received: (qmail 54641 invoked by alias); 10 Apr 2017 17:55:25 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 53741 invoked by uid 89); 10 Apr 2017 17:55:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, NO_DNS_FOR_FROM, RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=shortly, 3919 X-HELO: mga04.intel.com X-ExtLoop1: 1 Date: Mon, 10 Apr 2017 10:55:23 -0700 From: "H.J. Lu" To: GNU C Library Subject: [PATCH] Add sysdeps/x86/dl-procinfo.c Message-ID: <20170410175523.GA2191@intel.com> Reply-To: "H.J. Lu" MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.8.0 (2017-02-23) Add sysdeps/x86/dl-procinfo.c for x86 version of processor capability information to reduce duplication between i386 and x86_64 dl-procinfo.c. There is code difference in ld.so and libc.so on i386 and x86-64 with this change. I will check it in shortly. H.J. --- * sysdeps/i386/dl-procinfo.c: Include . * sysdeps/x86_64/dl-procinfo.c: Likewise. * sysdeps/x86/dl-procinfo.c: New file. --- sysdeps/i386/dl-procinfo.c | 16 +------------- sysdeps/x86/dl-procinfo.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ sysdeps/x86_64/dl-procinfo.c | 14 +----------- 3 files changed, 54 insertions(+), 28 deletions(-) create mode 100644 sysdeps/x86/dl-procinfo.c diff --git a/sysdeps/i386/dl-procinfo.c b/sysdeps/i386/dl-procinfo.c index cec7dcc..b832830 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 #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 0000000..9d154bf --- /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 + . */ + +/* 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 a76624f..17ae800 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 #undef PROCINFO_DECL #undef PROCINFO_CLASS