Skip to content

Restricts cpuid usage to only 64 & 32 bit architectures #1016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pavanky merged 1 commit into from
Sep 23, 2015
Merged

Restricts cpuid usage to only 64 & 32 bit architectures #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/af/defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
typedef long long dim_t;
#endif

#if defined(__arm__) || defined(_M_ARM) || defined(_M_ARMT) || defined(_ARM) || defined(_TARGET_ARCH_ARM) || defined(__TARGET_ARCH_THUMB) || defined(__thumb__)
#define ARM_ARCH
#if defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86) || defined(_WIN64) || defined(__LP64__)
#define USE_CPUID
#endif

#include <stdlib.h>
Expand Down
4 changes: 2 additions & 2 deletions src/backend/cpu/platform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ typedef unsigned __int32 uint32_t;

using namespace std;

#ifndef ARM_ARCH
#ifdef USE_CPUID

#define MAX_INTEL_TOP_LVL 4

Expand Down Expand Up @@ -76,7 +76,7 @@ class CPUInfo {
bool mIsHTT;
};

#ifdef ARM_ARCH
#ifndef USE_CPUID

CPUInfo::CPUInfo()
: mVendorId(""), mModelName(""), mNumSMT(0), mNumCores(0), mNumLogCpus(0), mIsHTT(false)
Expand Down