merge with mainline

diff --cc Makefile.in
Simple merge

diff --cc configure.ac
Simple merge

diff --cc include/grub/dl.h
index fde2e31633580ca4c891f6e8ac3e7439db5a57e9,cf5da7fd5be5ab600a73d3e3c74c6685b60bcd9b..9d5f2af2daff07c606b5ae70c3bbe241ce3727e0
--- 1/include/grub/dl.h
--- 2/include/grub/dl.h
+++ b/include/grub/dl.h
@@@ -101,7 -106,7 +101,7 @@@ grub_err_t EXPORT_FUNC(grub_dl_register
  grub_err_t grub_arch_dl_check_header (void *ehdr);
  grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
  
- #if defined (_mips) && ! GRUB_MACHINE_EMU
 -#if defined (_mips) && ! GRUB_NO_MODULES
++#if defined (_mips) && (! defined (GRUB_MACHINE_EMU) || ! GRUB_MACHINE_EMU)
  #define GRUB_LINKER_HAVE_INIT 1
  void grub_arch_dl_init_linker (void);
  #endif