summaryrefslogtreecommitdiff
path: root/recipes/openssl
diff options
context:
space:
mode:
authorMatthew Waters <matthew@centricular.com>2018-03-23 15:09:55 +1100
committerMatthew Waters <matthew@centricular.com>2018-04-09 11:00:08 +1000
commit099710ad63c78468a7f3beb5fe0b403cc8804d32 (patch)
tree81df58e067573627a647b38aceb00dd7567407f3 /recipes/openssl
parent98f9447fda18433b96f4bdec9fa5f8c6a187df1d (diff)
recipes/openssl: disable poly1305 optimization assembly for arm
Fails to link with Android NDK's r16 binutils NDK bug report: https://github.com/android-ndk/ndk/issues/337
Diffstat (limited to 'recipes/openssl')
-rw-r--r--recipes/openssl/0001-build-disable-poly1305-custom-assembly-on-armv4-as-i.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/recipes/openssl/0001-build-disable-poly1305-custom-assembly-on-armv4-as-i.patch b/recipes/openssl/0001-build-disable-poly1305-custom-assembly-on-armv4-as-i.patch
new file mode 100644
index 00000000..0d15bea2
--- /dev/null
+++ b/recipes/openssl/0001-build-disable-poly1305-custom-assembly-on-armv4-as-i.patch
@@ -0,0 +1,26 @@
+From 3940804d3344e097517dedd6e762e10002448b3f Mon Sep 17 00:00:00 2001
+From: Matthew Waters <matthew@centricular.com>
+Date: Mon, 19 Mar 2018 15:35:36 +1100
+Subject: [PATCH] build: disable poly1305 custom assembly on armv4 as it fails
+ to link in android
+
+---
+ Configurations/00-base-templates.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
+index 3455b3a..cdc8ccc 100644
+--- a/Configurations/00-base-templates.conf
++++ b/Configurations/00-base-templates.conf
+@@ -247,7 +247,7 @@
+ sha1_asm_src => "sha1-armv4-large.S sha256-armv4.S sha512-armv4.S",
+ modes_asm_src => "ghash-armv4.S ghashv8-armx.S",
+ chacha_asm_src => "chacha-armv4.S",
+- poly1305_asm_src=> "poly1305-armv4.S",
++ #poly1305_asm_src=> "poly1305-armv4.S",
+ perlasm_scheme => "void"
+ },
+ aarch64_asm => {
+--
+2.16.2
+