# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1262901930 -3600
# Node ID 6df0d71a7a55dc702b26aae3397b0344f9b9805c
# Parent  6a27ffede541daf8dfb4f156a77c21fde5e38175
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 -r 6a27ffede541 -r 6df0d71a7a55 config/toolchain.in
--- a/config/toolchain.in	Thu Jan 07 20:40:52 2010 +0100
+++ b/config/toolchain.in	Thu Jan 07 23:05:30 2010 +0100
@@ -42,7 +42,7 @@
       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 -r 6a27ffede541 -r 6df0d71a7a55 scripts/functions
--- a/scripts/functions	Thu Jan 07 20:40:52 2010 +0100
+++ b/scripts/functions	Thu Jan 07 23:05:30 2010 +0100
@@ -759,7 +759,10 @@
     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 @@
 
     # 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}"