From 3ebc5d0c1e72e95f05a02818a3e2c642663d4b74 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sat, 2 Apr 2016 00:12:41 -0700
Subject: libc/*.sh: Deprecate libc_check_config step.

This step was only used in uClibc. However, with upcoming multilib, the
config management will have to be done for each variant differently,
anyway.

uClibc was the only user of libc_check_config step, as well as
CT_CONFIG_DIR directory. Retire these.

Two other clean-ups in uClibc.sh:
- KERNEL_HEADERS check seems to be bogus, this config option is not
  present even in 0.9.30 - which is not supported already.
- SHARED_LIB_LOADER_PREFIX was renamed to MULTILIB_DIR in 0.9.31,
  according to ChangeLog - and MULTILIB_DIR is passed from command line
  instead.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 scripts/build/arch/sparc.sh | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'scripts/build/arch/sparc.sh')

diff --git a/scripts/build/arch/sparc.sh b/scripts/build/arch/sparc.sh
index 2d3baa35..189cebe2 100644
--- a/scripts/build/arch/sparc.sh
+++ b/scripts/build/arch/sparc.sh
@@ -25,5 +25,39 @@ CT_DoArchMultilibTarget ()
     local target="${1}"; shift
     local -a multi_flags=( "$@" )
 
+    local m32=false
+    local m64=false
+
+    for m in "${multi_flags[@]}"; do
+        case "$m" in
+            -m32)     m32=true ;;
+            -m64)     m64=true ;;
+        esac
+    done
+
+    # Fix up bitness
+    case "${target}" in
+        sparc-*)      $m64 && target=${target/#sparc-/sparc64-} ;;
+        sparc64-*)    $m32 && target=${target/#sparc64-/sparc-} ;;
+    esac
+
+    echo "${target}"
+}
+
+# Special tuple adjustment for glibc.
+CT_DoArchGlibcAdjustTuple() {
+    local target="${1}"
+
+    case "${target}" in
+        # SPARC quirk: glibc 2.23 and newer dropped support for SPARCv8 and
+        # earlier (corresponding pthread barrier code is missing). Until this
+        # support is reintroduced, configure as sparcv9.
+        sparc-*)
+            if [ "${CT_LIBC_GLIBC_2_23_or_later}" = y ]; then
+                target=${target/#sparc-/sparcv9-}
+            fi
+            ;;
+    esac
+
     echo "${target}"
 }
-- 
cgit v1.2.3


From 0fdc1887a7426bf7974f0ca6bb24815dff4a2997 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sun, 3 Apr 2016 10:26:24 -0700
Subject: Change multilib functions to set the variable.

Rather than echo-ing the new value, set the value into the variable with
the name passed as an argument (similar to CT_SanitizeVarDir). This
allows to use CT_DoLog in these functions.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 scripts/build/arch.sh         | 11 ++++-------
 scripts/build/arch/powerpc.sh | 31 +++++++++++++++++--------------
 scripts/build/arch/s390.sh    | 16 ++++++++++------
 scripts/build/arch/sparc.sh   | 29 +++++++++++++++++++----------
 scripts/build/arch/x86.sh     | 38 +++++++++++++++++++++++---------------
 scripts/build/libc/glibc.sh   |  5 +++--
 scripts/functions             |  6 +++---
 7 files changed, 79 insertions(+), 57 deletions(-)

(limited to 'scripts/build/arch/sparc.sh')

diff --git a/scripts/build/arch.sh b/scripts/build/arch.sh
index 48da2d6d..2199a17f 100644
--- a/scripts/build/arch.sh
+++ b/scripts/build/arch.sh
@@ -6,18 +6,15 @@ CT_DoArchTupleValues() {
 }
 
 # Multilib: change the target triplet according to CFLAGS
+# Usage: CT_DoArchGlibcAdjustTuple <variable-name> <CFLAGS>
 CT_DoArchMultilibTarget() {
-    local multi_flags="${1}"
-    local target="${2}"
-
-    echo "${target}"
+    :;
 }
 
 # Multilib: Adjust target tuple for GLIBC
+# Usage: CT_DoArchGlibcAdjustTuple <variable-name>
 CT_DoArchGlibcAdjustTuple() {
-    local target="${1}"
-
-    echo "${target}"
+    :;
 }
 
 # Override from the actual arch implementation as needed.
diff --git a/scripts/build/arch/powerpc.sh b/scripts/build/arch/powerpc.sh
index 964dd25e..80157241 100644
--- a/scripts/build/arch/powerpc.sh
+++ b/scripts/build/arch/powerpc.sh
@@ -29,11 +29,12 @@ CT_DoArchTupleValues () {
 
 #------------------------------------------------------------------------------
 # Get multilib architecture-specific target
-# Usage: CT_DoArchMultilibTarget "multilib flags" "target tuple"
+# Usage: CT_DoArchMultilibTarget "target variable" "multilib flags"
 CT_DoArchMultilibTarget ()
 {
-    local target="${1}"; shift
+    local target_var="${1}"; shift
     local -a multi_flags=( "$@" )
+    local target_
 
     local m32=false
     local m64=false
@@ -49,22 +50,24 @@ CT_DoArchMultilibTarget ()
         esac
     done
 
+    eval target_=\"\${${target_var}}\"
+
     # Fix up bitness
-    case "${target}" in
-        powerpc-*)      $m64 && target=${target/#powerpc-/powerpc64-} ;;
-        powerpcle-*)    $m64 && target=${target/#powerpcle-/powerpc64le-} ;;
-        powerpc64-*)    $m32 && target=${target/#powerpc64-/powerpc-} ;;
-        powerpc64le-*)  $m32 && target=${target/#powerpc64le-/powerpcle-} ;;
+    case "${target_}" in
+        powerpc-*)      $m64 && target_=${target_/#powerpc-/powerpc64-} ;;
+        powerpcle-*)    $m64 && target_=${target_/#powerpcle-/powerpc64le-} ;;
+        powerpc64-*)    $m32 && target_=${target_/#powerpc64-/powerpc-} ;;
+        powerpc64le-*)  $m32 && target_=${target_/#powerpc64le-/powerpcle-} ;;
     esac
 
     # Fix up endianness
-    case "${target}" in
-        powerpc-*)      $mlittle && target=${target/#powerpc-/powerpcle-} ;;
-        powerpcle-*)    $mbig && target=${target/#powerpcle-/powerpc-} ;;
-        powerpc64-*)    $mlittle && target=${target/#powerpc64-/powerpc64le-} ;;
-        powerpc64le-*)  $mbig && target=${target/#powerpc64le-/powerpc64-} ;;
+    case "${target_}" in
+        powerpc-*)      $mlittle && target_=${target_/#powerpc-/powerpcle-} ;;
+        powerpcle-*)    $mbig && target_=${target_/#powerpcle-/powerpc-} ;;
+        powerpc64-*)    $mlittle && target_=${target_/#powerpc64-/powerpc64le-} ;;
+        powerpc64le-*)  $mbig && target_=${target_/#powerpc64le-/powerpc64-} ;;
     esac
 
-    # return the target
-    echo "${target}"
+    # Set the target variable
+    eval ${target_var}=\"${target_}\"
 }
diff --git a/scripts/build/arch/s390.sh b/scripts/build/arch/s390.sh
index e303420a..dff86a0c 100644
--- a/scripts/build/arch/s390.sh
+++ b/scripts/build/arch/s390.sh
@@ -9,11 +9,12 @@ CT_DoArchTupleValues() {
 
 #------------------------------------------------------------------------------
 # Get multilib architecture-specific target
-# Usage: CT_DoArchMultilibTarget "multilib flags" "target tuple"
+# Usage: CT_DoArchMultilibTarget "target variable" "multilib flags"
 CT_DoArchMultilibTarget ()
 {
-    local target="${1}"; shift
+    local target_var="${1}"; shift
     local -a multi_flags=( "$@" )
+    local target_
 
     local m31=false
     local m64=false
@@ -25,11 +26,14 @@ CT_DoArchMultilibTarget ()
         esac
     done
 
+    eval target_=\"\${${target_var}}\"
+
     # Fix bitness
-    case "${target}" in
-        s390-*)   $m64 && target=${target/#s390-/s390x-} ;;
-        s390x-*)  $m31 && target=${target/#s390x-/s390-} ;;
+    case "${target_}" in
+        s390-*)   $m64 && target_=${target_/#s390-/s390x-} ;;
+        s390x-*)  $m31 && target_=${target_/#s390x-/s390-} ;;
     esac
 
-    echo "${target}"
+    # Set the target variable
+    eval ${target_var}=\"${target_}\"
 }
diff --git a/scripts/build/arch/sparc.sh b/scripts/build/arch/sparc.sh
index 189cebe2..15213a6a 100644
--- a/scripts/build/arch/sparc.sh
+++ b/scripts/build/arch/sparc.sh
@@ -19,11 +19,12 @@ CT_DoArchTupleValues() {
 
 #------------------------------------------------------------------------------
 # Get multilib architecture-specific target
-# Usage: CT_DoArchMultilibTarget "multilib flags" "target tuple"
+# Usage: CT_DoArchMultilibTarget "target variable" "multilib flags"
 CT_DoArchMultilibTarget ()
 {
-    local target="${1}"; shift
+    local target_var="${1}"; shift
     local -a multi_flags=( "$@" )
+    local target_
 
     local m32=false
     local m64=false
@@ -35,29 +36,37 @@ CT_DoArchMultilibTarget ()
         esac
     done
 
+    eval target_=\"\${${target_var}}\"
+
     # Fix up bitness
-    case "${target}" in
-        sparc-*)      $m64 && target=${target/#sparc-/sparc64-} ;;
-        sparc64-*)    $m32 && target=${target/#sparc64-/sparc-} ;;
+    case "${target_}" in
+        sparc-*)      $m64 && target_=${target_/#sparc-/sparc64-} ;;
+        sparc64-*)    $m32 && target_=${target_/#sparc64-/sparc-} ;;
     esac
 
-    echo "${target}"
+    # Set the target variable
+    eval ${target_var}=\"${target_}\"
 }
 
 # Special tuple adjustment for glibc.
 CT_DoArchGlibcAdjustTuple() {
-    local target="${1}"
+    local target_var="${1}"
+    local target_
+
+    eval target_=\"\${${target_var}}\"
 
-    case "${target}" in
+    case "${target_}" in
         # SPARC quirk: glibc 2.23 and newer dropped support for SPARCv8 and
         # earlier (corresponding pthread barrier code is missing). Until this
         # support is reintroduced, configure as sparcv9.
         sparc-*)
             if [ "${CT_LIBC_GLIBC_2_23_or_later}" = y ]; then
-                target=${target/#sparc-/sparcv9-}
+                CT_DoLog WARN "GLIBC 2.23 only supports SPARCv9"
+                target_=${target_/#sparc-/sparcv9-}
             fi
             ;;
     esac
 
-    echo "${target}"
+    # Set the target variable
+    eval ${target_var}=\"${target_}\"
 }
diff --git a/scripts/build/arch/x86.sh b/scripts/build/arch/x86.sh
index 0e41d67f..51476786 100644
--- a/scripts/build/arch/x86.sh
+++ b/scripts/build/arch/x86.sh
@@ -35,11 +35,12 @@ CT_DoArchTupleValues() {
 
 #------------------------------------------------------------------------------
 # Get multilib architecture-specific target
-# Usage: CT_DoArchMultilibTarget "multilib flags" "target tuple"
+# Usage: CT_DoArchMultilibTarget "target variable" "multilib flags"
 CT_DoArchMultilibTarget ()
 {
-    local target="${1}"; shift
+    local target_var="${1}"; shift
     local -a multi_flags=( "$@" )
+    local target_
 
     local bit32=false
     local bit64=false
@@ -54,26 +55,32 @@ CT_DoArchMultilibTarget ()
         esac
     done
 
+    eval target_=\"\${${target_var}}\"
+
     # Fix up architecture.
-    case "${target}" in
-        x86_64-*)      $bit32 && target=${target/#x86_64-/i386-} ;;
-        i[34567]86-*)  $bit64 && target=${target/#i[34567]86-/x86_64-} ;;
+    case "${target_}" in
+        x86_64-*)      $bit32 && target_=${target_/#x86_64-/i386-} ;;
+        i[34567]86-*)  $bit64 && target_=${target_/#i[34567]86-/x86_64-} ;;
     esac
 
     # Fix up the ABI part.
-    case "${target}" in
-        *x32) $abi_dflt && target=${target/%x32} ;;
-        *)    $abi_x32  && target=${target}x32 ;;
+    case "${target_}" in
+        *x32) $abi_dflt && target_=${target_/%x32} ;;
+        *)    $abi_x32  && target_=${target_}x32 ;;
     esac
 
-    echo "${target}"
+    # Set the target variable
+    eval ${target_var}=\"${target_}\"
 }
 
 # Adjust target tuple for GLIBC
 CT_DoArchGlibcAdjustTuple() {
-    local target="${1}"
+    local target_var="${1}"
+    local target_
+
+    eval target_=\"\${${target_var}}\"
 
-    case "${target}" in
+    case "${target_}" in
         # x86 quirk: architecture name is i386, but glibc expects i[4567]86 - to
         # indicate the desired optimization. If it was a multilib variant of x86_64,
         # then it targets at least NetBurst a.k.a. i786, but we'll follow the model
@@ -81,14 +88,15 @@ CT_DoArchGlibcAdjustTuple() {
         # conservative choice, i486.
         i386-*)
             if [ "${CT_TARGET_ARCH}" = "x86_64" ]; then
-                target=${target/#i386-/i686-}
+                target_=${target_/#i386-/i686-}
             elif [ "${CT_TARGET_ARCH}" != "i386" ]; then
-                target=${target/#i386-/${CT_TARGET_ARCH}-}
+                target_=${target_/#i386-/${CT_TARGET_ARCH}-}
             else
-                target=${target/#i386-/i486-}
+                target_=${target_/#i386-/i486-}
             fi
             ;;
     esac
 
-    echo "${target}"
+    # Set the target variable
+    eval ${target_var}=\"${target_}\"
 }
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index a08ed973..dc9443c0 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -120,8 +120,9 @@ do_libc_backend() {
         multi_root=$( "${CT_TARGET}-gcc" -print-sysroot ${multi_flags} )
 
         # Adjust target tuple according to CFLAGS + any GLIBC quirks
-        target=$( CT_DoMultilibTarget "${CT_TARGET}" ${extra_flags} )
-        target=$( CT_DoArchGlibcAdjustTuple "${target}" )
+        target="${CT_TARGET}"
+        CT_DoMultilibTarget target ${extra_flags}
+        CT_DoArchGlibcAdjustTuple target
         CT_DoStep INFO "Building for multilib '${multi_flags}'"
 
         # Ensure sysroot (with suffix, if applicable) exists
diff --git a/scripts/functions b/scripts/functions
index 49b06869..ef75e09e 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -1371,18 +1371,18 @@ CT_DoBuildTargetTuple() {
 # GCC prints nothing and exits with status 0), falling back to calling
 # the architecture-specific functions.
 CT_DoMultilibTarget() {
-    local target="$1"; shift
+    local target_var="$1"; shift
     local -a multi_flags=( "$@" )
     local gcc_multiarch
 
     gcc_multiarch=$( "${CT_TARGET}-gcc" -print-multiarch "${multi_flags[@]}" )
     if [ -n "${gcc_multiarch}" ]; then
-        echo "${gcc_multiarch}"
+        eval "${target_var}=${gcc_multiarch}"
         return
     fi
 
     # Fall back to arch-specific guesswork
-    CT_DoArchMultilibTarget "${target}" "${multi_flags[@]}"
+    CT_DoArchMultilibTarget "${target_var}" "${multi_flags[@]}"
 }
 
 # This function does pause the build until the user strikes "Return"
-- 
cgit v1.2.3


From bf3eceb5d9b27fc65c819abe0b7f3cec704917e7 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Mon, 4 Apr 2016 08:25:07 -0700
Subject: uClibc: Split configuration tweaker into per-arch functions.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 scripts/build/arch.sh            |  18 ++++++
 scripts/build/arch/arm.sh        |  19 ++++++
 scripts/build/arch/m68k.sh       |   6 ++
 scripts/build/arch/microblaze.sh |   6 ++
 scripts/build/arch/mips.sh       |  33 ++++++++++
 scripts/build/arch/powerpc.sh    |  17 +++++
 scripts/build/arch/sh.sh         |  15 +++++
 scripts/build/arch/sparc.sh      |   7 +++
 scripts/build/arch/x86.sh        |  30 +++++++++
 scripts/build/arch/xtensa.sh     |   6 ++
 scripts/build/libc/uClibc.sh     | 130 +++++----------------------------------
 11 files changed, 174 insertions(+), 113 deletions(-)

(limited to 'scripts/build/arch/sparc.sh')

diff --git a/scripts/build/arch.sh b/scripts/build/arch.sh
index 2199a17f..6414b54a 100644
--- a/scripts/build/arch.sh
+++ b/scripts/build/arch.sh
@@ -17,5 +17,23 @@ CT_DoArchGlibcAdjustTuple() {
     :;
 }
 
+# Helper for uClibc configurators: select the architecture
+# Usage: CT_DoArchUClibcSelectArch <config-file> <architecture>
+CT_DoArchUClibcSelectArch() {
+    local cfg="${1}"
+    local arch="${2}"
+
+    ${sed} -i -r -e '/^TARGET_.*/d' "${cfg}"
+    CT_KconfigEnableOption "TARGET_${arch}" "${cfg}"
+    CT_KconfigSetOption "TARGET_ARCH" "${arch}" "${cfg}"
+}
+
+# uClibc: Adjust configuration file according to the CT-NG configuration
+# Usage CT_DoArchUClibcConfig <config-file>
+CT_DoArchUClibcConfig() {
+    CT_DoLog WARN "Support for '${CT_ARCH}' is not implemented in uClibc config tweaker."
+    CT_DoLog WARN "Exact configuration file must be provided."
+}
+
 # Override from the actual arch implementation as needed.
 . "${CT_LIB_DIR}/scripts/build/arch/${CT_ARCH}.sh"
