From 542419d6a093121909c6d90ef0c421769737b288 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 23 Jan 2010 22:06:11 +0100
Subject: [PATCH] libc/uClibc: fix the breakage for x86 and Super-H, after the
 32/64 merge

---
 scripts/build/libc/uClibc.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index b7fd737f..0d4775e0 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -189,12 +189,19 @@ mungeuClibcConfig() {
     (
 
     # 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";;
+        sh:64)      arch="sh64";;
+        *)          arch="${CT_ARCH}";;
+    esac
     # Also remove stripping: its the responsibility of the
     # firmware builder to strip or not.
     cat <<-ENDSED
 		s/^(TARGET_.*)=y$/# \\1 is not set/
-		s/^# TARGET_${CT_ARCH} is not set/TARGET_${CT_ARCH}=y/
-		s/^TARGET_ARCH=".*"/TARGET_ARCH="${CT_ARCH}"/
+		s/^# TARGET_${arch} is not set/TARGET_${arch}=y/
+		s/^TARGET_ARCH=".*"/TARGET_ARCH="${arch}"/
 		s/.*(DOSTRIP).*/# \\1 is not set/
 		ENDSED