Use uk/bits/syscall_nrs.h instead of musl internal bits/syscall.h

This patch updates Makefile.uk and include/sys/syscall.h in order to
avoid generating a clone of syscall_nrs.h which is defined within
Unikraft.

Signed-off-by: Gaulthier Gain <gaulthier.gain@uliege.be>
Reviewed-by: Simon Kuenzer <simon.kuenzer@neclab.eu>

diff --git a/Makefile.uk b/Makefile.uk
index a0a843c1f73a67a1e0393b40414c52dffc54abfc..9657bb75b872054f4e8eaf589db1eea4cd75cef0 100644 (file)
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -79,13 +79,6 @@ $(LIBMUSL)/arch/$(ARCH)/bits/alltypes.h: $(LIBMUSL_BUILD)/.patched
                $(LIBMUSL)/include/alltypes.h.in > $@ && \
                $(TOUCH) $@)
 
-# generate syscall.h
-$(LIBMUSL)/arch/$(ARCH)/bits/syscall.h: $(LIBMUSL)/arch/$(ARCH)/bits/syscall.h.in
-       $(call verbose_cmd,CONFIGURE,libmusl: $(notdir $@),\
-               cp $< $@ && \
-               sed -n -e s/__NR_/SYS_/p < $< >> $@ && \
-               $(TOUCH) $@)
-
 # generate version.h
 $(LIBMUSL)/src/internal/version.h: 
        $(call verbose_cmd,CONFIGURE,libmusl: $(notdir $@),\
@@ -93,11 +86,9 @@ $(LIBMUSL)/src/internal/version.h:
                $(TOUCH) $@)
 
 UK_PREPARE += $(LIBMUSL)/arch/$(ARCH)/bits/alltypes.h
-UK_PREPARE += $(LIBMUSL)/arch/$(ARCH)/bits/syscall.h
 UK_PREPARE += $(LIBMUSL)/src/internal/version.h
 
 LIBMUSL_CLEAN += $(LIBMUSL)/arch/$(ARCH)/bits/alltypes.h
-LIBMUSL_CLEAN += $(LIBMUSL)/arch/$(ARCH)/bits/syscall.h
 LIBMUSL_CLEAN += $(LIBMUSL)/src/internal/version.h
 
 ################################################################################

diff --git a/patches/0006-Use-uk_bits_syscall_nrs.patch b/patches/0006-Use-uk_bits_syscall_nrs.patch
new file mode 100644 (file)
index 0000000..6d1fdf5
--- /dev/null
+++ b/patches/0006-Use-uk_bits_syscall_nrs.patch
@@ -0,0 +1,26 @@
+From 0707c3af258a7859bd91e3efa468d39a5a151a3f Mon Sep 17 00:00:00 2001
+From: Gaulthier Gain <gaulthier.gain@uliege.be>
+Date: Sat, 25 Jan 2020 14:18:41 +0100
+Subject: [PATCH] Use uk/bits/syscall_nrs.h instead of musl internal
+ bits/syscall.h
+
+Signed-off-by: Gaulthier Gain <gaulthier.gain@uliege.be>
+---
+ include/sys/syscall.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/sys/syscall.h b/include/sys/syscall.h
+index 24987dd..918de59 100644
+--- a/include/sys/syscall.h
++++ b/include/sys/syscall.h
+@@ -1,6 +1,6 @@
+ #ifndef _SYS_SYSCALL_H
+ #define _SYS_SYSCALL_H
+
+-#include <bits/syscall.h>
++#include <uk/bits/syscall_nrs.h>
+
+ #endif
+--
+2.20.1
+