summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-01-09 19:03:34 +1100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-10 14:18:03 +0100
commita6c4c784ab12f376f12b00cad45fa86766270be3 (patch)
tree46f248ce3256686f305a419b120274aae1d0eda2
parentb41c2151fdfca3f63a6cd45f6c69ae678694b63e (diff)
downloadqtjsbackend-a6c4c784ab12f376f12b00cad45fa86766270be3.tar.gz
[V8] Only enable MinGW-w64 pow() workaround if needed
The pow() workaround is no longer needed in the latest version of MinGW-w64. Upstream patch: https://chromiumcodereview.appspot.com/11748033/ Change-Id: I3572a3be2e532ef1e4c728170641f772312c68b7 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rw-r--r--src/3rdparty/v8/src/assembler.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/v8/src/assembler.cc b/src/3rdparty/v8/src/assembler.cc
index be25649..4c1c744 100644
--- a/src/3rdparty/v8/src/assembler.cc
+++ b/src/3rdparty/v8/src/assembler.cc
@@ -1153,7 +1153,8 @@ double power_double_int(double x, int y) {
double power_double_double(double x, double y) {
-#ifdef __MINGW64_VERSION_MAJOR
+#if defined(__MINGW64_VERSION_MAJOR) && \
+ (!defined(__MINGW64_VERSION_RC) || __MINGW64_VERSION_RC < 1)
// MinGW64 has a custom implementation for pow. This handles certain
// special cases that are different.
if ((x == 0.0 || isinf(x)) && isfinite(y)) {