summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl10/0001-Fix-build-with-clang-using-external-assembler.patch
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-12 22:53:19 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-15 17:53:29 +0100
commita98ac2a39b30b3a3e94669616900547b0b87992a (patch)
tree3ab98c21f2018d317dae16ed6d40cb951eca60a2 /meta/recipes-connectivity/openssl/openssl10/0001-Fix-build-with-clang-using-external-assembler.patch
parent66ef365ba617e3f0dfb13d8711871b6628ed4465 (diff)
downloadpoky-a98ac2a39b30b3a3e94669616900547b0b87992a.tar.gz
openssl: Remove openssl10
OpenSSL 1.0 has been replaced by 1.1, and it would be harder to security-support after the upstream EOL at the end of 2019. (From OE-Core rev: 0f7ffcaa18db7bc27f30c994aafbb9f4f8b2ae7e) Signed-off-by: Adrian Bunk <bunk@stusta.de> 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, 0 insertions, 45 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
deleted file mode 100644
index 2270962a6f..0000000000
--- a/meta/recipes-connectivity/openssl/openssl10/0001-Fix-build-with-clang-using-external-assembler.patch
+++ /dev/null
@@ -1,45 +0,0 @@
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