From bfd4c7ae5704af56d7188c35dfe0fa311874a770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 27 Feb 2014 15:59:09 +0100 Subject: Don't pretend to be PLATFORM(IPHONE) or PLATFORM(IPHONE_SIMULATOR) As that ends up triggering other code paths such as JIT on ARM. Change-Id: I14238c0913bd60e07de5015a82bcde0ab08a3a19 Reviewed-by: Simon Hausmann --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h index 3d6d271..0b95639 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -509,6 +509,7 @@ #define WTF_PLATFORM_WIN 1 #endif +#if !PLATFORM(QT) /* PLATFORM(IPHONE) */ /* FIXME: this is sometimes used as an OS switch and sometimes for higher-level things */ #if (defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) @@ -526,6 +527,7 @@ #if !defined(WTF_PLATFORM_IPHONE) #define WTF_PLATFORM_IPHONE 0 #endif +#endif /* PLATFORM(ANDROID) */ /* FIXME: this is sometimes used as an OS() switch, and other times to drive -- cgit v1.2.1