summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-11-18 15:44:26 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2019-11-18 15:45:10 +0200
commit12cc756c7948a90367473f0a52dd2fe2b519dd24 (patch)
tree5db143dfa7dbee5459cf4079d2e72cdf50c68d79 /recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch
parent3e502778ee161bef4177e7e7f45c0c9b78d047da (diff)
parent432ad2aa6c3a13253fefc909faba368851d21fb1 (diff)
downloadmeta-qt5-5.13.tar.gz
Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.135.13
* qtyocto/upstream/zeus: 432ad2a qttools: don't install tst_qtattributionsscanner 8115617 qt5: Upgrade to Qt 5.13.2 267e646 python(3)-pyqt5: add qml support 653e12f libqofono: bump SRCREV and add a fix for voicecall cefb48e qtbase: Add PACKAGECONFIG for lttng 911b346 layer: Mark zeus as compatible release c373272 ogl-runtime: Fix build on x86_64 9172ba1 README.md: Document need for 32bit host compiler db2fd6c qtwayland: Fix build with clang/libc++ 6b5122e qtbase: Fix build when fp16 is used Conflicts: recipes-qt/qt5/ogl-runtime_git.bb recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtwayland_git.bb Change-Id: I6f325e5d4fc0f2e774962f1b5fd54e5e0e9c96d7
Diffstat (limited to 'recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch b/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch
new file mode 100644
index 00000000..8411b83d
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch
@@ -0,0 +1,34 @@
1From b938d809624660a2998ea7f844aba715e40acfc6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 5 Oct 2019 16:21:08 -0700
4Subject: [PATCH] qfloat16: check for __ARM_FP & 2
5
6Clang hides vcvt_f16_f32() and vcvt_f32_f16() behind (__ARM_FP & 2) where 2 refers to -mfpu=fp-armv8.
7However, GCC would only build this code if -march=armv8.2-a+fp16 is passed as well.
8
9global/qfloat16.cpp:149:31: error: use of undeclared identifier 'vcvt_f16_f32'
10 vst1_f16(out_f16 + i, vcvt_f16_f32(vld1q_f32(in + i)));
11 ^
12global/qfloat16.cpp:159:28: error: use of undeclared identifier 'vcvt_f32_f16'
13 vst1q_f32(out + i, vcvt_f32_f16(vld1_f16(in_f16 + i)));
14 ^
15
16Upstream-Status: Pending
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19 src/corelib/global/qfloat16.cpp | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp
23index 87ff796368..37dec371a6 100644
24--- a/src/corelib/global/qfloat16.cpp
25+++ b/src/corelib/global/qfloat16.cpp
26@@ -148,7 +148,7 @@ f16cextern void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype
27 #undef f16cextern
28 }
29
30-#elif defined(__ARM_FP16_FORMAT_IEEE) && defined(__ARM_NEON__)
31+#elif defined(__ARM_FP16_FORMAT_IEEE) && defined(__ARM_NEON__) && (__ARM_FP & 2)
32 static inline bool hasFastF16()
33 {
34 return true;