Merge pull request #1114 from stilor/strip-vendor

Allow removing vendor part of the tuple

3 files changed, 10 insertions, 23 deletions

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"