* config/tc-ia64.c (emit_one_bundle): Stop collecting insns

        for template selection when a label is needed.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4d8e05ad8a9966060727e4a810d9c6d491555730..92e835c096a8651ad3f9d2a6a8243a1d30aeb73f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-03  Richard Henderson  <rth@cygnus.com>
+
+       * config/tc-ia64.c (emit_one_bundle): Stop collecting insns
+       for template selection when a label is needed.
+
 2000-09-02  Kazu Hirata  <kazu@hxi.com>
 
        * config/tc-ia64.c: Fix formatting.

diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index 05e37dbbd1769a403f99f6f684eac3cace38fabe..2fb2541fc6bc21aac779023cd0c9ef14f30fc0c9 100644 (file)
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -5233,11 +5233,13 @@ emit_one_bundle ()
     user_template = template = md.slot[first].user_template;
   else
     {
-      /* auto select appropriate template */
+      /* Auto select appropriate template.  */
       memset (type, 0, sizeof (type));
       curr = first;
       for (i = 0; i < n; ++i)
        {
+         if (md.slot[curr].label_fixups && i != 0)
+           break;
          type[i] = md.slot[curr].idesc->type;
          curr = (curr + 1) % NUM_SLOTS;
        }