All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/4] misc fixes
@ 2017-03-20 16:47 Khem Raj
  2017-03-20 16:47 ` [PATCH 1/4] ltp: Fix __sighandler_t for mips Khem Raj
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Khem Raj @ 2017-03-20 16:47 UTC (permalink / raw)
  To: openembedded-core

Fix install collisions between go-native and go-bootstrap-native
Fix ltp for musl
Other fixes are found by clang but are generic

The following changes since commit b5a595a4be09756b88e91f3353e3b221b165ab44:

  binutils: disable gold on mingw (2017-03-20 15:17:48 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib kraj/pu
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=kraj/pu

Khem Raj (4):
  ltp: Fix __sighandler_t for mips
  openssl: Fix build with clang
  acpitests: Point Makefile CC to use OE synthesized CC
  go-native: Install bootstrap binaries with 1.4 suffix

 ...build-with-clang-using-external-assembler.patch | 49 ++++++++++++++++++++++
 .../recipes-connectivity/openssl/openssl_1.0.2k.bb |  5 ++-
 meta/recipes-devtools/go/go-native.inc             | 12 +++---
 meta/recipes-extended/acpica/acpitests_20140828.bb |  2 +-
 ...n.h-Use-sighandler_t-instead-of-__sighand.patch | 31 +++++++-------
 5 files changed, 76 insertions(+), 23 deletions(-)
 create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Fix-build-with-clang-using-external-assembler.patch

-- 
2.12.0



^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH 1/4] ltp: Fix __sighandler_t for mips
  2017-03-20 16:47 [PATCH 0/4] misc fixes Khem Raj
@ 2017-03-20 16:47 ` Khem Raj
  2017-03-20 16:47 ` [PATCH 2/4] openssl: Fix build with clang Khem Raj
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2017-03-20 16:47 UTC (permalink / raw)
  To: openembedded-core

mips definition of kernel_sigaction was added later
and the patch did not apply to mips part which ended
in ltp failing to compile on mips parts

In file included from rt_sigaction01.c:42:0:
../../../../include/lapi/rt_sigaction.h:39:2: error: unknown type name '__sighandler_t'
  __sighandler_t k_sa_handler;
  ^~~~~~~~~~~~~~

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...n.h-Use-sighandler_t-instead-of-__sighand.patch | 31 ++++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/meta/recipes-extended/ltp/ltp/0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch b/meta/recipes-extended/ltp/ltp/0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
index fc82ff9239..b26aa133e9 100644
--- a/meta/recipes-extended/ltp/ltp/0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
+++ b/meta/recipes-extended/ltp/ltp/0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
@@ -13,23 +13,29 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  testcases/kernel/syscalls/rt_sigsuspend/Makefile | 3 +++
  2 files changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/include/lapi/rt_sigaction.h b/include/lapi/rt_sigaction.h
-index 3a5a763..870918c 100644
---- a/include/lapi/rt_sigaction.h
-+++ b/include/lapi/rt_sigaction.h
-@@ -34,7 +34,7 @@
- #define INVAL_SA_PTR ((void *)-1)
- 
+Index: git/include/lapi/rt_sigaction.h
+===================================================================
+--- git.orig/include/lapi/rt_sigaction.h
++++ git/include/lapi/rt_sigaction.h
+@@ -36,12 +36,12 @@
+ #if defined(__mips__)
+ struct kernel_sigaction {
+ 	unsigned int sa_flags;
+-	__sighandler_t k_sa_handler;
++	sighandler_t k_sa_handler;
+ 	sigset_t sa_mask;
+ };
+ #else
  struct kernel_sigaction {
 -	__sighandler_t k_sa_handler;
 +	sighandler_t k_sa_handler;
  	unsigned long sa_flags;
  	void (*sa_restorer) (void);
  	sigset_t sa_mask;
-diff --git a/testcases/kernel/syscalls/rt_sigsuspend/Makefile b/testcases/kernel/syscalls/rt_sigsuspend/Makefile
-index 37bc3a9..2ca7f7c 100644
---- a/testcases/kernel/syscalls/rt_sigsuspend/Makefile
-+++ b/testcases/kernel/syscalls/rt_sigsuspend/Makefile
+Index: git/testcases/kernel/syscalls/rt_sigsuspend/Makefile
+===================================================================
+--- git.orig/testcases/kernel/syscalls/rt_sigsuspend/Makefile
++++ git/testcases/kernel/syscalls/rt_sigsuspend/Makefile
 @@ -19,4 +19,7 @@
  top_srcdir		?= ../../../..
  
@@ -38,6 +44,3 @@ index 37bc3a9..2ca7f7c 100644
 +CFLAGS	+= -D_GNU_SOURCE
 +
  include $(top_srcdir)/include/mk/generic_leaf_target.mk
--- 
-2.7.0
-
-- 
2.12.0



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH 2/4] openssl: Fix build with clang
  2017-03-20 16:47 [PATCH 0/4] misc fixes Khem Raj
  2017-03-20 16:47 ` [PATCH 1/4] ltp: Fix __sighandler_t for mips Khem Raj
