On Thu, Mar 23, 2017 at 1:26 AM, Martin Jansa <martin.jansa at gmail.com> wrote:
> This breaks build with default gcc with thumb enabled:
>
These are straight backports from upstream. I wonder if this breakage
was just a break in waiting with newer release
> arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon
> -mfloat-abi=softfp -mcpu=cortex-a9 -mtune=cortex-a9 -funwind-tables
> -rdynamic --sysroot=WORKDIR/recipe-sysroot -I.. -I../.. -I../modes -I../asn1
> -I../evp -I../../include -fPIC -DOPENSSL_PIC -DOPENSSL_THREADS -D_REENTRANT
> -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN -DTERMIO -O2 -pipe -g
> -feliminate-unused-debug-types
> -fdebug-prefix-map=WORKDIR=/usr/src/debug/openssl/1.0.2k-r0
> -fdebug-prefix-map=WORKDIR/recipe-sysroot-native=
> -fdebug-prefix-map=WORKDIR/recipe-sysroot= -Wall -Wa,--noexecstack
> -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS -DOPENSSL_BN_ASM_MONT
> -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DAES_ASM
> -DBSAES_ASM -DGHASH_ASM -c -c -o ghash-armv4.o ghash-armv4.S
> ghash-armv4.S: Assembler messages:
> ghash-armv4.S:88: conditional infixes are deprecated in unified syntax
> 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'
> make[2]: *** [ghash-armv4.o] Error 1
>
>
>
> On Mon, Mar 20, 2017 at 5:47 PM, Khem Raj <raj.khem at gmail.com> wrote:
>>
>> Signed-off-by: Khem Raj <raj.khem at gmail.com>
>> ---
>> ...build-with-clang-using-external-assembler.patch | 49
>> ++++++++++++++++++++++
>> .../recipes-connectivity/openssl/openssl_1.0.2k.bb | 5 ++-
>> 2 files changed, 52 insertions(+), 2 deletions(-)
>> create mode 100644
>> meta/recipes-connectivity/openssl/openssl/0001-Fix-build-with-clang-using-external-assembler.patch
>>
>> 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 @@
>> +From 2f6026cb8b16cf00726e3c5625c023f196680f07 Mon Sep 17 00:00:00 2001
>> +From: Khem Raj <raj.khem at gmail.com>
>> +Date: Fri, 17 Mar 2017 12:52:08 -0700
>> +Subject: [PATCH] Fix build with clang using external assembler
>> +
>> +Cherry-picked from
>>
>> +https://github.com/openssl/openssl/commit/11208dcfb9105e8afa37233185decefd45e89e17
>>
>> +https://github.com/openssl/openssl/commit/fbab8baddef8d3346ae40ff068871e2ddaf10270
>>
>> +https://github.com/openssl/openssl/commit/6cf412c473d8145562b76219ce3da73b201b3255
>> +
>> +Fixes
>> +
>> +| ghash-armv4.S: Assembler messages:
>> +| ghash-armv4.S:81: Error: bad instruction `ldrbpl r12,[r2,r3]'
>> +| ghash-armv4.S:91: Error: bad instruction `ldrbpl r8,[r0,r3]'
>> +| ghash-armv4.S:137: Error: bad instruction `ldrbne r12,[r2,#15]'
>> +| ghash-armv4.S:224: Error: bad instruction `ldrbpl r12,[r0,r3]'
>> +| clang-4.0: error: assembler command failed with exit code 1 (use -v to
>> see invocation)
>> +| make[2]: *** [<builtin>: ghash-armv4.o] Error 1
>> +
>> +Upstream-Status: Backport
>> +
>> +Signed-off-by: Khem Raj <raj.khem at gmail.com>
>> +---
>> + crypto/modes/asm/ghash-armv4.pl | 7 +++++++
>> + 1 file changed, 7 insertions(+)
>> +
>> +diff --git a/crypto/modes/asm/ghash-armv4.pl
>> b/crypto/modes/asm/ghash-armv4.pl
>> +index 8ccc963ef..442fed4da 100644
>> +--- a/crypto/modes/asm/ghash-armv4.pl
>> ++++ b/crypto/modes/asm/ghash-armv4.pl
>> +@@ -124,7 +124,14 @@ $code=<<___;
>> + #include "arm_arch.h"
>> +
>> + .text
>> ++#if defined(__thumb2__) || defined(__clang__)
>> ++.syntax unified
>> ++#endif
>> ++#if defined(__thumb2__)
>> ++.thumb
>> ++#else
>> + .code 32
>> ++#endif
>> +
>> + #ifdef __clang__
>> + #define ldrplb ldrbpl
>> +--
>> +2.12.0
>> +
>> 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/ \
>> file://Makefiles-ptest.patch \
>> file://ptest-deps.patch \
>> file://openssl-1.0.2a-x32-asm.patch \
>> - file://ptest_makefile_deps.patch \
>> + file://ptest_makefile_deps.patch \
>> file://configure-musl-target.patch \
>> file://parallel.patch \
>> file://openssl-util-perlpath.pl-cwd.patch \
>> file://Use-SHA256-not-MD5-as-default-digest.patch \
>> - "
>> +
>> file://0001-Fix-build-with-clang-using-external-assembler.patch \
>> + "
>> SRC_URI[md5sum] = "f965fc0bf01bf882b31314b61391ae65"
>> SRC_URI[sha256sum] =
>> "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"
>>
>> --
>> 2.12.0
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>