Revert "Add x86 bots to the read64le party"

This reverts commit b07c92a12d39e1ac51fe0dab8e4cb98f91f0d213.

Reason for revert: the litmus test of running this code on linux x86 bots
worked. However, performance-wise we're not so sure. Back this change out
to restrict it to Intel x64 for now.

Original change's description:
> 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/910328
> Reviewed-by: Mike Klein <mtklein@chromium.org>
> Commit-Queue: Noel Gordon <noel@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#535612}

TBR=noel@chromium.org,mtklein@chromium.org,nigeltao@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 760853
Change-Id: If3d24a2cdc6614ff82c781019623108a52dbd16a
Reviewed-on: https://chromium-review.googlesource.com/913029
Commit-Queue: Noel Gordon <noel@chromium.org>
Reviewed-by: Noel Gordon <noel@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#536020}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: b7fef3927da4a703c523e7e8916fd8d4c031a402

1 files changed, 6 insertions, 7 deletions

diff --git a/BUILD.gn b/BUILD.gn
index a9294d4..e545ae5 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -56,10 +56,11 @@ source_set("zlib_adler32_simd") {
 
 config("zlib_inflate_chunk_simd_config") {
   if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
-    defines = [
-      "INFLATE_CHUNK_READ_64LE",
-      "INFLATE_CHUNK_SIMD_SSE2",
-    ]
+    defines = [ "INFLATE_CHUNK_SIMD_SSE2" ]
+
+    if (current_cpu == "x64") {
+      defines += [ "INFLATE_CHUNK_READ_64LE" ]
+    }
   }
 
   if (current_cpu == "arm" || current_cpu == "arm64") {
@@ -241,7 +242,6 @@ static_library("zlib") {
 
 config("minizip_warnings") {
   visibility = [ ":*" ]
-
   if (is_clang) {
     # zlib uses `if ((a == b))` for some reason.
     cflags = [ "-Wno-parentheses-equality" ]
@@ -266,7 +266,6 @@ 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.
@@ -304,7 +303,7 @@ executable("zlib_bench") {
   configs += [ "//build/config/compiler:no_chromium_code" ]
 
   deps = [
-    ":zlib",
     "//build/config:exe_and_shlib_deps",
+    ":zlib",
   ]
 }