* gas/config/tc-i386.c (cpu_arch): Add amdfam15.
	  (i386_align_code): Add PROCESSOR_AMDFAM15 cases.
	* gas/config/tc-i386.h (processor_type): Add PROCESSOR_AMDFAM15.
	* gas/doc/c-i386.texi: Add amdfam15.
	* opcodes/i386-gen.c (cpu_flag_init): Add new CPU_AMDFAM15_FLAGS.
	* opcodes/i386-init.h: Regenerated.

Index: gas/config/tc-i386.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-i386.c,v
retrieving revision 1.409
diff -d -u -p -r1.409 tc-i386.c
--- gas/config/tc-i386.c	18 Nov 2009 20:28:57 -0000	1.409
+++ gas/config/tc-i386.c	30 Nov 2009 23:42:25 -0000
@@ -594,6 +594,8 @@ static const arch_entry cpu_arch[] =
     CPU_K8_FLAGS },
   { "amdfam10", PROCESSOR_AMDFAM10,
     CPU_AMDFAM10_FLAGS },
+  { "amdfam15", PROCESSOR_AMDFAM15,
+    CPU_AMDFAM15_FLAGS },
   { ".8087", PROCESSOR_UNKNOWN,
     CPU_8087_FLAGS },
   { ".287", PROCESSOR_UNKNOWN,
@@ -955,7 +957,8 @@ 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, alt_short_patt will be used.
+     PROCESSOR_AMDFAM10, and PROCESSOR_AMDFAM15, alt_short_patt
+     will be used.
 
      When -mtune= isn't used, alt_long_patt will be used if
      cpu_arch_isa_flags has Cpu686. Otherwise, f32_patt will
@@ -1008,6 +1011,7 @@ i386_align_code (fragS *fragP, int count
 	    case PROCESSOR_ATHLON:
 	    case PROCESSOR_K8:
 	    case PROCESSOR_AMDFAM10:
+	    case PROCESSOR_AMDFAM15:
 	      patt = alt_short_patt;
 	      break;
 	    case PROCESSOR_I386:
@@ -1035,6 +1039,7 @@ i386_align_code (fragS *fragP, int count
 	    case PROCESSOR_ATHLON:
 	    case PROCESSOR_K8:
 	    case PROCESSOR_AMDFAM10:
+	    case PROCESSOR_AMDFAM15:
 	    case PROCESSOR_GENERIC32:
 	      /* We use cpu_arch_isa_flags to check if we CAN optimize
 		 for Cpu686.  */
Index: gas/config/tc-i386.h
===================================================================
RCS file: /cvs/src/src/gas/config/tc-i386.h,v
retrieving revision 1.113
diff -d -u -p -r1.113 tc-i386.h
--- gas/config/tc-i386.h	24 Sep 2009 14:36:47 -0000	1.113
+++ gas/config/tc-i386.h	30 Nov 2009 23:42:25 -0000
@@ -220,7 +220,8 @@ enum processor_type
   PROCESSOR_K8,
   PROCESSOR_GENERIC32,
   PROCESSOR_GENERIC64,
-  PROCESSOR_AMDFAM10
+  PROCESSOR_AMDFAM10,
+  PROCESSOR_AMDFAM15
 };
 
 extern enum processor_type cpu_arch_tune;
Index: gas/doc/c-i386.texi
===================================================================
RCS file: /cvs/src/src/gas/doc/c-i386.texi,v
retrieving revision 1.45
diff -d -u -p -r1.45 c-i386.texi
--- gas/doc/c-i386.texi	18 Nov 2009 20:28:58 -0000	1.45
+++ gas/doc/c-i386.texi	30 Nov 2009 23:42:26 -0000
@@ -109,6 +109,7 @@ processor names are recognized: 
 @code{opteron},
 @code{k8},
 @code{amdfam10},
+@code{amdfam15},
 @code{generic32} and
 @code{generic64}.
 
@@ -915,7 +916,7 @@ supported on the CPU specified.  The cho
 @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}
+@item @samp{amdfam10} @tab @samp{amdfam15}
 @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}
Index: opcodes/i386-gen.c
===================================================================
RCS file: /cvs/src/src/opcodes/i386-gen.c,v
retrieving revision 1.57
diff -d -u -p -r1.57 i386-gen.c
--- opcodes/i386-gen.c	18 Nov 2009 20:28:59 -0000	1.57
+++ opcodes/i386-gen.c	30 Nov 2009 23:42:27 -0000
@@ -86,6 +86,8 @@ 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",
+    "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" },
   { "CPU_287_FLAGS",