aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-08-11 03:50:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-08-11 03:50:31 +0000
commit6f446dec6a10304e88ea0b4b4650fc3810fc3841 (patch)
treebb9713272d8f0282409ce6f8495fb7cf86600a8b
parente2075d1fbf166ad79fca7e3443e6a4c5d354e528 (diff)
parenta8d25fb698b092714ef73c684db69260e2047ed4 (diff)
downloadstrace-6f446dec6a10304e88ea0b4b4650fc3810fc3841.tar.gz
Merge "Add PROT_BTI and PROT_MTE to strace." into main am: e017bac325 am: ae2641da9f am: 88a4a17e6e am: 941662ca4b am: a8d25fb698
Original change: https://android-review.googlesource.com/c/platform/external/strace/+/2704457 Change-Id: I1f2c49211ab575a5b27a2daed8e64de63aca1a70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--xlat/mmap_prot.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/xlat/mmap_prot.h b/xlat/mmap_prot.h
index 310e7f1e..edca99c2 100644
--- a/xlat/mmap_prot.h
+++ b/xlat/mmap_prot.h
@@ -41,6 +41,12 @@ const struct xlat mmap_prot[] = {
#if defined(PROT_ADI) || (defined(HAVE_DECL_PROT_ADI) && HAVE_DECL_PROT_ADI)
XLAT(PROT_ADI),
#endif
+#if defined(PROT_BTI)
+ XLAT(PROT_BTI),
+#endif
+#if defined(PROT_MTE)
+ XLAT(PROT_MTE),
+#endif
XLAT_END
};