From cafb3c3b62db0918dad6160f4401681c89afcd54 Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Tue, 8 Oct 2024 23:31:05 +0000 Subject: [PATCH] Revert^3 "Use -target-feature for MTE" This reverts commit fe67d8f1f22106bcc6634652ea1a5303e406f639. Reason for revert: reapplied too early (cherry picked from https://android-review.googlesource.com/q/commit:476da833e12179d31f6a301ad65bf45c63a28818) Merged-In: I8d5f8b056a644b661bf03e79e1f1a783a3dcbf1d Change-Id: I8d5f8b056a644b661bf03e79e1f1a783a3dcbf1d --- core/config_sanitizers.mk | 6 +++--- 1 file 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