From 5cf859d9d9308e341c58caff45d54a910480ad24 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Mon, 10 Dec 2018 01:10:01 -0800
Subject: 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>
---
 scripts/build/arch/arc.sh    | 15 ++++++---------
 scripts/build/arch/avr.sh    |  7 -------
 scripts/build/arch/xtensa.sh | 11 ++++-------
 3 files changed, 10 insertions(+), 23 deletions(-)

(limited to 'scripts/build/arch')

diff --git a/scripts/build/arch/arc.sh b/scripts/build/arch/arc.sh
index 2b48e4ba..b13ef0eb 100644
--- a/scripts/build/arch/arc.sh
+++ b/scripts/build/arch/arc.sh
@@ -1,23 +1,20 @@
 # Compute ARC-specific values
 
-CT_DoArchTupleValues() {
+CT_DoArchTupleValues()
+{
     # The architecture part of the tuple:
     CT_TARGET_ARCH="${CT_ARCH}${CT_ARCH_SUFFIX:-${target_endian_eb}}"
-
-    # The system part of the tuple:
-    case "${CT_LIBC}" in
-        glibc)    CT_TARGET_SYS=gnu;;
-        uClibc)   CT_TARGET_SYS=uclibc;;
-    esac
 }
 
-CT_DoArchUClibcConfig() {
+CT_DoArchUClibcConfig()
+{
     local cfg="${1}"
 
     CT_DoArchUClibcSelectArch "${cfg}" "arc"
 }
 
-CT_DoArchUClibcCflags() {
+CT_DoArchUClibcCflags()
+{
     local cfg="${1}"
     local cflags="${2}"
     local f
diff --git a/scripts/build/arch/avr.sh b/scripts/build/arch/avr.sh
index fd8c8edd..501b020b 100644
--- a/scripts/build/arch/avr.sh
+++ b/scripts/build/arch/avr.sh
@@ -2,11 +2,4 @@
 
 CT_DoArchTupleValues() {
     CT_TARGET_ARCH="${CT_ARCH}"
-    case "${CT_LIBC}" in
-    avr-libc)
-        # avr-libc only seems to work with the non-canonical "avr" target.
-        CT_TARGET_SKIP_CONFIG_SUB=y
-        CT_TARGET_SYS= # CT_TARGET_SYS must be empty
-        ;;
-    esac
 }
diff --git a/scripts/build/arch/xtensa.sh b/scripts/build/arch/xtensa.sh
index 744bbb2d..d0ba6f58 100644
--- a/scripts/build/arch/xtensa.sh
+++ b/scripts/build/arch/xtensa.sh
@@ -1,18 +1,15 @@
 # Compute Xtensa-specific values
 
-CT_DoArchTupleValues() {
+CT_DoArchTupleValues()
+{
     # The architecture part of the tuple:
     CT_TARGET_ARCH="${CT_ARCH}${CT_ARCH_SUFFIX}"
     CT_ARCH_ENDIAN_CFLAG=""
     CT_ARCH_ENDIAN_LDFLAG=""
-    # The system part of the tuple:
-    case "${CT_LIBC}" in
-        *glibc)   CT_TARGET_SYS=gnu;;
-        uClibc)   CT_TARGET_SYS=uclibc;;
-    esac
 }
 
-CT_DoArchUClibcConfig() {
+CT_DoArchUClibcConfig()
+{
     local cfg="${1}"
 
     CT_DoArchUClibcSelectArch "${cfg}" "xtensa"
-- 
cgit v1.2.3