sim: frv: fix ambiguous else compiler warnings

[binutils-gdb.git] / sim / frv / options.c

diff --git a/sim/frv/options.c b/sim/frv/options.c
index e464f18cd56e651867630e2ccc72d38182d3b9ad..3528c357c68035ce804151da7ef92d5f4ece769c 100644 (file)
--- a/sim/frv/options.c
+++ b/sim/frv/options.c
@@ -1,5 +1,5 @@
 /* FRV simulator memory option handling.
-   Copyright (C) 1999, 2000, 2007, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1999-2021 Free Software Foundation, Inc.
    Contributed by Red Hat.
 
 This file is part of GDB, the GNU debugger.
@@ -17,6 +17,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/* This must come before any other includes.  */
+#include "defs.h"
+
 #define WANT_CPU frvbf
 #define WANT_CPU_FRVBF
 
@@ -24,16 +27,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sim-assert.h"
 #include "sim-options.h"
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 
 /* FRV specific command line options. */