Update.

2001-06-04  Bruno Haible  <haible@clisp.cons.org>

	* iconv/loop.c (UNICODE_TAG_HANDLER): New macro.
	* iconv/gconv_simple.c (__gconv_transform_internal_ascii): Invoke
	UNICODE_TAG_HANDLER.
	(__gconv_transform_internal_ucs2): Likewise.
	(__gconv_transform_internal_ucs2reverse): Likewise.
	* iconvdata/8bit-gap.c (BODY for TO_LOOP): Invoke UNICODE_TAG_HANDLER.
	* iconvdata/8bit-generic.c (BODY for TO_LOOP): Likewise.
	* iconvdata/ansi_x3.110.c (BODY for TO_LOOP): Likewise.
	* iconvdata/big5.c (BODY for TO_LOOP): Likewise.
	* iconvdata/big5hkscs.c (BODY for TO_LOOP): Likewise.
	* iconvdata/cp1255.c (BODY for TO_LOOP): Likewise.
	* iconvdata/cp1258.c (BODY for TO_LOOP): Likewise.
	* iconvdata/euc-cn.c (BODY for TO_LOOP): Likewise.
	* iconvdata/euc-jp.c (BODY for TO_LOOP): Likewise.
	* iconvdata/euc-kr.c (BODY for TO_LOOP): Likewise.
	* iconvdata/euc-tw.c (BODY for TO_LOOP): Likewise.
	* iconvdata/gbk.c (BODY for TO_LOOP): Likewise.
	* iconvdata/ibm930.c (BODY for TO_LOOP): Likewise.
	* iconvdata/ibm932.c (BODY for TO_LOOP): Likewise.
	* iconvdata/ibm933.c (BODY for TO_LOOP): Likewise.
	* iconvdata/ibm935.c (BODY for TO_LOOP): Likewise.
	* iconvdata/ibm937.c (BODY for TO_LOOP): Likewise.
	* iconvdata/ibm939.c (BODY for TO_LOOP): Likewise.
	* iconvdata/ibm943.c (BODY for TO_LOOP): Likewise.
	* iconvdata/iso646.c (BODY for TO_LOOP): Likewise.
	* iconvdata/iso8859-1.c (BODY for TO_LOOP): Likewise.
	* iconvdata/iso_6937.c (BODY for TO_LOOP): Likewise.
	* iconvdata/iso_6937-2.c (BODY for TO_LOOP): Likewise.
	* iconvdata/iso-2022-cn.c (BODY for TO_LOOP): Likewise.
	* iconvdata/iso-2022-cn-ext.c (BODY for TO_LOOP): Likewise.
	* iconvdata/iso-2022-kr.c (BODY for TO_LOOP): Likewise.
	* iconvdata/johab.c (BODY for TO_LOOP): Likewise.
	* iconvdata/sjis.c (BODY for TO_LOOP): Likewise.
	* iconvdata/t.61.c (BODY for TO_LOOP): Likewise.
	* iconvdata/uhc.c (BODY for TO_LOOP): Likewise.
	* iconvdata/unicode.c (BODY for TO_LOOP): Likewise.
	* iconvdata/iso-2022-jp.c (TAG_none, TAG_language, TAG_language_j,
	TAG_language_ja, TAG_language_k, TAG_language_ko, TAG_language_z,
	TAG_language_zh, CURRENT_TAG_MASK): New enum values.
	(EMIT_SHIFT_TO_INIT): Don't emit an escape sequence if ASCII_set
	is already selected but set2 or tag are set.
	(conversion): New enum type.
	(cvlist_t): New type.
	(CVLIST, CVLIST_FIRST, CVLIST_REST): New macros.
	(conversion_lists): New array.
	(BODY for TO_LOOP): Keep track of Unicode 3.1 language tag. If "ja",
	prefer conversion to Japanese character sets. If "zh", prefer
	conversion to GB2312. If "ko", prefer conversion to KSC5601. Small
	optimizations.
	(INIT_PARAMS): Add tag.
	(UPDATE_PARAMS): Add tag.

2001-06-04  Bruno Haible  <haible@clisp.cons.org>

	* locale/programs/locfile.c (write_locale_data): Before creat(),
	unlink the file, to avoid crashing the processes that mmap it.  Change
	a double slash to a single slash.  Free fname in case of error return.

2001-06-02  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/i386/fpu/s_frexpl.S (__frexpl): Mostly revert 2000-12-03
	changes, do the special handling for denormal numbers, not for
	normalized numbers (patch by <trevin@xmission.com>).

	* math/test-misc.c (main): Test frexpl with denormal arguments.

2001-06-04  Jakub Jelinek  <jakub@redhat.com>

	* math/libm-test.inc (llround_test): Add two new llround tests.
	* sysdeps/ieee754/ldbl-96/s_llroundl.c (__llroundl): Don't allow
	overflow when rounding away from zero.

2001-06-04  Jakub Jelinek  <jakub@redhat.com>

	* math/Makefile (libm-calls): Add e_log2, w_log2, remove s_log2.
	* math/math_private.h (__ieee754_log2, __ieee754_log2f,
	__ieee754_log2l): New prototypes.
	* sysdeps/generic/w_log2.c: New file.
	* sysdeps/generic/w_log2f.c: New file.
	* sysdeps/generic/w_log2l.c: New file.
	* sysdeps/generic/s_log2l.c: Move...
	* sysdeps/generic/e_log2l.c: ...to here. Rename to __ieee754_log2l.
	* sysdeps/ieee754/k_standard.c (__kernel_standard): Handle log2(0)
	and log2(x < 0).
	* sysdeps/i386/fpu/s_log2.S: Move...
	* sysdeps/i386/fpu/e_log2.S: ...to here. Rename to __ieee754_log2.
	* sysdeps/i386/fpu/s_log2f.S: Move...
	* sysdeps/i386/fpu/e_log2f.S: ...to here. Rename to __ieee754_log2f.
	* sysdeps/i386/fpu/s_log2l.S: Move...
	* sysdeps/i386/fpu/e_log2l.S: ...to here. Rename to __ieee754_log2l.
	* sysdeps/m68k/fpu/s_log2.S: Move...
	* sysdeps/m68k/fpu/e_log2.S: ...to here. Rename to __ieee754_log2.
	* sysdeps/m68k/fpu/s_log2f.S: Move...
	* sysdeps/m68k/fpu/e_log2f.S: ...to here. Rename to __ieee754_log2f.
	* sysdeps/m68k/fpu/s_log2l.S: Move...
	* sysdeps/m68k/fpu/e_log2l.S: ...to here. Rename to __ieee754_log2l.
	* sysdeps/ieee754/dbl-64/s_log2.c: Move...
	* sysdeps/ieee754/dbl-64/e_log2.c: ...to here. Rename to
	__ieee754_log2.
	* sysdeps/ieee754/flt-32/s_log2f.c: Move...
	* sysdeps/ieee754/flt-32/e_log2f.c: ...to here. Rename to
	__ieee754_log2f.

