From 50e7cf943b73657d874a97dc587bcd8a7740cc00 Mon Sep 17 00:00:00 2001
From: Maxython <mixython@gmail.com>
Date: Mon, 1 Jan 2024 13:14:44 +0300
Subject: [PATCH] gpkg/glibc: experiment

---
 gpkg/glibc/ignore-syscall.h |  7 -------
 gpkg/glibc/syscall.c.patch  | 28 ++++++++++++++++++++--------
 gpkg/glibc/unistd.h.patch   | 10 ----------
 3 files changed, 20 insertions(+), 25 deletions(-)
 delete mode 100644 gpkg/glibc/unistd.h.patch

diff --git a/gpkg/glibc/ignore-syscall.h b/gpkg/glibc/ignore-syscall.h
index eb8395605..c5d369b8d 100644
--- a/gpkg/glibc/ignore-syscall.h
+++ b/gpkg/glibc/ignore-syscall.h
@@ -14,11 +14,4 @@ static struct IdSyscalls ListIgnoreSyscall[] = {
 
 #define count_ignore_syscall (sizeof(ListIgnoreSyscall) / sizeof(ListIgnoreSyscall[0]))
 
-static int is_ignore_syscall(int id) {
-	for (int i=0; i<count_ignore_syscall; ++i)
-		if (ListIgnoreSyscall[i].id == id)
-			return 1;
-	return 0;
-}
-
 #endif //_IGNORE_SYSCALL
diff --git a/gpkg/glibc/syscall.c.patch b/gpkg/glibc/syscall.c.patch
index e64330d33..03c6eada9 100644
--- a/gpkg/glibc/syscall.c.patch
+++ b/gpkg/glibc/syscall.c.patch
@@ -1,6 +1,6 @@
---- src/sysdeps/unix/sysv/linux/syscall.c	2023-07-31 20:54:16.000000000 +0300
-+++ src/sysdeps/unix/sysv/linux/syscall.c.patch	2023-12-25 23:09:19.195827394 +0300
-@@ -18,10 +18,14 @@
+--- glibc-2.38/sysdeps/unix/sysv/linux/syscall.c	2023-07-31 20:54:16.000000000 +0300
++++ glibc-2.38/sysdeps/unix/sysv/linux/syscall.c.patch	2024-01-01 13:12:45.120508427 +0300
+@@ -18,26 +18,26 @@
  
  #include <stdarg.h>
  #include <sysdep.h>
@@ -9,14 +9,26 @@
  long int
  syscall (long int number, ...)
  {
-+  if (is_ignore_syscall(number))
-+    return 0;
++  for (int i=0; i<count_ignore_syscall; ++i)
++    if (ListIgnoreSyscall[i].id == number)
++      return 0;
 +
    va_list args;
  
    va_start (args, number);
-@@ -33,11 +37,5 @@
-   long int a5 = va_arg (args, long int);
+-  long int a0 = va_arg (args, long int);
+-  long int a1 = va_arg (args, long int);
+-  long int a2 = va_arg (args, long int);
+-  long int a3 = va_arg (args, long int);
+-  long int a4 = va_arg (args, long int);
+-  long int a5 = va_arg (args, long int);
++  long int res = syscallS (number,
++    va_arg (args, long int),
++    va_arg (args, long int),
++    va_arg (args, long int),
++    va_arg (args, long int),
++    va_arg (args, long int),
++    va_arg (args, long int));
    va_end (args);
  
 -  long int r = INTERNAL_SYSCALL_NCS_CALL (number, a0, a1, a2, a3, a4, a5);
@@ -26,5 +38,5 @@
 -      return -1;
 -    }
 -  return r;
-+  return syscallS (number, a0, a1, a2, a3, a4, a5);
++  return res;
  }
diff --git a/gpkg/glibc/unistd.h.patch b/gpkg/glibc/unistd.h.patch
deleted file mode 100644
index 0c4e81acc..000000000
--- a/gpkg/glibc/unistd.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- glibc-2.38/posix/unistd.h	2023-07-31 20:54:16.000000000 +0300
-+++ glibc-2.38/posix/unistd.h.patch	2023-12-26 11:16:26.077614803 +0300
-@@ -1088,6 +1088,7 @@
- 
-    In Mach, all system calls take normal arguments and always return an
-    error code (zero for success).  */
-+extern long int syscallS (long int __sysno, ...) __THROW;
- extern long int syscall (long int __sysno, ...) __THROW;
- 
- #endif	/* Use misc.  */