diff options
Diffstat (limited to 'libavutil/x86_cpu.h')
-rw-r--r-- | libavutil/x86_cpu.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/libavutil/x86_cpu.h b/libavutil/x86_cpu.h index 4b5f10527e..d29b7d8ad9 100644 --- a/libavutil/x86_cpu.h +++ b/libavutil/x86_cpu.h @@ -24,7 +24,7 @@ #include <stdint.h> #include "config.h" -#ifdef ARCH_X86_64 +#if ARCH_X86_64 # define REG_a "rax" # define REG_b "rbx" # define REG_c "rcx" @@ -64,15 +64,10 @@ typedef int32_t x86_reg; # define REGSP esp #endif -#if defined(ARCH_X86_64) || (defined(ARCH_X86_32) && defined(HAVE_EBX_AVAILABLE) && defined(HAVE_EBP_AVAILABLE)) -# define HAVE_7REGS 1 -#endif - -#if defined(ARCH_X86_64) || (defined(ARCH_X86_32) && (defined(HAVE_EBX_AVAILABLE) || defined(HAVE_EBP_AVAILABLE))) -# define HAVE_6REGS 1 -#endif +#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE)) +#define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE)) -#if defined(ARCH_X86_64) && defined(PIC) +#if ARCH_X86_64 && defined(PIC) # define BROKEN_RELOCATIONS 1 #endif |