2001-06-04  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/generic/w_exp2.c (u_threshold): Lower threshold so that
	even arguments which result in denormalized exp2 are accepted.
	(__exp2): Arguments equal to u_threshold already result into
	underflow.
	* sysdeps/generic/w_exp2f.c (u_threshold, __exp2f): Likewise.
	* sysdeps/generic/w_exp2l.c (u_threshold, __exp2l): Likewise.
	* sysdeps/ieee754/dbl-64/e_exp2.c (__ieee754_exp2): Lomark was too
	low, with corrected lowmark use greaterequal, not greater.
	* sysdeps/ieee754/flt-32/e_exp2f.c (__ieee754_exp2f): Likewise.

2001-06-04  Jakub Jelinek  <jakub@redhat.com>

	* math/libm-test.inc (ilogb_test): Test that ilogb(+-Inf) == INT_MAX.
	* sysdeps/i386/fpu/s_ilogb.S (__ilogb): Return INT_MAX for +-Inf.
	* sysdeps/i386/fpu/s_ilogbf.S (__ilogbf): Likewise.
	* sysdeps/i386/fpu/s_ilogbl.S (__ilogbl): Likewise.
	* sysdeps/ieee754/dbl-64/s_ilogb.c (__ilogb): Likewise.
	* sysdeps/ieee754/flt-32/s_ilogbf.c (__ilogbf): Likewise.
	* sysdeps/ieee754/ldbl-128/s_ilogbl.c (__ilogbl): Likewise.
	* sysdeps/ieee754/ldbl-96/s_ilogbl.c (__ilogbl): Likewise.

2001-06-04  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/generic/w_coshl.c (__coshl): Test if finite argument
	gave non-finite result instead of using constant in generic
	version.
	* sysdeps/generic/w_coshf.c (__coshf): Likewise.
	* sysdeps/generic/w_cosh.c (__cosh): Likewise.
	* sysdeps/generic/w_exp10.c (o_threshold, u_threshold): Remove.
	(__exp10): Test if finite argument gave non-finite result.
	* sysdeps/generic/w_exp10f.c (o_threshold, u_threshold, __exp10f):
	Likewise.
	* sysdeps/generic/w_exp10l.c (o_threshold, u_threshold, __exp10l):
	Likewise.
2001-06-04  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/ieee754/ldbl-96/e_coshl.c (__ieee754_coshl): Fix
	overflow threshold constant (log(LDBL_MAX)+M_LN2l).

2001-05-29  Bruno Haible  <haible@clisp.cons.org>

	* locale/programs/ld-ctype.c (idx_table): New struct type.
	(idx_table_init, idx_table_get, idx_table_add): New functions.
	(MAX_CHARNAMES_IDX): Remove macro.
	(locale_ctype_t): Change type of charnames_idx field.
	(ctype_startup): Change initialization of charnames_idx field.
	(find_idx): Use idx_table_get and idx_table_add for speed.

	* locale/programs/charmap.c (charmap_new_char): Fix ucs4 value
	computation of characters in a range.

2001-05-29  Bruno Haible  <haible@clisp.cons.org>

	* iconvdata/gb18030.c (__fourbyte_to_ucs1): Add mappings for <U03F4>,
	<U03F5>.
	(__ucs_to_gb18030_tab1): Likewise.
	(BODY for FROM_LOOP): Add mapping for <U00010000>..<U0010FFFF>.
	(BODY for TO_LOOP): Likewise.
	* iconvdata/tst-table-charmap.sh: Update for charmaps containing
	<U00xxxxxx> syntax.
	* iconvdata/tst-table-from.c (bmp_only): New variable.
	(utf8_decode): If bmp_only, don't return characters outside Unicode
	plane 0.
	(main): When testing UTF-8 or GB18030, set bmp_only to 1. Don't print
	a conversion line if utf8_decode returns NULL.
	* iconvdata/tst-table-to.c (main): When testing encodings other than
	UTF-8 and GB18030, loop upto U+30000 instead of U+10000. Use UTF-8
	instead of UCS-2 as input.
	* iconvdata/tst-table.sh: For GB18030, use only the part < 0x10000
	of the charmap.

2001-05-29  Bruno Haible  <haible@clisp.cons.org>

	* iconvdata/cns11643l1.c: Update to Unicode 3.1.
	(__cns11643l1_to_ucs4_tab): Regenerated.
	(__cns11643l1_from_ucs4_tab12): Regenerated.
	* iconvdata/cns11643.c: Update to Unicode 3.1.
	(__cns11643l14_to_ucs4_tab): Remove array.
	(__cns11643l3_to_ucs4_tab, __cns11643l4_to_ucs4_tab,
	__cns11643l5_to_ucs4_tab, __cns11643l6_to_ucs4_tab,
	__cns11643l7_to_ucs4_tab, __cns11643l15_to_ucs4_tab): New arrays.
	(__cns11643_from_ucs4p0_tab): Renamed from __cns11643_from_ucs4_tab.
	(__cns11643_from_ucs4p2_tab): New array.
	* iconvdata/cns11643.h (__cns11643l14_to_ucs4_tab): Remove declaration.
	(__cns11643l3_to_ucs4_tab, __cns11643l4_to_ucs4_tab,
	__cns11643l5_to_ucs4_tab, __cns11643l6_to_ucs4_tab,
	__cns11643l7_to_ucs4_tab, __cns11643l15_to_ucs4_tab): New declarations.
	(cns11643_to_ucs4): Treat planes 3, 4, 5, 6, 7, 15 instead of 14.
	(__cns11643_from_ucs4_tab): Remove declaration.
	(__cns11643_from_ucs4p0_tab, __cns11643_from_ucs4p2_tab): New
	declarations.
	(ucs4_to_cns11643): Update for new arrays. Treat U+3400..U+4DFF and
	U+20000..U+2A6D6.
	* iconvdata/cns11643l2.h (__cns11643_from_ucs4_tab): Remove
	declaration.
	(__cns11643_from_ucs4p0_tab): New declaration.
	(ucs4_to_cns11643l2): Update for new arrays.
	* iconvdata/iso-2022-cn-ext.c (BODY for FROM_LOOP): Handle planes
	3 to 7.
	(BODY for TO_LOOP): Handle planes 3 to 7, instead of plane 14.
	* iconvdata/EUC-TW.irreversible: New file.
	* iconvdata/tst-table.sh: Use it.
	* iconvdata/Makefile (distribute): Add CP1255.irreversible,
	CP1258.irreversible, EUC-TW.irreversible.

