aboutsummaryrefslogtreecommitdiff
path: root/gas/doc
diff options
context:
space:
mode:
Diffstat (limited to 'gas/doc')
-rw-r--r--gas/doc/as.texinfo3
-rw-r--r--gas/doc/c-z80.texi7
2 files changed, 5 insertions, 5 deletions
diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index cb1c26b..b6879e2 100644
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -4324,6 +4324,7 @@ The syntax for @code{equ} on the HPPA is
The syntax for @code{equ} on the Z80 is
@samp{@var{symbol} equ @var{expression}}.
On the Z80 it is an eror if @var{symbol} is already defined,
+but the symbol is not protected from later redefinition,
compare @xref{Equiv}.
@end ifset
@@ -4357,7 +4358,7 @@ value is taken.
@cindex @code{err} directive
If @command{@value{AS}} assembles a @code{.err} directive, it will print an error
message and, unless the @option{-Z} option was used, it will not generate an
-object file. This can be used to signal error an conditionally compiled code.
+object file. This can be used to signal an error in conditionally compiled code.
@node Error
@section @code{.error "@var{string}"}
diff --git a/gas/doc/c-z80.texi b/gas/doc/c-z80.texi
index f650581..c3e64bf 100644
--- a/gas/doc/c-z80.texi
+++ b/gas/doc/c-z80.texi
@@ -7,7 +7,6 @@
@chapter Z80 Dependent Features
@end ifset
-@c DO-NOT-COMMIT
@ifclear GENERIC
@node Machine Dependencies
@@ -168,9 +167,9 @@ Fill @var{count} bytes in the object file with @var{value}, if
@item @var{symbol} equ @var{expression}
@itemx @var{symbol} defl @var{expression}
-These directives set the value of @var{symbol} to @var{expression}. To
-keep code portable to other assemblers it is best to use @samp{equ} for
-the first definition and @samp{defl} for redefinitions.
+These directives set the value of @var{symbol} to @var{expression}. If
+@code{equ} is used, it is an error if @var{symbol} is already defined.
+Symbols defined with @code{equ} are not protected from redefinition.
@item set
This is a normal instruction on Z80, and not an assembler directive.