init 5.15.10
This commit is contained in:
任建全
openkylin-cibot
parent
164b8dbada
commit
e2961ee1b2
|
|
@ -0,0 +1,137 @@
|
|||
From: =?utf-8?b?5Lu75bu65YWo?= <renjianquan@kylinos.cn>
|
||||
Date: Mon, 20 Nov 2023 16:25:23 +0800
|
||||
Subject: init 5.15.10
|
||||
|
||||
---
|
||||
.../javascriptcore/JavaScriptCore/runtime/Collector.cpp | 5 -----
|
||||
.../javascriptcore/JavaScriptCore/wtf/Platform.h | 14 +-------------
|
||||
tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp | 1 -
|
||||
tests/auto/qscriptjstestsuite/skip.txt | 2 --
|
||||
tests/auto/qscriptv8testsuite/skip.txt | 16 ++++++++++++++--
|
||||
tests/benchmarks/script/script.pro | 4 +++-
|
||||
6 files changed, 18 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
|
||||
index d965834..e8f78ee 100644
|
||||
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
|
||||
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
|
||||
@@ -672,12 +672,7 @@ static inline void* currentThreadStackBase()
|
||||
pthread_attr_destroy(&sattr);
|
||||
stackThread = thread;
|
||||
}
|
||||
-#if defined(__hppa__)
|
||||
- // Stack grows up.
|
||||
- return static_cast<char*>(stackBase);
|
||||
-#else
|
||||
return static_cast<char*>(stackBase) + stackSize;
|
||||
-#endif
|
||||
#else
|
||||
#error Need a way to get the stack base on this platform
|
||||
#endif
|
||||
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
|
||||
index 4bf2a5d..a4695a2 100644
|
||||
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
|
||||
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
|
||||
@@ -226,18 +226,6 @@
|
||||
#define WTF_CPU_SPARC 1
|
||||
#endif
|
||||
|
||||
-/* CPU(S390X) - S390 64-bit */
|
||||
-#if defined(__s390x__)
|
||||
-#define WTF_CPU_S390X 1
|
||||
-#define WTF_CPU_BIG_ENDIAN 1
|
||||
-#endif
|
||||
-
|
||||
-/* CPU(S390) - S390 32-bit */
|
||||
-#if defined(__s390__)
|
||||
-#define WTF_CPU_S390 1
|
||||
-#define WTF_CPU_BIG_ENDIAN 1
|
||||
-#endif
|
||||
-
|
||||
/* CPU(X86) - i386 / x86 32-bit */
|
||||
#if defined(__i386__) \
|
||||
|| defined(i386) \
|
||||
@@ -970,7 +958,7 @@
|
||||
#endif
|
||||
|
||||
#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
|
||||
-#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) || CPU(RISCV64) || CPU(S390X)
|
||||
+#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) || CPU(RISCV64)
|
||||
#define WTF_USE_JSVALUE64 1
|
||||
#elif CPU(ARM) || CPU(PPC64) || CPU(RISCV32)
|
||||
#define WTF_USE_JSVALUE32 1
|
||||
diff --git a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
|
||||
index 019773a..9d6c2fb 100644
|
||||
--- a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
|
||||
+++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
|
||||
@@ -2270,7 +2270,6 @@ void tst_QScriptExtQObject::cppConnectAndDisconnect()
|
||||
|
||||
void tst_QScriptExtQObject::cppConnectAndDisconnect2()
|
||||
{
|
||||
- QSKIP("Fails on some architectures");
|
||||
QScriptEngine eng;
|
||||
QLineEdit edit;
|
||||
QLineEdit edit2;
|
||||
diff --git a/tests/auto/qscriptjstestsuite/skip.txt b/tests/auto/qscriptjstestsuite/skip.txt
|
||||
index 3f3362f..c007041 100644
|
||||
--- a/tests/auto/qscriptjstestsuite/skip.txt
|
||||
+++ b/tests/auto/qscriptjstestsuite/skip.txt
|
||||
@@ -5,8 +5,6 @@ regress-322135-01.js | asserts
|
||||
regress-322135-02.js | asserts
|
||||
regress-322135-03.js | takes forever
|
||||
regress-322135-04.js | takes forever
|
||||
-ecma/Expressions/11.4.7-02.js | Fails on some architectures
|
||||
-ecma/TypeConversion/9.3.1-3.js | Fails on some architectures
|
||||
ecma_3/Array/regress-387501.js | Produces wrong error message
|
||||
ecma_3/RegExp/regress-375715-04.js | bug
|
||||
ecma_3/RegExp/regress-289669.js | Can fail due to relying on wall-clock time
|
||||
diff --git a/tests/auto/qscriptv8testsuite/skip.txt b/tests/auto/qscriptv8testsuite/skip.txt
|
||||
index 128f157..bbcdef8 100644
|
||||
--- a/tests/auto/qscriptv8testsuite/skip.txt
|
||||
+++ b/tests/auto/qscriptv8testsuite/skip.txt
|
||||
@@ -3,10 +3,8 @@ debug-* | not applicable
|
||||
mirror-* | not applicable
|
||||
array-concat | Hangs on JSC backend
|
||||
array-splice | Hangs on JSC backend
|
||||
-smi-negative-zero | Unresolved failures
|
||||
sparse-array-reverse | Hangs on JSC backend
|
||||
string-case | V8-specific behavior? (Doesn't pass on SpiderMonkey either)
|
||||
-to-precision | Unresolved failures
|
||||
|
||||
[Q_OS_WINCE]
|
||||
deep-recursion | Demands too much memory on WinCE
|
||||
@@ -21,4 +19,18 @@ unicode-test | Demands too much memory on Symbian
|
||||
[Q_CC_INTEL]
|
||||
math-min-max | Unresolved failures with intel compiler
|
||||
negate-zero | Unresolved failures with intel compiler
|
||||
+smi-negative-zero | Unresolved failures with intel compiler
|
||||
str-to-num | Unresolved failures with intel compiler
|
||||
+to-precision | Unresolved failures with intel compiler
|
||||
+
|
||||
+[Q_OS_MAC]
|
||||
+smi-negative-zero | Unresolved failures on Mac OS X (Cocoa)
|
||||
+to-precision | Unresolved failures on Mac OS X (Cocoa)
|
||||
+
|
||||
+[Q_OS_WIN]
|
||||
+to-precision | Unresolved failures on Windows
|
||||
+smi-negative-zero | Unresolved failure on Windows 8 (QTBUG-41321)
|
||||
+
|
||||
+[Q_OS_LINUX]
|
||||
+smi-negative-zero | Unresolved sign failure for Ubuntu 11.10 x64 (QTBUG-23463)
|
||||
+to-precision | Unresolved failure on Ubuntu 11.10 x64 (QTBUG-23463)
|
||||
diff --git a/tests/benchmarks/script/script.pro b/tests/benchmarks/script/script.pro
|
||||
index 49e06a9..80278d0 100644
|
||||
--- a/tests/benchmarks/script/script.pro
|
||||
+++ b/tests/benchmarks/script/script.pro
|
||||
@@ -5,8 +5,10 @@ SUBDIRS = \
|
||||
qscriptclass_bytearray \
|
||||
qscriptengine \
|
||||
qscriptvalue \
|
||||
+ sunspider \
|
||||
qscriptqobject \
|
||||
- qscriptvalueiterator
|
||||
+ qscriptvalueiterator \
|
||||
+ v8
|
||||
|
||||
TRUSTED_BENCHMARKS += \
|
||||
qscriptclass \
|
||||
|
|
@ -1,11 +1,20 @@
|
|||
Description: disable tests that fail on some Debian architectures
|
||||
Author: Dmitry Shachnev <mitya57@debian.org>
|
||||
From: Dmitry Shachnev <mitya57@debian.org>
|
||||
Date: Mon, 20 Nov 2023 08:25:53 +0000
|
||||
Subject: disable tests that fail on some Debian architectures
|
||||
|
||||
Forwarded: not-needed
|
||||
Last-Update: 2015-02-25
|
||||
---
|
||||
tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp | 1 +
|
||||
tests/auto/qscriptjstestsuite/skip.txt | 2 ++
|
||||
tests/auto/qscriptv8testsuite/skip.txt | 16 ++--------------
|
||||
3 files changed, 5 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
|
||||
index 9d6c2fb..019773a 100644
|
||||
--- a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
|
||||
+++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
|
||||
@@ -2270,6 +2270,7 @@
|
||||
@@ -2270,6 +2270,7 @@ void tst_QScriptExtQObject::cppConnectAndDisconnect()
|
||||
|
||||
void tst_QScriptExtQObject::cppConnectAndDisconnect2()
|
||||
{
|
||||
|
|
@ -13,9 +22,11 @@ Last-Update: 2015-02-25
|
|||
QScriptEngine eng;
|
||||
QLineEdit edit;
|
||||
QLineEdit edit2;
|
||||
diff --git a/tests/auto/qscriptjstestsuite/skip.txt b/tests/auto/qscriptjstestsuite/skip.txt
|
||||
index c007041..3f3362f 100644
|
||||
--- a/tests/auto/qscriptjstestsuite/skip.txt
|
||||
+++ b/tests/auto/qscriptjstestsuite/skip.txt
|
||||
@@ -5,6 +5,8 @@
|
||||
@@ -5,6 +5,8 @@ regress-322135-01.js | asserts
|
||||
regress-322135-02.js | asserts
|
||||
regress-322135-03.js | takes forever
|
||||
regress-322135-04.js | takes forever
|
||||
|
|
@ -24,9 +35,11 @@ Last-Update: 2015-02-25
|
|||
ecma_3/Array/regress-387501.js | Produces wrong error message
|
||||
ecma_3/RegExp/regress-375715-04.js | bug
|
||||
ecma_3/RegExp/regress-289669.js | Can fail due to relying on wall-clock time
|
||||
diff --git a/tests/auto/qscriptv8testsuite/skip.txt b/tests/auto/qscriptv8testsuite/skip.txt
|
||||
index bbcdef8..128f157 100644
|
||||
--- a/tests/auto/qscriptv8testsuite/skip.txt
|
||||
+++ b/tests/auto/qscriptv8testsuite/skip.txt
|
||||
@@ -3,8 +3,10 @@
|
||||
@@ -3,8 +3,10 @@ debug-* | not applicable
|
||||
mirror-* | not applicable
|
||||
array-concat | Hangs on JSC backend
|
||||
array-splice | Hangs on JSC backend
|
||||
|
|
@ -37,7 +50,7 @@ Last-Update: 2015-02-25
|
|||
|
||||
[Q_OS_WINCE]
|
||||
deep-recursion | Demands too much memory on WinCE
|
||||
@@ -19,18 +21,4 @@
|
||||
@@ -19,18 +21,4 @@ unicode-test | Demands too much memory on Symbian
|
||||
[Q_CC_INTEL]
|
||||
math-min-max | Unresolved failures with intel compiler
|
||||
negate-zero | Unresolved failures with intel compiler
|
||||
|
|
|
|||
|
|
@ -1,16 +1,24 @@
|
|||
Description: Remove mixedly licensed tests.
|
||||
From: Timo Jyrinki <timo.jyrinki@canonical.com>
|
||||
Date: Mon, 20 Nov 2023 08:25:53 +0000
|
||||
Subject: Remove mixedly licensed tests.
|
||||
|
||||
Forwarded: not-needed
|
||||
|
||||
The license mix in Qt Script is already quite colorful, and the sunspider
|
||||
and V8 tests are a further mix of licenses and license-not-specified or
|
||||
clearly non-DFSG. Currently the easiest way out is to repackage the
|
||||
tarball not to include those tests.
|
||||
.
|
||||
This patch disables the tests provided by the removed sources.
|
||||
Author: Timo Jyrinki <timo.jyrinki@canonical.com>
|
||||
Forwarded: not-needed
|
||||
|
||||
--- a/tests/benchmarks/script/script.pro.old 2013-01-29 19:03:26.000000000 +0000
|
||||
+++ b/tests/benchmarks/script/script.pro 2013-02-11 08:31:02.073365014 +0000
|
||||
@@ -5,10 +5,8 @@
|
||||
This patch disables the tests provided by the removed sources.
|
||||
---
|
||||
tests/benchmarks/script/script.pro | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/tests/benchmarks/script/script.pro b/tests/benchmarks/script/script.pro
|
||||
index 80278d0..49e06a9 100644
|
||||
--- a/tests/benchmarks/script/script.pro
|
||||
+++ b/tests/benchmarks/script/script.pro
|
||||
@@ -5,10 +5,8 @@ SUBDIRS = \
|
||||
qscriptclass_bytearray \
|
||||
qscriptengine \
|
||||
qscriptvalue \
|
||||
|
|
|
|||
|
|
@ -1,11 +1,18 @@
|
|||
Description: fix stack base detection on hppa
|
||||
Author: John David Anglin <dave.anglin@bell.net>
|
||||
From: John David Anglin <dave.anglin@bell.net>
|
||||
Date: Mon, 20 Nov 2023 08:25:53 +0000
|
||||
Subject: fix stack base detection on hppa
|
||||
|
||||
Forwarded: not-yet
|
||||
Last-Update: 2018-12-18
|
||||
---
|
||||
src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
|
||||
index e8f78ee..d965834 100644
|
||||
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
|
||||
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
|
||||
@@ -672,7 +672,12 @@ static inline void* currentThreadStackBa
|
||||
@@ -672,7 +672,12 @@ static inline void* currentThreadStackBase()
|
||||
pthread_attr_destroy(&sattr);
|
||||
stackThread = thread;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,16 @@
|
|||
Description: Add support for s390/s390x architectures
|
||||
Author: Dan Horák <dan@danny.cz>
|
||||
From: =?utf-8?q?Dan_Hor=C3=A1k?= <dan@danny.cz>
|
||||
Date: Mon, 20 Nov 2023 08:25:53 +0000
|
||||
Subject: Add support for s390/s390x architectures
|
||||
|
||||
Origin: vendor (http://trac.webkit.org/changeset?old_path=%2Ftrunk&old=71843+&new_path=%2Ftrunk&new=71844+)
|
||||
Forwarded: no
|
||||
Last-Update: 2019-03-26
|
||||
|
||||
---
|
||||
src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 14 +++++++++++++-
|
||||
1 file changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
|
||||
index a4695a2..4bf2a5d 100644
|
||||
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
|
||||
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
|
||||
@@ -226,6 +226,18 @@
|
||||
|
|
|
|||
|
|
@ -2,3 +2,4 @@ disable_failing_tests.diff
|
|||
disable_v8_sunspider_tests.patch
|
||||
s390x_jscore.diff
|
||||
hppa_stackbase.diff
|
||||
0005-init-5.15.10.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue