summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nick Kralevich <nnk@google.com> 2025-03-03 21:28:40 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2025-03-03 21:28:40 -0800
commitca57a0234c281a957ce18e29f60164a4b6cc0008 (patch)
tree17c2ccf8f7e9b84baff9cf85c1155db6a51d9833
parent1917078b7725e23b81fb82ff3bcd0c4f746f3543 (diff)
parentf274f7cd26901b89d2b141c0df89e4a443e761ba (diff)
Merge "Revert "Use -target-feature for MTE"" into main
-rw-r--r--core/config_sanitizers.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index c0f2c6893f..ab2d5c1ddf 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -284,9 +284,9 @@ endif
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