diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-10-07 00:40:12 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-10-07 00:40:12 +0000 |
| commit | b75bc69cdfe5247b2156ce249518f1c1df4d797d (patch) | |
| tree | 7cbc51c7f8a7954e5394fcd873f42f7abeaa22df /sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c | |
| parent | a68dec3b03b9c163ad79192cbe837208b2f90de1 (diff) | |
| download | glibc-b75bc69cdfe5247b2156ce249518f1c1df4d797d.tar.gz glibc-b75bc69cdfe5247b2156ce249518f1c1df4d797d.tar.xz glibc-b75bc69cdfe5247b2156ce249518f1c1df4d797d.zip | |
Don't use dbl-64/wordsize-64 lround based on llround for ILP32 (bug 19079).
The implementation of lround in dbl-64/wordsize-64 as an alias or wrapper for llround is always incorrect when long is not 64-bit, because it misses required exceptions in overflow cases, as shown by my recently added tests. This patch removes that alias / wrapper in the non-LP64 case, together with the REGISTER_CAST_INT32_TO_INT64 macro, restoring the previous version of lround for dbl-64/wordsize-64 (newly conditioned on !_LP64). Tested for x86_64, and for mips64 with use of dbl-64/wordsize-64 enabled. [BZ #19079] * sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c: Restore previous file, conditioned on [!_LP64]. * sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c [!_LP64] (__lround): Do not define as function or alias. [!_LP64] (lround): Likewise. [!_LP64] (__lroundl): Likewise. [!_LP64] (lroundl): Likewise. * sysdeps/tile/sysdep.h (REGISTER_CAST_INT32_TO_INT64): Remove macro. * sysdeps/x86_64/x32/sysdep.h (REGISTER_CAST_INT32_TO_INT64): Likewise.
Diffstat (limited to 'sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c')
| -rw-r--r-- | sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c index 8bb52524b7..483d4a0a4b 100644 --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c +++ b/sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c @@ -69,23 +69,10 @@ strong_alias (__llround, __llroundl) weak_alias (__llround, llroundl) #endif -/* long has the same width as long long on LP64 machines, so use an alias. - If building for ILP32 on a machine with 64-bit registers, however, - use a cast if necessary. */ +/* long has the same width as long long on LP64 machines, so use an alias. */ #undef lround #undef __lround -#if !defined (_LP64) && REGISTER_CAST_INT32_TO_INT64 -long int -__lround (double x) -{ - return __llround (x); -} -weak_alias (__lround, lround) -# ifdef NO_LONG_DOUBLE -strong_alias (__lround, __lroundl) -weak_alias (__lround, lroundl) -# endif -#else +#ifdef _LP64 strong_alias (__llround, __lround) weak_alias (__llround, lround) # ifdef NO_LONG_DOUBLE |