Use LDBL_MIN_EXP to distinguish Intel and Motorola extended float format

diff --git a/ChangeLog b/ChangeLog
index d8960216fad7f80f02282f18c89f3511b004d0ee..73da793cfa4330181a0a570cd7c8c8a031f07d72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,8 @@
        * stdlib/gen-tst-strtod-round.c (formats): Add Motorola extended
        float format.
        * stdlib/tst-strtod-round.c (TEST) [LDBL_MANT_DIG == 64 &&
-       LDBL_MAX_EXP]: Add case for Motorola extended float format.
+       LDBL_MAX_EXP == 16384]: Add case for Motorola extended float
+       format.
        (test): Regenerate.
 
 2012-09-04  David S. Miller  <davem@davemloft.net>

diff --git a/stdlib/tst-strtod-round.c b/stdlib/tst-strtod-round.c
index 3e75c11c911184d555aefb2d8d06a280a51e7ee7..1edeff6c17683bf62cc9b9326da1b1158d3ce5b8 100644 (file)
--- a/stdlib/tst-strtod-round.c
+++ b/stdlib/tst-strtod-round.c
@@ -39,26 +39,22 @@ struct test {
              ld106exact, ld106d, ld106n, ld106z, ld106u,                     \
              ld113d, ld113n, ld113z, ld113u)                                 \
   { s, fn, dn, true, ld53n }
-#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384
-# if defined __i386__ || defined __x86_64__ || defined __ia64__
+#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && LDBL_MIN_EXP == -16381
 /* This is for the Intel extended float format.  */
-#  define TEST(s, fd, fn, fz, fu, dd, dn, dz, du, ld53d, ld53n, ld53z, ld53u, \
-              ld64id, ld64in, ld64iz, ld64iu,                                \
-              ld64md, ld64mn, ld64mz, ld64mu,                                \
-              ld106exact, ld106d, ld106n, ld106z, ld106u,                    \
-              ld113d, ld113n, ld113z, ld113u)                                \
+# define TEST(s, fd, fn, fz, fu, dd, dn, dz, du, ld53d, ld53n, ld53z, ld53u,  \
+             ld64id, ld64in, ld64iz, ld64iu,                                 \
+             ld64md, ld64mn, ld64mz, ld64mu,                                 \
+             ld106exact, ld106d, ld106n, ld106z, ld106u,                     \
+             ld113d, ld113n, ld113z, ld113u)                                 \
   { s, fn, dn, true, ld64in }
-# elif defined __mc68000__
+#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && LDBL_MIN_EXP == -16382
 /* This is for the Motorola extended float format.  */
-#  define TEST(s, fd, fn, fz, fu, dd, dn, dz, du, ld53d, ld53n, ld53z, ld53u, \
-              ld64id, ld64in, ld64iz, ld64iu,                                \
-              ld64md, ld64mn, ld64mz, ld64mu,                                \
-              ld106exact, ld106d, ld106n, ld106z, ld106u,                    \
-              ld113d, ld113n, ld113z, ld113u)                                \
+# define TEST(s, fd, fn, fz, fu, dd, dn, dz, du, ld53d, ld53n, ld53z, ld53u,  \
+             ld64id, ld64in, ld64iz, ld64iu,                                 \
+             ld64md, ld64mn, ld64mz, ld64mu,                                 \
+             ld106exact, ld106d, ld106n, ld106z, ld106u,                     \
+             ld113d, ld113n, ld113z, ld113u)                                 \
   { s, fn, dn, true, ld64mn }
-# else
-#  error "unknown long double format"
-# endif
 #elif LDBL_MANT_DIG == 106 && LDBL_MAX_EXP == 1024
 # define TEST(s, fd, fn, fz, fu, dd, dn, dz, du, ld53d, ld53n, ld53z, ld53u,  \
              ld64id, ld64in, ld64iz, ld64iu,                                 \