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 52dcf4565769c0b513126126240f58bebefa28d9..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-2011 Free Software Foundation, Inc.
+   Copyright (C) 2010-2021 Free Software Foundation, Inc.
    Contributed by Analog Devices, Inc.
 
    This file is part of simulators.
@@ -22,18 +22,21 @@
 
 /* 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 <stdbool.h>
 #include <unistd.h>
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
 
 #include "sim-main.h"
-#include "devices.h"
+#include "hw-base.h"
+#include "hw-main.h"
 #include "dv-cfi.h"
 
 /* Flashes are simple state machines, so here we cover all the
@@ -608,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)
     {
@@ -725,7 +728,7 @@ attach_cfi_regs (struct hw *me, struct cfi *cfi)
   /* Figure out where our initial flash data is coming from.  */
   if (fd != -1 && fd_writable)
     {
-#ifdef HAVE_MMAP
+#if defined (HAVE_MMAP) && defined (HAVE_POSIX_FALLOCATE)
       posix_fallocate (fd, 0, cfi->dev_size);
 
       cfi->mmap = mmap (NULL, cfi->dev_size,