From: Costin Lupu Date: Sun, 13 Oct 2019 13:37:29 +0000 (+0300) Subject: Introduce header for basic types defined by Unikraft X-Git-Tag: RELEASE-0.4~29 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=20ab04686a016b311c4e25f059cc9efb960b24df;p=unikraft%2Flibs%2Fnewlib.git Introduce header for basic types defined by Unikraft Newlib defines some fundamental data types in its header. We need to overwrite those definitions that are provided by Unikraft so we introduce the header. In order to use both our and Newlib's we use an intermediary header in which we can also overwrite some other type definitions (e.g. _CLOCK_T_ in this patch). Signed-off-by: Costin Lupu Reviewed-by: Felipe Huici --- diff --git a/include/sys/_types.h b/include/sys/_types.h new file mode 100644 index 0000000..972a7de --- /dev/null +++ b/include/sys/_types.h @@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ +/* + * Authors: Costin Lupu + * + * Copyright (c) 2019, University Politehnica of Bucharest. 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. + */ + +#ifndef __NEWLIB_GLUE_SYS__TYPES_H__ +#define __NEWLIB_GLUE_SYS__TYPES_H__ + +/* Use Unikraft type definitions */ +#include + +/* Provide _CLOCK_T_ */ +#define _CLOCK_T_ long /* clock() */ +#define __machine_clock_t_defined + +/* Use newlib type definitions */ +#include_next + +#endif /* __NEWLIB_GLUE_SYS__TYPES_H__ */ diff --git a/include/uk/_types.h b/include/uk/_types.h new file mode 100644 index 0000000..72e25b9 --- /dev/null +++ b/include/uk/_types.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ +/* + * Authors: Costin Lupu + * + * Copyright (c) 2019, University Politehnica of Bucharest. 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. + */ + +#ifndef __NEWLIB_GLUE_UK__TYPES_H__ +#define __NEWLIB_GLUE_UK__TYPES_H__ + +/* Use Unikraft time definitions */ +#define __NEED_time_t +#define __NEED_suseconds_t +#define __NEED_struct_timeval +#define __NEED_struct_timespec +#define __NEED_timer_t +#define __NEED_clockid_t +#define __NEED_clock_t +#include + +/* newlib guards */ +#define __time_t_defined +#define _SUSECONDS_T_DECLARED +#define _TIMEVAL_DEFINED +#define __timer_t_defined +#define __clockid_t_defined +#define __clock_t_defined + +#endif /* __NEWLIB_GLUE_UK__TYPES_H__ */