Fix double-word branch on bit instruction.

        Backport from mainline
        2017-07-31  John David Anglin  <danglin@gcc.gnu.org>

        * config/tc-hppa.c (pa_ip): Clear `d' bit in branch on bit instructions
        with a double-word condition and a fixed bit position greater than 31.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 948f23662cac8ad67adb66809e4c937cf42b0ff3..cfa67e9efc92278c1b5f6678df5543dbe98290e1 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2017-08-02  John David Anglin  <danglin@gcc.gnu.org>
+
+       Backport from mainline
+       2017-07-31  John David Anglin  <danglin@gcc.gnu.org>
+
+       * config/tc-hppa.c (pa_ip): Clear `d' bit in branch on bit instructions
+       with a double-word condition and a fixed bit position greater than 31.
+
 2017-08-01  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
 
        Backport from mainline

diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index 724b48bfbce0d102f980f4f0a3bf3f809320404f..e4ec89260772767464733e013b2018891ccfe8e9 100644 (file)
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -5216,9 +5216,7 @@ pa_ip (char *str)
              s = expr_end;
              CHECK_FIELD (num, 63, 0, strict);
              if (num & 0x20)
-               ;
-             else
-               opcode |= (1 << 13);
+               opcode &= ~(1 << 13);
              INSERT_FIELD_AND_CONTINUE (opcode, num & 0x1f, 21);
 
            /* Handle a 5 bit immediate at 10.  */