Blame view

buildroot/buildroot-2016.08.1/package/libfreeimage/0002-fix-cpuid-x86.patch 1.98 KB
6b13f685e   김민수   BSP 최초 추가
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
  Fix build issue caused by invalid register usage on x86
  
  Patch taken from https://github.com/openexr/openexr/issues/128.
  
  Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  
  Index: b/Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp
  ===================================================================
  --- a/Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp
  +++ b/Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp
  @@ -40,21 +40,19 @@
   
   namespace {
   #if defined(IMF_HAVE_SSE2) &&  defined(__GNUC__)
  -
  +#include <cpuid.h>
       // Helper functions for gcc + SSE enabled
  -    void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx)
  +    void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx,
  +					unsigned int &ecx, unsigned int &edx)
       {
  -        __asm__ __volatile__ (
  -            "cpuid"
  -            : /* Output  */ "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) 
  -            : /* Input   */ "a"(n)
  -            : /* Clobber */);
  +		__get_cpuid(n, &eax, &ebx, &ecx, &edx);
       }
   
   #else // IMF_HAVE_SSE2 && __GNUC__
   
       // Helper functions for generic compiler - all disabled
  -    void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx)
  +    void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx,
  +					unsigned int &ecx, unsigned int &edx)
       {
           eax = ebx = ecx = edx = 0;
       }
  @@ -64,7 +62,7 @@
   
   #ifdef OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX
   
  -    void xgetbv(int n, int &eax, int &edx)
  +    void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx)
       {
           __asm__ __volatile__ (
               "xgetbv"
  @@ -75,7 +73,7 @@
   
   #else //  OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX
   
  -    void xgetbv(int n, int &eax, int &edx)
  +    void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx)
       {
           eax = edx = 0;
       }
  @@ -94,8 +92,8 @@
       f16c(false)
   {
       bool osxsave = false;
  -    int  max     = 0;
  -    int  eax, ebx, ecx, edx;
  +    unsigned int  max     = 0;
  +    unsigned int  eax, ebx, ecx, edx;
   
       cpuid(0, max, ebx, ecx, edx);
       if (max > 0)