2001-05-29  Bruno Haible  <haible@clisp.cons.org>

	* locale/C-translit.h.in: Add transliterations for new Unicode 3.1
	mathematical symbols.

37 files changed, 262 insertions, 129 deletions

diff --git a/sysdeps/generic/s_log2l.c b/sysdeps/generic/e_log2l.c
index 835cd4fed2..681904bfbb 100644
--- a/sysdeps/generic/s_log2l.c
+++ b/sysdeps/generic/e_log2l.c
@@ -3,13 +3,12 @@
 #include <errno.h>
 
 long double
-__log2l (long double x)
+__ieee754_log2l (long double x)
 {
-  fputs ("__log2l not implemented\n", stderr);
+  fputs ("__ieee754_log2l not implemented\n", stderr);
   __set_errno (ENOSYS);
   return 0.0;
 }
-weak_alias (__log2l, log2l)
 
 stub_warning (log2l)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/w_cosh.c b/sysdeps/generic/w_cosh.c
index 8db25c868c..709f485c6d 100644
--- a/sysdeps/generic/w_cosh.c
+++ b/sysdeps/generic/w_cosh.c
@@ -34,7 +34,7 @@ static char rcsid[] = "$NetBSD: w_cosh.c,v 1.6 1995/05/10 20:48:47 jtc Exp $";
 	double z;
 	z = __ieee754_cosh(x);
 	if(_LIB_VERSION == _IEEE_ || __isnan(x)) return z;
