From 0027d73b0283d01bbe718df8865ce8b0ca794780 Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kdab.com>
Date: Thu, 17 Aug 2017 09:32:44 +0300
Subject: Android: Dissable internal hack when using libc++

libc++ has proper wstring support

Change-Id: Ifae98676974bfd660b7f849d4466efc5486d3fca
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/tools/qstring.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/corelib/tools')

diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h
index 88ba4a3fb5..8f957a7b22 100644
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/tools/qstring.h
@@ -53,7 +53,7 @@
 #include <string>
 #include <iterator>
 
-#if defined(Q_OS_ANDROID)
+#if defined(Q_OS_ANDROID) && !defined(ANDROID_HAS_WSTRING)
 // std::wstring is disabled on android's glibc, as bionic lacks certain features
 // that libstdc++ checks for (like mbcslen).
 namespace std
-- 
cgit v1.2.3


From b7722c251c3a0938c7c71fc3da47fdbe920060b7 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Sun, 16 Jul 2017 00:05:44 +0200
Subject: Fix error attribute(target("+crc")) is unknown

Task-number: QTBUG-61975
Change-Id: I0b1b55c0737dad485b5ace8e6eb7cb842589453d
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
---
 src/corelib/tools/qhash.cpp | 2 ++
 src/corelib/tools/qsimd_p.h | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'src/corelib/tools')

diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
index 1f9c05c0b7..4cc9ec8ec8 100644
--- a/src/corelib/tools/qhash.cpp
+++ b/src/corelib/tools/qhash.cpp
@@ -144,7 +144,9 @@ static inline bool hasFastCrc32()
 }
 
 template <typename Char>
+#if defined(Q_PROCESSOR_ARM_64)
 QT_FUNCTION_TARGET(CRC32)
+#endif
 static uint crc32(const Char *ptr, size_t len, uint h)
 {
     // The crc32[whbd] instructions on Aarch64/Aarch32 calculate a 32-bit CRC32 checksum
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index 023a4b08d2..05f118a9eb 100644
--- a/src/corelib/tools/qsimd_p.h
+++ b/src/corelib/tools/qsimd_p.h
@@ -326,7 +326,10 @@
 #endif
 // AArch64/ARM64
 #if defined(Q_PROCESSOR_ARM_V8) && defined(__ARM_FEATURE_CRC32)
+#if defined(Q_PROCESSOR_ARM_64)
+// only available on aarch64
 #define QT_FUNCTION_TARGET_STRING_CRC32      "+crc"
+#endif
 #  include <arm_acle.h>
 #endif
 
-- 
cgit v1.2.3