Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Nov 2012 13:03:31 +0000 (14:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Nov 2012 13:03:31 +0000 (14:03 +0100)
* qatar/master:
  configure: sort cpuflags section by architecture

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -2913,46 -2581,52 +2859,74 @@@ elif enabled mips; the
  
      cpuflags="-march=$cpu"
  
- elif enabled avr32; then
 +    case $cpu in
 +        24kc)
 +            disable mipsfpu
 +            disable mipsdspr1
 +            disable mipsdspr2
 +        ;;
 +        24kf*)
 +            disable mipsdspr1
 +            disable mipsdspr2
 +        ;;
 +        24kec|34kc|1004kc)
 +            disable mipsfpu
 +            disable mipsdspr2
 +        ;;
 +        24kef*|34kf*|1004kf*)
 +            disable mipsdspr2
 +        ;;
 +        74kc)
 +            disable mipsfpu
 +        ;;
 +    esac
 +
+ elif enabled ppc; then
  
-     case $cpu in
-         ap7[02]0[0-2])
-             subarch="avr32_ap"
-             cpuflags="-mpart=$cpu"
+     case $(tolower $cpu) in
+         601|ppc601|powerpc601)
+             cpuflags="-mcpu=601"
+             disable altivec
          ;;
-         ap)
-             subarch="avr32_ap"
-             cpuflags="-march=$cpu"
+         603*|ppc603*|powerpc603*)
+             cpuflags="-mcpu=603"
+             disable altivec
          ;;
-         uc3[ab]*)
-             subarch="avr32_uc"
+         604*|ppc604*|powerpc604*)
+             cpuflags="-mcpu=604"
+             disable altivec
+         ;;
+         g3|75*|ppc75*|powerpc75*)
+             cpuflags="-mcpu=750"
+             disable altivec
+         ;;
+         g4|745*|ppc745*|powerpc745*)
+             cpuflags="-mcpu=7450"
+         ;;
+         74*|ppc74*|powerpc74*)
+             cpuflags="-mcpu=7400"
+         ;;
+         g5|970|ppc970|powerpc970)
+             cpuflags="-mcpu=970"
+         ;;
+         power[3-7]*)
              cpuflags="-mcpu=$cpu"
          ;;
-         uc)
-             subarch="avr32_uc"
-             cpuflags="-march=$cpu"
+         cell)
+             cpuflags="-mcpu=cell"
+             enable ldbrx
+         ;;
+         e500mc)
+             cpuflags="-mcpu=e500mc"
+             disable altivec
+         ;;
+         e500v2)
+             cpuflags="-mcpu=8548 -mhard-float -mfloat-gprs=double"
+             disable altivec
+         ;;
+         e500)
+             cpuflags="-mcpu=8540 -mhard-float"
+             disable altivec
          ;;
      esac