This is so to say "damage control" for jumbo "cpuid" patch, see

http://cvs.openssl.org/chngview?cn=12493. Now all platform should
be operational, while SSE2 code pathes get engaged on ELF platforms
only.
This commit is contained in:
Andy Polyakov 2004-07-26 22:01:50 +00:00
parent 14e21f863a
commit ebaec63e3e
2 changed files with 3 additions and 1 deletions

View File

@ -1408,6 +1408,8 @@ print OUT "#ifdef OPENSSL_ALGORITHM_DEFINES\n";
print OUT $openssl_algorithm_defines_trans;
print OUT "#endif\n\n";
print OUT "#define OPENSSL_CPUID_OBJ\n\n" if ($cpuid_obj);
while (<IN>)
{
if (/^#define\s+OPENSSLDIR/)

View File

@ -544,7 +544,7 @@ const char *CRYPTO_get_lock_name(int type)
unsigned long OPENSSL_ia32cap=0;
unsigned long *OPENSSL_ia32cap_loc() { return &OPENSSL_ia32cap; }
#if !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)
#if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)
#define OPENSSL_CPUID_SETUP
void OPENSSL_cpuid_setup()
{ static int trigger=0;