From 3544fa8aa63bef9a35abf236e9376191b5ec206b Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna Date: Thu, 20 Jun 2013 14:20:36 +0300 Subject: Check if assembler is compatible with AMD64 assembly implementations * cipher/blowfish-amd64.S: Enable only if HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS is defined. * cipher/camellia-aesni-avx-amd64.S: Ditto. * cipher/camellia-aesni-avx2-amd64.S: Ditto. * cipher/cast5-amd64.S: Ditto. * cipher/rinjdael-amd64.S: Ditto. * cipher/serpent-avx2-amd64.S: Ditto. * cipher/serpent-sse2-amd64.S: Ditto. * cipher/twofish-amd64.S: Ditto. * cipher/blowfish.c: Use AMD64 assembly implementation only if HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS is defined * cipher/camellia-glue.c: Ditto. * cipher/cast5.c: Ditto. * cipher/rijndael.c: Ditto. * cipher/serpent.c: Ditto. * cipher/twofish.c: Ditto. * configure.ac: Check gcc/as compatibility with AMD64 assembly implementations. -- Later these checks can be split and assembly implementations adapted to handle different platforms, but for now disable AMD64 assembly implementations if assembler does not look to be able to handle them. Signed-off-by: Jussi Kivilinna --- cipher/cast5-amd64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cipher/cast5-amd64.S') diff --git a/cipher/cast5-amd64.S b/cipher/cast5-amd64.S index c3007d32..1bca2493 100644 --- a/cipher/cast5-amd64.S +++ b/cipher/cast5-amd64.S @@ -20,7 +20,7 @@ #ifdef __x86_64 #include -#if defined(USE_CAST5) +#if defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) && defined(USE_CAST5) #ifdef __PIC__ # define RIP %rip -- cgit v1.2.1