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

* util/grub-mkimagexx.c (relocate_addresses): Display offset rather

Browse source 
than almost useless pointer.
This commit is contained in:
Vladimir Serbinenko 2013-12-15 14:18:30 +01:00
parent 7e47e27bd8
commit e7c418c58f
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-12-15 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkimagexx.c (relocate_addresses): Display offset rather
than almost useless pointer.
2013-12-15 Vladimir Serbinenko <phcoder@gmail.com> 2013-12-15 Vladimir Serbinenko <phcoder@gmail.com>
Add gcc_struct to all packed structures when compiling with mingw. Add gcc_struct to all packed structures when compiling with mingw.

7
util/grub-mkimagexx.c
View file

@ -855,7 +855,10 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
case R_ARM_THM_JUMP19: case R_ARM_THM_JUMP19:
{ {
grub_err_t err; grub_err_t err;
grub_util_info (" THM_JUMP24:\ttarget=0x%08lx\toffset=(0x%08x)", (unsigned long) target, sym_addr); grub_util_info (" THM_JUMP24:\ttarget=0x%08lx\toffset=(0x%08x)",
(unsigned long) ((char *) target
- (char *) e),
sym_addr);
if (!(sym_addr & 1)) if (!(sym_addr & 1))
{ {
grub_uint32_t tr_addr; grub_uint32_t tr_addr;
@ -888,7 +891,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
case R_ARM_JUMP24: case R_ARM_JUMP24:
{ {
grub_err_t err; grub_err_t err;
grub_util_info (" JUMP24:\ttarget=0x%08lx\toffset=(0x%08x)", (unsigned long) target, sym_addr); grub_util_info (" JUMP24:\ttarget=0x%08lx\toffset=(0x%08x)", (unsigned long) ((char *) target - (char *) e), sym_addr);
if (sym_addr & 1) if (sym_addr & 1)
{ {
grub_uint32_t tr_addr; grub_uint32_t tr_addr;