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

multiboot_elfxx.c: Fix compilation by fixing undeclared variable

Browse source 
Without that fix we have:
  In file included from ../../include/grub/command.h:25:0,
                   from ../../grub-core/loader/multiboot.c:30:
  ../../grub-core/loader/multiboot_elfxx.c: In function 'grub_multiboot_load_elf64':
  ../../grub-core/loader/multiboot_elfxx.c:130:28: error: 'relocatable' undeclared (first use in this function)
     "load_base_addr=0x%x\n", relocatable,

This happens due to mistake in the commit 14ec665
(mbi: Use per segment a separate relocator chunk).

So, let's fix it.

Signed-off-by: Ignat Korchagin <ignat@cloudflare.com>
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Denis 'GNUtoo' Carikli 2018-06-29 14:15:11 +02:00 committed by Vincent Batts
parent 5c6a46110d
commit 3c3ddc9b92
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
grub-core/loader/multiboot_elfxx.c
View file

@ -127,7 +127,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
mld->load_base_addr = mld->link_base_addr; mld->load_base_addr = mld->link_base_addr;
grub_dprintf ("multiboot_loader", "relocatable=%d, link_base_addr=0x%x, " grub_dprintf ("multiboot_loader", "relocatable=%d, link_base_addr=0x%x, "
"load_base_addr=0x%x\n", relocatable, "load_base_addr=0x%x\n", mld->relocatable,
mld->link_base_addr, mld->load_base_addr); mld->link_base_addr, mld->load_base_addr);
/* Load every loadable segment in memory. */ /* Load every loadable segment in memory. */