diff --git a/scripts/build/arch/arm.sh b/scripts/build/arch/arm.sh
index 5f6ce2fc..8af00722 100644
--- a/scripts/build/arch/arm.sh
+++ b/scripts/build/arch/arm.sh
@@ -39,3 +39,22 @@ CT_DoArchTupleValues() {
         CT_TARGET_SYS="${CT_TARGET_SYS}hf"
     fi
 }
+
+CT_DoArchUClibcConfig() {
+    local cfg="${1}"
+
+    CT_DoArchUClibcSelectArch "${cfg}" "arm"
+
+    # FIXME: CONFIG_ARM_OABI does not exist in neither uClibc/uClibc-ng
+    # FIXME: CONFIG_ARM_EABI does not seem to affect anything in either of them, too
+    # (both check the compiler's built-in define, __ARM_EABI__ instead) except for
+    # a check for match between toolchain configuration and uClibc-ng in
+    # uClibc_arch_features.h
+    if [ "${CT_ARCH_ARM_EABI}" = "y" ]; then
+        CT_KconfigDisableOption "CONFIG_ARM_OABI" "${cfg}"
+        CT_KconfigEnableOption "CONFIG_ARM_EABI" "${cfg}"
+    else
+        CT_KconfigDisableOption "CONFIG_ARM_EABI" "${cfg}"
+        CT_KconfigEnableOption "CONFIG_ARM_OABI" "${cfg}"
+    fi
+}
diff --git a/scripts/build/arch/m68k.sh b/scripts/build/arch/m68k.sh
index 052e4a7c..3cba76c6 100644
--- a/scripts/build/arch/m68k.sh
+++ b/scripts/build/arch/m68k.sh
@@ -1 +1,7 @@
 # Compute M68k-specific values
