commit 588d2528d1e9e7d1c076563e47ecbfabc6e49cb1
author Adam Langley <agl@google.com> Fri Sep 19 10:15:33 2014 -0700
committer Adam Langley <agl@google.com> Sat Sep 20 00:09:57 2014 +0000
tree 04139edd02b200e1756b6b59008c493f3f8fe53a
parent bed8ce78f001c600a143966b932f8e587c35e573

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>

crypto/cpu-intel.c

diff --git a/crypto/cpu-intel.c b/crypto/cpu-intel.c
index e2efb2c..3dd08a9 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 @@
   }
 }
 
-#endif  /* OPENSSL_X86 || OPENSSL_X86_64 */
+#endif  /* !OPENSSL_NO_ASM && (OPENSSL_X86 || OPENSSL_X86_64) */