wolfssl: update to 4.8.1-stable

[openwrt/staging/mkresin.git] / package / libs / wolfssl / patches / 001-Maths-x86-asm-change-asm-snippets-to-get-compiling.patch

diff --git a/package/libs/wolfssl/patches/001-Maths-x86-asm-change-asm-snippets-to-get-compiling.patch b/package/libs/wolfssl/patches/001-Maths-x86-asm-change-asm-snippets-to-get-compiling.patch
index 091b241285339ba91522ad5cbf7a18b359be2b14..763f9e8d065b89f519289e5872620b06c1d9a790 100644 (file)
--- a/package/libs/wolfssl/patches/001-Maths-x86-asm-change-asm-snippets-to-get-compiling.patch
+++ b/package/libs/wolfssl/patches/001-Maths-x86-asm-change-asm-snippets-to-get-compiling.patch
@@ -13,8 +13,6 @@ SP_ASM_MUL_ADD2 and SP_ASM_SQR_ADD.
  wolfcrypt/src/sp_int.c |  6 +++---
  2 files changed, 23 insertions(+), 12 deletions(-)
 
-diff --git a/wolfcrypt/src/asm.c b/wolfcrypt/src/asm.c
-index b7f53d073..a37e75e02 100644
 --- a/wolfcrypt/src/asm.c
 +++ b/wolfcrypt/src/asm.c
 @@ -698,33 +698,39 @@ __asm__(                             \
@@ -64,7 +62,7 @@ index b7f53d073..a37e75e02 100644
  
  #define SQRADDAC(i, j)                                    \
  __asm__(                                                  \
-@@ -733,7 +739,9 @@ __asm__(                                                  \
+@@ -733,7 +739,9 @@ __asm__(
       "addl  %%eax,%0     \n\t"                            \
       "adcl  %%edx,%1     \n\t"                            \
       "adcl  $0,%2        \n\t"                            \
@@ -75,7 +73,7 @@ index b7f53d073..a37e75e02 100644
  
  #define SQRADDDB                                          \
  __asm__(                                                  \
-@@ -743,7 +751,10 @@ __asm__(                                                  \
+@@ -743,7 +751,10 @@ __asm__(
       "addl %6,%0         \n\t"                            \
       "adcl %7,%1         \n\t"                            \
       "adcl %8,%2         \n\t"                            \
@@ -87,11 +85,9 @@ index b7f53d073..a37e75e02 100644
  
  #elif defined(TFM_X86_64)
  /* x86-64 optimized */
-diff --git a/wolfcrypt/src/sp_int.c b/wolfcrypt/src/sp_int.c
-index 6070faaa9..d26702e47 100644
 --- a/wolfcrypt/src/sp_int.c
 +++ b/wolfcrypt/src/sp_int.c
-@@ -477,7 +477,7 @@ static WC_INLINE sp_int_digit sp_div_word(sp_int_digit hi, sp_int_digit lo,
+@@ -476,7 +476,7 @@ static WC_INLINE sp_int_digit sp_div_wor
          "addl %%eax, %[l]     \n\t"                    \
          "adcl %%edx, %[h]     \n\t"                    \
          "adcl $0   , %[o]     \n\t"                    \
@@ -100,7 +96,7 @@ index 6070faaa9..d26702e47 100644
          : [a] "r" (va), [b] "r" (vb)                     \
          : "eax", "edx", "cc"                             \
      )
-@@ -503,7 +503,7 @@ static WC_INLINE sp_int_digit sp_div_word(sp_int_digit hi, sp_int_digit lo,
+@@ -502,7 +502,7 @@ static WC_INLINE sp_int_digit sp_div_wor
          "addl %%eax, %[l]     \n\t"                    \
          "adcl %%edx, %[h]     \n\t"                    \
          "adcl $0   , %[o]     \n\t"                    \
@@ -109,7 +105,7 @@ index 6070faaa9..d26702e47 100644
          : [a] "r" (va), [b] "r" (vb)                     \
          : "eax", "edx", "cc"                             \
      )
-@@ -542,7 +542,7 @@ static WC_INLINE sp_int_digit sp_div_word(sp_int_digit hi, sp_int_digit lo,
+@@ -541,7 +541,7 @@ static WC_INLINE sp_int_digit sp_div_wor
          "addl %%eax, %[l]     \n\t"                    \
          "adcl %%edx, %[h]     \n\t"                    \
          "adcl $0   , %[o]     \n\t"                    \
@@ -118,6 +114,3 @@ index 6070faaa9..d26702e47 100644
          : [a] "m" (va)                                   \
          : "eax", "edx", "cc"                             \
      )
--- 
-2.31.1
-