+
+CT_DoArchUClibcConfig() {
+    local cfg="${1}"
+
+    CT_DoArchUClibcSelectArch "${cfg}" "m68k"
+}
diff --git a/scripts/build/arch/microblaze.sh b/scripts/build/arch/microblaze.sh
index 456a6e3a..e9d98114 100644
--- a/scripts/build/arch/microblaze.sh
+++ b/scripts/build/arch/microblaze.sh
@@ -19,3 +19,9 @@ CT_DoArchTupleValues () {
     esac
 
 }
+
+CT_DoArchUClibcConfig() {
+    local cfg="${1}"
+
+    CT_DoArchUClibcSelectArch "${cfg}" "microblaze"
+}
diff --git a/scripts/build/arch/mips.sh b/scripts/build/arch/mips.sh
index 4d732be9..030e77b6 100644
--- a/scripts/build/arch/mips.sh
+++ b/scripts/build/arch/mips.sh
@@ -14,3 +14,36 @@ CT_DoArchTupleValues() {
     CT_ARCH_ABI_CFLAG="-mabi=${CT_ARCH_mips_ABI}"
     CT_ARCH_WITH_ABI="--with-abi=${CT_ARCH_mips_ABI}"
 }
+
+CT_DoArchUClibcConfig() {
+    local cfg="${1}"
+
+    CT_DoArchUClibcSelectArch "${cfg}" "${CT_ARCH}"
+
+    CT_KconfigDisableOption "CONFIG_MIPS_O32_ABI" "${cfg}"
+    CT_KconfigDisableOption "CONFIG_MIPS_N32_ABI" "${cfg}"
+    CT_KconfigDisableOption "CONFIG_MIPS_N64_ABI" "${cfg}"
+    case "${CT_ARCH_mips_ABI}" in
+        32)
+            CT_KconfigEnableOption "CONFIG_MIPS_O32_ABI" "${cfg}"
+            ;;
+        n32)
+            CT_KconfigEnableOption "CONFIG_MIPS_N32_ABI" "${cfg}"
+            ;;
+        64)
+            CT_KconfigEnableOption "CONFIG_MIPS_N64_ABI" "${cfg}"
+            ;;
+    esac
+
+    # FIXME: uClibc (!ng) allows to select ISA in the config; should
+    # match from the selected ARCH_ARCH level... For now, delete and
+    # fall back to default.
+    CT_KconfigDeleteOption "CONFIG_MIPS_ISA_1" "${cfg}"
+    CT_KconfigDeleteOption "CONFIG_MIPS_ISA_2" "${cfg}"
+    CT_KconfigDeleteOption "CONFIG_MIPS_ISA_3" "${cfg}"
+    CT_KconfigDeleteOption "CONFIG_MIPS_ISA_4" "${cfg}"
+    CT_KconfigDeleteOption "CONFIG_MIPS_ISA_MIPS32" "${cfg}"
+    CT_KconfigDeleteOption "CONFIG_MIPS_ISA_MIPS32R2" "${cfg}"
+    CT_KconfigDeleteOption "CONFIG_MIPS_ISA_MIPS64" "${cfg}"
+    CT_KconfigDeleteOption "CONFIG_MIPS_ISA_MIPS64R2" "${cfg}"
+}
diff --git a/scripts/build/arch/powerpc.sh b/scripts/build/arch/powerpc.sh
index 80157241..52f3f8bb 100644
--- a/scripts/build/arch/powerpc.sh
+++ b/scripts/build/arch/powerpc.sh
@@ -71,3 +71,20 @@ CT_DoArchMultilibTarget ()
     # Set the target variable
     eval ${target_var}=\"${target_}\"
 }
