Re: [Minios-devel] [UNIKRAFT/MUSL PATCH 14/19] Add stubs for functions related to dlerror.c

[Costin Lupu <costin.lup@xxxxxxxxx>]

Hi Gaulthier,

Actually these stubs should go to Unikraft's posix-libdl internal lib.

Costin

On 10/15/19 6:23 PM, Gaulthier Gain wrote:
> wip: This commit adds the following stubs: __dl_invalid_handle,
> __dl_seterr, __dl_thread_cleanup and dlerror. These functions need
> stubs since they use the __pthread_self primitive from musl. It is
> necessary to re-write these functions by considering
> pthread-embedded declarations.
> 
> Signed-off-by: Gaulthier Gain <gaulthier.gain@xxxxxxxxx>
> ---
>  Makefile.uk |  3 ++-
>  ldso.c      | 70 
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 72 insertions(+), 1 deletion(-)
>  create mode 100644 ldso.c
> 
> diff --git a/Makefile.uk b/Makefile.uk
> index d0d1eef..c9daa9e 100644
> --- a/Makefile.uk
> +++ b/Makefile.uk
> @@ -134,8 +134,9 @@ LIBMUSLGLUE_CXXFLAGS-y += $(LIBMUSLGLUE_SUPPRESS_FLAGS-y)
>  # OS dependencies code - Glue between Unicore and musl
>  
> ################################################################################
>  LIBMUSLGLUE_SRCS-y += $(LIBMUSL_BASE)/mem.c
> +LIBMUSLGLUE_SRCS-y += $(LIBMUSL_BASE)/ldso.c
>  
> -################################################################################
> +#################################################################################
>  # musl code -- one external Makefile per sub-lib
>  
> ################################################################################
>  include $(LIBMUSL_BASE)/Makefile.uk.musl.mq
> diff --git a/ldso.c b/ldso.c
> new file mode 100644
> index 0000000..afe5fac
> --- /dev/null
> +++ b/ldso.c
> @@ -0,0 +1,70 @@
> +/* SPDX-License-Identifier: BSD-3-Clause */
> +/*
> + * libmusl glue code
> + *
> + * Authors: Gain Gaulthier <gaulthier.gain@xxxxxxxxx>
> + *
> + * Copyright (c) 2017, University of Liege., Uliege. All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + *
> + * 1. Redistributions of source code must retain the above copyright
> + *    notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + *    notice, this list of conditions and the following disclaimer in the
> + *    documentation and/or other materials provided with the distribution.
> + * 3. Neither the name of the copyright holder nor the names of its
> + *    contributors may be used to endorse or promote products derived from
> + *    this software without specific prior written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
> IS"
> + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
> + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> + * POSSIBILITY OF SUCH DAMAGE.
> + *
> + * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
> + */
> +#include <errno.h>
> +#include <stdlib.h>
> +#include <uk/assert.h>
> +
> +char *dlerror()
> +{
> +        errno = ENOSYS;
> +        return NULL;
> +}
> +
> +void __dl_thread_cleanup(void)
> +{
> +        UK_CRASH("%s is not implemented", __func__);
> +}
> +
> +__attribute__((__visibility__("hidden")))
> +void __dl_vseterr(const char *fmt, va_list ap)
> +{
> +        UK_CRASH("%s is not implemented", __func__);
> +}
> +
> +__attribute__((__visibility__("hidden")))
> +void __dl_seterr(const char *fmt, ...)
> +{
> +        va_list ap;
> +        va_start(ap, fmt);
> +        __dl_vseterr(fmt, ap);
> +        va_end(ap);
> +}
> +
> +int __dl_invalid_handle(void *h)
> +{
> +        __dl_seterr("Invalid library handle %p", (void *)h);
> +        return -1;
> +}
> 

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