|
From: <sv...@va...> - 2009-02-22 23:05:50
|
Author: njn
Date: 2009-02-22 23:05:45 +0000 (Sun, 22 Feb 2009)
New Revision: 9220
Log:
Merge r9217 (make fcntl and fcntl64 Linux wrappers more consistent) from the
trunk.
Modified:
branches/DARWIN/coregrind/m_syswrap/syswrap-linux.c
Modified: branches/DARWIN/coregrind/m_syswrap/syswrap-linux.c
===================================================================
--- branches/DARWIN/coregrind/m_syswrap/syswrap-linux.c 2009-02-22 23:00:30 UTC (rev 9219)
+++ branches/DARWIN/coregrind/m_syswrap/syswrap-linux.c 2009-02-22 23:05:45 UTC (rev 9220)
@@ -3173,7 +3173,6 @@
case VKI_F_GETLK64:
case VKI_F_SETLK64:
case VKI_F_SETLKW64:
-# else
# endif
PRINT("sys_fcntl[ARG3=='lock'] ( %ld, %ld, %#lx )", ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "fcntl",
@@ -3187,7 +3186,11 @@
break;
}
+# if defined(VGP_x86_linux)
+ if (ARG2 == VKI_F_SETLKW || ARG2 == VKI_F_SETLKW64)
+# else
if (ARG2 == VKI_F_SETLKW)
+# endif
*flags |= SfMayBlock;
}
@@ -3250,11 +3253,10 @@
# if defined(VGP_x86_linux)
if (ARG2 == VKI_F_SETLKW || ARG2 == VKI_F_SETLKW64)
- *flags |= SfMayBlock;
# else
if (ARG2 == VKI_F_SETLKW)
+# endif
*flags |= SfMayBlock;
-# endif
}
POST(sys_fcntl64)
|