summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl10/0001-Fix-build-with-clang-using-external-assembler.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-08-08 18:30:48 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-13 09:27:38 +0100
commite326733d69181a03af7a4f837ea78fce348fdf00 (patch)
treef2b049b04bf94693ad017ac68df139b4ed655c65 /meta/recipes-connectivity/openssl/openssl10/0001-Fix-build-with-clang-using-external-assembler.patch
parent04891b31e62f37e692647399fa3534d3dd4ab7f9 (diff)
downloadpoky-e326733d69181a03af7a4f837ea78fce348fdf00.tar.gz
openssl: add a 1.1 version
Existing openssl 1.0 recipe is renamed to openssl10; it will continue to be provided for as long as upstream supports it (and there are still several recipes which do not work with openssl 1.1 due to API differences). A few files (such as openssl binary) are no longer installed by openssl 1.0, because they clash with openssl 1.1. (From OE-Core rev: da1183f9fa5e06fbe66b5b31eb3313d5d35d11e3) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl10/0001-Fix-build-with-clang-using-external-assembler.patch')
-rw-r--r--meta/recipes-connectivity/openssl/openssl10/0001-Fix-build-with-clang-using-external-assembler.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl10/0001-Fix-build-with-clang-using-external-assembler.patch b/meta/recipes-connectivity/openssl/openssl10/0001-Fix-build-with-clang-using-external-assembler.patch
new file mode 100644
index 0000000000..2270962a6f
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl10/0001-Fix-build-with-clang-using-external-assembler.patch
@@ -0,0 +1,45 @@
1From 2f6026cb8b16cf00726e3c5625c023f196680f07 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 17 Mar 2017 12:52:08 -0700
4Subject: [PATCH] Fix build with clang using external assembler
5
6Cherry-picked from
7https://github.com/openssl/openssl/commit/11208dcfb9105e8afa37233185decefd45e89e17
8https://github.com/openssl/openssl/commit/fbab8baddef8d3346ae40ff068871e2ddaf10270
9https://github.com/openssl/openssl/commit/6cf412c473d8145562b76219ce3da73b201b3255
10
11Fixes
12
13| ghash-armv4.S: Assembler messages:
14| ghash-armv4.S:81: Error: bad instruction `ldrbpl r12,[r2,r3]'
15| ghash-armv4.S:91: Error: bad instruction `ldrbpl r8,[r0,r3]'
16| ghash-armv4.S:137: Error: bad instruction `ldrbne r12,[r2,#15]'
17| ghash-armv4.S:224: Error: bad instruction `ldrbpl r12,[r0,r3]'
18| clang-4.0: error: assembler command failed with exit code 1 (use -v to see invocation)
19| make[2]: *** [<builtin>: ghash-armv4.o] Error 1
20
21Upstream-Status: Backport
22
23Signed-off-by: Khem Raj <raj.khem@gmail.com>
24---
25 crypto/modes/asm/ghash-armv4.pl | 7 +++++++
26 1 file changed, 7 insertions(+)
27
28diff --git a/crypto/modes/asm/ghash-armv4.pl b/crypto/modes/asm/ghash-armv4.pl
29index 8ccc963ef..442fed4da 100644
30--- a/crypto/modes/asm/ghash-armv4.pl
31+++ b/crypto/modes/asm/ghash-armv4.pl
32@@ -124,7 +124,10 @@ $code=<<___;
33 #include "arm_arch.h"
34
35 .text
36+#if defined(__thumb2__) || defined(__clang__)
37+.syntax unified
38+#endif
39 .code 32
40
41 #ifdef __clang__
42 #define ldrplb ldrbpl
43--
442.12.0
45