commit 9dcc1d04fb6c4f972bc97a3c69814db7e7fcd9e6
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 07 17:23:41 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 07 17:23:41 2018 +0000
tree 922db2be9e866f4c178ef2b3df6497e18138b977
parent 5ec2688d71c5270744927cc2398709c65d95941c
parent 9b82b3fa3457d1f0b0b18c3d337c6608994ea0b5

Merge "(make) Add -fsanitize= argument to assembly flags."

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index ac917aa..e58f676 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -277,6 +277,7 @@
 ifneq ($(my_sanitize),)
   fsanitize_arg := $(subst $(space),$(comma),$(my_sanitize))
   my_cflags += -fsanitize=$(fsanitize_arg)
+  my_asflags += -fsanitize=$(fsanitize_arg)
 
   ifdef LOCAL_IS_HOST_MODULE
     my_cflags += -fno-sanitize-recover=all
@@ -297,6 +298,7 @@
   # entire module.
   LOCAL_ARM_MODE := thumb
   my_cflags += $(CFI_EXTRA_CFLAGS)
+  my_asflags += $(CFI_EXTRA_ASFLAGS)
   # Only append the default visibility flag if -fvisibility has not already been
   # set to hidden.
   ifeq ($(filter -fvisibility=hidden,$(LOCAL_CFLAGS)),)