]> git.proxmox.com Git - grub2.git/commitdiff
multiboot_elfxx.c: Fix compilation by fixing undeclared variable
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Fri, 29 Jun 2018 12:15:11 +0000 (14:15 +0200)
committerDaniel Kiper <daniel.kiper@oracle.com>
Mon, 2 Jul 2018 12:16:14 +0000 (14:16 +0200)
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>
grub-core/loader/multiboot_elfxx.c

index ae36d9d49da206ccaf10ce67da46a65116fbb9f0..70cd1db513e679f0e02e06dc2de24747a62b88ba 100644 (file)
@@ -127,7 +127,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
     mld->load_base_addr = mld->link_base_addr;
 
   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);
 
   /* Load every loadable segment in memory.  */