On Tue, Jun 18, 2013 at 12:37:26PM +0530, Sravan V Dodla wrote:
> Hello,
>
> I was trying to compile trinity-2013-06-17 build on s390x with kernel
> 3.9.4 and have hit the following issue:
>
> CC syscalls/fcntl.o
> syscalls/fcntl.c: In function ‘sanitise_fcntl’:
> syscalls/fcntl.c:70:2: error: duplicate case value
> case F_GETLK64:
> ^
> syscalls/fcntl.c:65:2: error: previously used here
> case F_GETLK:
> ^
> syscalls/fcntl.c:72:2: error: duplicate case value
> case F_SETLK64:
> ^
> syscalls/fcntl.c:66:2: error: previously used here
> case F_SETLK:
> ^
> syscalls/fcntl.c:74:2: error: duplicate case value
> case F_SETLKW64:
> ^
> syscalls/fcntl.c:67:2: error: previously used here
> case F_SETLKW:
> ^
> make: *** [syscalls/fcntl.o] Error 1
>
> Was this a known issue and I was not able to find anything related to
> this in archived mails.
Does this help ?
diff --git a/syscalls/fcntl.c b/syscalls/fcntl.c
index 6eb2344..5d651af 100644
--- a/syscalls/fcntl.c
+++ b/syscalls/fcntl.c
@@ -23,6 +23,10 @@
#include "shm.h"
#include "compat.h"
+#if F_GETLK64 != F_GETLK
+#define HAVE_LK64
+#endif
+
void sanitise_fcntl(int childno)
{
switch (shm->a2[childno]) {
@@ -66,7 +70,7 @@ void sanitise_fcntl(int childno)
case F_SETLK:
case F_SETLKW:
break;
-#ifndef __x86_64__
+#ifdef HAVE_LK64
case F_GETLK64:
break;
case F_SETLK64:
@@ -122,7 +126,7 @@ struct syscall syscall_fcntl = {
.arg2name = "cmd",
.arg2type = ARG_OP,
.arg2list = {
-#ifdef __x86_64__
+#ifndef HAVE_LK64
.num = 20,
#else
.num = 23,
@@ -130,7 +134,7 @@ struct syscall syscall_fcntl = {
.values = { F_DUPFD, F_DUPFD_CLOEXEC, F_GETFD, F_SETFD,
F_GETFL, F_SETFL, F_GETLK, F_SETLK,
F_SETLKW, F_GETOWN, F_SETOWN, F_GETOWN_EX, F_SETOWN_EX,
F_GETSIG, F_SETSIG, F_GETLEASE,
F_SETLEASE, F_NOTIFY, F_SETPIPE_SZ, F_GETPIPE_SZ,
-#ifndef __x86_64__
+#ifdef HAVE_LK64
F_GETLK64, F_SETLK64, F_SETLKW64,
#endif
},
--
To unsubscribe from this list: send the line "unsubscribe trinity" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
