[Minios-devel] [UNIKRAFT PATCH 1/3] lib/nolibc: Move time.c to lib/uktime

[Costin Lupu <costin.lupu@xxxxxxxxx>]

There are 2 files time.c with duplicated code in nolibc and newlib, with minor
differences. Therefore it makes more sense to move it in a common time-related
library.

Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx>
---
 lib/nolibc/Makefile.uk        | 1 -
 lib/uktime/Makefile.uk        | 1 +
 lib/{nolibc => uktime}/time.c | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/{nolibc => uktime}/time.c (100%)

diff --git a/lib/nolibc/Makefile.uk b/lib/nolibc/Makefile.uk
index 45f0b0fc..7cb2e7d1 100644
--- a/lib/nolibc/Makefile.uk
+++ b/lib/nolibc/Makefile.uk
@@ -33,7 +33,6 @@ LIBNOLIBC_SRCS-y += $(LIBNOLIBC_BASE)/string.c
 LIBNOLIBC_SRCS-y += $(LIBNOLIBC_BASE)/getopt.c
 LIBNOLIBC_SRCS-y += $(LIBNOLIBC_BASE)/sscanf.c
 LIBNOLIBC_SRCS-y += $(LIBNOLIBC_BASE)/asprintf.c
-LIBNOLIBC_SRCS-y += $(LIBNOLIBC_BASE)/time.c
 LIBNOLIBC_SRCS-$(CONFIG_LIBUKALLOC) += $(LIBNOLIBC_BASE)/malloc.c
 
 # Localize internal symbols (starting with __*)
diff --git a/lib/uktime/Makefile.uk b/lib/uktime/Makefile.uk
index a1bee0a2..47fbb4b3 100644
--- a/lib/uktime/Makefile.uk
+++ b/lib/uktime/Makefile.uk
@@ -10,3 +10,4 @@ LIBUKTIME_SRCS-y += 
$(LIBUKTIME_BASE)/musl-imported/src/__secs_to_tm.c
 LIBUKTIME_SRCS-y += $(LIBUKTIME_BASE)/musl-imported/src/timegm.c
 LIBUKTIME_SRCS-y += $(LIBUKTIME_BASE)/musl-imported/src/__tm_to_secs.c
 LIBUKTIME_SRCS-y += $(LIBUKTIME_BASE)/musl-imported/src/__year_to_secs.c
+LIBUKTIME_SRCS-y += $(LIBUKTIME_BASE)/time.c
diff --git a/lib/nolibc/time.c b/lib/uktime/time.c
similarity index 100%
rename from lib/nolibc/time.c
rename to lib/uktime/time.c
-- 
2.20.1


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