From: H.J. Lu <hjl.tools@gmail.com>
Date: Tue, 17 May 2005 17:23:37 +0000 (+0000)
Subject: 2005-05-17  H.J. Lu  <hongjiu.lu@intel.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5e27d42770ef937b86823315224cbbff12d7c856;p=binutils-gdb.git

2005-05-17  H.J. Lu  <hongjiu.lu@intel.com>

	* elfxx-ia64.c (elfNN_ia64_relax_br): Keep the original
	predicate on slot 0 only if slot 0 isn't br.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e60fbd6c777..8fb261fa913 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (elfNN_ia64_relax_br): Keep the original
+	predicate on slot 0 only if slot 0 isn't br.
+
 2005-05-17  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR 797
diff --git a/bfd/elfxx-ia64.c b/bfd/elfxx-ia64.c
index cc8e5beebe3..0a906ec5f55 100644
--- a/bfd/elfxx-ia64.c
+++ b/bfd/elfxx-ia64.c
@@ -795,9 +795,12 @@ elfNN_ia64_relax_br (bfd_byte *contents, bfd_vma off)
 
   if (template == 0x16)
     {
-      /* For BBB, we need to put nop.m in slot 0 and keep the original
-	 predicate.  */
-      t0 &= PREDICATE_BITS << 5;
+      /* For BBB, we need to put nop.m in slot 0.  We keep the original
+	 predicate only if slot 0 isn't br.  */
+      if (br_slot == 0)
+	t0 = 0LL;
+      else
+	t0 &= PREDICATE_BITS << 5;
       t0 |= 0x1LL << (X4_SHIFT + 5);
     }
   else