From patchwork Tue May 10 12:28:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lu, Hongjiu" X-Patchwork-Id: 12179 Received: (qmail 44819 invoked by alias); 10 May 2016 12:31:21 -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 44691 invoked by uid 89); 10 May 2016 12:31:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.0 required=5.0 tests=BAYES_00, KAM_LAZY_DOMAIN_SECURITY, NO_DNS_FOR_FROM, RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=libc.so, UD:libc.so, libcso, H*R:D*gmail.com X-HELO: mga09.intel.com X-ExtLoop1: 1 Date: Tue, 10 May 2016 05:28:23 -0700 From: "H.J. Lu" To: GNU C Library Subject: [PATCH] Add sysdeps/x86/dl-procinfo.c Message-ID: <20160510122823.GA13575@intel.com> Reply-To: "H.J. Lu" MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.6.0 (2016-04-01) linux/x86_64/dl-procinfo.[ch] includes i386 dl-procinfo.[ch] when building ldconfig since sysdeps/x86_64/dl-procinfo.c doesn't support ldconfig. Add sysdeps/x86/dl-procinfo.c to support ldconfig. This also removes the unnecessary _dl_procinfo from x86-64 ldconfig. No code changes in i686. No code changes in x86-64 libc.so and libc.a. Any feebacks, comments? H.J. --- * sysdeps/i386/dl-procinfo.c (_SYSDEPS_DL_PROCINFO_C): New. (_dl_x86_cpu_features): Removed. Include . * sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c: Removed. * sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h: Likewise. * sysdeps/x86/dl-procinfo.c: New file. * sysdeps/x86_64//dl-procinfo.c (_SYSDEPS_DL_PROCINFO_C): New. (_dl_x86_cpu_features): Removed. Include . --- sysdeps/i386/dl-procinfo.c | 18 ++------- sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c | 5 --- sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h | 5 --- sysdeps/x86/dl-procinfo.c | 56 ++++++++++++++++++++++++++++ sysdeps/x86_64/dl-procinfo.c | 16 ++------ 5 files changed, 62 insertions(+), 38 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c delete mode 100644 sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h create mode 100644 sysdeps/x86/dl-procinfo.c diff --git a/sysdeps/i386/dl-procinfo.c b/sysdeps/i386/dl-procinfo.c index ffa6b9d..b9f4b09 100644 --- a/sysdeps/i386/dl-procinfo.c +++ b/sysdeps/i386/dl-procinfo.c @@ -39,25 +39,13 @@ needed. */ +#define _SYSDEPS_DL_PROCINFO_C + #ifndef PROCINFO_CLASS # 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/unix/sysv/linux/x86_64/dl-procinfo.c b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c deleted file mode 100644 index a3c0c19..0000000 --- a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c +++ /dev/null @@ -1,5 +0,0 @@ -#if IS_IN (ldconfig) -# include -#else -# include -#endif diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h deleted file mode 100644 index 7829e1c..0000000 --- a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h +++ /dev/null @@ -1,5 +0,0 @@ -#if IS_IN (ldconfig) -# include -#else -# include -#endif diff --git a/sysdeps/x86/dl-procinfo.c b/sysdeps/x86/dl-procinfo.c new file mode 100644 index 0000000..6e0d09c --- /dev/null +++ b/sysdeps/x86/dl-procinfo.c @@ -0,0 +1,56 @@ +/* Data for x86 version of processor capability information. + Copyright (C) 2016 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 + . */ + +#ifndef _SYSDEPS_DL_PROCINFO_C +# error "Never include sysdeps/x86/dl-procinfo.c directly." +#endif + +/* 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 4625695..42ebf7f 100644 --- a/sysdeps/x86_64/dl-procinfo.c +++ b/sysdeps/x86_64/dl-procinfo.c @@ -35,23 +35,13 @@ needed. */ +#define _SYSDEPS_DL_PROCINFO_C + #ifndef PROCINFO_CLASS # 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