mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-02-17 13:10:12 +08:00
sim: fix compilation on mingw64 [PR sim/28476]
...by reordering includes. 1. sim-utils.c sim/mips/sim-main.h defines UserMode, while there is a struct in winnt.h which has UserMode as a member. So if sim-main.h is included before winnt.h, compilation fails. 2. ppc registers.h defines CR, which is used as a member in winnt.h. winsock2.h is included by sys/time.h, so sys/time.h has to be included before registers.h. Bug: https://sourceware.org/PR28476
This commit is contained in:
parent
590abc168f
commit
1352aabb23
@ -20,9 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
/* This must come before any other includes. */
|
||||
#include "defs.h"
|
||||
|
||||
#include "sim-main.h"
|
||||
#include "sim-assert.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
#include <sys/time.h> /* needed by sys/resource.h */
|
||||
@ -34,6 +31,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include "libiberty.h"
|
||||
#include "bfd.h"
|
||||
#include "sim-main.h"
|
||||
#include "sim-assert.h"
|
||||
#include "sim-utils.h"
|
||||
|
||||
/* Allocate zero filled memory with xcalloc - xcalloc aborts if the
|
||||
|
@ -25,8 +25,7 @@
|
||||
/* Note: this module is called via a table. There is no benefit in
|
||||
making it inline */
|
||||
|
||||
#include "emul_generic.h"
|
||||
#include "emul_netbsd.h"
|
||||
#include "defs.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
@ -38,6 +37,9 @@
|
||||
#include <sys/param.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
#include "emul_generic.h"
|
||||
#include "emul_netbsd.h"
|
||||
|
||||
#ifdef HAVE_GETRUSAGE
|
||||
#ifndef HAVE_SYS_RESOURCE_H
|
||||
#undef HAVE_GETRUSAGE
|
||||
|
@ -25,8 +25,7 @@
|
||||
/* Note: this module is called via a table. There is no benefit in
|
||||
making it inline */
|
||||
|
||||
#include "emul_generic.h"
|
||||
#include "emul_unix.h"
|
||||
#include "defs.h"
|
||||
|
||||
#include <string.h>
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
@ -124,6 +123,9 @@ int getrusage();
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
|
||||
#include "emul_generic.h"
|
||||
#include "emul_unix.h"
|
||||
|
||||
#ifndef STATIC_INLINE_EMUL_UNIX
|
||||
#define STATIC_INLINE_EMUL_UNIX STATIC_INLINE
|
||||
#endif
|
||||
|
@ -21,9 +21,8 @@
|
||||
#ifndef _MON_C_
|
||||
#define _MON_C_
|
||||
|
||||
#include "basics.h"
|
||||
#include "cpu.h"
|
||||
#include "mon.h"
|
||||
#include "defs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include <string.h>
|
||||
@ -42,6 +41,10 @@
|
||||
int getrusage();
|
||||
#endif
|
||||
|
||||
#include "basics.h"
|
||||
#include "cpu.h"
|
||||
#include "mon.h"
|
||||
|
||||
#define MAX_BYTE_READWRITE 9
|
||||
#define MAX_SHIFT_READWRITE 3
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user