PowerPC64 .branch_lt address

[binutils-gdb.git] / sim / common / dv-cfi.c

diff --git a/sim/common/dv-cfi.c b/sim/common/dv-cfi.c
index 19677cbfac71a26441a49e1a17f2875c7b3d98f7..d63b0ed6da2d442d9263fe28424d16ec5a02c98d 100644 (file)
--- a/sim/common/dv-cfi.c
+++ b/sim/common/dv-cfi.c
@@ -2,7 +2,7 @@
    http://www.spansion.com/Support/AppNotes/CFI_Spec_AN_03.pdf
    http://www.spansion.com/Support/AppNotes/cfi_100_20011201.pdf
 
-   Copyright (C) 2010-2016 Free Software Foundation, Inc.
+   Copyright (C) 2010-2022 Free Software Foundation, Inc.
    Contributed by Analog Devices, Inc.
 
    This file is part of simulators.
@@ -22,11 +22,12 @@
 
 /* TODO: support vendor query tables.  */
 
-#include "cconfig.h"
+/* This must come before any other includes.  */
+#include "defs.h"
 
-#include <math.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <math.h>
 #include <stdbool.h>
 #include <unistd.h>
 #ifdef HAVE_SYS_MMAN_H
@@ -610,7 +611,7 @@ attach_cfi_regs (struct hw *me, struct cfi *cfi)
     if (cfi_cmdsets[i]->id == ival)
       cfi->cmdset = cfi_cmdsets[i];
   if (cfi->cmdset == NULL)
-    hw_abort (me, "cmdset %u not supported", ival);
+    hw_abort (me, "cmdset %" PRIiTC " not supported", ival);
 
   if (ret == 2)
     {