diff options
| author | Johannes Pointner <johannes.pointner@br-automation.com> | 2019-05-06 10:19:46 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-05-06 18:52:02 +0000 |
| commit | c7e0ba566f136a55ce69287cd3f72952b3a43687 (patch) | |
| tree | 6d4e3db84a9b2ff3a30690023806c9e3f3ee8453 /recipes-qt/qt5/qtwebengine | |
| parent | 9c62c01bc28ec8211cfa5dae16a1da58f062e805 (diff) | |
| download | meta-qt5-c7e0ba566f136a55ce69287cd3f72952b3a43687.tar.gz | |
qtwebengine: arm: use OE specified -mcpu option
OE-Core sets -mcpu option, which is equivalent to -march and -mtune
combination. Therefore don't set -march and -mtune in chromium.
Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch new file mode 100644 index 00000000..1e3f2c15 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | From 058158c568698f79c905c19e5ef32ca714f8223e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Johannes Pointner <johannes.pointner@br-automation.com> | ||
| 3 | Date: Fri, 3 May 2019 09:12:38 +0200 | ||
| 4 | Subject: [PATCH 1/1] chromium: Do not try to set the guessed values for | ||
| 5 | march/mtune/float-abi OE config machinary has computed these values already | ||
| 6 | and fed it via compiler cmdline to chromium build | ||
| 7 | |||
| 8 | I think upstream should check for the values on compiler cmdline | ||
| 9 | before overriding these | ||
| 10 | |||
| 11 | Upstream-Status: Inappropriate [OE-Specific] | ||
| 12 | |||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com> | ||
| 15 | --- | ||
| 16 | chromium/build/config/compiler/BUILD.gn | 9 --------- | ||
| 17 | 1 file changed, 9 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn | ||
| 20 | index 1c42c49ea4..e919e157d7 100644 | ||
| 21 | --- a/chromium/build/config/compiler/BUILD.gn | ||
| 22 | +++ b/chromium/build/config/compiler/BUILD.gn | ||
| 23 | @@ -742,15 +742,6 @@ config("compiler_cpu_abi") { | ||
| 24 | } else if (current_cpu == "arm") { | ||
| 25 | if (is_clang && !is_android && !is_nacl) { | ||
| 26 | } | ||
| 27 | - if (!is_nacl) { | ||
| 28 | - cflags += [ | ||
| 29 | - "-march=$arm_arch", | ||
| 30 | - "-mfloat-abi=$arm_float_abi", | ||
| 31 | - ] | ||
| 32 | - } | ||
| 33 | - if (arm_tune != "") { | ||
| 34 | - cflags += [ "-mtune=$arm_tune" ] | ||
| 35 | - } | ||
| 36 | } else if (current_cpu == "arm64") { | ||
| 37 | if (is_clang && !is_android && !is_nacl && !is_fuchsia) { | ||
| 38 | } | ||
| 39 | -- | ||
| 40 | 2.21.0 | ||
| 41 | |||
