gas:

* doc/as.texinfo [EPIPHANY]: Include c-epiphany.texi to avoid
        duplication.
opcodes:
        * disassemble.c (ARCH_epiphany): Move into alphasorted spot.

gas/ChangeLog

@@ -1,3 +1,8 @@
+2011-10-26  Joern Rennecke  <joern.rennecke@embecosm.com>
+
+	* doc/as.texinfo [EPIPHANY]: Include c-epiphany.texi to avoid
+	duplication.
+
 2011-10-25  Mike Frysinger  <vapier@gentoo.org>
 
 	* config/rx-defs.h (rx_error): Add const to first arg.

gas/doc/as.texinfo

@@ -852,16 +852,21 @@ Warn when a nop after a 32-bit multiply instruction is generated.
 The following options are available when @value{AS} is configured for the
 Adapteva EPIPHANY series.
 
-@table @gcctabopt
+@ifclear man
+@xref{Epiphany Options}, for the options available when @value{AS} is
+configured for an Epiphany processor.
+@end ifclear
 
-@item -mepiphany
-Specifies that the both 32 and 16 bit instructions are allowed.  This is the
-default behavior.
+@ifset man
+@c man begin OPTIONS
+The following options are available when @value{AS} is configured for
+an Epiphany processor.
+@c man end
+@c man begin INCLUDE
+@include c-epiphany.texi
+@c ended inside the included file
+@end ifset
 
-@item -mepiphany16
-Restricts the permitted instructions to just the 16 bit set.
-
-@end table
 @end ifset
 
 @ifset I80386

opcodes/ChangeLog

@@ -1,3 +1,7 @@
+2011-10-26  Joern Rennecke  <joern.rennecke@embecosm.com>
+
+	* disassemble.c (ARCH_epiphany): Move into alphasorted spot.
+
 2011-10-25  Joern Rennecke  <joern.rennecke@embecosm.com>
 
 	* Makefile.am (HFILES): Add epiphany-desc.h and epiphany-opc.h .

opcodes/disassemble.c

@@ -26,7 +26,6 @@
 #define ARCH_alpha
 #define ARCH_arc
 #define ARCH_arm
-#define ARCH_epiphany
 #define ARCH_avr
 #define ARCH_bfin
 #define ARCH_cr16
@@ -35,6 +34,7 @@
 #define ARCH_d10v
 #define ARCH_d30v
 #define ARCH_dlx
+#define ARCH_epiphany
 #define ARCH_fr30
 #define ARCH_frv
 #define ARCH_h8300