From: Ben Laurie <ben@links.org>
Date: Mon, 4 Mar 2013 20:26:17 +0000 (+0000)
Subject: Merge branch 'master' of openssl.net:openssl
X-Git-Tag: master-post-reformat~1399
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=35ced1f705d65d6637a674f2726bccf69aeb574f;p=oweals%2Fopenssl.git

Merge branch 'master' of openssl.net:openssl

Conflicts:
	util/mk1mf.pl
---

35ced1f705d65d6637a674f2726bccf69aeb574f
diff --cc util/mk1mf.pl
index e0e8d57243,dfe28964e1..f12f9ea3fa
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@@ -875,16 -875,17 +875,18 @@@ sub fix_as
  	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)
  	{