about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/ieee754/dbl-64/e_sqrt.c5
-rw-r--r--sysdeps/ieee754/dbl-64/uroot.h43
3 files changed, 9 insertions, 46 deletions
diff --git a/ChangeLog b/ChangeLog
index 038181cf63..5a44a8a0b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-12-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/ieee754/dbl-64/e_sqrt.c: Do not include uroot.h.
+	(__ieee754_sqrt): Use hex float constants instead of tm256.x and
+	t512.x.
+	* sysdeps/ieee754/dbl-64/uroot.h: Remove file.
+
 2015-11-30  Amit Pawar  <amit.pawar@amd.com>
 
 	[BZ #19214]
diff --git a/sysdeps/ieee754/dbl-64/e_sqrt.c b/sysdeps/ieee754/dbl-64/e_sqrt.c
index fff6d148fe..c1fed7d97e 100644
--- a/sysdeps/ieee754/dbl-64/e_sqrt.c
+++ b/sysdeps/ieee754/dbl-64/e_sqrt.c
@@ -21,7 +21,7 @@
 /*                                                                   */
 /* FUNCTION:    usqrt                                                */
 /*                                                                   */
-/* FILES NEEDED: dla.h endian.h mydefs.h uroot.h                     */
+/* FILES NEEDED: dla.h endian.h mydefs.h                             */
 /*               uroot.tbl                                           */
 /*                                                                   */
 /* An ultimate sqrt routine. Given an IEEE double machine number x   */
@@ -47,7 +47,6 @@
 double
 __ieee754_sqrt (double x)
 {
-#include "uroot.h"
   static const double
     rt0 = 9.99999999859990725855365213134618E-01,
     rt1 = 4.99999999495955425917856814202739E-01,
@@ -134,7 +133,7 @@ __ieee754_sqrt (double x)
 	return x;       /* sqrt(+0)=+0, sqrt(-0)=-0 */
       if (k < 0)
 	return (x - x) / (x - x); /* sqrt(-ve)=sNaN */
-      return tm256.x * __ieee754_sqrt (x * t512.x);
+      return 0x1p-256 * __ieee754_sqrt (x * 0x1p512);
     }
 }
 strong_alias (__ieee754_sqrt, __sqrt_finite)
diff --git a/sysdeps/ieee754/dbl-64/uroot.h b/sysdeps/ieee754/dbl-64/uroot.h
deleted file mode 100644
index 4bbcc3bac7..0000000000
--- a/sysdeps/ieee754/dbl-64/uroot.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * IBM Accurate Mathematical Library
- * Written by International Business Machines Corp.
- * Copyright (C) 2001-2015 Free Software Foundation, Inc.
- *
- * This program 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.
- *
- * This program 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 this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-/******************************************************************/
-/*                                                                */
-/* MODULE_NAME:uroot.h                                            */
-/*                                                                */
-/* common data and variables prototype and definition             */
-/******************************************************************/
-
-#ifndef UROOT_H
-#define UROOT_H
-
-#ifdef BIG_ENDI
- static const  mynumber
-/**/           t512 = {{0x5ff00000, 0x00000000 }},  /* 2^512  */
-/**/          tm256 = {{0x2ff00000, 0x00000000 }};  /* 2^-256 */
-
-#else
-#ifdef LITTLE_ENDI
- static const  mynumber
-/**/           t512 = {{0x00000000, 0x5ff00000 }}, /* 2^512  */
-/**/          tm256 = {{0x00000000, 0x2ff00000 }}; /* 2^-256 */
-#endif
-#endif
-
-#endif