gas/
2004-03-08  Jan Beulich  <jbeulich@novell.com>

	* doc/as.texinfo: Add sentence to indicate redefining a macro is an
	error, and point to .purgem documentation if someone really needs
	re-definitions.
	* NEWS: Mention macro redefinition is now an error.

--- /home/jbeulich/src/binutils/mainline/2005-03-08/gas/NEWS	2005-02-28 08:27:12.000000000 +0100
+++ 2005-03-08/gas/NEWS	2005-03-08 10:14:27.334292936 +0100
@@ -1,5 +1,7 @@
 -*- text -*-
 
+* Redefinition of macros now results in an error.
+
 * New command line option -mhint.b=[ok|warning|error] for IA64 targets.
 
 * New command line option -munwind-check=[warning|error] for IA64
--- /home/jbeulich/src/binutils/mainline/2005-03-08/gas/doc/as.texinfo	2005-03-04 15:51:47.000000000 +0100
+++ 2005-03-08/gas/doc/as.texinfo	2005-03-08 10:35:54.158665896 +0100
@@ -4838,8 +4838,10 @@ With that definition, @samp{SUM 0,5} is 
 Begin the definition of a macro called @var{macname}.  If your macro
 definition requires arguments, specify their names after the macro name,
 separated by commas or spaces.  You can supply a default value for any
-macro argument by following the name with @samp{=@var{deflt}}.  For
-example, these are all valid @code{.macro} statements:
+macro argument by following the name with @samp{=@var{deflt}}.  You
+cannot define two macros with the same @var{macname} unless it has been
+subject to the @code{.purgem} directive (@xref{Purgem}.) between the two
+definitions.  For example, these are all valid @code{.macro} statements:
 
 @table @code
 @item .macro comm