Index: boot/arch/riscv64/include/arch/asm.h =================================================================== --- boot/arch/riscv64/include/arch/asm.h (revision 173b3bdc85bf0eff3efa47b82e307fdc3f1186c8) +++ boot/arch/riscv64/include/arch/asm.h (revision 10d65d70906a865fb116576edc88e47ab61a5fb4) @@ -31,10 +31,10 @@ #include +#include extern char htif_page[]; extern char pt_page[]; -extern void jump_to_kernel(uintptr_t) - __attribute__((noreturn)); +extern _Noreturn void jump_to_kernel(uintptr_t); #endif Index: boot/arch/riscv64/include/arch/ucb.h =================================================================== --- boot/arch/riscv64/include/arch/ucb.h (revision 173b3bdc85bf0eff3efa47b82e307fdc3f1186c8) +++ boot/arch/riscv64/include/arch/ucb.h (revision 10d65d70906a865fb116576edc88e47ab61a5fb4) @@ -37,4 +37,5 @@ #include +#include extern volatile uint64_t tohost; Index: boot/genarch/include/genarch/ofw.h =================================================================== --- boot/genarch/include/genarch/ofw.h (revision 173b3bdc85bf0eff3efa47b82e307fdc3f1186c8) +++ boot/genarch/include/genarch/ofw.h (revision 10d65d70906a865fb116576edc88e47ab61a5fb4) @@ -30,6 +30,7 @@ #define BOOT_OFW_H_ +#include #include -#include +#include #define MEMMAP_MAX_RECORDS 32 Index: boot/generic/include/balloc.h =================================================================== --- boot/generic/include/balloc.h (revision 173b3bdc85bf0eff3efa47b82e307fdc3f1186c8) +++ boot/generic/include/balloc.h (revision 10d65d70906a865fb116576edc88e47ab61a5fb4) @@ -31,4 +31,5 @@ #include +#include typedef struct { Index: boot/generic/include/stdarg.h =================================================================== --- boot/generic/include/stdarg.h (revision 173b3bdc85bf0eff3efa47b82e307fdc3f1186c8) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * Copyright (c) 2006 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @file - */ - -#ifndef BOOT_STDARG_H__ -#define BOOT_STDARG_H__ - -typedef __builtin_va_list va_list; - -#define va_start(ap, last) __builtin_va_start(ap, last) -#define va_arg(ap, type) __builtin_va_arg(ap, type) -#define va_end(ap) __builtin_va_end(ap) - -#endif - -/** @} - */ Index: boot/generic/include/stdbool.h =================================================================== --- boot/generic/include/stdbool.h (revision 173b3bdc85bf0eff3efa47b82e307fdc3f1186c8) +++ (revision ) @@ -1,43 +1,0 @@ -/* - * Copyright (c) 2006 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @file - */ - -#ifndef BOOT_STDBOOL_H_ -#define BOOT_STDBOOL_H_ - -#define false 0 -#define true 1 - -#define bool _Bool - -#endif - -/** @} - */ Index: boot/generic/include/stddef.h =================================================================== --- boot/generic/include/stddef.h (revision 173b3bdc85bf0eff3efa47b82e307fdc3f1186c8) +++ (revision ) @@ -1,42 +1,0 @@ -/* - * Copyright (c) 2006 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @file - */ - -#ifndef BOOT_STDDEF_H_ -#define BOOT_STDDEF_H_ - -#include - -#include <_bits/NULL.h> - -#endif - -/** @} - */ Index: boot/generic/src/inflate.c =================================================================== --- boot/generic/src/inflate.c (revision 173b3bdc85bf0eff3efa47b82e307fdc3f1186c8) +++ boot/generic/src/inflate.c (revision 10d65d70906a865fb116576edc88e47ab61a5fb4) @@ -67,4 +67,5 @@ #include #include +#include #include #include Index: boot/generic/src/memstr.c =================================================================== --- boot/generic/src/memstr.c (revision 173b3bdc85bf0eff3efa47b82e307fdc3f1186c8) +++ boot/generic/src/memstr.c (revision 10d65d70906a865fb116576edc88e47ab61a5fb4) @@ -29,4 +29,5 @@ #include #include +#include /** Move memory block without overlapping. Index: boot/generic/src/printf_core.c =================================================================== --- boot/generic/src/printf_core.c (revision 173b3bdc85bf0eff3efa47b82e307fdc3f1186c8) +++ boot/generic/src/printf_core.c (revision 10d65d70906a865fb116576edc88e47ab61a5fb4) @@ -39,4 +39,5 @@ #include #include +#include #include #include Index: boot/generic/src/str.c =================================================================== --- boot/generic/src/str.c (revision 173b3bdc85bf0eff3efa47b82e307fdc3f1186c8) +++ boot/generic/src/str.c (revision 10d65d70906a865fb116576edc88e47ab61a5fb4) @@ -101,4 +101,5 @@ #include #include +#include #include