1.1 --- a/scripts/functions Thu Oct 23 13:00:45 2008 +0000
1.2 +++ b/scripts/functions Mon Oct 27 18:39:24 2008 +0000
1.3 @@ -674,6 +674,9 @@
1.4 ;;
1.5 esac
1.6
1.7 + # Build the default architecture tuple part
1.8 + CT_TARGET_ARCH="${CT_ARCH}"
1.9 +
1.10 # Set defaults for the system part of the tuple. Can be overriden
1.11 # by architecture-specific values.
1.12 case "${CT_LIBC}" in
1.13 @@ -695,17 +698,15 @@
1.14 [ "${CT_ARCH_FPU}" ] && { CT_ARCH_FPU_CFLAG="-mfpu=${CT_ARCH_FPU}"; CT_ARCH_WITH_FPU="--with-fpu=${CT_ARCH_FPU}"; }
1.15 [ "${CT_ARCH_FLOAT_SW}" ] && { CT_ARCH_FLOAT_CFLAG="-msoft-float"; CT_ARCH_WITH_FLOAT="--with-float=soft"; }
1.16
1.17 - # Build the kernel tuple part
1.18 - case "${CT_KERNEL}" in
1.19 - bare-metal) CT_TARGET_KERNEL=;;
1.20 - linux) CT_TARGET_KERNEL=linux-;;
1.21 - esac
1.22 + # Build the default kernel tuple part
1.23 + CT_TARGET_KERNEL="${CT_KERNEL}"
1.24
1.25 - # Call the architecture specific settings
1.26 + # Overide the default values with the components specific settings
1.27 CT_DoArchTupleValues
1.28 + CT_DoKernelTupleValues
1.29
1.30 # Finish the target tuple construction
1.31 - CT_TARGET=$(CT_DoConfigSub "${CT_TARGET_ARCH}-${CT_TARGET_VENDOR:-unknown}-${CT_TARGET_KERNEL}${CT_TARGET_SYS}")
1.32 + CT_TARGET=$(CT_DoConfigSub "${CT_TARGET_ARCH}-${CT_TARGET_VENDOR:-unknown}-${CT_TARGET_KERNEL}${CT_TARGET_KERNEL:+-}${CT_TARGET_SYS}")
1.33
1.34 # Prepare the target CFLAGS
1.35 CT_ARCH_TARGET_CFLAGS="${CT_ARCH_TARGET_CFLAGS} ${CT_ARCH_ENDIAN_CFLAG}"