[AArch64] Fix errors rebasing the ARMv8.2 AT and system registers patch

[deliverable/binutils-gdb.git] / opcodes / ia64-dis.c

diff --git a/opcodes/ia64-dis.c b/opcodes/ia64-dis.c
index 13ee194925893fcf84041b01e11103b009740810..bb96777b32cba317223f1c7914e05a02b0eaa3b1 100644 (file)
--- a/opcodes/ia64-dis.c
+++ b/opcodes/ia64-dis.c
@@ -1,6 +1,5 @@
 /* ia64-dis.c -- Disassemble ia64 instructions
-   Copyright 1998, 1999, 2000, 2002, 2005, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 1998-2015 Free Software Foundation, Inc.
    Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
 
    This file is part of the GNU opcodes library.
@@ -20,8 +19,8 @@
    Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
+#include "sysdep.h"
 #include <assert.h>
-#include <string.h>
 
 #include "dis-asm.h"
 #include "opcode/ia64.h"
@@ -304,7 +303,7 @@ print_insn_ia64 (bfd_vma memaddr, struct disassemble_info *info)
          need_comma = 0;
        }
     }
-  if (slotnum + 1 == ia64_templ_desc[template_val].group_boundary 
+  if (slotnum + 1 == ia64_templ_desc[template_val].group_boundary
       || ((slotnum == 2) && s_bit))
     (*info->fprintf_func) (info->stream, ";;");