From 64fbd2f00bf98d66788feff442e252da2194852c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 15 May 2013 13:44:09 +0200 Subject: [PATCH] New asm directory arm/v6. Moved aes functions using the uxtb instruction there. --- ChangeLog | 9 +++++++++ arm/{ => v6}/aes-decrypt-internal.asm | 0 arm/{ => v6}/aes-encrypt-internal.asm | 0 configure.ac | 8 ++++++-- 4 files changed, 15 insertions(+), 2 deletions(-) rename arm/{ => v6}/aes-decrypt-internal.asm (100%) rename arm/{ => v6}/aes-encrypt-internal.asm (100%) diff --git a/ChangeLog b/ChangeLog index e0b32058..6bcf524a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2013-05-15 Niels Möller + + * configure.ac (asm_path): Handle armv6 and armv7 differently from + older ARMs. Add the arm/v6 directory to asm_path when appropriate. + + * arm/v6/aes-encrypt-internal.asm: Moved into v6 directory. Uses + the uxtb instruction which is not available for older ARMs. + * arm/v6/aes-decrypt-internal.asm: Likewise. + 2013-05-03 Niels Möller * cast128.c: Adapt to new struct cast128_ctx. diff --git a/arm/aes-decrypt-internal.asm b/arm/v6/aes-decrypt-internal.asm similarity index 100% rename from arm/aes-decrypt-internal.asm rename to arm/v6/aes-decrypt-internal.asm diff --git a/arm/aes-encrypt-internal.asm b/arm/v6/aes-encrypt-internal.asm similarity index 100% rename from arm/aes-encrypt-internal.asm rename to arm/v6/aes-encrypt-internal.asm diff --git a/configure.ac b/configure.ac index a4109276..3dd3a990 100644 --- a/configure.ac +++ b/configure.ac @@ -237,14 +237,18 @@ if test "x$enable_assembler" = xyes ; then asm_path=sparc32 fi ;; - arm*) + armv6* | armv7*) NETTLE_CHECK_ARM_NEON - asm_path=arm + asm_path="arm/v6 arm" + if test "x$enable_arm_neon" = xyes ; then asm_path="arm/neon $asm_path" fi ;; + arm*) + asm_path=arm + ;; *) enable_assembler=no ;; -- GitLab