diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /bsp/meta-synopsys/recipes-qt/qt5 | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'bsp/meta-synopsys/recipes-qt/qt5')
-rw-r--r-- | bsp/meta-synopsys/recipes-qt/qt5/qtbase/0001-Add-ARC-support-in-double-conversion.patch | 22 | ||||
-rw-r--r-- | bsp/meta-synopsys/recipes-qt/qt5/qtbase_git.bbappend | 7 |
2 files changed, 14 insertions, 15 deletions
diff --git a/bsp/meta-synopsys/recipes-qt/qt5/qtbase/0001-Add-ARC-support-in-double-conversion.patch b/bsp/meta-synopsys/recipes-qt/qt5/qtbase/0001-Add-ARC-support-in-double-conversion.patch index de7fec59..40e7b08b 100644 --- a/bsp/meta-synopsys/recipes-qt/qt5/qtbase/0001-Add-ARC-support-in-double-conversion.patch +++ b/bsp/meta-synopsys/recipes-qt/qt5/qtbase/0001-Add-ARC-support-in-double-conversion.patch @@ -1,7 +1,7 @@ -From e7da33f233ffb38f0e9d0bf839c7712911bce109 Mon Sep 17 00:00:00 2001 +From 2fa8ccab832fde23d5e8e395dbaa6e7ed94dd00b Mon Sep 17 00:00:00 2001 From: Evgeniy Didin <Evgeniy.Didin@synopsys.com> -Date: Tue, 26 Mar 2019 14:13:49 +0300 -Subject: [PATCH] double conversion: support ARC +Date: Thu, 2 Apr 2020 23:11:49 +0300 +Subject: [PATCH] double conversion: ARC support Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com> --- @@ -9,18 +9,18 @@ Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index 69aa17171c..ae5342eb45 100644 +index 7622fe6162..f45c77c360 100644 --- a/src/3rdparty/double-conversion/include/double-conversion/utils.h +++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -77,7 +77,7 @@ inline void abort_noreturn() { abort(); } - defined(__SH4__) || defined(__alpha__) || \ +@@ -94,7 +94,7 @@ int main(int argc, char** argv) { defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__AARCH64EL__) || defined(__AARCH64EB__) || defined(__aarch64__) || \ -- defined(__riscv) -+ defined(__riscv) || defined(__arc__) + defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ + defined(__riscv) || defined(__EMSCRIPTEN__) || \ +- defined(__or1k__) ++ defined(__or1k__) || defined(__arc__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(__mc68000__) - #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS + #elif defined(__mc68000__) || \ + defined(__pnacl__) || defined(__native_client__) -- 2.16.2 diff --git a/bsp/meta-synopsys/recipes-qt/qt5/qtbase_git.bbappend b/bsp/meta-synopsys/recipes-qt/qt5/qtbase_git.bbappend index f3ad0fc2..a11cdeb0 100644 --- a/bsp/meta-synopsys/recipes-qt/qt5/qtbase_git.bbappend +++ b/bsp/meta-synopsys/recipes-qt/qt5/qtbase_git.bbappend @@ -1,5 +1,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" -SRC_URI += "\ - file://0001-Add-ARC-support-in-double-conversion.patch \ - file://0002-Fix-build-for-ARC-with-glibc-due-to-lack-of-FENV.patch \ -" +#SRC_URI += "\ +# file://0001-Add-ARC-support-in-double-conversion.patch \ +#" |