New module load_on directive 'never', to mark known-buggy code

4 files changed, 5 insertions, 2 deletions

diff --git a/configure.pl b/configure.pl
index 0cdd402d7..539256acb 100755
--- a/configure.pl
+++ b/configure.pl
@@ -513,6 +513,7 @@ sub can_enable_module {
     unless($is_enabled) {
         return '' if $modinfo{'load_on'} eq 'dep' and $for_dep == 0;
         return '' if $modinfo{'load_on'} eq 'request';
+        return '' if $modinfo{'load_on'} eq 'never';
     }
 
     # Doesn't run here, don't bother
diff --git a/configure.py b/configure.py
index 23034f792..f8c0affa4 100755
--- a/configure.py
+++ b/configure.py
@@ -762,6 +762,8 @@ def choose_modules_to_use(options, modules):
                 return (False, 'loaded only if needed by dependency')
             elif module.load_on == 'request':
                 return (False, 'loaded on request only')
+            elif module.load_on == 'never':
+                return (False, 'disabled as buggy')
             elif module.load_on == 'asm_ok' and not options.asm_ok:
                 return (False, 'load_on asm_ok only')
 
diff --git a/src/math/bigint/monty_amd64/info.txt b/src/math/bigint/monty_amd64/info.txt
index 32308bf41..5f80a0b1e 100644
--- a/src/math/bigint/monty_amd64/info.txt
+++ b/src/math/bigint/monty_amd64/info.txt
@@ -2,7 +2,7 @@ realname "Montgomery Reduction (x86-64)"
 
 mp_bits 64
 
-load_on request
+load_on never
 
 <add>
 mp_monty.S
diff --git a/src/math/bigint/mulop_amd64/info.txt b/src/math/bigint/mulop_amd64/info.txt
index 0960ac4d6..15bde7bf3 100644
--- a/src/math/bigint/mulop_amd64/info.txt
+++ b/src/math/bigint/mulop_amd64/info.txt
@@ -2,7 +2,7 @@ realname "BigInt Multiply-Add (x86-64)"
 
 mp_bits 64
 
-load_on request
+load_on never
 
 <add>
 mp_mulop_amd64.S