From: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Date: Thu, 13 Oct 2022 18:56:25 +0000 (+0100)
Subject: Workaround cacheflush on arm
X-Git-Tag: archive/raspbian/11.0.0+r48-4+rpi1^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=56c312bc4d5d9d8f620305450b5695b1022ead38;p=android-platform-art.git

Workaround cacheflush on arm

Forwarded: not-needed


Gbp-Pq: Name workaround-cacheflush-on-arm.patch
---

diff --git a/libartbase/base/utils.cc b/libartbase/base/utils.cc
index 19311b3..f00a81a 100644
--- a/libartbase/base/utils.cc
+++ b/libartbase/base/utils.cc
@@ -78,7 +78,10 @@ static constexpr size_t kMaxFlushAttempts = 4;
 int CacheFlush(uintptr_t start, uintptr_t limit) {
   // The signature of cacheflush(2) seems to vary by source. On ARM the system call wrapper
   //    (bionic/SYSCALLS.TXT) has the form: int cacheflush(long start, long end, long flags);
-  int r = cacheflush(start, limit, kCacheFlushFlags);
+//  int r = cacheflush(start, limit, kCacheFlushFlags);
+//This is only for ARM
+//Workaround/skip cacheflush until we find the real replacement
+  int r = 0;
   if (r == -1) {
     CHECK_NE(errno, EINVAL);
   }