Index: gcc/ChangeLog
===================================================================
--- gcc/ChangeLog	(revision 206209)
+++ gcc/ChangeLog	(working copy)
@@ -1,3 +1,11 @@
+2013-12-26  Ganesh Gopalasubramanian  <Ganesh.Gopalasubramanian@amd.com>
+
+        * config/i386/i386.c (get_builtin_code_for_version): Rename AMD 
+        CPU names M_AMD_BOBCAT to M_AMD_BTVER1 and M_AMD_JAGUAR 
+        to M_AMD_BTVER2.
+        (processor_model): Likewise.
+        (arch_names_table): Likewise.
+
 2013-12-26  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/driver-i386.c (decode_caches_intel): Add missing entries.
Index: gcc/config/i386/i386.c
===================================================================
--- gcc/config/i386/i386.c	(revision 206209)
+++ gcc/config/i386/i386.c	(working copy)
@@ -30034,11 +30034,11 @@
 	      priority = P_PROC_SSE4_A;
 	      break;
 	    case PROCESSOR_BTVER1:
-	      arg_str = "bobcat";
+	      arg_str = "btver1";
 	      priority = P_PROC_SSE4_A;
 	      break;
 	    case PROCESSOR_BTVER2:
-	      arg_str = "jaguar";
+	      arg_str = "btver2";
 	      priority = P_PROC_AVX;
 	      break;
 	    case PROCESSOR_BDVER1:
@@ -30942,8 +30942,8 @@
     M_AMDFAM10H,
     M_AMDFAM15H,
     M_INTEL_SILVERMONT,
-    M_AMD_BOBCAT,
-    M_AMD_JAGUAR,    
+    M_AMD_BTVER1,
+    M_AMD_BTVER2,    
     M_CPU_SUBTYPE_START,
     M_INTEL_COREI7_NEHALEM,
     M_INTEL_COREI7_WESTMERE,
@@ -30983,13 +30983,13 @@
       {"barcelona", M_AMDFAM10H_BARCELONA},
       {"shanghai", M_AMDFAM10H_SHANGHAI},
       {"istanbul", M_AMDFAM10H_ISTANBUL},
-      {"bobcat", M_AMD_BOBCAT},      
+      {"btver1", M_AMD_BTVER1},      
       {"amdfam15h", M_AMDFAM15H},
       {"bdver1", M_AMDFAM15H_BDVER1},
       {"bdver2", M_AMDFAM15H_BDVER2},
       {"bdver3", M_AMDFAM15H_BDVER3},
       {"bdver4", M_AMDFAM15H_BDVER4},
-      {"jaguar", M_AMD_JAGUAR},      
+      {"btver2", M_AMD_BTVER2},      
     };
 
   static struct _isa_names_table
Index: libgcc/ChangeLog
===================================================================
--- libgcc/ChangeLog	(revision 206209)
+++ libgcc/ChangeLog	(working copy)
@@ -1,3 +1,9 @@
+2013-12-26  Ganesh Gopalasubramanian  <Ganesh.Gopalasubramanian@amd.com>
+
+        * config/i386/cpuinfo.c (processor_types): Rename AMD cpu names
+	AMD_BOBCAT to AMD_BTVER1 and AMD_JAGUAR to AMD_BTVER2.
+	(get_amd_cpu): Likewise.
+
 2013-12-25   H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config/i386/cpuinfo.c (get_intel_cpu): Remove model 0x3f from
Index: libgcc/config/i386/cpuinfo.c
===================================================================
--- libgcc/config/i386/cpuinfo.c	(revision 206209)
+++ libgcc/config/i386/cpuinfo.c	(working copy)
@@ -62,8 +62,8 @@
   AMDFAM10H,
   AMDFAM15H,
   INTEL_SILVERMONT,
-  AMD_BOBCAT,
-  AMD_JAGUAR,  
+  AMD_BTVER1,
+  AMD_BTVER2,  
   CPU_TYPE_MAX
 };
 
@@ -142,9 +142,9 @@
 	  break;
 	}
       break;
-    /* AMD Family 14h "Bobcat". */
+    /* AMD Family 14h "btver1". */
     case 0x14:
-      __cpu_model.__cpu_type = AMD_BOBCAT;
+      __cpu_model.__cpu_type = AMD_BTVER1;
       break;
     /* AMD Family 15h "Bulldozer".  */
     case 0x15:
@@ -159,9 +159,9 @@
       if (model >= 0x30 && model <= 0x4f)
 	__cpu_model.__cpu_subtype = AMDFAM15H_BDVER3;
       break;
-    /* AMD Family 16h "Jaguar". */
+    /* AMD Family 16h "btver2" */
     case 0x16:
-      __cpu_model.__cpu_type = AMD_JAGUAR;
+      __cpu_model.__cpu_type = AMD_BTVER2;
       break;
     default:
       break;