+
+CT_DoArchUClibcConfig() {
+    local cfg="${1}"
+
+    CT_DoArchUClibcSelectArch "${cfg}" "powerpc"
+
+    CT_KconfigDisableOption "CONFIG_E500" "${cfg}"
+    CT_KconfigDisableOption "CONFIG_CLASSIC" "${cfg}"
+    CT_KconfigDeleteOption "TARGET_SUBARCH" "${cfg}"
+    if [ "${CT_ARCH_powerpc_ABI}" = "spe" ]; then
+        CT_KconfigEnableOption "CONFIG_E500" "${cfg}"
+        CT_KconfigSetOption "TARGET_SUBARCH" "e500" "${cfg}"
+    else
+        CT_KconfigEnableOption "CONFIG_CLASSIC" "${cfg}"
+        CT_KconfigSetOption "TARGET_SUBARCH" "classic" "${cfg}"
+    fi
+}
diff --git a/scripts/build/arch/sh.sh b/scripts/build/arch/sh.sh
index 7780e40f..101e4ce8 100644
--- a/scripts/build/arch/sh.sh
+++ b/scripts/build/arch/sh.sh
@@ -35,3 +35,18 @@ CT_DoArchTupleValues () {
     esac
     CT_ARCH_FLOAT_CFLAG=
 }
