merge with mainline

diff --cc .bzrignore
Simple merge

diff --cc acinclude.m4
Simple merge

diff --cc configure.ac
index b4dd0e9e0953f5696e63e6bd39e7e9cb07145128,4091b4fa2018af4b87af2f5cf1c3a4c0c59f5513..9b918f1bc8c8c57dba50df4f079b7c8147f2d36f
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -811,56 -800,17 +805,68 @@@ if test x"$device_mapper_excuse" = x ; 
                            [Define to 1 if you have the devmapper library.])],
                 [device_mapper_excuse="need devmapper library"])
  fi
 +AC_SUBST([LIBDEVMAPPER])
  
 -             [LDFLAGS="$LDFLAGS -lzfs"
+ AC_CHECK_LIB([zfs], [libzfs_init],
 -             [LDFLAGS="$LDFLAGS -lnvpair"
++             [LIBZFS="-lzfs"
+               AC_DEFINE([HAVE_LIBZFS], [1],
+                         [Define to 1 if you have the ZFS library.])],)
++AC_SUBST([LIBZFS])
++
+ AC_CHECK_LIB([nvpair], [nvlist_print],
++             [LIBNVPAIR="-lnvpair"
+               AC_DEFINE([HAVE_LIBNVPAIR], [1],
+                         [Define to 1 if you have the NVPAIR library.])],)
++AC_SUBST([LIBNVPAIR])
++
 +pkglibrootdir='$(libdir)'/`echo $PACKAGE | sed "$program_transform_name"`
 +AC_SUBST(pkglibrootdir)
 +
 +AC_SUBST([FONT_SOURCE])
 +AS_IF([test x$target_cpu = xi386 -a x$platform = xpc],
 +          [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
 +AS_IF([test x$target_cpu = xi386 -a x$platform = xcoreboot],
 +          [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
 +AS_IF([test x$target_cpu = xi386 -a x$platform = xmultiboot],
 +          [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
 +AS_IF([test x$target_cpu = xmips -a x$platform = xyeeloong],
 +          [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x80200000)])
 +AS_IF([test x$target_cpu = xpowerpc -a x$platform = xieee1275],
 +          [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x200000)])
 +AS_IF([test x$target_cpu = xi386 -a x$platform = xqemu],
 +          [AC_SUBST([GRUB_BOOT_MACHINE_LINK_ADDR], 0xffe00)])
 +AS_IF([test x$target_cpu = xi386 -a x$platform = xieee1275],
 +          [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x10000)])
 +AS_IF([test x$TARGET_APPLE_CC = x1],
 +          [AC_SUBST([USE_APPLE_CC_FIXES], yes)])
  
 -AC_SUBST(ASFLAGS)
 +#
 +# Automake conditionals
 +#
 +
 +AM_CONDITIONAL([COND_emu], [test x$platform = xemu])
 +AM_CONDITIONAL([COND_i386_pc], [test x$target_cpu = xi386 -a x$platform = xpc])
 +AM_CONDITIONAL([COND_i386_efi], [test x$target_cpu = xi386 -a x$platform = xefi])
 +AM_CONDITIONAL([COND_i386_qemu], [test x$target_cpu = xi386 -a x$platform = xqemu])
 +AM_CONDITIONAL([COND_i386_ieee1275], [test x$target_cpu = xi386 -a x$platform = xieee1275])
 +AM_CONDITIONAL([COND_i386_coreboot], [test x$target_cpu = xi386 -a x$platform = xcoreboot])
 +AM_CONDITIONAL([COND_i386_multiboot], [test x$target_cpu = xi386 -a x$platform = xmultiboot])
 +AM_CONDITIONAL([COND_x86_64_efi], [test x$target_cpu = xx86_64 -a x$platform = xefi])
 +AM_CONDITIONAL([COND_mips_yeeloong], [test x$target_cpu = xmips -a x$platform = xyeeloong])
 +AM_CONDITIONAL([COND_mips_qemu_mips], [test x$target_cpu = xmips -a x$platform = xqemu_mips])
 +AM_CONDITIONAL([COND_sparc64_ieee1275], [test x$target_cpu = xsparc64 -a x$platform = xieee1275])
 +AM_CONDITIONAL([COND_powerpc_ieee1275], [test x$target_cpu = xpowerpc -a x$platform = xieee1275])
 +
 +AM_CONDITIONAL([COND_MAN_PAGES], [test x$cross_compiling = xno -a x$HELP2MAN != x])
 +AM_CONDITIONAL([COND_GRUB_EMU_USB], [test x$enable_grub_emu_usb = xyes])
 +AM_CONDITIONAL([COND_GRUB_EMU_SDL], [test x$enable_grub_emu_sdl = xyes])
 +AM_CONDITIONAL([COND_GRUB_EMU_PCI], [test x$enable_grub_emu_pci = xyes])
 +AM_CONDITIONAL([COND_GRUB_MKFONT], [test x$enable_grub_mkfont = xyes])
 +AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x])
 +AM_CONDITIONAL([COND_GRUB_FSTEST], [test x$enable_grub_fstest = xyes])
 +AM_CONDITIONAL([COND_GRUB_PE2ELF], [test x$TARGET_OBJ2ELF != x])
 +AM_CONDITIONAL([COND_APPLE_CC], [test x$TARGET_APPLE_CC != x])
 +AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes])
  
  # Output files.
  grub_CHECK_LINK_DIR

diff --cc grub-core/bus/usb/emu/usb.c
Simple merge

diff --cc grub-core/bus/usb/ohci.c
Simple merge

diff --cc grub-core/bus/usb/uhci.c
Simple merge

diff --cc grub-core/bus/usb/usb.c
Simple merge

diff --cc grub-core/bus/usb/usbhub.c
Simple merge

diff --cc grub-core/bus/usb/usbtrans.c
Simple merge

diff --cc grub-core/commands/acpi.c
Simple merge

diff --cc grub-core/commands/usbtest.c
Simple merge

diff --cc grub-core/disk/dmraid_nvidia.c
Simple merge

diff --cc grub-core/disk/loopback.c
Simple merge

diff --cc grub-core/disk/mdraid_linux.c
Simple merge

diff --cc grub-core/disk/raid.c
Simple merge

diff --cc grub-core/disk/scsi.c
Simple merge

diff --cc grub-core/disk/usbms.c
Simple merge

diff --cc grub-core/fs/nilfs2.c
Simple merge

diff --cc grub-core/kern/emu/getroot.c
Simple merge

diff --cc grub-core/kern/emu/misc.c
Simple merge

diff --cc grub-core/kern/i386/qemu/init.c
Simple merge

diff --cc grub-core/kern/misc.c
Simple merge

diff --cc grub-core/kern/partition.c
Simple merge

diff --cc grub-core/lib/arg.c
Simple merge

diff --cc grub-core/lib/i386/relocator_asm.S
Simple merge

diff --cc grub-core/loader/powerpc/ieee1275/linux.c
Simple merge

diff --cc grub-core/modules.def
index 416e20dd1985a4fd44b11a77d9bc12c952c12620,0000000000000000000000000000000000000000..71215aba0f8e2c1ad3979d32ef75e5c372768f20
mode 100644,000000..100644
--- 1/grub-core/modules.def
--- /dev/null
+++ b/grub-core/modules.def
@@@ -1,1589 -1,0 +1,1597 @@@
 +AutoGen definitions Makefile.tpl;
 +
 +kernel = {
 +  name = kernel;
 +
 +  nostrip = emu;
 +
 +  emu_ldflags              = '-Wl,-r,-d';
 +  x86_efi_ldflags          = '-Wl,-r,-d';
 +  x86_efi_stripflags       = '--strip-unneeded -K start -R .note -R .comment';
 +
 +  i386_pc_ldflags          = '$(TARGET_IMG_LDFLAGS)';
 +  i386_pc_ldflags          = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
 +
 +  i386_qemu_ldflags        = '$(TARGET_IMG_LDFLAGS)';
 +  i386_qemu_ldflags        = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
 +
 +  i386_coreboot_ldflags    = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
 +  i386_multiboot_ldflags   = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
 +  i386_ieee1275_ldflags    = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
 +  mips_yeeloong_ldflags    = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
 +  powerpc_ieee1275_ldflags = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
 +
 +  mips_yeeloong_cppflags = '-DUSE_ASCII_FAILBACK';
 +  i386_qemu_cppflags     = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
 +  i386_qemu_ccasflags    = '-DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
 +  emu_cflags = '$(CFLAGS_GNULIB)';
 +  emu_cppflags = '$(CPPFLAGS_GNULIB)';
 +
 +  mips_ldadd = '-lgcc';
 +  powerpc_ldadd = '-lgcc';
 +  sparc64_ldadd = '-lgcc';
 +
 +  nonemu_nodist = symlist.c;
 +
 +  shared = kern/command.c;
 +  shared = kern/corecmd.c;
 +  shared = kern/device.c;
 +  shared = kern/disk.c;
 +  shared = kern/dl.c;
 +  shared = kern/env.c;
 +  shared = kern/err.c;
 +  shared = kern/file.c;
 +  shared = kern/fs.c;
 +  shared = kern/list.c;
 +  shared = kern/main.c;
 +  shared = kern/misc.c;
 +  shared = kern/parser.c;
 +  shared = kern/partition.c;
 +  shared = kern/rescue_parser.c;
 +  shared = kern/rescue_reader.c;
 +  shared = kern/term.c;
 +
 +  i386_pc = kern/i386/pc/startup.S;
 +  i386_pc = kern/i386/misc.S;
 +  i386_pc = kern/mm.c;
 +  i386_pc = kern/time.c;
 +  i386_pc = kern/i386/dl.c;
 +  i386_pc = kern/i386/pc/init.c;
 +  i386_pc = kern/i386/pc/mmap.c;
 +  i386_pc = kern/i386/tsc.c;
 +  i386_pc = kern/i386/pit.c;
 +  i386_pc = kern/generic/rtc_get_time_ms.c;
 +  i386_pc = kern/generic/millisleep.c;
 +  i386_pc = term/i386/pc/console.c;
 +  i386_pc = term/i386/vga_common.c;
 +
 +  i386_efi = kern/i386/efi/startup.S;
 +  i386_efi = kern/mm.c;
 +  i386_efi = kern/i386/dl.c;
 +  i386_efi = kern/i386/efi/init.c;
 +  i386_efi = kern/efi/efi.c;
 +  i386_efi = kern/efi/init.c;
 +  i386_efi = kern/efi/mm.c;
 +  i386_efi = kern/time.c;
 +  i386_efi = kern/i386/tsc.c;
 +  i386_efi = kern/i386/pit.c;
 +  i386_efi = kern/generic/rtc_get_time_ms.c;
 +  i386_efi = kern/generic/millisleep.c;
 +  i386_efi = term/efi/console.c;
 +  i386_efi = disk/efi/efidisk.c;
 +
 +  i386_coreboot = kern/i386/coreboot/startup.S;
 +  i386_coreboot = kern/i386/misc.S;
 +  i386_coreboot = kern/i386/coreboot/init.c;
 +  i386_coreboot = kern/i386/coreboot/mmap.c;
 +  i386_coreboot = kern/i386/halt.c;
 +  i386_coreboot = kern/mm.c;
 +  i386_coreboot = kern/time.c;
 +  i386_coreboot = kern/i386/dl.c;
 +  i386_coreboot = kern/i386/tsc.c;
 +  i386_coreboot = kern/i386/pit.c;
 +  i386_coreboot = kern/generic/rtc_get_time_ms.c;
 +  i386_coreboot = kern/generic/millisleep.c;
 +  i386_coreboot = term/i386/pc/vga_text.c;
 +  i386_coreboot = term/i386/vga_common.c;
 +
 +  i386_multiboot = kern/i386/coreboot/startup.S;
 +  i386_multiboot = kern/i386/misc.S;
 +  i386_multiboot = kern/i386/coreboot/init.c;
 +  i386_multiboot = kern/i386/multiboot_mmap.c;
 +  i386_multiboot = kern/i386/halt.c;
 +  i386_multiboot = kern/mm.c;
 +  i386_multiboot = kern/time.c;
 +  i386_multiboot = kern/i386/dl.c;
 +  i386_multiboot = kern/i386/tsc.c;
 +  i386_multiboot = kern/i386/pit.c;
 +  i386_multiboot = kern/generic/rtc_get_time_ms.c;
 +  i386_multiboot = kern/generic/millisleep.c;
 +  i386_multiboot = term/i386/pc/vga_text.c;
 +  i386_multiboot = term/i386/vga_common.c;
 +
 +  i386_qemu = kern/i386/qemu/startup.S;
 +  i386_qemu = kern/i386/misc.S;
 +  i386_qemu = kern/i386/qemu/init.c;
 +  i386_qemu = kern/i386/coreboot/init.c;
 +  i386_qemu = kern/i386/qemu/mmap.c;
 +  i386_qemu = kern/i386/halt.c;
 +  i386_qemu = kern/mm.c;
 +  i386_qemu = kern/time.c;
 +  i386_qemu = kern/i386/dl.c;
 +  i386_qemu = kern/i386/tsc.c;
 +  i386_qemu = kern/i386/pit.c;
 +  i386_qemu = kern/generic/rtc_get_time_ms.c;
 +  i386_qemu = kern/generic/millisleep.c;
 +  i386_qemu = term/i386/pc/vga_text.c;
 +  i386_qemu = term/i386/vga_common.c;
 +  i386_qemu = bus/pci.c;
 +
 +  i386_ieee1275 = kern/i386/ieee1275/startup.S;
 +  i386_ieee1275 = kern/i386/misc.S;
 +  i386_ieee1275 = kern/i386/ieee1275/init.c;
 +  i386_ieee1275 = kern/ieee1275/init.c;
 +  i386_ieee1275 = kern/ieee1275/mmap.c;
 +  i386_ieee1275 = kern/ieee1275/cmain.c;
 +  i386_ieee1275 = kern/ieee1275/openfw.c;
 +  i386_ieee1275 = kern/mm.c;
 +  i386_ieee1275 = kern/i386/dl.c;
 +  i386_ieee1275 = kern/time.c;
 +  i386_ieee1275 = kern/generic/millisleep.c;
 +  i386_ieee1275 = kern/ieee1275/ieee1275.c;
 +  i386_ieee1275 = term/ieee1275/ofconsole.c;
 +  i386_ieee1275 = disk/ieee1275/ofdisk.c;
 +  i386_ieee1275 = term/terminfo.c;
 +  i386_ieee1275 = term/tparm.c;
 +
 +  x86_64_efi = kern/x86_64/efi/startup.S;
 +  x86_64_efi = kern/x86_64/efi/callwrap.S;
 +  x86_64_efi = kern/mm.c;
 +  x86_64_efi = kern/x86_64/dl.c;
 +  x86_64_efi = kern/i386/efi/init.c;
 +  x86_64_efi = kern/efi/efi.c;
 +  x86_64_efi = kern/efi/init.c;
 +  x86_64_efi = kern/efi/mm.c;
 +  x86_64_efi = kern/time.c;
 +  x86_64_efi = kern/i386/tsc.c;
 +  x86_64_efi = kern/i386/pit.c;
 +  x86_64_efi = kern/generic/millisleep.c;
 +  x86_64_efi = kern/generic/rtc_get_time_ms.c;
 +  x86_64_efi = term/efi/console.c;
 +  x86_64_efi = disk/efi/efidisk.c;
 +
 +  mips_yeeloong = kern/mips/startup.S;
 +  mips_yeeloong = kern/mips/init.c;
 +  mips_yeeloong = kern/mips/yeeloong/init.c;
 +  mips_yeeloong = kern/mm.c;
 +  mips_yeeloong = kern/mips/dl.c;
 +  mips_yeeloong = kern/generic/millisleep.c;
 +  mips_yeeloong = kern/generic/rtc_get_time_ms.c;
 +  mips_yeeloong = kern/time.c;
 +  mips_yeeloong = kern/mips/cache.S;
 +  mips_yeeloong = io/bufio.c;
 +  mips_yeeloong = lib/arg.c;
 +  mips_yeeloong = commands/extcmd.c;
 +  mips_yeeloong = bus/pci.c;
 +  mips_yeeloong = bus/bonito.c;
 +  mips_yeeloong = font/font_cmd.c;
 +  mips_yeeloong = font/font.c;
 +  mips_yeeloong = term/at_keyboard.c;
 +  mips_yeeloong = term/gfxterm.c;
 +  mips_yeeloong = video/video.c;
 +  mips_yeeloong = video/fb/video_fb.c;
 +  mips_yeeloong = video/fb/fbblit.c;
 +  mips_yeeloong = video/fb/fbfill.c;
 +  mips_yeeloong = video/fb/fbutil.c;
 +  mips_yeeloong = video/bitmap.c;
 +  mips_yeeloong = video/bitmap_scale.c;
 +  mips_yeeloong = video/sm712.c;
 +  mips_yeeloong = bus/cs5536.c;
 +  mips_yeeloong = term/serial.c;
 +  mips_yeeloong = term/terminfo.c;
 +  mips_yeeloong = term/tparm.c;
 +
 +  powerpc_ieee1275 = kern/powerpc/ieee1275/startup.S;
 +  powerpc_ieee1275 = kern/ieee1275/cmain.c;
 +  powerpc_ieee1275 = kern/ieee1275/ieee1275.c;
 +  powerpc_ieee1275 = kern/mm.c;
 +  powerpc_ieee1275 = kern/ieee1275/init.c;
 +  powerpc_ieee1275 = kern/ieee1275/mmap.c;
 +  powerpc_ieee1275 = kern/ieee1275/openfw.c;
 +  powerpc_ieee1275 = kern/powerpc/dl.c;
 +  powerpc_ieee1275 = kern/generic/millisleep.c;
 +  powerpc_ieee1275 = kern/time.c;
 +  powerpc_ieee1275 = kern/powerpc/cache.S;
 +  powerpc_ieee1275 = term/ieee1275/ofconsole.c;
 +  powerpc_ieee1275 = disk/ieee1275/ofdisk.c;
 +  powerpc_ieee1275 = term/terminfo.c;
 +  powerpc_ieee1275 = term/tparm.c;
 +
 +  sparc64_ieee1275 = kern/sparc64/ieee1275/crt0.S;
 +  sparc64_ieee1275 = kern/ieee1275/cmain.c;
 +  sparc64_ieee1275 = kern/ieee1275/ieee1275.c;
 +  sparc64_ieee1275 = kern/mm.c;
 +  sparc64_ieee1275 = kern/sparc64/ieee1275/ieee1275.c;
 +  sparc64_ieee1275 = kern/sparc64/ieee1275/init.c;
 +  sparc64_ieee1275 = kern/ieee1275/mmap.c;
 +  sparc64_ieee1275 = kern/ieee1275/openfw.c;
 +  sparc64_ieee1275 = kern/sparc64/dl.c;
 +  sparc64_ieee1275 = kern/generic/millisleep.c;
 +  sparc64_ieee1275 = kern/time.c;
 +  sparc64_ieee1275 = kern/sparc64/cache.S;
 +  sparc64_ieee1275 = disk/ieee1275/ofdisk.c;
 +  sparc64_ieee1275 = term/ieee1275/ofconsole.c;
 +  sparc64_ieee1275 = term/terminfo.c;
 +  sparc64_ieee1275 = term/tparm.c;
 +
 +  emu = kern/emu/mm.c;
 +  emu = kern/emu/main.c;
 +  emu = kern/emu/misc.c;
 +  emu = kern/emu/getroot.c;
 +  emu = kern/emu/time.c;
 +  emu = kern/emu/hostdisk.c;
 +  emu = kern/emu/hostfs.c;
 +  emu = kern/emu/console.c;
 +  emu = disk/host.c;
 +  emu = gnulib/progname.c;
 +
 +  extra_dist = kern/i386/loader.S;
 +  extra_dist = kern/i386/realmode.S;
 +  extra_dist = kern/i386/pc/lzma_decode.S;
 +};
 +
 +program = {
 +  name = grub-emu;
 +  mansection = 1;
 +
 +  source = kern/emu/full.c;
 +  nodist = grub_emu_init.c;
 +
 +  ldadd = 'kernel.img$(EXEEXT)';
 +  ldadd = '$(MODULE_FILES)';
 +  ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)';
 +
 +  enable = emu;
 +};
 +
 +program = {
 +  name = grub-emu-lite;
 +
 +  source = kern/emu/lite.c;
 +  source = kern/emu/cache.S;
 +  nodist = symlist.c;
 +
 +  ldadd = 'kernel.img$(EXEEXT)';
 +  ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)';
 +
 +  enable = emu;
 +};
 +
 +image = {
 +  name = boot;
 +  i386_pc = boot/i386/pc/boot.S;
 +  i386_qemu = boot/i386/qemu/boot.S;
 +
 +  i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
 +  i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00';
 +
 +  i386_qemu_ldflags = '$(TARGET_IMG_LDFLAGS)';
 +  i386_qemu_ldflags = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_BOOT_MACHINE_LINK_ADDR)';
 +  i386_qemu_ccasflags = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
 +
 +  sparc64_ieee1275 = boot/sparc64/ieee1275/boot.S;
 +  sparc64_ieee1275_objcopyflags = '-O a.out-sunos-big';
 +  sparc64_ieee1275_ldflags = ' -Wl,-Ttext=0x4000';
 +
 +  objcopyflags = '-O binary';
 +  enable = i386_pc;
 +  enable = i386_qemu;
 +  enable = sparc64_ieee1275;
 +};
 +
 +image = {
 +  name = cdboot;
 +  i386_pc = boot/i386/pc/cdboot.S;
 +  i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
 +  i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00';
 +  objcopyflags = '-O binary';
 +  enable = i386_pc;
 +};
 +
 +image = {
 +  name = pxeboot;
 +  i386_pc = boot/i386/pc/pxeboot.S;
 +
 +  i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
 +  i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00';
 +
 +  objcopyflags = '-O binary';
 +  enable = i386_pc;
 +};
 +
 +image = {
 +  name = diskboot;
 +  i386_pc = boot/i386/pc/diskboot.S;
 +
 +  i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
 +  i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x8000';
 +
 +  sparc64_ieee1275 = boot/sparc64/ieee1275/diskboot.S;
 +  sparc64_ieee1275_ldflags = '-Wl,-Ttext=0x4200';
 +
 +  objcopyflags = '-O binary';
 +
 +  enable = i386_pc;
 +  enable = sparc64_ieee1275;
 +};
 +
 +image = {
 +  name = lnxboot;
 +  i386_pc = boot/i386/pc/lnxboot.S;
 +
 +  i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
 +  i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x6000';
 +
 +  objcopyflags = '-O binary';
 +  enable = i386_pc;
 +};
 +
 +image = {
 +  name = fwstart;
 +  mips_yeeloong = boot/mips/yeeloong/fwstart.S;
 +  objcopyflags = '-O binary';
 +  enable = mips_yeeloong;
 +};
 +
 +module = {
 +  name = trig;
 +  nodist = trigtables.c;
 +  extra_dist = gentrigtables.c;
 +};
 +
 +module = {
 +  name = cs5536;
 +  source = bus/cs5536.c;
 +  enable = i386;
 +};
 +
 +module = {
 +  name = libusb;
 +  source = bus/usb/emu/usb.c;
 +  enable = emu;
 +  condition = COND_GRUB_EMU_USB;
 +};
 +
 +module = {
 +  name = lsspd;
 +  mips_yeeloong = commands/mips/yeeloong/lsspd.c;
 +  enable = mips_yeeloong;
 +};
 +
 +module = {
 +  name = usb;
 +  source = bus/usb/usb.c;
 +  source = bus/usb/usbtrans.c;
 +  source = bus/usb/usbhub.c;
 +  enable = i386;
 +  enable = mips_yeeloong;
 +};
 +
 +module = {
 +  name = usb;
 +  source = bus/usb/usb.c;
 +  enable = emu;
 +  condition = COND_GRUB_EMU_USB;
 +};
 +
 +module = {
 +  name = uhci;
 +  source = bus/usb/uhci.c;
 +  enable = i386_pc;
 +};
 +
 +module = {
 +  name = ohci;
 +  source = bus/usb/ohci.c;
 +  enable = i386_pc;
 +  enable = mips_yeeloong;
 +};
 +
 +module = {
 +  name = pci;
 +  source = bus/pci.c;
 +  emu = bus/emu/pci.c;
 +  emu = commands/lspci.c;
 +
 +  enable = emu;
 +  enable = i386_pc;
 +  enable = x86_efi;
 +  enable = i386_ieee1275;
 +  enable = i386_coreboot;
 +
 +  emu_condition = COND_GRUB_EMU_PCI;
 +};
 +
 +library = {
 +  name = libgnulib.a;
 +  source = gnulib/regex.c;
 +
 +  extra_dist = gnulib/regcomp.c;
 +  extra_dist = gnulib/regexec.c;
 +  extra_dist = gnulib/fnmatch_loop.c;
 +  extra_dist = gnulib/regex_internal.c;
 +
 +  cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
 +  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
 +};
 +
