From 9dc7a58993e73dfc595e0e077f14104574f441ed Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Tue, 19 Sep 2023 17:18:01 +0800
Subject: Disable assembly instructions on non x86

at least for now.
---
 indra/llcommon/llprocessor.cpp | 2 ++
 indra/newview/llappviewer.cpp  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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 5d23f5b784..1de0ed3f93 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -5392,7 +5392,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;
-- 
cgit v1.2.3