+
+CT_DoArchUClibcConfig() {
+    local cfg="${1}"
+
+    # FIXME: uclibc (!ng) seems to support sh64 (sh5), too
+    CT_DoArchUClibcSelectArch "${cfg}" "sh"
+    CT_KconfigDisableOption "CONFIG_SH3" "${cfg}"
+    CT_KconfigDisableOption "CONFIG_SH4" "${cfg}"
+    CT_KconfigDisableOption "CONFIG_SH4A" "${cfg}"
+    case "${CT_ARCH_SH_VARIAN}" in
+        sh3) CT_KconfigEnableOption "CONFIG_SH3" "${cfg}";;
+        sh4) CT_KconfigEnableOption "CONFIG_SH4" "${cfg}";;
+        sh4a) CT_KconfigEnableOption "CONFIG_SH4A" "${cfg}";;
+    esac
+}
diff --git a/scripts/build/arch/sparc.sh b/scripts/build/arch/sparc.sh
index 15213a6a..74f6f785 100644
--- a/scripts/build/arch/sparc.sh
+++ b/scripts/build/arch/sparc.sh
@@ -70,3 +70,10 @@ CT_DoArchGlibcAdjustTuple() {
     # Set the target variable
     eval ${target_var}=\"${target_}\"
 }
+
+CT_DoArchUClibcConfig() {
+    local cfg="${1}"
+
+    CT_DoArchUClibcSelectArch "${cfg}" "${CT_ARCH}"
+    # FIXME: select CONFIG_SPARC_V7/V8/V9/V9B according to the CPU selector
+}
diff --git a/scripts/build/arch/x86.sh b/scripts/build/arch/x86.sh
index 51476786..41932782 100644
--- a/scripts/build/arch/x86.sh
+++ b/scripts/build/arch/x86.sh
@@ -100,3 +100,33 @@ CT_DoArchGlibcAdjustTuple() {
     # Set the target variable
     eval ${target_var}=\"${target_}\"
 }
