From: Niels Möller <nisse@lysator.liu.se>
Date: Tue, 21 May 2013 06:54:04 +0000 (+0200)
Subject: Handle pre-v6 ARM processors (master 64fbd2f00bf98d66788feff442e252da2194852c).
X-Git-Tag: nettle_2.7.1_release_20130528~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57fb97124123434a4c42909155133fe29209102f;p=thirdparty%2Fnettle.git

Handle pre-v6 ARM processors (master 64fbd2f00bf98d66788feff442e252da2194852c).
---

diff --git a/ChangeLog b/ChangeLog
index f1cb4738..5e65d1aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-05-21  Niels Möller  <nisse@lysator.liu.se>
+
+	From master (2013-05-15):
+	* 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-21  Niels Möller  <nisse@lysator.liu.se>
 
 	* configure.ac: Changed version number to 2.7.1.
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 c3de71bb..78a3d4e5 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
       ;;