diff options
| author | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2013-08-17 13:41:46 +0300 |
|---|---|---|
| committer | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2013-08-20 12:33:32 +0300 |
| commit | 151f1e518be2d16bed748ba832384b0472ddcf9b (patch) | |
| tree | 1b394c89bdbb16527073ceb6d01f50aa0dd83c34 /cipher/camellia.h | |
| parent | c030e33533fb819afe195eff5f89ec39863b1fbc (diff) | |
| download | libgcrypt-151f1e518be2d16bed748ba832384b0472ddcf9b.tar.gz | |
Move ARMv6 detection to configure.ac
* cipher/blowfish-armv6.S: Replace __ARM_ARCH >= 6 checks with
HAVE_ARM_ARCH_V6.
* cipher/blowfish.c: Ditto.
* cipher/camellia-armv6.S: Ditto.
* cipher/camellia.h: Ditto.
* cipher/cast5-armv6.S: Ditto.
* cipher/cast5.c: Ditto.
* cipher/rijndael-armv6.S: Ditto.
* cipher/rijndael.c: Ditto.
* configure.ac: Add HAVE_ARM_ARCH_V6 check.
--
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
Diffstat (limited to 'cipher/camellia.h')
| -rw-r--r-- | cipher/camellia.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/cipher/camellia.h b/cipher/camellia.h index 48f91604..72f2d1fa 100644 --- a/cipher/camellia.h +++ b/cipher/camellia.h @@ -32,14 +32,7 @@ #include <config.h> /* USE_ARMV6_ASM indicates whether to use ARMv6 assembly code. */ # undef USE_ARMV6_ASM -# if defined(__arm__) && defined(__ARMEL__) && \ - ((defined(__ARM_ARCH) && __ARM_ARCH >= 6) \ - || defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \ - || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \ - || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) \ - || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ - || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \ - || defined(__ARM_ARCH_7EM__)) +# if defined(HAVE_ARM_ARCH_V6) && defined(__ARMEL__) # ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS # define USE_ARMV6_ASM 1 # endif |