-	if(fabs(x)>7.10475860073943863426e+02) {
+	if(!__finite(z) && __finite(x)) {
 	        return __kernel_standard(x,x,5); /* cosh overflow */
 	} else
 	    return z;
diff --git a/sysdeps/generic/w_coshf.c b/sysdeps/generic/w_coshf.c
index 53ca84108e..c38fd1d93f 100644
--- a/sysdeps/generic/w_coshf.c
+++ b/sysdeps/generic/w_coshf.c
@@ -37,7 +37,7 @@ static char rcsid[] = "$NetBSD: w_coshf.c,v 1.3 1995/05/10 20:48:49 jtc Exp $";
 	float z;
 	z = __ieee754_coshf(x);
 	if(_LIB_VERSION == _IEEE_ || __isnanf(x)) return z;
-	if(fabsf(x)>(float)8.9415985107e+01) {	
+	if(!__finite(z) && __finite(x)) {	
 		/* cosh overflow */
 	        return (float)__kernel_standard((double)x,(double)x,105);
 	} else
diff --git a/sysdeps/generic/w_coshl.c b/sysdeps/generic/w_coshl.c
index 343d5724b9..cc1929a9ec 100644
--- a/sysdeps/generic/w_coshl.c
+++ b/sysdeps/generic/w_coshl.c
@@ -38,7 +38,7 @@ static char rcsid[] = "$NetBSD: $";
 	long double z;
 	z = __ieee754_coshl(x);
 	if(_LIB_VERSION == _IEEE_ || __isnanl(x)) return z;
-	if(fabsl(x)>7.10475860073943863426e+02) {
+	if(!__finite(z) && __finite(x)) {
 	        return __kernel_standard(x,x,205); /* cosh overflow */
 	} else
 	    return z;
diff --git a/sysdeps/generic/w_exp10.c b/sysdeps/generic/w_exp10.c
index bf0d361f52..597506f22f 100644
--- a/sysdeps/generic/w_exp10.c
+++ b/sysdeps/generic/w_exp10.c
@@ -21,14 +21,6 @@
 #include "math_private.h"
 
 #ifdef __STDC__
-static const double
-#else
-static double
-#endif
-o_threshold=  3.0825471555991674389672e+02,
-u_threshold= -3.2360724533877978485251e+02;
-
-#ifdef __STDC__
 	double __exp10(double x)		/* wrapper exp10 */
 #else
 	double __exp10(x)			/* wrapper exp10 */
@@ -41,11 +33,9 @@ u_threshold= -3.2360724533877978485251e+02;
 	double z;
 	z = __ieee754_exp10(x);
 	if(_LIB_VERSION == _IEEE_) return z;
-	if(__finite(x)) {
-	    if(x>o_threshold)
-	        return __kernel_standard(x,x,46); /* exp10 overflow */
-	    else if(x<u_threshold)
-	        return __kernel_standard(x,x,47); /* exp10 underflow */
+	if(!__finite(z) && __finite(x)) {
+	    /* exp10 overflow (46) if x > 0, underflow (47) if x < 0.  */
+	    return __kernel_standard(x,x,46+!!__signbit(x));
 	}
 	return z;
 #endif
diff --git a/sysdeps/generic/w_exp10f.c b/sysdeps/generic/w_exp10f.c
index f78be7973b..1c510a3bfa 100644
--- a/sysdeps/generic/w_exp10f.c
+++ b/sysdeps/generic/w_exp10f.c
@@ -21,14 +21,6 @@
 #include "math_private.h"
 
 #ifdef __STDC__
-static const float
-#else
-static float
-#endif
-o_threshold=  3.853183944498959298709e+01,
-u_threshold= -4.515449934959717928174e+01;
-
-#ifdef __STDC__
 	float __exp10f(float x)		/* wrapper exp10f */
 #else
 	float __exp10f(x)			/* wrapper exp10f */
@@ -41,13 +33,10 @@ u_threshold= -4.515449934959717928174e+01;
 	float z;
 	z = __ieee754_exp10f(x);
 	if(_LIB_VERSION == _IEEE_) return z;
-	if(__finitef(x)) {
-	    if(x>o_threshold)
-	        /* exp overflow */
-	        return (float)__kernel_standard((double)x,(double)x,146);
-	    else if(x<u_threshold)
-	        /* exp underflow */
-	        return (float)__kernel_standard((double)x,(double)x,147);
+	if(!__finitef(z) && __finitef(x)) {
+	    /* exp10f overflow (146) if x > 0, underflow (147) if x < 0.  */
+	    return (float)__kernel_standard((double) x, (double) x,
+					    146+!!__signbitf(x));
 	}
 	return z;
 #endif
diff --git a/sysdeps/generic/w_exp10l.c b/sysdeps/generic/w_exp10l.c
index 7117873c22..aebddcb201 100644
--- a/sysdeps/generic/w_exp10l.c
+++ b/sysdeps/generic/w_exp10l.c
@@ -22,14 +22,6 @@
 #include "math_private.h"
 
 #ifdef __STDC__
-static const long double
-#else
-static long double
-#endif
-o_threshold=  4.93207544895866790234755e+03,
-u_threshold= -4.95104033868549871764588e+03;
-
-#ifdef __STDC__
 	long double __exp10l(long double x)	/* wrapper exp10 */
 #else
 	long double __exp10l(x)			/* wrapper exp10 */
@@ -42,11 +34,9 @@ u_threshold= -4.95104033868549871764588e+03;
 	long double z;
 	z = __ieee754_exp10l(x);
 	if(_LIB_VERSION == _IEEE_) return z;
-	if(__finitel(x)) {
-	    if(x>o_threshold)
-	        return __kernel_standard(x,x,246); /* exp10 overflow */
-	    else if(x<u_threshold)
-	        return __kernel_standard(x,x,247); /* exp10 underflow */
+	if(!__finitel(z) && __finitel(x)) {
+	    /* exp10 overflow (246) if x > 0, underflow (247) if x < 0.  */
+	    return __kernel_standard(x,x,246+__signbitl(x));
 	}
 	return z;
 #endif
diff --git a/sysdeps/generic/w_exp2.c b/sysdeps/generic/w_exp2.c
index 126aa090bc..4e667d770e 100644
--- a/sysdeps/generic/w_exp2.c
+++ b/sysdeps/generic/w_exp2.c
@@ -7,7 +7,7 @@
 #include "math_private.h"
 
 static const double o_threshold= (double) DBL_MAX_EXP;
-static const double u_threshold= (double) DBL_MIN_EXP;
+static const double u_threshold= (double) (DBL_MIN_EXP - DBL_MANT_DIG - 1);
 
 double
 __exp2 (double x)		/* wrapper exp2 */
@@ -22,7 +22,7 @@ __exp2 (double x)		/* wrapper exp2 */
       if (x > o_threshold)
 	/* exp2 overflow */
 	return __kernel_standard (x, x, 44);
-      else if (x < u_threshold)
+      else if (x <= u_threshold)
 	/* exp2 underflow */
 	return __kernel_standard (x, x, 45);
     }
diff --git a/sysdeps/generic/w_exp2f.c b/sysdeps/generic/w_exp2f.c
index d2c340db3f..13cfc9a19f 100644
--- a/sysdeps/generic/w_exp2f.c
+++ b/sysdeps/generic/w_exp2f.c
@@ -7,7 +7,7 @@
 #include "math_private.h"
 
 static const float o_threshold= (float) FLT_MAX_EXP;
-static const float u_threshold= (float) FLT_MIN_EXP;
+static const float u_threshold= (float) (FLT_MIN_EXP - FLT_MANT_DIG - 1);
 
 float
 __exp2f (float x)		/* wrapper exp2f */
@@ -22,7 +22,7 @@ __exp2f (float x)		/* wrapper exp2f */
       if (x > o_threshold)
 	/* exp2 overflow */
 	return (float) __kernel_standard ((double) x, (double) x, 144);
-      else if (x < u_threshold)
+      else if (x <= u_threshold)
 	/* exp2 underflow */
 	return (float) __kernel_standard ((double) x, (double) x, 145);
     }
diff --git a/sysdeps/generic/w_exp2l.c b/sysdeps/generic/w_exp2l.c
index 965e9bf3e4..f492301223 100644
--- a/sysdeps/generic/w_exp2l.c
+++ b/sysdeps/generic/w_exp2l.c
@@ -7,7 +7,8 @@
 #include "math_private.h"
 
 static const long double o_threshold = (long double) LDBL_MAX_EXP;
-static const long double u_threshold = (long double) LDBL_MIN_EXP;
+static const long double u_threshold
+  = (long double) (LDBL_MIN_EXP - LDBL_MANT_DIG - 1);
 
 long double
 __exp2l (long double x)			/* wrapper exp2l */
@@ -21,7 +22,7 @@ __exp2l (long double x)			/* wrapper exp2l */
     {
       if (x > o_threshold)
 	return __kernel_standard (x, x, 244); /* exp2l overflow */
-      else if (x < u_threshold)
+      else if (x <= u_threshold)
 	return __kernel_standard (x, x, 245); /* exp2l underflow */
     }
   return z;
diff --git a/sysdeps/generic/w_log2.c b/sysdeps/generic/w_log2.c
new file mode 100644
index 0000000000..7966ff359f
--- /dev/null
+++ b/sysdeps/generic/w_log2.c
@@ -0,0 +1,32 @@
+/*
+ * wrapper log2(X)
+ */
+
+#include "math.h"
+#include "math_private.h"
+
+double
+__log2 (double x)	/* wrapper log2 */
+{
+#ifdef _IEEE_LIBM
+  return __ieee754_log2 (x);
+#else
+  double z;
+  z = __ieee754_log2 (x);
+  if (_LIB_VERSION == _IEEE_ || __isnan (x)) return z;
+  if (x <= 0.0)
+    {
+      if (x == 0.0)
+	return __kernel_standard (x, x, 48); /* log2 (0) */
+      else
+	return __kernel_standard (x, x, 49); /* log2 (x < 0) */
+    }
+  else
+    return z;
+#endif
+}
+weak_alias (__log2, log2)
+#ifdef NO_LONG_DOUBLE
+strong_alias (__log2, __log2l)
+weak_alias (__log2, log2l)
+#endif
diff --git a/sysdeps/generic/w_log2f.c b/sysdeps/generic/w_log2f.c
new file mode 100644
index 0000000000..1e2eb85d7b
--- /dev/null
+++ b/sysdeps/generic/w_log2f.c
@@ -0,0 +1,30 @@
+/*
+ * wrapper log2(X)
+ */
+
+#include "math.h"
+#include "math_private.h"
+
+float
+__log2f (float x)	/* wrapper log2f */
+{
+#ifdef _IEEE_LIBM
+  return __ieee754_log2f (x);
+#else
+  float z;
+  z = __ieee754_log2f (x);
+  if (_LIB_VERSION == _IEEE_ || __isnanf (x)) return z;
+  if (x <= 0.0f)
+    {
+      if (x == 0.0f)
+	/* log2f (0) */
+	return __kernel_standard ((double) x, (double) x, 148);
+      else
+	/* log2f (x < 0) */
+	return __kernel_standard ((double) x, (double) x, 149);
+    }
+  else
+    return z;
+#endif
+}
+weak_alias (__log2f, log2f)
diff --git a/sysdeps/generic/w_log2l.c b/sysdeps/generic/w_log2l.c
new file mode 100644
index 0000000000..f41757c5e4
--- /dev/null
+++ b/sysdeps/generic/w_log2l.c
@@ -0,0 +1,28 @@
+/*
+ * wrapper log2l(X)
+ */
+
+#include "math.h"
+#include "math_private.h"
+
+long double
+__log2l (long double x)	/* wrapper log2l */
+{
+#ifdef _IEEE_LIBM
+  return __ieee754_log2l (x);
+#else
+  long double z;
+  z = __ieee754_log2l (x);
+  if (_LIB_VERSION == _IEEE_ || __isnanl (x)) return z;
+  if (x <= 0.0)
+    {
+      if (x == 0.0)
+	return __kernel_standard (x, x, 248); /* log2l (0) */
+      else
+	return __kernel_standard (x, x, 249); /* log2l (x < 0) */
+    }
+  else
+    return z;
+#endif
+}
+weak_alias (__log2l, log2l)
diff --git a/sysdeps/i386/fpu/s_log2.S b/sysdeps/i386/fpu/e_log2.S
index 5ba40761e9..4f7f0d57d9 100644
--- a/sysdeps/i386/fpu/s_log2.S
+++ b/sysdeps/i386/fpu/e_log2.S
@@ -32,7 +32,7 @@ limit:	.double 0.29
 #endif
 
 	.text
-ENTRY(__log2)
+ENTRY(__ieee754_log2)
 #ifdef PIC
 	call	1f
 1:	popl	%edx
@@ -64,5 +64,4 @@ ENTRY(__log2)
 	fstp	%st(1)
 	fstp	%st(1)
 	ret
-END (__log2)
-weak_alias (__log2, log2)
+END (__ieee754_log2)
diff --git a/sysdeps/i386/fpu/s_log2f.S b/sysdeps/i386/fpu/e_log2f.S
index 111dc9c1d9..88f28b423c 100644
--- a/sysdeps/i386/fpu/s_log2f.S
+++ b/sysdeps/i386/fpu/e_log2f.S
@@ -32,7 +32,7 @@ limit:	.double 0.29
 #endif
 
 	.text
-ENTRY(__log2f)
+ENTRY(__ieee754_log2f)
 #ifdef PIC
 	call	1f
 1:	popl	%edx
@@ -64,5 +64,4 @@ ENTRY(__log2f)
 	fstp	%st(1)
 	fstp	%st(1)
 	ret
-END (__log2f)
-weak_alias (__log2f, log2f)
+END (__ieee754_log2f)
diff --git a/sysdeps/i386/fpu/s_log2l.S b/sysdeps/i386/fpu/e_log2l.S
index 7b645d57ab..f5c661a2d1 100644
--- a/sysdeps/i386/fpu/s_log2l.S
+++ b/sysdeps/i386/fpu/e_log2l.S
@@ -32,7 +32,7 @@ limit:	.double 0.29
 #endif
 
 	.text
-ENTRY(__log2l)
+ENTRY(__ieee754_log2l)
 #ifdef PIC
 	call	1f
 1:	popl	%edx
@@ -64,5 +64,4 @@ ENTRY(__log2l)
 	fstp	%st(1)
 	fstp	%st(1)
 	ret
-END (__log2l)
-weak_alias (__log2l, log2l)
+END (__ieee754_log2l)
diff --git a/sysdeps/i386/fpu/s_frexpl.S b/sysdeps/i386/fpu/s_frexpl.S
index 2645d220ee..56b1456fcb 100644
--- a/sysdeps/i386/fpu/s_frexpl.S
+++ b/sysdeps/i386/fpu/s_frexpl.S
@@ -1,5 +1,5 @@
 /* ix87 specific frexp implementation for long double.
-   Copyright (C) 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -32,12 +32,6 @@
 	ASM_TYPE_DIRECTIVE(two64,@object)
 two64:	.byte 0, 0, 0, 0, 0, 0, 0xf0, 0x43
 	ASM_SIZE_DIRECTIVE(two64)
-	/* The following is LDBL_MAX / ldexp (1.0, 64), the largest
-	   number we can handle the normal way.  */
-	ASM_TYPE_DIRECTIVE(largest,@object)
-largest:
-	.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbe, 0x7f, 0, 0
-	ASM_SIZE_DIRECTIVE(largest)
 
 #ifdef PIC
 #define MO(op) op##@GOTOFF(%edx)
@@ -67,10 +61,7 @@ ENTRY (BP_SYM (__frexpl))
 	je	1f
 
 	cmpl	$0, %eax
-	je	2f
-
-	cmpl	$0x7fbe, %eax
-	ja	4f
+	jne	2f
 
 	fldt	VAL0(%esp)
 #ifdef	PIC
@@ -102,15 +93,5 @@ ENTRY (BP_SYM (__frexpl))
 
 	LEAVE
 	ret
-
-4:	movl	VAL2(%esp), %ecx
-	movl	%ecx, %edx
-	andl	$0x7fff, %ecx
-
-	andl	$0x8000, %edx
-	subl	$16382, %ecx
-	orl	$0x3ffe, %edx
-	movl	%edx, VAL2(%esp)
-	jmp	1b
 END (BP_SYM (__frexpl))
 weak_alias (BP_SYM (__frexpl), BP_SYM (frexpl))
diff --git a/sysdeps/i386/fpu/s_ilogb.S b/sysdeps/i386/fpu/s_ilogb.S
index 36fb000c02..68d9c1a680 100644
--- a/sysdeps/i386/fpu/s_ilogb.S
+++ b/sysdeps/i386/fpu/s_ilogb.S
@@ -9,6 +9,16 @@ RCSID("$NetBSD: s_ilogb.S,v 1.5 1995/10/12 15:53:09 jtc Exp $")
 
 ENTRY(__ilogb)
 	fldl	4(%esp)
+/* I added the following ugly construct because ilogb(+-Inf) is
+   required to return INT_MAX in ISO C99.
+   -- jakub@redhat.com.  */
+	fxam			/* Is NaN or +-Inf?  */
+	fstsw   %ax
+	movb    $0x45, %dh
+	andb    %ah, %dh
+	cmpb    $0x05, %dh
+	je      1f		/* Is +-Inf, jump.  */
+
 	fxtract
 	pushl	%eax
 	fstp	%st
@@ -18,5 +28,9 @@ ENTRY(__ilogb)
 	popl	%eax
 
 	ret
+
+1:	fstp	%st
+	movl	$0x7fffffff, %eax
+	ret
 END (__ilogb)
 weak_alias (__ilogb, ilogb)
diff --git a/sysdeps/i386/fpu/s_ilogbf.S b/sysdeps/i386/fpu/s_ilogbf.S
index 54f9d4647e..521afe2b60 100644
--- a/sysdeps/i386/fpu/s_ilogbf.S
+++ b/sysdeps/i386/fpu/s_ilogbf.S
@@ -9,6 +9,16 @@ RCSID("$NetBSD: s_ilogbf.S,v 1.4 1995/10/22 20:32:43 pk Exp $")
 
 ENTRY(__ilogbf)
 	flds	4(%esp)
+/* I added the following ugly construct because ilogb(+-Inf) is
+   required to return INT_MAX in ISO C99.
+   -- jakub@redhat.com.  */
+	fxam			/* Is NaN or +-Inf?  */
+	fstsw   %ax
+	movb    $0x45, %dh
+	andb    %ah, %dh
+	cmpb    $0x05, %dh
+	je      1f		/* Is +-Inf, jump.  */
+
 	fxtract
 	pushl	%eax
 	fstp	%st
@@ -18,5 +28,9 @@ ENTRY(__ilogbf)
 	popl	%eax
 
 	ret
+
+1:	fstp	%st
+	movl	$0x7fffffff, %eax
+	ret
 END (__ilogbf)
 weak_alias (__ilogbf, ilogbf)
diff --git a/sysdeps/i386/fpu/s_ilogbl.S b/sysdeps/i386/fpu/s_ilogbl.S
index 1dad93abeb..ed547bdc8b 100644
--- a/sysdeps/i386/fpu/s_ilogbl.S
+++ b/sysdeps/i386/fpu/s_ilogbl.S
@@ -10,6 +10,16 @@ RCSID("$NetBSD: $")
 
 ENTRY(__ilogbl)
 	fldt	4(%esp)
+/* I added the following ugly construct because ilogb(+-Inf) is
+   required to return INT_MAX in ISO C99.
+   -- jakub@redhat.com.  */
+	fxam			/* Is NaN or +-Inf?  */
+	fstsw   %ax
+	movb    $0x45, %dh
+	andb    %ah, %dh
+	cmpb    $0x05, %dh
+	je      1f		/* Is +-Inf, jump.  */
+
 	fxtract
 	pushl	%eax
 	fstp	%st
@@ -19,5 +29,9 @@ ENTRY(__ilogbl)
 	popl	%eax
 
 	ret
+
+1:	fstp	%st
+	movl	$0x7fffffff, %eax
+	ret
 END (__ilogbl)
 weak_alias (__ilogbl, ilogbl)
diff --git a/sysdeps/ieee754/dbl-64/e_exp2.c b/sysdeps/ieee754/dbl-64/e_exp2.c
index d02af15ecc..699f44ec4e 100644
--- a/sysdeps/ieee754/dbl-64/e_exp2.c
+++ b/sysdeps/ieee754/dbl-64/e_exp2.c
@@ -1,5 +1,5 @@
 /* Double-precision floating point 2^x.
-   Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Geoffrey Keating <geoffk@ozemail.com.au>
 
@@ -44,10 +44,10 @@ double
 __ieee754_exp2 (double x)
 {
   static const double himark = (double) DBL_MAX_EXP;
-  static const double lomark = (double) (DBL_MIN_EXP - DBL_MANT_DIG - 1) - 1.0;
+  static const double lomark = (double) (DBL_MIN_EXP - DBL_MANT_DIG - 1);
 
   /* Check for usual case.  */
-  if (isless (x, himark) && isgreater (x, lomark))
+  if (isless (x, himark) && isgreaterequal (x, lomark))
     {
       static const double THREEp42 = 13194139533312.0;
       int tval, unsafe;
diff --git a/sysdeps/ieee754/dbl-64/s_log2.c b/sysdeps/ieee754/dbl-64/e_log2.c
index 7379ce85e7..f05d0ce966 100644
--- a/sysdeps/ieee754/dbl-64/s_log2.c
+++ b/sysdeps/ieee754/dbl-64/e_log2.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-/* __log2(x)
+/* __ieee754_log2(x)
  * Return the logarithm to base 2 of x
  *
  * Method :
@@ -79,9 +79,9 @@ static double zero   =  0.0;
 #endif
 
 #ifdef __STDC__
-	double __log2(double x)
+	double __ieee754_log2(double x)
 #else
-	double __log2(x)
+	double __ieee754_log2(x)
 	double x;
 #endif
 {
@@ -128,9 +128,3 @@ static double zero   =  0.0;
 	    return dk-((s*(f-R))-f)/ln2;
 	}
 }
-
-weak_alias (__log2, log2)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__log2, __log2l)
-weak_alias (__log2, log2l)
-#endif
diff --git a/sysdeps/ieee754/dbl-64/s_ilogb.c b/sysdeps/ieee754/dbl-64/s_ilogb.c
index 820f01c9b2..89a833781d 100644
--- a/sysdeps/ieee754/dbl-64/s_ilogb.c
+++ b/sysdeps/ieee754/dbl-64/s_ilogb.c
@@ -16,10 +16,12 @@ static char rcsid[] = "$NetBSD: s_ilogb.c,v 1.9 1995/05/10 20:47:28 jtc Exp $";
 
 /* ilogb(double x)
  * return the binary exponent of non-zero x
- * ilogb(0) = 0x80000001
- * ilogb(inf/NaN) = 0x7fffffff (no signal is raised)
+ * ilogb(0) = FP_ILOGB0
+ * ilogb(NaN) = FP_ILOGBNAN (no signal is raised)
+ * ilogb(+-Inf) = INT_MAX (no signal is raised)
  */
 
+#include <limits.h>
 #include "math.h"
 #include "math_private.h"
 
@@ -47,7 +49,13 @@ static char rcsid[] = "$NetBSD: s_ilogb.c,v 1.9 1995/05/10 20:47:28 jtc Exp $";
 	    return ix;
 	}
 	else if (hx<0x7ff00000) return (hx>>20)-1023;
-	else return FP_ILOGBNAN;
+	else if (FP_ILOGBNAN != INT_MAX) {
+	    /* ISO C99 requires ilogb(+-Inf) == INT_MAX.  */
+	    GET_LOW_WORD(lx,x);
+	    if(((hx^0x7ff00000)|lx) == 0)
+		return INT_MAX;
+	}
+	return FP_ILOGBNAN;
 }
 weak_alias (__ilogb, ilogb)
 #ifdef NO_LONG_DOUBLE
diff --git a/sysdeps/ieee754/flt-32/e_exp2f.c b/sysdeps/ieee754/flt-32/e_exp2f.c
index 4d529ea285..263ee16a9f 100644
--- a/sysdeps/ieee754/flt-32/e_exp2f.c
+++ b/sysdeps/ieee754/flt-32/e_exp2f.c
@@ -1,5 +1,5 @@
 /* Single-precision floating point 2^x.
-   Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Geoffrey Keating <geoffk@ozemail.com.au>
 
@@ -45,10 +45,10 @@ float
 __ieee754_exp2f (float x)
 {
   static const float himark = (float) FLT_MAX_EXP;
-  static const float lomark = (float) (FLT_MIN_EXP - FLT_MANT_DIG - 1) - 1.0;
+  static const float lomark = (float) (FLT_MIN_EXP - FLT_MANT_DIG - 1);
 
   /* Check for usual case.  */
-  if (isless (x, himark) && isgreater (x, lomark))
+  if (isless (x, himark) && isgreaterequal (x, lomark))
     {
       static const float THREEp14 = 49152.0;
       int tval, unsafe;
diff --git a/sysdeps/ieee754/flt-32/s_log2f.c b/sysdeps/ieee754/flt-32/e_log2f.c
index 2377acd36a..af3c6eadfe 100644
--- a/sysdeps/ieee754/flt-32/s_log2f.c
+++ b/sysdeps/ieee754/flt-32/e_log2f.c
@@ -40,9 +40,9 @@ static float zero   =  0.0;
 #endif
 
 #ifdef __STDC__
-	float __log2f(float x)
+	float __ieee754_log2f(float x)
 #else
-	float __log2f(x)
+	float __ieee754_log2f(x)
 	float x;
 #endif
 {
@@ -88,4 +88,3 @@ static float zero   =  0.0;
 	    return dk-((s*(f-R))-f)/ln2;
 	}
 }
-weak_alias (__log2f, log2f)
diff --git a/sysdeps/ieee754/flt-32/s_ilogbf.c b/sysdeps/ieee754/flt-32/s_ilogbf.c
index e652b93619..ea3dc13bcb 100644
--- a/sysdeps/ieee754/flt-32/s_ilogbf.c
+++ b/sysdeps/ieee754/flt-32/s_ilogbf.c
@@ -17,6 +17,7 @@
 static char rcsid[] = "$NetBSD: s_ilogbf.c,v 1.4 1995/05/10 20:47:31 jtc Exp $";
 #endif
 
+#include <limits.h>
 #include "math.h"
 #include "math_private.h"
 
@@ -39,6 +40,11 @@ static char rcsid[] = "$NetBSD: s_ilogbf.c,v 1.4 1995/05/10 20:47:31 jtc Exp $";
 	    return ix;
 	}
 	else if (hx<0x7f800000) return (hx>>23)-127;
-	else return FP_ILOGBNAN;
+	else if (FP_ILOGBNAN != INT_MAX) {
+	    /* ISO C99 requires ilogbf(+-Inf) == INT_MAX.  */
+	    if (hx==0x7f800000)
+		return INT_MAX;
+	}
+	return FP_ILOGBNAN;
 }
 weak_alias (__ilogbf, ilogbf)
diff --git a/sysdeps/ieee754/k_standard.c b/sysdeps/ieee754/k_standard.c
index 22300652e9..6def34bc0c 100644
--- a/sysdeps/ieee754/k_standard.c
+++ b/sysdeps/ieee754/k_standard.c
@@ -88,6 +88,8 @@ static double zero = 0.0;	/* used as const */
  *	45-- exp2 underflow
  *	46-- exp10 overflow
  *	47-- exp10 underflow
+ *	48-- log2(0)
+ *	49-- log2(x<0)
  */
 
 
@@ -937,7 +939,42 @@ static double zero = 0.0;	/* used as const */
 			__set_errno (ERANGE);
 		}
 		break;
