Add config flags for omitting 'arch' and 'vendor'

... parts of the config tuple. While here, remove parts that are
setting portions of the target tuple to a value that's already
the default.

Signed-off-by: Alexey Neyman <stilor@att.net>

3 files changed, 20 insertions, 1 deletions

diff --git a/config/libc/avr-libc.in b/config/libc/avr-libc.in
index ade4454..ac037b7 100644
--- a/config/libc/avr-libc.in
+++ b/config/libc/avr-libc.in
@@ -1,9 +1,13 @@
 # avr-libc options
 
+# Do not canonicalize the target tuple: avr-libc requires a non-canonical "avr" target.
+#
 ## depends on ARCH_AVR
 ## depends on BARE_METAL
 ##
 ## select LIBC_SUPPORT_THREADS_NONE
+## select OMIT_TARGET_VENDOR
+## select TARGET_SKIP_CONFIG_SUB
 ##
 ## help The AVR Libc package provides a subset of the standard C library for
 ## help Atmel AVR 8-bit RISC microcontrollers. In addition, the library
diff --git a/config/target.in b/config/target.in
index c0054f2..8549c5b 100644
--- a/config/target.in
+++ b/config/target.in
@@ -19,6 +19,21 @@ config ARCH_SUFFIX
       
       If you are not sure about what this is, leave it blank.
 
+config OMIT_TARGET_ARCH
+    bool
+    help
+      Do not include architecture into the target tuple.
+
+config OMIT_TARGET_VENDOR
+    bool "Omit vendor part of the target tuple"
+    help
+      Do not include vendor into the target tuple.
+
+config TARGET_SKIP_CONFIG_SUB
+    bool
+    help
+      Skip canonicalization of the target tuple.
+
 #--------------------------------------
 comment "Generic target options"
 
diff --git a/config/toolchain.in b/config/toolchain.in
index 0599592..36a4782 100644
--- a/config/toolchain.in
+++ b/config/toolchain.in
@@ -121,7 +121,7 @@ comment "Tuple completion and aliasing"
 config TARGET_VENDOR
     string
     prompt "Tuple's vendor string"
-    depends on !LIBC_AVR_LIBC
+    depends on !OMIT_TARGET_VENDOR
     default "unknown"
     help
       Vendor part of the target tuple.