diff --git a/ChangeLog b/ChangeLog
index 18833f80ded..adab14f0800 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-31  Marc Gauthier  <marc@tensilica.com>
+
+	* configure.ac (xtensa*-*-*): Recognize processor variants.
+	* configure: Regenerate.
+
 2008-01-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
         PR bootstrap/34922
diff --git a/configure b/configure
index 4cdcd0a3454..15406285fc8 100755
--- a/configure
+++ b/configure
@@ -2598,7 +2598,7 @@ case "${target}" in
   vax-*-*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
     ;;
-  xtensa-*-*)
+  xtensa*-*-*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
   ip2k-*-*)
@@ -5275,7 +5275,7 @@ case "${target}" in
   v850*-*-*)
     md_exec_prefix=/usr/ccs/bin
     ;;
-  xtensa-*-elf*)
+  xtensa*-*-elf*)
     ;;
 
   *-*-beos* | \
diff --git a/configure.ac b/configure.ac
index 2cd53dc7df9..56d7f12d374 100644
--- a/configure.ac
+++ b/configure.ac
@@ -875,7 +875,7 @@ case "${target}" in
   vax-*-*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
     ;;
-  xtensa-*-*)
+  xtensa*-*-*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
   ip2k-*-*)
@@ -1795,7 +1795,7 @@ case "${target}" in
   v850*-*-*)
     md_exec_prefix=/usr/ccs/bin
     ;;
-  xtensa-*-elf*)
+  xtensa*-*-elf*)
     ;;
 
   *-*-beos* | \