From 92c7a2f7cdc5c022db7d2c4b9de3f0678728b333 Mon Sep 17 00:00:00 2001 From: Android Tools Maintainers Date: Thu, 24 Feb 2022 16:58:51 +0000 Subject: [PATCH] non-x86 arches do not have PAGE_SIZE Forwarded: not-needed Gbp-Pq: Topic art Gbp-Pq: Name fix-build-on-non-x86.patch --- art/libartbase/base/safe_copy.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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(cur); - if (!IsAlignedParam(cur, PAGE_SIZE)) { - src_iovs[iovecs_used].iov_len = AlignUp(cur, PAGE_SIZE) - cur; + size_t pagesize = static_cast(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); -- 2.30.2