StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug when memtag_heap in diag but not sanitizers" am: a0c6f31ef7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617517

Change-Id: I4f3bc6070ac1aeced4abdb523d7438cf00cb68a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Florian Mayer
2023-06-08 16:14:15 +00:00
committed by Automerger Merge Worker
parent 5c4398ba52 a0c6f31ef7
commit 9fa9bee104
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/config_sanitizers.mk
View File

@@ -249,6 +249,13 @@ ifneq ($(filter memtag_heap memtag_stack,$(my_sanitize)),)
endif
endif
# Ignore SANITIZE_TARGET_DIAG=memtag_heap without SANITIZE_TARGET=memtag_heap
# This can happen if a condition above filters out memtag_heap from
# my_sanitize. It is easier to handle all of these cases here centrally.
ifneq ($(filter memtag_heap,$(my_sanitize_diag)),)
my_sanitize_diag := $(filter-out memtag_heap,$(my_sanitize_diag))
endif
ifneq ($(filter memtag_heap,$(my_sanitize)),)
my_cflags += -fsanitize=memtag-heap
my_sanitize := $(filter-out memtag_heap,$(my_sanitize))