commit 2fb5f9cb8feec2234952f6999af941ac48555710
author David Benjamin <davidben@google.com> Thu May 16 15:27:36 2024 -0400
committer David Benjamin <davidben@google.com> Thu May 16 21:01:26 2024 +0000
tree b51cce2158dd2a600ecc93c4735827f3f93e93f1
parent d477c0d7c40ddca3a64ae26fc02d2dac175836d3

Move fiat_p256_adx assembly to the right build target

Change-Id: Ib06552aea216af191b172bb062c53f592720041a
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/68547
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: Adam Langley <agl@google.com>

build.json

diff --git a/build.json b/build.json
index f8948fb..2372b50 100644
--- a/build.json
+++ b/build.json
@@ -93,6 +93,10 @@
             "crypto/fipsmodule/sha/sha512.c",
             "crypto/fipsmodule/tls/kdf.c"
         ],
+        "asm": [
+            "third_party/fiat/asm/fiat_p256_adx_mul.S",
+            "third_party/fiat/asm/fiat_p256_adx_sqr.S"
+        ],
         "perlasm_aarch64": [
             {"src": "crypto/fipsmodule/aes/asm/aesv8-armx.pl", "dst": "aesv8-armv8"},
             {"src": "crypto/fipsmodule/modes/asm/aesv8-gcm-armv8.pl"},
@@ -548,9 +552,7 @@
             "crypto/hrss/asm/poly_rq_mul.S",
             "crypto/poly1305/poly1305_arm_asm.S",
             "third_party/fiat/asm/fiat_curve25519_adx_mul.S",
-            "third_party/fiat/asm/fiat_curve25519_adx_square.S",
-            "third_party/fiat/asm/fiat_p256_adx_mul.S",
-            "third_party/fiat/asm/fiat_p256_adx_sqr.S"
+            "third_party/fiat/asm/fiat_curve25519_adx_square.S"
         ],
         "perlasm_aarch64": [
             {"src": "crypto/chacha/asm/chacha-armv8.pl"},

gen/sources.bzl

diff --git a/gen/sources.bzl b/gen/sources.bzl
index 6903427..b162a45 100644
--- a/gen/sources.bzl
+++ b/gen/sources.bzl
@@ -195,6 +195,8 @@
   "gen/bcm/x86_64-mont-linux.S",
   "gen/bcm/x86_64-mont5-apple.S",
   "gen/bcm/x86_64-mont5-linux.S",
+  "third_party/fiat/asm/fiat_p256_adx_mul.S",
+  "third_party/fiat/asm/fiat_p256_adx_sqr.S",
 ]
 
 bcm_sources_nasm = [
@@ -666,8 +668,6 @@
   "gen/crypto/chacha20_poly1305_x86_64-linux.S",
   "third_party/fiat/asm/fiat_curve25519_adx_mul.S",
   "third_party/fiat/asm/fiat_curve25519_adx_square.S",
-  "third_party/fiat/asm/fiat_p256_adx_mul.S",
-  "third_party/fiat/asm/fiat_p256_adx_sqr.S",
 ]
 
 crypto_sources_nasm = [

gen/sources.cmake

diff --git a/gen/sources.cmake b/gen/sources.cmake
index d7e1e74..91c2395 100644
--- a/gen/sources.cmake
+++ b/gen/sources.cmake
@@ -201,6 +201,8 @@
   gen/bcm/x86_64-mont-linux.S
   gen/bcm/x86_64-mont5-apple.S
   gen/bcm/x86_64-mont5-linux.S
+  third_party/fiat/asm/fiat_p256_adx_mul.S
+  third_party/fiat/asm/fiat_p256_adx_sqr.S
 )
 
 set(
@@ -686,8 +688,6 @@
   gen/crypto/chacha20_poly1305_x86_64-linux.S
   third_party/fiat/asm/fiat_curve25519_adx_mul.S
   third_party/fiat/asm/fiat_curve25519_adx_square.S
-  third_party/fiat/asm/fiat_p256_adx_mul.S
-  third_party/fiat/asm/fiat_p256_adx_sqr.S
 )
 
 set(

gen/sources.json

diff --git a/gen/sources.json b/gen/sources.json
index 5d96a60..e6cc5db 100644
--- a/gen/sources.json
+++ b/gen/sources.json
@@ -178,7 +178,9 @@
       "gen/bcm/x86_64-mont-apple.S",
       "gen/bcm/x86_64-mont-linux.S",
       "gen/bcm/x86_64-mont5-apple.S",
-      "gen/bcm/x86_64-mont5-linux.S"
+      "gen/bcm/x86_64-mont5-linux.S",
+      "third_party/fiat/asm/fiat_p256_adx_mul.S",
+      "third_party/fiat/asm/fiat_p256_adx_sqr.S"
     ],
     "nasm": [
       "gen/bcm/aesni-gcm-x86_64-win.asm",
@@ -646,9 +648,7 @@
       "gen/crypto/chacha20_poly1305_x86_64-apple.S",
       "gen/crypto/chacha20_poly1305_x86_64-linux.S",
       "third_party/fiat/asm/fiat_curve25519_adx_mul.S",
-      "third_party/fiat/asm/fiat_curve25519_adx_square.S",
-      "third_party/fiat/asm/fiat_p256_adx_mul.S",
-      "third_party/fiat/asm/fiat_p256_adx_sqr.S"
+      "third_party/fiat/asm/fiat_curve25519_adx_square.S"
     ],
     "nasm": [
       "gen/crypto/aes128gcmsiv-x86_64-win.asm",