aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrendan Le Foll <brendan.le.foll@intel.com>2015-04-14 19:54:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-15 15:46:56 +0100
commita2966949e68bbdce8d0a0fd5946d078b84ae63e9 (patch)
tree7e2bef05eeb99183774b2b068d2fac0ceb97c45d
parent5094b8268daf8129cc6c7fad9c51a1bb845c99d1 (diff)
downloadopenembedded-core-a2966949e68bbdce8d0a0fd5946d078b84ae63e9.zip
openembedded-core-a2966949e68bbdce8d0a0fd5946d078b84ae63e9.tar.gz
openembedded-core-a2966949e68bbdce8d0a0fd5946d078b84ae63e9.tar.bz2
openssl: Fix x32 openssl patch which was not building
x32 builds where broken due to patch rebase not having been done correctly for this patch Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch b/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch
index 0d3902f..ab1434a 100644
--- a/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch
+++ b/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch
@@ -52,6 +52,36 @@ Index: openssl-1.0.1e/crypto/bn/bn.h
/*
* assuming long is 64bit - this is the DEC Alpha unsigned long long is only
* 64 bits :-(, don't define BN_LLONG for the DEC Alpha
+Index: openssl-1.0.1e/crypto/bn/asm/x86_64-gcc.c
+===================================================================
+--- openssl-1.0.1m/crypto/bn/asm/x86_64-gcc.c 2015-03-19 13:37:10.000000000 +0000
++++ openssl-1.0.1m-modif/crypto/bn/asm/x86_64-gcc.c 2015-04-14 17:09:11.876533194 +0100
+@@ -211,9 +211,9 @@
+
+ asm volatile (" subq %2,%2 \n"
+ ".p2align 4 \n"
+- "1: movq (%4,%2,8),%0 \n"
+- " adcq (%5,%2,8),%0 \n"
+- " movq %0,(%3,%2,8) \n"
++ "1: movq (%q4,%2,8),%0 \n"
++ " adcq (%q5,%2,8),%0 \n"
++ " movq %0,(%q3,%2,8) \n"
+ " leaq 1(%2),%2 \n"
+ " loop 1b \n"
+ " sbbq %0,%0 \n":"=&a" (ret), "+c"(n),
+@@ -235,9 +235,9 @@
+
+ asm volatile (" subq %2,%2 \n"
+ ".p2align 4 \n"
+- "1: movq (%4,%2,8),%0 \n"
+- " sbbq (%5,%2,8),%0 \n"
+- " movq %0,(%3,%2,8) \n"
++ "1: movq (%q4,%2,8),%0 \n"
++ " sbbq (%q5,%2,8),%0 \n"
++ " movq %0,(%q3,%2,8) \n"
+ " leaq 1(%2),%2 \n"
+ " loop 1b \n"
+ " sbbq %0,%0 \n":"=&a" (ret), "+c"(n)
Index: openssl-1.0.1e/crypto/bn/bn_exp.c
===================================================================
--- openssl-1.0.1e.orig/crypto/bn/bn_exp.c