Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging

[qemu.git] / ia64-dis.c

diff --git a/ia64-dis.c b/ia64-dis.c
index da73a98ba5606310be05501783df5a0714151369..2a103e6b5cbfa6a71381ce39ab2f79449a05391b 100644 (file)
--- a/ia64-dis.c
+++ b/ia64-dis.c
@@ -781,6 +781,9 @@ ext_inc3 (const struct ia64_operand *self, ia64_insn code, ia64_insn *valuep)
   return 0;
 }
 
+/* glib.h defines ABS so we must undefine it to avoid a clash */
+#undef ABS
+
 #define CST    IA64_OPND_CLASS_CST
 #define REG    IA64_OPND_CLASS_REG
 #define IND    IA64_OPND_CLASS_IND
@@ -10560,11 +10563,14 @@ print_insn_ia64 (bfd_vma memaddr, struct disassemble_info *info)
            if (str)
              (*info->fprintf_func) (info->stream, "%s", str);
            else if (odesc->flags & IA64_OPND_FLAG_DECIMAL_SIGNED)
-             (*info->fprintf_func) (info->stream, "%lld", (long long) value);
+              (*info->fprintf_func) (info->stream, "%" PRId64,
+                                     (int64_t) value);
            else if (odesc->flags & IA64_OPND_FLAG_DECIMAL_UNSIGNED)
-             (*info->fprintf_func) (info->stream, "%llu", (long long) value);
+              (*info->fprintf_func) (info->stream, "%" PRIu64,
+                                     (uint64_t) value);
            else
-             (*info->fprintf_func) (info->stream, "0x%llx", (long long) value);
+              (*info->fprintf_func) (info->stream, "0x%" PRIx64,
+                                     (uint64_t) value);
            break;
 
          case IA64_OPND_CLASS_REL: