.:

	* dwarf2dbg.c (DWARF2_ADDR_SIZE): Remove trailing ';'
	* read.h (SKIP_WHITESPACE): Turn into an expression.
	* read.c (read_a_source_file): A pseudo is removed by having a
	NULL handler.
testsuite:
	* gas/macros/test2.s: Lowercase it.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3fae09f425a3fd27714b076ad3e6c372453e467b..b5114e5d507115cc3c0e9b7b5ab82677a3e142af 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-06  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * dwarf2dbg.c (DWARF2_ADDR_SIZE): Remove trailing ';'
+       * read.h (SKIP_WHITESPACE): Turn into an expression.
+       * read.c (read_a_source_file): A pseudo is removed by having a
+       NULL handler.
+
 2004-02-05  James E Wilson  <wilson@specifixinc.com>
 
        * config/tc-ia64.c (output_endp): New.

diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
index 9601150c1613b14bec3426132e610c2147a69515..064a743229b94623e7cf2fd02d23964fa8d0745d 100644 (file)
--- a/gas/dwarf2dbg.c
+++ b/gas/dwarf2dbg.c
@@ -49,7 +49,7 @@
 #endif
 
 #ifndef DWARF2_ADDR_SIZE
-# define DWARF2_ADDR_SIZE(bfd) (bfd_arch_bits_per_address (bfd) / 8);
+# define DWARF2_ADDR_SIZE(bfd) (bfd_arch_bits_per_address (bfd) / 8)
 #endif
 
 #ifdef BFD_ASSEMBLER

diff --git a/gas/read.c b/gas/read.c
index b156b1c3427823a9f2e81f780184b865d9722aea..b8bc536c79c991a92efc233643ebf44ba97ed23f 100644 (file)
--- a/gas/read.c
+++ b/gas/read.c
@@ -754,6 +754,8 @@ read_a_source_file (char *name)
 
                      if (pop == NULL)
                        pop = (pseudo_typeS *) hash_find (po_hash, s + 1);
+                     if (pop && !pop->poc_handler)
+                       pop = NULL;
 
                      /* In MRI mode, we may need to insert an
                         automatic alignment directive.  What a hack

diff --git a/gas/read.h b/gas/read.h
index 7ebcecb275c3f913206cb3b0a3327bde8837fee2..2357cf9c39b0fa60fd6c7c557c1193a675bf56c2 100644 (file)
--- a/gas/read.h
+++ b/gas/read.h
@@ -30,10 +30,7 @@ extern char *input_line_pointer;     /* -> char we are parsing now.  */
 
 #ifdef PERMIT_WHITESPACE
 #define SKIP_WHITESPACE()                      \
-  {                                            \
-    if (* input_line_pointer == ' ')           \
-      ++ input_line_pointer;                   \
-  }
+  ((*input_line_pointer == ' ') ? ++input_line_pointer : 0)
 #else
 #define SKIP_WHITESPACE() know(*input_line_pointer != ' ' )
 #endif

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index b02fadbdcf2867d18b3a2e0cf9d8f83c85ffa50e..cc314d923b6d5c746e0b92affd7a25e0abe7d506 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-06  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * gas/macros/test2.s: Lowercase it.
+
 2004-02-02  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
 
        * gas/mips/div.d: Update to accomodate changes in macro

diff --git a/gas/testsuite/gas/macros/test2.s b/gas/testsuite/gas/macros/test2.s
index a21b011cef56e618d5369179229e45ba1f545dbe..0cfca29d117be78604d80ad1cbb17aed9a605347 100644 (file)
--- a/gas/testsuite/gas/macros/test2.s
+++ b/gas/testsuite/gas/macros/test2.s
@@ -1,7 +1,7 @@
        .macro  m arg1 arg2 arg3
        .long   \arg1
        .ifc    ,\arg2\arg3
-       .ELSE
+       .else
        m       \arg2,\arg3
        .endif
        .endm