5 files changed, 100 insertions, 2 deletions
diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am
index 87017fc..f115ae2 100644
--- a/gas/doc/Makefile.am
+++ b/gas/doc/Makefile.am
@@ -35,8 +35,9 @@ CPU_DOCS = \
 	c-avr.texi \
 	c-bfin.texi \
 	c-cr16.texi \
-	c-d10v.texi \
 	c-cris.texi \
+	c-d10v.texi \
+	c-epiphany.texi \
 	c-h8300.texi \
 	c-hppa.texi \
 	c-i370.texi \
diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in
index d7d0247..93a9f62 100644
--- a/gas/doc/Makefile.in
+++ b/gas/doc/Makefile.in
@@ -275,8 +275,9 @@ CPU_DOCS = \
 	c-avr.texi \
 	c-bfin.texi \
 	c-cr16.texi \
-	c-d10v.texi \
 	c-cris.texi \
+	c-d10v.texi \
+	c-epiphany.texi \
 	c-h8300.texi \
 	c-hppa.texi \
 	c-i370.texi \
diff --git a/gas/doc/all.texi b/gas/doc/all.texi
index 6f935ad..2be9c72 100644
--- a/gas/doc/all.texi
+++ b/gas/doc/all.texi
@@ -35,6 +35,7 @@
 @set CRIS
 @set D10V
 @set D30V
+@set EPIPHANY
 @set H8/300
 @set HPPA
 @set I370
diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index 8ed62a4..362c10b 100644
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -307,6 +307,11 @@ gcc(1), ld(1), and the Info entries for @file{binutils} and @file{ld}.
 @emph{Target D30V options:}
    [@b{-O}|@b{-n}|@b{-N}]
 @end ifset
+@ifset EPIPHANY
+
+@emph{Target EPIPHANY options:}
+   [@b{-mepiphany}|@b{-mepiphany16}]
+@end ifset
 @ifset H8
 
 @emph{Target H8/300 options:}
@@ -843,6 +848,22 @@ Warn when a nop after a 32-bit multiply instruction is generated.
 @end ifset
 @c man end
 
+@ifset EPIPHANY
+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.
+
+@item -mepiphany16
+Restricts the permitted instructions to just the 16 bit set.
+
+@end table
+@end ifset
+
 @ifset I80386
 
 @ifclear man
@@ -6849,6 +6870,9 @@ subject, see the hardware manufacturer's manual.
 @ifset D30V
 * D30V-Dependent::              D30V Dependent Features
 @end ifset
+@ifset EPIPHANY
+* Epiphany-Dependent::          EPIPHANY Dependent Features
+@end ifset
 @ifset H8/300
 * H8/300-Dependent::            Renesas H8/300 Dependent Features
 @end ifset
@@ -7025,6 +7049,10 @@ family.
 @include c-d30v.texi
 @end ifset
 
+@ifset EPIPHANY
+@include c-epiphany.texi
+@end ifset
+
 @ifset H8/300
 @include c-h8300.texi
 @end ifset
diff --git a/gas/doc/c-epiphany.texi b/gas/doc/c-epiphany.texi
new file mode 100644
index 0000000..c0b0222
--- /dev/null
+++ b/gas/doc/c-epiphany.texi
@@ -0,0 +1,67 @@
+@c Copyright 2011 Free Software Foundation, Inc.
+@c This is part of the GAS manual.
+@c For copying conditions, see the file as.texinfo.
+@c man end
+
+@ifset GENERIC
+@page
+@node Epiphany-Dependent
+@chapter Epiphany Dependent Features
+@end ifset
+@ifclear GENERIC
+@node Machine Dependencies
+@chapter Epiphany Dependent Features
+@end ifclear
+
+@cindex Epiphany support
+@menu
+* Epiphany Options::              Options
+* Epiphany Syntax::               Epiphany Syntax
+@end menu
+
+@node Epiphany Options
+@section Options
+
+@cindex Epiphany options
+@cindex options, Epiphany
+@code{@value{AS}} has two additional command-line options for the Epiphany
+architecture.
+
+@c man begin OPTIONS
+@table @gcctabopt
+
+@cindex @code{-mepiphany} command line option, Epiphany
+@item -mepiphany
+Specifies that the both 32 and 16 bit instructions are allowed.  This is the
+default behavior.
+
+@cindex @code{-mepiphany16} command line option, Epiphany
+@item -mepiphany16
+Restricts the permitted instructions to just the 16 bit set.
+@end table
+@c man end
+
+@node Epiphany Syntax
+@section Epiphany Syntax
+@menu
+* Epiphany-Chars::                Special Characters
+@end menu
+
+@node Epiphany-Chars
+@subsection Special Characters
+
+@cindex line comment character, Epiphany
+@cindex Epiphany line comment character
+The presence of a @samp{;} on a line indicates the start
+of a comment that extends to the end of the current line.
+
+If a @samp{#} appears as the first character of a line then the whole
+line is treated as a comment, but in this case the line could also be
+a logical line number directive (@pxref{Comments}) or a preprocessor
+control command (@pxref{Preprocessing}).
+
+@cindex line separator, Epiphany
+@cindex statement separator, Epiphany
+@cindex Epiphany line separator
+The @samp{`} character can be used to separate statements on the same
+line.