From: Ben Laurie <ben@links.org>
Date: Mon, 4 Mar 2013 16:10:47 +0000 (+0000)
Subject: Don't make CPUID stuff twice.
X-Git-Tag: master-post-reformat~1401
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=2f297fce734aa1ba38836e1a75f65e0a48bfa0c7

Don't make CPUID stuff twice.
---

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 2b1e915265..24ee3120dc 100755
--- 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_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');