diff options
| -rwxr-xr-x | configure.py | 4 | ||||
| -rw-r--r-- | src/block/serpent_ia32/info.txt | 4 | ||||
| -rw-r--r-- | src/hash/md4_ia32/info.txt | 4 | ||||
| -rw-r--r-- | src/hash/md5_ia32/info.txt | 4 | ||||
| -rw-r--r-- | src/hash/sha1_amd64/info.txt | 4 | ||||
| -rw-r--r-- | src/hash/sha1_ia32/info.txt | 4 |
6 files changed, 22 insertions, 2 deletions
diff --git a/configure.py b/configure.py index c9c2ed9ff..b99577135 100755 --- a/configure.py +++ b/configure.py @@ -1071,12 +1071,12 @@ def choose_modules_to_use(modules, archinfo, options): elif modname in options.enabled_modules: to_load.append(modname) # trust the user - elif not module.compatible_cpu(archinfo, options): - cannot_use_because(modname, 'incompatible CPU') elif not module.compatible_os(options.os): cannot_use_because(modname, 'incompatible OS') elif not module.compatible_compiler(options.compiler): cannot_use_because(modname, 'incompatible compiler') + elif not module.compatible_cpu(archinfo, options): + cannot_use_because(modname, 'incompatible CPU') elif not module.tr1_ok(options.with_tr1): cannot_use_because(modname, 'missing TR1') diff --git a/src/block/serpent_ia32/info.txt b/src/block/serpent_ia32/info.txt index c5f0946b8..3a1dd5919 100644 --- a/src/block/serpent_ia32/info.txt +++ b/src/block/serpent_ia32/info.txt @@ -2,6 +2,10 @@ define SERPENT_IA32 load_on asm_ok +<arch> +ia32 +</arch> + <requires> asm_ia32 serpent diff --git a/src/hash/md4_ia32/info.txt b/src/hash/md4_ia32/info.txt index 1421de2c4..5d14188f2 100644 --- a/src/hash/md4_ia32/info.txt +++ b/src/hash/md4_ia32/info.txt @@ -2,6 +2,10 @@ define MD4_IA32 load_on asm_ok +<arch> +ia32 +</arch> + <requires> asm_ia32 md4 diff --git a/src/hash/md5_ia32/info.txt b/src/hash/md5_ia32/info.txt index 25d8ed3e8..9be698a3f 100644 --- a/src/hash/md5_ia32/info.txt +++ b/src/hash/md5_ia32/info.txt @@ -2,6 +2,10 @@ define MD5_IA32 load_on asm_ok +<arch> +ia32 +</arch> + <requires> asm_ia32 md5 diff --git a/src/hash/sha1_amd64/info.txt b/src/hash/sha1_amd64/info.txt index 9da68f3c6..78eaa23c2 100644 --- a/src/hash/sha1_amd64/info.txt +++ b/src/hash/sha1_amd64/info.txt @@ -2,6 +2,10 @@ define SHA1_AMD64 load_on asm_ok +<arch> +amd64 +</arch> + <requires> asm_engine asm_amd64 diff --git a/src/hash/sha1_ia32/info.txt b/src/hash/sha1_ia32/info.txt index d6f223d05..47d8e753e 100644 --- a/src/hash/sha1_ia32/info.txt +++ b/src/hash/sha1_ia32/info.txt @@ -2,6 +2,10 @@ define SHA1_IA32 load_on asm_ok +<arch> +ia32 +</arch> + <requires> asm_ia32 sha1 |