Revert "Use -target-feature for MTE"
Revert submission 3493411-target_feature_mte
Reason for revert: The infrastructure upgrades necessary to support
this change still have not been completed. To submit this change,
re-client needs to be upgraded to v0.170 or greater.
Reverted changes: /q/submissionid:3493411-target_feature_mte
Bug: 366222162
Bug: 399925046
Change-Id: Id9ddce2546f6db1386d98fac44046f21878268d0
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