]>
Commit | Line | Data |
---|---|---|
07ffd246 JR |
1 | --- mjpegtools-2.1.0/utils/cpu_accel.c.orig 2010-09-19 23:21:37.000000000 +0200 |
2 | +++ mjpegtools-2.1.0/utils/cpu_accel.c 2015-04-03 23:40:52.986289070 +0200 | |
3 | @@ -117,14 +117,18 @@ | |
4 | ||
5 | static int x86_accel (void) | |
6 | { | |
a02da5ad | 7 | +#if defined(__x86_64__) && defined(__ILP32__) |
07ffd246 JR |
8 | + long long eax, ebx, ecx, edx; |
9 | +#else | |
10 | long eax, ebx, ecx, edx; | |
11 | +#endif | |
12 | int32_t AMD; | |
13 | int32_t caps; | |
14 | ||
15 | /* Slightly weirdified cpuid that preserves the ebx and edi required | |
16 | by gcc for PIC offset table and frame pointer */ | |
17 | ||
18 | -#if defined(__LP64__) || defined(_LP64) | |
a02da5ad | 19 | +#if defined(__x86_64__) /* also x32 */ |
07ffd246 JR |
20 | # define REG_b "rbx" |
21 | # define REG_S "rsi" | |
22 | #else |