From a4ca51951804c14a5a8e331747649ca767bd8524 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 9 Aug 2012 10:04:56 -0700
Subject: Don't check HWCAP_ARM_VFP in OS-generic code. Presume VFP if compiled
 without __SOFTFP__ defined.

---
 ports/sysdeps/arm/feupdateenv.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'ports/sysdeps/arm/feupdateenv.c')

diff --git a/ports/sysdeps/arm/feupdateenv.c b/ports/sysdeps/arm/feupdateenv.c
index 98f265432c..c0ed06e32e 100644
--- a/ports/sysdeps/arm/feupdateenv.c
+++ b/ports/sysdeps/arm/feupdateenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment and raise exceptions.
-   Copyright (C) 1997, 1999, 2000, 2008, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -19,16 +19,13 @@
 
 #include <fenv.h>
 #include <fpu_control.h>
+#include <arm-features.h>
 
-#include <unistd.h>
-#include <ldsodefs.h>
-#include <dl-procinfo.h>
-#include <sysdep.h>
 
 int
 __feupdateenv (const fenv_t *envp)
 {
-  if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
+  if (ARM_HAVE_VFP)
     {
       unsigned int temp;
 
-- 
cgit v1.2.3-70-g09d2