-		/* #### Last used is 47/147/247 ### */
+	    case 48:
+	    case 148:
+	    case 248:
+		/* log2(0) */
+		exc.type = SING;
+		exc.name = type < 100 ? "log2" : (type < 200
+						   ? "log2f" : "log2l");
+		if (_LIB_VERSION == _SVID_)
+		  exc.retval = -HUGE;
+		else
+		  exc.retval = -HUGE_VAL;
+		if (_LIB_VERSION == _POSIX_)
+		  __set_errno (ERANGE);
+		else if (!matherr(&exc)) {
+		  __set_errno (EDOM);
+		}
+		break;
+	    case 49:
+	    case 149:
+	    case 249:
+		/* log2(x<0) */
+		exc.type = DOMAIN;
+		exc.name = type < 100 ? "log2" : (type < 200
+						   ? "log2f" : "log2l");
+		if (_LIB_VERSION == _SVID_)
+		  exc.retval = -HUGE;
+		else
+		  exc.retval = NAN;
+		if (_LIB_VERSION == _POSIX_)
+		  __set_errno (EDOM);
+		else if (!matherr(&exc)) {
+		  __set_errno (EDOM);
+		}
+		break;
+		
+		/* #### Last used is 49/149/249 ### */
 	}
 	return exc.retval;
 }
