1.1 --- a/scripts/build/cc/gcc.sh	Mon Jun 27 18:04:50 2011 +0200
     1.2 +++ b/scripts/build/cc/gcc.sh	Sun Jul 03 22:32:36 2011 +0200
     1.3 @@ -267,22 +267,24 @@
     1.4          *)  extra_config+=( "--with-linker-hash-style=${CT_CC_GCC_LNK_HASH_STYLE}" );;
     1.5      esac
     1.6  
     1.7 -    case "${CT_CC_GCC_mips_llsc}" in
     1.8 -        y)  extra_config+=( --with-llsc );;
     1.9 -        m)  ;;
    1.10 -        *)  extra_config+=( --without-llsc );;
    1.11 +    case "${CT_ARCH}" in
    1.12 +        mips)
    1.13 +            case "${CT_CC_GCC_mips_llsc}" in
    1.14 +                y)  extra_config+=( --with-llsc );;
    1.15 +                m)  ;;
    1.16 +                *)  extra_config+=( --without-llsc );;
    1.17 +            esac
    1.18 +            case "${CT_CC_GCC_mips_synci}" in
    1.19 +                y)  extra_config+=( --with-synci );;
    1.20 +                m)  ;;
    1.21 +                *)  extra_config+=( --without-synci );;
    1.22 +            esac
    1.23 +            if [ "${CT_CC_GCC_mips_plt}" ]; then
    1.24 +                extra_config+=( --with-mips-plt )
    1.25 +            fi
    1.26 +            ;; # ARCH is mips
    1.27      esac
    1.28  
    1.29 -    case "${CT_CC_GCC_mips_synci}" in
    1.30 -        y)  extra_config+=( --with-synci );;
    1.31 -        m)  ;;
    1.32 -        *)  extra_config+=( --without-synci );;
    1.33 -    esac
    1.34 -
    1.35 -    if [ "${CT_CC_GCC_mips_plt}" ]; then
    1.36 -        extra_config+=( --with-mips-plt )
    1.37 -    fi
    1.38 -
    1.39      CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
    1.40  
    1.41      # Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532)
    1.42 @@ -560,22 +562,6 @@
    1.43          *)  extra_config+=( "--with-linker-hash-style=${CT_CC_GCC_LNK_HASH_STYLE}" );;
    1.44      esac
    1.45  
    1.46 -    case "${CT_CC_GCC_mips_llsc}" in
    1.47 -        y)  extra_config+=( --with-llsc );;
    1.48 -        m)  ;;
    1.49 -        *)  extra_config+=( --without-llsc );;
    1.50 -    esac
    1.51 -
    1.52 -    case "${CT_CC_GCC_mips_synci}" in
    1.53 -        y)  extra_config+=( --with-synci );;
    1.54 -        m)  ;;
    1.55 -        *)  extra_config+=( --without-synci );;
    1.56 -    esac
    1.57 -
    1.58 -    if [ "${CT_CC_GCC_mips_plt}" ]; then
    1.59 -        extra_config+=( --with-mips-plt )
    1.60 -    fi
    1.61 -
    1.62      if [ "${CT_CC_GCC_ENABLE_PLUGINS}" = "y" ]; then
    1.63          extra_config+=( --enable-plugin )
    1.64      fi
    1.65 @@ -583,6 +569,24 @@
    1.66          extra_config+=( --enable-gold )
    1.67      fi
    1.68  
    1.69 +    case "${CT_ARCH}" in
    1.70 +        mips)
    1.71 +            case "${CT_CC_GCC_mips_llsc}" in
    1.72 +                y)  extra_config+=( --with-llsc );;
    1.73 +                m)  ;;
    1.74 +                *)  extra_config+=( --without-llsc );;
    1.75 +            esac
    1.76 +            case "${CT_CC_GCC_mips_synci}" in
    1.77 +                y)  extra_config+=( --with-synci );;
    1.78 +                m)  ;;
    1.79 +                *)  extra_config+=( --without-synci );;
    1.80 +            esac
    1.81 +            if [ "${CT_CC_GCC_mips_plt}" ]; then
    1.82 +                extra_config+=( --with-mips-plt )
    1.83 +            fi
    1.84 +            ;; # ARCH is mips
    1.85 +    esac
    1.86 +
    1.87      CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
    1.88  
    1.89      # --disable-nls to work around crash bug on ppc405, but also because