generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of openssl.net:openssl

Browse Source 
Conflicts:
	util/mk1mf.pl
This commit is contained in:
Ben Laurie 2013-03-04 20:26:17 +00:00
commit 35ced1f705
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/x86cpuid.pl
View File

@ -69,6 +69,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
&inc ("esi"); # number of cores &inc ("esi"); # number of cores
&mov ("eax",1); &mov ("eax",1);
&xor ("ecx","ecx");
&cpuid (); &cpuid ();
&bt ("edx",28); &bt ("edx",28);
&jnc (&label("generic")); &jnc (&label("generic"));
@ -102,6 +103,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
&set_label("nocacheinfo"); &set_label("nocacheinfo");
&mov ("eax",1); &mov ("eax",1);
&xor ("ecx","ecx");
&cpuid (); &cpuid ();
&and ("edx",0xbfefffff); # force reserved bits #20, #30 to 0 &and ("edx",0xbfefffff); # force reserved bits #20, #30 to 0
&cmp ("ebp",0); &cmp ("ebp",0);

22
util/mk1mf.pl
View File

@ -875,16 +875,18 @@ sub fix_asm
return $asm . ' '; return $asm . ' ';
} }
$lib_obj{CRYPTO} .= fix_asm($mf_md5_asm, 'crypto/md5'); if ($orig_platform eq 'copy') {
$lib_obj{CRYPTO} .= fix_asm($mf_bn_asm, 'crypto/bn'); $lib_obj{CRYPTO} .= fix_asm($mf_md5_asm, 'crypto/md5');
# cpuid is included by the crypto dir $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
# AES asm files end up included by the aes dir itself $lib_obj{CRYPTO} .= fix_asm($mf_cpuid_asm, 'crypto');
#$lib_obj{CRYPTO} .= fix_asm($mf_aes_asm, 'crypto/aes'); # AES asm files end up included by the aes dir itself
$lib_obj{CRYPTO} .= fix_asm($mf_sha_asm, 'crypto/sha'); #$lib_obj{CRYPTO} .= fix_asm($mf_aes_asm, 'crypto/aes');
$lib_obj{CRYPTO} .= fix_asm($mf_engines_asm, 'engines'); $lib_obj{CRYPTO} .= fix_asm($mf_sha_asm, 'crypto/sha');
$lib_obj{CRYPTO} .= fix_asm($mf_rc4_asm, 'crypto/rc4'); $lib_obj{CRYPTO} .= fix_asm($mf_engines_asm, 'engines');
$lib_obj{CRYPTO} .= fix_asm($mf_modes_asm, 'crypto/modes'); $lib_obj{CRYPTO} .= fix_asm($mf_rc4_asm, 'crypto/rc4');
$lib_obj{CRYPTO} .= fix_asm($mf_modes_asm, 'crypto/modes');
}
foreach (values %lib_nam) foreach (values %lib_nam)
{ {