[PATCH 05/13] x86_64: Use builtin sqrt{f,l}

[Adhemerval Zanella]

Checked on x86_64-linux-gnu.
---
 sysdeps/x86_64/fpu/e_sqrt.c                 | 32 ---------------------
 sysdeps/x86_64/fpu/e_sqrtf.c                | 32 ---------------------
 sysdeps/x86_64/fpu/e_sqrtl.c                | 28 +++++++++++++++++-
 sysdeps/x86_64/fpu/math-use-builtins-sqrt.h |  4 +++
 4 files changed, 31 insertions(+), 65 deletions(-)
 delete mode 100644 sysdeps/x86_64/fpu/e_sqrt.c
 delete mode 100644 sysdeps/x86_64/fpu/e_sqrtf.c
 create mode 100644 sysdeps/x86_64/fpu/math-use-builtins-sqrt.h

diff --git a/sysdeps/x86_64/fpu/e_sqrt.c b/sysdeps/x86_64/fpu/e_sqrt.c
deleted file mode 100644
index c1708f9b65..0000000000
--- a/sysdeps/x86_64/fpu/e_sqrt.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Square root of floating point number.
-   Copyright (C) 2002-2020 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
-   <https://www.gnu.org/licenses/>.  */
-
-#include <math_private.h>
-#include <libm-alias-finite.h>
-
-#undef __ieee754_sqrt
-double
-__ieee754_sqrt (double x)
-{
-  double res;
-
-  asm ("sqrtsd %1, %0" : "=x" (res) : "xm" (x));
-
-  return res;
-}
-libm_alias_finite (__ieee754_sqrt, __sqrt)
diff --git a/sysdeps/x86_64/fpu/e_sqrtf.c b/sysdeps/x86_64/fpu/e_sqrtf.c
deleted file mode 100644
index 6155c7be24..0000000000
--- a/sysdeps/x86_64/fpu/e_sqrtf.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Square root of floating point number.
-   Copyright (C) 2002-2020 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
-   <https://www.gnu.org/licenses/>.  */
-
-#include <math_private.h>
-#include <libm-alias-finite.h>
-
-#undef __ieee754_sqrtf
-float
-__ieee754_sqrtf (float x)
-{
-  float res;
-
-  asm ("sqrtss %1, %0" : "=x" (res) : "xm" (x));
-
-  return res;
-}
-libm_alias_finite (__ieee754_sqrtf, __sqrtf)
diff --git a/sysdeps/x86_64/fpu/e_sqrtl.c b/sysdeps/x86_64/fpu/e_sqrtl.c
index 90e4e164e5..7ea6f52058 100644
--- a/sysdeps/x86_64/fpu/e_sqrtl.c
+++ b/sysdeps/x86_64/fpu/e_sqrtl.c
@@ -1 +1,27 @@
-#include "sysdeps/i386/fpu/e_sqrtl.c"
+/* Square root function.  x86_64 long double version.
+   Copyright (C) 2020 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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <math.h>
+#include <libm-alias-finite.h>
+
+long double
+__ieee754_sqrtl (long double x)
+{
+  return __builtin_sqrtl (x);
+}
+libm_alias_finite (__ieee754_sqrtl, __sqrtl)
diff --git a/sysdeps/x86_64/fpu/math-use-builtins-sqrt.h b/sysdeps/x86_64/fpu/math-use-builtins-sqrt.h
new file mode 100644
index 0000000000..e94c915ba6
--- /dev/null
+++ b/sysdeps/x86_64/fpu/math-use-builtins-sqrt.h
@@ -0,0 +1,4 @@
+#define USE_SQRT_BUILTIN 1
+#define USE_SQRTF_BUILTIN 1
+#define USE_SQRTL_BUILTIN 0
+#define USE_SQRTF128_BUILTIN 0
-- 
2.25.1