comparison configure @ 30877:447a58cf1611

Split subarch handling off from generic arch handling.
author diego
date Wed, 17 Mar 2010 13:20:06 +0000
parents 78c91b9f7d3d
children bdf505839bb1
comparison
equal deleted inserted replaced
30876:9283a5a007f0 30877:447a58cf1611
1763 1763
1764 def_fast_64bit='#define HAVE_FAST_64BIT 0' 1764 def_fast_64bit='#define HAVE_FAST_64BIT 0'
1765 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 0' 1765 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 0'
1766 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 0' 1766 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 0'
1767 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 0' 1767 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 0'
1768 arch_all='X86 X86_32 X86_64 IA64 SPARC ARM AVR32 SH4 PPC PPC64 ALPHA MIPS SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA TOMI GENERIC' 1768 arch_all='X86 IA64 SPARC ARM AVR32 SH4 PPC ALPHA MIPS SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA TOMI GENERIC'
1769 subarch_all='X86_32 X86_64 PPC64'
1769 case "$host_arch" in 1770 case "$host_arch" in
1770 i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) 1771 i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686)
1771 arch='X86 X86_32' 1772 arch='X86'
1773 subarch='X86_32'
1772 libavcodec_arch="x86" 1774 libavcodec_arch="x86"
1773 target_arch="ARCH_X86 = yes" 1775 target_arch="ARCH_X86 = yes"
1774 target_subarch="ARCH_X86_32 = yes" 1776 target_subarch="ARCH_X86_32 = yes"
1775 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' 1777 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
1776 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' 1778 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1'
2015 def_fast_64bit='#define HAVE_FAST_64BIT 1' 2017 def_fast_64bit='#define HAVE_FAST_64BIT 1'
2016 iproc='ia64' 2018 iproc='ia64'
2017 ;; 2019 ;;
2018 2020
2019 x86_64|amd64) 2021 x86_64|amd64)
2020 arch='X86 X86_64' 2022 arch='X86'
2023 subarch='X86_64'
2021 libavcodec_arch="x86" 2024 libavcodec_arch="x86"
2022 target_subarch='ARCH_X86_64 = yes' 2025 target_subarch='ARCH_X86_64 = yes'
2023 target_arch="ARCH_X86 = yes" 2026 target_arch="ARCH_X86 = yes"
2024 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' 2027 def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1'
2025 def_fast_64bit='#define HAVE_FAST_64BIT 1' 2028 def_fast_64bit='#define HAVE_FAST_64BIT 1'
2173 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1' 2176 def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 1'
2174 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1' 2177 def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 1'
2175 iproc='ppc' 2178 iproc='ppc'
2176 2179
2177 if test "$host_arch" = "ppc64" -o "$host_arch" = "powerpc64" ; then 2180 if test "$host_arch" = "ppc64" -o "$host_arch" = "powerpc64" ; then
2178 arch='PPC PPC64' 2181 subarch='PPC64'
2179 target_subarch='ARCH_PPC64 = yes' 2182 target_subarch='ARCH_PPC64 = yes'
2180 def_fast_64bit='#define HAVE_FAST_64BIT 1' 2183 def_fast_64bit='#define HAVE_FAST_64BIT 1'
2181 fi 2184 fi
2182 echocheck "CPU type" 2185 echocheck "CPU type"
2183 case $system_name in 2186 case $system_name in
8916 /* CPU stuff */ 8919 /* CPU stuff */
8917 #define __CPU__ $iproc 8920 #define __CPU__ $iproc
8918 $def_words_endian 8921 $def_words_endian
8919 $def_bigendian 8922 $def_bigendian
8920 $(ff_config_enable "$arch_all" "$arch" "ARCH") 8923 $(ff_config_enable "$arch_all" "$arch" "ARCH")
8924 $(ff_config_enable "$subarch_all" "$subarch" "ARCH")
8921 $(ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE") 8925 $(ff_config_enable "$_cpuexts_all" "$_cpuexts" "HAVE")
8922 8926
8923 8927
8924 /* DVD/VCD/CD */ 8928 /* DVD/VCD/CD */
8925 #define DEFAULT_CDROM_DEVICE "$default_cdrom_device" 8929 #define DEFAULT_CDROM_DEVICE "$default_cdrom_device"