diff options
| author | George Burgess IV <gbiv@chromium.org> | 2018-08-23 00:40:55 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2018-08-23 00:40:55 +0000 |
| commit | de0fe056df0577ea69cbf5f46dfe66debe046e5c (patch) | |
| tree | 2a3dc01712081930fd20dc4e85cecb0526227ea2 /BUILD.gn | |
| parent | ad6f586146dc261997f132ca76935970888a27fa (diff) | |
| download | zlib-de0fe056df0577ea69cbf5f46dfe66debe046e5c.tar.gz | |
[zlib] Tweak optimizations to work better with ThinLTO
ThinLTO emits warnings when linking modules with different target
triples. Android uses armv7-a as its default triple, so the mixing with
armv8-a here is problematic.
Bug: 807147
Test: md5sum <(objdump -d crc32_simd.o) is the same for Android.
Change-Id: If2bffc4090d3d94f158eea80d19ee9eb827fc837
Reviewed-on: https://chromium-review.googlesource.com/1147867
Commit-Queue: George Burgess <gbiv@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#585338}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 708d7d6be05885487cb5ccdffeab08a09ab1ea60
Diffstat (limited to 'BUILD.gn')
| -rw-r--r-- | BUILD.gn | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -78,7 +78,7 @@ if (current_cpu == "arm" || current_cpu == "arm64") { source_set("zlib_arm_crc32") { visibility = [ ":*" ] - if (!is_ios && !is_chromeos && !is_fuchsia) { + if (is_clang && (!is_ios && !is_chromeos && !is_fuchsia)) { include_dirs = [ "." ] if (is_android) { @@ -97,10 +97,6 @@ if (current_cpu == "arm" || current_cpu == "arm64") { "crc32_simd.h", ] - if (!is_win || is_clang) { - cflags_c = [ "-march=armv8-a+crc" ] - } - if (!is_debug) { configs -= [ "//build/config/compiler:default_optimization" ] configs += [ "//build/config/compiler:optimize_speed" ] |