diff options
| -rw-r--r-- | mpi/arm/mpi-asm-defs.h (renamed from mpi/armv6/mpi-asm-defs.h) | 0 | ||||
| -rw-r--r-- | mpi/arm/mpih-add1.S (renamed from mpi/armv6/mpih-add1.S) | 4 | ||||
| -rw-r--r-- | mpi/arm/mpih-mul1.S (renamed from mpi/armv6/mpih-mul1.S) | 4 | ||||
| -rw-r--r-- | mpi/arm/mpih-mul2.S (renamed from mpi/armv6/mpih-mul2.S) | 4 | ||||
| -rw-r--r-- | mpi/arm/mpih-mul3.S (renamed from mpi/armv6/mpih-mul3.S) | 4 | ||||
| -rw-r--r-- | mpi/arm/mpih-sub1.S (renamed from mpi/armv6/mpih-sub1.S) | 4 | ||||
| -rw-r--r-- | mpi/config.links | 11 |
7 files changed, 13 insertions, 18 deletions
diff --git a/mpi/armv6/mpi-asm-defs.h b/mpi/arm/mpi-asm-defs.h index 047d1f5a..047d1f5a 100644 --- a/mpi/armv6/mpi-asm-defs.h +++ b/mpi/arm/mpi-asm-defs.h diff --git a/mpi/armv6/mpih-add1.S b/mpi/arm/mpih-add1.S index 60ea4c32..de6d5ede 100644 --- a/mpi/armv6/mpih-add1.S +++ b/mpi/arm/mpih-add1.S @@ -1,5 +1,5 @@ -/* ARMv6 add_n -- Add two limb vectors of the same length > 0 and store - * sum in a third limb vector. +/* ARM add_n -- Add two limb vectors of the same length > 0 and store + * sum in a third limb vector. * * Copyright © 2013 Jussi Kivilinna <jussi.kivilinna@iki.fi> * diff --git a/mpi/armv6/mpih-mul1.S b/mpi/arm/mpih-mul1.S index 0aa41efb..9e6f361c 100644 --- a/mpi/armv6/mpih-mul1.S +++ b/mpi/arm/mpih-mul1.S @@ -1,5 +1,5 @@ -/* ARMv6 mul_1 -- Multiply a limb vector with a limb and store the result in - * a second limb vector. +/* ARM mul_1 -- Multiply a limb vector with a limb and store the result in + * a second limb vector. * * Copyright © 2013 Jussi Kivilinna <jussi.kivilinna@iki.fi> * diff --git a/mpi/armv6/mpih-mul2.S b/mpi/arm/mpih-mul2.S index a7eb8a15..2063be54 100644 --- a/mpi/armv6/mpih-mul2.S +++ b/mpi/arm/mpih-mul2.S @@ -1,5 +1,5 @@ -/* ARMv6 mul_2 -- Multiply a limb vector with a limb and add the result to - * a second limb vector. +/* ARM mul_2 -- Multiply a limb vector with a limb and add the result to + * a second limb vector. * * Copyright © 2013 Jussi Kivilinna <jussi.kivilinna@iki.fi> * diff --git a/mpi/armv6/mpih-mul3.S b/mpi/arm/mpih-mul3.S index 034929e5..be2c5e63 100644 --- a/mpi/armv6/mpih-mul3.S +++ b/mpi/arm/mpih-mul3.S @@ -1,5 +1,5 @@ -/* ARMv6 mul_3 -- Multiply a limb vector with a limb and subtract the result - * from a second limb vector. +/* ARM mul_3 -- Multiply a limb vector with a limb and subtract the result + * from a second limb vector. * * Copyright © 2013 Jussi Kivilinna <jussi.kivilinna@iki.fi> * diff --git a/mpi/armv6/mpih-sub1.S b/mpi/arm/mpih-sub1.S index 77d05eb6..a573efff 100644 --- a/mpi/armv6/mpih-sub1.S +++ b/mpi/arm/mpih-sub1.S @@ -1,5 +1,5 @@ -/* ARMv6 sub_n -- Subtract two limb vectors of the same length > 0 and store - * sum in a third limb vector. +/* ARM sub_n -- Subtract two limb vectors of the same length > 0 and store + * sum in a third limb vector. * * Copyright © 2013 Jussi Kivilinna <jussi.kivilinna@iki.fi> * diff --git a/mpi/config.links b/mpi/config.links index 9fb4f109..90d10770 100644 --- a/mpi/config.links +++ b/mpi/config.links @@ -138,14 +138,9 @@ case "${host}" in ;; arm*-*-*) if test "$gcry_cv_gcc_arm_platform_as_ok" = "yes" ; then - if test "$gcry_cv_cc_arm_arch_is_v6" = "yes" ; then - echo '/* configured for armv6 */' >>./mpi/asm-syntax.h - path="armv6" - mpi_cpu_arch="arm" - else - echo '/* No assembler modules configured */' >>./mpi/asm-syntax.h - path="" - fi + echo '/* configured for arm */' >>./mpi/asm-syntax.h + path="arm" + mpi_cpu_arch="arm" else echo '/* No assembler modules configured */' >>./mpi/asm-syntax.h path="" |