Merge branch 'master' of openssl.net:openssl

Conflicts:
	util/mk1mf.pl

util/mk1mf.pl

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index e0e8d57..f12f9ea 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -875,16 +875,18 @@
 	return $asm . ' ';
 	}
 
-$lib_obj{CRYPTO} .= fix_asm($mf_md5_asm, 'crypto/md5');
-$lib_obj{CRYPTO} .= fix_asm($mf_bn_asm, 'crypto/bn');
-# 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');
-$lib_obj{CRYPTO} .= fix_asm($mf_engines_asm, 'engines');
-$lib_obj{CRYPTO} .= fix_asm($mf_rc4_asm, 'crypto/rc4');
-$lib_obj{CRYPTO} .= fix_asm($mf_modes_asm, 'crypto/modes');
+if ($orig_platform eq 'copy') {
+	$lib_obj{CRYPTO} .= fix_asm($mf_md5_asm, 'crypto/md5');
+	$lib_obj{CRYPTO} .= fix_asm($mf_bn_asm, 'crypto/bn');
+	# 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');
+	$lib_obj{CRYPTO} .= fix_asm($mf_engines_asm, 'engines');
+	$lib_obj{CRYPTO} .= fix_asm($mf_rc4_asm, 'crypto/rc4');
+	$lib_obj{CRYPTO} .= fix_asm($mf_modes_asm, 'crypto/modes');
+}
 
 foreach (values %lib_nam)
 	{