From d6c2782a9079352bcd67d9d29fa652abb4dd197a Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 17 Dec 2013 16:17:46 +0100 Subject: [PATCH] Unify message for unsupported relocation. --- ChangeLog | 4 ++++ util/grub-mkimagexx.c | 30 ++++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39515b8da..c8bf716b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-12-17 Vladimir Serbinenko + + Unify message for unsupported relocation. + 2013-12-17 Vladimir Serbinenko Mark miscompile error for translation. diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c index b62a8a3a3..a5ef0bfd2 100644 --- a/util/grub-mkimagexx.c +++ b/util/grub-mkimagexx.c @@ -564,7 +564,8 @@ arm_get_trampoline_size (Elf_Ehdr *e, break; default: - grub_util_error (_("relocation 0x%x is not implemented yet!"), ELF_R_TYPE (info)); + grub_util_error (_("relocation 0x%x is not implemented yet"), + (unsigned int) ELF_R_TYPE (info)); break; } } @@ -681,8 +682,8 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, (unsigned long long) offset); break; default: - grub_util_error (_("relocation 0x%llx is not implemented yet"), - (unsigned long long) ELF_R_TYPE (info)); + grub_util_error (_("relocation 0x%x is not implemented yet"), + (unsigned int) ELF_R_TYPE (info)); break; } break; @@ -744,8 +745,8 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, } default: - grub_util_error (_("relocation 0x%llx is not implemented yet"), - (unsigned long long) ELF_R_TYPE (info)); + grub_util_error (_("relocation 0x%x is not implemented yet"), + (unsigned int) ELF_R_TYPE (info)); break; } break; @@ -820,8 +821,8 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, break; default: - grub_util_error (_("relocation 0x%llx is not implemented yet"), - (unsigned long long) ELF_R_TYPE (info)); + grub_util_error (_("relocation 0x%x is not implemented yet"), + (unsigned int) ELF_R_TYPE (info)); break; } break; @@ -848,8 +849,8 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, } break; default: - grub_util_error (_("relocation %d is not implemented yet"), - (unsigned long long) ELF_R_TYPE (info)); + grub_util_error (_("relocation 0x%x is not implemented yet"), + (unsigned int) ELF_R_TYPE (info)); break; } break; @@ -943,7 +944,8 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, break; default: - grub_util_error (_("relocation 0x%x is not implemented yet!"), ELF_R_TYPE (info)); + grub_util_error (_("relocation 0x%x is not implemented yet"), + (unsigned int) ELF_R_TYPE (info)); break; } break; @@ -1174,8 +1176,8 @@ SUFFIX (make_reloc_section) (Elf_Ehdr *e, void **out, #endif break; default: - grub_util_error (_("relocation 0x%llx is not implemented yet"), - (unsigned long long) ELF_R_TYPE (info)); + grub_util_error (_("relocation 0x%x is not implemented yet"), + (unsigned int) ELF_R_TYPE (info)); break; } break; @@ -1199,8 +1201,8 @@ SUFFIX (make_reloc_section) (Elf_Ehdr *e, void **out, case R_AARCH64_JUMP26: break; default: - grub_util_error (_("fixup for relocation %d is not implemented yet"), - (unsigned long long) ELF_R_TYPE (info)); + grub_util_error (_("fixup for relocation %u is not implemented yet"), + (unsigned int) ELF_R_TYPE (info)); break; } break;