2006-10-27 Joseph S. Myers <joseph@codesourcery.com>

	Backport from eglibc-2_5.
	* sysdeps/arm/eabi/fclrexcpt.c: Include <sysdep.h> instead of
	<asm/procinfo.h>.  Use HWCAP_ARM_VFP instead of HWCAP_VFP.
	* sysdeps/arm/eabi/fedisblxcpt.c: Likewise.
	* sysdeps/arm/eabi/feenablxcpt.c: Likewise.
	* sysdeps/arm/eabi/fegetenv.c: Likewise.
	* sysdeps/arm/eabi/fegetexcept.c: Likewise.
	* sysdeps/arm/eabi/fegetround.c: Likewise.
	* sysdeps/arm/eabi/feholdexcpt.c: Likewise.
	* sysdeps/arm/eabi/fesetenv.c: Likewise.
	* sysdeps/arm/eabi/fesetround.c: Likewise.
	* sysdeps/arm/eabi/fraiseexcpt.c: Likewise.
	* sysdeps/arm/eabi/fsetexcptflg.c: Likewise.
	* sysdeps/arm/eabi/ftestexcept.c: Likewise.
	* sysdeps/arm/eabi/setfpucw.c: Likewise.



git-svn-id: svn://svn.eglibc.org/branches/eglibc-2_3@518 7b3dc134-2b1b-0410-93df-9e9f96275f8d

14 files changed, 44 insertions, 26 deletions

diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc
index 1300445c1..c58e2281b 100644
--- a/libc/ChangeLog.eglibc
+++ b/libc/ChangeLog.eglibc
@@ -1,3 +1,21 @@
+2006-10-27  Joseph S. Myers  <joseph@codesourcery.com>
+
+	Backport from eglibc-2_5.
+	* sysdeps/arm/eabi/fclrexcpt.c: Include <sysdep.h> instead of
+	<asm/procinfo.h>.  Use HWCAP_ARM_VFP instead of HWCAP_VFP.
+	* sysdeps/arm/eabi/fedisblxcpt.c: Likewise.
+	* sysdeps/arm/eabi/feenablxcpt.c: Likewise.
+	* sysdeps/arm/eabi/fegetenv.c: Likewise.
+	* sysdeps/arm/eabi/fegetexcept.c: Likewise.
+	* sysdeps/arm/eabi/fegetround.c: Likewise.
+	* sysdeps/arm/eabi/feholdexcpt.c: Likewise.
+	* sysdeps/arm/eabi/fesetenv.c: Likewise.
+	* sysdeps/arm/eabi/fesetround.c: Likewise.
+	* sysdeps/arm/eabi/fraiseexcpt.c: Likewise.
+	* sysdeps/arm/eabi/fsetexcptflg.c: Likewise.
+	* sysdeps/arm/eabi/ftestexcept.c: Likewise.
+	* sysdeps/arm/eabi/setfpucw.c: Likewise.
+
 2006-09-11  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	Backport:
diff --git a/libc/sysdeps/arm/eabi/fclrexcpt.c b/libc/sysdeps/arm/eabi/fclrexcpt.c
index 6e5d24280..8287dc61b 100644
--- a/libc/sysdeps/arm/eabi/fclrexcpt.c
+++ b/libc/sysdeps/arm/eabi/fclrexcpt.c
@@ -23,12 +23,12 @@
 #include <unistd.h>
 #include <ldsodefs.h>
 #include <dl-procinfo.h>