@ 2017-03-20 16:47 ` Khem Raj
  2017-03-23  8:26   ` Martin Jansa
  2017-03-20 16:47 ` [PATCH 3/4] acpitests: Point Makefile CC to use OE synthesized CC Khem Raj
  2017-03-20 16:47 ` [PATCH 4/4] go-native: Install bootstrap binaries with 1.4 suffix Khem Raj
  3 siblings, 1 reply; 7+ messages in thread
From: Khem Raj @ 2017-03-20 16:47 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Khem Raj <raj.khem@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@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@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



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH 3/4] acpitests: Point Makefile CC to use OE synthesized CC
  2017-03-20 16:47 [PATCH 0/4] misc fixes Khem Raj
  2017-03-20 16:47 ` [PATCH 1/4] ltp: Fix __sighandler_t for mips Khem Raj
  2017-03-20 16:47 ` [PATCH 2/4] openssl: Fix build with clang Khem Raj
@ 2017-03-20 16:47 ` Khem Raj
  2017-03-20 16:47 ` [PATCH 4/4] go-native: Install bootstrap binaries with 1.4 suffix Khem Raj
  3 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2017-03-20 16:47 UTC (permalink / raw)
  To: openembedded-core

Default CC is same as used here, there is no need to
duplicate it, as a plus it helps in compiling acpitests with
non-gcc cross compilers

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-extended/acpica/acpitests_20140828.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/acpica/acpitests_20140828.bb b/meta/recipes-extended/acpica/acpitests_20140828.bb
index 1f6f190c2e..409da5ccc4 100644
--- a/meta/recipes-extended/acpica/acpitests_20140828.bb
+++ b/meta/recipes-extended/acpica/acpitests_20140828.bb
@@ -18,7 +18,7 @@ SRC_URI[acpica.sha256sum] = "01d8867656c5ba41dec307c4383ce676196ad4281ac2c9dec9f
 
 S = "${WORKDIR}/acpitests-unix-${PV}"
 
-EXTRA_OEMAKE = "'CC=${TARGET_PREFIX}gcc ${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS}' 'OPT_CFLAGS=-Wall'"
+EXTRA_OEMAKE = "'CC=${CC}' 'OPT_CFLAGS=-Wall'"
 
 # The Makefiles expect a specific layout
 do_compile() {
-- 
2.12.0



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH 4/4] go-native: Install bootstrap binaries with 1.4 suffix
  2017-03-20 16:47 [PATCH 0/4] misc fixes Khem Raj
                   ` (2 preceding siblings ...)
  2017-03-20 16:47 ` [PATCH 3/4] acpitests: Point Makefile CC to use OE synthesized CC Khem Raj
