File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed
src/trusted/platform_qualify/arch/x86 Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -38,7 +38,7 @@ const int kMagicConst_ROUNDSS = 0xc0000000;
3838const int kMagicConst_POPCNT = 13 ;
3939const int kMagicConst_CRC32 = 0xb906c3ea ;
4040
41- #if !(NACL_WINDOWS && (NACL_BUILD_SUBARCH == 64 ))
41+ #if !(( NACL_WINDOWS || !defined( _MSC_VER )) && (NACL_BUILD_SUBARCH == 64 ))
4242static int asm_HasMMX (void ) {
4343 volatile int before , after ;
4444 before = kMagicConst ;
@@ -386,13 +386,13 @@ static int asm_HasCX8(void) {
386386#endif /* 0 */
387387#endif /* 64-bit Windows */
388388
389- #if NACL_WINDOWS && (NACL_BUILD_SUBARCH == 64 )
389+ #if !( NACL_WINDOWS && (NACL_BUILD_SUBARCH == 64 )) || !defined( MSC_VER )
390390static int CheckCPUFeatureDetection (NaClCPUFeaturesX86 * cpuf ) {
391391 /* Unfortunately the asm_ tests will not work on 64-bit Windows */
392392 return 0 ;
393393}
394394#else
395- #if (NACL_LINUX || NACL_OSX )
395+ #if (NACL_LINUX || NACL_OSX || ( NACL_WINDOWS && !defined( MSC_VER ) )
396396/* Linux/MacOS signal handling code, for trapping illegal instruction faults */
397397static int sawbadinstruction = 0 ;
398398static struct sigaction crash_detect ;
You can’t perform that action at this time.
0 commit comments