From c5ed243be1a6f9e44fdf02257c5b2ff8d5bca7d5 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sun, 18 Oct 2009 13:33:20 +0000 Subject: [PATCH] * as.h (know): Don't define as empty. * config/tc-arm.c (make_mapping_symbol): Revert last patch. --- gas/ChangeLog | 5 +++++ gas/as.h | 2 +- gas/config/tc-arm.c | 4 +--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 48ff21e9949..31c5d13d3a6 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2009-10-18 Alan Modra + + * as.h (know): Don't define as empty. + * config/tc-arm.c (make_mapping_symbol): Revert last patch. + 2009-10-18 Matthias Klose * config/tc-arm.c (make_mapping_symbol): Add braces to avoid empty body diff --git a/gas/as.h b/gas/as.h index 7366121b03a..1d1d97e5a06 100644 --- a/gas/as.h +++ b/gas/as.h @@ -238,7 +238,7 @@ typedef addressT valueT; #define know(p) gas_assert(p) /* Verify our assumptions! */ #endif /* not yet defined */ #else -#define know(p) /* know() checks are no-op.ed */ +#define know(p) do {} while (0) /* know() checks are no-op.ed */ #endif /* input_scrub.c */ diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index bb30073e507..2c70923f293 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -2489,9 +2489,7 @@ make_mapping_symbol (enum mstate state, valueT value, fragS *frag) frag->tc_frag_data.first_map = symbolP; } if (frag->tc_frag_data.last_map != NULL) - { - know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP)); - } + know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP)); frag->tc_frag_data.last_map = symbolP; } -- 2.30.2