diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-08-07 10:27:09 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-08-13 12:03:25 +0000 |
commit | 7388cd427d99ac7920394a31f176c0eb92521837 (patch) | |
tree | 82fc75b5ab0861a1f68fc52373660270a6818b21 /recipes-qt/qt5/qtwebengine/chromium | |
parent | 77ba83f3fbf777add748a437b80c19c6a1a5f989 (diff) | |
download | meta-qt5-7388cd427d99ac7920394a31f176c0eb92521837.tar.gz |
meta-qt5: update submodules
Change-Id: I4ec55015ee1006f7a61049bf1a8442476f129a8e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch | 44 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch | 18 |
2 files changed, 31 insertions, 31 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch index 7823482b..8000969b 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 249b99b4b54468b428a156f33e2a72066c82e9c2 Mon Sep 17 00:00:00 2001 | 1 | From a26e5b6c8cf6fccbd473ca61b2d0038703bb0b99 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: Sat, 2 Feb 2019 19:28:59 -0800 | 3 | Date: Sat, 2 Feb 2019 19:28:59 -0800 |
4 | Subject: [PATCH] chromium: fix build with clang | 4 | Subject: [PATCH] chromium: fix build with clang |
@@ -10,24 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 1 file changed, 2 insertions(+), 25 deletions(-) | 10 | 1 file changed, 2 insertions(+), 25 deletions(-) |
11 | 11 | ||
12 | diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn | 12 | diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn |
13 | index d223a4f6fd4..1c42c49ea4a 100644 | 13 | index 127d0c4..eca0ce1 100644 |
14 | --- a/chromium/build/config/compiler/BUILD.gn | 14 | --- a/chromium/build/config/compiler/BUILD.gn |
15 | +++ b/chromium/build/config/compiler/BUILD.gn | 15 | +++ b/chromium/build/config/compiler/BUILD.gn |
16 | @@ -561,13 +561,6 @@ config("compiler") { | 16 | @@ -746,8 +746,6 @@ config("compiler_cpu_abi") { |
17 | } | ||
18 | } | ||
19 | |||
20 | - # Tells the compiler not to use absolute paths when passing the default | ||
21 | - # paths to the tools it invokes. We don't want this because we don't | ||
22 | - # really need it and it can mess up the goma cache entries. | ||
23 | - if (is_clang && !is_nacl) { | ||
24 | - cflags += [ "-no-canonical-prefixes" ] | ||
25 | - } | ||
26 | - | ||
27 | # C11/C++11 compiler flags setup. | ||
28 | # --------------------------- | ||
29 | if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { | ||
30 | @@ -799,8 +792,6 @@ config("compiler_cpu_abi") { | ||
31 | } | 17 | } |
32 | } else if (current_cpu == "arm") { | 18 | } else if (current_cpu == "arm") { |
33 | if (is_clang && !is_android && !is_nacl) { | 19 | if (is_clang && !is_android && !is_nacl) { |
@@ -36,7 +22,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 | |||
36 | } | 22 | } |
37 | if (!is_nacl) { | 23 | if (!is_nacl) { |
38 | cflags += [ | 24 | cflags += [ |
39 | @@ -813,8 +804,6 @@ config("compiler_cpu_abi") { | 25 | @@ -760,8 +758,6 @@ config("compiler_cpu_abi") { |
40 | } | 26 | } |
41 | } else if (current_cpu == "arm64") { | 27 | } else if (current_cpu == "arm64") { |
42 | if (is_clang && !is_android && !is_nacl && !is_fuchsia) { | 28 | if (is_clang && !is_android && !is_nacl && !is_fuchsia) { |
@@ -45,7 +31,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 | |||
45 | } | 31 | } |
46 | } else if (current_cpu == "mipsel" && !is_nacl) { | 32 | } else if (current_cpu == "mipsel" && !is_nacl) { |
47 | ldflags += [ "-Wl,--hash-style=sysv" ] | 33 | ldflags += [ "-Wl,--hash-style=sysv" ] |
48 | @@ -823,9 +812,6 @@ config("compiler_cpu_abi") { | 34 | @@ -770,9 +766,6 @@ config("compiler_cpu_abi") { |
49 | if (is_android) { | 35 | if (is_android) { |
50 | cflags += [ "--target=mipsel-linux-android" ] | 36 | cflags += [ "--target=mipsel-linux-android" ] |
51 | ldflags += [ "--target=mipsel-linux-android" ] | 37 | ldflags += [ "--target=mipsel-linux-android" ] |
@@ -55,7 +41,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 | |||
55 | } | 41 | } |
56 | } else { | 42 | } else { |
57 | cflags += [ "-EL" ] | 43 | cflags += [ "-EL" ] |
58 | @@ -904,10 +890,7 @@ config("compiler_cpu_abi") { | 44 | @@ -851,10 +844,7 @@ config("compiler_cpu_abi") { |
59 | } else if (current_cpu == "mips" && !is_nacl) { | 45 | } else if (current_cpu == "mips" && !is_nacl) { |
60 | ldflags += [ "-Wl,--hash-style=sysv" ] | 46 | ldflags += [ "-Wl,--hash-style=sysv" ] |
61 | if (custom_toolchain == "") { | 47 | if (custom_toolchain == "") { |
@@ -67,7 +53,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 | |||
67 | cflags += [ "-EB" ] | 53 | cflags += [ "-EB" ] |
68 | ldflags += [ "-EB" ] | 54 | ldflags += [ "-EB" ] |
69 | } | 55 | } |
70 | @@ -954,9 +937,6 @@ config("compiler_cpu_abi") { | 56 | @@ -901,9 +891,6 @@ config("compiler_cpu_abi") { |
71 | if (is_android) { | 57 | if (is_android) { |
72 | cflags += [ "--target=mips64el-linux-android" ] | 58 | cflags += [ "--target=mips64el-linux-android" ] |
73 | ldflags += [ "--target=mips64el-linux-android" ] | 59 | ldflags += [ "--target=mips64el-linux-android" ] |
@@ -77,7 +63,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 | |||
77 | } | 63 | } |
78 | } else { | 64 | } else { |
79 | cflags += [ | 65 | cflags += [ |
80 | @@ -1013,10 +993,7 @@ config("compiler_cpu_abi") { | 66 | @@ -960,10 +947,7 @@ config("compiler_cpu_abi") { |
81 | } else if (current_cpu == "mips64") { | 67 | } else if (current_cpu == "mips64") { |
82 | ldflags += [ "-Wl,--hash-style=sysv" ] | 68 | ldflags += [ "-Wl,--hash-style=sysv" ] |
83 | if (custom_toolchain == "") { | 69 | if (custom_toolchain == "") { |
@@ -89,3 +75,17 @@ index d223a4f6fd4..1c42c49ea4a 100644 | |||
89 | cflags += [ | 75 | cflags += [ |
90 | "-EB", | 76 | "-EB", |
91 | "-mabi=64", | 77 | "-mabi=64", |
78 | @@ -1137,13 +1121,6 @@ config("compiler_deterministic") { | ||
79 | } | ||
80 | } | ||
81 | } | ||
82 | - | ||
83 | - # Tells the compiler not to use absolute paths when passing the default | ||
84 | - # paths to the tools it invokes. We don't want this because we don't | ||
85 | - # really need it and it can mess up the goma cache entries. | ||
86 | - if (is_clang && !is_nacl) { | ||
87 | - cflags += [ "-no-canonical-prefixes" ] | ||
88 | - } | ||
89 | } | ||
90 | |||
91 | config("clang_revision") { | ||
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch index a0b73a7b..7730e712 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b882013421036a05ea8c909292cc38d05fc29c89 Mon Sep 17 00:00:00 2001 | 1 | From ffb83a8c687c18ec05bcf3397f08f6387b4c1ac2 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,20 +15,20 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
15 | 1 file changed, 4 insertions(+), 2 deletions(-) | 15 | 1 file changed, 4 insertions(+), 2 deletions(-) |
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 05907b481ac..dbc4be143cd 100644 | 18 | index b9f1bba..e8a5c58 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 | @@ -74,9 +74,11 @@ if (use_arm_neon_optimizations) { | 21 | @@ -77,9 +77,11 @@ if (use_arm_neon_optimizations) { |
22 | # implement the CRC32* instructions. These are optional in ARMv8.0." | 22 | # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: |
23 | # - Fuchsia just added a syscall for feature detection. | 23 | # "All implementations of the ARMv8.1 architecture are required to |
24 | # TODO(cavalcantii): crbug.com/810125. | 24 | # implement the CRC32* instructions. These are optional in ARMv8.0." |
25 | + defines = [] | 25 | + defines = [] |
26 | if (is_clang && (!is_ios && !is_fuchsia)) { | 26 | if (is_clang && !is_ios) { |
27 | - defines = [ "CRC32_ARMV8_CRC32" ] | 27 | - defines = [ "CRC32_ARMV8_CRC32" ] |
28 | - if (is_android) { | 28 | - if (is_android) { |
29 | + if (current_cpu == "arm64") { | 29 | + if (current_cpu == "arm64") { |
30 | + defines += [ "CRC32_ARMV8_CRC32" ] | 30 | + defines += [ "CRC32_ARMV8_CRC32" ] |
31 | + } if (is_android) { | 31 | + } if (is_android) { |
32 | defines += [ "ARMV8_OS_ANDROID" ] | 32 | defines += [ "ARMV8_OS_ANDROID" ] |
33 | } else if (is_linux || is_chromeos) { | 33 | } else if (is_linux || is_chromeos) { |
34 | defines += [ "ARMV8_OS_LINUX" ] | 34 | defines += [ "ARMV8_OS_LINUX" ] |