generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3331 from tSed:opencv-2.4.x/fix-x86-PIC-compilation

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-10-12 13:42:38 +00:00
commit 6b0cd392f0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/src/system.cpp
View File

@ -267,14 +267,17 @@ struct HWFeatures
: "cc" : "cc"
); );
#else #else
// We need to preserve ebx since we are compiling PIC code.
// This means we cannot use "=b" for the 2nd output register.
asm volatile asm volatile
( (
"pushl %%ebx\n\t" "pushl %%ebx\n\t"
"movl $7,%%eax\n\t" "movl $7,%%eax\n\t"
"movl $0,%%ecx\n\t" "movl $0,%%ecx\n\t"
"cpuid\n\t" "cpuid\n\t"
"movl %%ebx,%1\n\t"
"popl %%ebx\n\t" "popl %%ebx\n\t"
: "=a"(cpuid_data[0]), "=b"(cpuid_data[1]), "=c"(cpuid_data[2]), "=d"(cpuid_data[3]) : "=a"(cpuid_data[0]), "=r"(cpuid_data[1]), "=c"(cpuid_data[2]), "=d"(cpuid_data[3])
: :
: "cc" : "cc"
); );