mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 12:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

libgcrypt: Fix building on armv6

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

(From OE-Core rev: c47ed9aa7a34ef62b3ffaea6ebd5cc9e7c052899)

Signed-off-by: Paul Barker <pbarker@toganlabs.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Barker
2017-10-09 12:21:20 +00:00
committed by Richard Purdie
parent e824e09375
commit 3775adc024
2 changed files with 97 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
meta/recipes-support/libgcrypt/files/0006-Fix-building-AArch32-CE-implementations-when-target-.patch Normal file
View File

@@ -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

1
meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb
View File

@@ -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"