Merge pull request #1033 from Scrumplex/multi-arch-support

4 files changed, 0 insertions, 49 deletions

diff --git a/libraries/systeminfo/include/sys.h b/libraries/systeminfo/include/sys.h
index bd6e2486..6a6a7c82 100644
--- a/libraries/systeminfo/include/sys.h
+++ b/libraries/systeminfo/include/sys.h
@@ -56,8 +56,4 @@ struct DistributionInfo
 DistributionInfo getDistributionInfo();
 
 uint64_t getSystemRam();
-
-bool isSystem64bit();
-
-bool isCPU64bit();
 }
diff --git a/libraries/systeminfo/src/sys_apple.cpp b/libraries/systeminfo/src/sys_apple.cpp
index 6353b747..b6d62c1a 100644
--- a/libraries/systeminfo/src/sys_apple.cpp
+++ b/libraries/systeminfo/src/sys_apple.cpp
@@ -55,18 +55,6 @@ uint64_t Sys::getSystemRam()
     }
 }
 
-bool Sys::isCPU64bit()
-{
-    // not even going to pretend I'm going to support anything else
-    return true;
-}
-
-bool Sys::isSystem64bit()
-{
-    // yep. maybe when we have 128bit CPUs on consumer devices.
-    return true;
-}
-
 Sys::DistributionInfo Sys::getDistributionInfo()
 {
     DistributionInfo result;
diff --git a/libraries/systeminfo/src/sys_unix.cpp b/libraries/systeminfo/src/sys_unix.cpp
index b3098522..3c63e73a 100644
--- a/libraries/systeminfo/src/sys_unix.cpp
+++ b/libraries/systeminfo/src/sys_unix.cpp
@@ -82,17 +82,6 @@ uint64_t Sys::getSystemRam()
     return 0; // nothing found
 }
 
-bool Sys::isCPU64bit()
-{
-    return isSystem64bit();
-}
-
-bool Sys::isSystem64bit()
-{
-    // kernel build arch on linux
-    return QSysInfo::currentCpuArchitecture() == "x86_64";
-}
-
 Sys::DistributionInfo Sys::getDistributionInfo()
 {
     DistributionInfo systemd_info = read_os_release();
diff --git a/libraries/systeminfo/src/sys_win32.cpp b/libraries/systeminfo/src/sys_win32.cpp
index 430b87e4..5bf510cf 100644
--- a/libraries/systeminfo/src/sys_win32.cpp
+++ b/libraries/systeminfo/src/sys_win32.cpp
@@ -27,28 +27,6 @@ uint64_t Sys::getSystemRam()
     return (uint64_t)status.ullTotalPhys;
 }
 
-bool Sys::isSystem64bit()
-{
-#if defined(_WIN64)
-    return true;
-#elif defined(_WIN32)
-    BOOL f64 = false;
-    return IsWow64Process(GetCurrentProcess(), &f64) && f64;
-#else
-    // it's some other kind of system...
-    return false;
-#endif
-}
-
-bool Sys::isCPU64bit()
-{
-    SYSTEM_INFO info;
-    ZeroMemory(&info, sizeof(SYSTEM_INFO));
-    GetNativeSystemInfo(&info);
-    auto arch = info.wProcessorArchitecture;
-    return arch == PROCESSOR_ARCHITECTURE_AMD64 || arch == PROCESSOR_ARCHITECTURE_IA64;
-}
-
 Sys::DistributionInfo Sys::getDistributionInfo()
 {
     DistributionInfo result;