testsuite: Fix for gcc-4.8: gdb.base/jit.exp gdb.base/jit-so.exp

[deliverable/binutils-gdb.git] / gdb / aarch64-tdep.c

diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index c7da618e0ceaf19ca94dc199cc987c1d502ac892..77155ef2cc8bfd9c5a5f86dbff5335970f959e23 100644 (file)
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -299,7 +299,7 @@ aarch64_analyze_prologue (struct gdbarch *gdbarch,
              if (aarch64_debug)
                {
                  debug_printf ("aarch64: prologue analysis gave up "
-                               "addr=0x%s opcode=0x%x (orr x register)\n",
+                               "addr=%s opcode=0x%x (orr x register)\n",
                                core_addr_to_string_nz (start), insn);
                }
              break;
@@ -365,7 +365,7 @@ aarch64_analyze_prologue (struct gdbarch *gdbarch,
        {
          if (aarch64_debug)
            {
-             debug_printf ("aarch64: prologue analysis gave up addr=0x%s"
+             debug_printf ("aarch64: prologue analysis gave up addr=%s"
                            " opcode=0x%x\n",
                            core_addr_to_string_nz (start), insn);
            }
@@ -3192,15 +3192,17 @@ aarch64_record_asimd_load_store (insn_decode_record *aarch64_insn_r)
       else
         {
           for (sindex = 0; sindex < selem; sindex++)
-            if (bit (aarch64_insn_r->aarch64_insn, 22))
-              record_buf[reg_index++] = reg_rt + AARCH64_V0_REGNUM;
-            else
-              {
-                record_buf_mem[mem_index++] = esize / 8;
-                record_buf_mem[mem_index++] = address + addr_offset;
-              }
-            addr_offset = addr_offset + (esize / 8);
-            reg_rt = (reg_rt + 1) % 32;
+           {
+             if (bit (aarch64_insn_r->aarch64_insn, 22))
+               record_buf[reg_index++] = reg_rt + AARCH64_V0_REGNUM;
+             else
+               {
+                 record_buf_mem[mem_index++] = esize / 8;
+                 record_buf_mem[mem_index++] = address + addr_offset;
+               }
+             addr_offset = addr_offset + (esize / 8);
+             reg_rt = (reg_rt + 1) % 32;
+           }
         }
     }
   /* Load/store multiple structure.  */