++module = {
++  name = cmostest;
++  source = commands/i386/cmostest.c;
++  enable = i386_pc;
++  enable = i386_coreboot;
++};
++
 +module = {
 +  name = iorw;
 +  source = commands/iorw.c;
 +  enable = i386;
 +};
 +
 +module = {
 +  name = regexp;
 +  source = commands/regexp.c;
 +  ldadd = libgnulib.a;
 +  cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
 +  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
 +};
 +
 +module = {
 +  name = acpi;
 +
 +  x86_efi = commands/acpi.c;
 +  x86_efi = commands/efi/acpi.c;
 +
 +  i386_pc = commands/acpi.c;
 +  i386_pc = commands/i386/pc/acpi.c;
 +
 +  enable = x86_efi;
 +  enable = i386_pc;
 +};
 +
 +module = {
 +  name = blocklist;
 +  source = commands/blocklist.c;
 +};
 +
 +module = {
 +  name = boot;
 +  source = commands/boot.c;
 +
 +  i386_pc = commands/boot.c;
 +  i386_pc = lib/i386/pc/biosnum.c;
 +};
 +
 +module = {
 +  name = cat;
 +  source = commands/cat.c;
 +};
 +
 +module = {
 +  name = cmp;
 +  source = commands/cmp.c;
 +};
 +
 +module = {
 +  name = configfile;
 +  source = commands/configfile.c;
 +};
 +
 +module = {
 +  name = cpuid;
 +  source = commands/i386/cpuid.c;
 +
 +  enable = x86;
 +};
 +
 +module = {
 +  name = crc;
 +  source = commands/crc.c;
 +  source = lib/crc.c;
 +};
 +
 +module = {
 +  name = date;
 +  source = commands/date.c;
 +};
 +
 +module = {
 +  name = drivemap;
 +
 +  i386_pc = commands/i386/pc/drivemap.c;
 +  i386_pc = commands/i386/pc/drivemap_int13h.S;
 +  enable = i386_pc;
 +};
 +
 +module = {
 +  name = echo;
 +  source = commands/echo.c;
 +};
 +
 +module = {
 +  name = extcmd;
 +  source = commands/extcmd.c;
 +  source = lib/arg.c;
 +};
 +
 +module = {
 +  name = fixvideo;
 +  x86_efi = commands/efi/fixvideo.c;
 +  enable = x86_efi;
 +};
 +
 +module = {
 +  name = gptsync;
 +  source = commands/gptsync.c;
 +};
 +
 +module = {
 +  name = halt;
 +  source = commands/halt.c;
 +
 +  i386_pc = commands/i386/pc/halt.c;
 +};
 +
 +module = {
 +  name = hashsum;
 +  source = commands/hashsum.c;
 +};
 +
 +module = {
 +  name = hdparm;
 +  source = commands/hdparm.c;
 +  source = lib/hexdump.c;
 +
 +  enable = i386_pc;
 +};
 +
 +module = {
 +  name = help;
 +  source = commands/help.c;
 +};
 +
 +module = {
 +  name = hexdump;
 +  source = commands/hexdump.c;
 +  source = lib/hexdump.c;
 +};
 +
 +module = {
 +  name = keystatus;
 +  source = commands/keystatus.c;
 +};
 +
 +module = {
 +  name = loadbios;
 +  x86_efi = commands/efi/loadbios.c;
 +  enable = x86_efi;
 +};
 +
 +module = {
 +  name = loadenv;
 +  source = commands/loadenv.c;
 +  source = lib/envblk.c;
 +};
 +
 +module = {
 +  name = ls;
 +  source = commands/ls.c;
 +};
 +
 +module = {
 +  name = lsmmap;
 +  source = commands/lsmmap.c;
 +};
 +
 +module = {
 +  name = lspci;
 +  source = commands/lspci.c;
 +
 +  enable = x86;
 +  enable = mips;
 +};
 +
 +module = {
 +  name = memrw;
 +  source = commands/memrw.c;
 +};
 +
 +module = {
 +  name = minicmd;
 +  source = commands/minicmd.c;
 +};
 +
 +module = {
 +  name = parttool;
 +  source = commands/parttool.c;
 +};
 +
 +module = {
 +  name = password;
 +  source = commands/password.c;
 +};
 +
 +module = {
 +  name = password_pbkdf2;
 +  source = commands/password_pbkdf2.c;
 +};
 +
 +module = {
 +  name = play;
 +  source = commands/i386/pc/play.c;
 +  enable = i386;
 +};
 +
 +module = {
 +  name = probe;
 +  source = commands/probe.c;
 +};
 +
 +module = {
 +  name = pxecmd;
 +  i386_pc = commands/i386/pc/pxecmd.c;
 +  enable = i386_pc;
 +};
 +
 +module = {
 +  name = read;
 +  source = commands/read.c;
 +};
 +
 +module = {
 +  name = reboot;
 +  source = commands/reboot.c;
 +};
 +
 +module = {
 +  name = search;
 +  source = commands/search_wrap.c;
 +  extra_dist = commands/search.c;
 +};
 +
 +module = {
 +  name = search_fs_file;
 +  source = commands/search_file.c;
 +};
 +
 +module = {
 +  name = search_fs_uuid;
 +  source = commands/search_uuid.c;
 +};
 +
 +module = {
 +  name = search_label;
 +  source = commands/search_label.c;
 +};
 +
 +module = {
 +  name = setpci;
 +  source = commands/setpci.c;
 +
 +  enable = x86;
 +};
 +
 +module = {
 +  name = sleep;
 +  source = commands/sleep.c;
 +};
 +
 +module = {
 +  name = suspend;
 +  source = commands/ieee1275/suspend.c;
 +  enable = i386_ieee1275;
 +  enable = powerpc_ieee1275;
 +};
 +
 +module = {
 +  name = terminal;
 +  source = commands/terminal.c;
 +};
 +
 +module = {
 +  name = test;
 +  source = commands/test.c;
 +};
 +
 +module = {
 +  name = true;
 +  source = commands/true.c;
 +};
 +
 +module = {
 +  name = usbtest;
 +  source = commands/usbtest.c;
 +  enable = i386_pc;
 +  enable = mips_yeeloong;
 +};
 +
 +module = {
 +  name = usbtest;
 +  source = commands/usbtest.c;
 +  enable = emu;
 +  condition = COND_GRUB_EMU_USB;
 +};
 +
 +module = {
 +  name = vbeinfo;
 +  i386_pc = commands/i386/pc/vbeinfo.c;
 +  enable = i386_pc;
 +};
 +
 +module = {
 +  name = vbetest;
 +  i386_pc = commands/i386/pc/vbetest.c;
 +  enable = i386_pc;
 +};
 +
 +module = {
 +  name = videotest;
 +  source = commands/videotest.c;
 +};
 +
 +module = {
 +  name = xnu_uuid;
 +  source = commands/xnu_uuid.c;
 +};
 +
 +module = {
 +  name = dm_nv;
 +  source = disk/dmraid_nvidia.c;
 +};
 +
 +module = {
 +  name = loopback;
 +  source = disk/loopback.c;
 +};
 +
 +module = {
 +  name = lvm;
 +  source = disk/lvm.c;
 +};
 +
 +module = {
 +  name = mdraid;
 +  source = disk/mdraid_linux.c;
 +};
 +
 +module = {
 +  name = raid;
 +  source = disk/raid.c;
 +};
 +
 +module = {
 +  name = raid5rec;
 +  source = disk/raid5_recover.c;
 +};
 +
 +module = {
 +  name = raid6rec;
 +  source = disk/raid6_recover.c;
 +};
 +
 +module = {
 +  name = scsi;
 +  source = disk/scsi.c;
 +};
 +
 +module = {
 +  name = memdisk;
 +  source = disk/memdisk.c;
 +};
 +
 +module = {
 +  name = ata;
 +  source = disk/ata.c;
 +
 +  enable = x86;
 +  enable = mips;
 +};
 +
 +module = {
 +  name = ata_pthru;
 +  source = disk/ata_pthru.c;
 +
 +  enable = x86;
 +  enable = mips_yeeloong;
 +};
 +
 +module = {
 +  name = biosdisk;
 +  i386_pc = disk/i386/pc/biosdisk.c;
 +  enable = i386_pc;
 +};
 +
 +module = {
 +  name = usbms;
 +  source = disk/usbms.c;
 +  enable = i386_pc;
 +  enable = mips_yeeloong;
 +};
 +
 +module = {
 +  name = usbms;
 +  source = disk/usbms.c;
 +  enable = emu;
 +  condition = COND_GRUB_EMU_USB;
 +};
 +
 +module = {
 +  name = nand;
 +  source = disk/ieee1275/nand.c;
 +
 +  enable = i386_ieee1275;
 +};
 +
 +module = {
 +  name = efiemu;
 +  i386_pc = efiemu/main.c;
 +  i386_pc = efiemu/i386/loadcore32.c;
 +  i386_pc = efiemu/i386/loadcore64.c;
 +  i386_pc = efiemu/i386/pc/cfgtables.c;
 +  i386_pc = efiemu/mm.c;
 +  i386_pc = efiemu/loadcore_common.c;
 +  i386_pc = efiemu/symbols.c;
 +  i386_pc = efiemu/loadcore32.c;
 +  i386_pc = efiemu/loadcore64.c;
 +  i386_pc = efiemu/prepare32.c;
 +  i386_pc = efiemu/prepare64.c;
 +  i386_pc = efiemu/pnvram.c;
 +  i386_pc = efiemu/i386/coredetect.c;
 +
 +  extra_dist = efiemu/prepare.c;
 +  extra_dist = efiemu/loadcore.c;
 +  extra_dist = efiemu/runtime/efiemu.S;
 +  extra_dist = efiemu/runtime/efiemu.c;
 +
 +  enable = i386_pc;
 +};
 +
 +module = {
 +  name = font;
 +  source = font/font.c;
 +  source = font/font_cmd.c;
 +  enable = emu;
 +  enable = x86;
 +  enable = sparc64;
 +  enable = powerpc;
 +};
 +
 +module = {
 +  name = affs;
 +  source = fs/affs.c;
 +};
 +
 +module = {
 +  name = afs;
 +  source = fs/afs.c;
 +};
 +
 +module = {
 +  name = afs_be;
 +  source = fs/afs_be.c;
 +};
 +
 +module = {
 +  name = befs;
 +  source = fs/befs.c;
 +};
 +
 +module = {
 +  name = befs_be;
 +  source = fs/befs_be.c;
 +};
 +
 +module = {
 +  name = cpio;
 +  source = fs/cpio.c;
 +};
 +
 +module = {
 +  name = ext2;
 +  source = fs/ext2.c;
 +};
 +
 +module = {
 +  name = fat;
 +  source = fs/fat.c;
 +};
 +
 +module = {
 +  name = fshelp;
 +  source = fs/fshelp.c;
 +};
 +
 +module = {
 +  name = hfs;
 +  source = fs/hfs.c;
 +};
 +
 +module = {
 +  name = hfsplus;
 +  source = fs/hfsplus.c;
 +};
 +
 +module = {
 +  name = iso9660;
 +  source = fs/iso9660.c;
 +};
 +
 +module = {
 +  name = jfs;
 +  source = fs/jfs.c;
 +};
 +
 +module = {
 +  name = minix;
 +  source = fs/minix.c;
 +};
 +
 +module = {
 +  name = nilfs2;
 +  source = fs/nilfs2.c;
 +};
 +
 +module = {
 +  name = ntfs;
 +  source = fs/ntfs.c;
 +};
 +
 +module = {
 +  name = ntfscomp;
 +  source = fs/ntfscomp.c;
 +};
 +
 +module = {
 +  name = reiserfs;
 +  source = fs/reiserfs.c;
 +};
 +
 +module = {
 +  name = sfs;
 +  source = fs/sfs.c;
 +};
 +
 +module = {
 +  name = tar;
 +  source = fs/tar.c;
 +};
 +
 +module = {
 +  name = udf;
 +  source = fs/udf.c;
 +};
 +
 +module = {
 +  name = ufs1;
 +  source = fs/ufs.c;
 +};
 +
 +module = {
 +  name = ufs2;
 +  source = fs/ufs2.c;
 +};
 +
 +module = {
 +  name = xfs;
 +  source = fs/xfs.c;
 +};
 +
 +module = {
 +  name = pxe;
 +  i386_pc = fs/i386/pc/pxe.c;
 +  enable = i386_pc;
 +};
 +
 +module = {
 +  name = gettext;
 +  source = gettext/gettext.c;
 +};
 +
 +module = {
 +  name = gfxmenu;
 +  source = gfxmenu/gfxmenu.c;
 +  source = gfxmenu/model.c;
 +  source = gfxmenu/view.c;
 +  source = gfxmenu/font.c;
 +  source = gfxmenu/icon_manager.c;
 +  source = gfxmenu/theme_loader.c;
 +  source = gfxmenu/widget-box.c;
 +  source = gfxmenu/gui_canvas.c;
 +  source = gfxmenu/gui_circular_progress.c;
 +  source = gfxmenu/gui_box.c;
 +  source = gfxmenu/gui_label.c;
 +  source = gfxmenu/gui_list.c;
 +  source = gfxmenu/gui_image.c;
 +  source = gfxmenu/gui_progress_bar.c;
 +  source = gfxmenu/gui_util.c;
 +  source = gfxmenu/gui_string_util.c;
 +  source = gfxmenu/named_colors.c;
 +};
 +
 +module = {
 +  name = hello;
 +  source = hello/hello.c;
 +};
 +
 +module = {
 +  name = gzio;
 +  source = io/gzio.c;
 +};
 +
 +module = {
 +  name = bufio;
 +  source = io/bufio.c;
 +  enable = emu;
 +  enable = x86;
 +  enable = sparc64;
 +  enable = powerpc;
 +};
 +
 +module = {
 +  name = elf;
 +  source = kern/elf.c;
 +};
 +
 +module = {
 +  name = crypto;
 +  source = lib/crypto.c;
 +
 +  extra_dist = lib/libgcrypt-grub/cipher/crypto.lst;
 +};
 +
 +module = {
 +  name = gcry_arcfour;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/arcfour.c;
 +};
 +
 +module = {
 +  name = gcry_blowfish;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/blowfish.c;
 +};
 +
 +module = {
 +  name = gcry_camellia;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/camellia.c;
 +  source = lib/libgcrypt-grub/cipher/camellia-glue.c;
 +};
 +
 +module = {
 +  name = gcry_cast5;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/cast5.c;
 +};
 +
 +module = {
 +  name = gcry_crc;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/crc.c;
 +};
 +
 +module = {
 +  name = gcry_des;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/des.c;
 +};
 +
 +module = {
 +  name = gcry_md4;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/md4.c;
 +};
 +
 +module = {
 +  name = gcry_md5;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/md5.c;
 +};
 +
 +module = {
 +  name = gcry_rfc2268;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/rfc2268.c;
 +};
 +
 +module = {
 +  name = gcry_rijndael;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/rijndael.c;
 +};
 +
 +module = {
 +  name = gcry_rmd160;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/rmd160.c;
 +};
 +
 +module = {
 +  name = gcry_seed;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/seed.c;
 +};
 +
 +module = {
 +  name = gcry_serpent;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/serpent.c;
 +};
 +
 +module = {
 +  name = gcry_sha1;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/sha1.c;
 +};
 +
 +module = {
 +  name = gcry_sha256;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/sha256.c;
 +};
 +
 +module = {
 +  name = gcry_sha512;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/sha512.c;
 +};
 +
 +module = {
 +  name = gcry_tiger;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/tiger.c;
 +};
 +
 +module = {
 +  name = gcry_twofish;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/twofish.c;
 +};
 +
 +module = {
 +  name = gcry_whirlpool;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +  source = lib/libgcrypt-grub/cipher/whirlpool.c;
 +};
 +
 +module = {
 +  name = pbkdf2;
 +  source = lib/pbkdf2.c;
 +};
 +
 +module = {
 +  name = relocator;
 +  mips = lib/mips/relocator.c;
 +  mips = lib/mips/relocator_asm.S;
 +  x86 = lib/i386/relocator.c;
 +  x86 = lib/i386/relocator_asm.S;
 +  x86 = lib/i386/relocator_backward.S;
 +  extra_dist = lib/relocator.c;
 +  enable = mips;
 +  enable = x86;
 +};
 +
 +module = {
 +  name = datetime;
 +  source = lib/cmos_datetime.c;
 +  x86_efi = lib/efi/datetime.c;
 +  sparc64_ieee1275 = lib/ieee1275/datetime.c;
 +  powerpc_ieee1275 = lib/ieee1275/datetime.c;
 +  enable = x86;
 +  enable = mips;
 +  enable = sparc64_ieee1275;
 +  enable = powerpc_ieee1275;
 +};
 +
 +module = {
 +  name = setjmp;
 +  nodist = lib/target_cpu/setjmp.S;
 +  extra_dist = lib/i386/setjmp.S;
 +  extra_dist = lib/mips/setjmp.S;
 +  extra_dist = lib/x86_64/setjmp.S;
 +  extra_dist = lib/sparc64/setjmp.S;
 +  extra_dist = lib/powerpc/setjmp.S;
 +};
 +
 +module = {
 +  name = aout;
 +  source = loader/aout.c;
 +  enable = i386_pc;
 +  enable = i386_qemu;
 +  enable = i386_coreboot;
 +  enable = i386_multiboot;
 +  enable = i386_ieee1275;
 +};
 +
 +module = {
 +  name = bsd;
 +  source = loader/i386/bsd.c;
 +  source = loader/i386/bsd32.c;
 +  source = loader/i386/bsd64.c;
 +  source = loader/i386/bsd_helper.S;
 +  source = loader/i386/bsd_trampoline.S;
 +
 +  extra_dist = loader/i386/bsdXX.c;
 +  extra_dist = loader/i386/bsd_pagetable.c;
 +
 +  enable = i386_pc;
 +  enable = i386_qemu;
 +  enable = i386_coreboot;
 +  enable = i386_multiboot;
 +};
 +
 +module = {
 +  name = linux16;
 +  source = loader/i386/pc/linux.c;
 +  enable = i386_pc;
 +};
 +
 +module = {
 +  name = multiboot2;
 +  cppflags = "-DGRUB_USE_MULTIBOOT2";
 +
 +  source = loader/multiboot.c;
 +  source = loader/multiboot_mbi2.c;
 +  enable = x86;
 +  enable = mips;
 +};
 +
 +module = {
 +  name = multiboot;
 +  source = loader/multiboot.c;
 +  source = loader/i386/multiboot_mbi.c;
 +  extra_dist = loader/multiboot_elfxx.c;
 +  enable = x86;
 +};
 +
 +module = {
 +  name = linux;
 +  i386 = loader/i386/linux.c;
 +  i386_efi = loader/i386/efi/linux.c;
 +  i386_ieee1275 = loader/i386/ieee1275/linux.c;
 +  x86_64_efi = loader/i386/efi/linux.c;
 +  x86_64_efi = loader/i386/linux_trampoline.S;
 +  mips = loader/mips/linux.c;
 +  powerpc_ieee1275 = loader/powerpc/ieee1275/linux.c;
 +  sparc64_ieee1275 = loader/sparc64/ieee1275/linux.c;
 +  enable = nonemu;
 +};
 +
 +module = {
 +  name = xnu;
 +  source = loader/xnu_resume.c;
 +  source = loader/i386/xnu.c;
 +  source = loader/macho32.c;
 +  source = loader/macho64.c;
 +  source = loader/macho.c;
 +  source = loader/xnu.c;
 +
 +  extra_dist = loader/machoXX.c;
 +  enable = i386_pc;
 +  enable = x86_efi;
 +};
 +
 +module = {
 +  name = appleldr;
 +  x86_efi = loader/efi/appleloader.c;
 +  enable = x86_efi;
 +};
 +
 +module = {
 +  name = chain;
 +  x86_efi = loader/efi/chainloader.c;
 +  i386_pc = loader/i386/pc/chainloader.c;
 +  enable = i386_pc;
 +  enable = x86_efi;
 +};
 +
 +module = {
 +  name = mmap;
 +  i386_pc = mmap/mmap.c;
 +  i386_pc = mmap/i386/uppermem.c;
 +  i386_pc = mmap/i386/mmap.c;
 +  i386_pc = mmap/i386/pc/mmap.c;
 +  i386_pc = mmap/i386/pc/mmap_helper.S;
 +
 +  x86_efi = mmap/mmap.c;
 +  x86_efi = mmap/i386/uppermem.c;
 +  x86_efi = mmap/i386/mmap.c;
 +  x86_efi = mmap/efi/mmap.c;
 +
 +  i386_coreboot = mmap/mmap.c;
 +  i386_coreboot = mmap/i386/uppermem.c;
 +  i386_coreboot = mmap/i386/mmap.c;
 +
 +  i386_multiboot = mmap/mmap.c;
 +  i386_multiboot = mmap/i386/uppermem.c;
 +  i386_multiboot = mmap/i386/mmap.c;
 +
 +  i386_qemu = mmap/mmap.c;
 +  i386_qemu = mmap/i386/uppermem.c;
 +  i386_qemu = mmap/i386/mmap.c;
 +
 +  i386_ieee1275 = mmap/mmap.c;
 +  i386_ieee1275 = mmap/i386/uppermem.c;
 +  i386_ieee1275 = mmap/i386/mmap.c;
 +
 +  mips_yeeloong = mmap/mmap.c;
 +  mips_yeeloong = mmap/mips/yeeloong/uppermem.c;
 +
 +  enable = x86;
 +  enable = mips_yeeloong;
 +};
 +
 +module = {
 +  name = normal;
 +  source = normal/main.c;
 +  source = normal/cmdline.c;
 +  source = normal/dyncmd.c;
 +  source = normal/auth.c;
 +  source = normal/autofs.c;
 +  source = normal/color.c;
 +  source = normal/completion.c;
 +  source = normal/datetime.c;
 +  source = normal/menu.c;
 +  source = normal/menu_entry.c;
 +  source = normal/menu_text.c;
 +  source = normal/misc.c;
 +  source = normal/crypto.c;
 +  source = normal/term.c;
 +  source = normal/context.c;
 +  source = normal/charset.c;
 +
 +  source = script/main.c;
 +  source = script/script.c;
 +  source = script/execute.c;
 +  source = script/function.c;
 +  source = script/lexer.c;
++  source = script/argv.c;
 +
 +  source = unidata.c;
 +  nodist = grub_script.tab.c;
 +  nodist = grub_script.yy.c;
 +  nodist = grub_script.tab.h;
 +  nodist = grub_script.yy.h;
 +
 +  extra_dist = script/yylex.l;
 +  extra_dist = script/parser.y;
 +
 +  cflags = '$(CFLAGS_POSIX) -Wno-error';
 +  cppflags = '$(CPPFLAGS_POSIX)';
 +};
 +
 +module = {
 +  name = part_acorn;
 +  source = partmap/acorn.c;
 +};
 +
 +module = {
 +  name = part_amiga;
 +  source = partmap/amiga.c;
 +};
 +
 +module = {
 +  name = part_apple;
 +  source = partmap/apple.c;
 +};
 +
 +module = {
 +  name = part_gpt;
 +  source = partmap/gpt.c;
 +};
 +
 +module = {
 +  name = part_msdos;
 +  source = partmap/msdos.c;
 +};
 +
 +module = {
 +  name = part_sun;
 +  source = partmap/sun.c;
 +};
 +
 +module = {
 +  name = part_bsd;
 +  source = partmap/bsdlabel.c;
 +};
 +
 +module = {
 +  name = part_sunpc;
 +  source = partmap/sunpc.c;
 +};
 +
 +module = {
 +  name = msdospart;
 +  source = parttool/msdospart.c;
 +};
 +
 +module = {
 +  name = at_keyboard;
 +  source = term/at_keyboard.c;
 +  enable = x86;
 +};
 +
 +module = {
 +  name = gfxterm;
 +  source = term/gfxterm.c;
 +  enable = emu;
 +  enable = x86;
 +  enable = sparc64;
 +  enable = powerpc;
 +};
 +
 +module = {
 +  name = serial;
 +  source = term/serial.c;
 +  enable = i386;
 +};
 +
 +module = {
 +  name = terminfo;
 +  source = term/terminfo.c;
 +  source = term/tparm.c;
 +};
 +
 +module = {
 +  name = usb_keyboard;
 +  source = term/usb_keyboard.c;
 +  enable = i386_pc;
 +  enable = mips_yeeloong;
 +};
 +
 +module = {
 +  name = vga;
 +  i386_pc = video/i386/pc/vga.c;
 +  enable = i386_pc;
 +};
 +
 +module = {
 +  name = vga_text;
 +  x86 = term/i386/pc/vga_text.c;
 +  x86 = term/i386/vga_common.c;
 +  enable = x86;
 +};
 +
 +module = {
 +  name = video_cirrus;
 +  i386 = video/cirrus.c;
 +  enable = i386;
 +};
 +
 +module = {
 +  name = video_bochs;
 +  i386 = video/bochs.c;
 +  enable = i386;
 +};
 +
 +module = {
 +  name = functional_test;
 +  source = tests/lib/functional_test.c;
 +  source = tests/lib/test.c;
 +};
 +
 +module = {
 +  name = example_functional_test;
 +  source = tests/example_functional_test.c;
 +  cflags = -Wno-format;
 +};
 +
 +module = {
 +  name = bitmap;
 +  source = video/bitmap.c;
 +  enable = emu;
 +  enable = x86;
 +  enable = sparc64;
 +  enable = powerpc;
 +};
 +
 +module = {
 +  name = bitmap_scale;
 +  source = video/bitmap_scale.c;
 +  enable = emu;
 +  enable = x86;
 +  enable = sparc64;
 +  enable = powerpc;
 +};
 +
 +module = {
 +  name = efi_gop;
 +  x86_efi = video/efi_gop.c;
 +  enable = x86_efi;
 +};
 +
 +module = {
 +  name = efi_uga;
 +  x86_efi = video/efi_uga.c;
 +  enable = x86_efi;
 +};
 +
 +module = {
 +  name = jpeg;
 +  source = video/readers/jpeg.c;
 +};
 +
 +module = {
 +  name = png;
 +  source = video/readers/png.c;
 +};
 +
 +module = {
 +  name = tga;
 +  source = video/readers/tga.c;
 +};
 +
 +module = {
 +  name = vbe;
 +  i386_pc = video/i386/pc/vbe.c;
 +  enable = i386_pc;
 +};
 +
 +module = {
 +  name = video_fb;
 +  source = video/fb/video_fb.c;
 +  source = video/fb/fbblit.c;
 +  source = video/fb/fbfill.c;
 +  source = video/fb/fbutil.c;
 +  enable = emu;
 +  enable = x86;
 +  enable = sparc64;
 +  enable = powerpc;
 +};
 +
 +module = {
 +  name = video;
 +  source = video/video.c;
 +  enable = emu;
 +  enable = x86;
 +  enable = sparc64;
 +  enable = powerpc;
 +};
 +
 +module = {
 +  name = ieee1275_fb;
 +  source = video/ieee1275.c;
 +  enable = powerpc;
 +  enable = sparc64;
 +};
 +
 +module = {
 +  name = sdl;
 +  source = video/emu/sdl.c;
 +  condition = COND_GRUB_EMU_SDL;
 +  enable = emu;
 +};
 +
 +module = {
 +  name = datehook;
 +  source = hook/datehook.c;
 +};

