commit 351b2f8ce574a5fe4ccaeb6666d918ed3155d16e
author David Benjamin <davidben@google.com> Sun Feb 06 12:57:17 2022 -0500
committer Adam Langley <agl@google.com> Mon Feb 07 22:13:45 2022 +0000
tree d88117aae27d45778f878cc3d7f687d47831cfa0
parent 0f1417ce068446c26c4a9add99aebe0b4f5b221c

Rename generated assembly from 'mac' or 'ios' to 'apple'

The current names are confusing because (ios, aarch64) is also used on
macOS. The various Apple platforms all use the same ABI, and aarch64 is
no longer limited to iOS. (For that matter, the iOS simulator on x86
Macs is x86 iOS.) Just call it 'apple'.

Update-Note: References to 'mac' or 'ios' source lists in downstream
builds should be renamed to 'apple'.

Change-Id: Id1a0627f8ce3241f34ffa6bb245ee5783adc7c15
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/51307
Reviewed-by: Adam Langley <agl@google.com>

util/BUILD.toplevel

diff --git a/util/BUILD.toplevel b/util/BUILD.toplevel
index 9cea2fd..cfa695a 100644
--- a/util/BUILD.toplevel
+++ b/util/BUILD.toplevel
@@ -18,11 +18,11 @@
     "crypto_headers",
     "crypto_internal_headers",
     "crypto_sources",
-    "crypto_sources_ios_aarch64",
+    "crypto_sources_apple_aarch64",
+    "crypto_sources_apple_x86_64",
     "crypto_sources_linux_aarch64",
     "crypto_sources_linux_ppc64le",
     "crypto_sources_linux_x86_64",
-    "crypto_sources_mac_x86_64",
     "fips_fragments",
     "ssl_headers",
     "ssl_internal_headers",
@@ -110,8 +110,8 @@
     ":linux_aarch64": crypto_sources_linux_aarch64,
     ":linux_ppc64le": crypto_sources_linux_ppc64le,
     ":linux_x86_64": crypto_sources_linux_x86_64,
-    ":macos_aarch64": crypto_sources_ios_aarch64,
-    ":macos_x86_64": crypto_sources_mac_x86_64,
+    ":macos_aarch64": crypto_sources_apple_aarch64,
+    ":macos_x86_64": crypto_sources_apple_x86_64,
     "//conditions:default": [],
 })
 boringssl_copts += select({

util/generate_build_files.py

diff --git a/util/generate_build_files.py b/util/generate_build_files.py
index 5cc2de4..f1e4d98 100644
--- a/util/generate_build_files.py
+++ b/util/generate_build_files.py
@@ -26,15 +26,15 @@
 # OS_ARCH_COMBOS maps from OS and platform to the OpenSSL assembly "style" for
 # that platform and the extension used by asm files.
 OS_ARCH_COMBOS = [
-    ('ios', 'arm', 'ios32', [], 'S'),
-    ('ios', 'aarch64', 'ios64', [], 'S'),
+    ('apple', 'arm', 'ios32', [], 'S'),
+    ('apple', 'aarch64', 'ios64', [], 'S'),
+    ('apple', 'x86', 'macosx', ['-fPIC', '-DOPENSSL_IA32_SSE2'], 'S'),
+    ('apple', 'x86_64', 'macosx', [], 'S'),
     ('linux', 'arm', 'linux32', [], 'S'),
     ('linux', 'aarch64', 'linux64', [], 'S'),
     ('linux', 'ppc64le', 'linux64le', [], 'S'),
     ('linux', 'x86', 'elf', ['-fPIC', '-DOPENSSL_IA32_SSE2'], 'S'),
     ('linux', 'x86_64', 'elf', [], 'S'),
-    ('mac', 'x86', 'macosx', ['-fPIC', '-DOPENSSL_IA32_SSE2'], 'S'),
-    ('mac', 'x86_64', 'macosx', [], 'S'),
     ('win', 'x86', 'win32n', ['-DOPENSSL_IA32_SSE2'], 'asm'),
     ('win', 'x86_64', 'nasm', [], 'asm'),
     ('win', 'aarch64', 'win64', [], 'S'),
@@ -587,11 +587,11 @@
 
       cmake.write(
 R'''if(APPLE AND ARCH STREQUAL "aarch64")
-  set(CRYPTO_ARCH_SOURCES ${CRYPTO_ios_aarch64_SOURCES})
+  set(CRYPTO_ARCH_SOURCES ${CRYPTO_apple_aarch64_SOURCES})
 elseif(APPLE AND ARCH STREQUAL "arm")
-  set(CRYPTO_ARCH_SOURCES ${CRYPTO_ios_arm_SOURCES})
+  set(CRYPTO_ARCH_SOURCES ${CRYPTO_apple_arm_SOURCES})
 elseif(APPLE)
-  set(CRYPTO_ARCH_SOURCES ${CRYPTO_mac_${ARCH}_SOURCES})
+  set(CRYPTO_ARCH_SOURCES ${CRYPTO_apple_${ARCH}_SOURCES})
 elseif(UNIX)
   set(CRYPTO_ARCH_SOURCES ${CRYPTO_linux_${ARCH}_SOURCES})
 elseif(WIN32)