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

[Sharan Santhanam <sharan.santhanam@xxxxxxxxx>]

Hello Costin,

This patch seems fine.

Reviewed-by: Sharan Santhanam <sharan.santhanam@xxxxxxxxx>

Thanks & Regards
Sharan

On 9/12/19 6:30 PM, Costin Lupu wrote:
> 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> */
_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel