diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-16 08:53:38 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-16 13:31:29 (GMT) |
| commit | d4150975af620e2889cc58bd476bac6b4d101db3 (patch) | |
| tree | 15e000be38cc530e25f68066ade6581d14a4f60d /src/corelib | |
| parent | 2326a8d878e0d18473c27ddd54880621518b6e6e (diff) | |
| download | Qt-d4150975af620e2889cc58bd476bac6b4d101db3.zip Qt-d4150975af620e2889cc58bd476bac6b4d101db3.tar.gz Qt-d4150975af620e2889cc58bd476bac6b4d101db3.tar.bz2 | |
Windows: Add gcc 4.6.
- Add gcc 4.6 mkspec for > 4.4 (win32-g++-4.6)
- Add detection of g++ version and 64bit to configure.
Reviewed-by: mariusSO
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qlocale_tools.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/tools/qlocale_tools.cpp b/src/corelib/tools/qlocale_tools.cpp index df31bf9..750379c 100644 --- a/src/corelib/tools/qlocale_tools.cpp +++ b/src/corelib/tools/qlocale_tools.cpp @@ -2253,6 +2253,13 @@ static int quorem(Bigint *b, Bigint *S) * calculation. */ +#if defined(Q_OS_WIN) && defined (Q_CC_GNU) && !defined(_clear87) // See QTBUG-7576 +extern "C" { +__attribute__ ((dllimport)) unsigned int __cdecl __MINGW_NOTHROW _control87 (unsigned int unNew, unsigned int unMask); +__attribute__ ((dllimport)) unsigned int __cdecl __MINGW_NOTHROW _clearfp (void); /* Clear the FPU status word */ +} +# define _clear87 _clearfp +#endif /* This actually sometimes returns a pointer to a string literal cast to a char*. Do NOT try to modify the return value. */ |