aboutsummaryrefslogtreecommitdiff
path: root/security/nettle
diff options
context:
space:
mode:
authorJohan van Selst <johans@FreeBSD.org>2016-01-27 10:54:07 +0000
committerJohan van Selst <johans@FreeBSD.org>2016-01-27 10:54:07 +0000
commit3b258bb9d064a49b5362f94f3101885b5824636d (patch)
tree92a490953f1dce71cca2e82b0f64180fc592f54c /security/nettle
parent20d73228c77226284cffc3df4c5989bc7ef987be (diff)
downloadports-3b258bb9d064a49b5362f94f3101885b5824636d.tar.gz
ports-3b258bb9d064a49b5362f94f3101885b5824636d.zip
Add patch to fix build on ARM v6
Submitted by: mmel
Notes
Notes: svn path=/head/; revision=407353
Diffstat (limited to 'security/nettle')
-rw-r--r--security/nettle/files/patch-arm__v6__sha256-compress.asm8
-rw-r--r--security/nettle/files/patch-arm_v6_aes-decrypt-internal.asm11
-rw-r--r--security/nettle/files/patch-arm_v6_aes-encrypt-internal.asm11
3 files changed, 26 insertions, 4 deletions
diff --git a/security/nettle/files/patch-arm__v6__sha256-compress.asm b/security/nettle/files/patch-arm__v6__sha256-compress.asm
index fbd06c45c59c..c18c3cba7b7c 100644
--- a/security/nettle/files/patch-arm__v6__sha256-compress.asm
+++ b/security/nettle/files/patch-arm__v6__sha256-compress.asm
@@ -1,6 +1,6 @@
---- arm/v6/sha256-compress.asm.orig 2013-05-28 16:21:54.000000000 +0200
-+++ arm/v6/sha256-compress.asm 2015-01-04 00:39:14.000000000 +0100
-@@ -112,7 +112,7 @@ define(<NOEXPN>, <
+--- arm/v6/sha256-compress.asm.orig 2015-04-24 19:22:03.000000000 +0200
++++ arm/v6/sha256-compress.asm 2016-01-27 11:48:29.249375000 +0100
+@@ -126,7 +126,7 @@ define(<NOEXPN>, <
PROLOGUE(_nettle_sha256_compress)
push {r4,r5,r6,r7,r8,r10,r11,r14}
sub sp, sp, #68
@@ -9,7 +9,7 @@
C Load data up front, since we don't have enough registers
C to load and shift on-the-fly
-@@ -185,7 +185,7 @@ PROLOGUE(_nettle_sha256_compress)
+@@ -199,7 +199,7 @@ PROLOGUE(_nettle_sha256_compress)
EXPN(15) ROUND(SB,SC,SD,SE,SF,SG,SH,SA)
bne .Loop2
diff --git a/security/nettle/files/patch-arm_v6_aes-decrypt-internal.asm b/security/nettle/files/patch-arm_v6_aes-decrypt-internal.asm
new file mode 100644
index 000000000000..26eea40a098c
--- /dev/null
+++ b/security/nettle/files/patch-arm_v6_aes-decrypt-internal.asm
@@ -0,0 +1,11 @@
+--- arm/v6/aes-decrypt-internal.asm.orig 2016-01-27 11:50:06.979110000 +0100
++++ arm/v6/aes-decrypt-internal.asm 2016-01-27 11:50:10.594660000 +0100
+@@ -59,7 +59,7 @@ C 8 saved registers
+ define(<FRAME_DST>, <[sp, #+40]>)
+ define(<FRAME_SRC>, <[sp, #+44]>)
+
+-define(<SRC>, <%r12>) C Overlap registers used in inner loop.
++define(<SRC>, <r12>) C Overlap registers used in inner loop.
+ define(<DST>, <COUNT>)
+
+ C AES_DECRYPT_ROUND(x0,x1,x2,x3,w0,w1,w2,w3,key)
diff --git a/security/nettle/files/patch-arm_v6_aes-encrypt-internal.asm b/security/nettle/files/patch-arm_v6_aes-encrypt-internal.asm
new file mode 100644
index 000000000000..191a0a03b0e2
--- /dev/null
+++ b/security/nettle/files/patch-arm_v6_aes-encrypt-internal.asm
@@ -0,0 +1,11 @@
+--- arm/v6/aes-encrypt-internal.asm.orig 2016-01-27 11:50:13.588690000 +0100
++++ arm/v6/aes-encrypt-internal.asm 2016-01-27 11:50:16.922229000 +0100
+@@ -65,7 +65,7 @@ C 8 saved registers
+ define(<FRAME_DST>, <[sp, #+40]>)
+ define(<FRAME_SRC>, <[sp, #+44]>)
+
+-define(<SRC>, <%r12>) C Overlap registers used in inner loop.
++define(<SRC>, <r12>) C Overlap registers used in inner loop.
+ define(<DST>, <COUNT>)
+
+ C 53 instr.