Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06979c9a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I6cec1d90ad4a97a8d63007e276dfec4d52e4e7ec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 796d7908 623d1df0

core/config_sanitizers.mk

+3 −3
Original line number Diff line number Diff line
@@ -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