fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge xmrig v6.15.0 into master

Browse source
This commit is contained in:
MoneroOcean 2021-08-31 16:45:39 +00:00
commit 29fa5c61e0
258 changed files with 13719 additions and 8163 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/backend/cpu/platform/BasicCpuInfo.cpp
View file

@ -196,7 +196,7 @@ xmrig::BasicCpuInfo::BasicCpuInfo() :
}
# ifdef XMRIG_FEATURE_ASM
if (hasAES()) {
if (m_flags.test(FLAG_AES)) {
char vendor[13] = { 0 };
int32_t data[4] = { 0 };

5
src/backend/cpu/platform/BasicCpuInfo_arm.cpp
View file

@ -16,7 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "base/tools/String.h"
@ -63,7 +62,7 @@ xmrig::BasicCpuInfo::BasicCpuInfo() :
m_units[i] = i;
}
# ifdef XMRIG_ARMv8
# if (XMRIG_ARM == 8)
memcpy(m_brand, "ARMv8", 5);
# else
memcpy(m_brand, "ARMv7", 5);
@ -128,7 +127,7 @@ rapidjson::Value xmrig::BasicCpuInfo::toJSON(rapidjson::Document &doc) const
out.AddMember("msr", "none", allocator);
out.AddMember("assembly", "none", allocator);
# ifdef XMRIG_ARMv8
# if (XMRIG_ARM == 8)
out.AddMember("arch", "aarch64", allocator);
# else
out.AddMember("arch", "aarch32", allocator);

2
src/backend/cpu/platform/HwlocCpuInfo.h
View file

@ -65,7 +65,7 @@ protected:
private:
CpuThreads allThreads(const Algorithm &algorithm, uint32_t limit) const;
void processTopLevelCache(hwloc_obj_t obj, const Algorithm &algorithm, CpuThreads &threads, size_t limit) const;
void processTopLevelCache(hwloc_obj_t cache, const Algorithm &algorithm, CpuThreads &threads, size_t limit) const;
void setThreads(size_t threads);
static uint32_t m_features;