# HG changeset patch # User "Yann E. MORIN" # Date 1224766845 0 # Node ID 0535f7bf10695179d77a39cabf6b6ebb89aa9032 # Parent 46d434da8983b6a283bf7c0c76eeb01652a02d0b Architecture API change: - rename the tuple function /trunk/scripts/build/arch/mips.sh | 2 1 1 0 +- /trunk/scripts/build/arch/sh.sh | 2 1 1 0 +- /trunk/scripts/build/arch/x86_64.sh | 2 1 1 0 +- /trunk/scripts/build/arch/arm.sh | 2 1 1 0 +- /trunk/scripts/build/arch/powerpc.sh | 2 1 1 0 +- /trunk/scripts/build/arch/ia64.sh | 2 1 1 0 +- /trunk/scripts/build/arch/alpha.sh | 2 1 1 0 +- /trunk/scripts/build/arch/x86.sh | 2 1 1 0 +- /trunk/scripts/functions | 12 7 5 0 +++++++----- 9 files changed, 15 insertions(+), 13 deletions(-) diff -r 46d434da8983 -r 0535f7bf1069 scripts/build/arch/alpha.sh --- a/scripts/build/arch/alpha.sh Wed Oct 22 21:02:03 2008 +0000 +++ b/scripts/build/arch/alpha.sh Thu Oct 23 13:00:45 2008 +0000 @@ -1,6 +1,6 @@ # Compute Alpha-specific values -CT_DoArchValues () { +CT_DoArchTupleValues () { # The architecture part of the tuple: CT_TARGET_ARCH="${CT_ARCH}${CT_ARCH_ALPHA_VARIANT}" diff -r 46d434da8983 -r 0535f7bf1069 scripts/build/arch/arm.sh --- a/scripts/build/arch/arm.sh Wed Oct 22 21:02:03 2008 +0000 +++ b/scripts/build/arch/arm.sh Thu Oct 23 13:00:45 2008 +0000 @@ -1,6 +1,6 @@ # Compute ARM-specific values -CT_DoArchValues() { +CT_DoArchTupleValues() { # The architecture part of the tuple: CT_TARGET_ARCH="${CT_ARCH}${target_endian_eb}" diff -r 46d434da8983 -r 0535f7bf1069 scripts/build/arch/ia64.sh --- a/scripts/build/arch/ia64.sh Wed Oct 22 21:02:03 2008 +0000 +++ b/scripts/build/arch/ia64.sh Thu Oct 23 13:00:45 2008 +0000 @@ -1,6 +1,6 @@ # Compute IA-64-specific values -CT_DoArchValues() { +CT_DoArchTupleValues() { # The architecture part of the tuple: CT_TARGET_ARCH="${CT_ARCH}" } diff -r 46d434da8983 -r 0535f7bf1069 scripts/build/arch/mips.sh --- a/scripts/build/arch/mips.sh Wed Oct 22 21:02:03 2008 +0000 +++ b/scripts/build/arch/mips.sh Thu Oct 23 13:00:45 2008 +0000 @@ -1,6 +1,6 @@ # Compute IA-64-specific values -CT_DoArchValues() { +CT_DoArchTupleValues() { # The architecture part of the tuple: CT_TARGET_ARCH="${CT_ARCH}${target_endian_el}" diff -r 46d434da8983 -r 0535f7bf1069 scripts/build/arch/powerpc.sh --- a/scripts/build/arch/powerpc.sh Wed Oct 22 21:02:03 2008 +0000 +++ b/scripts/build/arch/powerpc.sh Thu Oct 23 13:00:45 2008 +0000 @@ -1,6 +1,6 @@ # Compute powerpc-specific values -CT_DoArchValues () { +CT_DoArchTupleValues () { # The architecture part of the tuple: CT_TARGET_ARCH="${CT_ARCH}" diff -r 46d434da8983 -r 0535f7bf1069 scripts/build/arch/sh.sh --- a/scripts/build/arch/sh.sh Wed Oct 22 21:02:03 2008 +0000 +++ b/scripts/build/arch/sh.sh Thu Oct 23 13:00:45 2008 +0000 @@ -1,6 +1,6 @@ # Compute sh-specific values -CT_DoArchValues () { +CT_DoArchTupleValues () { # The architecture part of the tuple: CT_TARGET_ARCH="${CT_ARCH_SH_VARIANT}${target_endian_eb}" diff -r 46d434da8983 -r 0535f7bf1069 scripts/build/arch/x86.sh --- a/scripts/build/arch/x86.sh Wed Oct 22 21:02:03 2008 +0000 +++ b/scripts/build/arch/x86.sh Thu Oct 23 13:00:45 2008 +0000 @@ -2,7 +2,7 @@ # This one really need a little love! :-( -CT_DoArchValues() { +CT_DoArchTupleValues() { # The architecture part of the tuple: arch="${CT_ARCH_ARCH}" [ -z "${arch}" ] && arch="${CT_ARCH_TUNE}" diff -r 46d434da8983 -r 0535f7bf1069 scripts/build/arch/x86_64.sh --- a/scripts/build/arch/x86_64.sh Wed Oct 22 21:02:03 2008 +0000 +++ b/scripts/build/arch/x86_64.sh Thu Oct 23 13:00:45 2008 +0000 @@ -1,6 +1,6 @@ # Compute x86_64-specific values -CT_DoArchValues() { +CT_DoArchTupleValues() { # The architecture part of the tuple: CT_TARGET_ARCH="${CT_ARCH}" } diff -r 46d434da8983 -r 0535f7bf1069 scripts/functions --- a/scripts/functions Wed Oct 22 21:02:03 2008 +0000 +++ b/scripts/functions Thu Oct 23 13:00:45 2008 +0000 @@ -695,14 +695,16 @@ [ "${CT_ARCH_FPU}" ] && { CT_ARCH_FPU_CFLAG="-mfpu=${CT_ARCH_FPU}"; CT_ARCH_WITH_FPU="--with-fpu=${CT_ARCH_FPU}"; } [ "${CT_ARCH_FLOAT_SW}" ] && { CT_ARCH_FLOAT_CFLAG="-msoft-float"; CT_ARCH_WITH_FLOAT="--with-float=soft"; } + # Build the kernel tuple part + case "${CT_KERNEL}" in + bare-metal) CT_TARGET_KERNEL=;; + linux) CT_TARGET_KERNEL=linux-;; + esac + # Call the architecture specific settings - CT_DoArchValues + CT_DoArchTupleValues # Finish the target tuple construction - case "${CT_KERNEL}" in - none) CT_TARGET_KERNEL=;; - linux) CT_TARGET_KERNEL=linux-;; - esac CT_TARGET=$(CT_DoConfigSub "${CT_TARGET_ARCH}-${CT_TARGET_VENDOR:-unknown}-${CT_TARGET_KERNEL}${CT_TARGET_SYS}") # Prepare the target CFLAGS