Remove libm-test START_DATA and END_DATA.

3 files changed, 172 insertions, 347 deletions

diff --git a/ChangeLog b/ChangeLog
index 69100a60d0..95cd66dd1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,177 @@
 2013-05-24  Joseph Myers  <joseph@codesourcery.com>
 
+	* math/gen-libm-test.pl (generate_testfile): Do not handle
+	START_DATA and END_DATA.
+	* math/libm-test.inc (acos_test_data): Do not use START_DATA and
+	END_DATA.
+	(acos_tonearest_test_data): Likewise.
+	(acos_towardzero_test_data): Likewise.
+	(acos_downward_test_data): Likewise.
+	(acos_upward_test_data): Likewise.
+	(acosh_test_data): Likewise.
+	(asin_test_data): Likewise.
+	(asin_tonearest_test_data): Likewise.
+	(asin_towardzero_test_data): Likewise.
+	(asin_downward_test_data): Likewise.
+	(asin_upward_test_data): Likewise.
+	(asinh_test_data): Likewise.
+	(atan_test_data): Likewise.
+	(atanh_test_data): Likewise.
+	(atan2_test_data): Likewise.
+	(cabs_test_data): Likewise.
+	(cacos_test_data): Likewise.
+	(cacosh_test_data): Likewise.
+	(carg_test_data): Likewise.
+	(casin_test_data): Likewise.
+	(casinh_test_data): Likewise.
+	(catan_test_data): Likewise.
+	(catanh_test_data): Likewise.
+	(cbrt_test_data): Likewise.
+	(ccos_test_data): Likewise.
+	(ccosh_test_data): Likewise.
+	(ceil_test_data): Likewise.
+	(cexp_test_data): Likewise.
+	(cimag_test_data): Likewise.
+	(clog_test_data): Likewise.
+	(clog10_test_data): Likewise.
+	(conj_test_data): Likewise.
+	(copysign_test_data): Likewise.
+	(cos_test_data): Likewise.
+	(cos_tonearest_test_data): Likewise.
+	(cos_towardzero_test_data): Likewise.
+	(cos_downward_test_data): Likewise.
+	(cos_upward_test_data): Likewise.
+	(cosh_test_data): Likewise.
+	(cosh_tonearest_test_data): Likewise.
+	(cosh_towardzero_test_data): Likewise.
+	(cosh_downward_test_data): Likewise.
+	(cosh_upward_test_data): Likewise.
+	(cpow_test_data): Likewise.
+	(cproj_test_data): Likewise.
+	(creal_test_data): Likewise.
+	(csin_test_data): Likewise.
+	(csinh_test_data): Likewise.
+	(csqrt_test_data): Likewise.
+	(ctan_test_data): Likewise.
+	(ctan_tonearest_test_data): Likewise.
+	(ctan_towardzero_test_data): Likewise.
+	(ctan_downward_test_data): Likewise.
+	(ctan_upward_test_data): Likewise.
+	(ctanh_test_data): Likewise.
+	(ctanh_tonearest_test_data): Likewise.
+	(ctanh_towardzero_test_data): Likewise.
+	(ctanh_downward_test_data): Likewise.
+	(ctanh_upward_test_data): Likewise.
+	(erf_test_data): Likewise.
+	(erfc_test_data): Likewise.
+	(exp_test_data): Likewise.
+	(exp_tonearest_test_data): Likewise.
+	(exp_towardzero_test_data): Likewise.
+	(exp_downward_test_data): Likewise.
+	(exp_upward_test_data): Likewise.
+	(exp10_test_data): Likewise.
+	(exp2_test_data): Likewise.
+	(expm1_test_data): Likewise.
+	(fabs_test_data): Likewise.
+	(fdim_test_data): Likewise.
+	(finite_test_data): Likewise.
+	(floor_test_data): Likewise.
+	(fma_test_data): Likewise.
+	(fma_towardzero_test_data): Likewise.
+	(fma_downward_test_data): Likewise.
+	(fma_upward_test_data): Likewise.
+	(fmax_test_data): Likewise.
+	(fmin_test_data): Likewise.
+	(fmod_test_data): Likewise.
+	(fpclassify_test_data): Likewise.
+	(frexp_test_data): Likewise.
+	(gamma_test_data): Likewise.
+	(hypot_test_data): Likewise.
+	(ilogb_test_data): Likewise.
+	(isfinite_test_data): Likewise.
+	(isgreater_test_data): Likewise.
+	(isgreaterequal_test_data): Likewise.
+	(isinf_test_data): Likewise.
+	(isless_test_data): Likewise.
+	(islessequal_test_data): Likewise.
+	(islessgreater_test_data): Likewise.
+	(isnan_test_data): Likewise.
+	(isnormal_test_data): Likewise.
+	(issignaling_test_data): Likewise.
+	(isunordered_test_data): Likewise.
+	(j0_test_data): Likewise.
+	(j1_test_data): Likewise.
+	(jn_test_data): Likewise.
+	(ldexp_test_data): Likewise.
+	(lgamma_test_data): Likewise.
+	(lrint_test_data): Likewise.
+	(lrint_tonearest_test_data): Likewise.
+	(lrint_towardzero_test_data): Likewise.
+	(lrint_downward_test_data): Likewise.
+	(lrint_upward_test_data): Likewise.
+	(llrint_test_data): Likewise.
+	(llrint_tonearest_test_data): Likewise.
+	(llrint_towardzero_test_data): Likewise.
+	(llrint_downward_test_data): Likewise.
+	(llrint_upward_test_data): Likewise.
+	(log_test_data): Likewise.
+	(log10_test_data): Likewise.
+	(log1p_test_data): Likewise.
+	(log2_test_data): Likewise.
+	(logb_test_data): Likewise.
+	(logb_downward_test_data): Likewise.
+	(lround_test_data): Likewise.
+	(llround_test_data): Likewise.
+	(modf_test_data): Likewise.
+	(nearbyint_test_data): Likewise.
+	(nextafter_test_data): Likewise.
+	(nexttoward_test_data): Likewise.
+	(pow_test_data): Likewise.
+	(pow_tonearest_test_data): Likewise.
+	(pow_towardzero_test_data): Likewise.
+	(pow_downward_test_data): Likewise.
+	(pow_upward_test_data): Likewise.
+	(remainder_test_data): Likewise.
+	(remainder_tonearest_test_data): Likewise.
+	(remainder_towardzero_test_data): Likewise.
+	(remainder_downward_test_data): Likewise.
+	(remainder_upward_test_data): Likewise.
+	(remquo_test_data): Likewise.
+	(rint_test_data): Likewise.
+	(rint_tonearest_test_data): Likewise.
+	(rint_towardzero_test_data): Likewise.
+	(rint_downward_test_data): Likewise.
+	(rint_upward_test_data): Likewise.
+	(round_test_data): Likewise.
+	(scalb_test_data): Likewise.
+	(scalbn_test_data): Likewise.
+	(scalbln_test_data): Likewise.
+	(signbit_test_data): Likewise.
+	(sin_test_data): Likewise.
+	(sin_tonearest_test_data): Likewise.
+	(sin_towardzero_test_data): Likewise.
+	(sin_downward_test_data): Likewise.
+	(sin_upward_test_data): Likewise.
+	(sincos_test_data): Likewise.
+	(sinh_test_data): Likewise.
+	(sinh_tonearest_test_data): Likewise.
+	(sinh_towardzero_test_data): Likewise.
+	(sinh_downward_test_data): Likewise.
+	(sinh_upward_test_data): Likewise.
+	(sqrt_test_data): Likewise.
+	(tan_test_data): Likewise.
+	(tan_tonearest_test_data): Likewise.
+	(tan_towardzero_test_data): Likewise.
+	(tan_downward_test_data): Likewise.
+	(tan_upward_test_data): Likewise.
+	(tanh_test_data): Likewise.
+	(tgamma_test_data): Likewise.
+	(trunc_test_data): Likewise.
+	(y0_test_data): Likewise.
+	(y1_test_data): Likewise.
+	(yn_test_data): Likewise.
+	(significand_test_data): Likewise.
+
 	* math/gen-libm-test.pl (@functions): Remove variable.
 	(generate_testfile): Don't handle START and END lines.
 	* math/libm-test.inc (START): New macro.
