Add sysdeps/x86/dl-procinfo.c

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.

	* sysdeps/i386/dl-procinfo.c (_SYSDEPS_DL_PROCINFO_C): New.
	(_dl_x86_cpu_features): Removed.
	Include <sysdeps/x86/dl-procinfo.c>.
	* 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/x86/dl-procinfo.c>.

5 files changed, 62 insertions, 38 deletions

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 <sysdeps/x86/dl-procinfo.c>
 
 #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 <sysdeps/i386/dl-procinfo.c>
-#else
-# include <sysdeps/x86_64/dl-procinfo.c>
-#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 <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
-#else
-# include <sysdeps/generic/dl-procinfo.h>
-#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
+   <http://www.gnu.org/licenses/>.  */
+
+#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 <sysdeps/x86/dl-procinfo.c>
 
 #undef PROCINFO_DECL
 #undef PROCINFO_CLASS