aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@qt.io>2019-01-17 10:59:04 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2019-01-20 18:37:28 +0000
commit4ed072432172398d753d1664244d74548704c107 (patch)
tree86033b341d0cc59d246a456879ad09901fdcd70c
parent95c050bb22f65ba5d8488b4a036f1c7a1223b138 (diff)
Fix cacheFlush ManageCaches flags for INTEGRITY
Use ACCESS_DST_SYNC to flush I-cache instead of ACCESS_DST_COHERENT D-cache flush. Fixes invalid instruction crash caused by out of sync instruction cache. Task-number: QTBUG-72267 Change-Id: Icb95050c9fee42ae7fa659b8ed4d3a4fbb98df6e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io>
-rw-r--r--src/3rdparty/masm/assembler/ARM64Assembler.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/masm/assembler/ARM64Assembler.h b/src/3rdparty/masm/assembler/ARM64Assembler.h
index fcf2e485e8..a9166e83a2 100644
--- a/src/3rdparty/masm/assembler/ARM64Assembler.h
+++ b/src/3rdparty/masm/assembler/ARM64Assembler.h
@@ -3051,7 +3051,7 @@ public:
UNUSED_PARAM(size);
#endif
#elif OS(INTEGRITY)
- ManageCaches((Address)code, size, ACCESS_DST_COHERENT);
+ ManageCaches((Address)code, size, ACCESS_DST_SYNC);
#else
#error "The cacheFlush support is missing on this platform."
#endif