[PATCH v2 5/6] sparc: Add <bits/hwcap.h>

[Richard Henderson <rth at twiddle dot net>]

	* sysdeps/sparc/bits/hwcap.h: New file, split from ...
	* sysdeps/sparc/sysdep.h: ... here.  Use <bits/hwcap.h>.

Cc: David S. Miller <davem@davemloft.net>
---
 sysdeps/sparc/bits/hwcap.h |   47 ++++++++++++++++++++++++++++++++++++++++++++
 sysdeps/sparc/sysdep.h     |   29 +-------------------------
 2 files changed, 49 insertions(+), 27 deletions(-)
 create mode 100644 sysdeps/sparc/bits/hwcap.h

diff --git a/sysdeps/sparc/bits/hwcap.h b/sysdeps/sparc/bits/hwcap.h
new file mode 100644
index 0000000..d922d7b
--- /dev/null
+++ b/sysdeps/sparc/bits/hwcap.h
@@ -0,0 +1,47 @@
+/* Defines for bits in AT_HWCAP.
+   Copyright (C) 2011-2012 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 _SYS_AUXV_H
+# error "Never include <bits/hwcap.h> directly; use <sys/auxv.h> instead."
+#endif
+
+#define HWCAP_SPARC_FLUSH	0x00000001
+#define HWCAP_SPARC_STBAR	0x00000002
+#define HWCAP_SPARC_SWAP	0x00000004
+#define HWCAP_SPARC_MULDIV	0x00000008
+#define HWCAP_SPARC_V9		0x00000010
+#define HWCAP_SPARC_ULTRA3	0x00000020
+#define HWCAP_SPARC_BLKINIT	0x00000040
+#define HWCAP_SPARC_N2		0x00000080
+#define HWCAP_SPARC_MUL32	0x00000100
+#define HWCAP_SPARC_DIV32	0x00000200
+#define HWCAP_SPARC_FSMULD	0x00000400
+#define HWCAP_SPARC_V8PLUS	0x00000800
+#define HWCAP_SPARC_POPC	0x00001000
+#define HWCAP_SPARC_VIS		0x00002000
+#define HWCAP_SPARC_VIS2	0x00004000
+#define HWCAP_SPARC_ASI_BLK_INIT 0x00008000
+#define HWCAP_SPARC_FMAF	0x00010000
+#define HWCAP_SPARC_VIS3	0x00020000
+#define HWCAP_SPARC_HPC		0x00040000
+#define HWCAP_SPARC_RANDOM	0x00080000
+#define HWCAP_SPARC_TRANS	0x00100000
+#define HWCAP_SPARC_FJFMAU	0x00200000
+#define HWCAP_SPARC_IMA		0x00400000
+#define HWCAP_SPARC_ASI_CACHE_SPARING \
+				0x00800000
diff --git a/sysdeps/sparc/sysdep.h b/sysdeps/sparc/sysdep.h
index 8a7546b..311c2a9 100644
--- a/sysdeps/sparc/sysdep.h
+++ b/sysdeps/sparc/sysdep.h
@@ -15,30 +15,5 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-/* Bits present in AT_HWCAP on SPARC.  */
-
-#define HWCAP_SPARC_FLUSH	0x00000001
-#define HWCAP_SPARC_STBAR	0x00000002
-#define HWCAP_SPARC_SWAP	0x00000004
-#define HWCAP_SPARC_MULDIV	0x00000008
-#define HWCAP_SPARC_V9		0x00000010
-#define HWCAP_SPARC_ULTRA3	0x00000020
-#define HWCAP_SPARC_BLKINIT	0x00000040
-#define HWCAP_SPARC_N2		0x00000080
-#define HWCAP_SPARC_MUL32	0x00000100
-#define HWCAP_SPARC_DIV32	0x00000200
-#define HWCAP_SPARC_FSMULD	0x00000400
-#define HWCAP_SPARC_V8PLUS	0x00000800
-#define HWCAP_SPARC_POPC	0x00001000
-#define HWCAP_SPARC_VIS		0x00002000
-#define HWCAP_SPARC_VIS2	0x00004000
-#define HWCAP_SPARC_ASI_BLK_INIT 0x00008000
-#define HWCAP_SPARC_FMAF	0x00010000
-#define HWCAP_SPARC_VIS3	0x00020000
-#define HWCAP_SPARC_HPC		0x00040000
-#define HWCAP_SPARC_RANDOM	0x00080000
-#define HWCAP_SPARC_TRANS	0x00100000
-#define HWCAP_SPARC_FJFMAU	0x00200000
-#define HWCAP_SPARC_IMA		0x00400000
-#define HWCAP_SPARC_ASI_CACHE_SPARING \
-				0x00800000
+#define _SYS_AUXV_H 1
+#include <bits/hwcap.h>
-- 
1.7.7.6