+
+CT_DoArchUClibcConfig() {
+    local cfg="${1}"
+
+    if [ "${CT_ARCH_BITNESS}" = 64 ]; then
+        CT_DoArchUClibcSelectArch "${cfg}" "x86_64"
+    else
+        CT_DoArchUClibcSelectArch "${cfg}" "i386"
+    fi
+
+    # FIXME This doesn't cover all cases of x86_32 on uClibc (!ng)
+    CT_KconfigDisableOption "CONFIG_386" "${cfg}"
+    CT_KconfigDisableOption "CONFIG_486" "${cfg}"
+    CT_KconfigDisableOption "CONFIG_586" "${cfg}"
+    CT_KconfigDisableOption "CONFIG_686" "${cfg}"
+    case ${CT_TARGET_ARCH} in
+        i386)
+            CT_KconfigEnableOption "CONFIG_386" "${cfg}"
+            ;;
+        i486)
+            CT_KconfigEnableOption "CONFIG_486" "${cfg}"
+            ;;
+        i586)
+            CT_KconfigEnableOption "CONFIG_586" "${cfg}"
+            ;;
+        i686)
+            CT_KconfigEnableOption "CONFIG_686" "${cfg}"
+            ;;
+    esac
+}
diff --git a/scripts/build/arch/xtensa.sh b/scripts/build/arch/xtensa.sh
index c7bd4320..a3010c69 100644
--- a/scripts/build/arch/xtensa.sh
+++ b/scripts/build/arch/xtensa.sh
@@ -70,3 +70,9 @@ CT_ConfigureXtensa() {
 
     CT_Popd
 }
