From 56b1318518d87bf96803f9842f4111d466a6cfe1 Mon Sep 17 00:00:00 2001 From: Joern Rennecke Date: Wed, 26 Oct 2011 12:14:17 +0000 Subject: [PATCH] gas: * doc/as.texinfo [EPIPHANY]: Include c-epiphany.texi to avoid duplication. opcodes: * disassemble.c (ARCH_epiphany): Move into alphasorted spot. --- gas/ChangeLog | 5 +++++ gas/doc/as.texinfo | 21 +++++++++++++-------- opcodes/ChangeLog | 4 ++++ opcodes/disassemble.c | 2 +- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index d82606a59fd..1f1a7b5adb6 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2011-10-26 Joern Rennecke + + * doc/as.texinfo [EPIPHANY]: Include c-epiphany.texi to avoid + duplication. + 2011-10-25 Mike Frysinger * config/rx-defs.h (rx_error): Add const to first arg. diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo index 362c10bcc72..a22eb32f588 100644 --- a/gas/doc/as.texinfo +++ b/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 - -@item -mepiphany -Specifies that the both 32 and 16 bit instructions are allowed. This is the -default behavior. +@ifclear man +@xref{Epiphany Options}, for the options available when @value{AS} is +configured for an Epiphany processor. +@end ifclear -@item -mepiphany16 -Restricts the permitted instructions to just the 16 bit set. +@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 -@end table @end ifset @ifset I80386 diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 6ad9cf386bf..cac099ed868 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2011-10-26 Joern Rennecke + + * disassemble.c (ARCH_epiphany): Move into alphasorted spot. + 2011-10-25 Joern Rennecke * Makefile.am (HFILES): Add epiphany-desc.h and epiphany-opc.h . diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c index a9c65f32f5f..11f2ea6bca3 100644 --- a/opcodes/disassemble.c +++ b/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 -- 2.30.2