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

Fix bug when memtag_heap in diag but not sanitizers

Browse Source 
Without this we get:
unsupported argument 'memtag_heap' to option '-fno-sanitize-trap='
(cherry picked from https://android-review.googlesource.com/q/commit:2a6762605574d6fbcea63e9d5e18d184e241417d)

Bug: 286415307
Merged-In: Iaeb23d0f4962bb3d788036fadc14b9420221a38e
Change-Id: Iaeb23d0f4962bb3d788036fadc14b9420221a38e
This commit is contained in:
Florian Mayer
2023-06-07 15:02:22 -07:00
parent d833e73b8b
commit 0f79319bb8
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
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)),) ifneq ($(filter memtag_heap,$(my_sanitize)),)
my_cflags += -fsanitize=memtag-heap my_cflags += -fsanitize=memtag-heap
my_sanitize := $(filter-out memtag_heap,$(my_sanitize)) my_sanitize := $(filter-out memtag_heap,$(my_sanitize))