diff --git a/sysdeps/ieee754/ldbl-128/s_ilogbl.c b/sysdeps/ieee754/ldbl-128/s_ilogbl.c
index d2acfd3105..c042aa43d8 100644
--- a/sysdeps/ieee754/ldbl-128/s_ilogbl.c
+++ b/sysdeps/ieee754/ldbl-128/s_ilogbl.c
@@ -19,8 +19,9 @@ static char rcsid[] = "$NetBSD: $";
 
 /* ilogbl(long double x)
  * return the binary exponent of non-zero x
- * ilogbl(0) = 0x80000001
- * ilogbl(inf/NaN) = 0x7fffffff (no signal is raised)
+ * ilogbl(0) = FP_ILOGB0
+ * ilogbl(NaN) = FP_ILOGBNAN (no signal is raised)
+ * ilogbl(+-Inf) = INT_MAX (no signal is raised)
  */
 
 #include "math.h"
@@ -50,6 +51,11 @@ static char rcsid[] = "$NetBSD: $";
 	    return ix;
 	}
 	else if (hx<0x7fff000000000000LL) return (hx>>48)-0x3fff;
-	else return FP_ILOGBNAN;
+	else if (FP_ILOGBNAN != INT_MAX) {
+	    /* ISO C99 requires ilogbl(+-Inf) == INT_MAX.  */
+	    if (((hx^0x7fff000000000000LL)|lx) == 0)
+		return INT_MAX;
+	}
+	return FP_ILOGBNAN;
 }
 weak_alias (__ilogbl, ilogbl)
