1.1 --- a/scripts/build/libc_uClibc.sh	Thu May 15 20:54:06 2008 +0000
     1.2 +++ b/scripts/build/libc_uClibc.sh	Thu May 15 20:55:46 2008 +0000
     1.3 @@ -201,12 +201,12 @@
     1.4      # way to select between hard/soft float has changed
     1.5      case "${CT_ARCH_FLOAT_HW},${CT_ARCH_FLOAT_SW}" in
     1.6          y,) cat >>"${munge_file}" <<-ENDSED
     1.7 -s/[^_]*(HAS_FPU).*/\\1=y/
     1.8 +s/^[^_]*(HAS_FPU).*/\\1=y/
     1.9  s/.*(UCLIBC_HAS_FPU).*/\\1=y/
    1.10  ENDSED
    1.11              ;;
    1.12          ,y) cat >>"${munge_file}" <<-ENDSED
    1.13 -s/[^_]*(HAS_FPU).*/\\# \\1 is not set/
    1.14 +s/^[^_]*(HAS_FPU).*/\\# \\1 is not set/
    1.15  s/.*(UCLIBC_HAS_FPU).*/# \\1 is not set/
    1.16  ENDSED
    1.17              ;;

     2.1 --- a/scripts/functions	Thu May 15 20:54:06 2008 +0000
     2.2 +++ b/scripts/functions	Thu May 15 20:55:46 2008 +0000
     2.3 @@ -517,8 +517,8 @@
     2.4      CT_KERNEL_ARCH="${CT_ARCH}"
     2.5  
     2.6      # Set the default values for ARCH, ABI, CPU, TUNE, FPU and FLOAT
     2.7 -    unset CT_ARCH_ARCH_CFLAG CT_ARCH_ABI_CFLAG CT_ARCH_CPU_CFLAG CT_ARCH_TUNE_CFLAG CT_ARCH_FPU_CFLAG
     2.8 -    unset CT_ARCH_WITH_ARCH CT_ARCH_WITH_ABI CT_ARCH_WITH_CPU CT_ARCH_WITH_TUNE CT_ARCH_WITH_FPU
     2.9 +    unset CT_ARCH_ARCH_CFLAG CT_ARCH_ABI_CFLAG CT_ARCH_CPU_CFLAG CT_ARCH_TUNE_CFLAG CT_ARCH_FPU_CFLAG CT_ARCH_FLOAT_CFLAG
    2.10 +    unset CT_ARCH_WITH_ARCH CT_ARCH_WITH_ABI CT_ARCH_WITH_CPU CT_ARCH_WITH_TUNE CT_ARCH_WITH_FPU CT_ARCH_WITH_FLOAT
    2.11      [ "${CT_ARCH_ARCH}"     ] && { CT_ARCH_ARCH_CFLAG="-march=${CT_ARCH_ARCH}";  CT_ARCH_WITH_ARCH="--with-arch=${CT_ARCH_ARCH}"; }
    2.12      [ "${CT_ARCH_ABI}"      ] && { CT_ARCH_ABI_CFLAG="-mabi=${CT_ARCH_ABI}";     CT_ARCH_WITH_ABI="--with-abi=${CT_ARCH_ABI}";    }
    2.13      [ "${CT_ARCH_CPU}"      ] && { CT_ARCH_CPU_CFLAG="-mcpu=${CT_ARCH_CPU}";     CT_ARCH_WITH_CPU="--with-cpu=${CT_ARCH_CPU}";    }