diff options
Diffstat (limited to 'sub/syslinux/syslinux-inttypes.patch')
| -rw-r--r-- | sub/syslinux/syslinux-inttypes.patch | 310 |
1 files changed, 310 insertions, 0 deletions
diff --git a/sub/syslinux/syslinux-inttypes.patch b/sub/syslinux/syslinux-inttypes.patch new file mode 100644 index 0000000..79cc36c --- /dev/null +++ b/sub/syslinux/syslinux-inttypes.patch @@ -0,0 +1,310 @@ +--- src.tmp/efi/wrapper.c ++++ src/efi/wrapper.c +@@ -43,8 +43,8 @@ + * For 64bit machines (class == ELFCLASS64), the optional + * header includes PE32+header fields + */ +-static void write_header(FILE *f, __uint32_t entry, size_t data_size, +- __uint32_t so_memsz, __uint8_t class) ++static void write_header(FILE *f, uint32_t entry, size_t data_size, ++ uint32_t so_memsz, uint8_t class) + { + struct optional_hdr o_hdr; + struct optional_hdr_pe32p o_hdr_pe32p; +@@ -53,9 +53,9 @@ + struct extra_hdr_pe32p e_hdr_pe32p; + struct coff_hdr c_hdr; + struct header hdr; +- __uint32_t total_sz = data_size; +- __uint32_t hdr_sz; +- __uint32_t reloc_start, reloc_end; ++ uint32_t total_sz = data_size; ++ uint32_t hdr_sz; ++ uint32_t reloc_start, reloc_end; + + /* + * The header size have to be a multiple of file_align, which currently +@@ -103,7 +103,7 @@ + e_hdr.image_sz = hdr_sz + so_memsz; + e_hdr.headers_sz = hdr_sz; + e_hdr.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION; +- e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) / sizeof(__uint64_t); ++ e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) / sizeof(uint64_t); + fwrite(&e_hdr, sizeof(e_hdr), 1, f); + } + else if (class == ELFCLASS64) { +@@ -126,7 +126,7 @@ + e_hdr_pe32p.image_sz = hdr_sz + so_memsz; + e_hdr_pe32p.headers_sz = hdr_sz; + e_hdr_pe32p.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION; +- e_hdr_pe32p.rva_and_sizes_nr = sizeof(e_hdr_pe32p.data_directory) / sizeof(__uint64_t); ++ e_hdr_pe32p.rva_and_sizes_nr = sizeof(e_hdr_pe32p.data_directory) / sizeof(uint64_t); + fwrite(&e_hdr_pe32p, sizeof(e_hdr_pe32p), 1, f); + } + +@@ -163,10 +163,10 @@ + { + Elf32_Ehdr e32_hdr; + Elf64_Ehdr e64_hdr; +- __uint32_t entry; +- __uint8_t class; +- __uint64_t phoff = 0; +- __uint16_t phnum = 0, phentsize = 0; ++ uint32_t entry; ++ uint8_t class; ++ uint64_t phoff = 0; ++ uint16_t phnum = 0, phentsize = 0; + unsigned char *id; + FILE *f_in, *f_out; + void *buf; +--- src.tmp/efi/wrapper.h ++++ src/efi/wrapper.h +@@ -1,6 +1,8 @@ + #ifndef EFI_WRAPPER_H + #define EFI_WRAPPER_H + ++#include <stdint.h> ++ + #define MSDOS_SIGNATURE 0x5a4d + #define PE_SIGNATURE 0x4550 + #define PE32_FORMAT 0x10b +@@ -27,13 +29,13 @@ + #define OFFSETOF(t,m) ((size_t)&((t *)0)->m) + + struct header { +- __uint16_t msdos_signature; +- __uint8_t _pad1[0x16]; +- __uint16_t relocs_ptr; +- __uint8_t __pad2[0x3c - 0x1a]; +- __uint32_t pe_hdr; +- __uint16_t pe_signature; +- __uint16_t _pad2; ++ uint16_t msdos_signature; ++ uint8_t _pad1[0x16]; ++ uint16_t relocs_ptr; ++ uint8_t __pad2[0x3c - 0x1a]; ++ uint32_t pe_hdr; ++ uint16_t pe_signature; ++ uint16_t _pad2; + } __packed; + + /* FIXME: when setting up coff_hdr, set up optional_hdr_sz +@@ -43,72 +45,72 @@ + * COFF header + */ + struct coff_hdr { +- __uint16_t arch; +- __uint16_t nr_sections; +- __uint32_t timedatestamp; +- __uint32_t symtab; +- __uint32_t nr_syms; +- __uint16_t optional_hdr_sz; +- __uint16_t characteristics; ++ uint16_t arch; ++ uint16_t nr_sections; ++ uint32_t timedatestamp; ++ uint32_t symtab; ++ uint32_t nr_syms; ++ uint16_t optional_hdr_sz; ++ uint16_t characteristics; + } __packed; + + struct optional_hdr { +- __uint16_t format; +- __uint8_t major_linker_version; +- __uint8_t minor_linker_version; +- __uint32_t code_sz; +- __uint32_t initialized_data_sz; +- __uint32_t uninitialized_data_sz; +- __uint32_t entry_point; +- __uint32_t base_code; +- __uint32_t data; ++ uint16_t format; ++ uint8_t major_linker_version; ++ uint8_t minor_linker_version; ++ uint32_t code_sz; ++ uint32_t initialized_data_sz; ++ uint32_t uninitialized_data_sz; ++ uint32_t entry_point; ++ uint32_t base_code; ++ uint32_t data; + } __packed; + + /* For PE32+, the optional_header does NOT have + * data after base_code + */ + struct optional_hdr_pe32p { +- __uint16_t format; +- __uint8_t major_linker_version; +- __uint8_t minor_linker_version; +- __uint32_t code_sz; +- __uint32_t initialized_data_sz; +- __uint32_t uninitialized_data_sz; +- __uint32_t entry_point; +- __uint32_t base_code; ++ uint16_t format; ++ uint8_t major_linker_version; ++ uint8_t minor_linker_version; ++ uint32_t code_sz; ++ uint32_t initialized_data_sz; ++ uint32_t uninitialized_data_sz; ++ uint32_t entry_point; ++ uint32_t base_code; + } __packed; + /* + * Extra header fields + */ + struct extra_hdr { +- __uint32_t image_base; +- __uint32_t section_align; +- __uint32_t file_align; +- __uint16_t major_os_version; +- __uint16_t minor_os_version; +- __uint16_t major_image_version; +- __uint16_t minor_image_version; +- __uint16_t major_subsystem_version; +- __uint16_t minor_subsystem_version; +- __uint32_t win32_version; +- __uint32_t image_sz; +- __uint32_t headers_sz; +- __uint32_t checksum; +- __uint16_t subsystem; +- __uint16_t dll_characteristics; +- __uint32_t stack_reserve_sz; +- __uint32_t stack_commit_sz; +- __uint32_t heap_reserve_sz; +- __uint32_t heap_commit_sz; +- __uint32_t loader_flags; +- __uint32_t rva_and_sizes_nr; ++ uint32_t image_base; ++ uint32_t section_align; ++ uint32_t file_align; ++ uint16_t major_os_version; ++ uint16_t minor_os_version; ++ uint16_t major_image_version; ++ uint16_t minor_image_version; ++ uint16_t major_subsystem_version; ++ uint16_t minor_subsystem_version; ++ uint32_t win32_version; ++ uint32_t image_sz; ++ uint32_t headers_sz; ++ uint32_t checksum; ++ uint16_t subsystem; ++ uint16_t dll_characteristics; ++ uint32_t stack_reserve_sz; ++ uint32_t stack_commit_sz; ++ uint32_t heap_reserve_sz; ++ uint32_t heap_commit_sz; ++ uint32_t loader_flags; ++ uint32_t rva_and_sizes_nr; + struct { +- __uint64_t export_table; +- __uint64_t import_table; +- __uint64_t resource_table; +- __uint64_t exception_table; +- __uint64_t certification_table; +- __uint64_t base_relocation_table; ++ uint64_t export_table; ++ uint64_t import_table; ++ uint64_t resource_table; ++ uint64_t exception_table; ++ uint64_t certification_table; ++ uint64_t base_relocation_table; + } data_directory; + } __packed; + +@@ -117,54 +119,54 @@ + */ + + struct extra_hdr_pe32p { +- __uint64_t image_base; +- __uint32_t section_align; +- __uint32_t file_align; +- __uint16_t major_os_version; +- __uint16_t minor_os_version; +- __uint16_t major_image_version; +- __uint16_t minor_image_version; +- __uint16_t major_subsystem_version; +- __uint16_t minor_subsystem_version; +- __uint32_t win32_version; +- __uint32_t image_sz; +- __uint32_t headers_sz; +- __uint32_t checksum; +- __uint16_t subsystem; +- __uint16_t dll_characteristics; +- __uint64_t stack_reserve_sz; +- __uint64_t stack_commit_sz; +- __uint64_t heap_reserve_sz; +- __uint64_t heap_commit_sz; +- __uint32_t loader_flags; +- __uint32_t rva_and_sizes_nr; ++ uint64_t image_base; ++ uint32_t section_align; ++ uint32_t file_align; ++ uint16_t major_os_version; ++ uint16_t minor_os_version; ++ uint16_t major_image_version; ++ uint16_t minor_image_version; ++ uint16_t major_subsystem_version; ++ uint16_t minor_subsystem_version; ++ uint32_t win32_version; ++ uint32_t image_sz; ++ uint32_t headers_sz; ++ uint32_t checksum; ++ uint16_t subsystem; ++ uint16_t dll_characteristics; ++ uint64_t stack_reserve_sz; ++ uint64_t stack_commit_sz; ++ uint64_t heap_reserve_sz; ++ uint64_t heap_commit_sz; ++ uint32_t loader_flags; ++ uint32_t rva_and_sizes_nr; + struct { +- __uint64_t export_table; +- __uint64_t import_table; +- __uint64_t resource_table; +- __uint64_t exception_table; +- __uint64_t certification_table; +- __uint64_t base_relocation_table; ++ uint64_t export_table; ++ uint64_t import_table; ++ uint64_t resource_table; ++ uint64_t exception_table; ++ uint64_t certification_table; ++ uint64_t base_relocation_table; + } data_directory; + } __packed; + + struct section { +- __uint8_t name[8]; +- __uint32_t virtual_sz; +- __uint32_t virtual_address; +- __uint32_t raw_data_sz; +- __uint32_t raw_data; +- __uint32_t relocs; +- __uint32_t line_numbers; +- __uint16_t relocs_nr; +- __uint16_t line_numbers_nr; +- __uint32_t characteristics; ++ uint8_t name[8]; ++ uint32_t virtual_sz; ++ uint32_t virtual_address; ++ uint32_t raw_data_sz; ++ uint32_t raw_data; ++ uint32_t relocs; ++ uint32_t line_numbers; ++ uint16_t relocs_nr; ++ uint16_t line_numbers_nr; ++ uint32_t characteristics; + } __packed; + + struct coff_reloc { +- __uint32_t virtual_address; +- __uint32_t symtab_index; +- __uint16_t type; ++ uint32_t virtual_address; ++ uint32_t symtab_index; ++ uint16_t type; + }; + + #endif /* EFI_WRAPPER_H */ |