X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fsyscall-list.h;h=37efc5681dd0368a8c9f9067db711ff8c71f1d3c;hb=05d3a176239c1dd67863c70a5b79d9bc14144ef6;hp=0fc68596053e668e596f5679bd47fefb563adccf;hpb=8351ceaea9480d9c2979aa2ff0f4982cfdfef58d;p=elogind.git

diff --git a/src/core/syscall-list.h b/src/core/syscall-list.h
index 0fc685960..37efc5681 100644
--- a/src/core/syscall-list.h
+++ b/src/core/syscall-list.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foosyscalllisthfoo
-#define foosyscalllisthfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -22,9 +21,21 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#if defined __x86_64__ && defined __ILP32__
+/* The x32 ABI defines all of its syscalls with bit 30 set, which causes
+   issues when attempting to use syscalls as simple indices into an array.
+   Instead, use the syscall id & ~SYSCALL_MASK as the index, and | the
+   internal id with the syscall mask as needed.
+*/
+#include <asm/unistd.h>
+#define SYSCALL_TO_INDEX(x) ((x) & ~__X32_SYSCALL_BIT)
+#define INDEX_TO_SYSCALL(x) ((x) | __X32_SYSCALL_BIT)
+#else
+#define SYSCALL_TO_INDEX(x) (x)
+#define INDEX_TO_SYSCALL(x) (x)
+#endif
+
 const char *syscall_to_name(int id);
 int syscall_from_name(const char *name);
 
 int syscall_max(void);
-
-#endif