This is the mail archive of the
libc-ports@sources.redhat.com
mailing list for the libc-ports project.
Update ARM hwcap code
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: libc-ports at sourceware dot org
- Date: Mon, 21 May 2012 10:46:50 +0000 (UTC)
- Subject: Update ARM hwcap code
I've applied this patch to update the ARM port's hwcap code. The
patch adds a bits/hwcap.h header. Since the Linux kernel now has four
more ARM hwcap values that weren't listed in glibc, I also added those
to bits/hwcap.h and dl-procinfo.c.
2012-05-21 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/arm/bits/hwcap.h: New file. Macros
taken from sysdeps/unix/sysv/linux/arm/sysdep.h.
(HWCAP_ARM_TLS): New macro.
(HWCAP_ARM_VFPv4): Likewise.
(HWCAP_ARM_IDIVA): Likewise.
(HWCAP_ARM_IDIVT): Likewise.
* sysdeps/unix/sysv/linux/arm/sysdep.h: Include <bits/hwcap.h>.
(HWCAP_ARM_SWP): Remove macro. Moved to <bits/hwcap.h>.
(HWCAP_ARM_HALF): Likewise.
(HWCAP_ARM_THUMB): Likewise.
(HWCAP_ARM_26BIT): Likewise.
(HWCAP_ARM_FAST_MULT): Likewise.
(HWCAP_ARM_FPA): Likewise.
(HWCAP_ARM_VFP): Likewise.
(HWCAP_ARM_EDSP): Likewise.
(HWCAP_ARM_JAVA): Likewise.
(HWCAP_ARM_IWMMXT): Likewise.
(HWCAP_ARM_CRUNCH): Likewise.
(HWCAP_ARM_THUMBEE): Likewise.
(HWCAP_ARM_NEON): Likewise.
(HWCAP_ARM_VFPv3): Likewise.
(HWCAP_ARM_VFPv3D16): Likewise.
* sysdeps/unix/sysv/linux/arm/dl-procinfo.c (_dl_arm_cap_flags):
Add "tls", "vfpv4", "idiva" and "idivt".
* sysdeps/unix/sysv/linux/arm/dl-procinfo.h (_DL_HWCAP_COUNT):
Increase to 19.
diff --git a/sysdeps/unix/sysv/linux/arm/bits/hwcap.h b/sysdeps/unix/sysv/linux/arm/bits/hwcap.h
new file mode 100644
index 0000000..ddfed85
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/arm/bits/hwcap.h
@@ -0,0 +1,42 @@
+/* Defines for bits in AT_HWCAP. ARM Linux version.
+ Copyright (C) 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
+
+/* The following must match the kernel's <asm/hwcap.h>. */
+#define HWCAP_ARM_SWP 1
+#define HWCAP_ARM_HALF 2
+#define HWCAP_ARM_THUMB 4
+#define HWCAP_ARM_26BIT 8
+#define HWCAP_ARM_FAST_MULT 16
+#define HWCAP_ARM_FPA 32
+#define HWCAP_ARM_VFP 64
+#define HWCAP_ARM_EDSP 128
+#define HWCAP_ARM_JAVA 256
+#define HWCAP_ARM_IWMMXT 512
+#define HWCAP_ARM_CRUNCH 1024
+#define HWCAP_ARM_THUMBEE 2048
+#define HWCAP_ARM_NEON 4096
+#define HWCAP_ARM_VFPv3 8192
+#define HWCAP_ARM_VFPv3D16 16384
+#define HWCAP_ARM_TLS 32768
+#define HWCAP_ARM_VFPv4 65536
+#define HWCAP_ARM_IDIVA 131072
+#define HWCAP_ARM_IDIVT 262144
diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.c b/sysdeps/unix/sysv/linux/arm/dl-procinfo.c
index 64a4444..227492e 100644
--- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.c
+++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.c
@@ -1,5 +1,5 @@
/* Data for Linux/ARM version of processor capability information.
- Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Philip Blundell <philb@gnu.org>, 2001.
@@ -46,12 +46,13 @@
#if !defined PROCINFO_DECL && defined SHARED
._dl_arm_cap_flags
#else
-PROCINFO_CLASS const char _dl_arm_cap_flags[15][10]
+PROCINFO_CLASS const char _dl_arm_cap_flags[19][10]
#endif
#ifndef PROCINFO_DECL
= {
"swp", "half", "thumb", "26bit", "fastmult", "fpa", "vfp", "edsp",
"java", "iwmmxt", "crunch", "thumbee", "neon", "vfpv3", "vfpv3d16",
+ "tls", "vfpv4", "idiva", "idivt",
}
#endif
#if !defined SHARED || defined PROCINFO_DECL
diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
index 7fe6674..bea7100 100644
--- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
+++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h
@@ -1,5 +1,5 @@
/* Linux/ARM version of processor capability information handling macros.
- Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Philip Blundell <philb@gnu.org>, 2001.
@@ -23,7 +23,7 @@
#include <ldsodefs.h>
#include <sysdep.h>
-#define _DL_HWCAP_COUNT 15
+#define _DL_HWCAP_COUNT 19
/* The kernel provides platform data but it is not interesting. */
#define _DL_HWCAP_PLATFORM 0
diff --git a/sysdeps/unix/sysv/linux/arm/sysdep.h b/sysdeps/unix/sysv/linux/arm/sysdep.h
index ef83ec2..30fa599 100644
--- a/sysdeps/unix/sysv/linux/arm/sysdep.h
+++ b/sysdeps/unix/sysv/linux/arm/sysdep.h
@@ -40,23 +40,8 @@
#undef SYS_ify
#define SYS_ify(syscall_name) (__NR_##syscall_name)
-
-/* The following must match the kernel's <asm/procinfo.h>. */
-#define HWCAP_ARM_SWP 1
-#define HWCAP_ARM_HALF 2
-#define HWCAP_ARM_THUMB 4
-#define HWCAP_ARM_26BIT 8
-#define HWCAP_ARM_FAST_MULT 16
-#define HWCAP_ARM_FPA 32
-#define HWCAP_ARM_VFP 64
-#define HWCAP_ARM_EDSP 128
-#define HWCAP_ARM_JAVA 256
-#define HWCAP_ARM_IWMMXT 512
-#define HWCAP_ARM_CRUNCH 1024
-#define HWCAP_ARM_THUMBEE 2048
-#define HWCAP_ARM_NEON 4096
-#define HWCAP_ARM_VFPv3 8192
-#define HWCAP_ARM_VFPv3D16 16384
+#define _SYS_AUXV_H 1
+#include <bits/hwcap.h>
#ifdef __ASSEMBLER__
--
Joseph S. Myers
joseph@codesourcery.com