1.1 --- a/scripts/build/arch/alpha.sh	Wed Oct 22 21:02:03 2008 +0000
     1.2 +++ b/scripts/build/arch/alpha.sh	Thu Oct 23 13:00:45 2008 +0000
     1.3 @@ -1,6 +1,6 @@
     1.4  # Compute Alpha-specific values
     1.5  
     1.6 -CT_DoArchValues () {
     1.7 +CT_DoArchTupleValues () {
     1.8      # The architecture part of the tuple:
     1.9      CT_TARGET_ARCH="${CT_ARCH}${CT_ARCH_ALPHA_VARIANT}"
    1.10  

     2.1 --- a/scripts/build/arch/arm.sh	Wed Oct 22 21:02:03 2008 +0000
     2.2 +++ b/scripts/build/arch/arm.sh	Thu Oct 23 13:00:45 2008 +0000
     2.3 @@ -1,6 +1,6 @@
     2.4  # Compute ARM-specific values
     2.5  
     2.6 -CT_DoArchValues() {
     2.7 +CT_DoArchTupleValues() {
     2.8      # The architecture part of the tuple:
     2.9      CT_TARGET_ARCH="${CT_ARCH}${target_endian_eb}"
    2.10  

     3.1 --- a/scripts/build/arch/ia64.sh	Wed Oct 22 21:02:03 2008 +0000
     3.2 +++ b/scripts/build/arch/ia64.sh	Thu Oct 23 13:00:45 2008 +0000
     3.3 @@ -1,6 +1,6 @@
     3.4  # Compute IA-64-specific values
     3.5  
     3.6 -CT_DoArchValues() {
     3.7 +CT_DoArchTupleValues() {
     3.8      # The architecture part of the tuple:
     3.9      CT_TARGET_ARCH="${CT_ARCH}"
    3.10  }

     4.1 --- a/scripts/build/arch/mips.sh	Wed Oct 22 21:02:03 2008 +0000
     4.2 +++ b/scripts/build/arch/mips.sh	Thu Oct 23 13:00:45 2008 +0000
     4.3 @@ -1,6 +1,6 @@
     4.4  # Compute IA-64-specific values
     4.5  
     4.6 -CT_DoArchValues() {
     4.7 +CT_DoArchTupleValues() {
     4.8      # The architecture part of the tuple:
     4.9      CT_TARGET_ARCH="${CT_ARCH}${target_endian_el}"
    4.10  

     5.1 --- a/scripts/build/arch/powerpc.sh	Wed Oct 22 21:02:03 2008 +0000
     5.2 +++ b/scripts/build/arch/powerpc.sh	Thu Oct 23 13:00:45 2008 +0000
     5.3 @@ -1,6 +1,6 @@
     5.4  # Compute powerpc-specific values
     5.5  
     5.6 -CT_DoArchValues () {
     5.7 +CT_DoArchTupleValues () {
     5.8      # The architecture part of the tuple:
     5.9      CT_TARGET_ARCH="${CT_ARCH}"
    5.10  

     6.1 --- a/scripts/build/arch/sh.sh	Wed Oct 22 21:02:03 2008 +0000
     6.2 +++ b/scripts/build/arch/sh.sh	Thu Oct 23 13:00:45 2008 +0000
     6.3 @@ -1,6 +1,6 @@
     6.4  # Compute sh-specific values
     6.5  
     6.6 -CT_DoArchValues () {
     6.7 +CT_DoArchTupleValues () {
     6.8      # The architecture part of the tuple:
     6.9      CT_TARGET_ARCH="${CT_ARCH_SH_VARIANT}${target_endian_eb}"
    6.10  

     7.1 --- a/scripts/build/arch/x86.sh	Wed Oct 22 21:02:03 2008 +0000
     7.2 +++ b/scripts/build/arch/x86.sh	Thu Oct 23 13:00:45 2008 +0000
     7.3 @@ -2,7 +2,7 @@
     7.4  
     7.5  # This one really need a little love! :-(
     7.6  
     7.7 -CT_DoArchValues() {
     7.8 +CT_DoArchTupleValues() {
     7.9      # The architecture part of the tuple:
    7.10      arch="${CT_ARCH_ARCH}"
    7.11      [ -z "${arch}" ] && arch="${CT_ARCH_TUNE}"

     8.1 --- a/scripts/build/arch/x86_64.sh	Wed Oct 22 21:02:03 2008 +0000
     8.2 +++ b/scripts/build/arch/x86_64.sh	Thu Oct 23 13:00:45 2008 +0000
     8.3 @@ -1,6 +1,6 @@
     8.4  # Compute x86_64-specific values
     8.5  
     8.6 -CT_DoArchValues() {
     8.7 +CT_DoArchTupleValues() {
     8.8      # The architecture part of the tuple:
     8.9      CT_TARGET_ARCH="${CT_ARCH}"
    8.10  }

     9.1 --- a/scripts/functions	Wed Oct 22 21:02:03 2008 +0000
     9.2 +++ b/scripts/functions	Thu Oct 23 13:00:45 2008 +0000
     9.3 @@ -695,14 +695,16 @@
     9.4      [ "${CT_ARCH_FPU}"      ] && { CT_ARCH_FPU_CFLAG="-mfpu=${CT_ARCH_FPU}";     CT_ARCH_WITH_FPU="--with-fpu=${CT_ARCH_FPU}";    }
     9.5      [ "${CT_ARCH_FLOAT_SW}" ] && { CT_ARCH_FLOAT_CFLAG="-msoft-float";           CT_ARCH_WITH_FLOAT="--with-float=soft";          }
     9.6  
     9.7 +    # Build the kernel tuple part
     9.8 +    case "${CT_KERNEL}" in
     9.9 +        bare-metal) CT_TARGET_KERNEL=;;
    9.10 +        linux)      CT_TARGET_KERNEL=linux-;;
    9.11 +    esac
    9.12 +
    9.13      # Call the architecture specific settings
    9.14 -    CT_DoArchValues
    9.15 +    CT_DoArchTupleValues
    9.16  
    9.17      # Finish the target tuple construction
    9.18 -    case "${CT_KERNEL}" in
    9.19 -        none)   CT_TARGET_KERNEL=;;
    9.20 -        linux)  CT_TARGET_KERNEL=linux-;;
    9.21 -    esac
    9.22      CT_TARGET=$(CT_DoConfigSub "${CT_TARGET_ARCH}-${CT_TARGET_VENDOR:-unknown}-${CT_TARGET_KERNEL}${CT_TARGET_SYS}")
    9.23  
    9.24      # Prepare the target CFLAGS