Merge branch 'master' of openssl.net:openssl

Conflicts:
	util/mk1mf.pl

diff --combined util/mk1mf.pl
index e0e8d572436d4e5e3fb1c48d0aaa16a0430b9ce5,dfe28964e143d175e3a0087e86b1daaca3bcb4f6..f12f9ea3fa5bd46ad9f6c56fd27196706171d9de
--- 1/util/mk1mf.pl
--- 2/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)
        {
@@@ -1353,7 -1354,7 +1355,7 @@@ sub do_copy_rul
                if ($n =~ /bss_file/)
                        { $pp=".c"; }
                else    { $pp=$p; }
 -              $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp $to\n\t\$(CP) \"\$(SRC_D)$o$_$pp\" \"$to${o}$n$pp\"\n\n";
 +              $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp $to\n\t\$(SRC_D)${o}util${o}copy-if-different.pl \"\$(SRC_D)$o$_$pp\" \"$to${o}$n$pp\"\n\n";
                }
        return($ret);
        }