+
+CT_DoArchUClibcConfig() {
+    local cfg="${1}"
+
+    CT_DoArchUClibcSelectArch "${cfg}" "xtensa"
+}
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index c59d5fa2..1e2a2908 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -193,96 +193,8 @@ manage_uClibc_config() {
     dst="$2"
 
     # Start with fresh files
-    CT_DoExecLog ALL rm -f "${dst}"
-    CT_DoExecLog ALL mkdir -p "$(dirname ${dst})"
     CT_DoExecLog ALL cp "${src}" "${dst}"
 
-    # Hack our target in the config file.
-    case "${CT_ARCH}:${CT_ARCH_BITNESS}" in
-        x86:32)      arch=i386;;
-        x86:64)      arch=x86_64;;
-        sh:32)       arch="sh";;
-        *)           arch="${CT_ARCH}";;
-    esac
-    # Also remove stripping: its the responsibility of the
-    # firmware builder to strip or not.
-    ${sed} -i -r -e '/^TARGET_.*/d' "${dst}"
-    CT_KconfigEnableOption "TARGET_${arch}" "${dst}"
-    CT_KconfigSetOption "TARGET_ARCH" "${arch}" "${dst}"
-    CT_KconfigDisableOption "DOSTRIP" "${dst}"
-
-    # Ah. We may one day need architecture-specific handler here...
-    case "${arch}" in
-        arm*)
-            if [ "${CT_ARCH_ARM_EABI}" = "y" ]; then
-                CT_KconfigDisableOption "CONFIG_ARM_OABI" "${dst}"
-                CT_KconfigEnableOption "CONFIG_ARM_EABI" "${dst}"
-            else
-                CT_KconfigDisableOption "CONFIG_ARM_EABI" "${dst}"
-                CT_KconfigEnableOption "CONFIG_ARM_OABI" "${dst}"
-            fi
-            ;;
-        i386)
-            # FIXME This doesn't cover all cases of x86_32...
-            case ${CT_TARGET_ARCH} in
-                i386)
-                    CT_KconfigEnableOption "CONFIG_386" "${dst}"
-                    ;;
-                i486)
-                    CT_KconfigEnableOption "CONFIG_486" "${dst}"
-                    ;;
-                i586)
-                    CT_KconfigEnableOption "CONFIG_586" "${dst}"
-                    ;;
-                i686)
-                    CT_KconfigEnableOption "CONFIG_686" "${dst}"
-                    ;;
-            esac
-            ;;
-        mips*)
-            CT_KconfigDisableOption "CONFIG_MIPS_O32_ABI" "${dst}"
-            CT_KconfigDisableOption "CONFIG_MIPS_N32_ABI" "${dst}"
-            CT_KconfigDisableOption "CONFIG_MIPS_N64_ABI" "${dst}"
-            CT_KconfigDeleteOption "CONFIG_MIPS_ISA_1" "${dst}"
-            CT_KconfigDeleteOption "CONFIG_MIPS_ISA_2" "${dst}"
-            CT_KconfigDeleteOption "CONFIG_MIPS_ISA_3" "${dst}"
-            CT_KconfigDeleteOption "CONFIG_MIPS_ISA_4" "${dst}"
-            CT_KconfigDeleteOption "CONFIG_MIPS_ISA_MIPS32" "${dst}"
-            CT_KconfigDeleteOption "CONFIG_MIPS_ISA_MIPS32R2" "${dst}"
-            CT_KconfigDeleteOption "CONFIG_MIPS_ISA_MIPS64" "${dst}"
-            CT_KconfigDeleteOption "CONFIG_MIPS_ISA_MIPS64R2" "${dst}"
-            case "${CT_ARCH_mips_ABI}" in
-                32)
-                    CT_KconfigEnableOption "CONFIG_MIPS_O32_ABI" "${dst}"
-                    ;;
-                n32)
-                    CT_KconfigEnableOption "CONFIG_MIPS_N32_ABI" "${dst}"
-                    ;;
-                64)
-                    CT_KconfigEnableOption "CONFIG_MIPS_N64_ABI" "${dst}"
-                    ;;
-            esac
-            ;;
-        powerpc*)
-            CT_KconfigDisableOption "CONFIG_E500" "${dst}"
-            CT_KconfigDisableOption "CONFIG_CLASSIC" "${dst}"
-            CT_KconfigDeleteOption "TARGET_SUBARCH" "${dst}"
-            if [ "${CT_ARCH_powerpc_ABI}" = "spe" ]; then
-                CT_KconfigEnableOption "CONFIG_E500" "${dst}"
-                CT_KconfigSetOption "TARGET_SUBARCH" "e500" "${dst}"
-            else
-                CT_KconfigEnableOption "CONFIG_CLASSIC" "${dst}"
-                CT_KconfigSetOption "TARGET_SUBARCH" "classic" "${dst}"
-            fi
-            ;;
-        sh)
-            # all we really support right now is sh4:32
-            CT_KconfigEnableOption "CONFIG_SH4" "${dst}"
-            ;;
-    esac
-
-    # Accomodate for old and new uClibc versions, where the
-    # way to select between big/little endian has changed
     case "${CT_ARCH_ENDIAN}" in
         big)
             CT_KconfigDisableOption "ARCH_LITTLE_ENDIAN" "${dst}"
