diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-28 11:28:58 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-28 11:28:58 (GMT) |
| commit | e7b9fb2e87641a36301babf457056b3350f0431c (patch) | |
| tree | 3db3d29297d29ac1801a33d50c1273efec97352b /tests/benchmarks/corelib | |
| parent | b36e845dde90313cf98df118ce6ffd88502b943b (diff) | |
| parent | 77819edac505823226c40033e76d2dda0e8b363a (diff) | |
| download | Qt-e7b9fb2e87641a36301babf457056b3350f0431c.zip Qt-e7b9fb2e87641a36301babf457056b3350f0431c.tar.gz Qt-e7b9fb2e87641a36301babf457056b3350f0431c.tar.bz2 | |
Merge remote branch 'scm/qt/master'
Conflicts:
mkspecs/symbian-gcce/qmake.conf
Diffstat (limited to 'tests/benchmarks/corelib')
| -rw-r--r-- | tests/benchmarks/corelib/tools/qstring/main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/benchmarks/corelib/tools/qstring/main.cpp b/tests/benchmarks/corelib/tools/qstring/main.cpp index 9616052..eafcc24 100644 --- a/tests/benchmarks/corelib/tools/qstring/main.cpp +++ b/tests/benchmarks/corelib/tools/qstring/main.cpp @@ -1007,6 +1007,7 @@ static inline __attribute__((optimize("no-unroll-loops"))) int ucstrncmp_sse2_al return ucstrncmp_short_tail(a + counter, b + counter, len); } +#ifdef __SSSE3__ static inline __attribute__((optimize("no-unroll-loops"))) int ucstrncmp_ssse3_alignr_aligned(const ushort *a, const ushort *b, int len) { quintptr counter = 0; @@ -1276,6 +1277,7 @@ static int ucstrncmp_ssse3_aligning2(const ushort *a, const ushort *b, int len) } #endif +#endif typedef int (* UcstrncmpFunction)(const ushort *, const ushort *, int); Q_DECLARE_METATYPE(UcstrncmpFunction) |