| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Fix get of FLAGS register in x32 ABI, |
| 2 | |
| 3 | x32 ABI requires to have 64-bit variable to store FLAGS register |
| 4 | instead of size_t that is 32-bit variable, this fix operand |
| 5 | type mismatch when try to pop previous pushf value. |
| 6 | |
| 7 | Upstream-Status: Submitted |
| 8 | |
| 9 | Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> |
| 10 | |
| 11 | Index: lzop-1.03/src/miniacc.h |
| 12 | =================================================================== |
| 13 | --- lzop-1.03.orig/src/miniacc.h |
| 14 | +++ lzop-1.03/src/miniacc.h |
| 15 | @@ -754,6 +754,9 @@ |
| 16 | #elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64) |
| 17 | # define ACC_ARCH_AMD64 1 |
| 18 | # define ACC_INFO_ARCH "amd64" |
| 19 | +# if defined(__ILP32__) |
| 20 | +# define ACC_ARCH_AMD64_X32 1 |
| 21 | +# endif |
| 22 | #elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB)) |
| 23 | # define ACC_ARCH_ARM 1 |
| 24 | # define ACC_ARCH_ARM_THUMB 1 |
| 25 | @@ -6787,7 +6790,11 @@ ACCLIB_PUBLIC_NOINLINE(void, acc_debug_n |
| 26 | ACCLIB_PUBLIC_NOINLINE(int, acc_debug_align_check_query) (void) |
| 27 | { |
| 28 | #if (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC) |
| 29 | +# if defined(ACC_ARCH_AMD64_X32) |
| 30 | + unsigned long long r; |
| 31 | +# else |
| 32 | size_t r; |
| 33 | +# endif |
| 34 | __asm__ __volatile__("pushf\n pop %0\n" : "=a" (r) : : __ACC_ASM_CLOBBER); |
| 35 | return (int)(r >> 18) & 1; |
| 36 | #elif (ACC_ARCH_I386) && (ACC_ASM_SYNTAX_MSC) |