[PATCH] libgcrypt: Fix building on armv6

[PATCH] libgcrypt: Fix building on armv6

[Paul Barker]

This patch is backported from the upstream git repository to fix building
libgcrypt on armv6 platforms such as raspberrypi.

Signed-off-by: Paul Barker <pbarker@toganlabs.com>
---
 ...g-AArch32-CE-implementations-when-target-.patch | 96 ++++++++++++++++++++++
 meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb  |  1 +
 2 files changed, 97 insertions(+)
 create mode 100644 meta/recipes-support/libgcrypt/files/0006-Fix-building-AArch32-CE-implementations-when-target-.patch

diff --git a/meta/recipes-support/libgcrypt/files/0006-Fix-building-AArch32-CE-implementations-when-target-.patch b/meta/recipes-support/libgcrypt/files/0006-Fix-building-AArch32-CE-implementations-when-target-.patch
new file mode 100644
index 0000000..0887588
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/files/0006-Fix-building-AArch32-CE-implementations-when-target-.patch
@@ -0,0 +1,96 @@
+From 4a7aa30ae9f3ce798dd886c2f2d4164c43027748 Mon Sep 17 00:00:00 2001
+From: Jussi Kivilinna <jussi.kivilinna@iki.fi>
+Date: Sat, 29 Jul 2017 14:34:23 +0300
+Subject: [PATCH] Fix building AArch32 CE implementations when target is ARMv6
+ arch
+
+* cipher/cipher-gcm-armv8-aarch32-ce.S: Select ARMv8 architecure.
+* cipher/rijndael-armv8-aarch32-ce.S: Ditto.
+* cipher/sha1-armv8-aarch32-ce.S: Ditto.
+* cipher/sha256-armv8-aarch32-ce.S: Ditto.
+* configure.ac (gcry_cv_gcc_inline_asm_aarch32_crypto): Ditto.
+--
+
+Raspbian distribution defaults to ARMv6 architecture thus 'rbit'
+instruction is not available with default compiler flags. Patch
+adds explicit architecture selection for ARMv8 to enable 'rbit'
+usage with ARMv8/AArch32-CE assembly implementations of SHA,
+GHASH and AES.
+
+Reported-by: Chris Horry <zerbey@gmail.com>
+Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
+
+Signed-off-by: Paul Barker <pbarker@toganlabs.com>
+Upstream-status: Backport
+
+---
+ cipher/cipher-gcm-armv8-aarch32-ce.S | 1 +
+ cipher/rijndael-armv8-aarch32-ce.S   | 1 +
+ cipher/sha1-armv8-aarch32-ce.S       | 1 +
+ cipher/sha256-armv8-aarch32-ce.S     | 1 +
+ configure.ac                         | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/cipher/cipher-gcm-armv8-aarch32-ce.S b/cipher/cipher-gcm-armv8-aarch32-ce.S
+index b61a7871..1de66a16 100644
+--- a/cipher/cipher-gcm-armv8-aarch32-ce.S
++++ b/cipher/cipher-gcm-armv8-aarch32-ce.S
+@@ -24,6 +24,7 @@
+     defined(HAVE_GCC_INLINE_ASM_AARCH32_CRYPTO)
+ 
+ .syntax unified
++.arch armv8-a
+ .fpu crypto-neon-fp-armv8
+ .arm
+ 
+diff --git a/cipher/rijndael-armv8-aarch32-ce.S b/cipher/rijndael-armv8-aarch32-ce.S
+index f375f673..5c8fa3c0 100644
+--- a/cipher/rijndael-armv8-aarch32-ce.S
++++ b/cipher/rijndael-armv8-aarch32-ce.S
+@@ -24,6 +24,7 @@
+     defined(HAVE_GCC_INLINE_ASM_AARCH32_CRYPTO)
+ 
+ .syntax unified
++.arch armv8-a
+ .fpu crypto-neon-fp-armv8
+ .arm
+ 
+diff --git a/cipher/sha1-armv8-aarch32-ce.S b/cipher/sha1-armv8-aarch32-ce.S
+index b0bc5ffe..bf2b233b 100644
+--- a/cipher/sha1-armv8-aarch32-ce.S
++++ b/cipher/sha1-armv8-aarch32-ce.S
+@@ -24,6 +24,7 @@
+     defined(HAVE_GCC_INLINE_ASM_AARCH32_CRYPTO) && defined(USE_SHA1)
+ 
+ .syntax unified
++.arch armv8-a
+ .fpu crypto-neon-fp-armv8
+ .arm
+ 
+diff --git a/cipher/sha256-armv8-aarch32-ce.S b/cipher/sha256-armv8-aarch32-ce.S
+index 2041a237..2b17ab1b 100644
+--- a/cipher/sha256-armv8-aarch32-ce.S
++++ b/cipher/sha256-armv8-aarch32-ce.S
+@@ -24,6 +24,7 @@
+     defined(HAVE_GCC_INLINE_ASM_AARCH32_CRYPTO) && defined(USE_SHA256)
+ 
+ .syntax unified
++.arch armv8-a
+ .fpu crypto-neon-fp-armv8
+ .arm
+ 
+diff --git a/configure.ac b/configure.ac
+index 27faa7f4..66e7cd67 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1619,6 +1619,7 @@ AC_CACHE_CHECK([whether GCC inline assembler supports AArch32 Crypto Extension i
+           AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+           [[__asm__(
+                 ".syntax unified\n\t"
++                ".arch armv8-a\n\t"
+                 ".arm\n\t"
+                 ".fpu crypto-neon-fp-armv8\n\t"
+ 
+-- 
+2.11.0
+
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb
index fb004d9..02982f0 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb
@@ -21,6 +21,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.gz \
            file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
            file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \
            file://0005-ecc-Add-input-validation-for-X25519.patch \
+           file://0006-Fix-building-AArch32-CE-implementations-when-target-.patch \
 "
 SRC_URI[md5sum] = "110ce4352f9ea6f560bdc6c5644ae93c"
 SRC_URI[sha256sum] = "f6e470b7f2d3a703e8747f05a8c19d9e10e26ebf2d5f3d71ff75a40f504e12ee"
-- 
2.7.4

✗ patchtest: failure for libgcrypt: Fix building on armv6

[Patchwork]

== Series Details ==

Series: libgcrypt: Fix building on armv6
Revision: 1
URL   : https://patchwork.openembedded.org/series/9276/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Added patch file is missing Upstream-Status in the header [test_upstream_status_presence] 
  Suggested fix    Add Upstream-Status: <status> to the header of meta/recipes-support/libgcrypt/files/0006-Fix-building-AArch32-CE-implementations-when-target-.patch (possible values: Pending, Submitted, Accepted, Backport, Denied, Inappropriate)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: ✗ patchtest: failure for libgcrypt: Fix building on armv6

[Paul Barker]

On Mon, Oct 9, 2017 at 1:30 PM, Patchwork
<patchwork@patchwork.openembedded.org> wrote:
> == Series Details ==
>
> Series: libgcrypt: Fix building on armv6
> Revision: 1
> URL   : https://patchwork.openembedded.org/series/9276/
> State : failure
>
> == Summary ==
>
>
> Thank you for submitting this patch series to OpenEmbedded Core. This is
> an automated response. Several tests have been executed on the proposed
> series by patchtest resulting in the following failures:
>
>
>
> * Issue             Added patch file is missing Upstream-Status in the header [test_upstream_status_presence]
>   Suggested fix    Add Upstream-Status: <status> to the header of meta/recipes-support/libgcrypt/files/0006-Fix-building-AArch32-CE-implementations-when-target-.patch (possible values: Pending, Submitted, Accepted, Backport, Denied, Inappropriate)
>

Huh, it has got an upstream status:

+Upstream-status: Backport

I think this is a false-positive.

>
>
> If you believe any of these test results are incorrect, please reply to the
> mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
> Otherwise we would appreciate you correcting the issues and submitting a new
> version of the patchset if applicable. Please ensure you add/increment the
> version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
> [PATCH v3] -> ...).
>
> ---
> Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
> Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
>

Cheers,

-- 
Paul Barker
Togán Labs Ltd

Re: [PATCH] libgcrypt: Fix building on armv6

[Burton, Ross]

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

On 9 October 2017 at 13:21, Paul Barker <pbarker@toganlabs.com> wrote:

> This patch is backported from the upstream git repository to fix building
> libgcrypt on armv6 platforms such as raspberrypi.
>

Is this fixed in 1.8.1?  We've a pending upgrade for that waiting for
master, if so then this would be rocko-specific.

Ross

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

Re: [PATCH] libgcrypt: Fix building on armv6

[Paul Barker]

On Mon, Oct 9, 2017 at 1:42 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 9 October 2017 at 13:21, Paul Barker <pbarker@toganlabs.com> wrote:
>>
>> This patch is backported from the upstream git repository to fix building
>> libgcrypt on armv6 platforms such as raspberrypi.
>
>
> Is this fixed in 1.8.1?  We've a pending upgrade for that waiting for
> master, if so then this would be rocko-specific.
>
> Ross

Yes this change is in 1.8.1. I backported just the single patch as I
assume it's too late for a version bump in rocko now.

I still see rocko == master in the git repository so I didn't include
a [rocko] tag.

Cheers,

-- 
Paul Barker
Togán Labs Ltd

Re: [PATCH] libgcrypt: Fix building on armv6

[Burton, Ross]

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

Thanks, queued for rocko.  We've just fired RC2 so this is unlikely to make
it into 2.4.0 but it can be in the queue for 2.4.1 if it doesn't.

Ross

On 9 October 2017 at 13:48, Paul Barker <pbarker@toganlabs.com> wrote:

> On Mon, Oct 9, 2017 at 1:42 PM, Burton, Ross <ross.burton@intel.com>
> wrote:
> > On 9 October 2017 at 13:21, Paul Barker <pbarker@toganlabs.com> wrote:
> >>
> >> This patch is backported from the upstream git repository to fix
> building
> >> libgcrypt on armv6 platforms such as raspberrypi.
> >
> >
> > Is this fixed in 1.8.1?  We've a pending upgrade for that waiting for
> > master, if so then this would be rocko-specific.
> >
> > Ross
>
> Yes this change is in 1.8.1. I backported just the single patch as I
> assume it's too late for a version bump in rocko now.
>
> I still see rocko == master in the git repository so I didn't include
> a [rocko] tag.
>
> Cheers,
>
> --
> Paul Barker
> Togán Labs Ltd
>

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

Re: ✗ patchtest: failure for libgcrypt: Fix building on armv6

[Burton, Ross]

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

On 9 October 2017 at 13:35, Paul Barker <pbarker@toganlabs.com> wrote:

> Huh, it has got an upstream status:
>
> +Upstream-status: Backport
>
> I think this is a false-positive.
>

The test is pedantic, the tag is Upstream-Status.  Note the capitalisation.
 :)

(fixed when I queued it)

Ross

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

Re: [PATCH] libgcrypt: Fix building on armv6

[Paul Barker]

On Mon, Oct 9, 2017 at 2:15 PM, Burton, Ross <ross.burton@intel.com> wrote:
> Thanks, queued for rocko.  We've just fired RC2 so this is unlikely to make
> it into 2.4.0 but it can be in the queue for 2.4.1 if it doesn't.
>
> Ross
>

Ok. I assume the same will apply for the go qemux86 illegal
instruction fix once I've got it sorted. As long as it hits the rocko
branch within a week or two of release it won't impact me. If not I'll
carry this in our distro layer.

-- 
Paul Barker
Togán Labs Ltd