Fixed NEON related compile error, when compiling for armv7a-eabi.

1 files changed, 44 insertions, 0 deletions

diff --git a/0003-Fix-neon.patch b/0003-Fix-neon.patch
new file mode 100644
index 000000000000..069aae3f4de6
--- /dev/null
+++ b/0003-Fix-neon.patch
@@ -0,0 +1,44 @@
+--- a/qtbase/src/corelib/global/qfloat16.cpp	2020-01-19 09:49:52.130475297 -0300
++++ b/qtbase/src/corelib/global/qfloat16.cpp	2020-01-19 09:47:33.000000000 -0300
+@@ -204,7 +204,7 @@
+
+ #undef f16cextern
+ }
+-
++/*
+ #elif defined(__ARM_FP16_FORMAT_IEEE) && defined(__ARM_NEON__)
+ static inline bool hasFastF16()
+ {
+@@ -229,7 +229,7 @@
+         vst1q_f32(out + i, vcvt_f32_f16(vld1_f16(in_f16 + i)));
+     SIMD_EPILOGUE(i, len, 3)
+         out[i] = float(in_f16[i]);
+-}
++}*/
+ #else
+ static inline bool hasFastF16()
+ {
+
+--- a/qtbase/src/gui/painting/painting.pri	2019-12-07 03:27:07.000000000 -0300
++++ b/qtbase/src/gui/painting/painting.pri	2020-01-19 10:07:08.307871293 -0300
+@@ -166,7 +166,7 @@
+         DEFINES += QT_COMPILER_SUPPORTS_SSE4_1 QT_COMPILER_SUPPORTS_SSE4_2
+         SOURCES += painting/qdrawhelper_sse4.cpp painting/qimagescale_sse4.cpp
+     }
+-    arm64-v8a {
++    arm64-v8a | armeabi-v7a {
+         SOURCES += painting/qdrawhelper_neon.cpp painting/qimagescale_neon.cpp
+         HEADERS += painting/qdrawhelper_neon_p.h
+     }
+
+--- a/qtbase/src/gui/image/image.pri	2019-12-07 03:27:07.000000000 -0300
++++ b/qtbase/src/gui/image/image.pri	2020-01-19 11:14:07.704965297 -0300
+@@ -97,7 +97,7 @@
+     MIPS_DSPR2_ASM += image/qimage_mips_dspr2_asm.S
+ } else {
+     # see https://developer.android.com/ndk/guides/abis
+-    arm64-v8a {
++    arm64-v8a | armeabi-v7a {
+         SOURCES += image/qimage_neon.cpp
+     }
+     x86 | x86_64 {