From: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Date: Tue, 31 Jan 2023 07:58:29 +0000 (+0000)
Subject: non-x86 arches do not have PAGE_SIZE
X-Git-Tag: archive/raspbian/29.0.6-26+rpi1^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fd7bb41fa1eb3834023f78a88b9a2222ab3a43a3;p=android-platform-tools.git

non-x86 arches do not have PAGE_SIZE

Forwarded: not-needed


Gbp-Pq: Topic art
Gbp-Pq: Name fix-build-on-non-x86.patch
---

diff --git a/art/libartbase/base/safe_copy.cc b/art/libartbase/base/safe_copy.cc
index ad75aa7b..0c477920 100644
--- a/art/libartbase/base/safe_copy.cc
+++ b/art/libartbase/base/safe_copy.cc
@@ -56,10 +56,11 @@ ssize_t SafeCopy(void *dst, const void *src, size_t len) {
     }
 
     src_iovs[iovecs_used].iov_base = const_cast<char*>(cur);
-    if (!IsAlignedParam(cur, PAGE_SIZE)) {
-      src_iovs[iovecs_used].iov_len = AlignUp(cur, PAGE_SIZE) - cur;
+    size_t pagesize = static_cast<size_t>(sysconf(_SC_PAGE_SIZE));
+    if (!IsAlignedParam(cur, pagesize)) {
+      src_iovs[iovecs_used].iov_len = AlignUp(cur, pagesize) - cur;
     } else {
-      src_iovs[iovecs_used].iov_len = PAGE_SIZE;
+      src_iovs[iovecs_used].iov_len = pagesize;
     }
 
     src_iovs[iovecs_used].iov_len = std::min(src_iovs[iovecs_used].iov_len, len);