loader/multiboot.c: unable to compile due to undefined symbols

[Joe Konno]

Hey gang,

From latest grub sources (HEAD):
    1b18d6b0d348 Add a file missing in multiboot2 commit.

After configuring like this:

    ./configure --enable-boot-time --enable-cache-stats --target=x86_64 
--with-platform=efi

I am unable to compile grub from source due to the following undefined symbol
errors.

(I'm coming in to the grub-devel community cold, so if you'd like me to drop
this into the bug tracker, let me know how best to do so.)

"""
loader/multiboot.c: In function ‘efi_boot’:
loader/multiboot.c:142:47: error: ‘MULTIBOOT2_EFI_INITIAL_STATE’ undeclared 
(first use in this function); did you mean ‘MULTIBOOT_EFI_INITIAL_STATE’?
   struct grub_relocator_efi_state state_efi = MULTIBOOT2_EFI_INITIAL_STATE;
                                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                               MULTIBOOT_EFI_INITIAL_STATE
loader/multiboot.c:142:47: note: each undeclared identifier is reported only 
once for each function it appears in
loader/multiboot.c:146:44: error: ‘grub_multiboot_payload_eip’ undeclared 
(first use in this function); did you mean ‘grub_multiboot2_payload_eip’?
   state_efi.MULTIBOOT_EFI_ENTRY_REGISTER = grub_multiboot_payload_eip;
                                            ^~~~~~~~~~~~~~~~~~~~~~~~~~
                                            grub_multiboot2_payload_eip
make[3]: *** [Makefile:35921: loader/multiboot2_module-multiboot.o] Error 1
"""

For build environment, Fedora 26 for x86_64 (using Fedora 26's gcc, captured
when querying glibc):

$ /lib64/libc.so.6 
GNU C Library (GNU libc) stable release version 2.25, by Roland McGrath et al.
Copyright (C) 2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.
There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE.
Compiled by GNU CC version 7.1.1 20170622 (Red Hat 7.1.1-3).
Available extensions:
        crypt add-on version 2.1 by Michael Glad and others
        GNU Libidn by Simon Josefsson
        Native POSIX Threads Library by Ulrich Drepper et al
        BIND-8.2.3-T5B
libc ABIs: UNIQUE IFUNC


Cheers, hope that helps

pgp2S4RNDhxRU.pgp
Description: OpenPGP digital signature