changeset 9d44c9cfdddc in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=9d44c9cfdddc
description:
arch: fix build under MacOSX
put O_DIRECT under ifdefs -- this fixes build for MacOSX.
Also use correct class for arm64 openFlagTable.
Committed by: Nilay Vaish <[email protected]>
diffstat:
src/arch/arm/freebsd/freebsd.cc | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diffs (50 lines):
diff -r c78bfcfdfb02 -r 9d44c9cfdddc src/arch/arm/freebsd/freebsd.cc
--- a/src/arch/arm/freebsd/freebsd.cc Sat May 30 13:45:17 2015 +0200
+++ b/src/arch/arm/freebsd/freebsd.cc Sun Jun 07 14:02:40 2015 -0500
@@ -47,7 +47,9 @@
{ ArmFreebsd32::TGT_O_NONBLOCK, O_NONBLOCK },
{ ArmFreebsd32::TGT_O_SYNC, O_SYNC },
{ ArmFreebsd32::TGT_FASYNC, FASYNC },
+#ifdef O_DIRECT
{ ArmFreebsd32::TGT_O_DIRECT, O_DIRECT },
+#endif
{ ArmFreebsd32::TGT_O_DIRECTORY, O_DIRECTORY },
{ ArmFreebsd32::TGT_O_NOFOLLOW, O_NOFOLLOW },
};
@@ -57,20 +59,22 @@
// open(2) flags translation table
OpenFlagTransTable ArmFreebsd64::openFlagTable[] = {
- { ArmFreebsd32::TGT_O_RDONLY, O_RDONLY },
- { ArmFreebsd32::TGT_O_WRONLY, O_WRONLY },
- { ArmFreebsd32::TGT_O_RDWR, O_RDWR },
- { ArmFreebsd32::TGT_O_CREAT, O_CREAT },
- { ArmFreebsd32::TGT_O_EXCL, O_EXCL },
- { ArmFreebsd32::TGT_O_NOCTTY, O_NOCTTY },
- { ArmFreebsd32::TGT_O_TRUNC, O_TRUNC },
- { ArmFreebsd32::TGT_O_APPEND, O_APPEND },
- { ArmFreebsd32::TGT_O_NONBLOCK, O_NONBLOCK },
- { ArmFreebsd32::TGT_O_SYNC, O_SYNC },
- { ArmFreebsd32::TGT_FASYNC, FASYNC },
- { ArmFreebsd32::TGT_O_DIRECT, O_DIRECT },
- { ArmFreebsd32::TGT_O_DIRECTORY, O_DIRECTORY },
- { ArmFreebsd32::TGT_O_NOFOLLOW, O_NOFOLLOW },
+ { ArmFreebsd64::TGT_O_RDONLY, O_RDONLY },
+ { ArmFreebsd64::TGT_O_WRONLY, O_WRONLY },
+ { ArmFreebsd64::TGT_O_RDWR, O_RDWR },
+ { ArmFreebsd64::TGT_O_CREAT, O_CREAT },
+ { ArmFreebsd64::TGT_O_EXCL, O_EXCL },
+ { ArmFreebsd64::TGT_O_NOCTTY, O_NOCTTY },
+ { ArmFreebsd64::TGT_O_TRUNC, O_TRUNC },
+ { ArmFreebsd64::TGT_O_APPEND, O_APPEND },
+ { ArmFreebsd64::TGT_O_NONBLOCK, O_NONBLOCK },
+ { ArmFreebsd64::TGT_O_SYNC, O_SYNC },
+ { ArmFreebsd64::TGT_FASYNC, FASYNC },
+#ifdef O_DIRECT
+ { ArmFreebsd64::TGT_O_DIRECT, O_DIRECT },
+#endif
+ { ArmFreebsd64::TGT_O_DIRECTORY, O_DIRECTORY },
+ { ArmFreebsd64::TGT_O_NOFOLLOW, O_NOFOLLOW },
};
const int ArmFreebsd64::NUM_OPEN_FLAGS = sizeof(ArmFreebsd64::openFlagTable) /
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
