commit 2cb30000dfc51e43fd9a231f1882b4dd40025f60
author David Benjamin <davidben@google.com> Thu Jan 25 22:53:44 2024 -0500
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jan 26 18:21:23 2024 +0000
tree 618322b6d693f26588cbb10c661a69b9b8024658
parent 97dc33638b40a428ce666d61d71ee3db08083bf3

Stop generating unused assembly for 32-bit iOS

We stopped using it in
https://boringssl-review.googlesource.com/c/boringssl/+/64748. No need
to run through it with perlasm.

Change-Id: If58d38d9bf95080ebb245bec680b5c5639f07404
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/65807
Reviewed-by: Bob Beck <bbe@google.com>
Auto-Submit: David Benjamin <davidben@google.com>
Commit-Queue: Bob Beck <bbe@google.com>

cmake/perlasm.cmake

diff --git a/cmake/perlasm.cmake b/cmake/perlasm.cmake
index 6d0c30f..0dc104c 100644
--- a/cmake/perlasm.cmake
+++ b/cmake/perlasm.cmake
@@ -37,9 +37,8 @@
     add_perlasm_target("${dest}-win.S" ${src} win64 ${ARGN})
     append_to_parent_scope("${var}_ASM" "${dest}-apple.S" "${dest}-linux.S" "${dest}-win.S")
   elseif(arch STREQUAL "arm")
-    add_perlasm_target("${dest}-apple.S" ${src} ios32 ${ARGN})
     add_perlasm_target("${dest}-linux.S" ${src} linux32 ${ARGN})
-    append_to_parent_scope("${var}_ASM" "${dest}-apple.S" "${dest}-linux.S")
+    append_to_parent_scope("${var}_ASM" "${dest}-linux.S")
   elseif(arch STREQUAL "x86")
     add_perlasm_target("${dest}-apple.S" ${src} macosx -fPIC -DOPENSSL_IA32_SSE2 ${ARGN})
     add_perlasm_target("${dest}-linux.S" ${src} elf -fPIC -DOPENSSL_IA32_SSE2 ${ARGN})

util/generate_build_files.py

diff --git a/util/generate_build_files.py b/util/generate_build_files.py
index 74eb374..864febf 100644
--- a/util/generate_build_files.py
+++ b/util/generate_build_files.py
@@ -29,7 +29,6 @@
 # TODO(https://crbug.com/boringssl/542): This probably should be a map, but some
 # downstream scripts import this to find what folders to add/remove from git.
 OS_ARCH_COMBOS = [
-    ('apple', 'arm', 'ios32', [], 'S'),
     ('apple', 'aarch64', 'ios64', [], 'S'),
     ('apple', 'x86', 'macosx', ['-fPIC', '-DOPENSSL_IA32_SSE2'], 'S'),
     ('apple', 'x86_64', 'macosx', [], 'S'),