Apply OpenSSL PR 20235 to fix builds on ARM64

zooba · zooba · commit 82bfdc9e019e · 2023-02-09T15:19:48.000Z
diff --git a/20235.diff b/20235.diff
@@ -0,0 +1,13 @@
+diff --git a/crypto/bn/rsa_sup_mul.c b/crypto/bn/rsa_sup_mul.c
+index 0e0d02e1946e..234cce026dc1 100644
+--- a/crypto/bn/rsa_sup_mul.c
++++ b/crypto/bn/rsa_sup_mul.c
+@@ -109,7 +109,7 @@ static ossl_inline void _mul_limb(limb_t *hi, limb_t *lo, limb_t a, limb_t b)
+     *hi = t >> LIMB_BIT_SIZE;
+     *lo = (limb_t)t;
+ }
+-#elif (BN_BYTES == 8) && (defined _MSC_VER)
++#elif (BN_BYTES == 8) && (defined _MSC_VER) && (defined(_M_AMD64) || defined(_M_X64))
+ /* https://learn.microsoft.com/en-us/cpp/intrinsics/umul128?view=msvc-170 */
+ #pragma intrinsic(_umul128)
+ static ossl_inline void _mul_limb(limb_t *hi, limb_t *lo, limb_t a, limb_t b)
diff --git a/crypto/bn/rsa_sup_mul.c b/crypto/bn/rsa_sup_mul.c
@@ -109,7 +109,7 @@ static ossl_inline void _mul_limb(limb_t *hi, limb_t *lo, limb_t a, limb_t b)
     *hi = t >> LIMB_BIT_SIZE;
     *lo = (limb_t)t;
 }
-#elif (BN_BYTES == 8) && (defined _MSC_VER)
+#elif (BN_BYTES == 8) && (defined _MSC_VER) && (defined(_M_AMD64) || defined(_M_X64))
 /* https://learn.microsoft.com/en-us/cpp/intrinsics/umul128?view=msvc-170 */
 #pragma intrinsic(_umul128)
 static ossl_inline void _mul_limb(limb_t *hi, limb_t *lo, limb_t a, limb_t b)

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ static ossl_inline void _mul_limb(limb_t hi, limb_t lo, limb_t a, limb_t b)`
`109`	`109`	`*hi = t >> LIMB_BIT_SIZE;`
`110`	`110`	`*lo = (limb_t)t;`
`111`	`111`	`}`
`112`		`-#elif (BN_BYTES == 8) && (defined _MSC_VER)`
	`112`	`+#elif (BN_BYTES == 8) && (defined _MSC_VER) && (defined(_M_AMD64) \|\| defined(_M_X64))`
`113`	`113`	`/* https://learn.microsoft.com/en-us/cpp/intrinsics/umul128?view=msvc-170 */`
`114`	`114`	`#pragma intrinsic(_umul128)`
`115`	`115`	`static ossl_inline void _mul_limb(limb_t hi, limb_t lo, limb_t a, limb_t b)`