diff options
| author | Adam Langley <agl@google.com> | 2014-09-19 21:15:33 +0400 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-09-20 04:09:57 +0400 |
| commit | 588d2528d1e9e7d1c076563e47ecbfabc6e49cb1 (patch) | |
| tree | 04139edd02b200e1756b6b59008c493f3f8fe53a /crypto/cpu-intel.c | |
| parent | bed8ce78f001c600a143966b932f8e587c35e573 (diff) | |
Don't try to setup CPUID if NO_ASM.
Change-Id: Idec1cda87b0a58e9350d0e10c3251a2c47ac1929
Reviewed-on: https://boringssl-review.googlesource.com/1790
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/cpu-intel.c')
| -rw-r--r-- | crypto/cpu-intel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/cpu-intel.c b/crypto/cpu-intel.c index e2efb2c4..3dd08a9e 100644 --- a/crypto/cpu-intel.c +++ b/crypto/cpu-intel.c @@ -61,7 +61,7 @@ #include <openssl/cpu.h> -#if defined(OPENSSL_X86) || defined(OPENSSL_X86_64) +#if !defined(OPENSSL_NO_ASM) && (defined(OPENSSL_X86) || defined(OPENSSL_X86_64)) #include <stdio.h> #include <inttypes.h> @@ -132,4 +132,4 @@ void OPENSSL_cpuid_setup(void) { } } -#endif /* OPENSSL_X86 || OPENSSL_X86_64 */ +#endif /* !OPENSSL_NO_ASM && (OPENSSL_X86 || OPENSSL_X86_64) */ |