commit 06979c9a1cb94c22e26c2622f3dfbb685fc37e40
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 09 01:20:01 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 09 01:20:01 2024 +0000
tree f917892a7484d30a83f20ac01e0410ab3be1294e
parent 796d7908bb8ae4e8841036ffc32eafce4269b4d8
parent 623d1df008ce9f54e2f99b3d6db1507d10029883

Merge "Revert^3 "Use -target-feature for MTE"" into main am: 2e14f9acc8 am: 623d1df008

Original change: https://android-review.googlesource.com/c/platform/build/+/3299864

Change-Id: I6cec1d90ad4a97a8d63007e276dfec4d52e4e7ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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