aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:14:04 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:14:04 +0200
commit3900b170baf0fa2bfe5ed43592e9acc95521fe0a (patch)
tree6863fb1f46577b75e6b62e52bc4d0d8a9dec0818
parentx86_64: prepare shared crypto/aes.c (diff)
downloadlinux-dev-3900b170baf0fa2bfe5ed43592e9acc95521fe0a.tar.xz
linux-dev-3900b170baf0fa2bfe5ed43592e9acc95521fe0a.zip
x86_64: prepare shared crypto/Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86_64/crypto/Makefile17
-rw-r--r--arch/x86_64/crypto/Makefile_6412
2 files changed, 17 insertions, 12 deletions
diff --git a/arch/x86_64/crypto/Makefile b/arch/x86_64/crypto/Makefile
index c96faeb842c8..fbd34ac2cda2 100644
--- a/arch/x86_64/crypto/Makefile
+++ b/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/arch/x86_64/crypto/Makefile_64 b/arch/x86_64/crypto/Makefile_64
new file mode 100644
index 000000000000..c96faeb842c8
--- /dev/null
+++ b/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
+