From 4d8386d8e49fe58a2d55b8a8809a7a088b5272a5 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:14:04 +0200 Subject: [PATCH] --- yaml --- r: 65447 b: refs/heads/master c: 3900b170baf0fa2bfe5ed43592e9acc95521fe0a h: refs/heads/master i: 65445: ed1ffa33d0f19765c8dd6bd26c78775f371e5ca3 65443: 45feaceb3c4c44d9bf6251010870cba8b0ecefbc 65439: 34329adf05fcbccb1a76d4df3a159e3c1fd53d6a v: v3 --- [refs] | 2 +- trunk/arch/x86_64/crypto/Makefile | 17 +++++------------ trunk/arch/x86_64/crypto/Makefile_64 | 12 ++++++++++++ 3 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 trunk/arch/x86_64/crypto/Makefile_64 diff --git a/[refs] b/[refs] index cf49490f9829..6b97f42aa949 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d685249a33eb729d1dbe7ee54d63cb81fdee53da +refs/heads/master: 3900b170baf0fa2bfe5ed43592e9acc95521fe0a diff --git a/trunk/arch/x86_64/crypto/Makefile b/trunk/arch/x86_64/crypto/Makefile index c96faeb842c8..fbd34ac2cda2 100644 --- a/trunk/arch/x86_64/crypto/Makefile +++ b/trunk/arch/x86_64/crypto/Makefile @@ -1,12 +1,5 @@ -# -# x86_64/crypto/Makefile -# -# Arch-specific CryptoAPI modules. -# - -obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o -obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o - -aes-x86_64-y := aes-x86_64-asm_64.o aes_64.o -twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_64.o - +ifeq ($(CONFIG_X86_32),y) +include ${srctree}/arch/i386/crypto/Makefile_32 +else +include ${srctree}/arch/x86_64/crypto/Makefile_64 +endif diff --git a/trunk/arch/x86_64/crypto/Makefile_64 b/trunk/arch/x86_64/crypto/Makefile_64 new file mode 100644 index 000000000000..c96faeb842c8 --- /dev/null +++ b/trunk/arch/x86_64/crypto/Makefile_64 @@ -0,0 +1,12 @@ +# +# x86_64/crypto/Makefile +# +# Arch-specific CryptoAPI modules. +# + +obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o +obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o + +aes-x86_64-y := aes-x86_64-asm_64.o aes_64.o +twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_64.o +