Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge pull request #1751 from mdspann/master 

Add  hostinfo detection for 64 bit arm processors to use the same log…
This commit is contained in:
David Anderson 2017-01-05 13:24:09 -08:00 committed by GitHub
parent 536d89f228 e833bef636
commit 96274fe88f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/hostinfo_unix.cpp
View File

@ -481,7 +481,7 @@ static void parse_cpuinfo_linux(HOST_INFO& host) {
#elif __ia64__
strcpy(host.p_model, "IA-64 ");
model_hack = true;
#elif __arm__
#elif __arm__ || __aarch64__
strcpy(host.p_vendor, "ARM");
vendor_hack = vendor_found = true;
#endif
@ -522,7 +522,7 @@ static void parse_cpuinfo_linux(HOST_INFO& host) {
strstr(buf, "family : ") || strstr(buf, "model name : ")
#elif __powerpc__ || __sparc__
strstr(buf, "cpu\t\t: ")
#elif __arm__
#elif __arm__ || __aarch64__
strstr(buf, "Processor\t: ") || strstr(buf, "model name")
#else
strstr(buf, "model name\t: ") || strstr(buf, "cpu model\t\t: ")

6
client/hostinfo_unix_test.cpp
View File

@ -53,7 +53,7 @@ int main(void) {
#elif __ia64__
strcpy(p_model, "IA-64 ");
model_hack = true;
#elif __arm__
#elif __arm__ || __aarch64__
strcpy(p_vendor, "ARM ");
vendor_hack = vendor_found = true;
#endif
@ -73,7 +73,7 @@ int main(void) {
strstr(buf, "type\t\t: ")
#elif __alpha__
strstr(buf, "cpu\t\t\t: ")
#elif __arm__
#elif __arm__ || __aarch64__
strstr(buf, "CPU architecture: ")
#else
strstr(buf, "vendor_id\t: ") || strstr(buf, "system type\t\t: ")
@ -94,7 +94,7 @@ int main(void) {
strstr(buf, "family : ") || strstr(buf, "model name : ")
#elif __powerpc__ || __sparc__
strstr(buf, "cpu\t\t: ")
#elif __arm__
#elif __arm__ || __aarch64__
strstr(buf, "Processor\t: ")
#else
strstr(buf, "model name\t: ") || strstr(buf, "cpu model\t\t: ")