From b0d954f0ecdf84c112aeaa249d9ca223af12cf14 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Mon, 10 Dec 2018 01:11:18 -0800
Subject: Allow short "moxiebox" alias

... while making use of the new tunables.

Also, unmark the moxie-elf as broken: the ld scripts installed by newlib
can be found by the compiler and can link the binaries. Why the default
script is broken is not ct-ng's problem...

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

diff --git a/config/libc/moxiebox.in b/config/libc/moxiebox.in
index ca2107e..e036641 100644
--- a/config/libc/moxiebox.in
+++ b/config/libc/moxiebox.in
@@ -15,3 +15,13 @@
 ## select LIBELF_NEEDED
 ##
 ## help Secure execution runtime for Moxie architecture.
+
+config MOXIEBOX_SHORT_TUPLE
+    bool "Use 'moxiebox-' as target tuple"
+    select OMIT_TARGET_ARCH
+    select OMIT_TARGET_VENDOR
+    select TARGET_SKIP_CONFIG_SUB
+    help
+      Moxiebox refers to the tools configured for 'moxie-unknown-moxiebox-' by
+      a short, 'moxiebox-' prefix. Though non-canonical, it seems to be officially
+      endorsed.
diff --git a/samples/moxie-unknown-elf/broken b/samples/moxie-unknown-elf/broken
deleted file mode 100644
index e69de29..0000000
diff --git a/samples/moxie-unknown-moxiebox/crosstool.config b/samples/moxie-unknown-moxiebox/crosstool.config
deleted file mode 100644
index 58fe653..0000000
--- a/samples/moxie-unknown-moxiebox/crosstool.config
+++ /dev/null
@@ -1,7 +0,0 @@
-CT_EXPERIMENTAL=y
-CT_ARCH_MOXIE=y
-CT_ARCH_LE=y
-CT_DEBUG_GDB=y
-CT_GDB_CROSS_SIM=y
-# CT_GDB_CROSS_PYTHON is not set
-CT_DTC_VERBOSE=y
diff --git a/samples/moxie-unknown-moxiebox/reported.by b/samples/moxie-unknown-moxiebox/reported.by
deleted file mode 100644
index b9de4f7..0000000
--- a/samples/moxie-unknown-moxiebox/reported.by
+++ /dev/null
@@ -1,3 +0,0 @@
-reporter_name="Alexey Neyman"
-reporter_url=""
-reporter_comment="Moxie toolchain with moxiebox+newlib as the C library."
diff --git a/samples/moxiebox/crosstool.config b/samples/moxiebox/crosstool.config
new file mode 100644
index 0000000..58fe653
--- /dev/null
+++ b/samples/moxiebox/crosstool.config
@@ -0,0 +1,7 @@
+CT_EXPERIMENTAL=y
+CT_ARCH_MOXIE=y
+CT_ARCH_LE=y
+CT_DEBUG_GDB=y
+CT_GDB_CROSS_SIM=y
+# CT_GDB_CROSS_PYTHON is not set
+CT_DTC_VERBOSE=y
diff --git a/samples/moxiebox/reported.by b/samples/moxiebox/reported.by
new file mode 100644
index 0000000..b9de4f7
--- /dev/null
+++ b/samples/moxiebox/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Alexey Neyman"
+reporter_url=""
+reporter_comment="Moxie toolchain with moxiebox+newlib as the C library."
-- 
cgit v0.10.2-6-g49f6