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

Merge "Add Scudo support for Make"

Browse Source 
am: ab0c76c869

Change-Id: I722875707223675672a59c644f330cb94f2f6576
This commit is contained in:
Vishwath Mohan
2018-06-19 13:12:40 -07:00
committed by android-build-merger
parent d7cf905f1f ab0c76c869
commit 969a880b2f
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/config_sanitizers.mk
View File

@@ -192,6 +192,15 @@ ifneq ($(filter safe-stack,$(my_sanitize)),)
endif endif
endif endif
# Disable Scudo if ASan or TSan is enabled.
ifneq ($(filter address thread,$(my_sanitize)),)
my_sanitize := $(filter-out scudo,$(my_sanitize))
endif
ifneq ($(filter scudo,$(my_sanitize)),)
my_shared_libraries += $($(LOCAL_2ND_ARCH_VAR_PREFIX)SCUDO_RUNTIME_LIBRARY)
endif
# Undefined symbols can occur if a non-sanitized library links # Undefined symbols can occur if a non-sanitized library links
# sanitized static libraries. That's OK, because the executable # sanitized static libraries. That's OK, because the executable
# always depends on the ASan runtime library, which defines these # always depends on the ASan runtime library, which defines these
@@ -376,7 +385,7 @@ ifneq ($(my_sanitize_diag),)
notrap_arg := $(subst $(space),$(comma),$(my_sanitize_diag)), notrap_arg := $(subst $(space),$(comma),$(my_sanitize_diag)),
my_cflags += -fno-sanitize-trap=$(notrap_arg) my_cflags += -fno-sanitize-trap=$(notrap_arg)
# Diagnostic requires a runtime library, unless ASan or TSan are also enabled. # Diagnostic requires a runtime library, unless ASan or TSan are also enabled.
ifeq ($(filter address thread,$(my_sanitize)),) ifeq ($(filter address thread scudo,$(my_sanitize)),)
# Does not have to be the first DT_NEEDED unlike ASan. # Does not have to be the first DT_NEEDED unlike ASan.
my_shared_libraries += $($(LOCAL_2ND_ARCH_VAR_PREFIX)UBSAN_RUNTIME_LIBRARY) my_shared_libraries += $($(LOCAL_2ND_ARCH_VAR_PREFIX)UBSAN_RUNTIME_LIBRARY)
endif endif