From a272b32bbaa71d0b4c70e289a562843d451e8791 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Thu, 7 Jan 2010 23:05:30 +0100
Subject: config: don't force the vendor part in the tuple

Note however that some configurations (eg. arm-elf) will still
have the vendor part 'unknown' forced in (by config.sub).

diff --git a/config/toolchain.in b/config/toolchain.in
index 4039d9d..c3d0351 100644
--- a/config/toolchain.in
+++ b/config/toolchain.in
@@ -42,7 +42,7 @@ config TARGET_VENDOR
       Use a single word, or use underscores "_" to separate words.
       Use neither dash nor space, as it breaks things.
       
-      Keep the default (unkown) if you don't know better.
+      Keep the default (unknown) if you don't know better.
 
 config TARGET_ALIAS_SED_EXPR
     string
diff --git a/scripts/functions b/scripts/functions
index c8fec30..c7b1047 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -759,7 +759,10 @@ CT_DoBuildTargetTuple() {
     CT_DoKernelTupleValues
 
     # Finish the target tuple construction
-    CT_TARGET="${CT_TARGET_ARCH}-${CT_TARGET_VENDOR:-unknown}-${CT_TARGET_KERNEL}${CT_TARGET_KERNEL:+-}${CT_TARGET_SYS}"
+    CT_TARGET="${CT_TARGET_ARCH}-"
+    CT_TARGET="${CT_TARGET}${CT_TARGET_VENDOR:+${CT_TARGET_VENDOR}-}"
+    CT_TARGET="${CT_TARGET}${CT_TARGET_KERNEL:+${CT_TARGET_KERNEL}-}"
+    CT_TARGET="${CT_TARGET}${CT_TARGET_SYS}"
 
     # Sanity checks
     __sed_alias=""
@@ -775,7 +778,6 @@ CT_DoBuildTargetTuple() {
 
     # Canonicalise it
     CT_TARGET=$(CT_DoConfigSub "${CT_TARGET}")
-
     # Prepare the target CFLAGS
     CT_ARCH_TARGET_CFLAGS="${CT_ARCH_TARGET_CFLAGS} ${CT_ARCH_ENDIAN_CFLAG}"
     CT_ARCH_TARGET_CFLAGS="${CT_ARCH_TARGET_CFLAGS} ${CT_ARCH_ARCH_CFLAG}"
-- 
cgit v0.10.2-6-g49f6