2004-10-25 H.J. Lu <hongjiu.lu@intel.com>

	PR 474
	* config/tc-ia64.c (emit_one_bundle): Decrement md.num_slots_in_use
	after reporting template error during manual bundling. Reported
	by Michael Dupont, michaelx.dupont@intel.com.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index fdc74da04ddae82bb30a91dafca470e4e22fe39f..0840103a329ecf68f701c378188370a755796dbc 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR 474
+       * config/tc-ia64.c (emit_one_bundle): Decrement md.num_slots_in_use
+       after reporting template error during manual bundling. Reported
+       by Michael Dupont, michaelx.dupont@intel.com.
+
 2004-10-25  Daniel Jacobowitz  <dan@debian.org>
 
        * Makefile.am: Run dep-am.

diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index fc768d906a620a15b1745f491619b3504e6edf8f..b18b0ea0c856410e69afb163787383126e3e3c50 100644 (file)
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -6496,9 +6496,12 @@ emit_one_bundle ()
   if (manual_bundling)
     {
       if (md.num_slots_in_use > 0)
-       as_bad_where (md.slot[curr].src_file, md.slot[curr].src_line,
-                     "`%s' does not fit into %s template",
-                     idesc->name, ia64_templ_desc[template].name);
+       {
+         as_bad_where (md.slot[curr].src_file, md.slot[curr].src_line,
+                       "`%s' does not fit into %s template",
+                       idesc->name, ia64_templ_desc[template].name);
+         --md.num_slots_in_use;
+       }
       else
        as_bad_where (md.slot[curr].src_file, md.slot[curr].src_line,
                      "Missing '}' at end of file");