diff --git a/sysdeps/ieee754/ldbl-96/e_coshl.c b/sysdeps/ieee754/ldbl-96/e_coshl.c
index 6af846cb2d..8c38fa4da2 100644
--- a/sysdeps/ieee754/ldbl-96/e_coshl.c
+++ b/sysdeps/ieee754/ldbl-96/e_coshl.c
@@ -79,16 +79,15 @@ static long double one = 1.0, half=0.5, huge = 1.0e4900L;
 	if (ex < 0x400c || (ex == 0x400c && mx < 0xb1700000u))
 		return half*__ieee754_expl(fabsl(x));
 
-    /* |x| in [log(maxdouble), overflowthresold] */
-	if (ex < 0x400d
-	    || (ex == 0x400d && (mx < 0xb170b513u
-				  || (mx == 0xb170b513u && lx < 0xa1dfd60cu))))
+    /* |x| in [log(maxdouble), log(2*maxdouble)) */
+	if (ex == 0x400c && (mx < 0xb174ddc0u
+			     || (mx == 0xb174ddc0u && lx < 0x31aec0ebu)))
 	{
 	    w = __ieee754_expl(half*fabsl(x));
 	    t = half*w;
 	    return t*w;
 	}
 
-    /* |x| > overflowthresold, cosh(x) overflow */
+    /* |x| >= log(2*maxdouble), cosh(x) overflow */
 	return huge*huge;
 }
