From 47113b3e832a496601d0a4e73661e8723f14b015 Mon Sep 17 00:00:00 2001
From: armfazh <armfazh@cloudflare.com>
Date: Wed, 19 Mar 2025 18:45:32 -0700
Subject: [PATCH] Change extension of assembler headers .h -> .s

---
 dh/x25519/{curve_amd64.h => curveMacro_amd64.s} | 0
 dh/x25519/curve_amd64.s                         | 4 ++--
 dh/x448/{curve_amd64.h => curveMacro_amd64.s}   | 0
 dh/x448/curve_amd64.s                           | 4 ++--
 ecc/fourq/{fp_amd64.h => fpMacro_amd64.s}       | 0
 ecc/fourq/fp_amd64.s                            | 2 +-
 ecc/fourq/{fq_amd64.h => fqMacro_amd64.s}       | 2 +-
 ecc/fourq/fq_amd64.s                            | 2 +-
 ecc/fourq/{point_amd64.h => pointMacro_amd64.s} | 0
 ecc/fourq/point_amd64.s                         | 4 ++--
 math/fp25519/{fp_amd64.h => fpMacro_amd64.s}    | 0
 math/fp25519/fp_amd64.s                         | 2 +-
 math/fp448/{fp_amd64.h => fpMacro_amd64.s}      | 0
 math/fp448/fp_amd64.s                           | 2 +-
 14 files changed, 11 insertions(+), 11 deletions(-)
 rename dh/x25519/{curve_amd64.h => curveMacro_amd64.s} (100%)
 rename dh/x448/{curve_amd64.h => curveMacro_amd64.s} (100%)
 rename ecc/fourq/{fp_amd64.h => fpMacro_amd64.s} (100%)
 rename ecc/fourq/{fq_amd64.h => fqMacro_amd64.s} (99%)
 rename ecc/fourq/{point_amd64.h => pointMacro_amd64.s} (100%)
 rename math/fp25519/{fp_amd64.h => fpMacro_amd64.s} (100%)
 rename math/fp448/{fp_amd64.h => fpMacro_amd64.s} (100%)

diff --git a/dh/x25519/curve_amd64.h b/dh/x25519/curveMacro_amd64.s
similarity index 100%
rename from dh/x25519/curve_amd64.h
rename to dh/x25519/curveMacro_amd64.s
diff --git a/dh/x25519/curve_amd64.s b/dh/x25519/curve_amd64.s
index ce9f06289..53f6678ba 100644
--- a/dh/x25519/curve_amd64.s
+++ b/dh/x25519/curve_amd64.s
@@ -4,8 +4,8 @@
 #include "textflag.h"
 
 // Depends on circl/math/fp25519 package
-#include "../../math/fp25519/fp_amd64.h"
-#include "curve_amd64.h"
+#include "../../math/fp25519/fpMacro_amd64.s"
+#include "curveMacro_amd64.s"
 
 // CTE_A24 is (A+2)/4 from Curve25519
 #define CTE_A24 121666
diff --git a/dh/x448/curve_amd64.h b/dh/x448/curveMacro_amd64.s
similarity index 100%
rename from dh/x448/curve_amd64.h
rename to dh/x448/curveMacro_amd64.s
diff --git a/dh/x448/curve_amd64.s b/dh/x448/curve_amd64.s
index ed33ba3d0..52ec91a07 100644
--- a/dh/x448/curve_amd64.s
+++ b/dh/x448/curve_amd64.s
@@ -4,8 +4,8 @@
 #include "textflag.h"
 
 // Depends on circl/math/fp448 package
-#include "../../math/fp448/fp_amd64.h"
-#include "curve_amd64.h"
+#include "../../math/fp448/fpMacro_amd64.s"
+#include "curveMacro_amd64.s"
 
 // CTE_A24 is (A+2)/4 from Curve448
 #define CTE_A24 39082
diff --git a/ecc/fourq/fp_amd64.h b/ecc/fourq/fpMacro_amd64.s
similarity index 100%
rename from ecc/fourq/fp_amd64.h
rename to ecc/fourq/fpMacro_amd64.s
diff --git a/ecc/fourq/fp_amd64.s b/ecc/fourq/fp_amd64.s
index 9543bd260..3dd088b34 100644
--- a/ecc/fourq/fp_amd64.s
+++ b/ecc/fourq/fp_amd64.s
@@ -1,7 +1,7 @@
 // +build amd64,!purego
 
 #include "textflag.h"
-#include "fp_amd64.h"
+#include "fpMacro_amd64.s"
 
 // fpModp sets e to zero if it is equal to p. This is the only case where c
 // will not naturally be reduced to canonical form.
diff --git a/ecc/fourq/fq_amd64.h b/ecc/fourq/fqMacro_amd64.s
similarity index 99%
rename from ecc/fourq/fq_amd64.h
rename to ecc/fourq/fqMacro_amd64.s
index 241b1d237..356fa0fc0 100644
--- a/ecc/fourq/fq_amd64.h
+++ b/ecc/fourq/fqMacro_amd64.s
@@ -1,4 +1,4 @@
-#include "fp_amd64.h"
+#include "fpMacro_amd64.s"
 
 #define _fqAdd(c,a,b)      \
     _fpAdd( 0+c, 0+a, 0+b) \
diff --git a/ecc/fourq/fq_amd64.s b/ecc/fourq/fq_amd64.s
index 415fc135d..5446b2100 100644
--- a/ecc/fourq/fq_amd64.s
+++ b/ecc/fourq/fq_amd64.s
@@ -1,6 +1,6 @@
 // +build amd64,!purego
 
-#include "fq_amd64.h"
+#include "fqMacro_amd64.s"
 
 #define fqMulLegacy \
     _fqMulLeg(0(DI),0(SI),0(BX))
diff --git a/ecc/fourq/point_amd64.h b/ecc/fourq/pointMacro_amd64.s
similarity index 100%
rename from ecc/fourq/point_amd64.h
rename to ecc/fourq/pointMacro_amd64.s
diff --git a/ecc/fourq/point_amd64.s b/ecc/fourq/point_amd64.s
index f4dd5dd5e..90ddd2abb 100644
--- a/ecc/fourq/point_amd64.s
+++ b/ecc/fourq/point_amd64.s
@@ -1,8 +1,8 @@
 // +build amd64,!purego
 
 #include "go_asm.h"
-#include "fq_amd64.h"
-#include "point_amd64.h"
+#include "fqMacro_amd64.s"
+#include "pointMacro_amd64.s"
 
 // func doubleAmd64(P *pointR1)
 TEXT ·doubleAmd64(SB),0,$0-8
diff --git a/math/fp25519/fp_amd64.h b/math/fp25519/fpMacro_amd64.s
similarity index 100%
rename from math/fp25519/fp_amd64.h
rename to math/fp25519/fpMacro_amd64.s
diff --git a/math/fp25519/fp_amd64.s b/math/fp25519/fp_amd64.s
index 1fcc2dee1..bff496359 100644
--- a/math/fp25519/fp_amd64.s
+++ b/math/fp25519/fp_amd64.s
@@ -2,7 +2,7 @@
 // +build amd64,!purego
 
 #include "textflag.h"
-#include "fp_amd64.h"
+#include "fpMacro_amd64.s"
 
 // func cmovAmd64(x, y *Elt, n uint)
 TEXT ·cmovAmd64(SB),NOSPLIT,$0-24
diff --git a/math/fp448/fp_amd64.h b/math/fp448/fpMacro_amd64.s
similarity index 100%
rename from math/fp448/fp_amd64.h
rename to math/fp448/fpMacro_amd64.s
diff --git a/math/fp448/fp_amd64.s b/math/fp448/fp_amd64.s
index 3f1f07c98..8b0c4a99d 100644
--- a/math/fp448/fp_amd64.s
+++ b/math/fp448/fp_amd64.s
@@ -2,7 +2,7 @@
 // +build amd64,!purego
 
 #include "textflag.h"
-#include "fp_amd64.h"
+#include "fpMacro_amd64.s"
 
 // func cmovAmd64(x, y *Elt, n uint)
 TEXT ·cmovAmd64(SB),NOSPLIT,$0-24