@ 2017-03-20 16:47 ` Khem Raj
  3 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2017-03-20 16:47 UTC (permalink / raw)
  To: openembedded-core

Currently, bin/go and bin/gofmt collide between go-native
and go-bootstrap-native packages, these are scripts anyway
which call the go compiler proper from right install, in
this case create go1.4 and gofmt1.4 names for these scripts
to avoid namespace collision

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-devtools/go/go-native.inc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-devtools/go/go-native.inc b/meta/recipes-devtools/go/go-native.inc
index c1ada5121a..c21f8fda78 100644
--- a/meta/recipes-devtools/go/go-native.inc
+++ b/meta/recipes-devtools/go/go-native.inc
@@ -22,14 +22,14 @@ do_compile() {
 }
 
 make_wrapper() {
-	rm -f ${D}${bindir}/$2
-	cat <<END >${D}${bindir}/$2
+	rm -f ${D}${bindir}/$2$3
+	cat <<END >${D}${bindir}/$2$3
 #!/bin/bash
 here=\`dirname \$0\`
-export GOROOT="${GOROOT:-\`readlink -f \$here/../lib/go\`}"
-\$here/../lib/go/bin/$1 "\$@"
+export GOROOT="${GOROOT:-\`readlink -f \$here/../lib/go$3\`}"
+\$here/../lib/go$3/bin/$1 "\$@"
 END
-	chmod +x ${D}${bindir}/$2
+	chmod +x ${D}${bindir}/$2$3
 }
 
 do_install() {
@@ -45,7 +45,7 @@ do_install() {
 	do
 		base=`basename $f`
 		install -m755 $f ${D}${libdir}/go${BOOTSTRAP}/bin
-		make_wrapper $base $base
+		make_wrapper $base $base ${BOOTSTRAP}
 	done
 }
 
-- 
2.12.0



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH 2/4] openssl: Fix build with clang
  2017-03-20 16:47 ` [PATCH 2/4] openssl: Fix build with clang Khem Raj
@ 2017-03-23  8:26   ` Martin Jansa
  2017-03-23 17:28     ` Khem Raj
  0 siblings, 1 reply; 7+ messages in thread
From: Martin Jansa @ 2017-03-23  8:26 UTC (permalink / raw)
  To: Khem Raj; +Cc: Patches and discussions about the oe-core layer

[-- Attachment #1: Type: text/plain, Size: 6089 bytes --]

This breaks build with default gcc with thumb enabled:

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@gmail.com> wrote:

> Signed-off-by: Khem Raj <raj.khem@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@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/11208dcfb9105e8afa37233185dece
> fd45e89e17
> +https://github.com/openssl/openssl/commit/fbab8baddef8d3346ae40ff068871e
> 2ddaf10270
> +https://github.com/openssl/openssl/commit/6cf412c473d8145562b76219ce3da7
> 3b201b3255
> +
> +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@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] = "6b3977c61f2aedf0f96367dcfb5c6e
> 578cf37e7b8d913b4ecb6643c3cb88d8c0"
>
> --
> 2.12.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 8676 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH 2/4] openssl: Fix build with clang
  2017-03-23  8:26   ` Martin Jansa
@ 2017-03-23 17:28     ` Khem Raj
  0 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2017-03-23 17:28 UTC (permalink / raw)
  To: Martin Jansa; +Cc: Patches and discussions about the oe-core layer

On Thu, Mar 23, 2017 at 1:26 AM, Martin Jansa <martin.jansa@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@gmail.com> wrote:
>>
>> Signed-off-by: Khem Raj <raj.khem@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@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@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@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>


^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-03-23 17:28 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-20 16:47 [PATCH 0/4] misc fixes Khem Raj
2017-03-20 16:47 ` [PATCH 1/4] ltp: Fix __sighandler_t for mips Khem Raj
2017-03-20 16:47 ` [PATCH 2/4] openssl: Fix build with clang Khem Raj
2017-03-23  8:26   ` Martin Jansa
2017-03-23 17:28     ` Khem Raj
2017-03-20 16:47 ` [PATCH 3/4] acpitests: Point Makefile CC to use OE synthesized CC Khem Raj
2017-03-20 16:47 ` [PATCH 4/4] go-native: Install bootstrap binaries with 1.4 suffix Khem Raj

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.