AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation on ARM without ARMv6T2

Browse Source 
The "rbit" instruction requires ARMv6T2 or higher. This was found in the
CI when building the imx6 target:

Compiler: arm-poky-linux-gnueabi-g++
Flags: -mfloat-abi=hard -mfpu=neon
Errors from the assembler:
  {standard input}:3078: Error: selected processor does not support ARM mode `rbit r3,r3'
  {standard input}:7341: Error: selected processor does not support ARM mode `rbit ip,ip'

That compiler defaults to ARMv5T. That's obviously wrong for an i.MX 6,
which is a Cortex-A9 (ARMv7), but the correction applies for older
processors.

Change-Id: I56c276fa411977dd7cd867d62adf021e4909302c
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
This commit is contained in:
Thiago Macieira 2014-07-18 18:57:22 -07:00
parent 9f5f3bcbc1
commit 1602a091c6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/benchmarks/corelib/tools/qstring/main.cpp
View File

@ -2388,7 +2388,7 @@ int fromUtf8_sse2_trusted_no_bom(ushort *qch, const char *chars, int len)
}
#endif
#ifdef __ARM_NEON__
#if defined(__ARM_NEON__) && (defined(Q_PROCESSOR_ARM_V7) || defined(__ARM_ARCH_6T2__))
int fromUtf8_latin1_neon(ushort *dst, const char *chars, int len)
{
fromLatin1_neon_improved(dst, chars, len);
@ -2521,7 +2521,7 @@ void tst_QString::fromUtf8Alternatives_data() const
QTest::newRow("sse2-optimized-for-ascii") << &fromUtf8_sse2_optimised_for_ascii;
QTest::newRow("sse2-trusted-no-bom") << &fromUtf8_sse2_trusted_no_bom;
#endif
#ifdef __ARM_NEON__
#if defined(__ARM_NEON__) && (defined(Q_PROCESSOR_ARM_V7) || defined(__ARM_ARCH_6T2__))
QTest::newRow("neon") << &fromUtf8_neon;
QTest::newRow("neon-trusted-no-bom") << &fromUtf8_neon_trusted;
#endif
@ -2531,7 +2531,7 @@ void tst_QString::fromUtf8Alternatives_data() const
QTest::newRow("latin1-sse2-qt4.7") << &fromUtf8_latin1_qt47;
QTest::newRow("latin1-sse2-improved") << &fromUtf8_latin1_sse2_improved;
#endif
#ifdef __ARM_NEON__
#if defined(__ARM_NEON__) && (defined(Q_PROCESSOR_ARM_V7) || defined(__ARM_ARCH_6T2__))
QTest::newRow("latin1-neon-improved") << &fromUtf8_latin1_neon;
#endif
}