From 2a6762605574d6fbcea63e9d5e18d184e241417d Mon Sep 17 00:00:00 2001 From: Florian Mayer Date: Wed, 7 Jun 2023 15:02:22 -0700 Subject: [PATCH] Fix bug when memtag_heap in diag but not sanitizers Without this we get: unsupported argument 'memtag_heap' to option '-fno-sanitize-trap=' Change-Id: Iaeb23d0f4962bb3d788036fadc14b9420221a38e --- core/config_sanitizers.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index aa638d41ad..d837c6ebb4 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -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))