Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I5ce25e65626e497c32e5ecdc7a644ab8f5d3a1eb

4 files changed, 19 insertions, 14 deletions

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp
index 71ab6e8..f42e69d 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/MacroAssemblerARM.cpp
@@ -37,14 +37,7 @@
 #include <unistd.h>
 #include <elf.h>
 # if OS(ANDROID) && PLATFORM(QT)
-typedef struct
-{
-    uint32_t a_type;
-    union
-    {
-        uint32_t a_val;
-    } a_un;
-} Elf32_auxv_t;
+# include <asm/procinfo.h>
 # else
 # include <asm/hwcap.h>
 # endif
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
index 3d6d271..85ed8a7 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
@@ -202,6 +202,11 @@
 #if   defined(__x86_64__) \
     || defined(_M_X64)
 #define WTF_CPU_X86_64 1
+
+#if defined(__ILP32__)
+#define WTF_CPU_X32 1
+#endif
+
 #endif
 
 /* 64-bit mode on AIX */
@@ -509,6 +514,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 +532,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
@@ -904,7 +911,7 @@
 #endif
 
 #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
+#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
 #define WTF_USE_JSVALUE64 1
 #elif CPU(ARM) || CPU(PPC64)
 #define WTF_USE_JSVALUE32 1
@@ -921,6 +928,11 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
 #define ENABLE_REPAINT_THROTTLING 0
 #endif
 
+/* Disable JIT on x32 */
+#if CPU(X32)
+#define ENABLE_JIT 0
+#endif
+
 #if !defined(ENABLE_JIT)
 
 /* The JIT is tested & working on x86_64 Mac */
diff --git a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
index e0e7a5b..1097a41 100644
--- a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
+++ b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
@@ -809,7 +809,7 @@ void tst_QScriptEngineAgent::functionEntryAndExit_native2()
     delete spy;
 }
 
-/** check behaiviour of native function throwing error*/
+/** check behavior of native function throwing error*/
 void tst_QScriptEngineAgent::functionEntryAndExit_nativeThrowing()
 {
     /* This function was changed from old backend. JSC return more Entrys / Exits, (exactly +1)
@@ -2353,7 +2353,7 @@ void tst_QScriptEngineAgent::hasUncaughtException()
   QVERIFY2(spy->isPass(), "At least one of a functionExit event should set hasUncaughtException flag.");
   spy->reset();
 
-  // Check catched exception.
+  // Check caught exception.
   eng.evaluate("function innerFoo() { throw new Error('ciao') }");
   eng.evaluate("function foo() {try { innerFoo() } catch (e) {} }");
   scriptValue = QScriptValue(eng.globalObject().property("foo")).call();
diff --git a/tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp b/tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp
index 68c598f..bd82afa 100644
--- a/tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp
+++ b/tests/benchmarks/script/qscriptclass/tst_qscriptclass.cpp
@@ -117,7 +117,7 @@ private:
     QScriptString foo;
 };
 
-// Test the overhead of getting a value of QScriptClass accross the Javascript engine
+// Test the overhead of getting a value of QScriptClass across the Javascript engine
 void tst_QScriptClass::property()
 {
     QScriptEngine eng;
@@ -130,7 +130,7 @@ void tst_QScriptClass::property()
     }
 }
 
-// Test the overhead of setting a value on QScriptClass accross the Javascript engine
+// Test the overhead of setting a value on QScriptClass across the Javascript engine
 void tst_QScriptClass::setProperty()
 {
     QScriptEngine eng;
@@ -144,7 +144,7 @@ void tst_QScriptClass::setProperty()
     }
 }
 
-// Test the time taken to get the propeties flags accross the engine
+// Test the time taken to get the propeties flags across the engine
 void tst_QScriptClass::propertyFlags()
 {
     QScriptEngine eng;