diff options
| author | Brendan Le Foll <brendan.le.foll@intel.com> | 2015-04-14 19:54:32 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-15 15:56:08 +0100 |
| commit | efde5a130397c597e6464a4e547774b6e600abfa (patch) | |
| tree | f9ce2e2d904664e0fc4ad57cf034aab4befedcf7 /meta | |
| parent | f1bb6acacc854f4d585e9a848aac82e7381313b9 (diff) | |
| download | poky-efde5a130397c597e6464a4e547774b6e600abfa.tar.gz | |
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
(From OE-Core rev: a2966949e68bbdce8d0a0fd5946d078b84ae63e9)
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch | 30 |
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 0d3902f2a1..ab1434a0e7 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 | |||
| 52 | /* | 52 | /* |
| 53 | * assuming long is 64bit - this is the DEC Alpha unsigned long long is only | 53 | * assuming long is 64bit - this is the DEC Alpha unsigned long long is only |
| 54 | * 64 bits :-(, don't define BN_LLONG for the DEC Alpha | 54 | * 64 bits :-(, don't define BN_LLONG for the DEC Alpha |
| 55 | Index: openssl-1.0.1e/crypto/bn/asm/x86_64-gcc.c | ||
| 56 | =================================================================== | ||
| 57 | --- openssl-1.0.1m/crypto/bn/asm/x86_64-gcc.c 2015-03-19 13:37:10.000000000 +0000 | ||
| 58 | +++ openssl-1.0.1m-modif/crypto/bn/asm/x86_64-gcc.c 2015-04-14 17:09:11.876533194 +0100 | ||
| 59 | @@ -211,9 +211,9 @@ | ||
| 60 | |||
| 61 | asm volatile (" subq %2,%2 \n" | ||
| 62 | ".p2align 4 \n" | ||
| 63 | - "1: movq (%4,%2,8),%0 \n" | ||
| 64 | - " adcq (%5,%2,8),%0 \n" | ||
| 65 | - " movq %0,(%3,%2,8) \n" | ||
| 66 | + "1: movq (%q4,%2,8),%0 \n" | ||
| 67 | + " adcq (%q5,%2,8),%0 \n" | ||
| 68 | + " movq %0,(%q3,%2,8) \n" | ||
| 69 | " leaq 1(%2),%2 \n" | ||
| 70 | " loop 1b \n" | ||
| 71 | " sbbq %0,%0 \n":"=&a" (ret), "+c"(n), | ||
| 72 | @@ -235,9 +235,9 @@ | ||
| 73 | |||
| 74 | asm volatile (" subq %2,%2 \n" | ||
| 75 | ".p2align 4 \n" | ||
| 76 | - "1: movq (%4,%2,8),%0 \n" | ||
| 77 | - " sbbq (%5,%2,8),%0 \n" | ||
| 78 | - " movq %0,(%3,%2,8) \n" | ||
| 79 | + "1: movq (%q4,%2,8),%0 \n" | ||
| 80 | + " sbbq (%q5,%2,8),%0 \n" | ||
| 81 | + " movq %0,(%q3,%2,8) \n" | ||
| 82 | " leaq 1(%2),%2 \n" | ||
| 83 | " loop 1b \n" | ||
| 84 | " sbbq %0,%0 \n":"=&a" (ret), "+c"(n) | ||
| 55 | Index: openssl-1.0.1e/crypto/bn/bn_exp.c | 85 | Index: openssl-1.0.1e/crypto/bn/bn_exp.c |
| 56 | =================================================================== | 86 | =================================================================== |
| 57 | --- openssl-1.0.1e.orig/crypto/bn/bn_exp.c | 87 | --- openssl-1.0.1e.orig/crypto/bn/bn_exp.c |