musl's stdint does not support gcc -m32 so we need to make sure that we don't use system's stdint.h. We ship a stdind_local.h and make sure that we use that instead https://bugs.alpinelinux.org/issues/3308 diff --git a/tools/firmware/Rules.mk b/tools/firmware/Rules.mk index 26bbddc..efad58c 100644 --- a/tools/firmware/Rules.mk +++ b/tools/firmware/Rules.mk @@ -12,6 +12,7 @@ CFLAGS += -DNDEBUG endif CFLAGS += -Werror +CFLAGS += -I$(XEN_ROOT)/tools/firmware $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) diff --git a/tools/firmware/hvmloader/32bitbios_support.c b/tools/firmware/hvmloader/32bitbios_support.c index fe770a3..cdab677 100644 --- a/tools/firmware/hvmloader/32bitbios_support.c +++ b/tools/firmware/hvmloader/32bitbios_support.c @@ -21,8 +21,8 @@ * Place - Suite 330, Boston, MA 02111-1307 USA. */ -#include -#include +#include +#include #ifdef __sun__ #include #endif diff --git a/tools/firmware/hvmloader/acpi/acpi2_0.h b/tools/firmware/hvmloader/acpi/acpi2_0.h index 7b22d80..413c930 100644 --- a/tools/firmware/hvmloader/acpi/acpi2_0.h +++ b/tools/libacpi/acpi2_0.h @@ -18,7 +18,7 @@ #ifndef _ACPI_2_0_H_ #define _ACPI_2_0_H_ -#include +#include #include #include diff --git a/tools/firmware/hvmloader/config.h b/tools/firmware/hvmloader/config.h index b838cf9..33d48b3 100644 --- a/tools/firmware/hvmloader/config.h +++ b/tools/firmware/hvmloader/config.h @@ -1,7 +1,7 @@ #ifndef __HVMLOADER_CONFIG_H__ #define __HVMLOADER_CONFIG_H__ -#include +#include enum virtual_vga { VGA_none, VGA_std, VGA_cirrus, VGA_pt }; extern enum virtual_vga virtual_vga; diff --git a/tools/firmware/hvmloader/hypercall.h b/tools/firmware/hvmloader/hypercall.h index 5368c30..c57bc86 100644 --- a/tools/firmware/hvmloader/hypercall.h +++ b/tools/firmware/hvmloader/hypercall.h @@ -31,7 +31,7 @@ #ifndef __HVMLOADER_HYPERCALL_H__ #define __HVMLOADER_HYPERCALL_H__ -#include +#include #include #include "config.h" diff --git a/tools/firmware/hvmloader/mp_tables.c b/tools/firmware/hvmloader/mp_tables.c index fd636a0..b3b703e 100644 --- a/tools/firmware/hvmloader/mp_tables.c +++ b/tools/firmware/hvmloader/mp_tables.c @@ -28,7 +28,7 @@ * Place - Suite 330, Boston, MA 02111-1307 USA. */ -#include +#include #include "config.h" /* number of non-processor MP table entries */ diff --git a/tools/firmware/hvmloader/option_rom.h b/tools/firmware/hvmloader/option_rom.h index 0fefe08..66a93bc 100644 --- a/tools/firmware/hvmloader/option_rom.h +++ b/tools/firmware/hvmloader/option_rom.h @@ -1,7 +1,7 @@ #ifndef __HVMLOADER_OPTION_ROM_H__ #define __HVMLOADER_OPTION_ROM_H__ -#include +#include struct option_rom_header { uint8_t signature[2]; /* "\x55\xaa" */ diff --git a/tools/firmware/hvmloader/pir_types.h b/tools/firmware/hvmloader/pir_types.h index 6e50822..6134b01 100644 --- a/tools/firmware/hvmloader/pir_types.h +++ b/tools/firmware/hvmloader/pir_types.h @@ -24,7 +24,7 @@ #ifndef PIR_TYPES_H #define PIR_TYPES_H -#include +#include #define NR_PIR_SLOTS 6 diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/smbios.c index 4d3d692..60d144d 100644 --- a/tools/firmware/hvmloader/smbios.c +++ b/tools/firmware/hvmloader/smbios.c @@ -20,7 +20,7 @@ * Authors: Andrew D. Ball */ -#include +#include #include #include #include "smbios_types.h" diff --git a/tools/firmware/hvmloader/smbios_types.h b/tools/firmware/hvmloader/smbios_types.h index ff36564..1b61d9a 100644 --- a/tools/firmware/hvmloader/smbios_types.h +++ b/tools/firmware/hvmloader/smbios_types.h @@ -26,7 +26,7 @@ #ifndef SMBIOS_TYPES_H #define SMBIOS_TYPES_H -#include +#include /* SMBIOS entry point -- must be written to a 16-bit aligned address between 0xf0000 and 0xfffff. diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index 80d822f..671d8cd 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -24,7 +24,7 @@ #include "vnuma.h" #include #include -#include +#include #include #include #include diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index a70e4aa..a8a2628 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -2,7 +2,7 @@ #define __HVMLOADER_UTIL_H__ #include -#include +#include #include #include #include diff --git a/tools/firmware/rombios/32bit/pmm.c b/tools/firmware/rombios/32bit/pmm.c index 4a279ca..b90b813 100644 --- a/tools/firmware/rombios/32bit/pmm.c +++ b/tools/firmware/rombios/32bit/pmm.c @@ -63,7 +63,7 @@ * } */ -#include +#include #include #include "config.h" #include "e820.h" diff --git a/tools/firmware/rombios/32bit/util.c b/tools/firmware/rombios/32bit/util.c index a47bb71..777f742 100644 --- a/tools/firmware/rombios/32bit/util.c +++ b/tools/firmware/rombios/32bit/util.c @@ -18,7 +18,7 @@ * Place - Suite 330, Boston, MA 02111-1307 USA. */ #include -#include +#include #include "rombios_compat.h" #include "util.h"