diff --git a/sysdeps/ieee754/ldbl-96/s_ilogbl.c b/sysdeps/ieee754/ldbl-96/s_ilogbl.c
index d44229dcda..9688f5af8f 100644
--- a/sysdeps/ieee754/ldbl-96/s_ilogbl.c
+++ b/sysdeps/ieee754/ldbl-96/s_ilogbl.c
@@ -20,10 +20,12 @@ static char rcsid[] = "$NetBSD: $";
 
 /* ilogbl(long double x)
  * return the binary exponent of non-zero x
- * ilogbl(0) = 0x80000001
- * ilogbl(inf/NaN) = 0x7fffffff (no signal is raised)
+ * ilogbl(0) = FP_ILOGB0
+ * ilogbl(NaN) = FP_ILOGBNAN (no signal is raised)
+ * ilogbl(+-Inf) = INT_MAX (no signal is raised)
  */
 
+#include <limits.h>
 #include "math.h"
 #include "math_private.h"
 
@@ -51,6 +53,9 @@ static char rcsid[] = "$NetBSD: $";
 	    return ix;
 	}
 	else if (es<0x7fff) return es-0x3fff;
-	else return FP_ILOGBNAN;
+	else if (FP_ILOGBNAN != INT_MAX && (hx|lx) == 0)
+	    /* ISO C99 requires ilogbl(+-Inf) == INT_MAX.  */
+	    return INT_MAX;
+	return FP_ILOGBNAN;
 }
 weak_alias (__ilogbl, ilogbl)
diff --git a/sysdeps/ieee754/ldbl-96/s_llroundl.c b/sysdeps/ieee754/ldbl-96/s_llroundl.c
index 4a537c871e..61df42d3c2 100644
--- a/sysdeps/ieee754/ldbl-96/s_llroundl.c
+++ b/sysdeps/ieee754/ldbl-96/s_llroundl.c
@@ -1,5 +1,5 @@
 /* Round long double value to long long int.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -59,13 +59,13 @@ __llroundl (long double x)
       else
 	{
 	  u_int32_t j = i1 + (0x80000000 >> (j0 - 31));
+
+	  result = (long long int) i0;
 	  if (j < i1)
-	    ++i0;
+	    ++result;
 
-	  if (j0 == 31)
-	    result = (long long int) i0;
-	  else
-	    result = ((long long int) i0 << (j0 - 31)) | (j >> (63 - j0));
+	  if (j0 > 31)
+	    result = (result << (j0 - 31)) | (j >> (63 - j0));
 	}
     }
   else
diff --git a/sysdeps/m68k/fpu/e_log2.c b/sysdeps/m68k/fpu/e_log2.c
new file mode 100644
index 0000000000..5528922b9c
--- /dev/null
+++ b/sysdeps/m68k/fpu/e_log2.c
@@ -0,0 +1,2 @@
+#define FUNC    __ieee754_log2
+#include <e_acos.c>
diff --git a/sysdeps/m68k/fpu/e_log2f.c b/sysdeps/m68k/fpu/e_log2f.c
new file mode 100644
index 0000000000..ed74933631
--- /dev/null
+++ b/sysdeps/m68k/fpu/e_log2f.c
@@ -0,0 +1,2 @@
+#define FUNC    __ieee754_log10f
+#include <e_acosf.c>
diff --git a/sysdeps/m68k/fpu/e_log2l.c b/sysdeps/m68k/fpu/e_log2l.c
new file mode 100644
index 0000000000..795cfba8c5
--- /dev/null
+++ b/sysdeps/m68k/fpu/e_log2l.c
@@ -0,0 +1,2 @@
+#define FUNC    __ieee754_log10l
+#include <e_acosl.c>
diff --git a/sysdeps/m68k/fpu/s_log2.c b/sysdeps/m68k/fpu/s_log2.c
deleted file mode 100644
index 26e26bae95..0000000000
--- a/sysdeps/m68k/fpu/s_log2.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define FUNC log2
-#include <s_atan.c>
diff --git a/sysdeps/m68k/fpu/s_log2f.c b/sysdeps/m68k/fpu/s_log2f.c
deleted file mode 100644
index 68494322b8..0000000000
--- a/sysdeps/m68k/fpu/s_log2f.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define FUNC log2f
-#include <s_atanf.c>
diff --git a/sysdeps/m68k/fpu/s_log2l.c b/sysdeps/m68k/fpu/s_log2l.c
deleted file mode 100644
index c4eb06332b..0000000000
--- a/sysdeps/m68k/fpu/s_log2l.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define FUNC log2l
-#include <s_atanl.c>