mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-17 09:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

openssl: Backport upstreamed version of patch to fix build on mips64

Browse Source 
Previous patch had a concern as well and this is a direct backport of
the patch fixing the problem.

(From OE-Core rev: 3d48bb6d2d65d0837dcacc262633a55053652e5f)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2015-05-27 21:51:55 -07:00
committed by Richard Purdie
parent db3aafa5ae
commit e092f1585b
3 changed files with 31 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
meta/recipes-connectivity/openssl/openssl/0001-Define-GCC_VERSION-macro-to-cover-upto-gcc-5.patch
View File

@@ -1,53 +0,0 @@
From 0aa68f7681a74f6ff80a80c5843bc35e5effffb9 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 22 May 2015 12:43:39 -0700
Subject: [PATCH] Define GCC_VERSION macro to cover upto gcc-5
Current check is limited to gcc 4 with minor versions
but when we use gcc 5.1, then minor version check fails
with current setup and we end up with build errors like
| In file included from bn_div.c:62:0:
| bn_div.c: In function 'BN_div':
| bn_lcl.h:311:9: error: impossible constraint in 'asm'
| asm ("dmultu %2,%3" \
| ^
| bn_div.c:402:13: note: in expansion of macro 'BN_UMULT_LOHI'
| BN_UMULT_LOHI(t2l, t2h, d1, q);
| ^
| <builtin>: recipe for target 'bn_div.o' failed
| make[2]: *** [bn_div.o] Error 1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: [Submitted]
crypto/bn/bn_lcl.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
index 196df7e..e801ba7 100644
--- a/crypto/bn/bn_lcl.h
+++ b/crypto/bn/bn_lcl.h
@@ -118,6 +118,9 @@
extern "C" {
#endif
+#define GCC_VERSION (__GNUC__ * 10000 \
+ + __GNUC_MINOR__ * 100 \
+ + __GNUC_PATCHLEVEL__)
/*-
* Bignum consistency macros
* There is one "API" macro, bn_fix_top(), for stripping leading zeroes from
@@ -443,7 +446,7 @@ unsigned __int64 _umul128(unsigned __int64 a, unsigned __int64 b,
# endif
# elif defined(__mips) && (defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG))
# if defined(__GNUC__) && __GNUC__>=2
-# if __GNUC__>=4 && __GNUC_MINOR__>=4
+# if GCC_VERSION > 40400
/* "h" constraint is no more since 4.4 */
# define BN_UMULT_HIGH(a,b) (((__uint128_t)(a)*(b))>>64)
# define BN_UMULT_LOHI(low,high,a,b) ({ \
--
2.1.4

30
meta/recipes-connectivity/openssl/openssl/0001-bn-bn_lcl.h-fix-MIPS-specific-gcc-version-check.patch Normal file
View File

@@ -0,0 +1,30 @@
From 60c268b21ac81cc6b1af5c5470282a613b96f6fd Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Mon, 25 May 2015 10:17:14 +0200
Subject: [PATCH] bn/bn_lcl.h: fix MIPS-specific gcc version check.
RT#3859
Reviewed-by: Tim Hudson <tjh@openssl.org>
---
Upstream-Status: Backport
crypto/bn/bn_lcl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
index 196df7e..b9d124a 100644
--- a/crypto/bn/bn_lcl.h
+++ b/crypto/bn/bn_lcl.h
@@ -443,7 +443,7 @@ unsigned __int64 _umul128(unsigned __int64 a, unsigned __int64 b,
# endif
# elif defined(__mips) && (defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG))
# if defined(__GNUC__) && __GNUC__>=2
-# if __GNUC__>=4 && __GNUC_MINOR__>=4
+# if __GNUC__>4 || (__GNUC__>=4 && __GNUC_MINOR__>=4)
/* "h" constraint is no more since 4.4 */
# define BN_UMULT_HIGH(a,b) (((__uint128_t)(a)*(b))>>64)
# define BN_UMULT_LOHI(low,high,a,b) ({ \
--
2.1.4

2
meta/recipes-connectivity/openssl/openssl_1.0.2a.bb
View File

@@ -36,7 +36,7 @@ SRC_URI += "file://configure-targets.patch \
file://ptest-deps.patch \
file://run-ptest \
file://crypto_use_bigint_in_x86-64_perl.patch \
file://0001-Define-GCC_VERSION-macro-to-cover-upto-gcc-5.patch \
file://0001-bn-bn_lcl.h-fix-MIPS-specific-gcc-version-check.patch \
"
SRC_URI[md5sum] = "a06c547dac9044161a477211049f60ef"