5 files changed, 55 insertions, 46 deletions
diff --git a/sysdeps/i386/fpu/e_acosl.S b/sysdeps/i386/fpu/e_acosl.S
deleted file mode 100644
index d69f056556..0000000000
--- a/sysdeps/i386/fpu/e_acosl.S
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
- */
-
-#include <machine/asm.h>
-
-
-/* acosl = atanl (sqrtl(1 - x^2) / x) */
-ENTRY(__ieee754_acosl)
-	fldt	4(%esp)			/* x */
-	fld	%st
-	fmul	%st(0)			/* x^2 */
-	fld1
-	fsubp				/* 1 - x^2 */
-	fsqrt				/* sqrtl (1 - x^2) */
-	fxch	%st(1)
-	fpatan
-	ret
-END (__ieee754_acosl)
diff --git a/sysdeps/i386/fpu/e_acosl.c b/sysdeps/i386/fpu/e_acosl.c
new file mode 100644
index 0000000000..0c3e03945a
--- /dev/null
+++ b/sysdeps/i386/fpu/e_acosl.c
@@ -0,0 +1,25 @@
+/*
+ * Written by J.T. Conklin <jtc@netbsd.org>.
+ * Public domain.
+ *
+ * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
+ */
+
+#include <math_private.h>
+
+long double
+__ieee754_acosl (long double x)
+{
+  long double res;
+
+  /* acosl = atanl (sqrtl(1 - x^2) / x) */
+  asm (	"fld	%%st\n"
+	"fmul	%%st(0)\n"		/* x^2 */
+	"fld1\n"
+	"fsubp\n"			/* 1 - x^2 */
+	"fsqrt\n"			/* sqrtl (1 - x^2) */
+	"fxch	%%st(1)\n"
+	"fpatan"
+	: "=t" (res) : "0" (x) : "st(1)");
+  return res;
+}
diff --git a/sysdeps/i386/fpu/e_sqrtl.S b/sysdeps/i386/fpu/e_sqrtl.S
deleted file mode 100644
index d47aae5cb5..0000000000
--- a/sysdeps/i386/fpu/e_sqrtl.S
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: $")
-
-ENTRY(__ieee754_sqrtl)
-	fldt	4(%esp)
-	fsqrt
-	ret
-END (__ieee754_sqrtl)
diff --git a/sysdeps/i386/fpu/e_sqrtl.c b/sysdeps/i386/fpu/e_sqrtl.c
new file mode 100644
index 0000000000..85f61bb385
--- /dev/null
+++ b/sysdeps/i386/fpu/e_sqrtl.c
@@ -0,0 +1,18 @@
+/*
+ * Written by J.T. Conklin <jtc@netbsd.org>.
+ * Public domain.
+ *
+ * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
+ */
+
+#include <math_private.h>
+
+long double
+__ieee754_sqrtl (long double x)
+{
+  long double res;
+
+  asm ("fsqrt" : "=t" (res) : "0" (x));
+
+  return res;
+}
diff --git a/sysdeps/i386/fpu/s_atanl.S b/sysdeps/i386/fpu/s_atanl.c
index 8b07272764..b7dba88aad 100644
--- a/sysdeps/i386/fpu/s_atanl.S
+++ b/sysdeps/i386/fpu/s_atanl.c
@@ -5,14 +5,18 @@
  * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
  */
 
-#include <machine/asm.h>
+#include <math_private.h>
 
-RCSID("$NetBSD: $")
+long double
+__atanl (long double x)
+{
+  long double res;
+
+  asm ("fld1\n"
+       "fpatan"
+       : "=t" (res) : "0" (x));
+
+  return res;
+}
 
-ENTRY(__atanl)
-	fldt	4(%esp)
-	fld1
-	fpatan
-	ret
-END (__atanl)
 weak_alias (__atanl, atanl)