Merge pull request #3642 from ilya-lavrenov:linux_x86

6e565ab4 · Vadim Pisarevsky · f1fb4744 · dcb0c68e · 6e565ab4
Commit 6e565ab4 authored Jan 26, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

system.cpp modules/core/src/system.cpp +4 -5

No files found.
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@@ -293,14 +293,13 @@ struct HWFeatures
            #else
            asm volatile
            (
-             "pushl %%eax\n\t"
+             "pushl %%ebx\n\t"
-             "pushl %%edx\n\t"
             "movl $7,%%eax\n\t"
             "movl $0,%%ecx\n\t"
             "cpuid\n\t"
-             "popl %%edx\n\t"
+             "movl %%ebx, %0\n\t"
-             "popl %%eax\n\t"
+             "popl %%ebx\n\t"
-             : "=b"(cpuid_data[1]), "=c"(cpuid_data[2])
+             : "=r"(cpuid_data[1]), "=c"(cpuid_data[2])
             :
             : "cc"
            );