commit 25a4bf78f14a109ac26ce88390daddd71d8d02bf
author Roland McGrath <mcgrathr@google.com> Tue Jan 05 11:55:11 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Jan 07 15:14:08 2021 -0800
tree f642e168307b3cdf5448c9857b71e67896add17a
parent 4f9197e8415b0f3b228c95a55026ec7b93d1c776

scudo: Fix compilation for non-Linux aarch64

Linux-specific aarch64 code was deconditionalized in commit
dfa40840e0e2fa094c5d3f441affe0785cdc8d09.  This broke builds for
non-Linux aarch64 platforms.

Reviewed By: cryptoad

Differential Revision: https://reviews.llvm.org/D94108

GitOrigin-RevId: 90b8fd6136078127f5b792ec64745e5ae54a12a4

memtag.h

diff --git a/memtag.h b/memtag.h
index d848e3a..b1b6206 100644
--- a/memtag.h
+++ b/memtag.h
@@ -52,6 +52,8 @@
 
 #if defined(__aarch64__)
 
+#if SCUDO_LINUX
+
 inline bool systemSupportsMemoryTagging() {
 #ifndef HWCAP2_MTE
 #define HWCAP2_MTE (1 << 18)
@@ -77,6 +79,14 @@
           PR_MTE_TCF_MASK) != PR_MTE_TCF_NONE;
 }
 
+#else // !SCUDO_LINUX
+
+inline bool systemSupportsMemoryTagging() { return false; }
+
+inline bool systemDetectsMemoryTagFaultsTestOnly() { return false; }
+
+#endif // SCUDO_LINUX
+
 inline void disableMemoryTagChecksTestOnly() {
   __asm__ __volatile__(".arch_extension mte; msr tco, #1");
 }