@@ -298,8 +210,6 @@ manage_uClibc_config() {
             ;;
     esac
 
-    # Accomodate for old and new uClibc versions, where the
-    # MMU settings has different config knobs
     if [ "${CT_ARCH_USE_MMU}" = "y" ]; then
         CT_KconfigEnableOption "ARCH_USE_MMU" "${dst}"
     else
@@ -392,29 +302,23 @@ manage_uClibc_config() {
     fi
 
     # Push the threading model
+    CT_KconfigDisableOption "UCLIBC_HAS_THREADS" "${dst}"
+    CT_KconfigDisableOption "LINUXTHREADS_OLD" "${dst}"
+    CT_KconfigDisableOption "LINUXTHREADS_NEW" "${dst}"
+    CT_KconfigDisableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}"
     case "${CT_THREADS}:${CT_LIBC_UCLIBC_LNXTHRD}" in
         none:)
-            CT_KconfigDisableOption "UCLIBC_HAS_THREADS" "${dst}"
-            CT_KconfigDisableOption "LINUXTHREADS_OLD" "${dst}"
-            CT_KconfigDisableOption "LINUXTHREADS_NEW" "${dst}"
-            CT_KconfigDisableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}"
             ;;
         linuxthreads:old)
             CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}"
             CT_KconfigEnableOption "LINUXTHREADS_OLD" "${dst}"
-            CT_KconfigDisableOption "LINUXTHREADS_NEW" "${dst}"
-            CT_KconfigDisableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}"
             ;;
         linuxthreads:new)
             CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}"
-            CT_KconfigDisableOption "LINUXTHREADS_OLD" "${dst}"
             CT_KconfigEnableOption "LINUXTHREADS_NEW" "${dst}"
-            CT_KconfigDisableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}"
             ;;
         nptl:)
             CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}"
-            CT_KconfigDisableOption "LINUXTHREADS_OLD" "${dst}"
-            CT_KconfigDisableOption "LINUXTHREADS_NEW" "${dst}"
             CT_KconfigEnableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}"
             ;;
         *)
@@ -426,29 +330,22 @@ manage_uClibc_config() {
     CT_KconfigEnableOption "PTHREADS_DEBUG_SUPPORT" "${dst}"
 
     # Force on debug options if asked for
+    CT_KconfigDisableOption "DODEBUG" "${dst}"
+    CT_KconfigDisableOption "DODEBUG_PT" "${dst}"
+    CT_KconfigDisableOption "DOASSERTS" "${dst}"
+    CT_KconfigDisableOption "SUPPORT_LD_DEBUG" "${dst}"
+    CT_KconfigDisableOption "SUPPORT_LD_DEBUG_EARLY" "${dst}"
+    CT_KconfigDisableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}"
     case "${CT_LIBC_UCLIBC_DEBUG_LEVEL}" in
         0)
-            CT_KconfigDisableOption "DODEBUG" "${dst}"
-            CT_KconfigDisableOption "DODEBUG_PT" "${dst}"
-            CT_KconfigDisableOption "DOASSERTS" "${dst}"
-            CT_KconfigDisableOption "SUPPORT_LD_DEBUG" "${dst}"
-            CT_KconfigDisableOption "SUPPORT_LD_DEBUG_EARLY" "${dst}"
-            CT_KconfigDisableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}"
             ;;
         1)
             CT_KconfigEnableOption "DODEBUG" "${dst}"
-            CT_KconfigDisableOption "DODEBUG_PT" "${dst}"
-            CT_KconfigDisableOption "DOASSERTS" "${dst}"
-            CT_KconfigDisableOption "SUPPORT_LD_DEBUG" "${dst}"
-            CT_KconfigDisableOption "SUPPORT_LD_DEBUG_EARLY" "${dst}"
-            CT_KconfigDisableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}"
             ;;
         2)
             CT_KconfigEnableOption "DODEBUG" "${dst}"
-            CT_KconfigDisableOption "DODEBUG_PT" "${dst}"
             CT_KconfigEnableOption "DOASSERTS" "${dst}"
             CT_KconfigEnableOption "SUPPORT_LD_DEBUG" "${dst}"
-            CT_KconfigDisableOption "SUPPORT_LD_DEBUG_EARLY" "${dst}"
             CT_KconfigEnableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}"
             ;;
         3)
@@ -460,6 +357,13 @@ manage_uClibc_config() {
             CT_KconfigEnableOption "UCLIBC_MALLOC_DEBUGGING" "${dst}"
             ;;
     esac
+
+    # Remove stripping: its the responsibility of the
+    # firmware builder to strip or not.
+    CT_KconfigDisableOption "DOSTRIP" "${dst}"
+
+    # Now allow architecture to tweak as it wants
+    CT_DoArchUClibcConfig "${dst}"
 }
 
 do_libc_post_cc() {
-- 
cgit v1.2.3