diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-09-19 17:18:55 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-09-19 17:18:55 +0800 |
| commit | 65f7c08ef3a68981d74336a0160ec3d0ce97337d (patch) | |
| tree | 97032102643912cf156789dc2a0cf87851bfde7b | |
| parent | b96c9ee1f9f8c1bcdda48638bba3e31a90887f86 (diff) | |
| parent | 9dc7a58993e73dfc595e0e077f14104574f441ed (diff) | |
Merge branch 'main' into DRTVWR-559
| -rw-r--r-- | indra/llcommon/llprocessor.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp index cfa85ac2fd..dab1c5bde1 100644 --- a/indra/llcommon/llprocessor.cpp +++ b/indra/llcommon/llprocessor.cpp @@ -742,12 +742,14 @@ private: : "0" (level)) #endif +#if __i386__ || __x86_64__ unsigned int eax, ebx, ecx, edx; __cpuid(0x1, eax, ebx, ecx, edx); if(feature_infos[0] != (S32)edx) { LL_ERRS() << "machdep.cpu.feature_bits doesn't match expected cpuid result!" << LL_ENDL; } +#endif // __i386__ || __x86_64__ #endif // LL_RELEASE_FOR_DOWNLOAD diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 757280f17e..0545377543 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -5408,7 +5408,7 @@ void LLAppViewer::forceErrorBreakpoint() LL_WARNS() << "Forcing a deliberate breakpoint" << LL_ENDL; #ifdef LL_WINDOWS DebugBreak(); -#else +#elif __i386__ || __x86_64__ asm ("int $3"); #endif return; |