From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sun, 29 Apr 2018 21:59:55 +0000 (+0000)
Subject: xlat: fix F_* fallback definitions on alpha, hppa, mips, and sparc
X-Git-Tag: v4.23~244
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa8f4866a46fd7bafd20b9cae4ec9c2e0e49a35c;p=strace

xlat: fix F_* fallback definitions on alpha, hppa, mips, and sparc

* xlat/fcntlcmds.in (F_GETLK, F_SETLK, F_SETLKW, F_SETOWN, F_GETOWN,
F_SETSIG, F_GETSIG) [alpha || hppa || mips || sparc]: Fix definitions.
* xlat/fcntl64cmds.in (F_GETLK64, F_SETLK64, F_SETLKW64) [hppa || mips]:
Likewise.
---

diff --git a/xlat/fcntl64cmds.in b/xlat/fcntl64cmds.in
index 074efe45..afed2135 100644
--- a/xlat/fcntl64cmds.in
+++ b/xlat/fcntl64cmds.in
@@ -1,4 +1,14 @@
 /* asm-generic/fcntl.h */
+#if defined __hppa__
+F_GETLK64	8
+F_SETLK64	9
+F_SETLKW64	10
+#elif defined __mips__
+F_GETLK64	33
+F_SETLK64	34
+F_SETLKW64	35
+#else
 F_GETLK64	12
 F_SETLK64	13
 F_SETLKW64	14
+#endif
diff --git a/xlat/fcntlcmds.in b/xlat/fcntlcmds.in
index c050836c..85fe9f04 100644
--- a/xlat/fcntlcmds.in
+++ b/xlat/fcntlcmds.in
@@ -4,13 +4,48 @@ F_GETFD		1
 F_SETFD		2
 F_GETFL		3
 F_SETFL		4
+
+#if defined __alpha__ || defined __sparc__
+F_GETLK		7
+#elif defined __mips__
+F_GETLK		14
+#else
 F_GETLK		5
+#endif
+
+#if defined __alpha__ || defined __sparc__
+F_SETLK		8
+F_SETLKW	9
+#else
 F_SETLK		6
 F_SETLKW	7
+#endif
+
+#if defined __alpha__
+F_SETOWN	5
+F_GETOWN	6
+#elif defined __hppa__
+F_GETOWN	11
+F_SETOWN	12
+#elif defined __mips__
+F_GETOWN	23
+F_SETOWN	24
+#elif defined __sparc__
+F_GETOWN	5
+F_SETOWN	6
+#else
 F_SETOWN	8
 F_GETOWN	9
+#endif
+
+#ifdef __hppa__
+F_SETSIG	13
+F_GETSIG	14
+#else
 F_SETSIG	10
 F_GETSIG	11
+#endif
+
 F_SETOWN_EX	15
 F_GETOWN_EX	16
 F_GETOWNER_UIDS	17