Don't disable CMPLXL macro for __NO_LONG_DOUBLE_MATH (bug 15488).

This commit is contained in:
Joseph Myers 2013-05-18 12:12:38 +00:00
parent 3779b5b64a
commit 2ee094ff75
5 changed files with 13 additions and 10 deletions

View File

@ -1,5 +1,15 @@
2013-05-18 Joseph Myers <joseph@codesourcery.com>
[BZ #15488]
* math/complex.h [__USE_ISOC11 && __GNUC_PREREQ (4, 7) &&
__NO_LONG_DOUBLE_MATH] (CMPLXL): Define macro.
* math/tst-CMPLX.c (do_test) [NO_LONG_DOUBLE]: Do not disable long
double tests.
* make/tst-CMPLX2.c [NO_LONG_DOUBLE] (check_long_double): Do not
disable.
(do_test) [NO_LONG_DOUBLE]: Do not disable call to
check_long_double.
* math/gen-libm-test.pl (@tests): Remove variable.
($count): Likewise.
(new_test): Remove function.

3
NEWS
View File

@ -17,7 +17,8 @@ Version 2.18
15086, 15160, 15214, 15221, 15232, 15234, 15283, 15285, 15287, 15304,
15305, 15307, 15309, 15327, 15330, 15335, 15336, 15337, 15342, 15346,
15359, 15361, 15366, 15380, 15394, 15395, 15405, 15406, 15409, 15416,
15418, 15419, 15423, 15424, 15426, 15429, 15442, 15448, 15480, 15485.
15418, 15419, 15423, 15424, 15426, 15429, 15442, 15448, 15480, 15485,
15488.
* CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla
#15078).

View File

@ -52,10 +52,8 @@ __BEGIN_DECLS
/* Macros to expand into expression of specified complex type. */
# define CMPLX(x, y) __builtin_complex ((double) (x), (double) (y))
# define CMPLXF(x, y) __builtin_complex ((float) (x), (float) (y))
# ifndef __NO_LONG_DOUBLE_MATH
# define CMPLXL(x, y) __builtin_complex ((long double) (x), (long double) (y))
#endif
#endif
/* The file <bits/cmathcalls.h> contains the prototypes for all the
actual math functions. These macros are used for those prototypes,

View File

@ -45,9 +45,7 @@ CMPLX (" #r ", " #i ") does not produce complex " #t ": %zu\n", s); \
C (CMPLXF, float);
C (CMPLX, double);
# ifndef NO_LONG_DOUBLE
C (CMPLXL, long double);
# endif
#endif
return result;

View File

@ -120,7 +120,6 @@ check_double (void)
double, comparec, CMPLX);
}
# ifndef NO_LONG_DOUBLE
static void
check_long_double (void)
{
@ -128,7 +127,6 @@ check_long_double (void)
long double, comparecl, CMPLXL);
}
#endif
#endif
static int
do_test (void)
@ -136,9 +134,7 @@ do_test (void)
#ifdef CMPLX
check_float ();
check_double ();
# ifndef NO_LONG_DOUBLE
check_long_double ();
# endif
#endif
return result;