From 3b8031059a14dd1d3bc65589a887092c22d2629b Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 20 Apr 2021 13:43:08 +0200 Subject: [PATCH] Fix missing CPU feature feedback Add empty string first like we have for x86. This fixes offset checks, and reported missing features. Pick-to: 6.1 Change-Id: I09f6be05641d5ed9ae5d91fa72f678fef60bdbe7 Reviewed-by: Thiago Macieira --- src/corelib/global/qsimd.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/corelib/global/qsimd.cpp b/src/corelib/global/qsimd.cpp index 093ca877908..37d6dd4e145 100644 --- a/src/corelib/global/qsimd.cpp +++ b/src/corelib/global/qsimd.cpp @@ -89,12 +89,6 @@ QT_BEGIN_NAMESPACE -/* - * Use kdesdk/scripts/generate_string_table.pl to update the table below. Note - * we remove the terminating -1 that the script adds. - */ - -// begin generated #if defined(Q_PROCESSOR_ARM) /* Data: neon @@ -102,23 +96,23 @@ QT_BEGIN_NAMESPACE aes */ static const char features_string[] = + "\0" " neon\0" " crc32\0" - " aes\0" - "\0"; -static const int features_indices[] = { 0, 6, 13 }; + " aes\0"; +static const int features_indices[] = { 0, 1, 7, 14 }; #elif defined(Q_PROCESSOR_MIPS) /* Data: dsp dspr2 */ static const char features_string[] = + "\0" " dsp\0" - " dspr2\0" - "\0"; + " dspr2\0"; static const int features_indices[] = { - 0, 5 + 0, 1, 6 }; #elif defined(Q_PROCESSOR_X86) # include "qsimd_x86.cpp" // generated by util/x86simdgen