diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-11-17 10:51:57 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-11-17 10:51:57 (GMT) |
| commit | 7ea82181db30cd437967e7bca1177f8cbd2f6fc5 (patch) | |
| tree | 889200e88bc94a06a7a826575897528e90863ea1 /scripts/build | |
| parent | 28b38f922241bd273f4f71823c037d4af43d96ba (diff) | |
arch/x86: commonalise the 32- and 64-bit x86 arch
Diffstat (limited to 'scripts/build')
| -rw-r--r-- | scripts/build/arch/x86.sh | 32 | ||||
| -rw-r--r-- | scripts/build/arch/x86_64.sh | 6 |
2 files changed, 16 insertions, 22 deletions
diff --git a/scripts/build/arch/x86.sh b/scripts/build/arch/x86.sh index 42a253a..dfdf96d 100644 --- a/scripts/build/arch/x86.sh +++ b/scripts/build/arch/x86.sh @@ -1,22 +1,22 @@ # Compute x86-specific values -# This one really need a little love! :-( +# This one really needs a little love! :-( CT_DoArchTupleValues() { - # The architecture part of the tuple: - arch="${CT_ARCH_ARCH}" - [ -z "${arch}" ] && arch="${CT_ARCH_TUNE}" - case "${arch}" in - nocona|athlon*64|k8|athlon-fx|opteron) - CT_DoError "Architecture is x86 (32-bit) but selected processor is \"${arch}\" (64-bit)";; - "") CT_TARGET_ARCH=i386;; - i386|i486|i586|i686) CT_TARGET_ARCH="${arch}";; - winchip*) CT_TARGET_ARCH=i486;; - pentium|pentium-mmx|c3*) CT_TARGET_ARCH=i586;; - pentiumpro|pentium*|athlon*) CT_TARGET_ARCH=i686;; - *) CT_TARGET_ARCH=i586;; - esac - # The kernel ARCH: - CT_KERNEL_ARCH=i386 + # Override the architecture part of the tuple: + if [ "${CT_ARCH_64}" = "y" ]; then + CT_TARGET_ARCH=x86_64 + else + arch="${CT_ARCH_ARCH}" + [ -z "${arch}" ] && arch="${CT_ARCH_TUNE}" + case "${arch}" in + "") CT_TARGET_ARCH=i386;; + i386|i486|i586|i686) CT_TARGET_ARCH="${arch}";; + winchip*) CT_TARGET_ARCH=i486;; + pentium|pentium-mmx|c3*) CT_TARGET_ARCH=i586;; + pentiumpro|pentium*|athlon*) CT_TARGET_ARCH=i686;; + *) CT_TARGET_ARCH=i586;; + esac + fi } diff --git a/scripts/build/arch/x86_64.sh b/scripts/build/arch/x86_64.sh deleted file mode 100644 index 1db0791..0000000 --- a/scripts/build/arch/x86_64.sh +++ /dev/null @@ -1,6 +0,0 @@ -# Compute x86_64-specific values - -CT_DoArchTupleValues() { - # The architecture part of the tuple: - CT_TARGET_ARCH="${CT_ARCH}" -} |