commit 108fa50cda23ed4a712a098d058dccbbfd248206
author Ryan Macnak <rmacnak@google.com> Tue May 21 23:33:10 2024
committer Copybara-Service <copybara-worker@google.com> Wed May 22 00:23:00 2024
tree 90ab27fceb23ff98f878a77410977d6be270b446
parent 4f653ff1af93e9256c59a2c524795cd84c39c698

[zlib] Fix ARM32 GCC build.

It was attempting to use ARMv8 compiler flags.

Bug: https://github.com/dart-lang/sdk/issues/52080
Change-Id: I05f7d9fed42e9fbcabaff4f79bc604aad032e833
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5529831
Reviewed-by: Adenilson Cavalcanti <cavalcantii@chromium.org>
Reviewed-by: Hans Wennborg <hans@chromium.org>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
Cr-Commit-Position: refs/heads/main@{#1304129}
NOKEYCHECK=True
GitOrigin-RevId: 20908d3a960ba99246b09946895e771c8032cb7b

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index f97ab45..378bd0d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -151,7 +151,13 @@
     if (!is_win && !is_clang) {
       assert(!use_thin_lto,
              "ThinLTO fails mixing different module-level targets")
-      cflags_c = [ "-march=armv8-a+aes+crc" ]
+      if (current_cpu == "arm64") {
+        cflags_c = [ "-march=armv8-a+aes+crc" ]
+      } else if (current_cpu == "arm") {
+        cflags_c = [ "-march=armv8-a+crc" ]
+      } else {
+        assert(false, "Unexpected cpu: $current_cpu")
+      }
     }
 
     sources = [
@@ -478,9 +484,7 @@
     sources = [ "contrib/minizip/minizip.c" ]
 
     if (is_clang) {
-      cflags = [
-        "-Wno-incompatible-pointer-types-discards-qualifiers",
-      ]
+      cflags = [ "-Wno-incompatible-pointer-types-discards-qualifiers" ]
     }
 
     if (!is_debug) {
@@ -500,9 +504,7 @@
     sources = [ "contrib/minizip/miniunz.c" ]
 
     if (is_clang) {
-      cflags = [
-        "-Wno-incompatible-pointer-types-discards-qualifiers",
-      ]
+      cflags = [ "-Wno-incompatible-pointer-types-discards-qualifiers" ]
     }
 
     if (!is_debug) {