Xen project Mailing List

[Minios-devel] [UNIKRAFT PATCH 3/3] lib/nolibc: Adapt ioctl.h header to Unikraft

From: Costin Lupu <costin.lupu@xxxxxxxxx>

Date: Thu, 12 Sep 2019 19:30:55 +0300

Delivery-date: Thu, 12 Sep 2019 16:31:16 +0000

Ironport-phdr: 9a23:/peLdB3WXthpveFZsmDT+DRfVm0co7zxezQtwd8ZseITLfad9pjvdHbS+e9qxAeQG9mCsLQc1qGH4uigATVGvc/b9ihaMdRlbFwssY0uhQsuAcqIWwXQDcXBSGgEJvlET0Jv5HqhMEJYS47UblzWpWCuv3ZJQk2sfQV6Kf7oFYHMks+5y/69+4HJYwVPmTGxfa5+IA+5oAnMuMQam5duJ6Y+xhbNpnZDZuBayX91KV6JkBvw+9m88IR//yhMvv4q6tJNX7j9c6kkV7JTES4oM3oy5M3ltBnDSRWA634BWWgIkRRGHhbI4gjiUpj+riX1uOx92DKHPcLtVrA7RS6i76ZwRxD2jioMKiM0/3vWisx0i6JbvQ6hqhliyIPafI2ZKPxzdb7bcNgHR2ROQ9xRWjRBDI2icoUBAekPM+FaoInzvFYCsQeyCBOwCO711jNEmnn71rA63eQ7FgHG2RQtEswJsHTPsNX1NaESWv2zwqnV1TXDcu5d1DDh54jPaRAhvfCMXbRqfcrV1EkvDx7Fg06Mpoz+JT+VzvkNvHOB4+p6UuKikmgqoBxyrDi33sogl4bEip8Pxl3H9Sh12pg5KcO6RUJhb9OoCIZcui6HO4dsQc4vQ3tktDg0x7AIo5K3YScHxIohyhXCcfKIaZKI7QjmVOuJJDd4g29qd6ynihap9Eig1vX8Vs6p0FZWtiZFksfDtnQK1xHL9MiHT+Fy/kal2TqVyw/T8ftIIVgplaXAMZIh2LkwmoISsUTFACD2hF37gLKZe0k54OSl6OTqbq/4qpOCNYJ4kA/zPrwrmsOlAOQ4NgYOX3Kc+eS5zLDs4Ur5QK5Wjv03lKnVqpTaJdkDpq6kGAJazp0j5wynDze7y9sUh2MHLFVddBKdk4fpI03OIOz/DfqnhlSskTFrx/HBPr36G5nCM2bMkKn/crZ58ENczAszzctD55JPEL0AL+z8WknruNzfFB85PBS+w/z7B9VlyoMeRWWPD7eCMKPSq1CI/PggI++WaI8Oojn9LeQl5/70gn8/g1AdeLKk3Z0JZ3+kGvRpOV6WbWDyjdccQi82uV87Terrj0bHXTNNanKaW6Mn+ip9GI+gS4DZSdODmruEiQy8BYFXYChiF0iRWSPjcJ6YWvFKbD+KP+dqiXocSLLnUYh3hkLmjxPz17cydrmcwSYfr5+2jNU=

Ironport-sdr: dSIXzWVPqi4iigftafHIexY4DuMg9BQPU4RaezGCNyywuvfVQIXEBZB+O9so0DmIUXrNvtt4Sb miX+9tBIRSJQ==

List-id: Mini-os development list <minios-devel.lists.xenproject.org>

These are the same changes we did for newlib glue code. Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx> --- lib/nolibc/Makefile.uk | 10 ++++++---- lib/nolibc/musl-imported/arch/generic/bits/ioctl.h | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/nolibc/Makefile.uk b/lib/nolibc/Makefile.uk index 5e267fe2..45f0b0fc 100644 --- a/lib/nolibc/Makefile.uk +++ b/lib/nolibc/Makefile.uk @@ -17,11 +17,13 @@ LIBNOLIBC_NO_BUILTINS += -fno-builtin-vsscanf CFLAGS-$(CONFIG_LIBNOLIBC) += $(LIBNOLIBC_NO_BUILTINS) CXXFLAGS-$(CONFIG_LIBNOLIBC) += $(LIBNOLIBC_NO_BUILTINS) -CINCLUDES-$(CONFIG_LIBNOLIBC) += -I$(LIBNOLIBC_BASE)/include -CXXINCLUDES-$(CONFIG_LIBNOLIBC) += -I$(LIBNOLIBC_BASE)/include -CINCLUDES-$(CONFIG_LIBNOLIBC) += -I$(LIBNOLIBC_BASE)/arch/$(ARCH) -CXXINCLUDES-$(CONFIG_LIBNOLIBC) += -I$(LIBNOLIBC_BASE)/include +LIBNOLIBC_GLOBAL_INCLUDES-y += -I$(LIBNOLIBC_BASE)/include +LIBNOLIBC_GLOBAL_INCLUDES-y += -I$(LIBNOLIBC_BASE)/arch/$(ARCH) +LIBNOLIBC_GLOBAL_INCLUDES-y += -I$(LIBNOLIBC_BASE)/musl-imported/include +LIBNOLIBC_GLOBAL_INCLUDES-y += -I$(LIBNOLIBC_BASE)/musl-imported/arch/generic +CINCLUDES-$(CONFIG_LIBNOLIBC) += $(LIBNOLIBC_GLOBAL_INCLUDES-y) +CXXINCLUDES-$(CONFIG_LIBNOLIBC) += $(LIBNOLIBC_GLOBAL_INCLUDES-y) LIBNOLIBC_SRCS-y += $(LIBNOLIBC_BASE)/errno.c LIBNOLIBC_SRCS-y += $(LIBNOLIBC_BASE)/stdio.c diff --git a/lib/nolibc/musl-imported/arch/generic/bits/ioctl.h b/lib/nolibc/musl-imported/arch/generic/bits/ioctl.h index d1a6c035..378d495f 100644 --- a/lib/nolibc/musl-imported/arch/generic/bits/ioctl.h +++ b/lib/nolibc/musl-imported/arch/generic/bits/ioctl.h @@ -103,8 +103,10 @@ #define SIOCSPGRP 0x8902 #define FIOGETOWN 0x8903 #define SIOCGPGRP 0x8904 +#ifndef CONFIG_LIBLWIP #define SIOCATMARK 0x8905 +#endif #define SIOCGSTAMP 0x8906 #define SIOCGSTAMPNS 0x8907 -#include <bits/ioctl_fix.h> +/* TODO #include <bits/ioctl_fix.h> */ -- 2.20.1 _______________________________________________ Minios-devel mailing list Minios-devel@xxxxxxxxxxxxxxxxxxxx https://lists.xenproject.org/mailman/listinfo/minios-devel

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.