diff -r 54bbdbf316f3 -r 4f07fc2b4491 scripts/build/libc/uClibc.sh
--- a/scripts/build/libc/uClibc.sh	Sat Jan 23 18:41:59 2010 +0100
+++ b/scripts/build/libc/uClibc.sh	Sat Jan 23 22:06:11 2010 +0100
@@ -189,12 +189,19 @@
     (
 
     # 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