diff options
| author | 2017-01-24 17:56:49 +0000 | |
|---|---|---|
| committer | 2017-01-24 17:56:49 +0000 | |
| commit | cd1ed41d0608bd5fec096a01030defb51e464faa (patch) | |
| tree | 113e360210cc4b9781778d5d4559fd32c0db4816 | |
| parent | 461bbbf6f2e8dddb33a124c598e806b75929c9bb (diff) | |
Revert to `-fstack-protector-strong` in read barrier config.
Instead of `-fstack-protector`, which was used temporarily
for performance reasons.
Test: m test-art-host
Bug: 26744236
Bug: 12687968
Change-Id: Ifefa93ef40249b616b278692907c1f9d9b6d41b6
| -rw-r--r-- | build/art.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/build/art.go b/build/art.go index 84269c3f23..999ece6de6 100644 --- a/build/art.go +++ b/build/art.go @@ -68,10 +68,6 @@ func globalFlags(ctx android.BaseContext) ([]string, []string) { asflags = append(asflags, "-DART_USE_READ_BARRIER=1", "-DART_READ_BARRIER_TYPE_IS_"+barrierType+"=1") - - // Temporarily override -fstack-protector-strong with -fstack-protector to avoid a major - // slowdown with the read barrier config. b/26744236. - cflags = append(cflags, "-fstack-protector") } if envTrue(ctx, "ART_USE_VIXL_ARM_BACKEND") { |