diff -rNdup config-orig/config.guess config/config.guess
--- config-orig/config.guess	2007-11-13 16:31:20.000000000 -0800
+++ config/config.guess	2007-11-14 00:26:39.000000000 -0800
@@ -954,8 +954,8 @@ EOF
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
-    xtensa:Linux:*:*)
-    	echo xtensa-unknown-linux-gnu
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
diff -rNdup config-orig/config.sub config/config.sub
--- config-orig/config.sub	2007-11-13 16:31:20.000000000 -0800
+++ config/config.sub	2007-11-14 00:48:37.000000000 -0800
@@ -369,10 +369,14 @@ case $basic_machine in
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
diff -rNdup config-orig/testsuite/config-sub.data config/testsuite/config-sub.data
--- config-orig/testsuite/config-sub.data	2007-11-13 15:56:17.000000000 -0800
+++ config/testsuite/config-sub.data	2007-11-14 00:31:22.000000000 -0800
@@ -109,6 +109,7 @@ fido-elf			fido-unknown-elf
 fido				fido-unknown-none
 xtensa-elf			xtensa-unknown-elf
 xtensa-linux			xtensa-unknown-linux-gnu
+xtensa_dc232b-linux		xtensa_dc232b-unknown-linux-gnu
 i386-drops1.0			i386-pc-drops1.0
 mep				mep-unknown-elf
 mep-elf				mep-unknown-elf