commit 2e14f9acc84f70e557920f8e83a79c8262081c05
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 09 00:22:51 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 09 00:22:51 2024 +0000
tree 56d08da4c6e4cedaba731001062b3788971fa9d9
parent 9765755c35531db7cb5b667347b4e7f3e158f787
parent 476da833e12179d31f6a301ad65bf45c63a28818

Merge "Revert^3 "Use -target-feature for MTE"" into main

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index c0f2c68..ab2d5c1 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -284,9 +284,9 @@
 ifneq ($(filter memtag_stack,$(my_sanitize)),)
   my_cflags += -fsanitize=memtag-stack
   my_ldflags += -fsanitize=memtag-stack
-  my_cflags += -Xclang -target-feature -Xclang +mte
-  my_ldflags += -Xclang -target-feature -Xclang +mte
-  my_asflags += -Xclang -target-feature -Xclang +mte
+  my_cflags += -march=armv8a+memtag
+  my_ldflags += -march=armv8a+memtag
+  my_asflags += -march=armv8a+memtag
   my_sanitize := $(filter-out memtag_stack,$(my_sanitize))
 endif