aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog7
-rw-r--r--gas/dwarf2dbg.c2
-rw-r--r--gas/read.c2
-rw-r--r--gas/read.h5
-rw-r--r--gas/testsuite/ChangeLog4
-rw-r--r--gas/testsuite/gas/macros/test2.s2
6 files changed, 16 insertions, 6 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3fae09f..b5114e5 100644
--- 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 9601150..064a743 100644
--- 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 b156b1c..b8bc536 100644
--- 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 7ebcecb..2357cf9 100644
--- 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 b02fadb..cc314d9 100644
--- 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 a21b011..0cfca29 100644
--- 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