From 8b063a0b60946578ba16e8e7d8ee4223fadb5eb9 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Tue, 30 Sep 2008 02:36:25 +0000
Subject: Rewrite part of the module loading code in configure.pl, now
 dependencies seem to be handled correctly (er, at least mostly), and more
 importantly the asm MPI modules are detected and used correctly (at least on
 x86-64 and x86).

---
 src/bigint/info.txt               | 4 ++--
 src/bigint/monty_generic/info.txt | 2 +-
 src/bigint/mp_amd64/info.txt      | 2 +-
 src/bigint/mp_generic/info.txt    | 2 +-
 src/bigint/mulop_amd64/info.txt   | 2 +-
 src/bigint/mulop_generic/info.txt | 2 +-
 src/bigint/mulop_ia32/info.txt    | 4 +++-
 7 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/bigint')

diff --git a/src/bigint/info.txt b/src/bigint/info.txt
index 3e1531754..d6c5df763 100644
--- a/src/bigint/info.txt
+++ b/src/bigint/info.txt
@@ -6,8 +6,8 @@ define BIGINT
 
 <requires>
 hex
-mp_amd64
-monty_amd64|monty_generic
+mp_amd64|mp_asm64|mp_ia32|mp_ia32_msvc|mp_generic
+monty_generic
 mulop_generic
 </requires>
 
diff --git a/src/bigint/monty_generic/info.txt b/src/bigint/monty_generic/info.txt
index 9187e9d22..6f5f0e722 100644
--- a/src/bigint/monty_generic/info.txt
+++ b/src/bigint/monty_generic/info.txt
@@ -1,6 +1,6 @@
 realname "Montgomery Reduction"
 
-load_on request
+load_on dep
 
 <add>
 mp_monty.cpp
diff --git a/src/bigint/mp_amd64/info.txt b/src/bigint/mp_amd64/info.txt
index c177c2a27..84a5bcf53 100644
--- a/src/bigint/mp_amd64/info.txt
+++ b/src/bigint/mp_amd64/info.txt
@@ -2,7 +2,7 @@ realname "MPI Core (x86-64)"
 
 mp_bits 64
 
-load_on request
+load_on dep
 
 <add>
 mp_asm.h
diff --git a/src/bigint/mp_generic/info.txt b/src/bigint/mp_generic/info.txt
index 8b319c58d..8bf75fec3 100644
--- a/src/bigint/mp_generic/info.txt
+++ b/src/bigint/mp_generic/info.txt
@@ -1,6 +1,6 @@
 realname "MPI Core (C++)"
 
-load_on request
+load_on dep
 
 <add>
 mp_asm.h
diff --git a/src/bigint/mulop_amd64/info.txt b/src/bigint/mulop_amd64/info.txt
index 0960ac4d6..670780d9c 100644
--- a/src/bigint/mulop_amd64/info.txt
+++ b/src/bigint/mulop_amd64/info.txt
@@ -2,7 +2,7 @@ realname "BigInt Multiply-Add (x86-64)"
 
 mp_bits 64
 
-load_on request
+load_on dep
 
 <add>
 mp_mulop_amd64.S
diff --git a/src/bigint/mulop_generic/info.txt b/src/bigint/mulop_generic/info.txt
index 1fe3c2868..28ebe41eb 100644
--- a/src/bigint/mulop_generic/info.txt
+++ b/src/bigint/mulop_generic/info.txt
@@ -1,6 +1,6 @@
 realname "BigInt Multiply-Add"
 
-load_on request
+load_on dep
 
 <add>
 mp_mulop.cpp
diff --git a/src/bigint/mulop_ia32/info.txt b/src/bigint/mulop_ia32/info.txt
index 0814bc08a..1c89e95c1 100644
--- a/src/bigint/mulop_ia32/info.txt
+++ b/src/bigint/mulop_ia32/info.txt
@@ -2,6 +2,8 @@ realname "BigInt Multiply-Add (IA-32)"
 
 mp_bits 32
 
+# Out of date, still implements bigint_mul_add_words
+
 load_on request
 
 <add>
@@ -9,7 +11,7 @@ mp_mulop.S
 </add>
 
 <requires>
-asm_amd64
+asm_ia32
 </requires>
 
 <arch>
-- 
cgit v1.2.3