diff -urN gcc-26-1700/gcc/ChangeLog gcc-26-1730/gcc/ChangeLog
--- gcc-26-1700/gcc/ChangeLog	2005-07-26 15:53:39.000000000 -0400
+++ gcc-26-1730/gcc/ChangeLog	2005-07-26 17:22:41.000000000 -0400
@@ -1,3 +1,9 @@
+2005-07-26  Aldy Hernandez  <aldyh@redhat.com>
+
+	* config.gcc (cpu_type): Add frv case.
+	(with_cpu): Add frv400-*-*linux* and frv550-*-*linux* cases.
+	(supported_defaults): Add fr550 case.
+
 2005-07-26  Diego Novillo  <dnovillo@redhat.com>
 
 	PR 22591
diff -urN gcc-26-1700/gcc/config.gcc gcc-26-1730/gcc/config.gcc
--- gcc-26-1700/gcc/config.gcc	2005-07-22 05:49:47.000000000 -0400
+++ gcc-26-1730/gcc/config.gcc	2005-07-26 17:22:44.000000000 -0400
@@ -255,6 +255,8 @@
 ep9312*-*-*)
 	cpu_type=arm
 	;;
+frv*)	cpu_type=frv
+	;;
 xscale-*-*)
 	cpu_type=arm
 	extra_headers="mmintrin.h"
@@ -2379,9 +2381,12 @@
     alphaev5*-*-*)
       with_cpu=ev5
       ;;
-    frv-*-*linux*)
+    frv-*-*linux* | frv400-*-*linux*)
       with_cpu=fr400
       ;;
+    frv550-*-*linux*)
+      with_cpu=fr550
+      ;;
     sparc*-*-*)
       with_cpu="`echo ${target} | sed 's/-.*$//'`"
       if [ x$with_cpu = xsparc64 ]; then
@@ -2514,6 +2519,7 @@
 		supported_defaults=cpu
 		case "$with_cpu" in
 		fr400) ;;
+		fr550) ;;
 		*)
 			echo "Unknown cpu used in --with-cpu=$with_cpu" 1>&2
 			exit 1