2010-02-03 Quentin Neill <quentin.neill@amd.com>

gas/
	* config/tc-i386.c (cpu_arch): Change amdfam15 to bdver1.
	(i386_align_code): Rename  PROCESSOR_AMDFAM15 to PROCESSOR_BDVER1.
	* config/tc-i386.h (processor_type): Same.
	* doc/c-i386.texi: Change amdfam15 to bdver1.

opcodes/
	* i386-gen.c (cpu_flag_init): Rename CPU_AMDFAM15_FLAGS
	to CPU_BDVER1_FLAGS
	* i386-init.h: Regenerated.

testsuite/
	* gas/i386/i386.exp: Rename amdfam15 test cases to bdver1.
	* gas/i386/x86-64-nops-1-amdfam15.d: Renamed test case to
	gas/i386/x86-64-nops-1-bdver1.d.
	* gas/i386/nops-1-amdfam15.d: Renamed test case to
	gas/i386/nops-1-bdver1.d.

11 files changed, 37 insertions, 16 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 358f47074a..c76e53e5f6 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-03  Quentin Neill  <quentin.neill@amd.com>
+
+	* config/tc-i386.c (cpu_arch): Change amdfam15 to bdver1.
+	(i386_align_code): Rename  PROCESSOR_AMDFAM15 to PROCESSOR_BDVER1.
+	* config/tc-i386.h (processor_type): Same.
+	* doc/c-i386.texi: Change amdfam15 to bdver1.
+
 2010-01-29  Nick Clifton  <nickc@redhat.com>
 
 	PR 11136
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 4a71209adc..f091aa216c 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -603,8 +603,8 @@ static const arch_entry cpu_arch[] =
     CPU_K8_FLAGS, 0 },
   { STRING_COMMA_LEN ("amdfam10"), PROCESSOR_AMDFAM10,
     CPU_AMDFAM10_FLAGS, 0 },
-  { STRING_COMMA_LEN ("amdfam15"), PROCESSOR_AMDFAM15,
-    CPU_AMDFAM15_FLAGS, 0 },
+  { STRING_COMMA_LEN ("bdver1"), PROCESSOR_BDVER1,
+    CPU_BDVER1_FLAGS, 0 },
   { STRING_COMMA_LEN (".8087"), PROCESSOR_UNKNOWN,
     CPU_8087_FLAGS, 0 },
   { STRING_COMMA_LEN (".287"), PROCESSOR_UNKNOWN,
@@ -966,7 +966,7 @@ i386_align_code (fragS *fragP, int count)
      PROCESSOR_CORE, PROCESSOR_CORE2, PROCESSOR_COREI7, and
      PROCESSOR_GENERIC64, alt_long_patt will be used.
      3. For PROCESSOR_ATHLON, PROCESSOR_K6, PROCESSOR_K8 and
-     PROCESSOR_AMDFAM10, and PROCESSOR_AMDFAM15, alt_short_patt
+     PROCESSOR_AMDFAM10, and PROCESSOR_BDVER1, alt_short_patt
      will be used.
 
      When -mtune= isn't used, alt_long_patt will be used if
@@ -1020,7 +1020,7 @@ i386_align_code (fragS *fragP, int count)
 	    case PROCESSOR_ATHLON:
 	    case PROCESSOR_K8:
 	    case PROCESSOR_AMDFAM10:
-	    case PROCESSOR_AMDFAM15:
+	    case PROCESSOR_BDVER1:
 	      patt = alt_short_patt;
 	      break;
 	    case PROCESSOR_I386:
@@ -1048,7 +1048,7 @@ i386_align_code (fragS *fragP, int count)
 	    case PROCESSOR_ATHLON:
 	    case PROCESSOR_K8:
 	    case PROCESSOR_AMDFAM10:
-	    case PROCESSOR_AMDFAM15:
+	    case PROCESSOR_BDVER1:
 	    case PROCESSOR_GENERIC32:
 	      /* We use cpu_arch_isa_flags to check if we CAN optimize
 		 for Cpu686.  */
diff --git a/gas/config/tc-i386.h b/gas/config/tc-i386.h
index 5e12272f4a..f2f02cc09c 100644
--- a/gas/config/tc-i386.h
+++ b/gas/config/tc-i386.h
@@ -221,7 +221,7 @@ enum processor_type
   PROCESSOR_GENERIC32,
   PROCESSOR_GENERIC64,
   PROCESSOR_AMDFAM10,
-  PROCESSOR_AMDFAM15
+  PROCESSOR_BDVER1
 };
 
 extern enum processor_type cpu_arch_tune;
diff --git a/gas/doc/c-i386.texi b/gas/doc/c-i386.texi
index e657ab3597..1f414f65ed 100644
--- a/gas/doc/c-i386.texi
+++ b/gas/doc/c-i386.texi
@@ -109,7 +109,7 @@ processor names are recognized:
 @code{opteron},
 @code{k8},
 @code{amdfam10},
-@code{amdfam15},
+@code{bdver1},
 @code{generic32} and
 @code{generic64}.
 
@@ -926,7 +926,7 @@ supported on the CPU specified.  The choices for @var{cpu_type} are:
 @item @samp{prescott} @tab @samp{nocona} @tab @samp{core} @tab @samp{core2}
 @item @samp{corei7} @tab @samp{l1om}
 @item @samp{k6} @tab @samp{k6_2} @tab @samp{athlon} @tab @samp{k8}
