Commit b07c92a1 authored by Noel Gordon's avatar Noel Gordon Committed by Commit Bot

Add x86 bots to the read64le party

thestig@ reminds me we do have linux x86 bots on the waterfall. Add them
to the read64le party. Minor: run git cl format over BUILD.gn, and add a
line space here and there for readability.

Bug: 760853
Change-Id: Ia47296a26bff77f9be699e31053d8b94aac583f4
Reviewed-on: https://chromium-review.googlesource.com/910328Reviewed-by: default avatarMike Klein <mtklein@chromium.org>
Commit-Queue: Noel Gordon <noel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#535612}
parent 812a74e7
......@@ -56,11 +56,10 @@ source_set("zlib_adler32_simd") {
config("zlib_inflate_chunk_simd_config") {
if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
defines = [ "INFLATE_CHUNK_SIMD_SSE2" ]
if (current_cpu == "x64") {
defines += [ "INFLATE_CHUNK_READ_64LE" ]
}
defines = [
"INFLATE_CHUNK_READ_64LE",
"INFLATE_CHUNK_SIMD_SSE2",
]
}
if (current_cpu == "arm" || current_cpu == "arm64") {
......@@ -242,6 +241,7 @@ static_library("zlib") {
config("minizip_warnings") {
visibility = [ ":*" ]
if (is_clang) {
# zlib uses `if ((a == b))` for some reason.
cflags = [ "-Wno-parentheses-equality" ]
......@@ -266,6 +266,7 @@ static_library("minizip") {
"contrib/minizip/iowin32.h",
]
}
if (is_mac || is_ios || is_android || is_nacl) {
# Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We
# use fopen, ftell, and fseek instead on these systems.
......@@ -303,7 +304,7 @@ executable("zlib_bench") {
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [
"//build/config:exe_and_shlib_deps",
":zlib",
"//build/config:exe_and_shlib_deps",
]
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment