diff options
| author | 2016-01-26 22:31:41 +0000 | |
|---|---|---|
| committer | 2016-01-26 22:31:41 +0000 | |
| commit | caef579e906abc5c3174ba65e5205ea7fd5c44ad (patch) | |
| tree | e6a81ca39f1dcd07a0542824b1a4fcd71b0e1cd7 | |
| parent | 6a507f3bef2c970b29bada165269d2764d260fc8 (diff) | |
| parent | 37ba27acc3bb0937ee75f1215b86c3b5b872a356 (diff) | |
Merge "Temporarily use -fstack-protector for the read barrier config."
| -rw-r--r-- | build/Android.common_build.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index eec471e457..dc5385309a 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -318,6 +318,10 @@ ifeq ($(ART_USE_READ_BARRIER),true) 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) |