proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-08-04 01:48:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dl/elf: Use format code PRIxGRUB_UINT64_T for 64-bit arg in grub_error()

Browse Source 
The macro ELF_R_TYPE does not change the underlying type. Here its argument
is a 64-bit Elf64_Xword. Make sure the format code matches.

For the RISC-V architecture, rel->r_info could be either Elf32_Xword or
Elf64_Xword depending on if 32 or 64-bit RISC-V is being built. So cast
to 64-bit value regardless.

Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Glenn Washburn 2021-03-04 18:22:41 -06:00 committed by Daniel Kiper
parent c95ec30d48
commit d028b1a35e
6 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
grub-core/efiemu/i386/loadcore64.c
View File

@ -122,7 +122,8 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs,
break;
default:
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
N_("relocation 0x%x is not implemented yet"),
N_("relocation 0x%" PRIxGRUB_UINT64_T
" is not implemented yet"),
ELF_R_TYPE (rel->r_info));
}
}

3
grub-core/kern/arm64/dl.c
View File

@ -184,7 +184,8 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
default:
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
N_("relocation 0x%x is not implemented yet"),
N_("relocation 0x%" PRIxGRUB_UINT64_T
" is not implemented yet"),
ELF_R_TYPE (rel->r_info));
}
}

3
grub-core/kern/ia64/dl.c
View File

@ -137,7 +137,8 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
break;
default:
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
N_("relocation 0x%x is not implemented yet"),
N_("relocation 0x%" PRIxGRUB_UINT64_T
" is not implemented yet"),
ELF_R_TYPE (rel->r_info));
}
}

5
grub-core/kern/riscv/dl.c
View File

@ -331,8 +331,9 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
break;
default:
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
N_("relocation 0x%x is not implemented yet"),
ELF_R_TYPE (rel->r_info));
N_("relocation 0x%" PRIxGRUB_UINT64_T
" is not implemented yet"),
(grub_uint64_t) ELF_R_TYPE (rel->r_info));
}
}

3
grub-core/kern/sparc64/dl.c
View File

@ -177,7 +177,8 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
break;
default:
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
N_("relocation 0x%x is not implemented yet"),
N_("relocation 0x%" PRIxGRUB_UINT64_T
" is not implemented yet"),
ELF_R_TYPE (rel->r_info));
}
}

3
grub-core/kern/x86_64/dl.c
View File

@ -107,7 +107,8 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
default:
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
N_("relocation 0x%x is not implemented yet"),
N_("relocation 0x%" PRIxGRUB_UINT64_T
" is not implemented yet"),
ELF_R_TYPE (rel->r_info));
}
}