diff options
author | Lei Maohui <leimaohui@cn.fujitsu.com> | 2019-06-06 11:05:05 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-19 12:46:44 +0100 |
commit | 9513e6dde4fa9fdbe1e100cb1b3802f983d4cfd6 (patch) | |
tree | 508fd736031b9831432b3ebfd30cd5b3c9040bf9 /meta/recipes-connectivity/openssl | |
parent | 6bb0cf46a1262ada4773990dd5ac4b66ceae6c9d (diff) | |
download | poky-9513e6dde4fa9fdbe1e100cb1b3802f983d4cfd6.tar.gz |
openssl: Fix a build bug on aarch64BE.
Fix bug as following on aarch64BE:
Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b'
(From OE-Core rev: f29572f70a89fd88ab3898d334c126422b66755c)
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch | 43 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.1c.bb | 1 |
2 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch new file mode 100644 index 0000000000..9a90a68cfd --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 1f8c0f2feea5cdcae0bcd9dfc78198d9e2c4cf09 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> | ||
3 | Date: Thu, 13 Jun 2019 12:17:30 +0900 | ||
4 | Subject: [PATCH] Fix build error for aarch64 big endian. | ||
5 | |||
6 | Modified rev to rev64, because rev only takes integer registers. | ||
7 | https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90827 | ||
8 | Otherwise, the following error will occur. | ||
9 | |||
10 | Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' | ||
11 | |||
12 | Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/9151] | ||
13 | |||
14 | Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> | ||
15 | --- | ||
16 | crypto/sha/asm/keccak1600-armv8.pl | 4 ++-- | ||
17 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl | ||
20 | index dc72f18..6620690 100755 | ||
21 | --- a/crypto/sha/asm/keccak1600-armv8.pl | ||
22 | +++ b/crypto/sha/asm/keccak1600-armv8.pl | ||
23 | @@ -731,7 +731,7 @@ $code.=<<___; | ||
24 | blo .Lprocess_block_ce | ||
25 | ldr d31,[$inp],#8 // *inp++ | ||
26 | #ifdef __AARCH64EB__ | ||
27 | - rev v31.16b,v31.16b | ||
28 | + rev64 v31.16b,v31.16b | ||
29 | #endif | ||
30 | eor $A[$j/5][$j%5],$A[$j/5][$j%5],v31.16b | ||
31 | beq .Lprocess_block_ce | ||
32 | @@ -740,7 +740,7 @@ ___ | ||
33 | $code.=<<___; | ||
34 | ldr d31,[$inp],#8 // *inp++ | ||
35 | #ifdef __AARCH64EB__ | ||
36 | - rev v31.16b,v31.16b | ||
37 | + rev64 v31.16b,v31.16b | ||
38 | #endif | ||
39 | eor $A[4][4],$A[4][4],v31.16b | ||
40 | |||
41 | -- | ||
42 | 2.7.4 | ||
43 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb index 534be57540..0117407316 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb | |||
@@ -16,6 +16,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | |||
16 | file://0001-skip-test_symbol_presence.patch \ | 16 | file://0001-skip-test_symbol_presence.patch \ |
17 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ | 17 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ |
18 | file://afalg.patch \ | 18 | file://afalg.patch \ |
19 | file://0001-Fix-build-error-for-aarch64-big-endian.patch \ | ||
19 | " | 20 | " |
20 | 21 | ||
21 | SRC_URI_append_class-nativesdk = " \ | 22 | SRC_URI_append_class-nativesdk = " \ |