Merge branch 'master' of https://github.com/crosstool-ng/crosstool-ng

1 files changed, 43 insertions, 9 deletions

diff --git a/scripts/build/arch/sh.sh b/scripts/build/arch/sh.sh
index e7f4f1a..6761435 100644
--- a/scripts/build/arch/sh.sh
+++ b/scripts/build/arch/sh.sh
@@ -36,13 +36,47 @@ CT_DoArchTupleValues () {
     CT_ARCH_FLOAT_CFLAG=
 }
 
-#------------------------------------------------------------------------------
-# Get multilib architecture-specific target
-# Usage: CT_DoArchMultilibTarget "multilib flags" "target tuple"
-CT_DoArchMultilibTarget ()
-{
-    local target="${1}"; shift
-    local -a multi_flags=( "$@" )
-
-    echo "${target}"
+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_VARIANT}" in
+        sh3) CT_KconfigEnableOption "CONFIG_SH3" "${cfg}";;
+        sh4) CT_KconfigEnableOption "CONFIG_SH4" "${cfg}";;
+        sh4a) CT_KconfigEnableOption "CONFIG_SH4A" "${cfg}";;
+    esac
+}
+
+CT_DoArchUClibcCflags() {
+    local cfg="${1}"
+    local cflags="${2}"
+    local f
+
+    for f in ${cflags}; do
+        case "${f}" in
+            -m3)
+                CT_KconfigEnableOption "CONFIG_SH3" "${cfg}"
+                ;;
+            -m4)
+                CT_KconfigEnableOption "CONFIG_SH4" "${cfg}"
+                CT_KconfigEnableOption "UCLIBC_HAS_FPU" "${cfg}"
+                ;;
+            -m4-nofpu)
+                CT_KconfigEnableOption "CONFIG_SH4" "${cfg}"
+                CT_KconfigDisableOption "UCLIBC_HAS_FPU" "${cfg}"
+                ;;
+            -m4a)
+                CT_KconfigEnableOption "CONFIG_SH4A" "${cfg}"
+                CT_KconfigEnableOption "UCLIBC_HAS_FPU" "${cfg}"
+                ;;
+            -m4a-nofpu)
+                CT_KconfigEnableOption "CONFIG_SH4A" "${cfg}"
+                CT_KconfigDisableOption "UCLIBC_HAS_FPU" "${cfg}"
+                ;;
+        esac
+    done
 }