2006-01-20 Jakub Jelinek <jakub@redhat.com>
authorroland <roland>
Sat, 21 Jan 2006 19:43:12 +0000 (19:43 +0000)
committerroland <roland>
Sat, 21 Jan 2006 19:43:12 +0000 (19:43 +0000)
* sysdeps/ieee754/ldbl-64-128/s_nexttowardfd.c: Moved to...
* sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c: ... here.  New file.
* sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h (long_double_symbol_1): For
C define again using _weak_alias, for assembler use weak_alias.

sysdeps/ieee754/ldbl-64-128/s_nexttowardfd.c [deleted file]
sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c [new file with mode: 0644]

diff --git a/sysdeps/ieee754/ldbl-64-128/s_nexttowardfd.c b/sysdeps/ieee754/ldbl-64-128/s_nexttowardfd.c
deleted file mode 100644 (file)
index d52526f..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Single precision version of nexttoward.c.
-   Conversion to IEEE single float by Jakub Jelinek, jj@ultra.linux.cz. */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-/* IEEE functions
- *     __nexttowardfd(x,y)
- *     return the next machine floating-point number of x in the
- *     direction toward y.
- * This is for machines which use different binary type for double and
- * long double conditionally, y is long double equal to double.
- *   Special cases:
- */
-
-#include <math_ldbl_opt.h>
-
-float __nldbl_nexttowardf(float x, double y);
-
-float __nldbl_nexttowardf(float x, double y)
-{
-       int32_t hx,hy,ix,iy;
-       u_int32_t ly;
-
-       GET_FLOAT_WORD(hx,x);
-       EXTRACT_WORDS(hy,ly,y);
-       ix = hx&0x7fffffff;             /* |x| */
-       iy = hy&0x7fffffff;             /* |y| */
-
-       if((ix>0x7f800000) ||                              /* x is nan */
-          ((iy>=0x7ff00000)&&((iy-0x7ff00000)|ly)!=0))    /* y is nan */
-          return x+y;
-       if((double) x==y) return y;             /* x=y, return y */
-       if(ix==0) {                             /* x == 0 */
-           float x2;
-           SET_FLOAT_WORD(x,(u_int32_t)(hy&0x80000000)|1);/* return +-minsub*/
-           x2 = x*x;
-           if(x2==x) return x2; else return x; /* raise underflow flag */
-       }
-       if(hx>=0) {                             /* x > 0 */
-           if(hy<0||(ix>>23)>(iy>>20)-0x380
-              || ((ix>>23)==(iy>>20)-0x380
-                  && (ix&0x7fffff)>(((hy<<3)|(ly>>29))&0x7fffff)))     /* x > y, x -= ulp */
-               hx -= 1;
-           else                                /* x < y, x += ulp */
-               hx += 1;
-       } else {                                /* x < 0 */
-           if(hy>=0||(ix>>23)>(iy>>20)-0x380
-              || ((ix>>23)==(iy>>20)-0x380
-                  && (ix&0x7fffff)>(((hy<<3)|(ly>>29))&0x7fffff)))     /* x < y, x -= ulp */
-               hx -= 1;
-           else                                /* x > y, x += ulp */
-               hx += 1;
-       }
-       hy = hx&0x7f800000;
-       if(hy>=0x7f800000) return x+x;  /* overflow  */
-       if(hy<0x00800000) {             /* underflow */
-           float x2 = x*x;
-           if(x2!=x) {         /* raise underflow flag */
-               SET_FLOAT_WORD(x2,hx);
-               return x2;
-           }
-       }
-       SET_FLOAT_WORD(x,hx);
-       return x;
-}
-
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __nldbl_nexttowardf, nexttowardf, GLIBC_2_1);
-#endif
index bba00c1..692b0c5 100644 (file)
 # define ldbl_hidden_def(local, name) libc_hidden_def (name)
 # define ldbl_strong_alias(name, aliasname) strong_alias (name, aliasname)
 # define ldbl_weak_alias(name, aliasname) weak_alias (name, aliasname)
+# ifndef __ASSEMBLER__
 /* Note that weak_alias cannot be used - it is defined to nothing
-   in most of the files.  */
-# define long_double_symbol_1(lib, local, symbol, version) \
+   in most of the C files.  */
+#  define long_double_symbol_1(lib, local, symbol, version) \
+  _weak_alias (local, symbol)
+# else
+#  define long_double_symbol_1(lib, local, symbol, version) \
   weak_alias (local, symbol)
+# endif
 #else
 # define ldbl_hidden_def(local, name) libc_hidden_def (name)
 # define ldbl_strong_alias(name, aliasname) strong_alias (name, aliasname)
diff --git a/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c b/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c
new file mode 100644 (file)
index 0000000..d52526f
--- /dev/null
@@ -0,0 +1,77 @@
+/* Single precision version of nexttoward.c.
+   Conversion to IEEE single float by Jakub Jelinek, jj@ultra.linux.cz. */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+/* IEEE functions
+ *     __nexttowardfd(x,y)
+ *     return the next machine floating-point number of x in the
+ *     direction toward y.
+ * This is for machines which use different binary type for double and
+ * long double conditionally, y is long double equal to double.
+ *   Special cases:
+ */
+
+#include <math_ldbl_opt.h>
+
+float __nldbl_nexttowardf(float x, double y);
+
+float __nldbl_nexttowardf(float x, double y)
+{
+       int32_t hx,hy,ix,iy;
+       u_int32_t ly;
+
+       GET_FLOAT_WORD(hx,x);
+       EXTRACT_WORDS(hy,ly,y);
+       ix = hx&0x7fffffff;             /* |x| */
+       iy = hy&0x7fffffff;             /* |y| */
+
+       if((ix>0x7f800000) ||                              /* x is nan */
+          ((iy>=0x7ff00000)&&((iy-0x7ff00000)|ly)!=0))    /* y is nan */
+          return x+y;
+       if((double) x==y) return y;             /* x=y, return y */
+       if(ix==0) {                             /* x == 0 */
+           float x2;
+           SET_FLOAT_WORD(x,(u_int32_t)(hy&0x80000000)|1);/* return +-minsub*/
+           x2 = x*x;
+           if(x2==x) return x2; else return x; /* raise underflow flag */
+       }
+       if(hx>=0) {                             /* x > 0 */
+           if(hy<0||(ix>>23)>(iy>>20)-0x380
+              || ((ix>>23)==(iy>>20)-0x380
+                  && (ix&0x7fffff)>(((hy<<3)|(ly>>29))&0x7fffff)))     /* x > y, x -= ulp */
+               hx -= 1;
+           else                                /* x < y, x += ulp */
+               hx += 1;
+       } else {                                /* x < 0 */
+           if(hy>=0||(ix>>23)>(iy>>20)-0x380
+              || ((ix>>23)==(iy>>20)-0x380
+                  && (ix&0x7fffff)>(((hy<<3)|(ly>>29))&0x7fffff)))     /* x < y, x -= ulp */
+               hx -= 1;
+           else                                /* x > y, x += ulp */
+               hx += 1;
+       }
+       hy = hx&0x7f800000;
+       if(hy>=0x7f800000) return x+x;  /* overflow  */
+       if(hy<0x00800000) {             /* underflow */
+           float x2 = x*x;
+           if(x2!=x) {         /* raise underflow flag */
+               SET_FLOAT_WORD(x2,hx);
+               return x2;
+           }
+       }
+       SET_FLOAT_WORD(x,hx);
+       return x;
+}
+
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
+compat_symbol (libm, __nldbl_nexttowardf, nexttowardf, GLIBC_2_1);
+#endif