summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMax Krummenacher <max.oss.09@gmail.com>2017-03-24 16:01:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-31 10:10:29 +0100
commit43832aa6c1d542d0be729ec475d1a37ca15d216a (patch)
tree44c8ab002c4f5d4a06e2a783ca2ae52a11cb94c8 /meta
parent22d9e285febec81b64e817094677ec0bc9065193 (diff)
downloadpoky-43832aa6c1d542d0be729ec475d1a37ca15d216a.tar.gz
openssl: Fix regression when building for thumb2
Commit 'c8da8ce openssl: Fix build with clang' introduced a regression. do_compile fails when building with gcc/thumb2. Note that I did not test if it still builds with clang. Prevents the following when building with thumb2: | ghash-armv4.S: Assembler messages: | ghash-armv4.S:88: Error: thumb conditional instruction should be in IT block -- `ldrplb r12,[r2,r3]' | ghash-armv4.S:98: conditional infixes are deprecated in unified syntax | ghash-armv4.S:98: Error: thumb conditional instruction should be in IT block -- `ldrplb r8,[r0,r3]' | ghash-armv4.S:105: Error: thumb conditional instruction should be in IT block -- `eorpl r12,r12,r8' | ghash-armv4.S:107: Error: thumb conditional instruction should be in IT block -- `andpl r14,r12,#0xf0' | ghash-armv4.S:108: Error: thumb conditional instruction should be in IT block -- `andpl r12,r12,#0x0f' | ghash-armv4.S:144: conditional infixes are deprecated in unified syntax | ghash-armv4.S:144: Error: thumb conditional instruction should be in IT block -- `ldrneb r12,[r2,#15]' | ghash-armv4.S:231: conditional infixes are deprecated in unified syntax | ghash-armv4.S:231: Error: thumb conditional instruction should be in IT block -- `ldrplb r12,[r0,r3]' | ghash-armv4.S:248: Error: thumb conditional instruction should be in IT block -- `andpl r14,r12,#0xf0' | ghash-armv4.S:249: Error: thumb conditional instruction should be in IT block -- `andpl r12,r12,#0x0f' (From OE-Core rev: 65cfb24033278fd4fb27013d3272394197649ca2) Signed-off-by: Max Krummenacher <max.krummenacher@toradex.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.patch6
1 files changed, 1 insertions, 5 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
index 47b83a5896..2270962a6f 100644
--- 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
@@ -29,18 +29,14 @@ diff --git a/crypto/modes/asm/ghash-armv4.pl b/crypto/modes/asm/ghash-armv4.pl
29index 8ccc963ef..442fed4da 100644 29index 8ccc963ef..442fed4da 100644
30--- a/crypto/modes/asm/ghash-armv4.pl 30--- a/crypto/modes/asm/ghash-armv4.pl
31+++ b/crypto/modes/asm/ghash-armv4.pl 31+++ b/crypto/modes/asm/ghash-armv4.pl
32@@ -124,7 +124,14 @@ $code=<<___; 32@@ -124,7 +124,10 @@ $code=<<___;
33 #include "arm_arch.h" 33 #include "arm_arch.h"
34 34
35 .text 35 .text
36+#if defined(__thumb2__) || defined(__clang__) 36+#if defined(__thumb2__) || defined(__clang__)
37+.syntax unified 37+.syntax unified
38+#endif 38+#endif
39+#if defined(__thumb2__)
40+.thumb
41+#else
42 .code 32 39 .code 32
43+#endif
44 40
45 #ifdef __clang__ 41 #ifdef __clang__
46 #define ldrplb ldrbpl 42 #define ldrplb ldrbpl