diff --git a/math/gen-libm-test.pl b/math/gen-libm-test.pl
index cdf3eb471a..c2d10d35e8 100755
--- a/math/gen-libm-test.pl
+++ b/math/gen-libm-test.pl
@@ -300,14 +300,6 @@ sub generate_testfile {
       &parse_args (\*OUTPUT, $descr, $args);
       next;
     }
-    # START_DATA (function)
-    if (/START_DATA/) {
-      next;
-    }
-    # END_DATA (function)
-    if (/END_DATA/) {
-      next;
-    }
     print OUTPUT;
   }
   close INPUT;
diff --git a/math/libm-test.inc b/math/libm-test.inc
index 29ae881402..48ea02f60c 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -1485,7 +1485,6 @@ matherr (struct exception *x __attribute__ ((unused)))
 
 static const struct test_f_f_data acos_test_data[] =
   {
-    START_DATA (acos),
     TEST_f_f (acos, plus_infty, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
     TEST_f_f (acos, minus_infty, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
     TEST_f_f (acos, qnan_value, qnan_value),
@@ -1517,7 +1516,6 @@ static const struct test_f_f_data acos_test_data[] =
     TEST_f_f (acos, 0x0.ffffffffffffffffp0L, 3.2927225399135962333718255320079907245059e-10L),
     TEST_f_f (acos, -0x0.ffffffffffffffffp0L, 3.1415926532605209844712837599423203309964L),
 #endif
-    END_DATA (acos)
   };
 
 static void
@@ -1531,14 +1529,12 @@ acos_test (void)
 
 static const struct test_f_f_data acos_tonearest_test_data[] =
   {
-    START_DATA (acos_tonearest),
     TEST_f_f (acos, 0, M_PI_2l),
     TEST_f_f (acos, minus_zero, M_PI_2l),
     TEST_f_f (acos, 1, 0),
     TEST_f_f (acos, -1, M_PIl),
     TEST_f_f (acos, 0.5, M_PI_6l*2.0),
     TEST_f_f (acos, -0.5, M_PI_6l*4.0),
-    END_DATA (acos_tonearest)
   };
 
 static void
@@ -1552,14 +1548,12 @@ acos_test_tonearest (void)
 
 static const struct test_f_f_data acos_towardzero_test_data[] =
   {
-    START_DATA (acos_towardzero),
     TEST_f_f (acos, 0, M_PI_2l),
     TEST_f_f (acos, minus_zero, M_PI_2l),
     TEST_f_f (acos, 1, 0),
     TEST_f_f (acos, -1, M_PIl),
     TEST_f_f (acos, 0.5, M_PI_6l*2.0),
     TEST_f_f (acos, -0.5, M_PI_6l*4.0),
-    END_DATA (acos_towardzero)
   };
 
 static void
@@ -1573,14 +1567,12 @@ acos_test_towardzero (void)
 
 static const struct test_f_f_data acos_downward_test_data[] =
   {
-    START_DATA (acos_downward),
     TEST_f_f (acos, 0, M_PI_2l),
     TEST_f_f (acos, minus_zero, M_PI_2l),
     TEST_f_f (acos, 1, 0),
     TEST_f_f (acos, -1, M_PIl),
     TEST_f_f (acos, 0.5, M_PI_6l*2.0),
     TEST_f_f (acos, -0.5, M_PI_6l*4.0),
-    END_DATA (acos_downward)
   };
 
 static void
@@ -1594,14 +1586,12 @@ acos_test_downward (void)
 
 static const struct test_f_f_data acos_upward_test_data[] =
   {
-    START_DATA (acos_upward),
     TEST_f_f (acos, 0, M_PI_2l),
     TEST_f_f (acos, minus_zero, M_PI_2l),
     TEST_f_f (acos, 1, 0),
     TEST_f_f (acos, -1, M_PIl),
     TEST_f_f (acos, 0.5, M_PI_6l*2.0),
     TEST_f_f (acos, -0.5, M_PI_6l*4.0),
-    END_DATA (acos_upward)
   };
 
 static void
@@ -1614,7 +1604,6 @@ acos_test_upward (void)
 
 static const struct test_f_f_data acosh_test_data[] =
   {
-    START_DATA (acosh),
     TEST_f_f (acosh, plus_infty, plus_infty),
     TEST_f_f (acosh, minus_infty, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
     TEST_f_f (acosh, qnan_value, qnan_value),
@@ -1625,7 +1614,6 @@ static const struct test_f_f_data acosh_test_data[] =
 
     TEST_f_f (acosh, 1, 0),
     TEST_f_f (acosh, 7, 2.63391579384963341725009269461593689L),
-    END_DATA (acosh)
   };
 
 static void
@@ -1638,7 +1626,6 @@ acosh_test (void)
 
 static const struct test_f_f_data asin_test_data[] =
   {
-    START_DATA (asin),
     TEST_f_f (asin, plus_infty, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
     TEST_f_f (asin, minus_infty, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
     TEST_f_f (asin, qnan_value, qnan_value),
@@ -1668,7 +1655,6 @@ static const struct test_f_f_data asin_test_data[] =
     TEST_f_f (asin, 0x0.ffffffffffffffffp0L, 1.5707963264656243652399620683025688888978L),
     TEST_f_f (asin, -0x0.ffffffffffffffffp0L, -1.5707963264656243652399620683025688888978L),
 #endif
-    END_DATA (asin)
   };
 
 static void
@@ -1682,14 +1668,12 @@ asin_test (void)
 
 static const struct test_f_f_data asin_tonearest_test_data[] =
   {
-    START_DATA (asin_tonearest),
     TEST_f_f (asin, 0, 0),
     TEST_f_f (asin, minus_zero, minus_zero),
     TEST_f_f (asin, 0.5, M_PI_6l),
     TEST_f_f (asin, -0.5, -M_PI_6l),
     TEST_f_f (asin, 1.0, M_PI_2l),
     TEST_f_f (asin, -1.0, -M_PI_2l),
-    END_DATA (asin_tonearest)
   };
 
 static void
@@ -1703,14 +1687,12 @@ asin_test_tonearest (void)
 
 static const struct test_f_f_data asin_towardzero_test_data[] =
   {
-    START_DATA (asin_towardzero),
     TEST_f_f (asin, 0, 0),
     TEST_f_f (asin, minus_zero, minus_zero),
     TEST_f_f (asin, 0.5, M_PI_6l),
     TEST_f_f (asin, -0.5, -M_PI_6l),
     TEST_f_f (asin, 1.0, M_PI_2l),
     TEST_f_f (asin, -1.0, -M_PI_2l),
-    END_DATA (asin_towardzero)
   };
 
 static void
@@ -1724,14 +1706,12 @@ asin_test_towardzero (void)
 
 static const struct test_f_f_data asin_downward_test_data[] =
   {
-    START_DATA (asin_downward),
     TEST_f_f (asin, 0, 0),
     TEST_f_f (asin, minus_zero, minus_zero),
     TEST_f_f (asin, 0.5, M_PI_6l),
     TEST_f_f (asin, -0.5, -M_PI_6l),
     TEST_f_f (asin, 1.0, M_PI_2l),
     TEST_f_f (asin, -1.0, -M_PI_2l),
-    END_DATA (asin_downward)
   };
 
 static void
@@ -1745,14 +1725,12 @@ asin_test_downward (void)
 
 static const struct test_f_f_data asin_upward_test_data[] =
   {
-    START_DATA (asin_upward),
     TEST_f_f (asin, 0, 0),
     TEST_f_f (asin, minus_zero, minus_zero),
     TEST_f_f (asin, 0.5, M_PI_6l),
     TEST_f_f (asin, -0.5, -M_PI_6l),
     TEST_f_f (asin, 1.0, M_PI_2l),
     TEST_f_f (asin, -1.0, -M_PI_2l),
-    END_DATA (asin_upward)
   };
 
 static void
@@ -1765,7 +1743,6 @@ asin_test_upward (void)
 
 static const struct test_f_f_data asinh_test_data[] =
   {
-    START_DATA (asinh),
     TEST_f_f (asinh, 0, 0),
     TEST_f_f (asinh, minus_zero, minus_zero),
 #ifndef TEST_INLINE
@@ -1774,7 +1751,6 @@ static const struct test_f_f_data asinh_test_data[] =
 #endif
     TEST_f_f (asinh, qnan_value, qnan_value),
     TEST_f_f (asinh, 0.75L, 0.693147180559945309417232121458176568L),
-    END_DATA (asinh)
   };
 
 static void
@@ -1787,7 +1763,6 @@ asinh_test (void)
 
 static const struct test_f_f_data atan_test_data[] =
   {
-    START_DATA (atan),
     TEST_f_f (atan, 0, 0),
     TEST_f_f (atan, minus_zero, minus_zero),
 
@@ -1809,7 +1784,6 @@ static const struct test_f_f_data atan_test_data[] =
 #if defined TEST_LDOUBLE && LDBL_MIN_EXP <= -16381
     TEST_f_f (atan, 0x1p-10000L, 0x1p-10000L),
 #endif
-    END_DATA (atan)
   };
 
 static void
@@ -1824,7 +1798,6 @@ atan_test (void)
 
 static const struct test_f_f_data atanh_test_data[] =
   {
-    START_DATA (atanh),
     TEST_f_f (atanh, 0, 0),
     TEST_f_f (atanh, minus_zero, minus_zero),
 
@@ -1839,7 +1812,6 @@ static const struct test_f_f_data atanh_test_data[] =
     TEST_f_f (atanh, -max_value, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
 
     TEST_f_f (atanh, 0.75L, 0.972955074527656652552676371721589865L),
-    END_DATA (atanh)
   };
 
 static void
@@ -1852,7 +1824,6 @@ atanh_test (void)
 
 static const struct test_ff_f_data atan2_test_data[] =
   {
-    START_DATA (atan2),
     /* atan2 (0,x) == 0 for x > 0.  */
     TEST_ff_f (atan2, 0, 1, 0),
 
@@ -1923,7 +1894,6 @@ static const struct test_ff_f_data atan2_test_data[] =
 #if defined TEST_LDOUBLE && LDBL_MANT_DIG >= 64
     TEST_ff_f (atan2, 0x1.00000000000001p0L, 0x1.00000000000001p0L, M_PI_4l),
 #endif
-    END_DATA (atan2)
   };
 
 static void
@@ -1936,7 +1906,6 @@ atan2_test (void)
 
 static const struct test_c_f_data cabs_test_data[] =
   {
-    START_DATA (cabs);
     /* cabs (x + iy) is specified as hypot (x,y) */
 
     /* cabs (+inf + i x) == +inf.  */
@@ -1968,7 +1937,6 @@ static const struct test_c_f_data cabs_test_data[] =
     TEST_c_f (cabs, 5.7e7L, 0, 5.7e7L),
 
     TEST_c_f (cabs, 0.75L, 1.25L, 1.45773797371132511771853821938639577L),
-    END_DATA (cabs);
   };
 
 static void
@@ -1982,7 +1950,6 @@ cabs_test (void)
 
 static const struct test_c_c_data cacos_test_data[] =
   {
-    START_DATA (cacos),
     TEST_c_c (cacos, 0, 0, M_PI_2l, minus_zero),
     TEST_c_c (cacos, minus_zero, 0, M_PI_2l, minus_zero),
     TEST_c_c (cacos, minus_zero, minus_zero, M_PI_2l, 0.0),
@@ -2661,7 +2628,6 @@ static const struct test_c_c_data cacos_test_data[] =
 
     TEST_c_c (cacos, 0.75L, 1.25L, 1.11752014915610270578240049553777969L, -1.13239363160530819522266333696834467L),
     TEST_c_c (cacos, -2, -3, 2.1414491111159960199416055713254211L, 1.9833870299165354323470769028940395L),
-    END_DATA (cacos)
   };
 
 static void
@@ -2674,7 +2640,6 @@ cacos_test (void)
 
 static const struct test_c_c_data cacosh_test_data[] =
   {
-    START_DATA (cacosh),
     TEST_c_c (cacosh, 0, 0, 0.0, M_PI_2l),
     TEST_c_c (cacosh, minus_zero, 0, 0.0, M_PI_2l),
     TEST_c_c (cacosh, 0, minus_zero, 0.0, -M_PI_2l),
@@ -3347,7 +3312,6 @@ static const struct test_c_c_data cacosh_test_data[] =
 
     TEST_c_c (cacosh, 0.75L, 1.25L, 1.13239363160530819522266333696834467L, 1.11752014915610270578240049553777969L),
     TEST_c_c (cacosh, -2, -3, 1.9833870299165354323470769028940395L, -2.1414491111159960199416055713254211L),
-    END_DATA (cacosh)
   };
 
 static void
@@ -3361,7 +3325,6 @@ cacosh_test (void)
 
 static const struct test_c_f_data carg_test_data[] =
   {
-    START_DATA (carg);
     /* carg (x + iy) is specified as atan2 (y, x) */
 
     /* carg (x + i 0) == 0 for x > 0.  */
@@ -3420,7 +3383,6 @@ static const struct test_c_f_data carg_test_data[] =
     TEST_c_f (carg, minus_infty, minus_infty, -M_PI_34l),
 
     TEST_c_f (carg, qnan_value, qnan_value, qnan_value),
-    END_DATA (carg);
   };
 
 static void
@@ -3433,7 +3395,6 @@ carg_test (void)
 
 static const struct test_c_c_data casin_test_data[] =
   {
-    START_DATA (casin),
     TEST_c_c (casin, 0, 0, 0.0, 0.0),
     TEST_c_c (casin, minus_zero, 0, minus_zero, 0.0),
     TEST_c_c (casin, 0, minus_zero, 0.0, minus_zero),
@@ -4116,7 +4077,6 @@ static const struct test_c_c_data casin_test_data[] =
 
     TEST_c_c (casin, 0.75L, 1.25L, 0.453276177638793913448921196101971749L, 1.13239363160530819522266333696834467L),
     TEST_c_c (casin, -2, -3, -0.57065278432109940071028387968566963L, -1.9833870299165354323470769028940395L),
-    END_DATA (casin)
   };
 
 static void
@@ -4130,7 +4090,6 @@ casin_test (void)
 
 static const struct test_c_c_data casinh_test_data[] =
   {
-    START_DATA (casinh),
     TEST_c_c (casinh, 0, 0, 0.0, 0.0),
     TEST_c_c (casinh, minus_zero, 0, minus_zero, 0),
     TEST_c_c (casinh, 0, minus_zero, 0.0, minus_zero),
@@ -4813,7 +4772,6 @@ static const struct test_c_c_data casinh_test_data[] =
 
     TEST_c_c (casinh, 0.75L, 1.25L, 1.03171853444778027336364058631006594L, 0.911738290968487636358489564316731207L),
     TEST_c_c (casinh, -2, -3, -1.9686379257930962917886650952454982L, -0.96465850440760279204541105949953237L),
-    END_DATA (casinh)
   };
 
 static void
@@ -4827,7 +4785,6 @@ casinh_test (void)
 
 static const struct test_c_c_data catan_test_data[] =
   {
-    START_DATA (catan),
     TEST_c_c (catan, 0, 0, 0, 0),
     TEST_c_c (catan, minus_zero, 0, minus_zero, 0),
     TEST_c_c (catan, 0, minus_zero, 0, minus_zero),
@@ -5324,7 +5281,6 @@ static const struct test_c_c_data catan_test_data[] =
 
     TEST_c_c (catan, 0.75L, 1.25L, 1.10714871779409050301706546017853704L, 0.549306144334054845697622618461262852L),
     TEST_c_c (catan, -2, -3, -1.4099210495965755225306193844604208L, -0.22907268296853876629588180294200276L),
-    END_DATA (catan)
   };
 
 static void
@@ -5337,7 +5293,6 @@ catan_test (void)
 
 static const struct test_c_c_data catanh_test_data[] =
   {
-    START_DATA (catanh),
     TEST_c_c (catanh, 0, 0, 0.0, 0.0),
     TEST_c_c (catanh, minus_zero, 0, minus_zero, 0.0),
     TEST_c_c (catanh, 0, minus_zero, 0.0, minus_zero),
@@ -5833,7 +5788,6 @@ static const struct test_c_c_data catanh_test_data[] =
 
     TEST_c_c (catanh, 0.75L, 1.25L, 0.261492138795671927078652057366532140L, 0.996825126463918666098902241310446708L),
     TEST_c_c (catanh, -2, -3, -0.14694666622552975204743278515471595L, -1.3389725222944935611241935759091443L),
-    END_DATA (catanh)
   };
 
 static void
@@ -5846,7 +5800,6 @@ catanh_test (void)
 
 static const struct test_f_f_data cbrt_test_data[] =
   {
-    START_DATA (cbrt),
     TEST_f_f (cbrt, 0.0, 0.0),
     TEST_f_f (cbrt, minus_zero, minus_zero),
 
@@ -5859,7 +5812,6 @@ static const struct test_f_f_data cbrt_test_data[] =
     TEST_f_f (cbrt, -27.0, -3.0),
     TEST_f_f (cbrt, 0.9921875L, 0.997389022060725270579075195353955217L),
     TEST_f_f (cbrt, 0.75L, 0.908560296416069829445605878163630251L),
-    END_DATA (cbrt)
   };
 
 static void
@@ -5873,7 +5825,6 @@ cbrt_test (void)
 
 static const struct test_c_c_data ccos_test_data[] =
   {
-    START_DATA (ccos),
     TEST_c_c (ccos, 0.0, 0.0, 1.0, minus_zero),
     TEST_c_c (ccos, minus_zero, 0.0, 1.0, 0.0),
     TEST_c_c (ccos, 0.0, minus_zero, 1.0, 0.0),
@@ -5960,7 +5911,6 @@ static const struct test_c_c_data ccos_test_data[] =
 
     TEST_c_c (ccos, min_subnorm_value * 0x1p120, 0x1p-120, 1.0, -min_subnorm_value, UNDERFLOW_EXCEPTION),
     TEST_c_c (ccos, 0x1p-120, min_subnorm_value * 0x1p120, 1.0, -min_subnorm_value, UNDERFLOW_EXCEPTION),
-    END_DATA (ccos)
   };
 
 static void
@@ -5974,7 +5924,6 @@ ccos_test (void)
 
 static const struct test_c_c_data ccosh_test_data[] =
   {
-    START_DATA (ccosh),
     TEST_c_c (ccosh, 0.0, 0.0, 1.0, 0.0),
     TEST_c_c (ccosh, minus_zero, 0.0, 1.0, minus_zero),
     TEST_c_c (ccosh, 0.0, minus_zero, 1.0, minus_zero),
@@ -6062,7 +6011,6 @@ static const struct test_c_c_data ccosh_test_data[] =
 
     TEST_c_c (ccosh, min_subnorm_value * 0x1p120, 0x1p-120, 1.0, min_subnorm_value, UNDERFLOW_EXCEPTION),
     TEST_c_c (ccosh, 0x1p-120, min_subnorm_value * 0x1p120, 1.0, min_subnorm_value, UNDERFLOW_EXCEPTION),
-    END_DATA (ccosh)
   };
 
 static void
@@ -6076,7 +6024,6 @@ ccosh_test (void)
 
 static const struct test_f_f_data ceil_test_data[] =
   {
-    START_DATA (ceil),
     TEST_f_f (ceil, 0.0, 0.0, NO_INEXACT_EXCEPTION),
     TEST_f_f (ceil, minus_zero, minus_zero, NO_INEXACT_EXCEPTION),
     TEST_f_f (ceil, plus_infty, plus_infty, NO_INEXACT_EXCEPTION),
@@ -6162,7 +6109,6 @@ static const struct test_f_f_data ceil_test_data[] =
     TEST_f_f (ceil, 10141204801825835211973625643008.75L, 10141204801825835211973625643009.0L),
     TEST_f_f (ceil, 10141204801825835211973625643009.5L, 10141204801825835211973625643010.0L),
 #endif
-    END_DATA (ceil)
   };
 
 static void
@@ -6176,7 +6122,6 @@ ceil_test (void)
 
 static const struct test_c_c_data cexp_test_data[] =
   {
-    START_DATA (cexp),
     TEST_c_c (cexp, plus_zero, plus_zero, 1, 0.0),
     TEST_c_c (cexp, minus_zero, plus_zero, 1, 0.0),
     TEST_c_c (cexp, plus_zero, minus_zero, 1, minus_zero),
@@ -6272,7 +6217,6 @@ static const struct test_c_c_data cexp_test_data[] =
 
     TEST_c_c (cexp, min_value, min_subnorm_value, 1.0, min_subnorm_value, UNDERFLOW_EXCEPTION),
     TEST_c_c (cexp, min_value, -min_subnorm_value, 1.0, -min_subnorm_value, UNDERFLOW_EXCEPTION),
-    END_DATA (cexp)
   };
 
 static void
@@ -6286,7 +6230,6 @@ cexp_test (void)
 
 static const struct test_c_f_data cimag_test_data[] =
   {
-    START_DATA (cimag);
     TEST_c_f (cimag, 1.0, 0.0, 0.0, NO_INEXACT_EXCEPTION),
     TEST_c_f (cimag, 1.0, minus_zero, minus_zero, NO_INEXACT_EXCEPTION),
     TEST_c_f (cimag, 1.0, qnan_value, qnan_value, NO_INEXACT_EXCEPTION),
@@ -6294,7 +6237,6 @@ static const struct test_c_f_data cimag_test_data[] =
     TEST_c_f (cimag, 1.0, plus_infty, plus_infty, NO_INEXACT_EXCEPTION),
     TEST_c_f (cimag, 1.0, minus_infty, minus_infty, NO_INEXACT_EXCEPTION),
     TEST_c_f (cimag, 2.0, 3.0, 3.0, NO_INEXACT_EXCEPTION),
-    END_DATA (cimag);
   };
 
 static void
@@ -6307,7 +6249,6 @@ cimag_test (void)
 
 static const struct test_c_c_data clog_test_data[] =
   {
-    START_DATA (clog),
     TEST_c_c (clog, minus_zero, 0, minus_infty, M_PIl, DIVIDE_BY_ZERO_EXCEPTION),
     TEST_c_c (clog, minus_zero, minus_zero, minus_infty, -M_PIl, DIVIDE_BY_ZERO_EXCEPTION),
 
@@ -6513,7 +6454,6 @@ static const struct test_c_c_data clog_test_data[] =
     TEST_c_c (clog, 0xdb85c467ee2aadd5f425fe0f4b8dp-114L, 0x3e83162a0f95f1dcbf97dddf410eap-114L, 4.6017338806965821566734340588575402712716e-67L, 1.3547418904611758959096647942223384691728L),
     TEST_c_c (clog, 0x1415bcaf2105940d49a636e98ae59p-115L, 0x7e6a150adfcd1b0921d44b31f40f4p-115L, 2.5993421227864195179698176012564317527271e-67L, 1.4132318089683022770487383611430906982461L),
 #endif
-    END_DATA (clog)
   };
 
 static void
@@ -6527,7 +6467,6 @@ clog_test (void)
 
 static const struct test_c_c_data clog10_test_data[] =
   {
-    START_DATA (clog10),
     TEST_c_c (clog10, minus_zero, 0, minus_infty, M_PIl, DIVIDE_BY_ZERO_EXCEPTION),
     TEST_c_c (clog10, minus_ze