Merge branch 'develop-linux' into marchcat/slua-linux

2 files changed, 11 insertions, 38 deletions

diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake
index 34c145a761..03f3fd1619 100644
--- a/indra/cmake/LLKDU.cmake
+++ b/indra/cmake/LLKDU.cmake
@@ -14,18 +14,17 @@ if (USE_KDU)
   include(Prebuilt)
   use_prebuilt_binary(kdu)
 
-  if (WINDOWS)
-    find_library(KDU_LIBRARY
-      NAMES
-      kdu
-      PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-  else (WINDOWS)
-    find_library(KDU_LIBRARY
-      NAMES
-      kdu
-      libkdu.a
-      PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-  endif (WINDOWS)
+  find_library(KDU_LIBRARY
+    NAMES
+    kdu
+    kdu.lib
+    libkdu.a
+    PATHS
+      "${ARCH_PREBUILT_DIRS_RELEASE}"
+      "${AUTOBUILD_INSTALL_DIR}/lib"
+    PATH_SUFFIXES release
+    REQUIRED
+    NO_DEFAULT_PATH)
 
   target_link_libraries(ll::kdu INTERFACE ${KDU_LIBRARY})
 
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index 090e62b114..37d1c60f91 100644
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -739,32 +739,6 @@ private:
             }
         }
 
-        // *NOTE:Mani - I didn't find any docs that assure me that machdep.cpu.feature_bits will always be
-        // The feature bits I think it is. Here's a test:
-#if !defined(LL_RELEASE_FOR_DOWNLOAD) && !defined(LL_ARM64)
-    #if defined(__i386__) && defined(__PIC__)
-            /* %ebx may be the PIC register.  */
-        #define __cpuid(level, a, b, c, d)          \
-        __asm__ ("xchgl\t%%ebx, %1\n\t"         \
-                "cpuid\n\t"                 \
-                "xchgl\t%%ebx, %1\n\t"          \
-                : "=a" (a), "=r" (b), "=c" (c), "=d" (d)    \
-                : "0" (level))
-    #else
-        #define __cpuid(level, a, b, c, d)          \
-        __asm__ ("cpuid\n\t"                    \
-                 : "=a" (a), "=b" (b), "=c" (c), "=d" (d)   \
-                 : "0" (level))
-    #endif
-
-        unsigned int eax, ebx, ecx, edx;
-        __cpuid(0x1, eax, ebx, ecx, edx);
-        if(feature_infos[0] != (S32)edx)
-        {
-            LL_WARNS() << "machdep.cpu.feature_bits doesn't match expected cpuid result!" << LL_ENDL;
-        }
-#endif // LL_RELEASE_FOR_DOWNLOAD
-
         // @TODO: Audit our usage of machdep.cpu.feature_bits.
 
         uint64_t ext_feature_info = getSysctlInt64("machdep.cpu.extfeature_bits");