Re: [Minios-devel] [UNIKRAFT/NEWLIB PATCH 1/3] build: add CONFIG_ prefix to all kconfig symbols

[Simon Kuenzer <simon.kuenzer@xxxxxxxxx>]

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

On 15.06.2018 13:51, Yuri Volchkov wrote:
> This is needed to support similar modifications in Unikraft main repo
>
> Signed-off-by: Yuri Volchkov <yuri.volchkov@xxxxxxxxx>
> ---
>   Makefile.uk | 14 +++++++-------
>   time.c      |  4 ++--
>   2 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/Makefile.uk b/Makefile.uk
> index dd0cd01..70d5c85 100644
> --- a/Makefile.uk
> +++ b/Makefile.uk
> @@ -39,12 +39,12 @@
>   # We have two libraries with newlib: libc and libm
>   # We are going to register both but fetch the sources of both into libc's
>   # build dir.
> -$(eval $(call addlib_s,libnewlibc,$(LIBNEWLIBC)))
> -$(eval $(call addlib_s,libnewlibm,$(LIBNEWLIBM)))
> +$(eval $(call addlib_s,libnewlibc,$(CONFIG_LIBNEWLIBC)))
> +$(eval $(call addlib_s,libnewlibm,$(CONFIG_LIBNEWLIBM)))
>   # Additionally, build glue code. This is put into a separate library so that 
> we
>   # can apply a thick helping of warning suppressions to newlib, which throws
>   # lots of compilation warnings, but keep our glue code up to our standards.
> -$(eval $(call addlib_s,libnewlibglue,$(LIBNEWLIBC)))
> +$(eval $(call addlib_s,libnewlibglue,$(CONFIG_LIBNEWLIBC)))
>   
>   ################################################################################
>   # Sources
> @@ -65,10 +65,10 @@ LIBNEWLIB_LIBM = 
> $(LIBNEWLIBC_ORIGIN)/$(LIBNEWLIB_SUBDIR)/newlib/libm
>   
> ################################################################################
>   # Library includes
>   
> ################################################################################
> -CINCLUDES-$(LIBNEWLIBC)   += -I$(LIBNEWLIBC_BASE)/include
> -CINCLUDES-$(LIBNEWLIBC)   += -I$(LIBNEWLIB_LIBC)/include
> -CXXINCLUDES-$(LIBNEWLIBC) += -I$(LIBNEWLIBC_BASE)/include
> -CXXINCLUDES-$(LIBNEWLIBC) += -I$(LIBNEWLIB_LIBC)/include
> +CINCLUDES-$(CONFIG_LIBNEWLIBC)   += -I$(LIBNEWLIBC_BASE)/include
> +CINCLUDES-$(CONFIG_LIBNEWLIBC)   += -I$(LIBNEWLIB_LIBC)/include
> +CXXINCLUDES-$(CONFIG_LIBNEWLIBC) += -I$(LIBNEWLIBC_BASE)/include
> +CXXINCLUDES-$(CONFIG_LIBNEWLIBC) += -I$(LIBNEWLIB_LIBC)/include
>   
>   CINCLUDES-$(LIBNEWLIBGLUE) += -I$(LIBNEWLIBC_BASE)/include
>   CINCLUDES-$(LIBNEWLIBGLUE) += -I$(LIBNEWLIB_LIBC)/include
> diff --git a/time.c b/time.c
> index ab73bc1..3196ad8 100644
> --- a/time.c
> +++ b/time.c
> @@ -38,7 +38,7 @@
>   #include <sys/time.h>
>   #include <utime.h>
>   #include <uk/config.h>
> -#if HAVE_SCHED
> +#if CONFIG_HAVE_SCHED
>   #include <uk/sched.h>
>   #else
>   #include <uk/plat/lcpu.h>
> @@ -58,7 +58,7 @@ int utime(const char *filename __unused, const struct utimbuf 
> *times __unused)
>   /* currently only have millisecond resolution on timers */
>   static void msleep(uint32_t milliseconds)
>   {
> -#if HAVE_SCHED
> +#if CONFIG_HAVE_SCHED
>         uk_sched_sleep(milliseconds);
>   #else
>         ukplat_lcpu_halt_to(milliseconds);
_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel