From 63b7621f466413ed051aa28037447400061ea742 Mon Sep 17 00:00:00 2001
From: Christian Paquin <cpaquin@microsoft.com>
Date: Fri, 19 Jun 2020 16:07:55 -0400
Subject: [PATCH] Fixed AMD64 and ARM64 macro detection in sike files.

---
 src/kem/sike/external/P434/P434.c            | 4 +++-
 src/kem/sike/external/P434/P434_compressed.c | 4 +++-
 src/kem/sike/external/P503/P503.c            | 4 ++--
 src/kem/sike/external/P503/P503_compressed.c | 4 ++--
 src/kem/sike/external/P610/P610.c            | 4 +++-
 src/kem/sike/external/P610/P610_compressed.c | 4 +++-
 src/kem/sike/external/P751/P751.c            | 4 ++--
 src/kem/sike/external/P751/P751_compressed.c | 4 ++--
 8 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/kem/sike/external/P434/P434.c b/src/kem/sike/external/P434/P434.c
index 4f239a304..b376f2d17 100644
--- a/src/kem/sike/external/P434/P434.c
+++ b/src/kem/sike/external/P434/P434.c
@@ -145,8 +145,10 @@ static const unsigned int strat_Bob[MAX_Bob - 1] = {
 #define USE_SIKE_ASM
 #endif
 
-#if defined(X86_64)
+#if defined(_AMD64_)
 #include "AMD64/fp_x64.c"
+#elif defined(_ARM64_)
+#include "ARM64/fp_arm64.c"
 #else
 #include "generic/fp_generic.c"
 #endif
diff --git a/src/kem/sike/external/P434/P434_compressed.c b/src/kem/sike/external/P434/P434_compressed.c
index 950a95436..85c24277f 100644
--- a/src/kem/sike/external/P434/P434_compressed.c
+++ b/src/kem/sike/external/P434/P434_compressed.c
@@ -388,8 +388,10 @@ static const uint64_t v_3_torsion[20][2 * NWORDS64_FIELD] = {
 #define USE_SIKE_ASM
 #endif
 
-#if defined(X86_64)
+#if defined(_AMD64_)
 #include "AMD64/fp_x64.c"
+#elif defined(_ARM64_)
+#include "ARM64/fp_arm64.c"
 #else
 #include "generic/fp_generic.c"
 #endif
diff --git a/src/kem/sike/external/P503/P503.c b/src/kem/sike/external/P503/P503.c
index 5e099d87e..b09e80fae 100644
--- a/src/kem/sike/external/P503/P503.c
+++ b/src/kem/sike/external/P503/P503.c
@@ -152,9 +152,9 @@ static const unsigned int strat_Bob[MAX_Bob - 1] = {
 #define USE_SIKE_ASM
 #endif
 
-#if defined(X86_64)
+#if defined(_AMD64_)
 #include "AMD64/fp_x64.c"
-#elif defined(ARM64)
+#elif defined(_ARM64_)
 #include "ARM64/fp_arm64.c"
 #else
 #include "generic/fp_generic.c"
diff --git a/src/kem/sike/external/P503/P503_compressed.c b/src/kem/sike/external/P503/P503_compressed.c
index 2b151effc..a1fb252f8 100644
--- a/src/kem/sike/external/P503/P503_compressed.c
+++ b/src/kem/sike/external/P503/P503_compressed.c
@@ -398,9 +398,9 @@ static const uint64_t v_3_torsion[20][2 * NWORDS64_FIELD] = {
 #define USE_SIKE_ASM
 #endif
 
-#if defined(X86_64)
+#if defined(_AMD64_)
 #include "AMD64/fp_x64.c"
-#elif defined(ARM64)
+#elif defined(_ARM64_)
 #include "ARM64/fp_arm64.c"
 #else
 #include "generic/fp_generic.c"
diff --git a/src/kem/sike/external/P610/P610.c b/src/kem/sike/external/P610/P610.c
index 42472afc7..740e5f325 100644
--- a/src/kem/sike/external/P610/P610.c
+++ b/src/kem/sike/external/P610/P610.c
@@ -153,8 +153,10 @@ static const unsigned int strat_Bob[MAX_Bob - 1] = {
 #define USE_SIKE_ASM
 #endif
 
-#if defined(X86_64)
+#if defined(_AMD64_)
 #include "AMD64/fp_x64.c"
+#elif defined(_ARM64_)
+#include "ARM64/fp_arm64.c"
 #else
 #include "generic/fp_generic.c"
 #endif
diff --git a/src/kem/sike/external/P610/P610_compressed.c b/src/kem/sike/external/P610/P610_compressed.c
index 1b3aea74f..d9ee621de 100644
--- a/src/kem/sike/external/P610/P610_compressed.c
+++ b/src/kem/sike/external/P610/P610_compressed.c
@@ -400,8 +400,10 @@ static const uint64_t v_3_torsion[20][2 * NWORDS64_FIELD] = {
 #define USE_SIKE_ASM
 #endif
 
-#if defined(X86_64)
+#if defined(_AMD64_)
 #include "AMD64/fp_x64.c"
+#elif defined(_ARM64_)
+#include "ARM64/fp_arm64.c"
 #else
 #include "generic/fp_generic.c"
 #endif
diff --git a/src/kem/sike/external/P751/P751.c b/src/kem/sike/external/P751/P751.c
index fdc2b206a..582058cb0 100644
--- a/src/kem/sike/external/P751/P751.c
+++ b/src/kem/sike/external/P751/P751.c
@@ -155,9 +155,9 @@ static const unsigned int strat_Bob[MAX_Bob - 1] = {
 #define USE_SIKE_ASM
 #endif
 
-#if defined(X86_64)
+#if defined(_AMD64_)
 #include "AMD64/fp_x64.c"
-#elif defined(ARM64)
+#elif defined(_ARM64_)
 #include "ARM64/fp_arm64.c"
 #else
 #include "generic/fp_generic.c"
diff --git a/src/kem/sike/external/P751/P751_compressed.c b/src/kem/sike/external/P751/P751_compressed.c
index a329ca69e..5d7a6e595 100644
--- a/src/kem/sike/external/P751/P751_compressed.c
+++ b/src/kem/sike/external/P751/P751_compressed.c
@@ -411,9 +411,9 @@ static const uint64_t v_3_torsion[20][2 * NWORDS64_FIELD] = {
 #define USE_SIKE_ASM
 #endif
 
-#if defined(X86_64)
+#if defined(_AMD64_)
 #include "AMD64/fp_x64.c"
-#elif defined(ARM64)
+#elif defined(_ARM64_)
 #include "ARM64/fp_arm64.c"
 #else
 #include "generic/fp_generic.c"