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

Commit c0bf85a6 authored by Vishwath Mohan's avatar Vishwath Mohan Committed by Gerrit Code Review
Browse files

Merge "Hide CFI behind a global flag."

parents bf28f593 8dcfdceb

core/config_sanitizers.mk

+9 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
##############################################



my_sanitize := $(strip $(LOCAL_SANITIZE))

my_sanitize_diag := $(strip $(LOCAL_SANITIZE_DIAG))



# SANITIZE_HOST is only in effect if the module is already using clang (host

# modules that haven't set `LOCAL_CLANG := false` and device modules that
@@ -61,6 +62,12 @@ ifeq ($(LOCAL_SANITIZE),never) 
  my_sanitize :=

endif



# If CFI is disabled globally, remove it from my_sanitize.

ifeq ($(strip $(ENABLE_CFI)),)

  my_sanitize := $(filter-out cfi,$(my_sanitize))

  my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag))

endif



my_nosanitize = $(strip $(LOCAL_NOSANITIZE))

ifneq ($(my_nosanitize),)

  my_sanitize := $(filter-out $(my_nosanitize),$(my_sanitize))
@@ -195,8 +202,8 @@ ifneq ($(strip $(LOCAL_SANITIZE_RECOVER)),) 
  my_cflags += -fsanitize-recover=$(recover_arg)

endif



ifneq ($(strip $(LOCAL_SANITIZE_DIAG)),)

  notrap_arg := $(subst $(space),$(comma),$(LOCAL_SANITIZE_DIAG)),

ifneq ($(my_sanitize_diag),)

  notrap_arg := $(subst $(space),$(comma),$(my_sanitize_diag)),

  my_cflags += -fno-sanitize-trap=$(notrap_arg)

  # Diagnostic requires a runtime library, unless ASan or TSan are also enabled.

  ifeq ($(filter address thread,$(my_sanitize)),)