diff mbox

[v1] qt5base: fix qthash error attribute(target("+crc")) is unknown

Message ID 20170715231146.25019-2-ps.report@gmx.net
State Accepted
Headers show

Commit Message

Peter Seiderer July 15, 2017, 11:11 p.m. UTC
Add patch 0005-Fix-error-attribute-target-crc-is-unknown.patch.

Upstream: https://codereview.qt-project.org/200171

Fixes buildroot Bug 9916 ([1]).

[1] https://bugs.busybox.net/show_bug.cgi?id=9916

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 ...Fix-error-attribute-target-crc-is-unknown.patch | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/qt5/qt5base/5.8.0/0005-Fix-error-attribute-target-crc-is-unknown.patch

Comments

Arnout Vandecappelle July 17, 2017, 9:22 p.m. UTC | #1
On 16-07-17 01:11, Peter Seiderer wrote:
> +From f0c02fb22bc277e2015a18e562b551ec7b3eed9e Mon Sep 17 00:00:00 2001
> +From: Peter Seiderer <ps.report@gmx.net>
> +Date: Sun, 16 Jul 2017 00:05:44 +0200
> +Subject: [PATCH] Fix error attribute(target("+crc")) is unknown
> +
> +Task-number: QTBUG-61975
> +Change-Id: I0b1b55c0737dad485b5ace8e6eb7cb842589453d

 You forgot your Sob. Care to send a follow-up patch to fix?

 Regards,
 Arnout

> +---
Peter Seiderer July 20, 2017, 6:52 p.m. UTC | #2
Hello Arnout,

On Mon, 17 Jul 2017 23:22:44 +0200, Arnout Vandecappelle <arnout@mind.be> wrote:

> 
> 
> On 16-07-17 01:11, Peter Seiderer wrote:
> > +From f0c02fb22bc277e2015a18e562b551ec7b3eed9e Mon Sep 17 00:00:00 2001
> > +From: Peter Seiderer <ps.report@gmx.net>
> > +Date: Sun, 16 Jul 2017 00:05:44 +0200
> > +Subject: [PATCH] Fix error attribute(target("+crc")) is unknown
> > +
> > +Task-number: QTBUG-61975
> > +Change-Id: I0b1b55c0737dad485b5ace8e6eb7cb842589453d
> 
>  You forgot your Sob. Care to send a follow-up patch to fix?
> 

Thanks for review, follow-up patch is on the way....

Regards,
Peter

>  Regards,
>  Arnout
> 
> > +---
>
diff mbox

Patch

diff --git a/package/qt5/qt5base/5.8.0/0005-Fix-error-attribute-target-crc-is-unknown.patch b/package/qt5/qt5base/5.8.0/0005-Fix-error-attribute-target-crc-is-unknown.patch
new file mode 100644
index 0000000000..92d93a800b
--- /dev/null
+++ b/package/qt5/qt5base/5.8.0/0005-Fix-error-attribute-target-crc-is-unknown.patch
@@ -0,0 +1,44 @@ 
+From f0c02fb22bc277e2015a18e562b551ec7b3eed9e Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Sun, 16 Jul 2017 00:05:44 +0200
+Subject: [PATCH] Fix error attribute(target("+crc")) is unknown
+
+Task-number: QTBUG-61975
+Change-Id: I0b1b55c0737dad485b5ace8e6eb7cb842589453d
+---
+ src/corelib/tools/qhash.cpp | 2 ++
+ src/corelib/tools/qsimd_p.h | 3 +++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
+index 1f9c05c..bbf6efb 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(__aarch64__)
+ 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 023a4b0..a85d572 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(__aarch64__)
++// only available on aarch64
+ #define QT_FUNCTION_TARGET_STRING_CRC32      "+crc"
++#endif
+ #  include <arm_acle.h>
+ #endif
+ 
+-- 
+2.7.4
+