comparison configure @ 37189:baa61e26cf83

configure: fix up some FFmpeg config.h defines, especially for ARM.
author reimar
date Thu, 18 Sep 2014 20:22:31 +0000
parents 1c64016edce3
children ac6c37d85d65
comparison
equal deleted inserted replaced
37188:32aab8a15bfc 37189:baa61e26cf83
2014 def_fast_64bit='#define HAVE_FAST_64BIT 0' 2014 def_fast_64bit='#define HAVE_FAST_64BIT 0'
2015 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 0' 2015 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 0'
2016 def_av_fast_unaligned='#define AV_HAVE_FAST_UNALIGNED 0' 2016 def_av_fast_unaligned='#define AV_HAVE_FAST_UNALIGNED 0'
2017 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 0' 2017 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 0'
2018 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 0' 2018 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 0'
2019 def_local_aligned_32='#define HAVE_LOCAL_ALIGNED_16 0'
2019 arch_all='X86 IA64 SPARC ARM AVR32 SH4 PPC ALPHA MIPS PA_RISC S390 S390X VAX BFIN XTENSA TOMI GENERIC AARCH64' 2020 arch_all='X86 IA64 SPARC ARM AVR32 SH4 PPC ALPHA MIPS PA_RISC S390 S390X VAX BFIN XTENSA TOMI GENERIC AARCH64'
2020 subarch_all='X86_32 X86_64 PPC64' 2021 subarch_all='X86_32 X86_64 PPC64'
2021 case "$host_arch" in 2022 case "$host_arch" in
2022 i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) 2023 i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686)
2023 arch='x86' 2024 arch='x86'
2024 subarch='x86_32' 2025 subarch='x86_32'
2025 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' 2026 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
2026 def_av_fast_unaligned='#define AV_HAVE_FAST_UNALIGNED 1' 2027 def_av_fast_unaligned='#define AV_HAVE_FAST_UNALIGNED 1'
2027 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' 2028 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1'
2028 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1' 2029 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1'
2030 def_local_aligned_32='#define HAVE_LOCAL_ALIGNED_32 1'
2029 iproc=486 2031 iproc=486
2030 proc=i486 2032 proc=i486
2031 2033
2032 2034
2033 if test "$_runtime_cpudetection" = no ; then 2035 if test "$_runtime_cpudetection" = no ; then
2278 subarch='x86_64' 2280 subarch='x86_64'
2279 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' 2281 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
2280 def_av_fast_unaligned='#define AV_HAVE_FAST_UNALIGNED 1' 2282 def_av_fast_unaligned='#define AV_HAVE_FAST_UNALIGNED 1'
2281 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' 2283 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1'
2282 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1' 2284 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1'
2285 def_local_aligned_32='#define HAVE_LOCAL_ALIGNED_32 1'
2283 def_fast_64bit='#define HAVE_FAST_64BIT 1' 2286 def_fast_64bit='#define HAVE_FAST_64BIT 1'
2284 iproc='x86_64' 2287 iproc='x86_64'
2285 2288
2286 # gcc >= 3.4.0 doesn't support -mcpu, we have to use -mtune instead 2289 # gcc >= 3.4.0 doesn't support -mcpu, we have to use -mtune instead
2287 if test "$cc_vendor" = "gnu" && test "$_cc_major" -gt 3 -o "$_cc_major" -eq 3 -a "$_cc_minor" -ge 4 ; then 2290 if test "$cc_vendor" = "gnu" && test "$_cc_major" -gt 3 -o "$_cc_major" -eq 3 -a "$_cc_minor" -ge 4 ; then
2413 ;; 2416 ;;
2414 2417
2415 arm*) 2418 arm*)
2416 arch='arm' 2419 arch='arm'
2417 iproc='arm' 2420 iproc='arm'
2421 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
2422 def_av_fast_unaligned='#define AV_HAVE_FAST_UNALIGNED 1'
2423 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1'
2424 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1'
2425 def_local_aligned_32='#define HAVE_LOCAL_ALIGNED_32 1'
2426 test $_fast_clz = "auto" && _fast_clz=yes
2418 ;; 2427 ;;
2419 2428
2420 avr32) 2429 avr32)
2421 arch='avr32' 2430 arch='avr32'
2422 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' 2431 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
2435 def_dcbzl='#define HAVE_DCBZL 0' 2444 def_dcbzl='#define HAVE_DCBZL 0'
2436 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' 2445 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
2437 def_av_fast_unaligned='#define AV_HAVE_FAST_UNALIGNED 1' 2446 def_av_fast_unaligned='#define AV_HAVE_FAST_UNALIGNED 1'
2438 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' 2447 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1'
2439 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1' 2448 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1'
2449 def_local_aligned_32='#define HAVE_LOCAL_ALIGNED_32 1'
2440 iproc='ppc' 2450 iproc='ppc'
2441 2451
2442 if test "$host_arch" = "ppc64" ; then 2452 if test "$host_arch" = "ppc64" ; then
2443 subarch='ppc64' 2453 subarch='ppc64'
2444 def_fast_64bit='#define HAVE_FAST_64BIT 1' 2454 def_fast_64bit='#define HAVE_FAST_64BIT 1'
9154 $def_fast_unaligned 9164 $def_fast_unaligned
9155 $def_gnu_as 9165 $def_gnu_as
9156 $def_ibm_asm 9166 $def_ibm_asm
9157 $def_local_aligned_8 9167 $def_local_aligned_8
9158 $def_local_aligned_16 9168 $def_local_aligned_16
9169 $def_local_aligned_32
9159 $def_os2threads 9170 $def_os2threads
9160 $def_pic 9171 $def_pic
9161 $def_pthreads 9172 $def_pthreads
9162 $def_pthread_cancel 9173 $def_pthread_cancel
9163 $def_socklen_t 9174 $def_socklen_t
9246 #define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1 9257 #define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
9247 #define HAVE_INTRINSICS_NEON 0 9258 #define HAVE_INTRINSICS_NEON 0
9248 #define HAVE_ISATTY 0 9259 #define HAVE_ISATTY 0
9249 #define HAVE_LDBRX 0 9260 #define HAVE_LDBRX 0
9250 #define HAVE_LIBC_MSVCRT 0 9261 #define HAVE_LIBC_MSVCRT 0
9251 #define HAVE_LOCAL_ALIGNED_8 1
9252 #define HAVE_LOCAL_ALIGNED_16 1
9253 #define HAVE_LOCAL_ALIGNED_32 1
9254 #define HAVE_LOCALTIME_R 0 9262 #define HAVE_LOCALTIME_R 0
9255 #define HAVE_MACH_MACH_TIME_H 0 9263 #define HAVE_MACH_MACH_TIME_H 0
9256 #define HAVE_MAPVIEWOFFILE 0 9264 #define HAVE_MAPVIEWOFFILE 0
9257 #define HAVE_MIPSDSPR1 0 9265 #define HAVE_MIPSDSPR1 0
9258 #define HAVE_MIPSFPU 0 9266 #define HAVE_MIPSFPU 0