Merge mainline into legacy_parser

diff --cc Makefile.util.def
index b4f9fc60e7a57066e87a84424f80a9759b0880ff,dd38774fdfa4d321dc7d1a47f2a00676f02bd9fc..d3a4ac2901c963b96778e94a58398444663ee248
--- 1/Makefile.util.def
--- 2/Makefile.util.def
+++ b/Makefile.util.def
@@@ -506,14 -541,5 +541,14 @@@ program = 
    common = grub-core/tests/lib/test.c;
    cflags = -Wno-format;
    ldadd = libgrub.a;
-   ldflags = '$(LIBDEVMAPPER)';
+   ldadd = '$(LIBDEVMAPPER)';
  };
 +
 +program = {
 +  name = grub-menulst2cfg;
 +  mansection = 1;
 +  common = util/grub-menulst2cfg.c;
 +  common = grub-core/lib/legacy_parse.c;
 +  ldadd = libgrub.a;
 +  ldflags = '$(LIBDEVMAPPER)';
 +};

diff --cc grub-core/Makefile.core.def
index 0ca28eb198d53266ff2ef019cf8c279575a505b0,59d99a3268ef85c76f89c6d7e939f8ecab0fb96a..a72f61b6661aaab75052aaddd3325c1eb299f1d3
--- 1/grub-core/Makefile.core.def
--- 2/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@@ -1404,9 -1384,21 +1384,29 @@@ module = 
    common = hook/datehook.c;
  };
  
 +module = {
 +  name = legacycfg;
 +  common = commands/legacycfg.c;
 +  common = lib/legacy_parse.c;
 +  enable = i386_pc;
++}
++
+ module = {
+   name = test_blockarg;
+   common = tests/test_blockarg.c;
+ };
+ 
+ module = {
+   name = xzio;
+   common = io/xzio.c;
+   common = lib/xzembed/xz_dec_bcj.c;
+   common = lib/xzembed/xz_dec_lzma2.c;
+   common = lib/xzembed/xz_dec_stream.c;
+   cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/xzembed';
+ };
+ 
+ module = {
+   name = testload;
+   common = commands/testload.c;
++>>>>>>> MERGE-SOURCE
  };