merge with mainline

diff --cc Makefile.in
Simple merge

diff --cc conf/any-emu.rmk
Simple merge

diff --cc configure.ac
Simple merge

diff --cc genmk.rb
Simple merge

diff --cc include/grub/dl.h
index b66b7641e4db3ba3eeb3f97e6a5b90d5515d89ac,351cca64d14337f7c13f21b0f9063d12c4aa1692..29dca7ec21631275c3f2827e761eef1fd1dfc282
--- 1/include/grub/dl.h
--- 2/include/grub/dl.h
+++ b/include/grub/dl.h
@@@ -91,9 -92,17 +92,12 @@@ grub_dl_t grub_dl_load_core (void *addr
  int EXPORT_FUNC(grub_dl_unload) (grub_dl_t mod);
  void grub_dl_unload_unneeded (void);
  void grub_dl_unload_all (void);
 -#if defined (GRUB_UTIL) || defined (GRUB_TARGET_NO_MODULES)
 -#define GRUB_NO_MODULES 1
 -#else
 -#define GRUB_NO_MODULES 0
 -#endif
  int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);
  int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);
- void EXPORT_FUNC(grub_dl_iterate) (int (*hook) (grub_dl_t mod));
+ extern grub_dl_t EXPORT_VAR(grub_dl_head);
+ 
+ #define FOR_DL_MODULES(var) FOR_LIST_ELEMENTS ((var), (grub_dl_head))
+ 
  grub_dl_t EXPORT_FUNC(grub_dl_get) (const char *name);
  grub_err_t grub_dl_register_symbol (const char *name, void *addr,
                                    grub_dl_t mod);

diff --cc include/grub/emu/misc.h
Simple merge

diff --cc include/grub/misc.h
index 077069934cba46dacb151f5733fc4799d7fc6e0e,9194ca8adad26fb62b733db6fde5cf4ea9d7c6d0..056bd1a65c17e555b6d9f7175418afa78722baad
--- 1/include/grub/misc.h
--- 2/include/grub/misc.h
+++ b/include/grub/misc.h
@@@ -303,16 -310,9 +310,16 @@@ void EXPORT_FUNC (grub_reboot) (void) _
  #ifdef GRUB_MACHINE_PCBIOS
  /* Halt the system, using APM if possible. If NO_APM is true, don't
   * use APM even if it is available.  */
- void EXPORT_FUNC (grub_halt) (int no_apm);
+ void EXPORT_FUNC (grub_halt) (int no_apm) __attribute__ ((noreturn));
  #else
- void EXPORT_FUNC (grub_halt) (void);
+ void EXPORT_FUNC (grub_halt) (void) __attribute__ ((noreturn));
  #endif
  
 +#ifdef GRUB_MACHINE_EMU
 +/* Flag to control module autoloading in normal mode.  */
 +extern int EXPORT_VAR(grub_no_autoload);
 +#else
 +#define grub_no_autoload 0
 +#endif
 +
  #endif /* ! GRUB_MISC_HEADER */

diff --cc normal/main.c
Simple merge