diff options
| author | Andy Polyakov <appro@openssl.org> | 2004-07-26 22:01:50 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2004-07-26 22:01:50 +0000 |
| commit | ebaec63e3e442a219faabf86d8961301ee003446 (patch) | |
| tree | 5a349c67a11e598ab37140769dcc457aa4eb0cc0 | |
| parent | 14e21f863a3e3278bb8660ea9844e92e52e1f2f7 (diff) | |
| download | openssl-new-ebaec63e3e442a219faabf86d8961301ee003446.tar.gz | |
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.
| -rwxr-xr-x | Configure | 2 | ||||
| -rw-r--r-- | crypto/cryptlib.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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/) diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 79c54b920e..23264ec823 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -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; |