am 9ceae0c9: Merge "Use FLT_ROUNDS in LP64 strtold."

* commit '9ceae0c9a62c8ffce1e3d9d79f494e692951cbc5':
  Use FLT_ROUNDS in LP64 strtold.
This commit is contained in:
Elliott Hughes 2014-04-17 23:21:57 +00:00 committed by Android Git Automerger
commit 31028f852d

View File

@ -26,6 +26,7 @@
* SUCH DAMAGE.
*/
#include <float.h>
#include <stdlib.h>
extern "C" int __strtorQ(const char*, char**, int, void*);
@ -33,8 +34,7 @@ extern "C" int __strtorQ(const char*, char**, int, void*);
long double strtold(const char* s, char** end_ptr) {
#if __LP64__
long double result;
// TODO: use the current rounding mode?
__strtorQ(s, end_ptr, 1 /* FPI_Round_near */, &result);
__strtorQ(s, end_ptr, FLT_ROUNDS, &result);
return result;
#else
// This is fine for LP32 where long double is just double.