From 7c720ae3941c7645fec0529ed3ba4701a9bfcbfe Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sun, 21 Jan 2018 19:45:13 -0800
Subject: Only decorate TARGET_ARCH if using specific CPU

Otherwise, binutils don't recognize it as a valid target - even though
GCC does.

Fixes #897.

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

diff --git a/scripts/build/arch/sh.sh b/scripts/build/arch/sh.sh
index 1911b20..8339b94 100644
--- a/scripts/build/arch/sh.sh
+++ b/scripts/build/arch/sh.sh
@@ -1,8 +1,12 @@
 # Compute sh-specific values
 
 CT_DoArchTupleValues () {
-    # The architecture part of the tuple:
-    CT_TARGET_ARCH="${CT_ARCH_SH_VARIANT}${CT_ARCH_SUFFIX:-${target_endian_eb}}"
+    # The architecture part of the tuple. Binutils do not accept specifications
+    # like 'sheb-unknown-elf' even though GCC does. So keep the tuple just sh-*-elf
+    # unless user wants something specific (either CPU or explicit suffix).
+    if [ "${CT_ARCH_SH_VARIANT}" != "sh" -o -n "${CT_ARCH_SUFFIX}" ]; then
+        CT_TARGET_ARCH="${CT_ARCH_SH_VARIANT}${CT_ARCH_SUFFIX:-${target_endian_eb}}"
+    fi
 
     # Endianness stuff (uses non-standard CFLAGS). If both are compiled, let the
     # compiler's default or multilib iterator be used.
-- 
cgit v0.10.2-6-g49f6