PR gas/14521

	* config/tc-mmix.h (tc_frob_file_before_fix): Renumber sections
	after call to mmix_frob_file.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index e0b47be..c3270d2 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-01  Hans-Peter Nilsson  <hp@bitrange.com>
+
+       PR gas/14521
+       * config/tc-mmix.h (tc_frob_file_before_fix): Renumber sections
+       after call to mmix_frob_file.
+
 2012-08-31  Maciej W. Rozycki  <macro@codesourcery.com>
 
        * doc/c-mips.texi (MIPS Opts): Correct a typo in the -mips5

diff --git a/gas/config/tc-mmix.h b/gas/config/tc-mmix.h
index ef90162..dba24a2 100644 (file)
--- a/gas/config/tc-mmix.h
+++ b/gas/config/tc-mmix.h
@@ -194,7 +194,18 @@ extern fragS *mmix_opcode_frag;
    fixups are done and relocs are output.  Similarly for each unknown
    symbol.  */
 extern void mmix_frob_file (void);
-#define tc_frob_file_before_fix mmix_frob_file
+#define tc_frob_file_before_fix()                                      \
+  do                                                                   \
+    {                                                                  \
+      int i = 0;                                                       \
+                                                                       \
+      /* It's likely mmix_frob_file changed (removed) sections, so make        \
+        sure sections are correctly numbered as per renumber_sections, \
+        (static to write.c where this macro is called).  */            \
+      mmix_frob_file ();                                               \
+      bfd_map_over_sections (stdoutput, renumber_sections, &i);                \
+    }                                                                  \
+  while (0)
 
 /* Used by mmix_frob_file.  Hangs on section symbols and unknown symbols.  */
 struct mmix_symbol_gregs;