summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-03-20 09:47:33 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-22 11:35:21 +0000
commit231fae32d319b7325a38d19cc9681a67f7083dd9 (patch)
treeb524b53356e8b7a1896b2f5248de76417a70db8b /meta
parentb799e4a033a968e1a2c977b91a80e8de357c32b1 (diff)
downloadpoky-231fae32d319b7325a38d19cc9681a67f7083dd9.tar.gz
openssl: Fix build with clang
(From OE-Core rev: c8da8cec9007f77396f873f1cd56fc78bf83b19a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0001-Fix-build-with-clang-using-external-assembler.patch49
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2k.bb5
2 files changed, 52 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-with-clang-using-external-assembler.patch b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-with-clang-using-external-assembler.patch
new file mode 100644
index 0000000000..47b83a5896
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-with-clang-using-external-assembler.patch
@@ -0,0 +1,49 @@
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,14 @@ $code=<<___;
33 #include "arm_arch.h"
34
35 .text
36+#if defined(__thumb2__) || defined(__clang__)
37+.syntax unified
38+#endif
39+#if defined(__thumb2__)
40+.thumb
41+#else
42 .code 32
43+#endif
44
45 #ifdef __clang__
46 #define ldrplb ldrbpl
47--
482.12.0
49
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2k.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2k.bb
index 922819b3d5..1c1041428c 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2k.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2k.bb
@@ -37,12 +37,13 @@ SRC_URI += "file://find.pl;subdir=${BP}/util/ \
37 file://Makefiles-ptest.patch \ 37 file://Makefiles-ptest.patch \
38 file://ptest-deps.patch \ 38 file://ptest-deps.patch \
39 file://openssl-1.0.2a-x32-asm.patch \ 39 file://openssl-1.0.2a-x32-asm.patch \
40 file://ptest_makefile_deps.patch \ 40 file://ptest_makefile_deps.patch \
41 file://configure-musl-target.patch \ 41 file://configure-musl-target.patch \
42 file://parallel.patch \ 42 file://parallel.patch \
43 file://openssl-util-perlpath.pl-cwd.patch \ 43 file://openssl-util-perlpath.pl-cwd.patch \
44 file://Use-SHA256-not-MD5-as-default-digest.patch \ 44 file://Use-SHA256-not-MD5-as-default-digest.patch \
45 " 45 file://0001-Fix-build-with-clang-using-external-assembler.patch \
46 "
46SRC_URI[md5sum] = "f965fc0bf01bf882b31314b61391ae65" 47SRC_URI[md5sum] = "f965fc0bf01bf882b31314b61391ae65"
47SRC_URI[sha256sum] = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" 48SRC_URI[sha256sum] = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"
48 49