diff --cc grub-core/normal/color.c
Simple merge

diff --cc grub-core/normal/main.c
Simple merge

diff --cc grub-core/partmap/bsdlabel.c
Simple merge

diff --cc grub-core/script/argv.c
index 0000000000000000000000000000000000000000,b69ee39c57be092dbbe358cf9879a0fc16bf98fe..b69ee39c57be092dbbe358cf9879a0fc16bf98fe
mode 000000,100644..100644
--- /dev/null
--- 2/script/argv.c
+++ b/grub-core/script/argv.c

diff --cc grub-core/script/execute.c
Simple merge

diff --cc grub-core/script/function.c
Simple merge

diff --cc grub-core/script/main.c
Simple merge

diff --cc grub-core/script/parser.y
Simple merge

diff --cc grub-core/script/script.c
Simple merge

diff --cc grub-core/script/yylex.l
Simple merge

diff --cc grub-core/term/efi/console.c
Simple merge

diff --cc grub-core/video/cirrus.c
Simple merge

diff --cc grub-core/video/sm712.c
Simple merge

diff --cc grub-core/video/sm712_init.c
Simple merge

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

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

diff --cc modules.def
index c7574e928fd4c78ed15e22a5f874529ed9ba8c1e,0000000000000000000000000000000000000000..50b5ac0d6ae08860eb494e3ab73a00f8ccd8e7ec
mode 100644,000000..100644
--- 1/modules.def
--- /dev/null
+++ b/modules.def
@@@ -1,457 -1,0 +1,482 @@@
 +AutoGen definitions Makefile.tpl;
 +
 +library = {
 +  name = libgrub.a;
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +
 +  nodist = grub_script.tab.c;
 +  nodist = grub_script.yy.c;
 +  nodist = libgrub_a_init.c;
 +
 +  source = grub-core/gnulib/error.c;
 +  source = grub-core/gnulib/fnmatch.c;
 +  source = grub-core/gnulib/getdelim.c;
 +  source = grub-core/gnulib/getline.c;
 +  source = grub-core/gnulib/getopt1.c;
 +  source = grub-core/gnulib/getopt.c;
 +  source = grub-core/gnulib/progname.c;
 +
 +  source = util/misc.c;
 +  source = grub-core/kern/misc.c;
 +  source = grub-core/kern/emu/mm.c;
 +  source = grub-core/kern/emu/misc.c;
 +  source = grub-core/kern/emu/hostfs.c;
 +  source = grub-core/kern/emu/getroot.c;
 +  source = grub-core/kern/emu/hostdisk.c;
 +
 +  source = grub-core/commands/blocklist.c;
 +  source = grub-core/commands/extcmd.c;
 +  source = grub-core/commands/ls.c;
 +  source = grub-core/disk/dmraid_nvidia.c;
 +  source = grub-core/disk/host.c;
 +  source = grub-core/disk/loopback.c;
 +  source = grub-core/disk/lvm.c;
 +  source = grub-core/disk/mdraid_linux.c;
 +  source = grub-core/disk/raid5_recover.c;
 +  source = grub-core/disk/raid6_recover.c;
 +  source = grub-core/disk/raid.c;
 +  source = grub-core/fs/affs.c;
 +  source = grub-core/fs/afs_be.c;
 +  source = grub-core/fs/afs.c;
 +  source = grub-core/fs/befs_be.c;
 +  source = grub-core/fs/befs.c;
 +  source = grub-core/fs/cpio.c;
 +  source = grub-core/fs/ext2.c;
 +  source = grub-core/fs/fat.c;
 +  source = grub-core/fs/fshelp.c;
 +  source = grub-core/fs/hfs.c;
 +  source = grub-core/fs/hfsplus.c;
 +  source = grub-core/fs/iso9660.c;
 +  source = grub-core/fs/jfs.c;
 +  source = grub-core/fs/minix.c;
 +  source = grub-core/fs/nilfs2.c;
 +  source = grub-core/fs/ntfs.c;
 +  source = grub-core/fs/ntfscomp.c;
 +  source = grub-core/fs/reiserfs.c;
 +  source = grub-core/fs/sfs.c;
 +  source = grub-core/fs/tar.c;
 +  source = grub-core/fs/udf.c;
 +  source = grub-core/fs/ufs2.c;
 +  source = grub-core/fs/ufs.c;
 +  source = grub-core/fs/xfs.c;
 +  source = grub-core/kern/command.c;
 +  source = grub-core/kern/device.c;
 +  source = grub-core/kern/disk.c;
 +  source = grub-core/kern/env.c;
 +  source = grub-core/kern/err.c;
 +  source = grub-core/kern/file.c;
 +  source = grub-core/kern/fs.c;
 +  source = grub-core/kern/list.c;
 +  source = grub-core/kern/partition.c;
 +  source = grub-core/lib/arg.c;
 +  source = grub-core/lib/crc.c;
 +  source = grub-core/lib/crypto.c;
 +  source = grub-core/lib/envblk.c;
 +  source = grub-core/lib/hexdump.c;
 +  source = grub-core/lib/libgcrypt-grub/cipher/sha512.c;
 +  source = grub-core/lib/LzFind.c;
 +  source = grub-core/lib/LzmaEnc.c;
 +  source = grub-core/lib/pbkdf2.c;
 +  source = grub-core/normal/datetime.c;
 +  source = grub-core/normal/misc.c;
 +  source = grub-core/partmap/acorn.c;
 +  source = grub-core/partmap/amiga.c;
 +  source = grub-core/partmap/apple.c;
 +  source = grub-core/partmap/gpt.c;
 +  source = grub-core/partmap/msdos.c;
 +  source = grub-core/partmap/sun.c;
 +  source = grub-core/script/function.c;
 +  source = grub-core/script/lexer.c;
 +  source = grub-core/script/main.c;
 +  source = grub-core/script/script.c;
++  source = grub-core/script/argv.c;
 +
 +  nodist = grub_script.yy.h;
 +  nodist = grub_script.tab.h;
 +};
 +
 +program = {
 +  name = grub-bin2h;
 +  source = util/bin2h.c;
 +  ldadd = libgrub.a;
 +  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
 +  mansection = 1;
 +};
 +
 +program = {
 +  name = grub-mkimage;
 +  mansection = 1;
 +
 +  source = util/grub-mkimage.c;
 +  source = util/resolve.c;
 +  extra_dist = util/grub-mkimagexx.c;
 +
 +  ldadd = libgrub.a;
 +  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
 +  cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"';
 +};
 +
 +program = {
 +  name = grub-mkrelpath;
 +  mansection = 1;
 +
 +  source = util/grub-mkrelpath.c;
 +
 +  ldadd = libgrub.a;
 +  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
 +};
 +
 +program = {
 +  name = grub-script-check;
 +  mansection = 1;
 +
 +  source = util/grub-script-check.c;
 +
 +  ldadd = libgrub.a;
 +  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
 +};
 +
 +program = {
 +  name = grub-editenv;
 +  mansection = 1;
 +
 +  source = util/grub-editenv.c;
 +
 +  ldadd = libgrub.a;
 +  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
 +};
 +
 +program = {
 +  name = grub-mkpasswd-pbkdf2;
 +  mansection = 1;
 +
 +  source = util/grub-mkpasswd-pbkdf2.c;
 +
 +  ldadd = libgrub.a;
 +  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
 +  cflags = '$(CFLAGS_GCRY)';
 +  cppflags = '$(CPPFLAGS_GCRY)';
 +};
 +
 +program = {
 +  name = grub-macho2img;
 +  mansection = 1;
 +  source = util/grub-macho2img.c;
 +  condition = COND_APPLE_CC;
 +};
 +
 +program = {
 +  name = grub-pe2elf;
 +  mansection = 1;
 +  source = util/grub-pe2elf.c;
 +
 +  ldadd = libgrub.a;
 +  ldflags = '$(LIBINTL)';
 +  condition = COND_GRUB_PE2ELF;
 +};
 +
 +program = {
 +  name = grub-fstest;
 +  mansection = 1;
 +  source = util/grub-fstest.c;
 +
 +  ldadd = libgrub.a;
 +  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
 +  condition = COND_GRUB_FSTEST;
 +};
 +
 +program = {
 +  name = grub-mkfont;
 +  mansection = 1;
 +  source = util/grub-mkfont.c;
 +  source = grub-core/unidata.c;
 +
 +  cflags = '$(freetype_cflags)';
 +
 +  ldadd = libgrub.a;
 +  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
 +  ldflags = '$(freetype_libs)';
 +  condition = COND_GRUB_MKFONT;
 +};
 +
 +program = {
 +  name = grub-mkdevicemap;
 +  installdir = sbin;
 +  mansection = 8;
 +  source = util/grub-mkdevicemap.c;
 +  source = util/deviceiter.c;
 +  source = util/devicemap.c;
 +
 +  sparc64_ieee1275 = util/grub-mkdevicemap.c;
 +  sparc64_ieee1275 = util/deviceiter.c;
 +  sparc64_ieee1275 = util/ieee1275/ofpath.c;
 +  sparc64_ieee1275 = util/ieee1275/devicemap.c;
 +
 +  ldadd = libgrub.a;
 +  ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
 +};
 +
 +program = {
 +  name = grub-probe;
 +  installdir = sbin;
 +  mansection = 8;
 +  source = util/grub-probe.c;
 +
 +  ldadd = libgrub.a;
 +  ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
 +};
 +
 +program = {
 +  name = grub-setup;
 +  installdir = sbin;
 +  mansection = 8;
 +  i386_pc = util/i386/pc/grub-setup.c;
 +  i386_pc = util/raid.c;
 +  i386_pc = util/lvm.c;
 +
 +  sparc64_ieee1275 = util/ieee1275/ofpath.c;
 +  sparc64_ieee1275 = util/sparc64/ieee1275/grub-setup.c;
 +  sparc64_ieee1275 = util/raid.c;
 +  sparc64_ieee1275 = util/lvm.c;
 +
 +  ldadd = libgrub.a;
 +  ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
 +
 +  enable = i386_pc;
 +  enable = sparc64_ieee1275;
 +};
 +
 +program = {
 +  name = grub-ofpathname;
 +  installdir = sbin;
 +  source = util/ieee1275/grub-ofpathname.c;
 +  source = util/ieee1275/ofpath.c;
 +
 +  ldadd = libgrub.a;
 +  enable = sparc64_ieee1275;
 +};
 +
 +data = {
 +  source = util/grub.d/README;
 +  installdir = grubconf;
 +};
 +
 +script = {
 +  name = '00_header';
 +  source = util/grub.d/00_header.in;
 +  installdir = grubconf;
 +};
 +
 +script = {
 +  name = '10_windows';
 +  source = util/grub.d/10_windows.in;
 +  installdir = grubconf;
 +};
 +
 +script = {
 +  name = '10_hurd';
 +  source = util/grub.d/10_hurd.in;
 +  installdir = grubconf;
 +};
 +
 +script = {
 +  name = '10_linux';
 +  source = util/grub.d/10_linux.in;
 +  installdir = grubconf;
 +};
 +
 +script = {
 +  name = '30_os-prober';
 +  source = util/grub.d/30_os-prober.in;
 +  installdir = grubconf;
 +};
 +
 +script = {
 +  name = '40_custom';
 +  source = util/grub.d/40_custom.in;
 +  installdir = grubconf;
 +};
 +
 +script = {
 +  name = '41_custom';
 +  source = util/grub.d/41_custom.in;
 +  installdir = grubconf;
 +};
 +
 +script = {
 +  mansection = 1;
 +  name = grub-mkrescue;
 +  source = util/grub-mkrescue.in;
 +  powerpc_ieee1275 = util/powerpc/ieee1275/grub-mkrescue.in;
 +  enable = i386_pc;
 +  enable = i386_qemu;
 +  enable = i386_coreboot;
 +  enable = powerpc_ieee1275;
 +};
 +
 +script = {
 +  mansection = 8;
 +  installdir = sbin;
 +  name = grub-install;
 +  source = util/grub-install.in;
 +  x86_efi = util/i386/efi/grub-install.in;
 +  i386_ieee1275 = util/ieee1275/grub-install.in;
 +  powerpc_ieee1275 = util/ieee1275/grub-install.in;
 +
 +  enable = x86;
 +  enable = mips;
 +  enable = powerpc_ieee1275;
 +};
 +
 +script = {
 +  name = grub-mkconfig;
 +  source = util/grub-mkconfig.in;
 +  mansection = 8;
 +  installdir = sbin;
 +};
 +
 +script = {
 +  name = grub-set-default;
 +  source = util/grub-set-default.in;
 +  mansection = 8;
 +  installdir = sbin;
 +};
 +
 +script = {
 +  name = grub-reboot;
 +  source = util/grub-reboot.in;
 +  mansection = 8;
 +  installdir = sbin;
 +};
 +
 +script = {
 +  name = grub-mkconfig_lib;
 +  source = util/grub-mkconfig_lib.in;
 +  installdir = pkglib;
 +};
 +
 +script = {
 +  name = update-grub_lib;
 +  source = util/update-grub_lib.in;
 +  installdir = pkglib;
 +};
 +
 +script = {
 +  name = grub-shell;
 +  source = tests/util/grub-shell.in;
 +};
 +
 +script = {
 +  name = grub-shell-tester;
 +  source = tests/util/grub-shell-tester.in;
 +};
 +
 +script = {
 +  testcase;
 +  name = example_scripted_test;
 +  source = tests/example_scripted_test.in;
 +};
 +
 +script = {
 +  testcase;
 +  name = example_grub_script_test;
 +  source = tests/example_grub_script_test.in;
 +};
 +
 +script = {
 +  testcase;
 +  name = grub_script_echo1;
 +  source = tests/grub_script_echo1.in;
 +};
 +
 +script = {
 +  testcase;
 +  name = grub_script_echo_keywords;
 +  source = tests/grub_script_echo_keywords.in;
 +};
 +
 +script = {
 +  testcase;
 +  name = grub_script_vars1;
 +  source = tests/grub_script_vars1.in;
 +};
 +
 +script = {
 +  testcase;
 +  name = grub_script_for1;
 +  source = tests/grub_script_for1.in;
 +};
 +
 +script = {
 +  testcase;
 +  name = grub_script_while1;
 +  source = tests/grub_script_while1.in;
 +};
 +
 +script = {
 +  testcase;
 +  name = grub_script_if;
 +  source = tests/grub_script_if.in;
 +};
 +
 +script = {
 +  testcase;
 +  name = grub_script_blanklines;
 +  source = tests/grub_script_blanklines.in;
 +};
 +
 +script = {
 +  testcase;
 +  name = grub_script_final_semicolon;
 +  source = tests/grub_script_final_semicolon.in;
 +};
 +
 +script = {
 +  testcase;
 +  name = grub_script_dollar;
 +  source = tests/grub_script_dollar.in;
 +};
 +
 +script = {
 +  testcase;
 +  name = grub_script_comments;
 +  source = tests/grub_script_comments.in;
 +};
 +
