From: Peter Bergner <bergner@gcc.gnu.org>
Date: Fri, 7 Jul 2017 21:08:42 +0000 (-0500)
Subject: float128-ifunc.c: Don't include auxv.h.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d4391a62cb9a00b8aed02b0328f38ada26848897;p=gcc.git

float128-ifunc.c: Don't include auxv.h.

	libgcc/
	* config/rs6000/float128-ifunc.c: Don't include auxv.h.
	(have_ieee_hw_p): Delete function.
	(SW_OR_HW) Use __builtin_cpu_supports().

From-SVN: r250061
---

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 6aee40e4b30..ff226417bc3 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,10 +1,16 @@
+2017-07-07  Peter Bergner  <bergner@vnet.ibm.com>
+
+	* config/rs6000/float128-ifunc.c: Don't include auxv.h.
+	(have_ieee_hw_p): Delete function.
+	(SW_OR_HW) Use __builtin_cpu_supports().
+
 2017-07-06  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
 	* config/arm/lib1funcs.S: Defined __ARM_ARCH__ to 8 for ARMv8-R.
 
 2017-07-03  Olivier Hainque  <hainque@adacore.com>
 
-        * config/t-vxworks7: New file, really.
+	* config/t-vxworks7: New file, really.
 
 2017-06-28  Joseph Myers  <joseph@codesourcery.com>
 
diff --git a/libgcc/config/rs6000/float128-ifunc.c b/libgcc/config/rs6000/float128-ifunc.c
index e456ab13ce8..882c56ef21e 100644
--- a/libgcc/config/rs6000/float128-ifunc.c
+++ b/libgcc/config/rs6000/float128-ifunc.c
@@ -45,47 +45,7 @@
 #error "This module must not be compiled with IEEE 128-bit hardware support"
 #endif
 
-#include <sys/auxv.h>
-
-/* Use the namespace clean version of getauxval.  However, not all versions of
-   sys/auxv.h declare it, so declare it here.  This code is intended to be
-   temporary until a suitable version of __builtin_cpu_supports is added that
-   allows us to tell quickly if the machine supports IEEE 128-bit hardware.  */
-extern unsigned long __getauxval (unsigned long);
-
-static int
-have_ieee_hw_p (void)
-{
-  static int ieee_hw_p = -1;
-
-  if (ieee_hw_p < 0)
-    {
-      char *p = (char *) __getauxval (AT_PLATFORM);
-
-      ieee_hw_p = 0;
-
-      /* Don't use atoi/strtol/strncmp/etc.  These may require the normal
-	 environment to be setup to set errno to 0, and the ifunc resolvers run
-	 before the whole glibc environment is initialized.  */
-      if (p && p[0] == 'p' && p[1] == 'o' && p[2] == 'w' && p[3] == 'e'
-	  && p[4] == 'r')
-	{
-	  long n = 0;
-	  char ch;
-
-	  p += 5;
-	  while ((ch = *p++) >= '0' && (ch <= '9'))
-	    n = (n * 10) + (ch - '0');
-
-	  if (n >= 9)
-	    ieee_hw_p = 1;
-	}
-    }
-
-  return ieee_hw_p;
-}
-
-#define SW_OR_HW(SW, HW) (have_ieee_hw_p () ? HW : SW)
+#define SW_OR_HW(SW, HW) (__builtin_cpu_supports ("ieee128") ? HW : SW)
 
 /* Resolvers.  */