diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-17 09:34:13 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-22 10:28:56 +0300 |
commit | b16599a516e0f5e73673ba101ae0a852d8a14cf0 (patch) | |
tree | d53dc26cba9dda359f16c0c715e557ab5423aec4 /recipes-qt/qt5/qtwebengine | |
parent | 5aeeb6f72b048e0dd804fae74fa0e359182828de (diff) | |
download | meta-qt5-b16599a516e0f5e73673ba101ae0a852d8a14cf0.tar.gz |
qt5: update submodulesv5.14.0-beta2
Update to latest content in Qt 5.14 branch.
Task-number: QTBUG-77876
Change-Id: I2b539ee3c0687bf9bc16787878ad0e8e09e8b4d7
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
3 files changed, 18 insertions, 34 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch index 295b18e0..d3957200 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 079403c8f4e9fc5e1ea81dcd7fa126b351c91094 Mon Sep 17 00:00:00 2001 | 1 | From 6af8909f46f0934cee50a641401a845c709a9db2 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 23 Dec 2018 16:58:04 -0800 | 3 | Date: Sun, 23 Dec 2018 16:58:04 -0800 |
4 | Subject: [PATCH] chromium: stack pointer clobber | 4 | Subject: [PATCH] chromium: stack pointer clobber |
@@ -13,22 +13,13 @@ of flagging this silent ignoring via [1] | |||
13 | Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160] | 13 | Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160] |
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
15 | --- | 15 | --- |
16 | chromium/third_party/lss/linux_syscall_support.h | 10 +++++----- | 16 | chromium/third_party/lss/linux_syscall_support.h | 6 +++--- |
17 | 1 file changed, 5 insertions(+), 5 deletions(-) | 17 | 1 file changed, 3 insertions(+), 3 deletions(-) |
18 | 18 | ||
19 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h | 19 | diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h |
20 | index 5d9c2e8582f..e19e51dd304 100644 | 20 | index 9276f56..622cc1f 100644 |
21 | --- a/chromium/third_party/lss/linux_syscall_support.h | 21 | --- a/chromium/third_party/lss/linux_syscall_support.h |
22 | +++ b/chromium/third_party/lss/linux_syscall_support.h | 22 | +++ b/chromium/third_party/lss/linux_syscall_support.h |
23 | @@ -1964,7 +1964,7 @@ struct kernel_statfs { | ||
24 | __asm__ volatile(LSS_ENTRYPOINT \ | ||
25 | : "=a" (__res) \ | ||
26 | : "0" (__NR_##name) \ | ||
27 | - : "esp", "memory"); \ | ||
28 | + : "memory"); \ | ||
29 | LSS_RETURN(type,__res); \ | ||
30 | } | ||
31 | #undef _syscall1 | ||
32 | @@ -2012,7 +2012,7 @@ struct kernel_statfs { | 23 | @@ -2012,7 +2012,7 @@ struct kernel_statfs { |
33 | : "i" (__NR_##name), "ri" ((long)(arg1)), \ | 24 | : "i" (__NR_##name), "ri" ((long)(arg1)), \ |
34 | "c" ((long)(arg2)), "d" ((long)(arg3)), \ | 25 | "c" ((long)(arg2)), "d" ((long)(arg3)), \ |
@@ -56,12 +47,3 @@ index 5d9c2e8582f..e19e51dd304 100644 | |||
56 | LSS_RETURN(int, __res); | 47 | LSS_RETURN(int, __res); |
57 | } | 48 | } |
58 | 49 | ||
59 | @@ -2405,7 +2405,7 @@ struct kernel_statfs { | ||
60 | "d"(LSS_SYSCALL_ARG(parent_tidptr)), | ||
61 | "r"(LSS_SYSCALL_ARG(newtls)), | ||
62 | "r"(LSS_SYSCALL_ARG(child_tidptr)) | ||
63 | - : "rsp", "memory", "r8", "r10", "r11", "rcx"); | ||
64 | + : "memory", "r8", "r10", "r11", "rcx"); | ||
65 | } | ||
66 | LSS_RETURN(int, __res); | ||
67 | } | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch index 4eba389f..4b8dcf8f 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 07161d6cffe2f38f8de1d176047548ea448c0b8f Mon Sep 17 00:00:00 2001 | 1 | From 147314e33ca3d397321da29287c7c64843229cb7 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 5 Feb 2019 14:32:20 -0800 | 3 | Date: Tue, 5 Feb 2019 14:32:20 -0800 |
4 | Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm | 4 | Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm |
@@ -15,15 +15,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
15 | 1 file changed, 4 insertions(+), 1 deletion(-) | 15 | 1 file changed, 4 insertions(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn | 17 | diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn |
18 | index b9f1bba6062..354bd444482 100644 | 18 | index 29dda54..6870dbb 100644 |
19 | --- a/chromium/third_party/zlib/BUILD.gn | 19 | --- a/chromium/third_party/zlib/BUILD.gn |
20 | +++ b/chromium/third_party/zlib/BUILD.gn | 20 | +++ b/chromium/third_party/zlib/BUILD.gn |
21 | @@ -77,8 +77,11 @@ if (use_arm_neon_optimizations) { | 21 | @@ -78,8 +78,11 @@ if (use_arm_neon_optimizations) { |
22 | # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: | 22 | # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: |
23 | # "All implementations of the ARMv8.1 architecture are required to | 23 | # "All implementations of the ARMv8.1 architecture are required to |
24 | # implement the CRC32* instructions. These are optional in ARMv8.0." | 24 | # implement the CRC32* instructions. These are optional in ARMv8.0." |
25 | + defines = [] | 25 | + defines = [] |
26 | if (is_clang && !is_ios) { | 26 | if (!is_ios) { |
27 | - defines = [ "CRC32_ARMV8_CRC32" ] | 27 | - defines = [ "CRC32_ARMV8_CRC32" ] |
28 | + if (current_cpu == "arm64") { | 28 | + if (current_cpu == "arm64") { |
29 | + defines += [ "CRC32_ARMV8_CRC32" ] | 29 | + defines += [ "CRC32_ARMV8_CRC32" ] |
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch index b97b2dca..451ec3ee 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 564eb25c70160f6b3f20a6eb5727427efc78b695 Mon Sep 17 00:00:00 2001 | 1 | From d9ff98eec574e87bf320fabc360c582f49c5d40a Mon Sep 17 00:00:00 2001 |
2 | From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> | 2 | From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> |
3 | Date: Thu, 8 Mar 2018 15:39:55 +0100 | 3 | Date: Thu, 8 Mar 2018 15:39:55 +0100 |
4 | Subject: [PATCH] chromium: aarch64 skia build fix | 4 | Subject: [PATCH] chromium: aarch64 skia build fix |
@@ -24,18 +24,19 @@ moment. | |||
24 | 24 | ||
25 | Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> | 25 | Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> |
26 | --- | 26 | --- |
27 | .../skia/src/opts/SkRasterPipeline_opts.h | 15 ++------------- | 27 | .../third_party/skia/src/opts/SkRasterPipeline_opts.h | 17 ++--------------- |
28 | 1 file changed, 2 insertions(+), 13 deletions(-) | 28 | 1 file changed, 2 insertions(+), 15 deletions(-) |
29 | 29 | ||
30 | diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 30 | diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h |
31 | index de14e65b94e..b8be7852086 100644 | 31 | index b59506d..b8f22c9 100644 |
32 | --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 32 | --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h |
33 | +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 33 | +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h |
34 | @@ -729,12 +729,7 @@ SI F approx_powf(F x, F y) { | 34 | @@ -972,13 +972,7 @@ SI F approx_powf(F x, F y) { |
35 | } | 35 | } |
36 | 36 | ||
37 | SI F from_half(U16 h) { | 37 | SI F from_half(U16 h) { |
38 | -#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | 38 | -#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ |
39 | - && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | ||
39 | - __fp16 fp16; | 40 | - __fp16 fp16; |
40 | - memcpy(&fp16, &h, sizeof(U16)); | 41 | - memcpy(&fp16, &h, sizeof(U16)); |
41 | - return float(fp16); | 42 | - return float(fp16); |
@@ -45,11 +46,12 @@ index de14e65b94e..b8be7852086 100644 | |||
45 | return _mm256_cvtph_ps(h); | 46 | return _mm256_cvtph_ps(h); |
46 | 47 | ||
47 | #else | 48 | #else |
48 | @@ -751,13 +746,7 @@ SI F from_half(U16 h) { | 49 | @@ -995,14 +989,7 @@ SI F from_half(U16 h) { |
49 | } | 50 | } |
50 | 51 | ||
51 | SI U16 to_half(F f) { | 52 | SI U16 to_half(F f) { |
52 | -#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | 53 | -#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ |
54 | - && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | ||
53 | - __fp16 fp16 = __fp16(f); | 55 | - __fp16 fp16 = __fp16(f); |
54 | - U16 u16; | 56 | - U16 u16; |
55 | - memcpy(&u16, &fp16, sizeof(U16)); | 57 | - memcpy(&u16, &fp16, sizeof(U16)); |