summaryrefslogtreecommitdiff
path: root/arm
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2015-01-24 14:22:07 +0200
committerNiels Möller <nisse@lysator.liu.se>2015-01-25 20:08:16 +0100
commit30ebb096065695ef9ba0f94c1e262bf3c379f66d (patch)
tree468131f3d520f858bf9adfc7d7d243ebad0c6da0 /arm
parentdff9f68c9ac50ac1d579ed47c3a8fc6cde805dea (diff)
downloadnettle-30ebb096065695ef9ba0f94c1e262bf3c379f66d.tar.gz
arm: Add .arch directives for armv6
This allows building these files as part of a fat build, even if the assembler by default targets a lower architecture version.
Diffstat (limited to 'arm')
-rw-r--r--arm/v6/aes-decrypt-internal.asm2
-rw-r--r--arm/v6/aes-encrypt-internal.asm2
-rw-r--r--arm/v6/sha1-compress.asm1
-rw-r--r--arm/v6/sha256-compress.asm1
4 files changed, 6 insertions, 0 deletions
diff --git a/arm/v6/aes-decrypt-internal.asm b/arm/v6/aes-decrypt-internal.asm
index 28d8f6f8..3eab3ebc 100644
--- a/arm/v6/aes-decrypt-internal.asm
+++ b/arm/v6/aes-decrypt-internal.asm
@@ -30,6 +30,8 @@ ifelse(<
not, see http://www.gnu.org/licenses/.
>)
+ .arch armv6
+
include_src(<arm/aes.m4>)
define(<PARAM_ROUNDS>, <r0>)
diff --git a/arm/v6/aes-encrypt-internal.asm b/arm/v6/aes-encrypt-internal.asm
index f7f47698..e4fa25d0 100644
--- a/arm/v6/aes-encrypt-internal.asm
+++ b/arm/v6/aes-encrypt-internal.asm
@@ -30,6 +30,8 @@ ifelse(<
not, see http://www.gnu.org/licenses/.
>)
+ .arch armv6
+
include_src(<arm/aes.m4>)
C Benchmarked at at 706, 870, 963 cycles/block on cortex A9,
diff --git a/arm/v6/sha1-compress.asm b/arm/v6/sha1-compress.asm
index fc1ebf05..59d6297e 100644
--- a/arm/v6/sha1-compress.asm
+++ b/arm/v6/sha1-compress.asm
@@ -31,6 +31,7 @@ ifelse(<
>)
.file "sha1-compress.asm"
+ .arch armv6
define(<STATE>, <r0>)
define(<INPUT>, <r1>)
diff --git a/arm/v6/sha256-compress.asm b/arm/v6/sha256-compress.asm
index 93c12b1a..75607789 100644
--- a/arm/v6/sha256-compress.asm
+++ b/arm/v6/sha256-compress.asm
@@ -31,6 +31,7 @@ ifelse(<
>)
.file "sha256-compress.asm"
+ .arch armv6
define(<STATE>, <r0>)
define(<INPUT>, <r1>)