-@item @samp{amdfam10} @tab @samp{amdfam15}
+@item @samp{amdfam10} @tab @samp{bdver1}
 @item @samp{generic32} @tab @samp{generic64}
 @item @samp{.mmx} @tab @samp{.sse} @tab @samp{.sse2} @tab @samp{.sse3}
 @item @samp{.ssse3} @tab @samp{.sse4.1} @tab @samp{.sse4.2} @tab @samp{.sse4}
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index b5258108a5..080ca73182 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-03  Quentin Neill  <quentin.neill@amd.com>
+
+	* gas/i386/i386.exp: Rename amdfam15 test cases to bdver1.
+	* gas/i386/x86-64-nops-1-amdfam15.d: Renamed test case to
+	gas/i386/x86-64-nops-1-bdver1.d.
+	* gas/i386/nops-1-amdfam15.d: Renamed test case to
+	gas/i386/nops-1-bdver1.d.
+
 2010-01-29  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gas/arm/dis-data.d: Update test name.  Do not expect
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index 994cf6ef1c..dc0be49959 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -77,7 +77,7 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_dump_test "nops-1-i686"
     run_dump_test "nops-1-k8"
     run_dump_test "nops-1-core2"
-    run_dump_test "nops-1-amdfam15"
+    run_dump_test "nops-1-bdver1"
     run_dump_test "nops-2"
     run_dump_test "nops-2-i386"
     run_dump_test "nops-2-core2"
@@ -279,7 +279,7 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
     run_dump_test "x86-64-nops-1-nocona"
     run_dump_test "x86-64-nops-1-core2"
     run_dump_test "x86-64-nops-1-pentium"
-    run_dump_test "x86-64-nops-1-amdfam15"
+    run_dump_test "x86-64-nops-1-bdver1"
     run_dump_test "x86-64-nops-2"
     run_dump_test "x86-64-nops-3"
     run_dump_test "x86-64-nops-4"
diff --git a/gas/testsuite/gas/i386/nops-1-amdfam15.d b/gas/testsuite/gas/i386/nops-1-bdver1.d
index c19774ef80..32c9cef769 100644
--- a/gas/testsuite/gas/i386/nops-1-amdfam15.d
+++ b/gas/testsuite/gas/i386/nops-1-bdver1.d
@@ -1,7 +1,7 @@
-#as: -mtune=amdfam15
+#as: -mtune=bdver1
 #source: nops-1.s
 #objdump: -drw
-#name: i386 -mtune=amdfam15 nops 1
+#name: i386 -mtune=bdver1 nops 1
 
 .*: +file format .*
 
diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-amdfam15.d b/gas/testsuite/gas/i386/x86-64-nops-1-bdver1.d
index 820399a8f1..a2e62bdcfc 100644
--- a/gas/testsuite/gas/i386/x86-64-nops-1-amdfam15.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-1-bdver1.d
@@ -1,7 +1,7 @@
-#as: -mtune=amdfam15
+#as: -mtune=bdver1
 #source: nops-1.s
 #objdump: -drw
-#name: x86-64 -mtune=amdfam15 nops 1
+#name: x86-64 -mtune=bdver1 nops 1
 
 .*: +file format .*
 
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index d20b7761ae..5171493332 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-03  Quentin Neill  <quentin.neill@amd.com>
+
+	* i386-gen.c (cpu_flag_init): Rename CPU_AMDFAM15_FLAGS
+	to CPU_BDVER1_FLAGS
+	* i386-init.h: Regenerated.
+
 2010-02-03  Anthony Green  <green@moxielogic.com>
 
 	* moxie-opc.c (moxie_form1_opc_info): Move "nop" from 0x00 to
diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c
index 0a99a2f76e..08ade93676 100644
--- a/opcodes/i386-gen.c
+++ b/opcodes/i386-gen.c
@@ -86,7 +86,7 @@ static initializer cpu_flag_init[] =
     "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuSYSCALL|CpuRdtscp|Cpu387|Cpu687|CpuMMX|Cpu3dnow|Cpu3dnowA|CpuSSE|CpuSSE2|CpuLM" },
   { "CPU_AMDFAM10_FLAGS",
     "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuSYSCALL|CpuRdtscp|Cpu387|Cpu687|CpuFISTTP|CpuMMX|Cpu3dnow|Cpu3dnowA|CpuSSE|CpuSSE2|CpuSSE3|CpuSSE4a|CpuABM|CpuLM" },
-  { "CPU_AMDFAM15_FLAGS",
+  { "CPU_BDVER1_FLAGS",
     "Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686|CpuSYSCALL|CpuRdtscp|Cpu387|Cpu687|CpuFISTTP|CpuMMX|Cpu3dnow|Cpu3dnowA|CpuSSE|CpuSSE2|CpuSSE3|CpuSSE4a|CpuABM|CpuLM|CpuFMA4|CpuXOP|CpuLWP" },
   { "CPU_8087_FLAGS",
     "Cpu8087" },
diff --git a/opcodes/i386-init.h b/opcodes/i386-init.h
index cfe65b0ade..cc1ed4f3ad 100644
--- a/opcodes/i386-init.h
+++ b/opcodes/i386-init.h
@@ -129,7 +129,7 @@
       0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,  \
       1, 0, 0, 0 } }
 
-#define CPU_AMDFAM15_FLAGS \
+#define CPU_BDVER1_FLAGS \
   { { 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,  \
       0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1,  \
       1, 0, 0, 0 } }