sim: unify toolchain dependency logic

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

diff --git a/sim/common/dv-cfi.c b/sim/common/dv-cfi.c
index a7581fc235108c83a4763e23ccc99993bbc3acfe..02a2cedd558b8fb16b7f68ba4f81cd98cfc4d571 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-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2021 Free Software Foundation, Inc.
    Contributed by Analog Devices, Inc.
 
    This file is part of simulators.
@@ -22,7 +22,8 @@
 
 /* TODO: support vendor query tables.  */
 
-#include "cconfig.h"
+/* This must come before any other includes.  */
+#include "defs.h"
 
 #include <math.h>
 #include <errno.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)
     {