[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Minios-devel] [UNIKRAFT/MUSL PATCH V2 08/28] Add patch to remove syscall prototype in unistd.h



I think we should introduce `long syscall(long, ...)` with `syscall_shim`. But this patch should work so far until we solve this.

Reviewed-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>

On 29.01.20 22:18, Gaulthier Gain wrote:
This patch removes the long syscall(long, ...) prototype which
conflicts with Unikraft's syscall_shim layer macros.

Signed-off-by: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
---
  ...-prototype-for-syscall-from-unistd.h.patch | 26 +++++++++++++++++++
  1 file changed, 26 insertions(+)
  create mode 100644 
patches/0001-Remove-prototype-for-syscall-from-unistd.h.patch

diff --git a/patches/0001-Remove-prototype-for-syscall-from-unistd.h.patch 
b/patches/0001-Remove-prototype-for-syscall-from-unistd.h.patch
new file mode 100644
index 0000000..d606afc
--- /dev/null
+++ b/patches/0001-Remove-prototype-for-syscall-from-unistd.h.patch
@@ -0,0 +1,26 @@
+From 64fc9d1ed189b546903e477b533cc73b8aa23187 Mon Sep 17 00:00:00 2001
+From: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
+Date: Thu, 17 Oct 2019 08:52:18 +0200
+Subject: [PATCH] Remove prototype for syscall from unistd.h
+
+With Unikraft shim layer, `syscall` is a macro and not a function.
+
+Signed-off-by: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
+---
+ include/unistd.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/include/unistd.h b/include/unistd.h
+index 09190af4..6ee0f1f1 100644
+--- a/include/unistd.h
++++ b/include/unistd.h
+@@ -173,7 +173,6 @@ void setusershell(void);
+ void endusershell(void);
+ char *getusershell(void);
+ int acct(const char *);
+-long syscall(long, ...);
+ int execvpe(const char *, char *const [], char *const []);
+ int issetugid(void);
+ #endif
+--
+2.23.0


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.