Don't make CPUID stuff twice.

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 2b1e915265667d5546e0c7fad2d6e2f866aad2da..24ee3120dc66b51b8882cfa70b30e1eebf85fd6c 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -877,7 +877,8 @@ sub fix_asm
 
 $lib_obj{CRYPTO} .= fix_asm($mf_md5_asm, 'crypto/md5');
 $lib_obj{CRYPTO} .= fix_asm($mf_bn_asm, 'crypto/bn');
 
 $lib_obj{CRYPTO} .= fix_asm($mf_md5_asm, 'crypto/md5');
 $lib_obj{CRYPTO} .= fix_asm($mf_bn_asm, 'crypto/bn');

-$lib_obj{CRYPTO} .= fix_asm($mf_cpuid_asm, 'crypto');
+# cpuid is included by the crypto dir
+#$lib_obj{CRYPTO} .= fix_asm($mf_cpuid_asm, 'crypto');

 # AES asm files end up included by the aes dir itself
 #$lib_obj{CRYPTO} .= fix_asm($mf_aes_asm, 'crypto/aes');
 $lib_obj{CRYPTO} .= fix_asm($mf_sha_asm, 'crypto/sha');
 # AES asm files end up included by the aes dir itself
 #$lib_obj{CRYPTO} .= fix_asm($mf_aes_asm, 'crypto/aes');
 $lib_obj{CRYPTO} .= fix_asm($mf_sha_asm, 'crypto/sha');