vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

grub-mkimagexx: Fix RISCV error message

Browse source 
Outputting a raw pointer doesn't match the format and is
also useless. Output offset instead.

Signed-off-by: Vladimir Serbinenko <phcoder@google.com>
This commit is contained in:
Vladimir Serbinenko 2019-03-22 17:11:14 +01:00 committed by Vladimir Serbinenko
parent d900dfa985
commit 3562536fd5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
util/grub-mkimagexx.c
View file

@ -1298,7 +1298,7 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, struct section_metadata *smd,
grub_uint32_t hi20, lo12;
if (off != (grub_int32_t)off)
grub_util_error ("target %lx not reachable from pc=%lx", (long)sym_addr, (long)target);
grub_util_error ("target %lx not reachable from pc=%lx", (long)sym_addr, (long)((char *)target - (char *)e));
hi20 = (off + 0x800) & 0xfffff000;
lo12 = (off - hi20) & 0xfff;
@ -1337,7 +1337,7 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, struct section_metadata *smd,
grub_int32_t hi20;
if (off != (grub_int32_t)off)
grub_util_error ("target %lx not reachable from pc=%lx", (long)sym_addr, (long)target);
grub_util_error ("target %lx not reachable from pc=%lx", (long)sym_addr, (long)((char *)target - (char *)e));
hi20 = (off + 0x800) & 0xfffff000;
*t32 = grub_host_to_target32 ((grub_target_to_host32 (*t32) & 0xfff) | hi20);