++script = {
++  testcase;
++  name = grub_script_functions;
++  source = tests/grub_script_functions.in;
++};
++
++script = {
++  testcase;
++  name = grub_script_break;
++  source = tests/grub_script_break.in;
++};
++
++script = {
++  testcase;
++  name = grub_script_continue;
++  source = tests/grub_script_continue.in;
++};
++
++script = {
++  testcase;
++  name = grub_script_shift;
++  source = tests/grub_script_shift.in;
++};
++
 +program = {
 +  testcase;
 +  name = example_unit_test;
 +  source = tests/example_unit_test.c;
 +  source = tests/lib/unit_test.c;
 +  source = grub-core/kern/list.c;
 +  source = grub-core/kern/misc.c;
 +  source = grub-core/tests/lib/test.c;
 +  cflags = -Wno-format;
 +  ldadd = libgrub.a;
 +  ldflags = '$(LIBDEVMAPPER)';
 +};

diff --cc tests/util/grub-shell-tester.in
Simple merge

diff --cc util/grub-fstest.c
Simple merge

diff --cc util/grub-mkrescue.in
Simple merge

diff --cc util/grub-probe.c
Simple merge

diff --cc util/i386/pc/grub-setup.c
Simple merge

diff --cc util/misc.c
index 3413c051ae3a6f6e955292919203afe9eb5e7988,21dd211e1b4acfb30000b53ce12d7b51ebe17ce0..cfbae609b711a03e40003d6f223ded0c244a4111
--- 1/util/misc.c
--- 2/util/misc.c
+++ b/util/misc.c
@@@ -180,97 -178,6 +180,97 @@@ grub_util_write_image (const char *img
      grub_util_error ("write failed");
  }
  