-#include <asm/procinfo.h>
+#include <sysdep.h>
 
 int
 __feclearexcept (int excepts)
 {
-  if (GLRO (dl_hwcap) & HWCAP_VFP)
+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
     {
       unsigned long int temp;
 
diff --git a/libc/sysdeps/arm/eabi/fedisblxcpt.c b/libc/sysdeps/arm/eabi/fedisblxcpt.c
index 414d34b1e..ab6fe79da 100644
--- a/libc/sysdeps/arm/eabi/fedisblxcpt.c
+++ b/libc/sysdeps/arm/eabi/fedisblxcpt.c
@@ -24,12 +24,12 @@
 #include <unistd.h>
 #include <ldsodefs.h>
 #include <dl-procinfo.h>
-#include <asm/procinfo.h>
+#include <sysdep.h>
 
 int
 fedisableexcept (int excepts)
 {
-  if (GLRO (dl_hwcap) & HWCAP_VFP)
+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
     {
       unsigned long int new_exc, old_exc;
 
diff --git a/libc/sysdeps/arm/eabi/feenablxcpt.c b/libc/sysdeps/arm/eabi/feenablxcpt.c
index e104bc4f6..f12b45320 100644
--- a/libc/sysdeps/arm/eabi/feenablxcpt.c
+++ b/libc/sysdeps/arm/eabi/feenablxcpt.c
@@ -24,12 +24,12 @@
 #include <unistd.h>
 #include <ldsodefs.h>
 #include <dl-procinfo.h>
-#include <asm/procinfo.h>
+#include <sysdep.h>
 
 int
 feenableexcept (int excepts)
 {
-  if (GLRO (dl_hwcap) & HWCAP_VFP)
+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
     {
       unsigned long int new_exc, old_exc;
 
diff --git a/libc/sysdeps/arm/eabi/fegetenv.c b/libc/sysdeps/arm/eabi/fegetenv.c
index 178d22a42..35bfac843 100644
--- a/libc/sysdeps/arm/eabi/fegetenv.c
+++ b/libc/sysdeps/arm/eabi/fegetenv.c
@@ -23,12 +23,12 @@
 #include <unistd.h>
 #include <ldsodefs.h>
 #include <dl-procinfo.h>
-#include <asm/procinfo.h>
+#include <sysdep.h>
 
 int
 __fegetenv (fenv_t *envp)
 {
-  if (GLRO (dl_hwcap) & HWCAP_VFP)
+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
     {
       unsigned long int temp;
       _FPU_GETCW (temp);
diff --git a/libc/sysdeps/arm/eabi/fegetexcept.c b/libc/sysdeps/arm/eabi/fegetexcept.c
index 811c8ae25..8e29ff7c6 100644
--- a/libc/sysdeps/arm/eabi/fegetexcept.c
+++ b/libc/sysdeps/arm/eabi/fegetexcept.c
@@ -24,12 +24,12 @@
 #include <unistd.h>
 #include <ldsodefs.h>
 #include <dl-procinfo.h>
-#include <asm/procinfo.h>
+#include <sysdep.h>
 
 int
 fegetexcept (void)
 {
-  if (GLRO (dl_hwcap) & HWCAP_VFP)
+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
     {
       unsigned long temp;
 
diff --git a/libc/sysdeps/arm/eabi/fegetround.c b/libc/sysdeps/arm/eabi/fegetround.c
index 1c4be04e6..6a3442aa4 100644
--- a/libc/sysdeps/arm/eabi/fegetround.c
+++ b/libc/sysdeps/arm/eabi/fegetround.c
@@ -23,12 +23,12 @@
 #include <unistd.h>
 #include <ldsodefs.h>
 #include <dl-procinfo.h>
-#include <asm/procinfo.h>
+#include <sysdep.h>
 
 int
 fegetround (void)
 {
-  if (GLRO (dl_hwcap) & HWCAP_VFP)
+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
     {
       unsigned int temp;
 
diff --git a/libc/sysdeps/arm/eabi/feholdexcpt.c b/libc/sysdeps/arm/eabi/feholdexcpt.c
index 40a140dff..60138781e 100644
--- a/libc/sysdeps/arm/eabi/feholdexcpt.c
+++ b/libc/sysdeps/arm/eabi/feholdexcpt.c
@@ -23,12 +23,12 @@
 #include <unistd.h>
 #include <ldsodefs.h>
 #include <dl-procinfo.h>
-#include <asm/procinfo.h>
+#include <sysdep.h>
 
 int
 feholdexcept (fenv_t *envp)
 {
-  if (GLRO (dl_hwcap) & HWCAP_VFP)
+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
     {
       unsigned long int temp;
 
diff --git a/libc/sysdeps/arm/eabi/fesetenv.c b/libc/sysdeps/arm/eabi/fesetenv.c
index bf253848b..c47aa6582 100644
--- a/libc/sysdeps/arm/eabi/fesetenv.c
+++ b/libc/sysdeps/arm/eabi/fesetenv.c
@@ -23,12 +23,12 @@
 #include <unistd.h>
 #include <ldsodefs.h>
 #include <dl-procinfo.h>
-#include <asm/procinfo.h>
+#include <sysdep.h>
 
 int
 __fesetenv (const fenv_t *envp)
 {
-  if (GLRO (dl_hwcap) & HWCAP_VFP)
+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
     {
       unsigned int temp;
 
diff --git a/libc/sysdeps/arm/eabi/fesetround.c b/libc/sysdeps/arm/eabi/fesetround.c
index b49e1adca..8993a9051 100644
--- a/libc/sysdeps/arm/eabi/fesetround.c
+++ b/libc/sysdeps/arm/eabi/fesetround.c
@@ -23,12 +23,12 @@
 #include <unistd.h>
 #include <ldsodefs.h>
 #include <dl-procinfo.h>
-#include <asm/procinfo.h>
+#include <sysdep.h>
 
 int
 fesetround (int round)
 {
-  if (GLRO (dl_hwcap) & HWCAP_VFP)
+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
     {
       fpu_control_t temp;
 
diff --git a/libc/sysdeps/arm/eabi/fraiseexcpt.c b/libc/sysdeps/arm/eabi/fraiseexcpt.c
index c0ab41967..53ccd9d01 100644
--- a/libc/sysdeps/arm/eabi/fraiseexcpt.c
+++ b/libc/sysdeps/arm/eabi/fraiseexcpt.c
@@ -24,12 +24,12 @@
 #include <unistd.h>
 #include <ldsodefs.h>
 #include <dl-procinfo.h>
-#include <asm/procinfo.h>
+#include <sysdep.h>
 
 int
 feraiseexcept (int excepts)
 {
-  if (GLRO (dl_hwcap) & HWCAP_VFP)
+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
     {
       int fpscr;
       const float fp_zero = 0.0, fp_one = 1.0, fp_max = FLT_MAX,
diff --git a/libc/sysdeps/arm/eabi/fsetexcptflg.c b/libc/sysdeps/arm/eabi/fsetexcptflg.c
index e76d74619..2e05514f1 100644
--- a/libc/sysdeps/arm/eabi/fsetexcptflg.c
+++ b/libc/sysdeps/arm/eabi/fsetexcptflg.c
@@ -24,12 +24,12 @@
 #include <unistd.h>
 #include <ldsodefs.h>
 #include <dl-procinfo.h>
-#include <asm/procinfo.h>
+#include <sysdep.h>
 
 int
 __fesetexceptflag (const fexcept_t *flagp, int excepts)
 {
-  if (GLRO (dl_hwcap) & HWCAP_VFP)
+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
     {
       fexcept_t temp;
 
diff --git a/libc/sysdeps/arm/eabi/ftestexcept.c b/libc/sysdeps/arm/eabi/ftestexcept.c
index 230ccbdce..846bb0195 100644
--- a/libc/sysdeps/arm/eabi/ftestexcept.c
+++ b/libc/sysdeps/arm/eabi/ftestexcept.c
@@ -23,12 +23,12 @@
 #include <unistd.h>
 #include <ldsodefs.h>
 #include <dl-procinfo.h>
-#include <asm/procinfo.h>
+#include <sysdep.h>
 
 int
 fetestexcept (int excepts)
 {
-  if (GLRO (dl_hwcap) & HWCAP_VFP)
+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
     {
       fexcept_t temp;
 
diff --git a/libc/sysdeps/arm/eabi/setfpucw.c b/libc/sysdeps/arm/eabi/setfpucw.c
index 2bd1f5561..cd680df6f 100644
--- a/libc/sysdeps/arm/eabi/setfpucw.c
+++ b/libc/sysdeps/arm/eabi/setfpucw.c
@@ -23,12 +23,12 @@
 #include <unistd.h>
 #include <ldsodefs.h>
 #include <dl-procinfo.h>
-#include <asm/procinfo.h>
+#include <sysdep.h>
 
 void
 __setfpucw (fpu_control_t set)
 {
-  if (GLRO (dl_hwcap) & HWCAP_VFP)
+  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
     {
       fpu_control_t cw;