2002-12-07  Gwenole Beauchesne  <gbeauchesne@mandriva.com>

	* sysdeps/i386/dl-procinfo.h (HWCAP_I386_*): Move to...
	* sysdeps/i386/dl-hwcapinfo.h: ... here. New file.

[ rebased for 2.18 / tmb ]
Signed-off-by: Thomas Backlund <tmb@mageia.org>

diff -Nurp glibc-2.18/sysdeps/i386/dl-procinfo.h glibc-2.18-i386-hwcap/sysdeps/i386/dl-procinfo.h
--- glibc-2.18/sysdeps/i386/dl-procinfo.h	2013-08-11 01:52:55.000000000 +0300
+++ glibc-2.18-i386-hwcap/sysdeps/i386/dl-procinfo.h	2013-08-17 17:51:19.364381042 +0300
@@ -31,34 +31,8 @@
 #define _DL_HWCAP_PLATFORM	(((1ULL << _DL_PLATFORMS_COUNT) - 1) \
 				 << _DL_FIRST_PLATFORM)
 
-enum
-{
-  HWCAP_I386_FPU   = 1 << 0,
-  HWCAP_I386_VME   = 1 << 1,
-  HWCAP_I386_DE    = 1 << 2,
-  HWCAP_I386_PSE   = 1 << 3,
-  HWCAP_I386_TSC   = 1 << 4,
-  HWCAP_I386_MSR   = 1 << 5,
-  HWCAP_I386_PAE   = 1 << 6,
-  HWCAP_I386_MCE   = 1 << 7,
-  HWCAP_I386_CX8   = 1 << 8,
-  HWCAP_I386_APIC  = 1 << 9,
-  HWCAP_I386_SEP   = 1 << 11,
-  HWCAP_I386_MTRR  = 1 << 12,
-  HWCAP_I386_PGE   = 1 << 13,
-  HWCAP_I386_MCA   = 1 << 14,
-  HWCAP_I386_CMOV  = 1 << 15,
-  HWCAP_I386_FCMOV = 1 << 16,
-  HWCAP_I386_MMX   = 1 << 23,
-  HWCAP_I386_OSFXSR = 1 << 24,
-  HWCAP_I386_XMM   = 1 << 25,
-  HWCAP_I386_XMM2  = 1 << 26,
-  HWCAP_I386_AMD3D = 1 << 31,
-
-  /* XXX Which others to add here?  */
-  HWCAP_IMPORTANT = (HWCAP_I386_XMM2)
-
-};
+/* Get HWCAP definitions.  */
+#include <sysdeps/i386/dl-hwcapinfo.h>
 
 /* We cannot provide a general printing function.  */
 #define _dl_procinfo(type, word) -1
diff -Nurp glibc-2.18/sysdeps/i386/dl-hwcapinfo.h glibc-2.18-i386-hwcap/sysdeps/i386/dl-hwcapinfo.h
--- glibc-2.18/sysdeps/i386/dl-hwcapinfo.h	1970-01-01 02:00:00.000000000 +0200
+++ glibc-2.18-i386-hwcap/sysdeps/i386/dl-hwcapinfo.h	2013-08-17 17:51:19.364381042 +0300
@@ -0,0 +1,53 @@
+/* i386 version of processor capability definitions.
+   Copyright (C) 1998, 2000, 2003, 2004 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _DL_HWCAPINFO_H
+#define _DL_HWCAPINFO_H	1
+
+enum
+{
+  HWCAP_I386_FPU   = 1 << 0,
+  HWCAP_I386_VME   = 1 << 1,
+  HWCAP_I386_DE    = 1 << 2,
+  HWCAP_I386_PSE   = 1 << 3,
+  HWCAP_I386_TSC   = 1 << 4,
+  HWCAP_I386_MSR   = 1 << 5,
+  HWCAP_I386_PAE   = 1 << 6,
+  HWCAP_I386_MCE   = 1 << 7,
+  HWCAP_I386_CX8   = 1 << 8,
+  HWCAP_I386_APIC  = 1 << 9,
+  HWCAP_I386_SEP   = 1 << 11,
+  HWCAP_I386_MTRR  = 1 << 12,
+  HWCAP_I386_PGE   = 1 << 13,
+  HWCAP_I386_MCA   = 1 << 14,
+  HWCAP_I386_CMOV  = 1 << 15,
+  HWCAP_I386_FCMOV = 1 << 16,
+  HWCAP_I386_MMX   = 1 << 23,
+  HWCAP_I386_OSFXSR = 1 << 24,
+  HWCAP_I386_XMM   = 1 << 25,
+  HWCAP_I386_XMM2  = 1 << 26,
+  HWCAP_I386_AMD3D = 1 << 31,
+
+  /* XXX Which others to add here?  */
+  HWCAP_IMPORTANT = (HWCAP_I386_XMM2)
+
+};
+
+#endif /* dl-hwcapinfo.h */