Merge cherrypicks of ['android-review.googlesource.com/3299976'] into 24Q4-release.
Change-Id: I809601a81b9c232f42bcc4292211212daeb002c2
diff --git a/cc/sanitize.go b/cc/sanitize.go
index a8722a0..7f52ce1 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -79,7 +79,7 @@
minimalRuntimeFlags = []string{"-fsanitize-minimal-runtime", "-fno-sanitize-trap=integer,undefined",
"-fno-sanitize-recover=integer,undefined"}
- memtagStackCommonFlags = []string{"-Xclang -target-feature -Xclang +mte"}
+ memtagStackCommonFlags = []string{"-march=armv8-a+memtag"}
memtagStackLlvmFlags = []string{"-dom-tree-reachability-max-bbs-to-explore=128"}
hostOnlySanitizeFlags = []string{"-fno-sanitize-recover=all"}