aboutsummaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
Diffstat (limited to 'math')
-rw-r--r--math/Makefile10
-rw-r--r--math/bits/cmathcalls.h5
-rw-r--r--math/bits/mathcalls.h25
-rw-r--r--math/libm-test.c216
-rw-r--r--math/libm.map11
-rw-r--r--math/math.h25
-rw-r--r--math/test-double.c1
-rw-r--r--math/test-float.c1
-rw-r--r--math/test-idouble.c1
-rw-r--r--math/test-ifloat.c3
-rw-r--r--math/tgmath.h312
11 files changed, 562 insertions, 48 deletions
diff --git a/math/Makefile b/math/Makefile
index bc54d57c43..d7525d084d 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -23,7 +23,7 @@ subdir := math
# Installed header files.
headers := math.h bits/mathcalls.h bits/mathinline.h bits/huge_val.h \
bits/nan.h fpu_control.h complex.h bits/cmathcalls.h \
- fenv.h bits/fenv.h bits/mathdef.h
+ fenv.h bits/fenv.h bits/mathdef.h tgmath.h
# Internal header files.
distribute := math_private.h machine/asm.h machine/endian.h
@@ -39,7 +39,6 @@ extra-libs-others = $(extra-libs)
libm-map := libm.map
libm-support = k_standard s_lib_version s_matherr s_signgam \
- s_lrint s_llrint s_lround s_llround \
fclrexcpt fgetexcptflg fraiseexcpt fsetexcptflg \
ftestexcept fegetround fesetround fegetenv feholdexcpt \
fesetenv feupdateenv
@@ -49,8 +48,8 @@ libm-calls = e_acos e_acosh e_asin e_atan2 e_atanh e_cosh e_exp e_fmod \
k_cos k_rem_pio2 k_sin k_tan s_asinh s_atan s_cbrt \
s_ceil s_copysign s_cos s_erf s_expm1 s_fabs s_finite \
s_floor s_frexp s_ilogb s_ldexp s_log1p s_logb \
- s_modf s_nextafter s_rint s_scalbn s_significand \
- s_sin s_tan s_tanh w_acos w_acosh w_asin \
+ s_modf s_nextafter s_nextafterx s_rint s_scalbn s_scalbln \
+ s_significand s_sin s_tan s_tanh w_acos w_acosh w_asin \
w_atan2 w_atanh w_cosh w_drem w_exp w_exp2 w_fmod w_gamma \
w_hypot w_j0 w_j1 w_jn w_lgamma w_lgamma_r \
w_log w_log10 w_pow w_remainder w_scalb w_sinh w_sqrt \
@@ -58,7 +57,8 @@ libm-calls = e_acos e_acosh e_asin e_atan2 e_atanh e_cosh e_exp e_fmod \
s_remquo s_log2 s_exp2 s_round s_nearbyint s_sincos \
conj cimag creal cabs carg s_cexp s_csinh s_ccosh s_clog \
s_catan s_casin s_ccos s_csin s_ctan s_ctanh s_cacos \
- s_casinh s_cacosh s_catanh s_csqrt s_cpow s_cproj
+ s_casinh s_cacosh s_catanh s_csqrt s_cpow s_cproj s_clog10 \
+ s_fma s_lrint s_llrint s_lround s_llround
libm-routines = $(libm-support) $(libm-calls) \
$(patsubst %_rf,%f_r,$(libm-calls:=f)) \
$(long-m-$(long-double-fcts))
diff --git a/math/bits/cmathcalls.h b/math/bits/cmathcalls.h
index d94e764930..ca0dfe1b9c 100644
--- a/math/bits/cmathcalls.h
+++ b/math/bits/cmathcalls.h
@@ -90,6 +90,11 @@ __MATHCALL (cexp, (_Mdouble_complex_ __z));
/* Natural logarithm of Z. */
__MATHCALL (clog, (_Mdouble_complex_ __z));
+#ifdef __USE_GNU
+/* The base 10 logarithm is not defined by the standard but to implement
+ the standard C++ library it is handy. */
+__MATHCALL (clog10, (_Mdouble_complex_ __z));
+#endif
/* Power functions. */
diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h
index e0bf1008d3..dacc264136 100644
--- a/math/bits/mathcalls.h
+++ b/math/bits/mathcalls.h
@@ -232,6 +232,9 @@ __MATHCALL (rint,, (_Mdouble_ __x));
/* Return X + epsilon if X < Y, X - epsilon if X > Y. */
__MATHCALLX (nextafter,, (_Mdouble_ __x, _Mdouble_ __y), (__const__));
+#ifdef __USE_ISOC9X
+__MATHCALLX (nextafterx,, (_Mdouble_ __x, long double __y), (__const__));
+#endif
/* Return the remainder of integer divison X / Y with infinite precision. */
__MATHCALL (remainder,, (_Mdouble_ __x, _Mdouble_ __y));
@@ -240,13 +243,16 @@ __MATHCALL (remainder,, (_Mdouble_ __x, _Mdouble_ __y));
__MATHCALL (scalb,, (_Mdouble_ __x, _Mdouble_ __n));
/* Return X times (2 to the Nth power). */
-__MATHCALL (scalbn,, (_Mdouble_ __x, long int __n));
+__MATHCALL (scalbn,, (_Mdouble_ __x, int __n));
/* Return the binary exponent of X, which must be nonzero. */
__MATHDECL (int,ilogb,, (_Mdouble_ __x));
#endif
#ifdef __USE_ISOC9X
+/* Return X times (2 to the Nth power). */
+__MATHCALL (scalbln,, (_Mdouble_ __x, long int __n));
+
/* Round X to integral valuein floating-point format using current
rounding direction, but do not raise inexact exception. */
__MATHCALL (nearbyint,, (_Mdouble_ __x));
@@ -265,6 +271,19 @@ __MATHCALLX (trunc,, (_Mdouble_ __x), (__const__));
__MATHCALL (remquo,, (_Mdouble_ __x, _Mdouble_ __y, int *__quo));
+/* Conversion functions. */
+
+/* Round X to nearest integral value according to current rounding
+ direction. */
+__MATHDECL (long int, lrint,, (_Mdouble_ __x));
+__MATHDECL (long long int, llrint,, (_Mdouble_ __x));
+
+/* Round X to nearest integral value, rounding halfway cases away from
+ zero. */
+__MATHDECL (long int, lround,, (_Mdouble_ __x));
+__MATHDECL (long long int, llround,, (_Mdouble_ __x));
+
+
/* Return positive difference between X and Y. */
__MATHCALL (fdim,, (_Mdouble_ __x, _Mdouble_ __y));
@@ -282,4 +301,8 @@ __MATHDECL_1 (int, __fpclassify,, (_Mdouble_ __value))
/* Test for negative number. */
__MATHDECL_1 (int, __signbit,, (_Mdouble_ __value))
__attribute__ ((__const__));
+
+
+/* Multiply-add function computed as a ternary operation. */
+__MATHCALL (fma,, (_Mdouble_ __x, _Mdouble_ __y, _Mdouble_ __z));
#endif /* Use ISO C 9X. */
diff --git a/math/libm-test.c b/math/libm-test.c
index 2075adcb59..c24b5f0f83 100644
--- a/math/libm-test.c
+++ b/math/libm-test.c
@@ -4301,6 +4301,160 @@ clog_test (void)
static void
+clog10_test (void)
+{
+ __complex__ MATHTYPE result;
+
+ result = FUNC(clog10) (BUILD_COMPLEX (minus_zero, 0));
+ check_isinfn_exc ("real(clog10(-0 + i0)) = -Inf plus divide-by-zero exception",
+ __real__ result, DIVIDE_BY_ZERO_EXCEPTION);
+ check ("imag(clog10(-0 + i0)) = pi plus divide-by-zero exception",
+ __imag__ result, M_PI);
+ result = FUNC(clog10) (BUILD_COMPLEX (minus_zero, minus_zero));
+ check_isinfn_exc ("real(clog10(-0 - i0)) = -Inf plus divide-by-zero exception",
+ __real__ result, DIVIDE_BY_ZERO_EXCEPTION);
+ check ("imag(clog10(-0 - i0)) = -pi plus divide-by-zero exception",
+ __imag__ result, -M_PI);
+
+ result = FUNC(clog10) (BUILD_COMPLEX (0, 0));
+ check_isinfn_exc ("real(clog10(0 + i0)) = -Inf plus divide-by-zero exception",
+ __real__ result, DIVIDE_BY_ZERO_EXCEPTION);
+ check ("imag(clog10(0 + i0)) = 0 plus divide-by-zero exception",
+ __imag__ result, 0);
+ result = FUNC(clog10) (BUILD_COMPLEX (0, minus_zero));
+ check_isinfn_exc ("real(clog10(0 - i0)) = -Inf plus divide-by-zero exception",
+ __real__ result, DIVIDE_BY_ZERO_EXCEPTION);
+ check ("imag(clog10(0 - i0)) = -0 plus divide-by-zero exception",
+ __imag__ result, minus_zero);
+
+ result = FUNC(clog10) (BUILD_COMPLEX (minus_infty, plus_infty));
+ check_isinfp ("real(clog10(-Inf + i Inf)) = +Inf", __real__ result);
+ check ("imag(clog10(-Inf + i Inf)) = 3*pi/4", __imag__ result, M_PI - M_PI_4);
+ result = FUNC(clog10) (BUILD_COMPLEX (minus_infty, minus_infty));
+ check_isinfp ("real(clog10(-Inf - i Inf)) = +Inf", __real__ result);
+ check ("imag(clog10(-Inf - i Inf)) = -3*pi/4", __imag__ result, M_PI_4 - M_PI);
+
+ result = FUNC(clog10) (BUILD_COMPLEX (plus_infty, plus_infty));
+ check_isinfp ("real(clog10(+Inf + i Inf)) = +Inf", __real__ result);
+ check ("imag(clog10(+Inf + i Inf)) = pi/4", __imag__ result, M_PI_4);
+ result = FUNC(clog10) (BUILD_COMPLEX (plus_infty, minus_infty));
+ check_isinfp ("real(clog10(+Inf - i Inf)) = +Inf", __real__ result);
+ check ("imag(clog10(+Inf - i Inf)) = -pi/4", __imag__ result, -M_PI_4);
+
+ result = FUNC(clog10) (BUILD_COMPLEX (0, plus_infty));
+ check_isinfp ("real(clog10(0 + i Inf)) = +Inf", __real__ result);
+ check ("imag(clog10(0 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+ result = FUNC(clog10) (BUILD_COMPLEX (3, plus_infty));
+ check_isinfp ("real(clog10(3 + i Inf)) = +Inf", __real__ result);
+ check ("imag(clog10(3 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+ result = FUNC(clog10) (BUILD_COMPLEX (minus_zero, plus_infty));
+ check_isinfp ("real(clog10(-0 + i Inf)) = +Inf", __real__ result);
+ check ("imag(clog10(-0 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+ result = FUNC(clog10) (BUILD_COMPLEX (-3, plus_infty));
+ check_isinfp ("real(clog10(-3 + i Inf)) = +Inf", __real__ result);
+ check ("imag(clog10(-3 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+ result = FUNC(clog10) (BUILD_COMPLEX (0, minus_infty));
+ check_isinfp ("real(clog10(0 - i Inf)) = +Inf", __real__ result);
+ check ("imag(clog10(0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+ result = FUNC(clog10) (BUILD_COMPLEX (3, minus_infty));
+ check_isinfp ("real(clog10(3 - i Inf)) = +Inf", __real__ result);
+ check ("imag(clog10(3 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+ result = FUNC(clog10) (BUILD_COMPLEX (minus_zero, minus_infty));
+ check_isinfp ("real(clog10(-0 - i Inf)) = +Inf", __real__ result);
+ check ("imag(clog10(-0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+ result = FUNC(clog10) (BUILD_COMPLEX (-3, minus_infty));
+ check_isinfp ("real(clog10(-3 - i Inf)) = +Inf", __real__ result);
+ check ("imag(clog10(-3 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+
+ result = FUNC(clog10) (BUILD_COMPLEX (minus_infty, 0));
+ check_isinfp ("real(clog10(-Inf + i0)) = +Inf", __real__ result);
+ check ("imag(clog10(-Inf + i0)) = pi", __imag__ result, M_PI);
+ result = FUNC(clog10) (BUILD_COMPLEX (minus_infty, 1));
+ check_isinfp ("real(clog10(-Inf + i1)) = +Inf", __real__ result);
+ check ("imag(clog10(-Inf + i1)) = pi", __imag__ result, M_PI);
+ result = FUNC(clog10) (BUILD_COMPLEX (minus_infty, minus_zero));
+ check_isinfp ("real(clog10(-Inf - i0)) = +Inf", __real__ result);
+ check ("imag(clog10(-Inf - i0)) = -pi", __imag__ result, -M_PI);
+ result = FUNC(clog10) (BUILD_COMPLEX (minus_infty, -1));
+ check_isinfp ("real(clog10(-Inf - i1)) = +Inf", __real__ result);
+ check ("imag(clog10(-Inf - i1)) = -pi", __imag__ result, -M_PI);
+
+ result = FUNC(clog10) (BUILD_COMPLEX (plus_infty, 0));
+ check_isinfp ("real(clog10(+Inf + i0)) = +Inf", __real__ result);
+ check ("imag(clog10(+Inf + i0)) = 0", __imag__ result, 0);
+ result = FUNC(clog10) (BUILD_COMPLEX (plus_infty, 1));
+ check_isinfp ("real(clog10(+Inf + i1)) = +Inf", __real__ result);
+ check ("imag(clog10(+Inf + i1)) = 0", __imag__ result, 0);
+ result = FUNC(clog10) (BUILD_COMPLEX (plus_infty, minus_zero));
+ check_isinfp ("real(clog10(+Inf - i0)) = +Inf", __real__ result);
+ check ("imag(clog10(+Inf - i0)) = -0", __imag__ result, minus_zero);
+ result = FUNC(clog10) (BUILD_COMPLEX (plus_infty, -1));
+ check_isinfp ("real(clog10(+Inf - i1)) = +Inf", __real__ result);
+ check ("imag(clog10(+Inf - i1)) = -0", __imag__ result, minus_zero);
+
+ result = FUNC(clog10) (BUILD_COMPLEX (plus_infty, nan_value));
+ check_isinfp ("real(clog10(+Inf + i NaN)) = +Inf", __real__ result);
+ check_isnan ("imag(clog10(+Inf + i NaN)) = NaN", __imag__ result);
+ result = FUNC(clog10) (BUILD_COMPLEX (minus_infty, nan_value));
+ check_isinfp ("real(clog10(-Inf + i NaN)) = +Inf", __real__ result);
+ check_isnan ("imag(clog10(-Inf + i NaN)) = NaN", __imag__ result);
+
+ result = FUNC(clog10) (BUILD_COMPLEX (nan_value, plus_infty));
+ check_isinfp ("real(clog10(NaN + i Inf)) = +Inf", __real__ result);
+ check_isnan ("imag(clog10(NaN + i Inf)) = NaN", __imag__ result);
+ result = FUNC(clog10) (BUILD_COMPLEX (nan_value, minus_infty));
+ check_isinfp ("real(clog10(NaN - i Inf)) = +Inf", __real__ result);
+ check_isnan ("imag(clog10(NaN - i Inf)) = NaN", __imag__ result);
+
+ result = FUNC(clog10) (BUILD_COMPLEX (0, nan_value));
+ check_isnan_maybe_exc ("real(clog10(0 + i NaN)) = NaN plus maybe invalid exception",
+ __real__ result, INVALID_EXCEPTION);
+ check_isnan ("imag(clog10(0 + i NaN)) = NaN plus maybe invalid exception",
+ __imag__ result);
+ result = FUNC(clog10) (BUILD_COMPLEX (3, nan_value));
+ check_isnan_maybe_exc ("real(clog10(3 + i NaN)) = NaN plus maybe invalid exception",
+ __real__ result, INVALID_EXCEPTION);
+ check_isnan ("imag(clog10(3 + i NaN)) = NaN plus maybe invalid exception",
+ __imag__ result);
+ result = FUNC(clog10) (BUILD_COMPLEX (minus_zero, nan_value));
+ check_isnan_maybe_exc ("real(clog10(-0 + i NaN)) = NaN plus maybe invalid exception",
+ __real__ result, INVALID_EXCEPTION);
+ check_isnan ("imag(clog10(-0 + i NaN)) = NaN plus maybe invalid exception",
+ __imag__ result);
+ result = FUNC(clog10) (BUILD_COMPLEX (-3, nan_value));
+ check_isnan_maybe_exc ("real(clog10(-3 + i NaN)) = NaN plus maybe invalid exception",
+ __real__ result, INVALID_EXCEPTION);
+ check_isnan ("imag(clog10(-3 + i NaN)) = NaN plus maybe invalid exception",
+ __imag__ result);
+
+ result = FUNC(clog10) (BUILD_COMPLEX (nan_value, 0));
+ check_isnan_maybe_exc ("real(clog10(NaN + i0)) = NaN plus maybe invalid exception",
+ __real__ result, INVALID_EXCEPTION);
+ check_isnan ("imag(clog10(NaN + i0)) = NaN plus maybe invalid exception",
+ __imag__ result);
+ result = FUNC(clog10) (BUILD_COMPLEX (nan_value, 5));
+ check_isnan_maybe_exc ("real(clog10(NaN + i5)) = NaN plus maybe invalid exception",
+ __real__ result, INVALID_EXCEPTION);
+ check_isnan ("imag(clog10(NaN + i5)) = NaN plus maybe invalid exception",
+ __imag__ result);
+ result = FUNC(clog10) (BUILD_COMPLEX (nan_value, minus_zero));
+ check_isnan_maybe_exc ("real(clog10(NaN - i0)) = NaN plus maybe invalid exception",
+ __real__ result, INVALID_EXCEPTION);
+ check_isnan ("imag(clog10(NaN - i0)) = NaN plus maybe invalid exception",
+ __imag__ result);
+ result = FUNC(clog10) (BUILD_COMPLEX (nan_value, -5));
+ check_isnan_maybe_exc ("real(clog10(NaN - i5)) = NaN plus maybe invalid exception",
+ __real__ result, INVALID_EXCEPTION);
+ check_isnan ("imag(clog10(NaN - i5)) = NaN plus maybe invalid exception",
+ __imag__ result);
+
+ result = FUNC(clog10) (BUILD_COMPLEX (nan_value, nan_value));
+ check_isnan ("real(clog10(NaN + i NaN)) = NaN", __real__ result);
+ check_isnan ("imag(clog10(NaN + i NaN)) = NaN", __imag__ result);
+}
+
+
+static void
csqrt_test (void)
{
__complex__ MATHTYPE result;
@@ -4539,43 +4693,52 @@ round_test (void)
static void
lround_test (void)
{
- check_long ("lround(0) = 0", lround (0), 0);
- check_long ("lround(-0) = 0", lround (minus_zero), 0);
- check_long ("lround(0.2) = 0", lround (0.2), 0.0);
- check_long ("lround(-0.2) = 0", lround (-0.2), 0);
- check_long ("lround(0.5) = 1", lround (0.5), 1);
- check_long ("lround(-0.5) = -1", lround (-0.5), -1);
- check_long ("lround(0.8) = 1", lround (0.8), 1);
- check_long ("lround(-0.8) = -1", lround (-0.8), -1);
- check_long ("lround(1.5) = 2", lround (1.5), 2);
- check_long ("lround(-1.5) = -2", lround (-1.5), -2);
- check_long ("lround(2097152.5) = 2097153", lround (2097152.5), 2097153);
- check_long ("lround(-2097152.5) = -2097153", lround (-2097152.5),
+ check_long ("lround(0) = 0", FUNC(lround) (0), 0);
+ check_long ("lround(-0) = 0", FUNC(lround) (minus_zero), 0);
+ check_long ("lround(0.2) = 0", FUNC(lround) (0.2), 0.0);
+ check_long ("lround(-0.2) = 0", FUNC(lround) (-0.2), 0);
+ check_long ("lround(0.5) = 1", FUNC(lround) (0.5), 1);
+ check_long ("lround(-0.5) = -1", FUNC(lround) (-0.5), -1);
+ check_long ("lround(0.8) = 1", FUNC(lround) (0.8), 1);
+ check_long ("lround(-0.8) = -1", FUNC(lround) (-0.8), -1);
+ check_long ("lround(1.5) = 2", FUNC(lround) (1.5), 2);
+ check_long ("lround(-1.5) = -2", FUNC(lround) (-1.5), -2);
+ check_long ("lround(22514.5) = 22514", FUNC(lround) (1.5), 2);
+ check_long ("lround(-22514.5) = -22514", FUNC(lround) (-1.5), -2);
+#ifndef TEST_FLOAT
+ check_long ("lround(2097152.5) = 2097153", FUNC(lround) (2097152.5),
+ 2097153);
+ check_long ("lround(-2097152.5) = -2097153", FUNC(lround) (-2097152.5),
-2097153);
+#endif
}
static void
llround_test (void)
{
- check_longlong ("llround(0) = 0", llround (0), 0);
- check_longlong ("llround(-0) = 0", llround (minus_zero), 0);
- check_longlong ("llround(0.2) = 0", llround (0.2), 0.0);
- check_longlong ("llround(-0.2) = 0", llround (-0.2), 0);
- check_longlong ("llround(0.5) = 1", llround (0.5), 1);
- check_longlong ("llround(-0.5) = -1", llround (-0.5), -1);
- check_longlong ("llround(0.8) = 1", llround (0.8), 1);
- check_longlong ("llround(-0.8) = -1", llround (-0.8), -1);
- check_longlong ("llround(1.5) = 2", llround (1.5), 2);
- check_longlong ("llround(-1.5) = -2", llround (-1.5), -2);
+ check_longlong ("llround(0) = 0", FUNC(llround) (0), 0);
+ check_longlong ("llround(-0) = 0", FUNC(llround) (minus_zero), 0);
+ check_longlong ("llround(0.2) = 0", FUNC(llround) (0.2), 0.0);
+ check_longlong ("llround(-0.2) = 0", FUNC(llround) (-0.2), 0);
+ check_longlong ("llround(0.5) = 1", FUNC(llround) (0.5), 1);
+ check_longlong ("llround(-0.5) = -1", FUNC(llround) (-0.5), -1);
+ check_longlong ("llround(0.8) = 1", FUNC(llround) (0.8), 1);
+ check_longlong ("llround(-0.8) = -1", FUNC(llround) (-0.8), -1);
+ check_longlong ("llround(1.5) = 2", FUNC(llround) (1.5), 2);
+ check_longlong ("llround(-1.5) = -2", FUNC(llround) (-1.5), -2);
+ check_longlong ("llround(22514.5) = 22514", FUNC(llround) (1.5), 2);
+ check_longlong ("llround(-22514.5) = -22514", FUNC(llround) (-1.5), -2);
+#ifndef TEST_FLOAT
check_longlong ("llround(2097152.5) = 2097153",
- llround (2097152.5), 2097153);
+ FUNC(llround) (2097152.5), 2097153);
check_longlong ("llround(-2097152.5) = -2097153",
- llround (-2097152.5), -2097153);
+ FUNC(llround) (-2097152.5), -2097153);
check_longlong ("llround(34359738368.5) = 34359738369",
- llround (34359738368.5), 34359738369ll);
+ FUNC(llround) (34359738368.5), 34359738369ll);
check_longlong ("llround(-34359738368.5) = -34359738369",
- llround (-34359738368.5), -34359738369ll);
+ FUNC(llround) (-34359738368.5), -34359738369ll);
+#endif
}
@@ -4962,6 +5125,7 @@ main (int argc, char *argv[])
ccos_test ();
ccosh_test ();
clog_test ();
+ clog10_test ();
cacos_test ();
cacosh_test ();
casin_test ();
diff --git a/math/libm.map b/math/libm.map
index 2a1aa6cfbe..296d55d675 100644
--- a/math/libm.map
+++ b/math/libm.map
@@ -23,6 +23,7 @@ GLIBC_2.0 {
fdim; fdimf; fdiml;
finite; finitef; finitel;
floor; floorf; floorl;
+ fma; fmaf; fmal;
fmax; fmaxf; fmaxl;
fmin; fminf; fminl;
fmod; fmodf; fmodl;
@@ -47,15 +48,19 @@ GLIBC_2.0 {
nan; nanf; nanl;
nearbyint; nearbyintf; nearbyintl;
nextafter; nextafterf; nextafterl;
+ nextafterx; nextafterxf; nextafterxl;
pow; powf; powl;
remainder; remainderf; remainderl;
remquo; remquof; remquol;
rint; rintf; rintl;
- lrint; llrint;
+ lrint; lrintf; lrintl;
+ llrint; llrintf; llrintl;
round; roundf; roundl;
- lround; llround;
+ lround; lroundf; lroundl;
+ llround; llroundf; llroundl;
scalb; scalbf; scalbl;
scalbn; scalbnf; scalbnl;
+ scalbln; scalblnf; scalblnl;
significand; significandf; significandl;
sin; sinf; sinl;
sincos; sincosf; sincosl;
@@ -82,6 +87,8 @@ GLIBC_2.0 {
cexp; cexpf; cexpl;
cimag; cimagf; cimagl;
clog; clogf; clogl;
+ clog10; clog10f; clog10l;
+ __clog10; __clog10f; __clog10l;
conj; conjf; conjl;
cpow; cpowf; cpowl;
cproj; cprojf; cprojl;
diff --git a/math/math.h b/math/math.h
index 762ccbe409..51055849ce 100644
--- a/math/math.h
+++ b/math/math.h
@@ -131,6 +131,18 @@ extern int signgam;
else `float_t' and `double_t' are unspecified
INFINITY representation of the infinity value of type `float_t'
+
+ FP_FAST_FMA
+ FP_FAST_FMAF
+ FP_FAST_FMAL
+ If defined it indicates that the the `fma' function
+ generally executes about as fast as a multiply and an add.
+ This macro is defined only iff the `fma' function is
+ implemented directly with a hardware multiply-add instructions.
+
+ FP_ILOGB0 Expands to a value returned by `ilogb (0.0)'.
+ FP_ILOGBNAN Expands to a value returned by `ilogb (NAN)'.
+
*/
# include <bits/mathdef.h>
@@ -181,19 +193,6 @@ enum
: sizeof (x) == sizeof (double) ? \
__isnan (x) : __isnanl (x))
-
-/* Conversion functions. */
-
-/* Round X to nearest integral value according to current rounding
- direction. */
-extern long int lrint __P ((long double __x));
-extern long long int llrint __P ((long double __x));
-
-/* Round X to nearest integral value, rounding halfway cases away from
- zero. */
-extern long int lround __P ((long double __x));
-extern long long int llround __P ((long double __x));
-
#endif /* Use ISO C 9X. */
#ifdef __USE_MISC
diff --git a/math/test-double.c b/math/test-double.c
index 1f4ff8e0d0..c2e7dc92b3 100644
--- a/math/test-double.c
+++ b/math/test-double.c
@@ -23,6 +23,7 @@
#define MATHCONST(x) x
#define CHOOSE(Clongdouble,Cdouble,Cfloat) Cdouble
#define PRINTF_EXPR "e"
+#define TEST_DOUBLE 1
#ifndef __NO_MATH_INLINES
# define __NO_MATH_INLINES
diff --git a/math/test-float.c b/math/test-float.c
index de918a3886..849067c8da 100644
--- a/math/test-float.c
+++ b/math/test-float.c
@@ -23,6 +23,7 @@
#define MATHCONST(x) x
#define CHOOSE(Clongdouble,Cdouble,Cfloat) Cfloat
#define PRINTF_EXPR "e"
+#define TEST_FLOAT 1
#ifndef __NO_MATH_INLINES
# define __NO_MATH_INLINES
diff --git a/math/test-idouble.c b/math/test-idouble.c
index 614f10feb4..3039ccf5b4 100644
--- a/math/test-idouble.c
+++ b/math/test-idouble.c
@@ -24,6 +24,7 @@
#define MATHCONST(x) x
#define CHOOSE(Clongdouble,Cdouble,Cfloat) Cdouble
#define PRINTF_EXPR "e"
+#define TEST_DOUBLE 1
#define TEST_INLINE
#ifdef __NO_MATH_INLINES
diff --git a/math/test-ifloat.c b/math/test-ifloat.c
index 05e5de62ff..d6f96f8622 100644
--- a/math/test-ifloat.c
+++ b/math/test-ifloat.c
@@ -23,7 +23,8 @@
#define MATHCONST(x) x
#define CHOOSE(Clongdouble,Cdouble,Cfloat) Cfloat
#define PRINTF_EXPR "e"
-#define TEST_INLINE
+#define TEST_FLOAT 1
+#define TEST_INLINE 1
#ifdef __NO_MATH_INLINES
# undef __NO_MATH_INLINES
diff --git a/math/tgmath.h b/math/tgmath.h
new file mode 100644
index 0000000000..4c7d957b37
--- /dev/null
+++ b/math/tgmath.h
@@ -0,0 +1,312 @@
+/* Copyright (C) 1997 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/*
+ * ISO C 9X Standard: 7.9 Type-generic math <tgmath.h>
+ */
+
+#ifndef _TGMATH_H
+#define _TGMATH_H 1
+
+/* Include the needed headers. */
+#include <math.h>
+#include <complex.h>
+
+
+/* Since `complex' is currently not really implemented in most C compilers
+ and if it is implemented, the implementations differ. This makes it
+ quite difficult to write a generic implementation of this header. We
+ do not try this for now and instead concentrate only on GNU CC. Once
+ we have more information support for other compilers might follow. */
+
+#if defined