[BZ #2592]

2006-06-17  Joseph S. Myers  <joseph@codesourcery.com>
	[BZ #2592]
	* math/libm-test.inc (lrint_test_tonearest): New function.
	(lrint_test_towardzero): New function.
	(lrint_test_downward): New function.
	(lrint_test_upward): New function.
	(main): Run these new tests.
	* sysdeps/ieee754/dbl-64/s_llrint.c (__llrint): Correct rounding
	of values near to 0.
	(two52): Use double not long double.
	* sysdeps/ieee754/dbl-64/s_lrint.c (__lrint): Likewise.
	* sysdeps/ieee754/flt-32/s_llrintf.c (__llrintf): Likewise.
	(two23): Use float not double.
	* sysdeps/ieee754/flt-32/s_lrintf.c (__lrintf): Likewise.
	(two23): Use float not double.
	* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Likewise.
	* sysdeps/ieee754/ldbl-128/s_lrintl.c (__lrintl): Likewise.
	* sysdeps/ieee754/ldbl-96/s_llrintl.c (__llrintl): Likewise.
	* sysdeps/ieee754/ldbl-96/s_lrintl.c (__lrintl): Likewise.

12 files changed, 248 insertions, 77 deletions

diff --git a/ChangeLog b/ChangeLog
index fb775e8564..c765422fb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2006-06-17  Joseph S. Myers  <joseph@codesourcery.com>
+
+	[BZ #2592]
+	* math/libm-test.inc (lrint_test_tonearest): New function.
+	(lrint_test_towardzero): New function.
+	(lrint_test_downward): New function.
+	(lrint_test_upward): New function.
+	(main): Run these new tests.
+	* sysdeps/ieee754/dbl-64/s_llrint.c (__llrint): Correct rounding
+	of values near to 0.
+	(two52): Use double not long double.
+	* sysdeps/ieee754/dbl-64/s_lrint.c (__lrint): Likewise.
+	* sysdeps/ieee754/flt-32/s_llrintf.c (__llrintf): Likewise.
+	(two23): Use float not double.
+	* sysdeps/ieee754/flt-32/s_lrintf.c (__lrintf): Likewise.
+	(two23): Use float not double.
+	* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Likewise.
+	* sysdeps/ieee754/ldbl-128/s_lrintl.c (__lrintl): Likewise.
+	* sysdeps/ieee754/ldbl-96/s_llrintl.c (__llrintl): Likewise.
+	* sysdeps/ieee754/ldbl-96/s_lrintl.c (__lrintl): Likewise.
+
 2006-09-20  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
 	* sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c (__makecontext):
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 936ae8b256..f72b177038 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-20  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #2823]
+	* locales/mk_MK: Fix date_fmt.  Add week, first_weekday, and
+	first_workday information.
+	Patch by Damjan Georgievski.
+
 2006-09-05  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/or_IN (mon): Fix February string.
diff --git a/localedata/locales/mk_MK b/localedata/locales/mk_MK
index 55a4ec70db..85f972c6e5 100644
--- a/localedata/locales/mk_MK
+++ b/localedata/locales/mk_MK
@@ -1,8 +1,8 @@
 comment_char %
 escape_char /
 % Macedonian language locale for Macedonia
-% Damjan Georgievski <gdamjan@freemail.org.mk>
-% Revision: 1.8 (2000-11-07)
+% Damjan Georgievski { gdamjan %% gmail.com }
+% Revision: 2.2 (2006-09-12)
 % Charsets: UTF-8, ISO-8859-5, CP1251
 % Distribution and use is free, also
 % for commercial purposes.
@@ -12,13 +12,13 @@ title      "Macedonian locale for Macedonia"
 source     ""
 address    ""
 contact    "Damjan Georgievski"
-email      "gdamjan@freemail.org.mk"
+email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "Macedonian"
 territory  "Macedonia"
-revision   "1.8"
-date       "2000-11-07"
+revision   "2.2"
+date       "2006-09-12"
 %
 category  "mk_MK:2000";LC_IDENTIFICATION
 category  "mk_MK:2000";LC_CTYPE
@@ -82,9 +82,12 @@ d_fmt   "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059>"
 t_fmt   "<U0025><U0054>"
 am_pm   "";""
 t_fmt_ampm ""
-date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+date_fmt "<U0025><U0061><U002C><U0020><U0025><U0064><U0020><U0025><U0062>/
 <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
 <U0025><U005A><U0020><U0025><U0059>"
+week    7;19971201;4
+first_weekday 1 % Monday
+first_workday 1 % Monday
 END LC_TIME
 
 LC_MONETARY
diff --git a/math/libm-test.inc b/math/libm-test.inc
index b99255fd6d..c27cc652ac 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -3273,6 +3273,166 @@ lrint_test (void)
 
 
 static void
+lrint_test_tonearest (void)
+{
+  int save_round_mode;
+  START (lrint_tonearest);
+
+  save_round_mode = fegetround ();
+
+  if (!fesetround (FE_TONEAREST))
+    {
+      TEST_f_l (lrint, 0.0, 0);
+      TEST_f_l (lrint, minus_zero, 0);
+      TEST_f_l (lrint, 0.2L, 0);
+      TEST_f_l (lrint, -0.2L, 0);
+      TEST_f_l (lrint, 0.5L, 0);
+      TEST_f_l (lrint, -0.5L, 0);
+      TEST_f_l (lrint, 0.8L, 1);
+      TEST_f_l (lrint, -0.8L, -1);
+
+      TEST_f_l (lrint, 1.4L, 1);
+      TEST_f_l (lrint, -1.4L, -1);
+
+      TEST_f_l (lrint, 8388600.3L, 8388600);
+      TEST_f_l (lrint, -8388600.3L, -8388600);
+
+      TEST_f_l (lrint, 1071930.0008, 1071930);
+#ifndef TEST_FLOAT
+      TEST_f_l (lrint, 1073741824.01, 1073741824);
+# if LONG_MAX > 281474976710656
+      TEST_f_l (lrint, 281474976710656.025, 281474976710656);
+# endif
+#endif
+    }
+
+  fesetround (save_round_mode);
+
+  END (lrint_tonearest);
+}
+
+
+static void
+lrint_test_towardzero (void)
+{
+  int save_round_mode;
+  START (lrint_towardzero);
+
+  save_round_mode = fegetround ();
+
+  if (!fesetround (FE_TOWARDZERO))
+    {
+      TEST_f_l (lrint, 0.0, 0);
+      TEST_f_l (lrint, minus_zero, 0);
+      TEST_f_l (lrint, 0.2L, 0);
+      TEST_f_l (lrint, -0.2L, 0);
+      TEST_f_l (lrint, 0.5L, 0);
+      TEST_f_l (lrint, -0.5L, 0);
+      TEST_f_l (lrint, 0.8L, 0);
+      TEST_f_l (lrint, -0.8L, 0);
+
+      TEST_f_l (lrint, 1.4L, 1);
+      TEST_f_l (lrint, -1.4L, -1);
+
+      TEST_f_l (lrint, 8388600.3L, 8388600);
+      TEST_f_l (lrint, -8388600.3L, -8388600);
+
+      TEST_f_l (lrint, 1071930.0008, 1071930);
+#ifndef TEST_FLOAT
+      TEST_f_l (lrint, 1073741824.01, 1073741824);
+# if LONG_MAX > 281474976710656
+      TEST_f_l (lrint, 281474976710656.025, 281474976710656);
+# endif
+#endif
+    }
+
+  fesetround (save_round_mode);
+
+  END (lrint_towardzero);
+}
+
+
+static void
+lrint_test_downward (void)
+{
+  int save_round_mode;
+  START (lrint_downward);
+
+  save_round_mode = fegetround ();
+
+  if (!fesetround (FE_DOWNWARD))
+    {
+      TEST_f_l (lrint, 0.0, 0);
+      TEST_f_l (lrint, minus_zero, 0);
+      TEST_f_l (lrint, 0.2L, 0);
+      TEST_f_l (lrint, -0.2L, -1);
+      TEST_f_l (lrint, 0.5L, 0);
+      TEST_f_l (lrint, -0.5L, -1);
+      TEST_f_l (lrint, 0.8L, 0);
+      TEST_f_l (lrint, -0.8L, -1);
+
+      TEST_f_l (lrint, 1.4L, 1);
+      TEST_f_l (lrint, -1.4L, -2);
+
+      TEST_f_l (lrint, 8388600.3L, 8388600);
+      TEST_f_l (lrint, -8388600.3L, -8388601);
+
+      TEST_f_l (lrint, 1071930.0008, 1071930);
+#ifndef TEST_FLOAT
+      TEST_f_l (lrint, 1073741824.01, 1073741824);
+# if LONG_MAX > 281474976710656
+      TEST_f_l (lrint, 281474976710656.025, 281474976710656);
+# endif
+#endif
+    }
+
+  fesetround (save_round_mode);
+
+  END (lrint_downward);
+}
+
+
+static void
+lrint_test_upward (void)
+{
+  int save_round_mode;
+  START (lrint_upward);
+
+  save_round_mode = fegetround ();
+
+  if (!fesetround (FE_UPWARD))
+    {
+      TEST_f_l (lrint, 0.0, 0);
+      TEST_f_l (lrint, minus_zero, 0);
+      TEST_f_l (lrint, 0.2L, 1);
+      TEST_f_l (lrint, -0.2L, 0);
+      TEST_f_l (lrint, 0.5L, 1);
+      TEST_f_l (lrint, -0.5L, 0);
+      TEST_f_l (lrint, 0.8L, 1);
+      TEST_f_l (lrint, -0.8L, 0);
+
+      TEST_f_l (lrint, 1.4L, 2);
+      TEST_f_l (lrint, -1.4L, -1);
+
+      TEST_f_l (lrint, 8388600.3L, 8388601);
+      TEST_f_l (lrint, -8388600.3L, -8388600);
+
+#ifndef TEST_FLOAT
+      TEST_f_l (lrint, 1071930.0008, 1071931);
+      TEST_f_l (lrint, 1073741824.01, 1073741825);
+# if LONG_MAX > 281474976710656 && defined (TEST_LDOUBLE)
+      TEST_f_l (lrint, 281474976710656.025, 28147497671065);
+# endif
+#endif
+    }
+
+  fesetround (save_round_mode);
+
+  END (lrint_upward);
+}
+
+
+static void
 llrint_test (void)
 {
   /* XXX this test is incomplete.  We need to have a way to specifiy
@@ -5937,6 +6097,10 @@ main (int argc, char **argv)
   rint_test_downward ();
   rint_test_upward ();
   lrint_test ();
+  lrint_test_tonearest ();
+  lrint_test_towardzero ();
+  lrint_test_downward ();
+  lrint_test_upward ();
   llrint_test ();
   llrint_test_tonearest ();
   llrint_test_towardzero ();
diff --git a/sysdeps/ieee754/dbl-64/s_llrint.c b/sysdeps/ieee754/dbl-64/s_llrint.c
index 893bd716b5..64c870eaaa 100644
--- a/sysdeps/ieee754/dbl-64/s_llrint.c
+++ b/sysdeps/ieee754/dbl-64/s_llrint.c
@@ -1,6 +1,6 @@
 /* Round argument to nearest integral value according to current rounding
    direction.
-   Copyright (C) 1997, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2004, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -23,7 +23,7 @@
 
 #include "math_private.h"
 
-static const long double two52[2] =
+static const double two52[2] =
 {
   4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
  -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
@@ -48,19 +48,14 @@ __llrint (double x)
 
   if (j0 < 20)
     {
-      if (j0 < -1)
-	return 0;
-      else
-	{
-	  w = two52[sx] + x;
-	  t = w - two52[sx];
-	  EXTRACT_WORDS (i0, i1, t);
-	  j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
-	  i0 &= 0xfffff;
-	  i0 |= 0x100000;
+      w = two52[sx] + x;
+      t = w - two52[sx];
+      EXTRACT_WORDS (i0, i1, t);
+      j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
+      i0 &= 0xfffff;
+      i0 |= 0x100000;
 
-	  result = i0 >> (20 - j0);
-	}
+      result = (j0 < 0 ? 0 : i0 >> (20 - j0));
     }
   else if (j0 < (int32_t) (8 * sizeof (long long int)) - 1)
     {
diff --git a/sysdeps/ieee754/dbl-64/s_lrint.c b/sysdeps/ieee754/dbl-64/s_lrint.c
index 2da68d4dcd..1084ed6e2d 100644
--- a/sysdeps/ieee754/dbl-64/s_lrint.c
+++ b/sysdeps/ieee754/dbl-64/s_lrint.c
@@ -1,6 +1,6 @@
 /* Round argument to nearest integral value according to current rounding
    direction.
-   Copyright (C) 1997, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2004, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -48,19 +48,14 @@ __lrint (double x)
 
   if (j0 < 20)
     {
-      if (j0 < -1)
-	return 0;
-      else
-	{
-	  w = two52[sx] + x;
-	  t = w - two52[sx];
-	  EXTRACT_WORDS (i0, i1, t);
-	  j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
-	  i0 &= 0xfffff;
-	  i0 |= 0x100000;
+      w = two52[sx] + x;
+      t = w - two52[sx];
+      EXTRACT_WORDS (i0, i1, t);
+      j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
+      i0 &= 0xfffff;
+      i0 |= 0x100000;
 
-	  result = i0 >> (20 - j0);
-	}
+      result = (j0 < 0 ? 0 : i0 >> (20 - j0));
     }
   else if (j0 < (int32_t) (8 * sizeof (long int)) - 1)
     {
diff --git a/sysdeps/ieee754/flt-32/s_llrintf.c b/sysdeps/ieee754/flt-32/s_llrintf.c
index 3b9a484a8d..7c6e4bcda4 100644
--- a/sysdeps/ieee754/flt-32/s_llrintf.c
+++ b/sysdeps/ieee754/flt-32/s_llrintf.c
@@ -1,6 +1,6 @@
 /* Round argument to nearest integral value according to current rounding
    direction.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -23,7 +23,7 @@
 
 #include "math_private.h"
 
-static const double two23[2] =
+static const float two23[2] =
 {
   8.3886080000e+06, /* 0x4B000000 */
  -8.3886080000e+06, /* 0xCB000000 */
@@ -49,9 +49,7 @@ __llrintf (float x)
 
   if (j0 < (int32_t) (sizeof (long long int) * 8) - 1)
     {
-      if (j0 < -1)
-	return 0;
-      else if (j0 >= 23)
+      if (j0 >= 23)
 	result = (long long int) i0 << (j0 - 23);
       else
 	{
@@ -62,7 +60,7 @@ __llrintf (float x)
 	  i0 &= 0x7fffff;
 	  i0 |= 0x800000;
 
-	  result = i0 >> (23 - j0);
+	  result = (j0 < 0 ? 0 : i0 >> (23 - j0));
 	}
     }
   else
diff --git a/sysdeps/ieee754/flt-32/s_lrintf.c b/sysdeps/ieee754/flt-32/s_lrintf.c
index 2a156f7ce2..64486a4c3e 100644
--- a/sysdeps/ieee754/flt-32/s_lrintf.c
+++ b/sysdeps/ieee754/flt-32/s_lrintf.c
@@ -1,6 +1,6 @@
 /* Round argument to nearest integral value according to current rounding
    direction.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -23,7 +23,7 @@
 
 #include "math_private.h"
 
-static const double two23[2] =
+static const float two23[2] =
 {
   8.3886080000e+06, /* 0x4B000000 */
  -8.3886080000e+06, /* 0xCB000000 */
@@ -49,9 +49,7 @@ __lrintf (float x)
 
   if (j0 < (int32_t) (sizeof (long int) * 8) - 1)
     {
-      if (j0 < -1)
-	return 0;
-      else if (j0 >= 23)
+      if (j0 >= 23)
 	result = (long int) i0 << (j0 - 23);
       else
 	{
@@ -62,7 +60,7 @@ __lrintf (float x)
 	  i0 &= 0x7fffff;
 	  i0 |= 0x800000;
 
-	  result = i0 >> (23 - j0);
+	  result = (j0 < 0 ? 0 : i0 >> (23 - j0));
 	}
     }
   else
diff --git a/sysdeps/ieee754/ldbl-128/s_llrintl.c b/sysdeps/ieee754/ldbl-128/s_llrintl.c
index ee66454e2f..5804f57d11 100644
--- a/sysdeps/ieee754/ldbl-128/s_llrintl.c
+++ b/sysdeps/ieee754/ldbl-128/s_llrintl.c
@@ -48,8 +48,6 @@ __llrintl (long double x)
 
   if (j0 < (int32_t) (8 * sizeof (long long int)) - 1)
     {
-      if (j0 < -1)
-	return 0;
       w = two112[sx] + x;
       t = w - two112[sx];
       GET_LDOUBLE_WORDS64 (i0, i1, t);
@@ -57,7 +55,9 @@ __llrintl (long double x)
       i0 &= 0x0000ffffffffffffLL;
       i0 |= 0x0001000000000000LL;
 
-      if (j0 <= 48)
+      if (j0 < 0)
+	result = 0;
+      else if (j0 <= 48)
 	result = i0 >> (48 - j0);
       else
 	result = ((long long int) i0 << (j0 - 48)) | (i1 >> (112 - j0));
diff --git a/sysdeps/ieee754/ldbl-128/s_lrintl.c b/sysdeps/ieee754/ldbl-128/s_lrintl.c
index 66f9a429fc..53835a4bbc 100644
--- a/sysdeps/ieee754/ldbl-128/s_lrintl.c
+++ b/sysdeps/ieee754/ldbl-128/s_lrintl.c
@@ -1,6 +1,6 @@
 /* Round argument to nearest integral value according to current rounding
    direction.
-   Copyright (C) 1997, 1999, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2004, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997 and
    		  Jakub Jelinek <jj@ultra.linux.cz>, 1999.
@@ -48,19 +48,14 @@ __lrintl (long double x)
 
   if (j0 < 48)
     {
-      if (j0 < -1)
-	return 0;
-      else
-	{
-	  w = two112[sx] + x;
-	  t = w - two112[sx];
-	  GET_LDOUBLE_WORDS64 (i0, i1, x);
-	  j0 = ((i0 >> 48) & 0x7fff) - 0x3fff;
-	  i0 &= 0x0000ffffffffffffLL;
-	  i0 |= 0x0001000000000000LL;
+      w = two112[sx] + x;
+      t = w - two112[sx];
+      GET_LDOUBLE_WORDS64 (i0, i1, x);
+      j0 = ((i0 >> 48) & 0x7fff) - 0x3fff;
+      i0 &= 0x0000ffffffffffffLL;
+      i0 |= 0x0001000000000000LL;
 
-	  result = i0 >> (48 - j0);
-	}
+      result = (j0 < 0 ? 0 : i0 >> (48 - j0));
     }
   else if (j0 < (int32_t) (8 * sizeof (long int)) - 1)
     {
diff --git a/sysdeps/ieee754/ldbl-96/s_llrintl.c b/sysdeps/ieee754/ldbl-96/s_llrintl.c
index e927a8af40..d6eedf1f33 100644
--- a/sysdeps/ieee754/ldbl-96/s_llrintl.c
+++ b/sysdeps/ieee754/ldbl-96/s_llrintl.c
@@ -1,6 +1,6 @@
 /* Round argument to nearest integral value according to current rounding
    direction.
-   Copyright (C) 1997, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2004, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -47,9 +47,7 @@ __llrintl (long double x)
 
   if (j0 < (int32_t) (8 * sizeof (long long int)) - 1)
     {
-      if (j0 < -1)
-	return 0;
-      else if (j0 >= 63)
+      if (j0 >= 63)
 	result = (((long long int) i0 << 32) | i1) << (j0 - 63);
       else
 	{
@@ -58,7 +56,9 @@ __llrintl (long double x)
 	  GET_LDOUBLE_WORDS (se, i0, i1, t);
 	  j0 = (se & 0x7fff) - 0x3fff;
 
-	  if (j0 <= 31)
+	  if (j0 < 0)
+	    result = 0;
+	  else if (j0 <= 31)
 	    result = i0 >> (31 - j0);
 	  else
 	    result = ((long long int) i0 << (j0 - 31)) | (i1 >> (63 - j0));
diff --git a/sysdeps/ieee754/ldbl-96/s_lrintl.c b/sysdeps/ieee754/ldbl-96/s_lrintl.c
index 4212093989..621951d87b 100644
--- a/sysdeps/ieee754/ldbl-96/s_lrintl.c
+++ b/sysdeps/ieee754/ldbl-96/s_lrintl.c
@@ -1,6 +1,6 @@
 /* Round argument to nearest integral value according to current rounding
    direction.
-   Copyright (C) 1997, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2004, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -47,17 +47,12 @@ __lrintl (long double x)
 
   if (j0 < 31)
     {
-      if (j0 < -1)
-	return 0;
-      else
-	{
-	  w = two63[sx] + x;
-	  t = w - two63[sx];
-	  GET_LDOUBLE_WORDS (se, i0, i1, t);
-	  j0 = (se & 0x7fff) - 0x3fff;
+      w = two63[sx] + x;
+      t = w - two63[sx];
+      GET_LDOUBLE_WORDS (se, i0, i1, t);
+      j0 = (se & 0x7fff) - 0x3fff;
 
-	  result = i0 >> (31 - j0);
-	}
+      result = (j0 < 0 ? 0 : i0 >> (31 - j0));
     }
   else if (j0 < (int32_t) (8 * sizeof (long int)) - 1)
     {