- grub_script_execute_cmdblock (struct grub_script_cmd *cmd __attribute__ ((unused)))
 +char *
 +grub_script_execute_argument_to_string (struct grub_script_arg *arg __attribute__ ((unused)))
 +{
 +  return 0;
 +}
 +
 +grub_err_t
 +grub_script_execute_cmdline (struct grub_script_cmd *cmd __attribute__ ((unused)))
 +{
 +  return 0;
 +}
 +
 +grub_err_t
++grub_script_execute_cmdlist (struct grub_script_cmd *cmd __attribute__ ((unused)))
 +{
 +  return 0;
 +}
 +
 +grub_err_t
 +grub_script_execute_cmdif (struct grub_script_cmd *cmd __attribute__ ((unused)))
 +{
 +  return 0;
 +}
 +
 +grub_err_t
 +grub_script_execute_cmdfor (struct grub_script_cmd *cmd __attribute__ ((unused)))
 +{
 +  return 0;
 +}
 +
 +grub_err_t
 +grub_script_execute_cmdwhile (struct grub_script_cmd *cmd __attribute__ ((unused)))
 +{
 +  return 0;
 +}
 +
 +grub_err_t
 +grub_script_execute_menuentry (struct grub_script_cmd *cmd __attribute__ ((unused)))
 +{
 +  return 0;
 +}
 +
 +grub_err_t
 +grub_script_execute (struct grub_script *script)
 +{
 +  if (script == 0 || script->cmd == 0)
 +    return 0;
 +
 +  return script->cmd->exec (script->cmd);
 +}
 +
 +void
 +grub_putchar (int c)
 +{
 +  putchar (c);
 +}
 +
 +int
 +grub_getkey (void)
 +{
 +  return -1;
 +}
 +
 +void
 +grub_refresh (void)
 +{
 +  fflush (stdout);
 +}
 +
 +static void
 +grub_xputs_real (const char *str)
 +{
 +  fputs (str, stdout);
 +}
 +
 +void (*grub_xputs) (const char *str) = grub_xputs_real;
 +
 +int
 +grub_dl_ref (grub_dl_t mod)
 +{
 +  (void) mod;
 +  return 0;
 +}
 +
 +int
 +grub_dl_unref (grub_dl_t mod)
 +{
 +  (void) mod;
 +  return 0;
 +}
 +
  /* Some functions that we don't use.  */
  void
  grub_mm_init_region (void *addr __attribute__ ((unused)),