commit caef579e906abc5c3174ba65e5205ea7fd5c44ad
author Hiroshi Yamauchi <yamauchi@google.com> Tue Jan 26 22:31:41 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 26 22:31:41 2016 +0000
tree e6a81ca39f1dcd07a0542824b1a4fcd71b0e1cd7
parent 6a507f3bef2c970b29bada165269d2764d260fc8
parent 37ba27acc3bb0937ee75f1215b86c3b5b872a356

Merge "Temporarily use -fstack-protector for the read barrier config."

build/Android.common_build.mk

diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index eec471e..dc53853 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -318,6 +318,10 @@
   art_cflags += -DART_READ_BARRIER_TYPE_IS_$(ART_READ_BARRIER_TYPE)=1
   art_asflags += -DART_USE_READ_BARRIER=1
   art_asflags += -DART_READ_BARRIER_TYPE_IS_$(ART_READ_BARRIER_TYPE)=1
+
+  # Temporarily override -fstack-protector-strong with -fstack-protector to avoid a major
+  # slowdown with the read barrier config. b/26744236.
+  art_cflags += -fstack-protector
 endif
 
 ifeq ($(ART_USE_TLAB),true)