Browse code

configure: split $cpu handling by arch

Originally committed as revision 21296 to svn://svn.ffmpeg.org/ffmpeg/trunk

Måns Rullgård authored on 2010/01/19 06:05:05
Showing 1 changed files
... ...
@@ -1812,8 +1812,11 @@ case "$arch" in
1812 1812
 esac
1813 1813
 
1814 1814
 is_in $arch $ARCH_LIST || echo "WARNING: unknown arch $arch"
1815
+enable $arch
1815 1816
 
1816 1817
 # Add processor-specific flags
1818
+if enabled ppc; then
1819
+
1817 1820
 case $cpu in
1818 1821
     601|ppc601|PowerPC601)
1819 1822
         cpuflags="-mcpu=601"
... ...
@@ -1840,6 +1843,11 @@ case $cpu in
1840 1840
         cpuflags="-mcpu=cell"
1841 1841
         enable ldbrx
1842 1842
     ;;
1843
+esac
1844
+
1845
+elif enabled x86; then
1846
+
1847
+case $cpu in
1843 1848
     i[345]86|pentium)
1844 1849
         cpuflags="-march=$cpu"
1845 1850
         disable mmx
... ...
@@ -1861,9 +1869,19 @@ case $cpu in
1861 1861
         enable cmov
1862 1862
         disable fast_cmov
1863 1863
     ;;
1864
+esac
1865
+
1866
+elif enabled sparc; then
1867
+
1868
+case $cpu in
1864 1869
     sparc64)
1865 1870
         cpuflags="-mcpu=v9"
1866 1871
     ;;
1872
+esac
1873
+
1874
+elif enabled arm; then
1875
+
1876
+case $cpu in
1867 1877
     arm11*|cortex*)
1868 1878
         cpuflags="-mcpu=$cpu"
1869 1879
     ;;
... ...
@@ -1876,15 +1894,35 @@ case $cpu in
1876 1876
     arm*)
1877 1877
         cpuflags="-mcpu=$cpu"
1878 1878
     ;;
1879
+esac
1880
+
1881
+elif enabled alpha; then
1882
+
1883
+case $cpu in
1879 1884
     ev4|ev45|ev5|ev56|pca56|ev6|ev67)
1880 1885
         enabled ccc && cpuflags="-arch $cpu" || cpuflags="-mcpu=$cpu"
1881 1886
     ;;
1887
+esac
1888
+
1889
+elif enabled bfin; then
1890
+
1891
+case $cpu in
1882 1892
     bf*)
1883 1893
         cpuflags="-mcpu=$cpu"
1884 1894
     ;;
1895
+esac
1896
+
1897
+elif enabled mips; then
1898
+
1899
+case $cpu in
1885 1900
     mips*|[45]k*|[237]4k*|m4k|r*000|loongson2[ef])
1886 1901
         cpuflags="-march=$cpu"
1887 1902
     ;;
1903
+esac
1904
+
1905
+elif enabled avr32; then
1906
+
1907
+case $cpu in
1888 1908
     ap7[02]0[0-2])
1889 1909
         subarch="avr32_ap"
1890 1910
         cpuflags="-mpart=$cpu"
... ...
@@ -1901,13 +1939,16 @@ case $cpu in
1901 1901
         subarch="avr32_uc"
1902 1902
         cpuflags="-march=$cpu"
1903 1903
     ;;
1904
-    generic)
1905
-    ;;
1906
-    *)
1907
-        echo "WARNING: Unknown CPU \"$cpu\", ignored."
1908
-    ;;
1909 1904
 esac
1910 1905
 
1906
+else
1907
+
1908
+    if test "$cpu" != generic; then
1909
+        echo "WARNING: Unknown CPU \"$cpu\", ignored."
1910
+    fi
1911
+
1912
+fi
1913
+
1911 1914
 add_cflags $cpuflags
1912 1915
 add_asflags $cpuflags
1913 1916
 
... ...
@@ -1950,7 +1991,7 @@ EOF
1950 1950
     ;;
1951 1951
 esac
1952 1952
 
1953
-enable $arch $subarch
1953
+enable $subarch
1954 1954
 enabled spic && enable pic
1955 1955
 check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
1956 1956