From: Ronald S. Bultje <rsbul...@gmail.com> Signed-off-by: Diego Biurrun <di...@biurrun.de> --- configure | 2 ++ libavutil/x86/cpu.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/configure b/configure index 488fa7e..657e6d8 100755 --- a/configure +++ b/configure @@ -1063,6 +1063,7 @@ HAVE_LIST=" cbrtf closesocket cmov + cpuid dcbzl dev_bktr_ioctl_bt848_h dev_bktr_ioctl_meteor_h @@ -2747,6 +2748,7 @@ elif enabled sparc; then elif enabled x86; then check_code ld immintrin.h "_xgetbv(0)" && enable xgetbv + check_code ld intrin.h "int info[4]; _cpuid(info, 0)" && enable cpuid check_code ld intrin.h "__rdtsc()" && enable rdtsc check_code ld mmintrin.h "_mm_empty()" && enable mm_empty diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c index c6c96f0..70e3125 100644 --- a/libavutil/x86/cpu.c +++ b/libavutil/x86/cpu.c @@ -25,6 +25,7 @@ #include "libavutil/x86_cpu.h" #include "libavutil/cpu.h" +#if HAVE_INLINE_ASM /* ebx saving is necessary for PIC. gcc seems unable to see it alone */ #define cpuid(index, eax, ebx, ecx, edx) \ __asm__ volatile ( \ @@ -33,6 +34,19 @@ "xchg %%"REG_b", %%"REG_S \ : "=a" (eax), "=S" (ebx), "=c" (ecx), "=d" (edx) \ : "0" (index)) +#elif HAVE_CPUID +#include <intrin.h> + +#define cpuid(index, eax, ebx, ecx, edx) \ + do { \ + int info[4]; \ + _cpuid(info, index); \ + eax = info[0]; \ + ebx = info[1]; \ + ecx = info[2]; \ + edx = info[3]; \ + } while (0) +#endif /* HAVE_CPUID */ #if HAVE_INLINE_ASM #define xgetbv(index, eax, edx) \ -- 1.7.1 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel