1 files changed, 19 insertions, 50 deletions

diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index 434501af77..2b6e4be1c8 100644
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -40,9 +40,6 @@
 #   include <intrin.h>
 #   undef _interlockedbittestandset
 #   undef _interlockedbittestandreset
-#if _M_ARM64
-#   include <cpuinfo.h>
-#endif
 #endif
 
 #include "llsd.h"
@@ -510,9 +507,7 @@ private:
         // the other three array elements. The CPU identification string is
         // not in linear order. The code below arranges the information
         // in a human readable form.
-#if _M_ARM64
-        cpuinfo_initialize();
-#else
+#if !_M_ARM64
         int cpu_info[4] = {-1};
         __cpuid(cpu_info, 0);
         unsigned int ids = (unsigned int)cpu_info[0];
@@ -521,44 +516,7 @@ private:
 
         char cpu_vendor[0x20];
         memset(cpu_vendor, 0, sizeof(cpu_vendor));
-#if _M_ARM64
-        switch (cpuinfo_get_current_core()->vendor)
-        {
-            case cpuinfo_vendor_unknown:
-                setInfo(eVendor, "Unknown");
-                break;
-            case cpuinfo_vendor_arm:
-                setInfo(eVendor, "ARM");
-                break;
-            case cpuinfo_vendor_qualcomm:
-                setInfo(eVendor, "Qualcomm");
-                break;
-            case cpuinfo_vendor_apple:
-                setInfo(eVendor, "Apple");
-                break;
-            case cpuinfo_vendor_samsung:
-                setInfo(eVendor, "Samsung");
-                break;
-            case cpuinfo_vendor_nvidia:
-                setInfo(eVendor, "Nvidia");
-                break;
-            case cpuinfo_vendor_cavium:
-                setInfo(eVendor, "Cavium");
-                break;
-            case cpuinfo_vendor_broadcom:
-                setInfo(eVendor, "Broadcom");
-                break;
-            case cpuinfo_vendor_apm:
-                setInfo(eVendor, "APM");
-                break;
-            case cpuinfo_vendor_huawei:
-                setInfo(eVendor, "Huawei");
-                break;
-            default:
-                setInfo(eVendor, "Unknown");
-                break;
-        }
-#else
+#if !_M_ARM64
         *((int*)cpu_vendor) = cpu_info[1];
         *((int*)(cpu_vendor+4)) = cpu_info[3];
         *((int*)(cpu_vendor+8)) = cpu_info[2];
@@ -572,8 +530,18 @@ private:
         }
 
 #if _M_ARM64
-        setInfo(eModel, cpuinfo_get_package(0)->name);
-        setInfo(eType, cpuinfo_get_uarch(0)->uarch);
+        HKEY hKey;
+        DWORD gotType;
+        char inBuffer[48] = "";
+        if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0", 0, KEY_READ, &hKey) == ERROR_SUCCESS)
+        {
+            if (!RegQueryValueExA(hKey, "ProcessorNameString", nullptr, &gotType, (PBYTE)(inBuffer), nullptr))
+            {
+                if ((gotType == REG_SZ) && strlen(inBuffer))
+                    setInfo(eModel, inBuffer);
+            }
+            RegCloseKey(hKey);
+        }
 #else
         // Get the information associated with each valid Id
         for(unsigned int i=0; i<=ids; ++i)
@@ -701,7 +669,8 @@ public:
     {
         getCPUIDInfo();
         uint64_t frequency = getSysctlInt64("hw.cpufrequency");
-        if (!frequency) {
+        if (!frequency)
+        {
             auto tbfrequency = getSysctlInt64("hw.tbfrequency");
             struct clockinfo clockrate;
             auto clockrate_len = sizeof(clockrate);
@@ -711,14 +680,14 @@ public:
         setInfo(eFrequency, (F64)frequency  / (F64)1000000);
     }
 
-    virtual ~LLProcessorInfoDarwinImpl() {}
+    virtual ~LLProcessorInfoDarwinImpl() = default;
 
 private:
     int getSysctlInt(const char* name)
     {
         int result = 0;
         size_t len = sizeof(int);
-        int error = sysctlbyname(name, (void*)&result, &len, NULL, 0);
+        int error = sysctlbyname(name, (void*)&result, &len, nullptr, 0);
         return error == -1 ? 0 : result;
     }
 
@@ -726,7 +695,7 @@ private:
     {
         uint64_t value = 0;
         size_t size = sizeof(value);
-        int result = sysctlbyname(name, (void*)&value, &size, NULL, 0);
+        int result = sysctlbyname(name, (void*)&value, &size, nullptr, 0);
         if ( result == 0 )
         {
             if ( size == sizeof( uint64_t ) )