* as.h (know): Don't define as empty.

	* config/tc-arm.c (make_mapping_symbol): Revert last patch.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 48ff21e9949086d66f067e3b6d081cc32db21c14..31c5d13d3a678a3ec9efae9ae7463aac15b1e68f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-18  Alan Modra  <amodra@bigpond.net.au>
+
+       * as.h (know): Don't define as empty.
+       * config/tc-arm.c (make_mapping_symbol): Revert last patch.
+
 2009-10-18  Matthias Klose  <doko@ubuntu.com>
 
        * config/tc-arm.c (make_mapping_symbol): Add braces to avoid empty body

diff --git a/gas/as.h b/gas/as.h
index 7366121b03a26806b84df4e9d1b4f19cbe74b296..1d1d97e5a06c0029bf0ef7fba16b37ff97b9a108 100644 (file)
--- 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
 \f
 /* input_scrub.c */

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index bb30073e5071fd5dc47c6e59f83b0b643b31e958..2c70923f29333af265581126d24f10af9c596707 100644 (file)
--- 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;
 }