Commit 35ced1f7 authored by Ben Laurie's avatar Ben Laurie
Browse files

Merge branch 'master' of openssl.net:openssl 

Conflicts:
	util/mk1mf.pl
parents 654d227a 71a16946

crypto/x86cpuid.pl

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } 
	&inc	("esi");		# number of cores



	&mov	("eax",1);

	&xor	("ecx","ecx");

	&cpuid	();

	&bt	("edx",28);

	&jnc	(&label("generic"));
@@ -102,6 +103,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } 


&set_label("nocacheinfo");

	&mov	("eax",1);

	&xor	("ecx","ecx");

	&cpuid	();

	&and	("edx",0xbfefffff);	# force reserved bits #20, #30 to 0

	&cmp	("ebp",0);

util/mk1mf.pl

+12 −10
Original line number Diff line number Diff line
@@ -875,16 +875,18 @@ sub fix_asm 
	return $asm . ' ';

	}



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');

	$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)

	{