Some scribbles on EFI compression

.gitignore

@@ -11,6 +11,7 @@ ahci_test
 ascii.bitmaps
 ascii.h
 autom4te.cache
+build_env.mk
 build-grub-gen-asciih
 build-grub-gen-widthspec
 build-grub-mkfont
@@ -31,59 +32,48 @@ docs/*.info
 docs/stamp-vti
 docs/version.texi
 ehci_test
+*.elf
 example_grub_script_test
 example_scripted_test
 example_unit_test
 *.exec
-*.exec.exe
 fddboot_test
 genkernsyms.sh
 gensymlist.sh
 gentrigtables
-gentrigtables.exe
 gettext_strings_test
 grub-bin2h
-/grub-bios-setup
+grub-bios-setup
-/grub-bios-setup.exe
 grub_cmd_date
 grub_cmd_echo
 grub_cmd_regexp
 grub_cmd_set_date
 grub_cmd_sleep
-/grub-editenv
+grub-editenv
-/grub-editenv.exe
 grub-emu
 grub-emu-lite
-grub-emu.exe
-grub-emu-lite.exe
 grub_emu_init.c
 grub_emu_init.h
 grub-fstest
-grub-fstest.exe
 grub_fstest_init.c
 grub_fstest_init.h
 grub_func_test
 grub-install
-grub-install.exe
 grub-kbdcomp
 grub-macho2img
-/grub-menulst2cfg
+grub-menulst2cfg
-/grub-menulst2cfg.exe
 /grub-mk*
 grub-mount
-/grub-ofpathname
+grub-ofpathname
-/grub-ofpathname.exe
+grub-pe2elf
-grub-core/build-grub-pe2elf.exe
+grub-probe
-/grub-probe
-/grub-probe.exe
 grub_probe_init.c
 grub_probe_init.h
-/grub-reboot
+grub-reboot
 grub_script_blanklines
 grub_script_blockarg
 grub_script_break
 grub-script-check
-grub-script-check.exe
 grub_script_check_init.c
 grub_script_check_init.h
 grub_script_comments
@@ -114,18 +104,17 @@ grub_script.tab.h
 grub_script.yy.c
 grub_script.yy.h
 grub-set-default
+grub-setup
 grub_setup_init.c
 grub_setup_init.h
 grub-shell
 grub-shell-tester
 grub-sparc64-setup
-grub-sparc64-setup.exe
 gzcompress_test
 hddboot_test
 help_test
 *.img
 *.image
-*.image.exe
 include/grub/cpu
 include/grub/machine
 install-sh
@@ -170,6 +159,7 @@ GPATH
 GRTAGS
 GSYMS
 GTAGS
+Makefile.tpl
 compile
 depcomp
 mdate-sh
@@ -192,7 +182,6 @@ grub-core/gmodule.pl
 grub-core/grub.chrp
 grub-core/modinfo.sh
 grub-core/*.module
-grub-core/*.module.exe
 grub-core/*.pp
 util/bash-completion.d/grub
 grub-core/gnulib/alloca.h
@@ -214,7 +203,7 @@ grub-core/gnulib/unistd.h
 grub-core/gnulib/warn-on-use.h
 grub-core/gnulib/wchar.h
 grub-core/gnulib/wctype.h
-grub-core/rs_decoder.h
+grub-core/rs_decoder.S
 widthspec.bin
 widthspec.h
 docs/stamp-1
@@ -228,14 +217,9 @@ include/grub/gcrypt/gcrypt.h
 include/grub/gcrypt/g10lib.h
 po/POTFILES.in
 po/POTFILES-shell.in
-/grub-glue-efi
+grub-glue-efi
-/grub-render-label
+grub-render-label
-/grub-glue-efi.exe
-/grub-render-label.exe
 grub-core/gnulib/locale.h
 grub-core/gnulib/unitypes.h
 grub-core/gnulib/uniwidth.h
 build-aux/test-driver
-/garbage-gen
-/garbage-gen.exe
-/grub-fs-tester

INSTALL

@@ -15,20 +15,8 @@ configuring the GRUB.
   Note: older versions may work but support is limited
   Note: clang 3.2 or later works for i386 and x86_64 targets but results in
         much bigger binaries.
-	earlier versions not tested
   Note: clang 3.2 or later works for arm
-	None of tested clang versions generated usable thumb code
+  Note: clang 3.4 or later works for powerpc
-	earlier versions not tested
-  Note: clang 3.3 or later works for arm64
-	earlier versions have no arm64 support
-  Note: clang 3.3 or later works for mips(el)
-	earlier versions fail to generate .reginfo and hence gprel relocations
-	fail.
-  Note: clang 3.2 or later works for powerpc
-	earlier versions not tested
-  Note: clang doesn't support -mno-app-regs and so can't be used for sparc64
-  Note: clang has no support for ia64 and hence you can't compile GRUB
-	for ia64 with clang
 * GNU Make
 * GNU Bison 2.3 or later
 * GNU gettext 0.17 or later
@@ -54,9 +42,10 @@ To build GRUB's graphical terminal (gfxterm), you need:
 If you use a development snapshot or want to hack on GRUB you may
 need the following.
 
-* Python 2.6 or later
+* Python 2.5.2 or later
 * Autoconf 2.60 or later
 * Automake 1.10.1 or later
+* Autogen 5.10 or later
 
 Prerequisites for make-check:
 

Makefile.am

@@ -73,7 +73,6 @@ CLEANFILES += build-grub-mkfont
 garbage-gen: util/garbage-gen.c
 	$(BUILD_CC) -o $@ $(BUILD_CFLAGS) $(BUILD_CPPFLAGS)  $^
 CLEANFILES += garbage-gen
-EXTRA_DIST += util/garbage-gen.c
 
 build-grub-gen-asciih: util/grub-gen-asciih.c
 	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
@@ -103,7 +102,7 @@ EXTRA_DIST += $(starfield_theme_files)
 EXTRA_DIST += $(srcdir)/themes/starfield/src/slider_s.xcf $(srcdir)/themes/starfield/src/slider_n.xcf $(srcdir)/themes/starfield/src/slider_c.xcf $(srcdir)/themes/starfield/src/blob_nw.xcf $(srcdir)/themes/starfield/src/bootmenu/center.xcf $(srcdir)/themes/starfield/src/bootmenu/corner.xcf $(srcdir)/themes/starfield/src/bootmenu/side.xcf $(srcdir)/themes/starfield/src/terminalbox/side.xcf $(srcdir)/themes/starfield/src/terminalbox/corner.xcf $(srcdir)/themes/starfield/src/terminalbox/center.xcf
 
 unicode.pf2: $(FONT_SOURCE) build-grub-mkfont
-	./build-grub-mkfont -o $@ $(FONT_SOURCE) || (rm -f $@; exit 1)
+	./build-grub-mkfont -o $@ $(FONT_SOURCE)
 CLEANFILES += unicode.pf2
 
 # Arrows and lines are needed to draw the menu, so always include them
@@ -111,23 +110,23 @@ UNICODE_ARROWS=0x2190-0x2193
 UNICODE_LINES=0x2501-0x251B
 
 ascii.pf2: $(FONT_SOURCE) build-grub-mkfont
-	./build-grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES) || (rm -f $@; exit 1)
+	./build-grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
 CLEANFILES += ascii.pf2
 
 euro.pf2: $(FONT_SOURCE) build-grub-mkfont
-	./build-grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x4ff,0x1e00-0x1fff,$(UNICODE_ARROWS),$(UNICODE_LINES) || (rm -f $@; exit 1)
+	./build-grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x4ff,0x1e00-0x1fff,$(UNICODE_ARROWS),$(UNICODE_LINES)
 CLEANFILES += euro.pf2
 
 ascii.h: $(FONT_SOURCE) build-grub-gen-asciih
-	./build-grub-gen-asciih $(FONT_SOURCE) $@ || (rm -f $@; exit 1)
+	./build-grub-gen-asciih $(FONT_SOURCE) $@
 CLEANFILES += ascii.h
 
 widthspec.h: $(FONT_SOURCE) build-grub-gen-widthspec
-	./build-grub-gen-widthspec $(FONT_SOURCE) $@ || (rm -f $@; exit 1)
+	./build-grub-gen-widthspec $(FONT_SOURCE) $@
 CLEANFILES += widthspec.h
 
 # Install config.h into platformdir
-nodist_platform_HEADERS = config.h
+platform_HEADERS = config.h
 
 pkgdata_DATA += grub-mkconfig_lib
 
@@ -399,7 +398,7 @@ bootcheck: $(BOOTCHECKS)
 
 if COND_i386_coreboot
 default_payload.elf: grub-mkstandalone grub-mkimage
-	pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos xfs ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
+	pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos xfs ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
 endif
 
 windowsdir=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows

Makefile.util.def

@@ -62,7 +62,6 @@ library = {
   common_nodist = grub_script.tab.h;
 
   common = grub-core/commands/blocklist.c;
-  common = grub-core/commands/macbless.c;
   common = grub-core/commands/xnu_uuid.c;
   common = grub-core/commands/testload.c;
   common = grub-core/commands/ls.c;
@@ -155,11 +154,8 @@ library = {
   common = grub-core/script/script.c;
   common = grub-core/script/argv.c;
   common = grub-core/io/gzio.c;
-  common = grub-core/io/xzio.c;
   common = grub-core/io/lzopio.c;
   common = grub-core/kern/ia64/dl_helper.c;
-  common = grub-core/kern/arm/dl_helper.c;
-  common = grub-core/kern/arm64/dl_helper.c;
   common = grub-core/lib/minilzo/minilzo.c;
   common = grub-core/lib/xzembed/xz_dec_bcj.c;
   common = grub-core/lib/xzembed/xz_dec_lzma2.c;
@@ -181,6 +177,8 @@ program = {
   extra_dist = grub-core/osdep/unix/config.c;
   common = util/config.c;
 
+  common = grub-core/kern/arm/dl_helper.c;
+
   extra_dist = util/grub-mkimagexx.c;
 
   ldadd = libgrubmods.a;
@@ -402,21 +400,6 @@ program = {
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
 
-program = {
-  name = grub-macbless;
-  installdir = sbin;
-  mansection = 1;
-  common = util/grub-macbless.c;
-  common = grub-core/osdep/init.c;
-  common = grub-core/kern/emu/argp_common.c;
-
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
-};
-
 data = {
   common = util/grub.d/README;
   installdir = grubconf;
@@ -529,6 +512,8 @@ program = {
   common = grub-core/kern/emu/hostfs.c;
   common = grub-core/disk/host.c;
 
+  common = grub-core/kern/arm/dl_helper.c;
+
   common = util/resolve.c;
 
   common = grub-core/kern/emu/argp_common.c;
@@ -561,7 +546,6 @@ program = {
   common = grub-core/osdep/platform.c;
   common = grub-core/osdep/platform_unix.c;
   extra_dist = grub-core/osdep/linux/platform.c;
-  extra_dist = grub-core/osdep/windows/platform.c;
   extra_dist = grub-core/osdep/basic/platform.c;
   extra_dist = grub-core/osdep/basic/no_platform.c;
   extra_dist = grub-core/osdep/unix/platform.c;
@@ -574,6 +558,8 @@ program = {
   common = grub-core/kern/emu/hostfs.c;
   common = grub-core/disk/host.c;
 
+  common = grub-core/kern/arm/dl_helper.c;
+
   common = util/resolve.c;
 
   common = grub-core/kern/emu/argp_common.c;
@@ -608,9 +594,8 @@ program = {
   common = grub-core/osdep/blocklist.c;
   common = grub-core/osdep/config.c;
   common = util/config.c;
-  common = util/render-label.c;
+
-  common = grub-core/kern/emu/hostfs.c;
+  common = grub-core/kern/arm/dl_helper.c;
-  common = grub-core/disk/host.c;
 
   common = util/resolve.c;
   enable = noemu;
@@ -647,6 +632,8 @@ program = {
   common = grub-core/osdep/config.c;
   common = util/config.c;
 
+  common = grub-core/kern/arm/dl_helper.c;
+
   common = util/resolve.c;
   common = grub-core/kern/emu/argp_common.c;
   common = grub-core/osdep/init.c;
@@ -1242,24 +1229,6 @@ program = {
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
 
-program = {
-  name = grub-syslinux2cfg;
-  mansection = 1;
-  common = util/grub-syslinux2cfg.c;
-  common = grub-core/lib/syslinux_parse.c;
-  common = grub-core/lib/getline.c;
-  common = grub-core/osdep/init.c;
-  common = grub-core/kern/emu/hostfs.c;
-  common = grub-core/disk/host.c;
-  common = grub-core/kern/emu/argp_common.c;
-
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
-};
-
 program = {
   name = grub-glue-efi;
   mansection = 1;
@@ -1293,32 +1262,3 @@ program = {
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
-
-program = {
-  name = grub-file;
-  mansection = 1;
-
-  common = util/grub-file.c;
-  common = util/render-label.c;
-  common = grub-core/commands/file.c;
-  common = grub-core/commands/file32.c;
-  common = grub-core/commands/file64.c;
-  common = grub-core/loader/i386/xen_file.c;
-  common = grub-core/loader/i386/xen_file32.c;
-  common = grub-core/loader/i386/xen_file64.c;
-  common = grub-core/io/offset.c;
-  common = grub-core/kern/elf.c;
-  common = grub-core/loader/lzss.c;
-  common = grub-core/loader/macho.c;
-  common = grub-core/loader/macho32.c;
-  common = grub-core/loader/macho64.c;
-  common = grub-core/kern/emu/hostfs.c;
-  common = grub-core/disk/host.c;
-  common = grub-core/osdep/init.c;
-
-  ldadd = libgrubmods.a;
-  ldadd = libgrubgcry.a;
-  ldadd = libgrubkern.a;
-  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
-};

acinclude.m4

@@ -19,8 +19,6 @@ AC_DEFUN([grub_PROG_TARGET_CC],
 AC_CACHE_VAL(grub_cv_prog_target_cc,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
 int main (void);
 ]], [[]])],
   		[grub_cv_prog_target_cc=yes],
@@ -290,12 +288,7 @@ AC_DEFUN([grub_CHECK_BSS_START_SYMBOL],
 [AC_REQUIRE([AC_PROG_CC])
 AC_MSG_CHECKING([if __bss_start is defined by the compiler])
 AC_CACHE_VAL(grub_cv_check_uscore_uscore_bss_start_symbol,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
-asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
-int main (void);
-]],
 		[[asm ("incl __bss_start")]])],
 		[grub_cv_check_uscore_uscore_bss_start_symbol=yes],
 		[grub_cv_check_uscore_uscore_bss_start_symbol=no])])
@@ -304,11 +297,7 @@ AC_MSG_RESULT([$grub_cv_check_uscore_uscore_bss_start_symbol])
 
 AC_MSG_CHECKING([if edata is defined by the compiler])
 AC_CACHE_VAL(grub_cv_check_edata_symbol,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
-asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
-int main (void);]],
 		[[asm ("incl edata")]])],
 		[grub_cv_check_edata_symbol=yes],
 		[grub_cv_check_edata_symbol=no])])
@@ -317,11 +306,7 @@ AC_MSG_RESULT([$grub_cv_check_edata_symbol])
 
 AC_MSG_CHECKING([if _edata is defined by the compiler])
 AC_CACHE_VAL(grub_cv_check_uscore_edata_symbol,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
-asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
-int main (void);]],
 		[[asm ("incl _edata")]])],
 		[grub_cv_check_uscore_edata_symbol=yes],
 		[grub_cv_check_uscore_edata_symbol=no])])
@@ -345,11 +330,7 @@ AC_DEFUN([grub_CHECK_END_SYMBOL],
 [AC_REQUIRE([AC_PROG_CC])
 AC_MSG_CHECKING([if end is defined by the compiler])
 AC_CACHE_VAL(grub_cv_check_end_symbol,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
-asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
-int main (void);]],
 		[[asm ("incl end")]])],
 		[grub_cv_check_end_symbol=yes],
 		[grub_cv_check_end_symbol=no])])
@@ -358,11 +339,7 @@ AC_MSG_RESULT([$grub_cv_check_end_symbol])
 
 AC_MSG_CHECKING([if _end is defined by the compiler])
 AC_CACHE_VAL(grub_cv_check_uscore_end_symbol,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
-asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
-int main (void);]],
 		[[asm ("incl _end")]])],
 		[grub_cv_check_uscore_end_symbol=yes],
 		[grub_cv_check_uscore_end_symbol=no])])
@@ -497,3 +474,23 @@ dnl program.
 AC_DEFUN([grub_TRANSFORM],[dnl
 AC_SUBST(AS_TR_SH([$1]), [`AS_ECHO([$1]) | sed "$program_transform_name"`])dnl
 ])
+
+dnl Check if the C compiler supports `-mno-unaligned-access'.
+AC_DEFUN([grub_CHECK_NO_UNALIGNED_ACCESS],[
+[# foobar
+nua_possible=yes]
+AC_MSG_CHECKING([whether `$CC' supports `-mno-unaligned-access'])
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[
+int main() {
+	return 0;
+}
+]])])
+
+[if eval "$ac_compile -S -mno-unaligned-access -o conftest.s" 2> /dev/null; then]
+  AC_MSG_RESULT([yes])
+  [rm -f conftest.s
+else
+  nua_possible=no]
+  AC_MSG_RESULT([no])
+[fi]
+])

autogen.sh

@@ -8,6 +8,8 @@ unset LC_ALL
 find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c'  ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' |sort > po/POTFILES.in
 find util -iname '*.in' ! -name Makefile.in  |sort > po/POTFILES-shell.in
 
+autogen --version >/dev/null || exit 1
+
 echo "Importing unicode..."
 python util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt unicode/ArabicShaping.txt grub-core/unidata.c
 
@@ -30,7 +32,10 @@ for x in mpi-asm-defs.h mpih-add1.c mpih-sub1.c mpih-mul1.c mpih-mul2.c mpih-mul
     ln -s generic/"$x" grub-core/lib/libgcrypt-grub/mpi/"$x"
 done
 
-echo "Generating Automake input..."
+echo "Creating Makefile.tpl..."
+python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl
+
+echo "Running autogen..."
 
 # Automake doesn't like including files from a path outside the project.
 rm -f contrib grub-core/contrib
@@ -54,8 +59,8 @@ for extra in contrib/*/Makefile.core.def; do
   fi
 done
 
-python gentpl.py $UTIL_DEFS > Makefile.util.am
+cat $UTIL_DEFS | autogen -T Makefile.tpl | sed -e '/^$/{N;/^\n$/D;}' > Makefile.util.am
-python gentpl.py $CORE_DEFS > grub-core/Makefile.core.am
+cat $CORE_DEFS | autogen -T Makefile.tpl | sed -e '/^$/{N;/^\n$/D;}' > grub-core/Makefile.core.am
 
 for extra in contrib/*/Makefile.common; do
   if test -e "$extra"; then

conf/Makefile.common

@@ -6,22 +6,23 @@ export LC_COLLATE := C
 unexport LC_ALL
 
 # Platform specific options
+if COND_mips_loongson
+  CFLAGS_PLATFORM += -mexplicit-relocs
+  CPPFLAGS_PLATFORM = -DUSE_ASCII_FALLBACK
+endif
+if COND_mips
+  CFLAGS_PLATFORM += -mflush-func=grub_red_herring
+  CCASFLAGS_PLATFORM = -march=mips3
+endif
 if COND_sparc64_ieee1275
   CFLAGS_PLATFORM += -mno-app-regs
-  LDFLAGS_PLATFORM = -Wl,-melf64_sparc -Wl,--no-relax
+  LDFLAGS_PLATFORM = -Wl,-melf64_sparc -mno-relax
-endif
-if COND_sparc64_emu
-  CFLAGS_PLATFORM += -mno-app-regs
-  LDFLAGS_PLATFORM = -Wl,--no-relax
 endif
 if COND_arm
-if !COND_emu
+  CFLAGS_PLATFORM += -mthumb-interwork -mlong-calls
+  CCASFLAGS_PLATFORM = -mthumb-interwork
   LDFLAGS_PLATFORM = -Wl,--wrap=__clear_cache
 endif
-endif
-if COND_arm64
-  CFLAGS_PLATFORM += -mcmodel=large
-endif
 
 #FIXME: discover and check XEN headers
 CPPFLAGS_XEN = -I/usr/include
@@ -35,6 +36,7 @@ CPPFLAGS_DEFAULT += -I$(top_builddir)
 CPPFLAGS_DEFAULT += -I$(top_srcdir)
 CPPFLAGS_DEFAULT += -I$(top_srcdir)/include
 CPPFLAGS_DEFAULT += -I$(top_builddir)/include
+CPPFLAGS_DEFAULT += -I$(top_srcdir)/grub-core/lib/libgcrypt-grub/include
 CPPFLAGS_DEFAULT += -I$(top_srcdir)/grub-core/lib/libgcrypt-grub/src/
 CCASFLAGS_DEFAULT = $(CPPFLAGS_DEFAULT) -DASM_FILE=1
 BUILD_CPPFLAGS += $(CPPFLAGS_DEFAULT)
@@ -45,7 +47,11 @@ CFLAGS_KERNEL = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
 LDFLAGS_KERNEL = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) $(TARGET_LDFLAGS_STATIC_LIBGCC)
 CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
 CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
-STRIPFLAGS_KERNEL = -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version
+if COND_CYGWIN
+STRIPFLAGS_KERNEL = -F elf32-i386 -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version
+else
+STRIPFLAGS_KERNEL = -R .rel.dyn -R .reginfo -R .note -R .comment -R .note.gnu.gold-version
+endif
 
 CFLAGS_MODULE = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
 LDFLAGS_MODULE = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
@@ -72,7 +78,7 @@ grubconfdir = $(sysconfdir)/grub.d
 platformdir = $(pkglibdir)/$(target_cpu)-$(platform)
 starfielddir = $(pkgdatadir)/themes/starfield
 
-CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion
+CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion -Wno-old-style-definition
 CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/gnulib -I$(top_srcdir)/grub-core/gnulib
 
 CFLAGS_POSIX = -fno-builtin
@@ -129,15 +135,20 @@ EXTRA_DIST =
 CLEANFILES =
 BUILT_SOURCES =
 
-# Rules for Automake input
+# Rules for autogen definition files
+
+.PRECIOUS: $(top_srcdir)/Makefile.tpl
+$(top_srcdir)/Makefile.tpl: $(top_srcdir)/gentpl.py
+	python $< | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
+	mv $@.new $@
 
 .PRECIOUS: $(top_srcdir)/Makefile.util.am
-$(top_srcdir)/Makefile.util.am: $(top_srcdir)/gentpl.py $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def
+$(top_srcdir)/Makefile.util.am: $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def $(top_srcdir)/Makefile.tpl
-	python $^ > $@.new || (rm -f $@.new; exit 1)
+	cat $(top_srcdir)/Makefile.util.def $(top_srcdir)/Makefile.utilgcry.def | autogen -T $(top_srcdir)/Makefile.tpl | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
 	mv $@.new $@
 
 .PRECIOUS: $(top_srcdir)/grub-core/Makefile.core.am
-$(top_srcdir)/grub-core/Makefile.core.am: $(top_srcdir)/gentpl.py $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def
+$(top_srcdir)/grub-core/Makefile.core.am: $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def $(top_srcdir)/Makefile.tpl
 	if [ "x$$GRUB_CONTRIB" != x ]; then echo "You need to run ./autogen.sh manually." >&2; exit 1; fi
-	python $^ > $@.new || (rm -f $@.new; exit 1)
+	cat $(top_srcdir)/grub-core/Makefile.core.def $(top_srcdir)/grub-core/Makefile.gcry.def | autogen -T $(top_srcdir)/Makefile.tpl | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
 	mv $@.new $@

conf/Makefile.extra-dist

@@ -2,6 +2,7 @@ EXTRA_DIST += autogen.sh
 EXTRA_DIST += geninit.sh
 
 EXTRA_DIST += gentpl.py
+EXTRA_DIST += Makefile.tpl
 EXTRA_DIST += Makefile.util.def
 EXTRA_DIST += Makefile.utilgcry.def
 
@@ -15,7 +16,7 @@ EXTRA_DIST += docs/autoiso.cfg
 EXTRA_DIST += docs/grub.cfg
 EXTRA_DIST += docs/osdetect.cfg
 
-EXTRA_DIST += conf/i386-cygwin-img-ld.sc
+EXTRA_DIST += conf/i386-pc-cygwin-img-ld.sc
 
 EXTRA_DIST += grub-core/Makefile.core.def
 EXTRA_DIST += grub-core/Makefile.gcry.def
@@ -109,4 +110,3 @@ EXTRA_DIST += grub-core/osdep/windows/sleep.c
 EXTRA_DIST += tests/dfly-mbr-mbexample.mbr.img.gz
 EXTRA_DIST += tests/dfly-mbr-mbexample.dfly.img.gz
 
-EXTRA_DIST += coreboot.cfg

conf/i386-pc-cygwin-img-ld.sc

@@ -5,8 +5,6 @@ SECTIONS
   .text :
   {
     start = . ;
-    _start = . ;
-    __start = . ;
     *(.text)
     etext = . ;
   }
@@ -35,8 +33,6 @@ SECTIONS
   {
     *(.edata)
     end = . ;
-    _end = . ;
-    __end = . ;
   }
   .stab :
   {

config.h.in

@@ -28,7 +28,6 @@
 #elif defined (GRUB_UTIL) || !defined (GRUB_MACHINE)
 #include <config-util.h>
 #else
-#define HAVE_FONT_SOURCE @HAVE_FONT_SOURCE@
 /* Define if C symbols get an underscore after compilation. */
 #define HAVE_ASM_USCORE @HAVE_ASM_USCORE@
 /* Define it to \"addr32\" or \"addr32;\" to make GAS happy.  */
@@ -51,6 +50,12 @@
 #define PACKAGE_NAME "@PACKAGE_NAME@"
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
+/* Default boot directory name" */
+#define GRUB_BOOT_DIR_NAME "@bootdirname@"
+/* Default grub directory name */
+#define GRUB_DIR_NAME "@grubdirname@"
+/* Define to 1 if GCC generates calls to __register_frame_info().  */
+#define NEED_REGISTER_FRAME_INFO @NEED_REGISTER_FRAME_INFO@
 
 #define GRUB_TARGET_CPU "@GRUB_TARGET_CPU@"
 #define GRUB_PLATFORM "@GRUB_PLATFORM@"

configure.ac

@@ -32,7 +32,7 @@ dnl type, so there is no conflict. Variables with the prefix "TARGET_"
 dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target
 dnl type.
 
-AC_INIT([GRUB],[2.02~beta2],[bug-grub@gnu.org])
+AC_INIT([GRUB],[2.00],[bug-grub@gnu.org])
 
 AC_CONFIG_AUX_DIR([build-aux])
 
@@ -69,7 +69,6 @@ grub_TRANSFORM([grub-script-check])
 grub_TRANSFORM([grub-set-default])
 grub_TRANSFORM([grub-sparc64-setup])
 grub_TRANSFORM([grub-render-label])
-grub_TRANSFORM([grub-file])
 
 # Optimization flag.  Allow user to override.
 if test "x$TARGET_CFLAGS" = x; then
@@ -100,9 +99,6 @@ case "$target_cpu" in
   arm*)
 		target_cpu=arm;
 		;;
-  aarch64*)
-		target_cpu=arm64;
-		;;
 esac
 
 # Specify the platform (such as firmware).
@@ -124,7 +120,6 @@ if test "x$with_platform" = x; then
     mips-*) platform=arc ;;
     ia64-*) platform=efi ;;
     arm-*) platform=uboot ;;
-    arm64-*) platform=efi ;;
     *) AC_MSG_ERROR([unsupported CPU: "$target_cpu"]) ;;
   esac
 else
@@ -165,7 +160,6 @@ case "$target_cpu"-"$platform" in
   mipsel-loongson) ;;
   arm-uboot) ;;
   arm-efi) ;;
-  arm64-efi) ;;
   *-emu) ;;
   *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
 esac
@@ -177,10 +171,6 @@ if test x$platform != xemu ; then
    esac
 fi
 
-if test x"$target_cpu-$platform" = xsparc64-emu ; then
-   target_m64=1 ;
-fi
-
 case "$target_os" in
   windows* | mingw32*) target_os=cygwin ;;
 esac
@@ -214,14 +204,19 @@ case "$platform" in
   qemu)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_QEMU=1" ;;
   pc)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_PCBIOS=1" ;;
   emu)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_EMU=1" ;;
-  loongson)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS_LOONGSON=1" ;;
+  loongson)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS_LOONGSON=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
-  qemu_mips)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS_QEMU_MIPS=1" ;;
+  qemu_mips)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
   arc)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_ARC=1" ;;
 esac
+case "$target_cpu" in
+  arm)      	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_ARM=1" ;;
+  mips |mipsel)      	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS=1" ;;
+  sparc64)      machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
+esac
 if test x${target_cpu} = xmipsel ; then
    machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE=`echo mips_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`"
 else
-   machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE=`echo ${target_cpu}_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`"
+   machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE=`echo ${target_cpu}_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,` -DGRUB_TARGET_CPU_`echo ${target_cpu} | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`=1"
 fi
 
 case "${target_cpu}-$platform" in
@@ -344,11 +339,6 @@ AC_SYS_LARGEFILE
 # Identify characteristics of the host architecture.
 unset ac_cv_c_bigendian
 
-if test x"$target_cpu-$platform" = xsparc64-emu ; then
-  CFLAGS="$CFLAGS -m64"
-  HOST_CFLAGS="$HOST_CFLAGS -m64"
-fi
-
 AC_C_BIGENDIAN
 AC_CHECK_SIZEOF(void *)
 AC_CHECK_SIZEOF(long)
@@ -426,26 +416,6 @@ esac
 # For gnulib.
 gl_INIT
 
-WARN_FLAGS="-Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes"
-EXTRA_WARN_FLAGS="-Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2"
-
-HOST_CFLAGS="$HOST_CFLAGS $WARN_FLAGS -Wcast-align"
-
-AC_CACHE_CHECK([which extra warnings work], [grub_cv_cc_w_extra_flags], [
-  SAVED_CFLAGS="$CFLAGS"
-  grub_cv_cc_w_extra_flags=
-  for x in $EXTRA_WARN_FLAGS; do
-      CFLAGS="$HOST_CFLAGS $x -Werror"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])], [flag=1], [flag=0])
-      if test x$flag = x1 ; then
-         grub_cv_cc_w_extra_flags="$grub_cv_cc_w_extra_flags $x"
-      fi
-  done
-  CFLAGS="$SAVED_CFLAGS"
-])
-
-HOST_CFLAGS="$HOST_CFLAGS $grub_cv_cc_w_extra_flags"
-
 #
 # Check for target programs.
 #
@@ -496,6 +466,8 @@ LDFLAGS="$TARGET_LDFLAGS"
 LIBS=""
 
 # debug flags.
+WARN_FLAGS="-Wall -W -Wshadow -Wold-style-definition -Wpointer-arith -Wundef -Wextra -Wattributes -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wendif-labels -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmain -Wmissing-braces -Wmissing-field-initializers -Wmissing-format-attribute -Wmultichar -Wnonnull -Woverflow -Wparentheses -Wpointer-arith -Wpointer-to-int-cast -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wstrict-aliasing -Wswitch -Wtrigraphs -Wundef -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wvariadic-macros -Wvolatile-register-var -Wwrite-strings -Wnested-externs -Wstrict-prototypes -Wpointer-sign"
+HOST_CFLAGS="$HOST_CFLAGS $WARN_FLAGS -Wcast-align"
 TARGET_CFLAGS="$TARGET_CFLAGS $WARN_FLAGS -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations"
 TARGET_CCASFLAGS="$TARGET_CCASFLAGS -g"
 
@@ -503,32 +475,8 @@ if test "x$target_cpu" != xi386 && test "x$target_cpu" != xx86_64; then
 TARGET_CFLAGS="$TARGET_CFLAGS -Wcast-align"
 fi
 
-TARGET_CC_VERSION="$(LC_ALL=C $TARGET_CC --version | head -n1)"
-
-AC_CACHE_CHECK([which extra warnings work], [grub_cv_target_cc_w_extra_flags], [
-  LDFLAGS="$TARGET_LDFLAGS -nostdlib -static"
-
-  grub_cv_target_cc_w_extra_flags=
-  for x in $EXTRA_WARN_FLAGS; do
-      CFLAGS="$TARGET_CFLAGS $x -Werror"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-asm (".globl start; start:");
-void __main (void);
-void __main (void) {}
-int main (void);
-]], [[]])], [flag=1], [flag=0])
-      if test x$flag = x1 ; then
-         grub_cv_target_cc_w_extra_flags="$grub_cv_target_cc_w_extra_flags $x"
-      fi
-  done
-])
-
-TARGET_CFLAGS="$TARGET_CFLAGS $grub_cv_target_cc_w_extra_flags"
-
 AC_CACHE_CHECK([if compiling with clang], [grub_cv_cc_target_clang]
-[
+[AC_COMPILE_IFELSE(
-CFLAGS="$TARGET_CFLAGS"
-AC_COMPILE_IFELSE(
 [AC_LANG_PROGRAM([], [[
 #ifdef __clang__
 #error "is clang"
@@ -538,34 +486,10 @@ AC_COMPILE_IFELSE(
 
 # on x86 clang doesn't support .code16
 # on arm clang doesn't support .arch directive
-# on mips clang doesn't support privilegied instructions, doubleword store/load
+if test "x$grub_cv_cc_target_clang" = xyes && ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 || test "x$target_cpu" = xarm ); then
-# and crashes with hand-written assembly
-if test "x$grub_cv_cc_target_clang" = xyes && ( test "x$target_cpu" = xi386 \
-   || test "x$target_cpu" = xx86_64 || test "x$target_cpu" = xarm \
-   || test "x$target_cpu" = xmips || test "x$target_cpu" = xmipsel ); then
    TARGET_CCASFLAGS="$TARGET_CCASFLAGS -no-integrated-as"
 fi
 
-if test "x$grub_cv_cc_target_clang" = xyes && test "x$target_cpu" = xpowerpc; then
-AC_CACHE_CHECK([if clang can handle ame instruction], [grub_cv_cc_target_clang_ame]
-[
-CFLAGS="$TARGET_CFLAGS"
-AC_COMPILE_IFELSE(
-[AC_LANG_PROGRAM([], [[
-   unsigned int a = 0, b = 0;
-   asm volatile ("{ame|addme} %0,%1" : "=r" (a) : "r" (b));
-   if (a)
-     return 1;
-]])],
-[grub_cv_cc_target_clang_ame=yes], [grub_cv_cc_target_clang_ame=no])])
-   # clang <= 3.3 doesn't handle most of ppc assembly, not even inline assembly
-   # used by gcrypt
-   if test x$grub_cv_cc_target_clang_ame = xno ; then
-     TARGET_CCASFLAGS="$TARGET_CCASFLAGS -no-integrated-as"
-     TARGET_CFLAGS="$TARGET_CFLAGS -no-integrated-as"
-   fi
-fi
-
 if test "x$target_cpu" = xi386 && test "x$platform" != xemu; then
   TARGET_CFLAGS="$TARGET_CFLAGS -march=i386"
 fi
@@ -592,21 +516,6 @@ if test "x$grub_cv_cc_target_clang" = xno && test "x$target_cpu" = xi386 && test
    TARGET_CFLAGS="$TARGET_CFLAGS -mrtd -mregparm=3"
 fi
 
-# on mips redirect cache flushing function to non-existant one.
-if test "x$target_cpu" = xmips || test "x$target_cpu" = xmipsel ; then
-  AC_CACHE_CHECK([whether -mflush-func=grub_red_herring works], [grub_cv_cc_mflush_func], [
-    CFLAGS="$TARGET_CFLAGS -mflush-func=grub_red_herring -Werror"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-        [grub_cv_cc_mflush_func=yes],
-	[grub_cv_cc_mflush_func=no])
-  ])
-
-  if test "x$grub_cv_cc_mflush_func" = xyes; then
-    TARGET_CFLAGS="$TARGET_CFLAGS -mflush-func=grub_red_herring"
-  fi
-fi
-
-
 # Force no alignment to save space on i386.
 if test "x$target_cpu" = xi386; then
   AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
@@ -690,13 +599,23 @@ if test "x$grub_cv_cc_fno_asynchronous_unwind_tables" = xyes; then
   TARGET_CFLAGS="$TARGET_CFLAGS -fno-asynchronous-unwind-tables"
 fi
 
+# For platforms where ELF is not the default link format.
+case "${target_os}" in
+  cygwin)
+# FIXME: put proper test here
+  NEED_REGISTER_FRAME_INFO=1
+  ;;
+  *) NEED_REGISTER_FRAME_INFO=0 ;;
+esac
+
+
 AC_ARG_ENABLE([efiemu],
 	      [AS_HELP_STRING([--enable-efiemu],
                              [build and install the efiemu runtimes (default=guessed)])])
 if test x"$enable_efiemu" = xno ; then
   efiemu_excuse="explicitly disabled"
 fi
-if test x"$grub_cv_target_cc_link_format" = x-mi386pe || test x"$grub_cv_target_cc_link_format" = x-mi386pep ; then
+if test x"$target_os" = xcygwin ; then
   efiemu_excuse="not available on cygwin"
 fi
 if test x"$target_cpu" != xi386 ; then
@@ -716,32 +635,8 @@ if test x"$efiemu_excuse" = x ; then
      efiemu_excuse="cannot compile with -m64 -mcmodel=large -mno-red-zone -nostdlib"
   fi
 fi
-if test x"$efiemu_excuse" = x ; then
-  AC_CACHE_CHECK([for efiemu64 linking format], [grub_cv_target_cc_efiemu64_link_format], [
-    grub_cv_target_cc_efiemu64_link_format=unknown
-    for format in -melf_x86_64 -melf_x86_64_fbsd -melf_x86_64_obsd -melf_x86_64_haiku -arch,x86_64; do
-      CFLAGS="-m64 -nostdlib -O2 -mcmodel=large -mno-red-zone"
-      LDFLAGS="-m64 -Wl,$format -nostdlib -static"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-      asm (".globl start; start:");
-      asm (".globl _start; _start:");
-      asm (".globl __start; __start:");
-      void __main (void);
-      void __main (void) {}
-      ]], [[]])], [flag=1], [flag=0])
-      if test x"$flag" = x1; then
-        grub_cv_target_cc_efiemu64_link_format="$format"
-	break;
-      fi
-    done])
-  if test x"$grub_cv_target_cc_efiemu64_link_format" = xunknown; then
-    efiemu_excuse="no suitable link format for efiemu64 found"
-  else
-    EFIEMU64_LINK_FORMAT="-Wl,$grub_cv_target_cc_efiemu64_link_format"
-  fi
-fi
 if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then
-  AC_MSG_ERROR([efiemu runtime was explicitly requested but can't be compiled ($efiemu_excuse)])
+  AC_MSG_ERROR([efiemu runtime was explicitly requested but can't be compiled])
 fi
 if test x"$efiemu_excuse" = x ; then
 enable_efiemu=yes
@@ -749,50 +644,25 @@ else
 enable_efiemu=no
 fi
 AC_SUBST([enable_efiemu])
-AC_SUBST([EFIEMU64_LINK_FORMAT])
 
 CFLAGS="$TARGET_CFLAGS"
 
-
+if test x"$target_cpu" = xi386 || test x"$target_cpu" = xx86_64; then
-if test x"$platform" = xemu ; then
+  AC_CACHE_CHECK([for linking format], [grub_cv_target_cc_link_format], [
-  TARGET_OBJ2ELF=
-  grub_cv_target_cc_link_format=
-  case "$host_os" in
-    *darwin* | *mac*)
-       grub_cv_target_cc_link_format="-arch,${target_cpu}"
-       TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,$grub_cv_target_cc_link_format"
-        ;;
-    *windows* | *cygwin* | *mingw*)
-      if test x${target_cpu} = xi386 ; then
-        grub_cv_target_cc_link_format=-mi386pe;
-	TARGET_OBJ2ELF='./build-grub-pe2elf';
-      fi
-      if test x${target_cpu} = xx86_64 ; then
-        grub_cv_target_cc_link_format=-mi386pep;
-	TARGET_OBJ2ELF='./build-grub-pep2elf';
-      fi
-      TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,$grub_cv_target_cc_link_format"
-      ;;
-  esac
-elif test x"$target_cpu" = xi386 || test x"$target_cpu" = xx86_64; then
-  AC_CACHE_CHECK([for target linking format], [grub_cv_target_cc_link_format], [
     grub_cv_target_cc_link_format=unknown
-    for format in -melf_${target_cpu} -melf_${target_cpu}_fbsd -melf_${target_cpu}_obsd -melf_${target_cpu}_haiku -mi386pe -mi386pep -arch,${target_cpu}; do
+    for format in -melf_${target_cpu} -melf_${target_cpu}_fbsd -melf_${target_cpu}_obsd -melf_${target_cpu}_haiku -m${target_cpu}pe -arch,${target_cpu}; do
-      if test x${target_cpu} != xi386 && test x$format = x-mi386pe; then
+      if test x${target_cpu} != xi386 && test x$format = x${target_cpu}pe; then
         continue
       fi
-      if test x${target_cpu} != xx86_64 && test x$format = x-mi386pep; then
+      CFLAGS="$TARGET_CFLAGS -static"
-        continue
+      LDFLAGS="$TARGET_LDFLAGS -Wl,$format -nostdlib"
-      fi
-      CFLAGS="$TARGET_CFLAGS"
-      LDFLAGS="$TARGET_LDFLAGS -Wl,$format -nostdlib -static"
       AC_LINK_IFELSE([AC_LANG_PROGRAM([[
       asm (".globl start; start:");
       asm (".globl _start; _start:");
       asm (".globl __start; __start:");
       void __main (void);
       void __main (void) {}
-      ]], [[]])], [flag=1], [flag=0])
+      ]], [[]])], [flag=1], [])
       if test x"$flag" = x1; then
         grub_cv_target_cc_link_format="$format"
 	break;
@@ -802,12 +672,9 @@ elif test x"$target_cpu" = xi386 || test x"$target_cpu" = xx86_64; then
     AC_MSG_ERROR([no suitable link format found])
   fi
   TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,$grub_cv_target_cc_link_format"
-  if test x"$grub_cv_target_cc_link_format" = x-mi386pe ; then
+  if test x"$grub_cv_target_cc_link_format" = x-mi386pe; then
     TARGET_OBJ2ELF='./build-grub-pe2elf';
   fi
-  if test x"$grub_cv_target_cc_link_format" = x-mi386pep ; then
-    TARGET_OBJ2ELF='./build-grub-pep2elf';
-  fi
 fi
 
 if test x$grub_cv_target_cc_link_format = x-arch,i386 || test x$grub_cv_target_cc_link_format = x-arch,x86_64; then
@@ -825,12 +692,12 @@ if test x$grub_cv_target_cc_link_format = x-arch,i386 || test x$grub_cv_target_c
    TARGET_IMG_LDFLAGS_AC='-nostdlib -static -Wl,-preload -Wl,-segalign,20'
    TARGET_IMG_BASE_LDOPT="-Wl,-image_base"
    TARGET_LDFLAGS_OLDMAGIC=""
-elif test x$grub_cv_target_cc_link_format = x-mi386pe || test x$grub_cv_target_cc_link_format = x-mi386pep ; then
+elif test x$grub_cv_target_cc_link_format = x-mi386pe && test x$platform = xpc; then
   TARGET_APPLE_LINKER=0
   TARGET_LDFLAGS_OLDMAGIC="-Wl,-N"
-  TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/${grub_coredir}/conf/i386-cygwin-img-ld.sc"
+  TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/${grub_coredir}/conf/i386-pc-cygwin-img-ld.sc"
   TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}"
-  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/${grub_coredir}/conf/i386-cygwin-img-ld.sc"
+  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/${grub_coredir}/conf/i386-pc-cygwin-img-ld.sc"
   TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
   TARGET_IMG_CFLAGS=
 else
@@ -848,7 +715,7 @@ AC_SUBST(TARGET_LDFLAGS_OLDMAGIC)
 
 LDFLAGS="$TARGET_LDFLAGS"
 
-if test "$target_cpu" = x86_64 || test "$target_cpu-$platform" = sparc64-emu ; then
+if test "$target_cpu" = x86_64; then
   # Use large model to support 4G memory
   AC_CACHE_CHECK([whether option -mcmodel=large works], grub_cv_cc_mcmodel, [
     CFLAGS="$TARGET_CFLAGS -m64 -mcmodel=large"
@@ -856,10 +723,10 @@ if test "$target_cpu" = x86_64 || test "$target_cpu-$platform" = sparc64-emu ; t
 		      [grub_cv_cc_mcmodel=yes],
 		      [grub_cv_cc_mcmodel=no])
   ])
-  if test "x$grub_cv_cc_mcmodel" = xyes; then
+  if test "x$grub_cv_cc_mcmodel" = xno; then
+    AC_MSG_ERROR([-mcmodel=large not supported. Upgrade your gcc.])
+  else
     TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large"
-  elif test "$target_cpu-$platform" = sparc64-emu; then
-    TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=medany"
   fi
 fi
 
@@ -878,50 +745,6 @@ if test "$target_cpu"-"$platform" = x86_64-efi; then
   TARGET_CFLAGS="$TARGET_CFLAGS -mno-red-zone"
 fi
 
-if test "x$target_cpu" = xarm; then
-  AC_CACHE_CHECK([whether option -mlong-calls works], grub_cv_cc_mlong_calls, [
-    CFLAGS="$TARGET_CFLAGS -mlong-calls -Werror"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-		      [grub_cv_cc_mlong_calls=yes],
-		      [grub_cv_cc_mlong_calls=no])
-  ])
-  if test "x$grub_cv_cc_mlong_calls" = xyes; then
-    TARGET_CFLAGS="$TARGET_CFLAGS -mlong-calls"
-  fi
-  AC_CACHE_CHECK([whether option -mthumb-interwork works], grub_cv_cc_mthumb_interwork, [
-    CFLAGS="$TARGET_CFLAGS -mthumb-interwork -Werror"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-		      [grub_cv_cc_mthumb_interwork=yes],
-		      [grub_cv_cc_mthumb_interwork=no])
-  ])
-  if test "x$grub_cv_cc_mthumb_interwork" = xyes; then
-    TARGET_CFLAGS="$TARGET_CFLAGS -mthumb-interwork"
-  elif test "x$grub_cv_cc_target_clang" = xno ; then
-    AC_MSG_ERROR([your compiler doesn't support -mthumb-interwork])
-  else
-    CFLAGS="$TARGET_CFLAGS"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
-#if defined (__thumb__) && !defined (__thumb2__)
-#error thumb without interworking
-#endif
-]])],
-		      [no_interwork_ok=yes],
-		      [no_interwork_ok=no])
-    if test x$no_interwork_ok = xno ; then
-       AC_MSG_ERROR([attempt to compile to thumb with no thumb interwork])
-    fi
-  fi
-fi
-
-AC_CACHE_CHECK([whether option -Qn works], grub_cv_target_cc_qn, [
-  CFLAGS="$TARGET_CFLAGS -Qn -Werror"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-		    [grub_cv_target_cc_qn=yes],
-		    [grub_cv_target_cc_qn=no])])
-if test "x$grub_cv_target_cc_qn" = xyes; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -Qn"
-fi
-
 #
 # Compiler features.
 #
@@ -940,17 +763,10 @@ CFLAGS="$TARGET_CFLAGS"
 
 # Position independent executable.
 grub_CHECK_PIC
-[# On most platforms we don't want PIC as it only makes relocations harder
+[# Need that, because some distributions ship compilers that include
-# and code less efficient. On mips we want to have one got table per module
+# `-fPIC' in the default specs.
-# and reload $gp in every function.
+if [ x"$pic_possible" = xyes ]; then
-# GCC implements it using symbol __gnu_local_gp in non-PIC as well.
+  TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIC"
-# However with clang we need PIC for this reloading to happen.
-# Since default varies across dictributions use either -fPIC or -fno-PIC
-# explicitly.
-if ( test x$target_cpu = xmips || test x$target_cpu = xmipsel ) && test "x$grub_cv_cc_target_clang" = xyes ; then
-   TARGET_CFLAGS="$TARGET_CFLAGS -fPIC"
-elif [ x"$pic_possible" = xyes ]; then
-   TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIC"
 fi]
 
 CFLAGS="$TARGET_CFLAGS"
@@ -974,43 +790,20 @@ fi
 
 CFLAGS="$TARGET_CFLAGS"
 
-# -mno-unaligned-access -mstrict-align
+# -mno-unaligned-access
 if test "$target_cpu" = arm; then
-  AC_CACHE_CHECK([for compile options to get strict alignment], [grub_cv_target_cc_strict_align], [
+  grub_CHECK_NO_UNALIGNED_ACCESS
-    grub_cv_target_cc_strict_align=
+  if test x"$nua_possible" = xyes; then
-    for arg in -mno-unaligned-access "-Xclang -mstrict-align" -mstrict-align; do
+    TARGET_CFLAGS="$TARGET_CFLAGS -mno-unaligned-access"
-      CFLAGS="$TARGET_CFLAGS $arg -Werror"
-      LDFLAGS="$TARGET_LDFLAGS"
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], [flag=1], [flag=0])
-      if test x"$flag" = x1; then
-        grub_cv_target_cc_strict_align="$arg"
-	break;
-      fi
-    done])
-
-  TARGET_CFLAGS="$TARGET_CFLAGS $grub_cv_target_cc_strict_align"
-  if test x"$grub_cv_target_cc_strict_align" = x"-Xclang -mstrict-align"; then
-    TARGET_LDFLAGS="$TARGET_LDFLAGS -Qunused-arguments"
-  fi
-  AC_CACHE_CHECK([if compiler generates unaligned accesses], [grub_cv_cc_target_emits_unaligned],
-  [CFLAGS="$TARGET_CFLAGS"
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
-#ifdef __ARM_FEATURE_UNALIGNED
-#error "unaligned"
-#endif
-     ]])],
-     [grub_cv_cc_target_emits_unaligned=no], [grub_cv_cc_target_emits_unaligned=yes])])
-  if test x$grub_cv_cc_target_emits_unaligned = xyes; then
-    AC_MSG_ERROR([compiler generates unaligned accesses])
   fi
 fi
 
 # Set them to their new values for the tests below.
 CC="$TARGET_CC"
 if test "x$TARGET_APPLE_LINKER" = x1 ; then
-CFLAGS="$TARGET_CFLAGS -nostdlib -static -Wno-error"
-else
 CFLAGS="$TARGET_CFLAGS -nostdlib -Wno-error"
+else
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100 -Wno-error"
 fi
 CPPFLAGS="$TARGET_CPPFLAGS"
 if test x$target_cpu = xi386 || test x$target_cpu = xx86_64 || test "x$grub_cv_cc_target_clang" = xyes ; then
@@ -1024,20 +817,19 @@ LIBS="$TARGET_LIBGCC"
 grub_ASM_USCORE
 if test "x$TARGET_APPLE_LINKER" = x0 ; then
 if test x$grub_cv_asm_uscore = xyes; then
-DEFSYM="-Wl,--defsym,_abort=_main -Wl,--defsym,__main=_main"
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,_abort=_main"
 else
-DEFSYM="-Wl,--defsym,abort=main -Wl,--defsym,_main=main -Wl,--defsym,__main=main"
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,abort=main"
 fi
-CFLAGS="$TARGET_CFLAGS -nostdlib $DEFSYM"
 fi
 
 # Check for libgcc symbols
 AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __ucmpdi2 _restgpr_14_x)
 
 if test "x$TARGET_APPLE_LINKER" = x1 ; then
-CFLAGS="$TARGET_CFLAGS -nostdlib -static"
-else
 CFLAGS="$TARGET_CFLAGS -nostdlib"
+else
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100"
 fi
 LIBS=""
 
@@ -1051,7 +843,7 @@ if test "x$target_cpu" = xi386; then
   if test "$platform" != emu && test "x$TARGET_APPLE_LINKER" != x1 ; then
     if test ! -z "$TARGET_IMG_LDSCRIPT"; then
       # Check symbols provided by linker script.
-      CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC} ${TARGET_IMG_BASE_LDOPT},0x8000"
+      CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC} ${TARGET_IMG_BASE_LDOPT},0x8000 -Wl,--defsym,___main=0x8100"
     fi
     grub_CHECK_BSS_START_SYMBOL
     grub_CHECK_END_SYMBOL
@@ -1170,7 +962,7 @@ AC_CHECK_LIB([usb], [usb_claim_interface], [LIBUSB="-lusb"],
       [grub_emu_usb_excuse=["need libusb headers"]])
 [fi]
 if test x"$enable_grub_emu_usb" = xyes && test x"$grub_emu_usb_excuse" != x ; then
-  AC_MSG_ERROR([USB support for grub-emu was explicitly requested but can't be compiled ($grub_emu_usb_excuse)])
+  AC_MSG_ERROR([USB support for grub-emu was explicitly requested but can't be compiled])
 fi
 if test x"$grub_emu_usb_excuse" = x ; then
 enable_grub_emu_usb=yes
@@ -1179,7 +971,7 @@ enable_grub_emu_usb=no
 fi
 
 if test x"$enable_grub_emu_sdl" = xno ; then
-  grub_emu_sdl_excuse="explicitly disabled"
+  grub_emu_sdl_excuse="explicitely disabled"
 fi
 [if [ x"$grub_emu_sdl_excuse" = x ]; then
     # Check for libSDL libraries.]
@@ -1195,7 +987,7 @@ AC_CHECK_LIB([SDL], [SDL_Init], [LIBSDL="-lSDL"],
 [fi]
 
 if test x"enable_grub_emu_sdl" = xyes && test x"$grub_emu_sdl_excuse" != x ; then
-  AC_MSG_ERROR([SDL support for grub-emu was explicitly requested but can't be compiled ($grub_emu_sdl_excuse)])
+  AC_MSG_ERROR([SDL support for grub-emu was explicitely requested but can't be compiled])
 fi
 if test x"$grub_emu_sdl_excuse" = x ; then
 enable_grub_emu_sdl=yes
@@ -1264,18 +1056,14 @@ if test x"$grub_mkfont_excuse" = x ; then
   freetype_cflags=`$FREETYPE --cflags`
   freetype_libs=`$FREETYPE --libs`
   SAVED_CPPFLAGS="$CPPFLAGS"
-  SAVED_LIBS="$LIBS"
   CPPFLAGS="$CPPFLAGS $freetype_cflags"
-  LIBS="$LIBS $freetype_libs"
   AC_CHECK_HEADERS([ft2build.h], [],
   	[grub_mkfont_excuse=["need freetype2 headers"]])
-  AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], [grub_mkfont_excuse=["freetype2 library unusable"]])
   CPPFLAGS="$SAVED_CPPFLAGS"
-  LIBS="$SAVED_LIBS"
 fi
 
 if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; then
-  AC_MSG_ERROR([grub-mkfont was explicitly requested but can't be compiled ($grub_mkfont_excuse)])
+  AC_MSG_ERROR([grub-mkfont was explicitly requested but can't be compiled])
 fi
 if test x"$grub_mkfont_excuse" = x ; then
 enable_grub_mkfont=yes
@@ -1323,30 +1111,22 @@ if test x"$grub_build_mkfont_excuse" = x ; then
   build_freetype_cflags=`$BUILD_FREETYPE --cflags`
   build_freetype_libs=`$BUILD_FREETYPE --libs`
   SAVED_CPPFLAGS_2="$CPPFLAGS"
-  SAVED_LIBS="$LIBS"
   CPPFLAGS="$CPPFLAGS $build_freetype_cflags"
-  LIBS="$LIBS $build_freetype_libs"
   AC_CHECK_HEADERS([ft2build.h], [],
   	[grub_build_mkfont_excuse=["need freetype2 headers"]])
-  AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], [grub_build_mkfont_excuse=["freetype2 library unusable"]])
-  LIBS="$SAVED_LIBS"
   CPPFLAGS="$SAVED_CPPFLAGS_2"
 fi
 
 if test x"$enable_build_grub_mkfont" = xyes && test x"$grub_build_mkfont_excuse" != x ; then
-  AC_MSG_ERROR([build-grub-mkfont was explicitly requested but can't be compiled ($grub_build_mkfont_excuse)])
+  AC_MSG_ERROR([build-grub-mkfont was explicitly requested but can't be compiled])
 fi
 if test x"$grub_build_mkfont_excuse" = x ; then
   enable_build_grub_mkfont=yes
 else
   enable_build_grub_mkfont=no
 fi
-if test x"$enable_build_grub_mkfont" = xno && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 || test "x$platform" = xcoreboot ); then
+if test x"$enable_build_grub_mkfont" = xno && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 ); then
-  if test x"$grub_build_mkfont_excuse" = x ; then
+  AC_MSG_ERROR([qemu, powerpc-ieee1275 and loongson ports needs build-time grub-mkfont])
-    AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot and loongson ports needs build-time grub-mkfont])
-  else
-    AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot and loongson ports needs build-time grub-mkfont ($grub_build_mkfont_excuse)])
-  fi
 fi
 
 AC_SUBST([build_freetype_cflags])
@@ -1389,7 +1169,7 @@ if test x"$starfield_excuse" = x; then
 fi
 
 if test x"$enable_grub_themes" = xyes &&  test x"$starfield_excuse" != x; then
-   AC_MSG_ERROR([themes were explicitly requested but requirements are not satisfied ($starfield_excuse)])
+   AC_MSG_ERROR([themes were explicitly requested but requirements are not satisfied])
 fi
 
 AC_SUBST([DJVU_FONT_SOURCE])
@@ -1399,11 +1179,6 @@ FONT_SOURCE=
 for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
   for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont /usr/share/fonts/misc; do
     if test -f "$dir/unifont.$ext"; then
-      md5="$(md5sum "$dir/unifont.$ext"|awk '{ print $1; }')"
-      # PCF and BDF from version 6.3 isn't hanled properly by libfreetype.
-      if test "$md5" = 0a54834d2788c83886a3e1785a6a1e61 || test "$md5" = 28f2565c7a41d8d407e2551159385edb || test "$md5" = dae5e588461b3b92b87b6ffee734f936 || test "$md5" = 4a3d687aa5bb329ed05f4263a1016791 ; then
-        continue;
-      fi
       FONT_SOURCE="$dir/unifont.$ext"
       break 2
     fi
@@ -1414,12 +1189,8 @@ if test x"$enable_build_grub_mkfont" = xno ; then
   FONT_SOURCE=
 fi
 
-if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 || test "x$platform" = xcoreboot ); then
+if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 ); then
-  if test x"$grub_build_mkfont_excuse" = x ; then
+   AC_MSG_ERROR([qemu, powerpc-ieee1275 and loongson ports need unifont])
-    AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot and loongson ports need unifont])
-  else
-    AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot and loongson ports need unifont ($grub_build_mkfont_excuse)])
-  fi
 fi
 
 AC_SUBST([FONT_SOURCE])
@@ -1451,7 +1222,7 @@ if test x"$grub_mount_excuse" = x ; then
 fi
 
 if test x"$enable_grub_mount" = xyes && test x"$grub_mount_excuse" != x ; then
-  AC_MSG_ERROR([grub-mount was explicitly requested but can't be compiled ($grub_mount_excuse)])
+  AC_MSG_ERROR([grub-mount was explicitly requested but can't be compiled])
 fi
 if test x"$grub_mount_excuse" = x ; then
 enable_grub_mount=yes
@@ -1519,7 +1290,7 @@ AC_CHECK_HEADER([lzma.h], [], [liblzma_excuse="need lzma header"])
 fi
 
 if test x"$enable_liblzma" = xyes && test x"$liblzma_excuse" != x ; then
-  AC_MSG_ERROR([liblzma support was explicitly requested but requirements are not satisfied ($liblzma_excuse)])
+  AC_MSG_ERROR([liblzma support was explicitly requested but requirements are not satisfied])
 fi
 
 
@@ -1556,7 +1327,7 @@ if test x"$libzfs_excuse" = x ; then
 fi
 
 if test x"$enable_libzfs" = xyes && test x"$libzfs_excuse" != x ; then
-  AC_MSG_ERROR([libzfs support was explicitly requested but requirements are not satisfied ($libzfs_excuse)])
+  AC_MSG_ERROR([libzfs support was explicitly requested but requirements are not satisfied])
 fi
 
 if test x"$libzfs_excuse" = x ; then
@@ -1585,6 +1356,7 @@ AC_SUBST(BSS_START_SYMBOL)
 AC_SUBST(END_SYMBOL)
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
+AC_SUBST(NEED_REGISTER_FRAME_INFO)
 
 AC_ARG_ENABLE([werror],
 	      [AS_HELP_STRING([--disable-werror],
@@ -1616,13 +1388,13 @@ AC_SUBST(TARGET_CPP)
 AC_SUBST(TARGET_CCAS)
 AC_SUBST(TARGET_OBJ2ELF)
 AC_SUBST(TARGET_MODULE_FORMAT)
-AC_SUBST(TARGET_CC_VERSION)
 
 AC_SUBST(TARGET_CFLAGS)
 AC_SUBST(TARGET_LDFLAGS)
 AC_SUBST(TARGET_CPPFLAGS)
 AC_SUBST(TARGET_CCASFLAGS)
 
+AC_SUBST(TARGET_IMG_LDSCRIPT)
 AC_SUBST(TARGET_IMG_LDFLAGS)
 AC_SUBST(TARGET_IMG_CFLAGS)
 AC_SUBST(TARGET_IMG_BASE_LDOPT)
@@ -1655,7 +1427,6 @@ AM_CONDITIONAL([COND_mips_loongson], [test x$target_cpu = xmipsel -a x$platform
 AM_CONDITIONAL([COND_mips_qemu_mips], [test "(" x$target_cpu = xmips -o x$target_cpu = xmipsel ")"  -a x$platform = xqemu_mips])
 AM_CONDITIONAL([COND_mips_arc], [test "(" x$target_cpu = xmips -o x$target_cpu = xmipsel ")"  -a x$platform = xarc])
 AM_CONDITIONAL([COND_sparc64_ieee1275], [test x$target_cpu = xsparc64 -a x$platform = xieee1275])
-AM_CONDITIONAL([COND_sparc64_emu], [test x$target_cpu = xsparc64 -a x$platform = xemu])
 AM_CONDITIONAL([COND_powerpc_ieee1275], [test x$target_cpu = xpowerpc -a x$platform = xieee1275])
 AM_CONDITIONAL([COND_mips], [test x$target_cpu = xmips -o x$target_cpu = xmipsel])
 AM_CONDITIONAL([COND_mipsel], [test x$target_cpu = xmipsel])
@@ -1663,8 +1434,6 @@ AM_CONDITIONAL([COND_mipseb], [test x$target_cpu = xmips])
 AM_CONDITIONAL([COND_arm], [test x$target_cpu = xarm ])
 AM_CONDITIONAL([COND_arm_uboot], [test x$target_cpu = xarm -a x$platform = xuboot])
 AM_CONDITIONAL([COND_arm_efi], [test x$target_cpu = xarm -a x$platform = xefi])
-AM_CONDITIONAL([COND_arm64], [test x$target_cpu = xarm64 ])
-AM_CONDITIONAL([COND_arm64_efi], [test x$target_cpu = xarm64 -a x$platform = xefi])
 
 AM_CONDITIONAL([COND_HOST_HURD], [test x$host_kernel = xhurd])
 AM_CONDITIONAL([COND_HOST_LINUX], [test x$host_kernel = xlinux])
@@ -1681,12 +1450,6 @@ 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_GRUB_MOUNT], [test x$enable_grub_mount = xyes])
 AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x])
-if test x$FONT_SOURCE != x ; then
-   HAVE_FONT_SOURCE=1
-else
-   HAVE_FONT_SOURCE=0
-fi
-AC_SUBST(HAVE_FONT_SOURCE)
 AM_CONDITIONAL([COND_APPLE_LINKER], [test x$TARGET_APPLE_LINKER = x1])
 AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes])
 AM_CONDITIONAL([COND_ENABLE_CACHE_STATS], [test x$DISK_CACHE_STATS = x1])
@@ -1695,6 +1458,7 @@ AM_CONDITIONAL([COND_ENABLE_BOOT_TIME_STATS], [test x$BOOT_TIME_STATS = x1])
 AM_CONDITIONAL([COND_HAVE_CXX], [test x$HAVE_CXX = xyes])
 
 AM_CONDITIONAL([COND_HAVE_ASM_USCORE], [test x$HAVE_ASM_USCORE = x1])
+AM_CONDITIONAL([COND_CYGWIN], [test x$target_os = xcygwin])
 AM_CONDITIONAL([COND_STARFIELD], [test "x$starfield_excuse" = x])
 AM_CONDITIONAL([COND_HAVE_EXEC], [test "x$have_exec" = xy])
 

coreboot.cfg

@@ -1,3 +0,0 @@
-if test -f (cbfsdisk)/etc/grub.cfg; then
-   source (cbfsdisk)/etc/grub.cfg
-fi

docs/grub-dev.texi

@@ -79,7 +79,6 @@ This edition documents version @value{VERSION}.
 * Contributing Changes::
 * Porting::
 * Error Handling::
-* Stack and heap size::
 * BIOS port memory map::
 * Video Subsystem::
 * PFF2 Font File Format::
@@ -907,69 +906,6 @@ if (grub_errno != GRUB_ERR_NONE)
 grub_error_pop ();
 @end example
 
-@node Stack and heap size
-@chapter Stack and heap size
-
-On emu stack and heap are just normal host OS stack and heap. Stack is typically
-8 MiB although it's OS-dependent.
-
-On i386-pc, i386-coreboot, i386-qemu and i386-multiboot the stack is 60KiB.
-All available space between 1MiB and 4GiB marks is part of heap.
-
-On *-xen stack is 4MiB. If compiled for x86-64 with GCC 4.4 or later adressable
-space is unlimited. When compiled for x86-64 with older GCC version adressable
-space is limited to 2GiB. When compiling for i386 adressable space is limited
-to 4GiB. All adressable pages except the ones for stack, GRUB binary, special
-pages and page table are in the heap.
-
-On *-efi GRUB uses same stack as EFI. If compiled for x86-64 with GCC 4.4 or
-later adressable space is unlimited. When compiled for x86-64 with older GCC
-version adressable space is limited to 2GiB. For all other platforms adressable
-space is limited to 4GiB. GRUB allocates pages from EFI for its heap, at most
-1.6 GiB.
-
-On i386-ieee1275 and powerpc-ieee1275 GRUB uses same stack as IEEE1275.
-It allocates at most 32MiB for its heap.
-
-On sparc64-ieee1275 stack is 256KiB and heap is 2MiB.
-
-On mips(el)-qemu_mips and mipsel-loongson stack is 2MiB (everything below
-GRUB image) and everything above GRUB image (from 2MiB + kernel size)
-until 256MiB is part of heap.
-
-On mips-arc stack is 2MiB (everything below GRUB image) and everything above
-GRUB image(from 2MiB + kernel size) until 128MiB is part of heap.
-
-On mipsel-arc stack is 2MiB (everything below GRUB image which is not part
-of ARC) and everything above GRUB image (from 7MiB + kernel size)
-until 256MiB is part of heap.
-
-On arm-uboot stack is 256KiB and heap is 2MiB.
-
-In short:
-
-@multitable @columnfractions .15 .25 .5
-@headitem Platform @tab Stack @tab Heap
-@item emu                     @tab 8 MiB   @tab ?
-@item i386-pc                 @tab 60 KiB  @tab < 4 GiB
-@item i386-coreboot           @tab 60 KiB  @tab < 4 GiB
-@item i386-multiboot          @tab 60 KiB  @tab < 4 GiB
-@item i386-qemu               @tab 60 KiB  @tab < 4 GiB
-@item *-efi                   @tab ?       @tab < 1.6 GiB
-@item i386-ieee1275           @tab ?       @tab < 32 MiB
-@item powerpc-ieee1275        @tab ?       @tab < 32 MiB
-@item sparc64-ieee1275        @tab 256KiB  @tab 2 MiB
-@item arm-uboot               @tab 256KiB  @tab 2 MiB
-@item mips(el)-qemu_mips      @tab 2MiB    @tab 253 MiB
-@item mipsel-loongson         @tab 2MiB    @tab 253 MiB
-@item mips-arc                @tab 2MiB    @tab 125 MiB
-@item mipsel-arc              @tab 2MiB    @tab 248 MiB
-@item x86_64-xen (GCC >= 4.4) @tab 4MiB    @tab unlimited
-@item x86_64-xen (GCC < 4.4)  @tab 4MiB    @tab < 2GiB
-@item i386-xen                @tab 4MiB    @tab < 4GiB
-@end multitable
-
-
 @node BIOS port memory map
 @chapter BIOS port memory map
 @c By Yoshinori K Okuji
@@ -981,8 +917,9 @@ In short:
 @item ?        @tab 0x2000 - 1   @tab Real mode stack 
 @item 0x7C00   @tab 0x7D00 - 1   @tab Boot sector 
 @item 0x8000   @tab ?            @tab GRUB kernel 
-@item 0x68000  @tab 0x71000 - 1  @tab Disk buffer 
+@item 0x68000  @tab 0x78000 - 1  @tab Disk buffer 
 @item ?        @tab 0x80000 - 1  @tab Protected mode stack 
+@item 0x80000  @tab ?            @tab Heap 
 @item ?        @tab 0xA0000 - 1  @tab Extended BIOS Data Area 
 @item 0xA0000  @tab 0xC0000 - 1  @tab Video RAM 
 @item 0xC0000  @tab 0x100000 - 1 @tab BIOS 
@@ -1812,9 +1749,7 @@ right edges of two adjacent glyphs.  The @strong{device width} field determines
 the effective leading value that is used to render the font.
 
 @end itemize
-@ifnottex
+@image{font_char_metrics,,,,png}
-@image{font_char_metrics,,,,.png}
-@end ifnottex
    
 An illustration of how the various font metrics apply to characters.
 

docs/grub.texi

@@ -1298,26 +1298,23 @@ a key is pressed.  The default is @samp{5}.  Set to @samp{0} to boot
 immediately without displaying the menu, or to @samp{-1} to wait
 indefinitely.
 
-If @samp{GRUB_TIMEOUT_STYLE} is set to @samp{countdown} or @samp{hidden},
+@item GRUB_HIDDEN_TIMEOUT
-the timeout is instead counted before the menu is displayed.
+Wait this many seconds for @key{ESC} to be pressed before displaying the menu.
+If no @key{ESC} is pressed during that time, display the menu for the number of
+seconds specified in GRUB_TIMEOUT before booting the default entry. We expect
+that most people who use GRUB_HIDDEN_TIMEOUT will want to have GRUB_TIMEOUT set 
+to @samp{0} so that the menu is not displayed at all unless @key{ESC} is
+pressed.
+Unset by default.
 
-@item GRUB_TIMEOUT_STYLE
+@item GRUB_HIDDEN_TIMEOUT_QUIET
-If this option is unset or set to @samp{menu}, then GRUB will display the
+In conjunction with @samp{GRUB_HIDDEN_TIMEOUT}, set this to @samp{true} to
-menu and then wait for the timeout set by @samp{GRUB_TIMEOUT} to expire
+suppress the verbose countdown while waiting for a key to be pressed before
-before booting the default entry.  Pressing a key interrupts the timeout.
+displaying the menu.  Unset by default.
-
-If this option is set to @samp{countdown} or @samp{hidden}, then, before
-displaying the menu, GRUB will wait for the timeout set by
-@samp{GRUB_TIMEOUT} to expire.  If @key{ESC} is pressed during that time, it
-will display the menu and wait for input.  If a hotkey associated with a
-menu entry is pressed, it will boot the associated menu entry immediately.
-If the timeout expires before either of these happens, it will boot the
-default entry.  In the @samp{countdown} case, it will show a one-line
-indication of the remaining time.
 
 @item GRUB_DEFAULT_BUTTON
 @itemx GRUB_TIMEOUT_BUTTON
-@itemx GRUB_TIMEOUT_STYLE_BUTTON
+@itemx GRUB_HIDDEN_TIMEOUT_BUTTON
 @itemx GRUB_BUTTON_CMOS_ADDRESS
 Variants of the corresponding variables without the @samp{_BUTTON} suffix,
 used to support vendor-specific power buttons.  @xref{Vendor power-on keys}.
@@ -1492,44 +1489,6 @@ Each module will be loaded as early as possible, at the start of
 
 @end table
 
-The following options are still accepted for compatibility with existing
-configurations, but have better replacements:
-
-@table @samp
-@item GRUB_HIDDEN_TIMEOUT
-Wait this many seconds before displaying the menu.  If @key{ESC} is pressed
-during that time, display the menu and wait for input according to
-@samp{GRUB_TIMEOUT}.  If a hotkey associated with a menu entry is pressed,
-boot the associated menu entry immediately.  If the timeout expires before
-either of these happens, display the menu for the number of seconds
-specified in @samp{GRUB_TIMEOUT} before booting the default entry.
-
-If you set @samp{GRUB_HIDDEN_TIMEOUT}, you should also set
-@samp{GRUB_TIMEOUT=0} so that the menu is not displayed at all unless
-@key{ESC} is pressed.
-
-This option is unset by default, and is deprecated in favour of the less
-confusing @samp{GRUB_TIMEOUT_STYLE=countdown} or
-@samp{GRUB_TIMEOUT_STYLE=hidden}.
-
-@item GRUB_HIDDEN_TIMEOUT_QUIET
-In conjunction with @samp{GRUB_HIDDEN_TIMEOUT}, set this to @samp{true} to
-suppress the verbose countdown while waiting for a key to be pressed before
-displaying the menu.
-
-This option is unset by default, and is deprecated in favour of the less
-confusing @samp{GRUB_TIMEOUT_STYLE=countdown}.
-
-@item GRUB_HIDDEN_TIMEOUT_BUTTON
-Variant of @samp{GRUB_HIDDEN_TIMEOUT}, used to support vendor-specific power
-buttons.  @xref{Vendor power-on keys}.
-
-This option is unset by default, and is deprecated in favour of the less
-confusing @samp{GRUB_TIMEOUT_STYLE=countdown} or
-@samp{GRUB_TIMEOUT_STYLE=hidden}.
-
-@end table
-
 For more detailed customisation of @command{grub-mkconfig}'s output, you may
 edit the scripts in @file{/etc/grub.d} directly.
 @file{/etc/grub.d/40_custom} is particularly useful for adding entire custom
@@ -2518,16 +2477,15 @@ menu requires several fancy features of your terminal.
 @node Vendor power-on keys
 @chapter Using GRUB with vendor power-on keys
 
-Some laptop vendors provide an additional power-on button which boots
+Some laptop vendors provide an additional power-on button which boots another
-another OS.  GRUB supports such buttons with the @samp{GRUB_TIMEOUT_BUTTON},
+OS.  GRUB supports such buttons with the @samp{GRUB_TIMEOUT_BUTTON},
-@samp{GRUB_TIMEOUT_STYLE_BUTTON}, @samp{GRUB_DEFAULT_BUTTON}, and
+@samp{GRUB_DEFAULT_BUTTON}, @samp{GRUB_HIDDEN_TIMEOUT_BUTTON} and
 @samp{GRUB_BUTTON_CMOS_ADDRESS} variables in default/grub (@pxref{Simple
-configuration}).  @samp{GRUB_TIMEOUT_BUTTON},
+configuration}).  @samp{GRUB_TIMEOUT_BUTTON}, @samp{GRUB_DEFAULT_BUTTON} and
-@samp{GRUB_TIMEOUT_STYLE_BUTTON}, and @samp{GRUB_DEFAULT_BUTTON} are used
+@samp{GRUB_HIDDEN_TIMEOUT_BUTTON} are used instead of the corresponding
-instead of the corresponding variables without the @samp{_BUTTON} suffix
+variables without the @samp{_BUTTON} suffix when powered on using the special
-when powered on using the special button.  @samp{GRUB_BUTTON_CMOS_ADDRESS}
+button.  @samp{GRUB_BUTTON_CMOS_ADDRESS} is vendor-specific and partially
-is vendor-specific and partially model-specific.  Values known to the GRUB
+model-specific.  Values known to the GRUB team are:
-team are:
 
 @table @key
 @item Dell XPS M1330M
@@ -3072,7 +3030,6 @@ These variables have special meaning to GRUB.
 * superusers::
 * theme::
 * timeout::
-* timeout_style::
 @end menu
 
 
@@ -3123,7 +3080,7 @@ This variable contains the ``highlight'' foreground and background terminal
 colors, separated by a slash (@samp{/}).  Setting this variable changes
 those colors.  For the available color names, @pxref{color_normal}.
 
-The default is @samp{black/light-gray}.
+The default is @samp{black/white}.
 
 
 @node color_normal
@@ -3152,7 +3109,7 @@ those colors.  Each color must be a name from the following list:
 @item white
 @end itemize
 
-The default is @samp{light-gray/black}.
+The default is @samp{white/black}.
 
 The color support support varies from terminal to terminal.
 
@@ -3505,21 +3462,8 @@ keyboard input before booting the default menu entry.  A timeout of @samp{0}
 means to boot the default entry immediately without displaying the menu; a
 timeout of @samp{-1} (or unset) means to wait indefinitely.
 
-If @samp{timeout_style} (@pxref{timeout_style}) is set to @samp{countdown}
+This variable is often set by @samp{GRUB_TIMEOUT} or
-or @samp{hidden}, the timeout is instead counted before the menu is
+@samp{GRUB_HIDDEN_TIMEOUT} (@pxref{Simple configuration}).
-displayed.
-
-This variable is often set by @samp{GRUB_TIMEOUT} (@pxref{Simple
-configuration}).
-
-
-@node timeout_style
-@subsection timeout_style
-
-This variable may be set to @samp{menu}, @samp{countdown}, or @samp{hidden}
-to control the way in which the timeout (@pxref{timeout}) interacts with
-displaying the menu.  See the documentation of @samp{GRUB_TIMEOUT_STYLE}
-(@pxref{Simple configuration}) for details.
 
 
 @node Environment block
@@ -4476,7 +4420,7 @@ List devices or files.
 With no arguments, print all devices known to GRUB.
 
 If the argument is a device name enclosed in parentheses (@pxref{Device
-syntax}), then print the name of the filesystem of that device.
+syntax}), then list all files at the root directory of that device.
 
 If the argument is a directory given as an absolute file name (@pxref{File
 name syntax}), then list the contents of that directory.
@@ -4939,8 +4883,7 @@ Alias for @code{hashsum --hash sha512 arg @dots{}}. See command @command{hashsum
 @deffn Command sleep [@option{--verbose}] [@option{--interruptible}] count
 Sleep for @var{count} seconds. If option @option{--interruptible} is given,
 allow @key{ESC} to interrupt sleep. With @option{--verbose} show countdown
-of remaining seconds. Exit code is set to 0 if timeout expired and to 1
+of remaining seconds.
-if timeout was interrupted by @key{ESC}.
 @end deffn
 
 
@@ -5994,21 +5937,9 @@ mounted on
 Recheck the device map, even if @file{/boot/grub/device.map} already
 exists. You should use this option whenever you add/remove a disk
 into/from your computer.
-
-@item --no-rs-codes
-By default on x86 BIOS systems, @command{grub-install} will use some
-extra space in the bootloader embedding area for Reed-Solomon
-error-correcting codes. This enables GRUB to still boot successfully
-if some blocks are corrupted.  The exact amount of protection offered
-is dependent on available space in the embedding area.  R sectors of
-redundancy can tolerate up to R/2 corrupted sectors. This
-redundancy may be cumbersome if attempting to cryptographically
-validate the contents of the bootloader embedding area, or in more
-modern systems with GPT-style partition tables (@pxref{BIOS
-installation}) where GRUB does not reside in any unpartitioned space
-outside of the MBR.  Disable the Reed-Solomon codes with this option.
 @end table
 
+
 @node Invoking grub-mkconfig
 @chapter Invoking grub-mkconfig
 
@@ -6385,7 +6316,7 @@ just do:
 @end group
 @end example
 
-Also, the latest version is available using Git. See
+Also, the latest version is available using Bazaar. See
 @uref{http://www.gnu.org/software/grub/grub-download.html} for more
 information.
 

docs/man/grub-file.h2m

@@ -1,2 +0,0 @@
-[NAME]
-grub-file \- check file type

docs/man/grub-macbless.h2m

@@ -1,4 +0,0 @@
-[NAME]
-grub-macbless \- bless a mac file/directory
-[SEE ALSO]
-.BR grub-install (1)

docs/man/grub-syslinux2cfg.h2m

@@ -1,4 +0,0 @@
-[NAME]
-grub-syslinux2cfg \- transform syslinux config into grub.cfg
-[SEE ALSO]
-.BR grub-menulst2cfg (8)

docs/osdetect.cfg

@@ -178,12 +178,6 @@ for dev in (*); do
     # uuid: filesystem UUID
     probe -s uuid -u $dev
 
-    if test -f ($device)/isolinux/isolinux.cfg ; then
-	menuentry "ISOLINUX config (on $device)" $device {
-	    set root=$2
-	    syslinux_configfile -i /isolinux/isolinux.cfg
-	}
-    fi
     if test -f ($device)/bootmgr -a -f ($device)/boot/bcd; then
 	menuentry "Windows Vista bootmgr (on $device)" $device {
 	    set root=$2

grub-core/Makefile.am

@@ -10,6 +10,10 @@ CCAS=$(TARGET_CC)
 RANLIB=$(TARGET_RANLIB)
 STRIP=$(TARGET_STRIP)
 
+if COND_HAVE_FONT_SOURCE
+TARGET_CFLAGS += -DUSE_ASCII_FALLBACK=1 -DHAVE_UNIFONT_WIDTHSPEC=1
+endif
+
 MACHO2IMG=$(top_builddir)/grub-macho2img
 
 AM_CFLAGS = $(TARGET_CFLAGS)
@@ -26,11 +30,8 @@ CFLAGS_LIBRARY += $(CFLAGS_PLATFORM) -fno-builtin
 CPPFLAGS_LIBRARY += $(CPPFLAGS_PLATFORM)
 CCASFLAGS_LIBRARY += $(CCASFLAGS_PLATFORM)
 
-build-grub-pep2elf: $(top_srcdir)/util/grub-pe2elf.c $(top_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c
-	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_BUILD=1 -DGRUB_TARGET_WORDSIZE=64 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-pep2elf\" $^
-
 build-grub-pe2elf: $(top_srcdir)/util/grub-pe2elf.c $(top_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c
-	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_BUILD=1 -DGRUB_TARGET_WORDSIZE=32 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-pe2elf\" $^
+	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-pe2elf\" $^
 
 # gentrigtables
 gentrigtables: gentrigtables.c
@@ -103,6 +104,7 @@ endif
 if COND_i386_coreboot
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/coreboot/lbio.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/i386/pc/int.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
@@ -112,6 +114,7 @@ endif
 
 if COND_i386_multiboot
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/i386/pc/int.h
 endif
 
 if COND_i386_qemu
@@ -170,6 +173,7 @@ endif
 if COND_mips_qemu_mips
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/keyboard_layouts.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/serial.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
@@ -181,6 +185,7 @@ if COND_mips_loongson
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/keyboard_layouts.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/time.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
@@ -221,19 +226,12 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/uboot/uboot.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/uboot/disk.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h
 endif
 
 if COND_arm_efi
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/efi/loader.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h
-endif
-
-if COND_arm64_efi
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
 endif
 
 if COND_emu
@@ -390,35 +388,41 @@ CLEANFILES += $(MOD_FILES)
 
 if COND_ENABLE_EFIEMU
 efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
-	-rm -f $@
+	-rm -f $@; \
-	-rm -f $@.bin
-	$(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m32 -Wall -Werror -nostdlib -static -O2 -c -o $@.bin $<
 	if test "x$(TARGET_APPLE_LINKER)" = x1; then \
-	  $(TARGET_OBJCONV) -felf32 -nu -nd $@.bin $@ || exit 1; \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m32 -Wall -Werror -nostdlib -O2 -c -o $@.bin $< || exit 1; \
-	  rm -f $@.bin ; \
+	  $(OBJCONV) -felf32 -nu -nd $@.bin $@ || exit 1; \
-	elif test ! -z "$(TARGET_OBJ2ELF)"; then \
-	  $(TARGET_OBJ2ELF) $@.bin || (rm -f $@.bin; exit 1); \
-	  mv $@.bin $@ ; \
-	else \
-	  mv $@.bin $@ ; \
-	fi
-
-# Link format -arch,x86_64 means Apple linker
-efiemu64_c.o: efiemu/runtime/efiemu.c
-	$(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -nostdlib -Wall -Werror -O2 -mcmodel=large -mno-red-zone -c -o $@ $<
-
-efiemu64_s.o: efiemu/runtime/efiemu.S
-	$(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -Wall -Werror -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $<
-
-efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF)
-	-rm -f $@
-	-rm -f $@.bin
-	$(TARGET_CC) -m64 $(EFIEMU64_LINK_FORMAT) -nostdlib -static -Wl,-r -o $@.bin $^
-	if test "x$(EFIEMU64_LINK_FORMAT)" = x-arch,x86_64; then \
-	  $(TARGET_OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \
 	  rm -f $@.bin; \
 	else \
-	  mv $@.bin $@ ; \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m32 -Wall -Werror -nostdlib -O2 -c -o $@ $< || exit 1; \
+	  if test ! -z "$(TARGET_OBJ2ELF)"; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
+	fi
+
+efiemu64_c.o: efiemu/runtime/efiemu.c
+	if test "x$(TARGET_APPLE_LINKER)" = x1; then \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -nostdlib -Wall -Werror -mno-red-zone -c -o $@ $< || exit 1; \
+	else \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -nostdlib -Wall -Werror -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
+	fi
+
+efiemu64_s.o: efiemu/runtime/efiemu.S
+	-rm -f $@
+	if test "x$(TARGET_APPLE_LINKER)" = x1; then \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -Wall -Werror -nostdlib -O2 -mno-red-zone -c -o $@ $< || exit 1; \
+	else \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -m64 -Wall -Werror -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
+	fi
+
+efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF)
+	-rm -f $@; \
+	if test "x$(TARGET_APPLE_LINKER)" = x1; then \
+	  rm -f $@.bin; \
+	  $(TARGET_CC) -m64 -Wl,-r -nostdlib -o $@.bin $^ || exit 1; \
+	  $(OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \
+	  rm -f $@.bin; \
+	else \
+	  $(TARGET_CC) -m64 -Wl,-melf_x86_64 -nostdlib -Wl,-r -o $@ $^ || exit 1; \
+	  if test ! -z "$(TARGET_OBJ2ELF)"; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
 	fi
 
 platform_DATA += efiemu32.o efiemu64.o

grub-core/Makefile.core.def

@@ -59,32 +59,25 @@ kernel = {
   ia64_efi_ldflags = '-Wl,-r,-d';
   ia64_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';
 
+  x86_64_xen_ldflags       = '-Wl,-Ttext=0';
   x86_64_xen_cppflags	   = '$(CPPFLAGS_XEN)';
+  i386_xen_ldflags       = '-Wl,-Ttext=0';
   i386_xen_cppflags	   = '$(CPPFLAGS_XEN)';
 
   arm_efi_ldflags          = '-Wl,-r,-d';
   arm_efi_stripflags       = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';
 
-  arm64_efi_ldflags          = '-Wl,-r,-d';
-  arm64_efi_stripflags       = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';
-
   i386_pc_ldflags          = '$(TARGET_IMG_LDFLAGS)';
   i386_pc_ldflags          = '$(TARGET_IMG_BASE_LDOPT),0x9000';
+
   i386_qemu_ldflags        = '$(TARGET_IMG_LDFLAGS)';
   i386_qemu_ldflags        = '$(TARGET_IMG_BASE_LDOPT),0x8200';
-  i386_coreboot_ldflags    = '$(TARGET_IMG_LDFLAGS)';
-  i386_coreboot_ldflags    = '$(TARGET_IMG_BASE_LDOPT),0x8200';
-  i386_multiboot_ldflags   = '$(TARGET_IMG_LDFLAGS)';
-  i386_multiboot_ldflags   = '$(TARGET_IMG_BASE_LDOPT),0x8200';
-  i386_ieee1275_ldflags    = '$(TARGET_IMG_LDFLAGS)';
-  i386_ieee1275_ldflags    = '$(TARGET_IMG_BASE_LDOPT),0x10000';
-  i386_xen_ldflags         = '$(TARGET_IMG_LDFLAGS)';
-  i386_xen_ldflags         = '$(TARGET_IMG_BASE_LDOPT),0';
-  x86_64_xen_ldflags       = '$(TARGET_IMG_LDFLAGS)';
-  x86_64_xen_ldflags       = '$(TARGET_IMG_BASE_LDOPT),0';
 
   ldadd = '$(LDADD_KERNEL)';
 
+  i386_coreboot_ldflags    = '-Wl,-Ttext=0x8200';
+  i386_multiboot_ldflags   = '-Wl,-Ttext=0x8200';
+  i386_ieee1275_ldflags    = '-Wl,-Ttext=0x10000';
   mips_loongson_ldflags    = '-Wl,-Ttext,0x80200000';
   powerpc_ieee1275_ldflags = '-Wl,-Ttext,0x200000';
   sparc64_ieee1275_ldflags = '-Wl,-Ttext,0x4400';
@@ -92,6 +85,7 @@ kernel = {
   mips_qemu_mips_ldflags    = '-Wl,-Ttext,0x80200000';
 
   mips_arc_cppflags = '-DGRUB_DECOMPRESSOR_LINK_ADDR=$(TARGET_DECOMPRESSOR_LINK_ADDR)';
+  mips_loongson_cppflags = '-DUSE_ASCII_FALLBACK';
   i386_qemu_cppflags     = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
   emu_cflags = '$(CFLAGS_GNULIB)';
   emu_cppflags = '$(CPPFLAGS_GNULIB)';
@@ -112,7 +106,6 @@ kernel = {
   powerpc_ieee1275_startup = kern/powerpc/ieee1275/startup.S;
   arm_uboot_startup = kern/arm/uboot/startup.S;
   arm_efi_startup = kern/arm/efi/startup.S;
-  arm64_efi_startup = kern/arm64/efi/startup.S;
 
   common = kern/command.c;
   common = kern/corecmd.c;
@@ -170,6 +163,7 @@ kernel = {
 
   efi = disk/efi/efidisk.c;
   efi = kern/efi/efi.c;
+  efi = kern/efi/efi_core.c;
   efi = kern/efi/init.c;
   efi = kern/efi/mm.c;
   efi = term/efi/console.c;
@@ -197,13 +191,10 @@ kernel = {
   ia64_efi = kern/ia64/efi/init.c;
   ia64_efi = kern/ia64/dl.c;
   ia64_efi = kern/ia64/dl_helper.c;
-  ia64_efi = kern/ia64/cache.c;
 
   arm_efi = kern/arm/efi/init.c;
   arm_efi = kern/arm/efi/misc.c;
 
-  arm64_efi = kern/arm/efi/init.c;
-
   i386_pc = kern/i386/pc/init.c;
   i386_pc = kern/i386/pc/mmap.c;
   i386_pc = term/i386/pc/console.c;
@@ -245,7 +236,6 @@ kernel = {
   mips_loongson = video/sm712.c;
   mips_loongson = video/sis315pro.c;
   mips_loongson = video/radeon_fuloong2e.c;
-  mips_loongson = video/radeon_yeeloong3a.c;
   extra_dist = video/sm712_init.c;
   extra_dist = video/sis315_init.c;
   mips_loongson = commands/keylayouts.c;
@@ -265,11 +255,6 @@ kernel = {
   arm = kern/arm/cache.c;
   arm = kern/arm/misc.S;
 
-  arm64 = kern/arm64/cache.c;
-  arm64 = kern/arm64/cache_flush.S;
-  arm64 = kern/arm64/dl.c;
-  arm64 = kern/arm64/dl_helper.c;
-
   emu = disk/host.c;
   emu = kern/emu/cache_s.S;
   emu = kern/emu/hostdisk.c;
@@ -288,9 +273,6 @@ kernel = {
   emu = osdep/emuconsole.c;
   extra_dist = osdep/unix/emuconsole.c;
   extra_dist = osdep/windows/emuconsole.c;
-  emu = osdep/dl.c;
-  extra_dist = osdep/unix/dl.c;
-  extra_dist = osdep/windows/dl.c;
   emu = osdep/sleep.c;
   emu = osdep/init.c;
   emu = osdep/emunet.c;
@@ -435,12 +417,22 @@ image = {
 
 image = {
   name = xz_decompress;
+  ia64_efi = kern/ia64/efi/startup.S;
+  i386_efi = kern/i386/efi/startup.S;
+  x86_64_efi = kern/x86_64/efi/startup.S;
+  arm_efi = kern/arm/efi/startup.S;
+
   mips = boot/mips/startup_raw.S;
+  mips = boot/mips/scratch.c;
   common = boot/decompressor/minilib.c;
   common = boot/decompressor/xz.c;
   common = lib/xzembed/xz_dec_bcj.c;
   common = lib/xzembed/xz_dec_lzma2.c;
   common = lib/xzembed/xz_dec_stream.c;
+  efi = boot/efi/decompressor.c;
+  efi = kern/efi/efi_core.c;
+
+  x86_64_efi = kern/x86_64/efi/callwrap.S;
 
   cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/xzembed -DGRUB_EMBED_DECOMPRESSOR=1';
 
@@ -449,6 +441,7 @@ image = {
   ldadd = '$(TARGET_LIBGCC)';
   cflags = '-Wno-unreachable-code $(TARGET_LDFLAGS_STATIC_LIBGCC)';
   enable = mips;
+  enable = efi;
 };
 
 image = {
@@ -623,6 +616,18 @@ module = {
   enable = xen;
 };
 
+module = {
+  name = check_nt_hiberfil;
+  common = commands/i386/nthibr.c;
+};
+
+library = {
+  name = libgnulib.a;
+  common = gnulib/regex.c;
+  cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
+};
+
 module = {
   name = cmostest;
   common = commands/i386/cmostest.c;
@@ -674,7 +679,8 @@ module = {
   name = regexp;
   common = commands/regexp.c;
   common = commands/wildcard.c;
-  common = gnulib/regex.c;
+  ldadd = libgnulib.a;
+  dependencies = libgnulib.a;
   cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
   cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
 };
@@ -757,7 +763,6 @@ module = {
   enable = mips_arc;
   enable = ia64_efi;
   enable = arm_efi;
-  enable = arm64_efi;
   enable = arm_uboot;
 };
 
@@ -853,7 +858,6 @@ module = {
   ia64_efi = lib/efi/reboot.c;
   x86_64_efi = lib/efi/reboot.c;
   arm_efi = lib/efi/reboot.c;
-  arm64_efi = lib/efi/reboot.c;
   powerpc_ieee1275 = lib/ieee1275/reboot.c;
   sparc64_ieee1275 = lib/ieee1275/reboot.c;
   mips_arc = lib/mips/arc/reboot.c;
@@ -1443,11 +1447,6 @@ module = {
   common = fs/zfs/zfsinfo.c;
 };
 
-module = {
-  name = macbless;
-  common = commands/macbless.c;
-};
-
 module = {
   name = pxe;
   i386_pc = net/drivers/i386/pc/pxe.c;
@@ -1579,7 +1578,6 @@ module = {
   extra_dist = lib/ia64/setjmp.S;
   extra_dist = lib/ia64/longjmp.S;
   extra_dist = lib/arm/setjmp.S;
-  extra_dist = lib/arm64/setjmp.S;
 };
 
 module = {
@@ -1621,14 +1619,6 @@ module = {
   enable = i386_pc;
 };
 
-
-module = {
-  name = truecrypt;
-  i386_pc = loader/i386/pc/truecrypt.c;
-  enable = i386_pc;
-};
-
-
 module = {
   name = freedos;
   i386_pc = loader/i386/pc/freedos.c;
@@ -1665,6 +1655,10 @@ module = {
   name = linux;
   x86 = loader/i386/linux.c;
   xen = loader/i386/xen.c;
+  xen = loader/i386/xen_file.c;
+  xen = loader/i386/xen_file32.c;
+  xen = loader/i386/xen_file64.c;
+  extra_dist = loader/i386/xen_fileXX.c;
   xen_cppflags	   = '$(CPPFLAGS_XEN)';
   i386_pc = lib/i386/pc/vesa_modes_table.c;
   mips = loader/mips/linux.c;
@@ -1672,8 +1666,7 @@ module = {
   sparc64_ieee1275 = loader/sparc64/ieee1275/linux.c;
   ia64_efi = loader/ia64/efi/linux.c;
   arm = loader/arm/linux.c;
-  arm64 = loader/arm64/linux.c;
+  arm = lib/fdt.c;
-  fdt = lib/fdt.c;
   common = loader/linux.c;
   common = lib/cmdline.c;
   enable = noemu;
@@ -1683,19 +1676,14 @@ module = {
   name = xnu;
   x86 = loader/xnu_resume.c;
   x86 = loader/i386/xnu.c;
+  x86 = loader/macho32.c;
+  x86 = loader/macho64.c;
+  x86 = loader/macho.c;
   x86 = loader/xnu.c;
+  x86 = loader/lzss.c;
 
-  enable = x86;
-};
-
-module = {
-  name = macho;
-
-  common = loader/macho.c;
-  common = loader/macho32.c;
-  common = loader/macho64.c;
-  common = loader/lzss.c;
   extra_dist = loader/machoXX.c;
+  enable = x86;
 };
 
 module = {
@@ -1732,7 +1720,6 @@ module = {
   enable = x86;
   enable = ia64_efi;
   enable = arm_efi;
-  enable = arm64_efi;
   enable = mips;
 };
 
@@ -1754,7 +1741,6 @@ module = {
   common = normal/term.c;
   common = normal/context.c;
   common = normal/charset.c;
-  common = lib/getline.c;
 
   common = script/main.c;
   common = script/script.c;
@@ -1944,11 +1930,6 @@ module = {
   common = tests/signatures.h;
 };
 
-module = {
-  name = sleep_test;
-  common = tests/sleep_test.c;
-};
-
 module = {
   name = xnu_uuid_test;
   common = tests/xnu_uuid_test.c;
@@ -2136,12 +2117,6 @@ module = {
   enable = xen;
 };
 
-module = {
-  name = syslinuxcfg;
-  common = lib/syslinux_parse.c;
-  common = commands/syslinuxcfg.c;
-};
-
 module = {
   name = test_blockarg;
   common = tests/test_blockarg.c;
@@ -2284,15 +2259,3 @@ module = {
   name = progress;
   common = lib/progress.c;
 };
-
-module = {
-  name = file;
-  common = commands/file.c;
-  common = commands/file32.c;
-  common = commands/file64.c;
-  extra_dist = commands/fileXX.c;
-  common = loader/i386/xen_file.c;
-  common = loader/i386/xen_file32.c;
-  common = loader/i386/xen_file64.c;
-  extra_dist = loader/i386/xen_fileXX.c;
-};

grub-core/boot/decompressor/minilib.c

@@ -79,24 +79,3 @@ void *memcpy (void *dest, const void *src, grub_size_t n)
 
 void *grub_decompressor_scratch;
 
-void
-find_scratch (void *src, void *dst, unsigned long srcsize,
-	      unsigned long dstsize)
-{
-#ifdef _mips
-  /* Decoding from ROM.  */
-  if (((grub_addr_t) src & 0x10000000))
-    {
-      grub_decompressor_scratch = (void *) ALIGN_UP((grub_addr_t) dst + dstsize,
-						    256);
-      return;
-    }
-#endif
-  if ((char *) src + srcsize > (char *) dst + dstsize)
-    grub_decompressor_scratch = (void *) ALIGN_UP ((grub_addr_t) src + srcsize,
-						   256);
-  else
-    grub_decompressor_scratch = (void *) ALIGN_UP ((grub_addr_t) dst + dstsize,
-						   256);
-  return;
-}

grub-core/boot/decompressor/scratch.c

@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2013  Free Software Foundation, Inc.
+ *  Copyright (C) 2010,2013  Free Software Foundation, Inc.
  *
  *  GRUB is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,22 +16,19 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GRUB_SYSLINUX_PARSE_HEADER
-#define GRUB_SYSLINUX_PARSE_HEADER 1
-
 #include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/decompressor.h>
 
-typedef enum
+void
-  {
+find_scratch (void *src, void *dst, unsigned long srcsize,
-    GRUB_SYSLINUX_UNKNOWN,
+	      unsigned long dstsize)
-    GRUB_SYSLINUX_ISOLINUX,
+{
-    GRUB_SYSLINUX_PXELINUX,
+  if ((char *) src + srcsize > (char *) dst + dstsize)
-    GRUB_SYSLINUX_SYSLINUX,
+    grub_decompressor_scratch = (void *) ALIGN_UP ((grub_addr_t) src + srcsize,
-  } grub_syslinux_flavour_t;
+						   256);
-
+  else
-char *
+    grub_decompressor_scratch = (void *) ALIGN_UP ((grub_addr_t) dst + dstsize,
-grub_syslinux_config_file (const char *root, const char *target_root,
+						   256);
-			   const char *cwd, const char *target_cwd,
+  return;
-			   const char *fname, grub_syslinux_flavour_t flav);
+}
-
-#endif

grub-core/boot/efi/decompressor.c

@@ -0,0 +1,116 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2013  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/kernel.h>
+#include <grub/efi/efi.h>
+#include <grub/decompressor.h>
+
+/* The handle of GRUB itself. Filled in by the startup code.  */
+grub_efi_handle_t grub_efi_image_handle;
+
+/* The pointer to a system table. Filled in by the startup code.  */
+grub_efi_system_table_t *grub_efi_system_table;
+
+int
+grub_strcmp (const char *s1, const char *s2)
+{
+  while (*s1 && *s2)
+    {
+      if (*s1 != *s2)
+	break;
+
+      s1++;
+      s2++;
+    }
+
+  return (int) (grub_uint8_t) *s1 - (int) (grub_uint8_t) *s2;
+}
+
+static grub_size_t unc_pages, scratch_pages;
+static void *unc;
+
+void
+grub_efi_fini (void)
+{
+  if (unc)
+    grub_efi_free_pages ((grub_addr_t) unc, unc_pages);
+  if (grub_decompressor_scratch)
+    grub_efi_free_pages ((grub_addr_t) grub_decompressor_scratch,
+			 scratch_pages);
+}
+
+void
+find_scratch (void *src __attribute__ ((unused)),
+	      void *dst __attribute__ ((unused)),
+	      unsigned long srcsize __attribute__ ((unused)),
+	      unsigned long dstsize __attribute__ ((unused)))
+{
+}
+
+void __attribute__ ((noreturn))
+grub_main (void)
+{
+  grub_addr_t start;
+  grub_size_t sz;
+  grub_addr_t unc_size;
+  grub_efi_boot_services_t *b;
+  grub_efi_status_t status;
+  grub_efi_uintn_t exit_data_size;
+  grub_efi_char16_t *exit_data = 0;
+  grub_efi_handle_t image_handle;
+  grub_efi_loaded_image_t *image;
+
+  b = grub_efi_system_table->boot_services;
+
+  if (!grub_efi_get_section ("payload", &start, &sz)
+      || sz < 12)
+    grub_exit ();
+  if (grub_memcmp ((void *) start, "COMPRESS", 8) != 0)
+    grub_exit ();
+  unc_size = grub_get_unaligned32 ((char *) start + 8);
+
+  unc_pages = (unc_size + 0xfff) >> 12;
+
+  unc = grub_efi_allocate_pages (0, unc_pages);
+  if (!unc)
+    grub_exit ();
+
+  scratch_pages = 0x200000 >> 12;
+  grub_decompressor_scratch = grub_efi_allocate_pages (0, scratch_pages);
+  if (!grub_decompressor_scratch)
+    grub_exit ();
+
+  grub_decompress_core ((char *) start + 12, unc, sz - 12,
+			unc_size);
+
+  image = grub_efi_get_loaded_image (grub_efi_image_handle);
+
+  status = efi_call_6 (b->load_image, 0, grub_efi_image_handle,
+		       image->file_path, unc, unc_size, &image_handle);
+  if (status != GRUB_EFI_SUCCESS)
+    efi_call_4 (grub_efi_system_table->boot_services->exit,
+		grub_efi_image_handle, status, 0, 0);
+
+  status = efi_call_3 (b->start_image, image_handle, &exit_data_size, &exit_data);
+
+  efi_call_4 (grub_efi_system_table->boot_services->exit,
+              grub_efi_image_handle, status, exit_data_size, exit_data);
+
+  grub_exit ();
+}
+

grub-core/boot/i386/pc/boot.S

@@ -31,32 +31,27 @@
 	.macro floppy
 part_start:
 
-LOCAL(probe_values):
+probe_values:
 	.byte	36, 18, 15, 9, 0
 
 LOCAL(floppy_probe):
-	pushw	%dx
 /*
  *  Perform floppy probe.
  */
-#ifdef __APPLE__
+
-	LOCAL(probe_values_minus_one) = LOCAL(probe_values) - 1
+	movw	$probe_values - 1, %si
-	movw	MACRO_DOLLAR(LOCAL(probe_values_minus_one)), %si
-#else
-	movw	MACRO_DOLLAR(LOCAL(probe_values)) - 1, %si
-#endif
 
 LOCAL(probe_loop):
 	/* reset floppy controller INT 13h AH=0 */
 	xorw	%ax, %ax
-	int	MACRO_DOLLAR(0x13)
+	int	$0x13
 
 	incw	%si
 	movb	(%si), %cl
 
 	/* if number of sectors is 0, display error and die */
-	testb	%cl, %cl
+	cmpb	$0, %cl
-	jnz	1f
+	jne	1f
 
 /*
  * Floppy disk probe failure.
@@ -69,20 +64,20 @@ fd_probe_error_string:	.asciz "Floppy"
 
 1:
 	/* perform read */
-	movw	MACRO_DOLLAR(GRUB_BOOT_MACHINE_BUFFER_SEG), %bx
+	movw	$GRUB_BOOT_MACHINE_BUFFER_SEG, %bx
 	movw	%bx, %es
 	xorw	%bx, %bx
-	movw	MACRO_DOLLAR(0x201), %ax
+	movw	$0x201, %ax
-	movb	MACRO_DOLLAR(0), %ch
+	movb	$0, %ch
-	movb	MACRO_DOLLAR(0), %dh
+	movb	$0, %dh
-	int	MACRO_DOLLAR(0x13)
+	int	$0x13
 
 	/* if error, jump to "LOCAL(probe_loop)" */
 	jc	LOCAL(probe_loop)
 
 	/* %cl is already the correct value! */
-	movb	MACRO_DOLLAR(1), %dh
+	movb	$1, %dh
-	movb	MACRO_DOLLAR(79), %ch
+	movb	$79, %ch
 
 	jmp	LOCAL(final_init)
 	.endm
@@ -185,9 +180,7 @@ kernel_address:
 #ifndef HYBRID_BOOT
 	. = _start + GRUB_BOOT_MACHINE_KERNEL_SECTOR
 kernel_sector:
-	.long	1
+	.long	1, 0
-kernel_sector_high:
-	.long	0
 #endif
 
 	. = _start + GRUB_BOOT_MACHINE_BOOT_DRIVE
@@ -292,7 +285,7 @@ lba_mode:
 	/* the absolute address */
 	movl	kernel_sector, %ebx
 	movl	%ebx, 8(%si)
-	movl	kernel_sector_high, %ebx
+	movl	kernel_sector + 4, %ebx
 	movl	%ebx, 12(%si)
 
 	/* the segment of buffer address */
@@ -325,12 +318,11 @@ LOCAL(chs_mode):
 	int	$0x13
 	jnc	LOCAL(final_init)
 
-	popw	%dx
 	/*
 	 *  The call failed, so maybe use the floppy probe instead.
 	 */
-	testb	%dl, %dl
+	testb	$GRUB_BOOT_MACHINE_BIOS_HD_FLAG, %dl
-	jnb	LOCAL(floppy_probe)
+	jz	LOCAL(floppy_probe)
 
 	/* Nope, we definitely have a hard disk, and we're screwed. */
 	ERR(hd_probe_error_string)
@@ -361,7 +353,7 @@ LOCAL(final_init):
 
 setup_sectors:
 	/* load logical sector start (top half) */
-	movl	kernel_sector_high, %eax
+	movl	kernel_sector + 4, %eax
 
 	orl	%eax, %eax
 	jnz	LOCAL(geometry_error)
@@ -513,9 +505,7 @@ LOCAL(message):
 #ifdef HYBRID_BOOT
 	. = _start + 0x1b0
 kernel_sector:
-	.long	1
+	.long	1, 0
-kernel_sector_high:
-	.long	0
 #endif
 	. = _start + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC
 nt_magic:

grub-core/boot/i386/qemu/boot.S

@@ -18,6 +18,7 @@
 
 #include <config.h>
 #include <grub/symbol.h>
+#include <grub/i386/pc/memory.h>
 #include <grub/machine/memory.h>
 #include <grub/machine/boot.h>
 #include <grub/machine/kernel.h>
@@ -58,7 +59,7 @@ VARIABLE(grub_core_entry_addr)
 	orb	$0x02, %al
 	outb	$0x92
 1:
-	movl	EXT_C(grub_core_entry_addr), %edx
+	movl	grub_core_entry_addr, %edx
 	jmp	*%edx
 
 #include "../../../kern/i386/realmode.S"

grub-core/boot/mips/loongson/fwstart.S

@@ -63,18 +63,18 @@ __start:
 	   This way we don't need to sacrifice a register for it.  */
 retry_cs5536:	
 	/* We have only one bus (0). Function is 0.  */
-	lui $t0, %hi(GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR_2F)
+	lui $t0, %hi(GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR)
-	lui $t1, %hi(GRUB_MACHINE_PCI_CONFSPACE_2F)
+	lui $t1, %hi(GRUB_MACHINE_PCI_CONFSPACE)
 	lui $t3, %hi(GRUB_CS5536_PCIID)
 	addiu $t3, $t3, %lo(GRUB_CS5536_PCIID)
 	ori $t4, $zero, 1
 1:
-	andi $t4, $t4, ((1 << GRUB_PCI_NUM_DEVICES_2F) - 1)
+	andi $t4, $t4, ((1 << GRUB_PCI_NUM_DEVICES) - 1)
 	/* In case of failure try again. CS5536 may be slow to come up.  */
 	beql  $t4, $zero, retry_cs5536
 	 nop
-	sw   $t4, %lo(GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR_2F) ($t0)
+	sw   $t4, %lo(GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR) ($t0)
-	lw   $t2, (%lo(GRUB_MACHINE_PCI_CONFSPACE_2F) + GRUB_PCI_REG_PCI_ID) ($t1)
+	lw   $t2, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_PCI_REG_PCI_ID) ($t1)
 	bnel  $t2, $t3, 1b
 	 sll $t4, $t4, 1
 
@@ -86,9 +86,9 @@ retry_cs5536:
 	 move $a0, $t4
 #endif
 
-	lui $t0, %hi(GRUB_MACHINE_PCI_CONFSPACE_2F)
+	lui $t0, %hi(GRUB_MACHINE_PCI_CONFSPACE)
 	li  $t1, GRUB_CS5536_MSR_MAILBOX_CONFIG_ENABLED
-	sw  $t1, (%lo(GRUB_MACHINE_PCI_CONFSPACE_2F) + GRUB_CS5536_MSR_MAILBOX_CONFIG) ($t0)
+	sw  $t1, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_CS5536_MSR_MAILBOX_CONFIG) ($t0)
 	
 	/* Set GPIO LBAR.  */
 	lui $a0, %hi(GRUB_CS5536_MSR_GPIO_BAR)
@@ -121,21 +121,21 @@ retry_cs5536:
 	bal message
 	  addiu $a0, $a0, %lo(smbus_enabled)
 
-	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS)
+	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS)
 
 	/* Disable SMB.  */
-	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL2) ($t0)
+	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL2) ($t0)
 
 	/* Disable interrupts.  */
-	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1) ($t0)
+	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1) ($t0)
 
 	/* Set as master.  */
-	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_ADDR) ($t0)
+	sb $zero, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_ADDR) ($t0)
 
 	/* Launch SMBus controller at slowest speed possible.  */
 	ori $t1, $zero, 0xff
-	sb $t1, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL3) ($t0)
+	sb $t1, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL3) ($t0)
-	sb $t1, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL2) ($t0)
+	sb $t1, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL2) ($t0)
 
 	/* Yeeloong and Fuloong2f have only one memory slot.  */
 	/* Output first byte on serial for debugging.  */
@@ -237,8 +237,8 @@ other_exception:
 	 addiu $a0, $a0, %lo(unhandled_exception)
 
 gpio_init:
-	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_GPIO)
+	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO)
-	addiu  $t0, $t0, %lo(GRUB_MACHINE_PCI_IO_BASE_2F + GRUB_CS5536_LBAR_GPIO)
+	addiu  $t0, $t0, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO)
 	lui $t1, %hi (gpio_dump)
 	addiu $t1, $t1, %lo (gpio_dump)
 
@@ -368,18 +368,18 @@ self:
            Clobbered:	 $t0
 	*/
 wrmsr:
-	lui $t0, %hi(GRUB_MACHINE_PCI_CONFSPACE_2F)
+	lui $t0, %hi(GRUB_MACHINE_PCI_CONFSPACE)
-	sw  $a0, (%lo(GRUB_MACHINE_PCI_CONFSPACE_2F) + GRUB_CS5536_MSR_MAILBOX_ADDR) ($t0)
+	sw  $a0, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_CS5536_MSR_MAILBOX_ADDR) ($t0)
-	sw  $a1, (%lo(GRUB_MACHINE_PCI_CONFSPACE_2F) + GRUB_CS5536_MSR_MAILBOX_DATA0) ($t0)
+	sw  $a1, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_CS5536_MSR_MAILBOX_DATA0) ($t0)
 	jr $ra
-	 sw  $a2, (%lo(GRUB_MACHINE_PCI_CONFSPACE_2F) + GRUB_CS5536_MSR_MAILBOX_DATA1) ($t0)
+	 sw  $a2, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_CS5536_MSR_MAILBOX_DATA1) ($t0)
 
 	/* Wait for SMBus data or empty transmitter.  */
 	/* In: $a0 = exception handler. Out: none. Clobbered: $t0, $t1  */
 smbus_wait:
 1:	
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_STATUS + GRUB_MACHINE_PCI_IO_BASE_2F)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_STATUS + GRUB_MACHINE_PCI_IO_BASE)
-	lb $t0, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_STATUS + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lb $t0, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_STATUS + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	andi $t1, $t0, GRUB_CS5536_SMB_REG_STATUS_SDAST
 	bne $t1, $zero, return
 	 nop
@@ -401,52 +401,52 @@ read_spd:
 	addiu $a0, $a0, %hi(read_spd_fail)
 
 	/* Send START.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE)
-	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	ori $t1, $t1, GRUB_CS5536_SMB_REG_CTRL1_START
 	bal smbus_wait
-	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	
 	/* Send device address.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
 	sll $t1, $a1, 1
 	bal smbus_wait
-	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 
 	/* Send ACK.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE)
-	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	ori $t1, $t1, GRUB_CS5536_SMB_REG_CTRL1_ACK
-	sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 
 	/* Send byte address.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
 	bal smbus_wait
-	 sb $t2, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t2, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 
 	/* Send START.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE)
-	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	ori $t1, $t1, GRUB_CS5536_SMB_REG_CTRL1_START
 	bal smbus_wait
-	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 
 	/* Send device address.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
 	sll $t1, $a1, 1
 	ori $t1, $t1, 1
 	bal smbus_wait
-	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 
 	/* Send STOP.  */
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE)
-	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	ori $t1, $t1, GRUB_CS5536_SMB_REG_CTRL1_STOP
 	bal smbus_wait
-	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1 + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 
-	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F)
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
-	lb $v0, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE_2F) ($t0)
+	lb $v0, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 	jr $t3
 	 andi $v0, $v0, 0xff
 read_spd_fail:

grub-core/boot/mips/scratch.c

@@ -1,7 +1,6 @@
-/* init.c - initialize an ia64-based EFI system */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008  Free Software Foundation, Inc.
+ *  Copyright (C) 2010,2013  Free Software Foundation, Inc.
  *
  *  GRUB is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,18 +17,26 @@
  */
 
 #include <grub/types.h>
-#include <grub/cache.h>
+#include <grub/misc.h>
+#include <grub/decompressor.h>
 
 void
-grub_arch_sync_caches (void *address, grub_size_t len)
+find_scratch (void *src, void *dst, unsigned long srcsize,
+	      unsigned long dstsize)
 {
-  /* Cache line length is at least 32.  */
+  /* Decoding from ROM.  */
-  len += (grub_uint64_t)address & 0x1f;
+  if (((grub_addr_t) src & 0x10000000))
-  grub_uint64_t a = (grub_uint64_t)address & ~0x1f;
+    {
+      grub_decompressor_scratch = (void *) ALIGN_UP((grub_addr_t) dst + dstsize,
+						    256);
+      return;
+    }
 
-  /* Flush data.  */
+  if ((char *) src + srcsize > (char *) dst + dstsize)
-  for (len = (len + 31) & ~0x1f; len > 0; len -= 0x20, a += 0x20)
+    grub_decompressor_scratch = (void *) ALIGN_UP ((grub_addr_t) src + srcsize,
-    asm volatile ("fc.i %0" : : "r" (a));
+						   256);
-  /* Sync and serialize.  Maybe extra.  */
+  else
-  asm volatile (";; sync.i;; srlz.i;;");
+    grub_decompressor_scratch = (void *) ALIGN_UP ((grub_addr_t) dst + dstsize,
+						   256);
+  return;
 }

grub-core/boot/mips/startup_raw.S

@@ -27,7 +27,6 @@
 
 .extern __bss_start
 .extern _end
-.extern _edata
 
 	.globl __start, _start, start
 	.set noreorder
@@ -249,9 +248,8 @@ cmdlinedone:
 #include "../../kern/mips/cache_flush.S"
 
 	/* Decompress the payload. */
-	lui $a0, %hi(_edata)
+	lui $a0, %hi(__bss_start)
-	addiu $a0, $a0, %lo(_edata)
+	addiu $a0, $a0, %lo(__bss_start)
-
 	lui $t0, %hi(base)
 	addiu $t0, $t0, %lo(base)
 	subu $a0, $a0, $t0
@@ -267,16 +265,16 @@ cmdlinedone:
 	*/
 	move $s6, $a3
 
-	lui $t9, %hi(EXT_C(grub_decompress_core))
+	lui $t0, %hi(EXT_C(grub_decompress_core))
-	addiu $t9, $t9, %lo(EXT_C(grub_decompress_core))
+	addiu $t0, $t0, %lo(EXT_C(grub_decompress_core))
 
 #ifdef GRUB_MACHINE_ARC
 	lui $sp, %hi(_start - 512)
-	jalr $t9
+	jalr $t0
 	 addiu $sp, $sp, %lo(_start - 512)
 #else
 	lui $sp, %hi(_start - 256)
-	jalr $t9
+	jalr $t0
 	 addiu $sp, $sp, %lo(_start - 256)
 #endif	
 	move $a0, $s1
@@ -289,11 +287,3 @@ cmdlinedone:
 
 	jr $t1
 	 nop
-	/* Ensure that .data section is created. In code we suppose that _edata
-	   is first location not in decompressor image. Strictly speaking it's
-	   _edata only when .data is present and _etext otherwise. But checking
-	   for .data presence would cost more in code than it is to ensure that
-	   .data is created.
-	*/
-	.data
-	.long 0

grub-core/boot/sparc64/ieee1275/boot.S

@@ -44,11 +44,11 @@ pic_base:
 	. = _start + GRUB_BOOT_MACHINE_BOOT_DEVPATH
 boot_path:
 	. = _start + GRUB_BOOT_MACHINE_KERNEL_BYTE
-boot_path_end:
 kernel_byte:		.xword (2 << 9)
+boot_path_end:
 kernel_address:		.word  GRUB_BOOT_MACHINE_KERNEL_ADDR
 #else
-#define boot_path (_start + 512 + SCRATCH_PAD_BOOT_SIZE)
+#define boot_path (_start + 512)
 #define boot_path_end (_start + 1024)
 #include <grub/offsets.h>
 
@@ -140,11 +140,7 @@ prom_call:
 
 boot_continue:
 	mov	%o7, PIC_REG		/* PIC base */
-#ifndef CDBOOT
 	sethi	%hi(SCRATCH_PAD_BOOT), %l1	/* OF argument slots */
-#else
-	GET_ABS(_start + 512, %l1)	/* OF argument slots */
-#endif
 
 	/* Find the /chosen node so we can fetch the stdout handle,
 	 * and thus perform console output.

grub-core/bus/bonito.c

@@ -30,66 +30,8 @@ static grub_addr_t addr_win[GRUB_MACHINE_PCI_NUM_WIN] =
   {GRUB_MACHINE_PCI_WIN1_ADDR, GRUB_MACHINE_PCI_WIN2_ADDR,
    GRUB_MACHINE_PCI_WIN3_ADDR};
 
-grub_bonito_type_t grub_bonito_type;
-
-static volatile void *
-config_addr (grub_pci_address_t addr)
-{
-  if (grub_bonito_type == GRUB_BONITO_2F)
-    {
-      GRUB_MACHINE_PCI_CONF_CTRL_REG_2F = 1 << ((addr >> 11) & 0xf);
-      return (volatile void *) (GRUB_MACHINE_PCI_CONFSPACE_2F
-				| (addr & 0x07ff));
-    }
-  else
-    {
-
-      if (addr >> 16)
-	return (volatile void *) (GRUB_MACHINE_PCI_CONFSPACE_3A_EXT | addr);
-      else
-	return (volatile void *) (GRUB_MACHINE_PCI_CONFSPACE_3A | addr);
-    }
-}
-
-grub_uint32_t
-grub_pci_read (grub_pci_address_t addr)
-{
-  return *(volatile grub_uint32_t *) config_addr (addr);
-}
-
-grub_uint16_t
-grub_pci_read_word (grub_pci_address_t addr)
-{
-  return *(volatile grub_uint16_t *) config_addr (addr);
-}
-
-grub_uint8_t
-grub_pci_read_byte (grub_pci_address_t addr)
-{
-  return *(volatile grub_uint8_t *) config_addr (addr);
-}
-
-void
-grub_pci_write (grub_pci_address_t addr, grub_uint32_t data)
-{
-  *(volatile grub_uint32_t *) config_addr (addr) = data;
-}
-
-void
-grub_pci_write_word (grub_pci_address_t addr, grub_uint16_t data)
-{
-  *(volatile grub_uint16_t *) config_addr (addr) = data;
-}
-
-void
-grub_pci_write_byte (grub_pci_address_t addr, grub_uint8_t data)
-{
-  *(volatile grub_uint8_t *) config_addr (addr) = data;
-}
-
-
 static inline void
-write_bases_2f (void)
+write_bases (void)
 {
   int i;
   grub_uint32_t reg = 0;
@@ -97,54 +39,38 @@ write_bases_2f (void)
     reg |= (((base_win[i] >> GRUB_MACHINE_PCI_WIN_SHIFT) 
 	     & GRUB_MACHINE_PCI_WIN_MASK) 
 	    << (i * GRUB_MACHINE_PCI_WIN_MASK_SIZE));
-  GRUB_MACHINE_PCI_IO_CTRL_REG_2F = reg;
+  GRUB_MACHINE_PCI_IO_CTRL_REG = reg;
 }
 
 volatile void *
 grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),
 			   grub_addr_t base, grub_size_t size)
 {
-  if (grub_bonito_type == GRUB_BONITO_2F)
+  int i;
-    {
+  grub_addr_t newbase;
-      int i;
-      grub_addr_t newbase;
 
-      /* First try already used registers. */
+  /* First try already used registers. */
-      for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
+  for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
-	if (usage_win[i] && base_win[i] <= base 
+    if (usage_win[i] && base_win[i] <= base 
-	    && base_win[i] + sizes_win[i] > base + size)
+	&& base_win[i] + sizes_win[i] > base + size)
-	  {
+      {
-	    usage_win[i]++;
+	usage_win[i]++;
-	    return (void *) 
+	return (void *) 
-	      (addr_win[i] | (base & GRUB_MACHINE_PCI_WIN_OFFSET_MASK));
+	  (addr_win[i] | (base & GRUB_MACHINE_PCI_WIN_OFFSET_MASK));
-	  }
+      }
-      /* Map new register.  */
+  /* Map new register.  */
-      newbase = base & ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK;
+  newbase = base & ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK;
-      for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
+  for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
-	if (!usage_win[i] && newbase <= base 
+    if (!usage_win[i] && newbase <= base 
-	    && newbase + sizes_win[i] > base + size)
+	&& newbase + sizes_win[i] > base + size)
-	  {
+      {
-	    usage_win[i]++;
+	usage_win[i]++;
-	    base_win[i] = newbase;
+	base_win[i] = newbase;
-	    write_bases_2f ();
+	write_bases ();
-	    return (void *) 
+	return (void *) 
-	      (addr_win[i] | (base & GRUB_MACHINE_PCI_WIN_OFFSET_MASK));
+	  (addr_win[i] | (base & GRUB_MACHINE_PCI_WIN_OFFSET_MASK));
-	  }
+      }
-      grub_fatal ("Out of PCI windows.");
+  grub_fatal ("Out of PCI windows.");
-    }
-  else
-    {
-      int region = 0;
-      if (base >= 0x10000000
-	  && base + size <= 0x18000000)
-	region = 1;
-      if (base >= 0x1c000000
-	  && base + size <= 0x1f000000)
-	region = 2;
-      if (region == 0)
-	grub_fatal ("Attempt to map out of regions");
-      return (void *) (0xa0000000 | base);
-    }
 }
 
 void *
@@ -160,17 +86,14 @@ grub_pci_device_unmap_range (grub_pci_device_t dev __attribute__ ((unused)),
 			     volatile void *mem,
 			     grub_size_t size __attribute__ ((unused)))
 {
-  if (grub_bonito_type == GRUB_BONITO_2F)
+  int i;
-    {
+  for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
-      int i;
+    if (usage_win[i] && addr_win[i] 
-      for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
+	== (((grub_addr_t) mem | 0x20000000)
-	if (usage_win[i] && addr_win[i] 
+	    & ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK))
-	    == (((grub_addr_t) mem | 0x20000000)
+      {
-		& ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK))
+	usage_win[i]--;
-	  {
+	return;
-	    usage_win[i]--;
+      }
-	    return;
+  grub_fatal ("Tried to unmap not mapped region");
-	  }
-      grub_fatal ("Tried to unmap not mapped region");
-    }
 }

grub-core/bus/usb/ehci.c

@@ -534,20 +534,11 @@ grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
 			"EHCI grub_ehci_pci_iter: registers above 4G are not supported\n");
 	  return 0;
 	}
-      base &= GRUB_PCI_ADDR_MEM_MASK;
-      if (!base)
-	{
-	  grub_dprintf ("ehci",
-			"EHCI: EHCI is not mapped\n");
-	  return 0;
-	}
 
       /* Set bus master - needed for coreboot, VMware, broken BIOSes etc. */
       addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
       grub_pci_write_word(addr,
-			  GRUB_PCI_COMMAND_MEM_ENABLED
+          GRUB_PCI_COMMAND_BUS_MASTER | grub_pci_read_word(addr));
-			  | GRUB_PCI_COMMAND_BUS_MASTER
-			  | grub_pci_read_word(addr));
       
       grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: 32-bit EHCI OK\n");
     }
@@ -1513,7 +1504,7 @@ grub_ehci_check_transfer (grub_usb_controller_t dev,
   struct grub_ehci *e = dev->data;
   struct grub_ehci_transfer_controller_data *cdata =
     transfer->controller_data;
-  grub_uint32_t token, token_ftd;
+  grub_uint32_t token;
 
   grub_dprintf ("ehci",
 		"check_transfer: EHCI STATUS=%08x, cdata=%p, qh=%p\n",
@@ -1541,18 +1532,13 @@ grub_ehci_check_transfer (grub_usb_controller_t dev,
     return grub_ehci_parse_notrun (dev, transfer, actual);
 
   token = grub_le_to_cpu32 (cdata->qh_virt->td_overlay.token);
-  /* If the transfer consist from only one TD, we should check */
-  /* if the TD was really executed and deactivated - to prevent */
-  /* false detection of transfer finish. */
-  token_ftd = grub_le_to_cpu32 (cdata->td_first_virt->token);
 
   /* Detect QH halted */
   if ((token & GRUB_EHCI_STATUS_HALTED) != 0)
     return grub_ehci_parse_halt (dev, transfer, actual);
 
   /* Detect QH not active - QH is not active and no next TD */
-  if (token && ((token & GRUB_EHCI_STATUS_ACTIVE) == 0)
+  if ((token & GRUB_EHCI_STATUS_ACTIVE) == 0)
-	&& ((token_ftd & GRUB_EHCI_STATUS_ACTIVE) == 0))
     {
       /* It could be finish at all or short packet condition */
       if ((grub_le_to_cpu32 (cdata->qh_virt->td_overlay.next_td)

grub-core/bus/usb/ohci.c

@@ -47,7 +47,7 @@ struct grub_ohci_hcca
   grub_uint32_t donehead;
 
   grub_uint8_t reserved[116];
-} GRUB_PACKED;
+} __attribute__((packed));
 
 /* OHCI General Transfer Descriptor */
 struct grub_ohci_td
@@ -64,7 +64,7 @@ struct grub_ohci_td
                                * physical address in CPU endian */
   grub_uint32_t tr_index; /* index of TD in transfer */
   grub_uint8_t pad[8 - sizeof (volatile struct grub_ohci_td *)]; /* padding to 32 bytes */
-} GRUB_PACKED;
+} __attribute__((packed));
 
 /* OHCI Endpoint Descriptor.  */
 struct grub_ohci_ed
@@ -73,7 +73,7 @@ struct grub_ohci_ed
   grub_uint32_t td_tail;
   grub_uint32_t td_head;
   grub_uint32_t next_ed;
-} GRUB_PACKED;
+} __attribute__((packed));
 
 typedef volatile struct grub_ohci_td *grub_ohci_td_t;
 typedef volatile struct grub_ohci_ed *grub_ohci_ed_t;
@@ -265,20 +265,16 @@ grub_ohci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
       addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
       base = grub_pci_read (addr);
 
-      base &= GRUB_PCI_ADDR_MEM_MASK;
+#if 0
-      if (!base)
+      /* Stop if there is no IO space base address defined.  */
-	{
+      if (! (base & 1))
-	  grub_dprintf ("ehci",
+	return 0;
-			"EHCI: EHCI is not mapper\n");
+#endif
-	  return 0;
-	}
 
       /* Set bus master - needed for coreboot, VMware, broken BIOSes etc. */
       addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
       grub_pci_write_word(addr,
-			  GRUB_PCI_COMMAND_MEM_ENABLED
+          GRUB_PCI_COMMAND_BUS_MASTER | grub_pci_read_word(addr));
-			  | GRUB_PCI_COMMAND_BUS_MASTER
-			  | grub_pci_read_word(addr));
 
       grub_dprintf ("ohci", "class=0x%02x 0x%02x interface 0x%02x\n",
 		    class, subclass, interf);

grub-core/bus/usb/serial/pl2303.c

@@ -55,7 +55,7 @@ struct grub_pl2303_config
   grub_uint8_t stop_bits;
   grub_uint8_t parity;
   grub_uint8_t word_len;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 static void
 real_config (struct grub_serial_port *port)

grub-core/bus/usb/uhci.c

@@ -105,7 +105,7 @@ struct grub_uhci_qh
   /* Queue heads are aligned on 16 bytes, pad so a queue head is 16
      bytes so we can store many in a 4K page.  */
   grub_uint8_t pad[8];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* UHCI Transfer Descriptor.  */
 struct grub_uhci_td
@@ -129,7 +129,7 @@ struct grub_uhci_td
 
   /* 3 additional 32 bits words reserved for the Host Controller Driver.  */
   grub_uint32_t data[3];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 typedef volatile struct grub_uhci_td *grub_uhci_td_t;
 typedef volatile struct grub_uhci_qh *grub_uhci_qh_t;
@@ -217,6 +217,12 @@ grub_uhci_pci_iter (grub_pci_device_t dev,
   if (class != 0x0c || subclass != 0x03 || interf != 0x00)
     return 0;
 
+  /* Set bus master - needed for coreboot or broken BIOSes */
+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
+  grub_pci_write_word(addr, GRUB_PCI_COMMAND_IO_ENABLED
+		      | GRUB_PCI_COMMAND_BUS_MASTER
+		      | grub_pci_read_word (addr));
+
   /* Determine IO base address.  */
   addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG4);
   base = grub_pci_read (addr);
@@ -227,13 +233,6 @@ grub_uhci_pci_iter (grub_pci_device_t dev,
   if ((base & GRUB_UHCI_IOMASK) == 0)
     return 0;
 
-  /* Set bus master - needed for coreboot or broken BIOSes */
-  addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
-  grub_pci_write_word(addr, GRUB_PCI_COMMAND_IO_ENABLED
-		      | GRUB_PCI_COMMAND_BUS_MASTER
-		      | GRUB_PCI_COMMAND_MEM_ENABLED
-		      | grub_pci_read_word (addr));
-
   grub_dprintf ("uhci", "base = %x\n", base);
 
   /* Allocate memory for the controller and register it.  */

grub-core/commands/acpi.c

@@ -227,7 +227,7 @@ grub_acpi_create_ebda (void)
 	    grub_dprintf ("acpi", "Copying rsdpv2 to %p\n", target);
 	    v2inebda = target;
 	    target += v2->length;
-	    target = (grub_uint8_t *) ((((grub_addr_t) target - 1) | 0xf) + 1);
+	    target = (grub_uint8_t *) ((((long) target - 1) | 0xf) + 1);
 	    v2 = 0;
 	    break;
 	  }
@@ -246,7 +246,7 @@ grub_acpi_create_ebda (void)
 	    grub_dprintf ("acpi", "Copying rsdpv1 to %p\n", target);
 	    v1inebda = target;
 	    target += sizeof (struct grub_acpi_rsdp_v10);
-	    target = (grub_uint8_t *) ((((grub_addr_t) target - 1) | 0xf) + 1);
+	    target = (grub_uint8_t *) ((((long) target - 1) | 0xf) + 1);
 	    v1 = 0;
 	    break;
 	  }
@@ -265,7 +265,7 @@ grub_acpi_create_ebda (void)
 	    grub_memcpy (target, v2, v2->length);
 	    v2inebda = target;
 	    target += v2->length;
-	    target = (grub_uint8_t *) ((((grub_addr_t) target - 1) | 0xf) + 1);
+	    target = (grub_uint8_t *) ((((long) target - 1) | 0xf) + 1);
 	    v2 = 0;
 	    break;
 	  }
@@ -282,7 +282,7 @@ grub_acpi_create_ebda (void)
 	    grub_memcpy (target, v1, sizeof (struct grub_acpi_rsdp_v10));
 	    v1inebda = target;
 	    target += sizeof (struct grub_acpi_rsdp_v10);
-	    target = (grub_uint8_t *) ((((grub_addr_t) target - 1) | 0xf) + 1);
+	    target = (grub_uint8_t *) ((((long) target - 1) | 0xf) + 1);
 	    v1 = 0;
 	    break;
 	  }
@@ -306,7 +306,7 @@ grub_acpi_create_ebda (void)
       *target = 0;
 
   grub_dprintf ("acpi", "Switching EBDA\n");
-  (*((grub_uint16_t *) 0x40e)) = ((grub_addr_t) targetebda) >> 4;
+  (*((grub_uint16_t *) 0x40e)) = ((long)targetebda) >> 4;
   grub_dprintf ("acpi", "EBDA switched\n");
 
   return GRUB_ERR_NONE;

grub-core/commands/boottime.c

@@ -56,7 +56,7 @@ GRUB_MOD_INIT(boottime)
 {
   cmd_boottime =
     grub_register_command ("boottime", grub_cmd_boottime,
-			   0, N_("Show boot time statistics."));
+			   0, N_("Get boot time statistics."));
 }
 
 GRUB_MOD_FINI(boottime)

grub-core/commands/efi/acpi.c

@@ -26,14 +26,14 @@ struct grub_acpi_rsdp_v10 *
 grub_machine_acpi_get_rsdpv1 (void)
 {
   unsigned i;
-  static grub_efi_packed_guid_t acpi_guid = GRUB_EFI_ACPI_TABLE_GUID;
+  static grub_efi_guid_t acpi_guid = GRUB_EFI_ACPI_TABLE_GUID;
 
   for (i = 0; i < grub_efi_system_table->num_table_entries; i++)
     {
-      grub_efi_packed_guid_t *guid =
+      grub_efi_guid_t *guid =
 	&grub_efi_system_table->configuration_table[i].vendor_guid;
 
-      if (! grub_memcmp (guid, &acpi_guid, sizeof (grub_efi_packed_guid_t)))
+      if (! grub_memcmp (guid, &acpi_guid, sizeof (grub_efi_guid_t)))
 	return (struct grub_acpi_rsdp_v10 *)
 	  grub_efi_system_table->configuration_table[i].vendor_table;
     }
@@ -44,14 +44,14 @@ struct grub_acpi_rsdp_v20 *
 grub_machine_acpi_get_rsdpv2 (void)
 {
   unsigned i;
-  static grub_efi_packed_guid_t acpi20_guid = GRUB_EFI_ACPI_20_TABLE_GUID;
+  static grub_efi_guid_t acpi20_guid = GRUB_EFI_ACPI_20_TABLE_GUID;
 
   for (i = 0; i < grub_efi_system_table->num_table_entries; i++)
     {
-      grub_efi_packed_guid_t *guid =
+      grub_efi_guid_t *guid =
 	&grub_efi_system_table->configuration_table[i].vendor_guid;
 
-      if (! grub_memcmp (guid, &acpi20_guid, sizeof (grub_efi_packed_guid_t)))
+      if (! grub_memcmp (guid, &acpi20_guid, sizeof (grub_efi_guid_t)))
 	return (struct grub_acpi_rsdp_v20 *)
 	  grub_efi_system_table->configuration_table[i].vendor_table;
     }

grub-core/commands/efi/loadbios.c

@@ -105,7 +105,7 @@ fake_bios_data (int use_rom)
   smbios = 0;
   for (i = 0; i < grub_efi_system_table->num_table_entries; i++)
     {
-      grub_efi_packed_guid_t *guid =
+      grub_efi_guid_t *guid =
 	&grub_efi_system_table->configuration_table[i].vendor_guid;
 
       if (! grub_memcmp (guid, &acpi2_guid, sizeof (grub_efi_guid_t)))

grub-core/commands/efi/lsefi.c

@@ -95,7 +95,7 @@ grub_cmd_lsefi (grub_command_t cmd __attribute__ ((unused)),
       grub_efi_handle_t handle = handles[i];
       grub_efi_status_t status;
       grub_efi_uintn_t num_protocols;
-      grub_efi_packed_guid_t **protocols;
+      grub_efi_guid_t **protocols;
       grub_efi_device_path_t *dp;
 
       grub_printf ("Handle %p\n", handle);

grub-core/commands/efi/lsefisystab.c

@@ -71,7 +71,7 @@ grub_cmd_lsefisystab (struct grub_command *cmd __attribute__ ((unused)),
 
   grub_printf (", Version=%x\n", st->firmware_revision);
 
-  grub_printf ("%lld tables:\n", (long long) st->num_table_entries);
+  grub_printf ("%ld tables:\n", st->num_table_entries);
   t = st->configuration_table;
   for (i = 0; i < st->num_table_entries; i++)
     {

grub-core/commands/efi/lssal.c

@@ -32,7 +32,7 @@ disp_sal (void *table)
 {
   struct grub_efi_sal_system_table *t = table;
   void *desc;
-  grub_uint32_t len, l, i;
+  grub_uint32_t len, l;
 
   grub_printf ("SAL rev: %02x, signature: %x, len:%x\n",
 	       t->sal_rev, t->signature, t->total_table_len);
@@ -44,9 +44,7 @@ disp_sal (void *table)
 
   desc = t->entries;
   len = t->total_table_len - sizeof (struct grub_efi_sal_system_table);
-  if (t->total_table_len <= sizeof (struct grub_efi_sal_system_table))
+  while (len > 0)
-    return;
-  for (i = 0; i < t->entry_count; i++)
     {
       switch (*(grub_uint8_t *) desc)
 	{
@@ -125,8 +123,6 @@ disp_sal (void *table)
 	  return;
 	}
       desc = (grub_uint8_t *)desc + l;
-      if (len <= l)
-	return;
       len -= l;
     }
 }
@@ -139,12 +135,12 @@ grub_cmd_lssal (struct grub_command *cmd __attribute__ ((unused)),
   const grub_efi_system_table_t *st = grub_efi_system_table;
   grub_efi_configuration_table_t *t = st->configuration_table;
   unsigned int i;
-  grub_efi_packed_guid_t guid = GRUB_EFI_SAL_TABLE_GUID;
+  grub_efi_guid_t guid = GRUB_EFI_SAL_TABLE_GUID;
 
   for (i = 0; i < st->num_table_entries; i++)
     {
       if (grub_memcmp (&guid, &t->vendor_guid,
-		       sizeof (grub_efi_packed_guid_t)) == 0)
+		       sizeof (grub_efi_guid_t)) == 0)
 	{
 	  disp_sal (t->vendor_table);
 	  return GRUB_ERR_NONE;

grub-core/commands/file.c

@@ -1,678 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2013  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/dl.h>
-#include <grub/misc.h>
-#include <grub/mm.h>
-#include <grub/env.h>
-#include <grub/command.h>
-#include <grub/extcmd.h>
-#include <grub/i18n.h>
-#include <grub/file.h>
-#include <grub/elf.h>
-#include <grub/xen_file.h>
-#include <grub/efi/pe32.h>
-#include <grub/i386/linux.h>
-#include <grub/xnu.h>
-#include <grub/machoload.h>
-#include <grub/fileid.h>
-
-GRUB_MOD_LICENSE ("GPLv3+");
-
-static const struct grub_arg_option options[] = {
-  {"is-i386-xen-pae-domu", 0, 0,
-   N_("Check if FILE can be booted as i386 PAE Xen unprivileged guest kernel"),
-   0, 0},
-  {"is-x86_64-xen-domu", 0, 0,
-   N_("Check if FILE can be booted as x86_64 Xen unprivileged guest kernel"), 0, 0},
-  {"is-x86-xen-dom0", 0, 0,
-   N_("Check if FILE can be used as Xen x86 privileged guest kernel"), 0, 0},
-  {"is-x86-multiboot", 0, 0,
-   N_("Check if FILE can be used as x86 multiboot kernel"), 0, 0},
-  {"is-x86-multiboot2", 0, 0,
-   N_("Check if FILE can be used as x86 multiboot2 kernel"), 0, 0},
-  {"is-arm-linux", 0, 0,
-   N_("Check if FILE is ARM Linux"), 0, 0},
-  {"is-arm64-linux", 0, 0,
-   N_("Check if FILE is ARM64 Linux"), 0, 0},
-  {"is-ia64-linux", 0, 0,
-   N_("Check if FILE is IA64 Linux"), 0, 0},
-  {"is-mips-linux", 0, 0,
-   N_("Check if FILE is MIPS Linux"), 0, 0},
-  {"is-mipsel-linux", 0, 0,
-   N_("Check if FILE is MIPSEL Linux"), 0, 0},
-  {"is-sparc64-linux", 0, 0,
-   N_("Check if FILE is SPARC64 Linux"), 0, 0},
-  {"is-powerpc-linux", 0, 0,
-   N_("Check if FILE is POWERPC Linux"), 0, 0},
-  {"is-x86-linux", 0, 0,
-   N_("Check if FILE is x86 Linux"), 0, 0},
-  {"is-x86-linux32", 0, 0,
-   N_("Check if FILE is x86 Linux supporting 32-bit protocol"), 0, 0},
-  {"is-x86-kfreebsd", 0, 0,
-   N_("Check if FILE is x86 kFreeBSD"), 0, 0},
-  {"is-i386-kfreebsd", 0, 0,
-   N_("Check if FILE is i386 kFreeBSD"), 0, 0},
-  {"is-x86_64-kfreebsd", 0, 0,
-   N_("Check if FILE is x86_64 kFreeBSD"), 0, 0},
-
-  {"is-x86-knetbsd", 0, 0,
-   N_("Check if FILE is x86 kNetBSD"), 0, 0},
-  {"is-i386-knetbsd", 0, 0,
-   N_("Check if FILE is i386 kNetBSD"), 0, 0},
-  {"is-x86_64-knetbsd", 0, 0,
-   N_("Check if FILE is x86_64 kNetBSD"), 0, 0},
-
-  {"is-i386-efi", 0, 0,
-   N_("Check if FILE is i386 EFI file"), 0, 0},
-  {"is-x86_64-efi", 0, 0,
-   N_("Check if FILE is x86_64 EFI file"), 0, 0},
-  {"is-ia64-efi", 0, 0,
-   N_("Check if FILE is IA64 EFI file"), 0, 0},
-  {"is-arm64-efi", 0, 0,
-   N_("Check if FILE is ARM64 EFI file"), 0, 0},
-  {"is-arm-efi", 0, 0,
-   N_("Check if FILE is ARM EFI file"), 0, 0},
-  {"is-hibernated-hiberfil", 0, 0,
-   N_("Check if FILE is hiberfil.sys in hibernated state"), 0, 0},
-  {"is-x86_64-xnu", 0, 0,
-   N_("Check if FILE is x86_64 XNU (Mac OS X kernel)"), 0, 0},
-  {"is-i386-xnu", 0, 0,
-   N_("Check if FILE is i386 XNU (Mac OS X kernel)"), 0, 0},
-  {"is-xnu-hibr", 0, 0,
-   N_("Check if FILE is XNU (Mac OS X kernel) hibernated image"), 0, 0},
-  {"is-x86-bios-bootsector", 0, 0,
-   N_("Check if FILE is BIOS bootsector"), 0, 0},
-  {0, 0, 0, 0, 0, 0}
-};
-
-enum
-{
-  IS_PAE_DOMU,
-  IS_64_DOMU,
-  IS_DOM0,
-  IS_MULTIBOOT,
-  IS_MULTIBOOT2,
-  IS_ARM_LINUX,
-  IS_ARM64_LINUX,
-  IS_IA64_LINUX,
-  IS_MIPS_LINUX,
-  IS_MIPSEL_LINUX,
-  IS_SPARC64_LINUX,
-  IS_POWERPC_LINUX,
-  IS_X86_LINUX,
-  IS_X86_LINUX32,
-  IS_X86_KFREEBSD,
-  IS_X86_KFREEBSD32,
-  IS_X86_KFREEBSD64,
-  IS_X86_KNETBSD,
-  IS_X86_KNETBSD32,
-  IS_X86_KNETBSD64,
-  IS_32_EFI,
-  IS_64_EFI,
-  IS_IA_EFI,
-  IS_ARM64_EFI,
-  IS_ARM_EFI,
-  IS_HIBERNATED,
-  IS_XNU64,
-  IS_XNU32,
-  IS_XNU_HIBR,
-  IS_BIOS_BOOTSECTOR,
-  OPT_TYPE_MIN = IS_PAE_DOMU,
-  OPT_TYPE_MAX = IS_BIOS_BOOTSECTOR
-};
-
-
-static grub_err_t
-grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
-{
-  grub_file_t file = 0;
-  grub_elf_t elf = 0;
-  grub_err_t err;
-  int type = -1, i;
-  int ret = 0;
-  grub_macho_t macho = 0;
-
-  if (argc == 0)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-  for (i = OPT_TYPE_MIN; i <= OPT_TYPE_MAX; i++)
-    if (ctxt->state[i].set)
-      {
-	if (type == -1)
-	  {
-	    type = i;
-	    continue;
-	  }
-	return grub_error (GRUB_ERR_BAD_ARGUMENT, "multiple types specified");
-      }
-  if (type == -1)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no type specified");
-
-  file = grub_file_open (args[0]);
-  if (!file)
-    return grub_errno;
-  switch (type)
-    {
-    case IS_BIOS_BOOTSECTOR:
-      {
-	grub_uint16_t sig;
-	if (grub_file_size (file) != 512)
-	  break;
-	if (grub_file_seek (file, 510) == (grub_size_t) -1)
-	  break;
-	if (grub_file_read (file, &sig, 2) != 2)
-	  break;
-	if (sig != grub_cpu_to_le16_compile_time (0xaa55))
-	  break;
-	ret = 1;
-	break;
-      }
-    case IS_IA64_LINUX:
-      {
-	Elf64_Ehdr ehdr;
-
-	if (grub_file_read (file, &ehdr, sizeof (ehdr)) != sizeof (ehdr))
-	  break;
-
-	if (ehdr.e_ident[EI_MAG0] != ELFMAG0
-	    || ehdr.e_ident[EI_MAG1] != ELFMAG1
-	    || ehdr.e_ident[EI_MAG2] != ELFMAG2
-	    || ehdr.e_ident[EI_MAG3] != ELFMAG3
-	    || ehdr.e_ident[EI_VERSION] != EV_CURRENT
-	    || ehdr.e_version != EV_CURRENT)
-	  break;
-
-	if (ehdr.e_ident[EI_CLASS] != ELFCLASS64
-	    || ehdr.e_ident[EI_DATA] != ELFDATA2LSB
-	    || ehdr.e_machine != grub_cpu_to_le16_compile_time (EM_IA_64))
-	  break;
-
-	ret = 1;
-
-	break;
-      }
-
-    case IS_SPARC64_LINUX:
-      {
-	Elf64_Ehdr ehdr;
-
-	if (grub_file_read (file, &ehdr, sizeof (ehdr)) != sizeof (ehdr))
-	  break;
-
-	if (ehdr.e_ident[EI_MAG0] != ELFMAG0
-	    || ehdr.e_ident[EI_MAG1] != ELFMAG1
-	    || ehdr.e_ident[EI_MAG2] != ELFMAG2
-	    || ehdr.e_ident[EI_MAG3] != ELFMAG3
-	    || ehdr.e_ident[EI_VERSION] != EV_CURRENT
-	    || ehdr.e_version != EV_CURRENT)
-	  break;
-
-	if (ehdr.e_ident[EI_CLASS] != ELFCLASS64
-	    || ehdr.e_ident[EI_DATA] != ELFDATA2MSB)
-	  break;
-
-	if (ehdr.e_machine != grub_cpu_to_le16_compile_time (EM_SPARCV9)
-	    || ehdr.e_type != grub_cpu_to_be16_compile_time (ET_EXEC))
-	  break;
-
-	ret = 1;
-
-	break;
-      }
-
-    case IS_POWERPC_LINUX:
-      {
-	Elf32_Ehdr ehdr;
-
-	if (grub_file_read (file, &ehdr, sizeof (ehdr)) != sizeof (ehdr))
-	  break;
-
-	if (ehdr.e_ident[EI_MAG0] != ELFMAG0
-	    || ehdr.e_ident[EI_MAG1] != ELFMAG1
-	    || ehdr.e_ident[EI_MAG2] != ELFMAG2
-	    || ehdr.e_ident[EI_MAG3] != ELFMAG3
-	    || ehdr.e_ident[EI_VERSION] != EV_CURRENT
-	    || ehdr.e_version != EV_CURRENT)
-	  break;
-
-	if (ehdr.e_ident[EI_DATA] != ELFDATA2MSB
-	    || (ehdr.e_machine != grub_cpu_to_le16_compile_time (EM_PPC)
-		&& ehdr.e_machine !=
-		grub_cpu_to_le16_compile_time (EM_PPC64)))
-	  break;
-
-	if (ehdr.e_type != grub_cpu_to_be16_compile_time (ET_EXEC)
-	    && ehdr.e_type != grub_cpu_to_be16_compile_time (ET_DYN))
-	  break;
-
-	ret = 1;
-
-	break;
-      }
-
-    case IS_MIPS_LINUX:
-      {
-	Elf32_Ehdr ehdr;
-
-	if (grub_file_read (file, &ehdr, sizeof (ehdr)) != sizeof (ehdr))
-	  break;
-
-	if (ehdr.e_ident[EI_MAG0] != ELFMAG0
-	    || ehdr.e_ident[EI_MAG1] != ELFMAG1
-	    || ehdr.e_ident[EI_MAG2] != ELFMAG2
-	    || ehdr.e_ident[EI_MAG3] != ELFMAG3
-	    || ehdr.e_ident[EI_VERSION] != EV_CURRENT
-	    || ehdr.e_version != EV_CURRENT)
-	  break;
-
-	if (ehdr.e_ident[EI_DATA] != ELFDATA2MSB
-	    || ehdr.e_machine != grub_cpu_to_be16_compile_time (EM_MIPS)
-	    || ehdr.e_type != grub_cpu_to_be16_compile_time (ET_EXEC))
-	  break;
-
-	ret = 1;
-
-	break;
-      }
-
-    case IS_X86_KNETBSD:
-    case IS_X86_KNETBSD32:
-    case IS_X86_KNETBSD64:
-      {
-	int is32, is64;
-
-	elf = grub_elf_file (file, file->name);
-
-	if (elf->ehdr.ehdr32.e_type != grub_cpu_to_le16_compile_time (ET_EXEC)
-	    || elf->ehdr.ehdr32.e_ident[EI_DATA] != ELFDATA2LSB)
-	  break;
-
-	is32 = grub_elf_is_elf32 (elf);
-	is64 = grub_elf_is_elf64 (elf);
-	if (!is32 && !is64)
-	  break;
-	if (!is32 && type == IS_X86_KNETBSD32)
-	  break;
-	if (!is64 && type == IS_X86_KNETBSD64)
-	  break;
-	if (is64)
-	  ret = grub_file_check_netbsd64 (elf);
-	if (is32)
-	  ret = grub_file_check_netbsd32 (elf);
-	break;
-      }
-
-    case IS_X86_KFREEBSD:
-    case IS_X86_KFREEBSD32:
-    case IS_X86_KFREEBSD64:
-      {
-	Elf32_Ehdr ehdr;
-	int is32, is64;
-
-	if (grub_file_read (file, &ehdr, sizeof (ehdr)) != sizeof (ehdr))
-	  break;
-
-	if (ehdr.e_ident[EI_MAG0] != ELFMAG0
-	    || ehdr.e_ident[EI_MAG1] != ELFMAG1
-	    || ehdr.e_ident[EI_MAG2] != ELFMAG2
-	    || ehdr.e_ident[EI_MAG3] != ELFMAG3
-	    || ehdr.e_ident[EI_VERSION] != EV_CURRENT
-	    || ehdr.e_version != EV_CURRENT)
-	  break;
-
-	if (ehdr.e_type != grub_cpu_to_le16_compile_time (ET_EXEC)
-	    || ehdr.e_ident[EI_DATA] != ELFDATA2LSB)
-	  break;
-
-	if (ehdr.e_ident[EI_OSABI] != ELFOSABI_FREEBSD)
-	  break;
-
-	is32 = (ehdr.e_machine == grub_cpu_to_le16_compile_time (EM_386)
-		&& ehdr.e_ident[EI_CLASS] == ELFCLASS32);
-	is64 = (ehdr.e_machine == grub_cpu_to_le16_compile_time (EM_X86_64)
-		&& ehdr.e_ident[EI_CLASS] == ELFCLASS64);
-	if (!is32 && !is64)
-	  break;
-	if (!is32 && (type == IS_X86_KFREEBSD32 || type == IS_X86_KNETBSD32))
-	  break;
-	if (!is64 && (type == IS_X86_KFREEBSD64 || type == IS_X86_KNETBSD64))
-	  break;
-	ret = 1;
-
-	break;
-      }
-
-
-    case IS_MIPSEL_LINUX:
-      {
-	Elf32_Ehdr ehdr;
-
-	if (grub_file_read (file, &ehdr, sizeof (ehdr)) != sizeof (ehdr))
-	  break;
-
-	if (ehdr.e_ident[EI_MAG0] != ELFMAG0
-	    || ehdr.e_ident[EI_MAG1] != ELFMAG1
-	    || ehdr.e_ident[EI_MAG2] != ELFMAG2
-	    || ehdr.e_ident[EI_MAG3] != ELFMAG3
-	    || ehdr.e_ident[EI_VERSION] != EV_CURRENT
-	    || ehdr.e_version != EV_CURRENT)
-	  break;
-
-	if (ehdr.e_machine != grub_cpu_to_le16_compile_time (EM_MIPS)
-	    || ehdr.e_type != grub_cpu_to_le16_compile_time (ET_EXEC))
-	  break;
-
-	ret = 1;
-
-	break;
-      }
-    case IS_ARM_LINUX:
-      {
-	grub_uint32_t sig, sig_pi;
-	if (grub_file_read (file, &sig_pi, 4) != 4)
-	  break;
-	/* Raspberry pi.  */
-	if (sig_pi == grub_cpu_to_le32_compile_time (0xea000006))
-	  {
-	    ret = 1;
-	    break;
-	  }
-
-	if (grub_file_seek (file, 0x24) == (grub_size_t) -1)
-	  break;
-	if (grub_file_read (file, &sig, 4) != 4)
-	  break;
-	if (sig == grub_cpu_to_le32_compile_time (0x016f2818))
-	  {
-	    ret = 1;
-	    break;
-	  }
-	break;
-      }
-    case IS_ARM64_LINUX:
-      {
-	grub_uint32_t sig;
-
-	if (grub_file_seek (file, 0x38) == (grub_size_t) -1)
-	  break;
-	if (grub_file_read (file, &sig, 4) != 4)
-	  break;
-	if (sig == grub_cpu_to_le32_compile_time (0x644d5241))
-	  {
-	    ret = 1;
-	    break;
-	  }
-	break;
-      }
-    case IS_PAE_DOMU ... IS_DOM0:
-      {
-	struct grub_xen_file_info xen_inf;
-	elf = grub_xen_file (file);
-	if (!elf)
-	  break;
-	err = grub_xen_get_info (elf, &xen_inf);
-	if (err)
-	  break;
-	/* Unfortuntely no way to check if kernel supports dom0.  */
-	if (type == IS_DOM0)
-	  ret = 1;
-	if (type == IS_PAE_DOMU)
-	  ret = (xen_inf.arch == GRUB_XEN_FILE_I386_PAE
-		 || xen_inf.arch == GRUB_XEN_FILE_I386_PAE_BIMODE);
-	if (type == IS_64_DOMU)
-	  ret = (xen_inf.arch == GRUB_XEN_FILE_X86_64);
-	break;
-      }
-    case IS_MULTIBOOT:
-    case IS_MULTIBOOT2:
-      {
-	grub_uint32_t *buffer;
-	grub_ssize_t len;
-	grub_size_t search_size;
-	grub_uint32_t *header;
-	grub_uint32_t magic;
-	grub_size_t step;
-
-	if (type == IS_MULTIBOOT2)
-	  {
-	    search_size = 32768;
-	    magic = grub_cpu_to_le32_compile_time (0xe85250d6);
-	    step = 2;
-	  }
-	else
-	  {
-	    search_size = 8192;
-	    magic = grub_cpu_to_le32_compile_time (0x1BADB002);
-	    step = 1;
-	  }
-
-	buffer = grub_malloc (search_size);
-	if (!buffer)
-	  break;
-
-	len = grub_file_read (file, buffer, search_size);
-	if (len < 32)
-	  {
-	    grub_free (buffer);
-	    break;
-	  }
-
-	/* Look for the multiboot header in the buffer.  The header should
-	   be at least 12 bytes and aligned on a 4-byte boundary.  */
-	for (header = buffer;
-	     ((char *) header <=
-	      (char *) buffer + len - (type == IS_MULTIBOOT2 ? 16 : 12))
-	     || (header = 0); header += step)
-	  {
-	    if (header[0] == magic
-		&& !(grub_le_to_cpu32 (header[0])
-		     + grub_le_to_cpu32 (header[1])
-		     + grub_le_to_cpu32 (header[2])
-		     + (type == IS_MULTIBOOT2
-			? grub_le_to_cpu32 (header[3]) : 0)))
-	      break;
-	  }
-
-	if (header != 0)
-	  ret = 1;
-	grub_free (buffer);
-	break;
-      }
-    case IS_X86_LINUX32:
-    case IS_X86_LINUX:
-      {
-	struct linux_kernel_header lh;
-	if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
-	  break;
-	if (lh.boot_flag != grub_cpu_to_le16_compile_time (0xaa55))
-	  break;
-
-	if (lh.setup_sects > GRUB_LINUX_MAX_SETUP_SECTS)
-	  break;
-
-	/* FIXME: some really old kernels (< 1.3.73) will fail this.  */
-	if (lh.header !=
-	    grub_cpu_to_le32_compile_time (GRUB_LINUX_MAGIC_SIGNATURE)
-	    || grub_le_to_cpu16 (lh.version) < 0x0200)
-	  break;
-
-	if (type == IS_X86_LINUX)
-	  {
-	    ret = 1;
-	    break;
-	  }
-
-	/* FIXME: 2.03 is not always good enough (Linux 2.4 can be 2.03 and
-	   still not support 32-bit boot.  */
-	if (lh.header !=
-	    grub_cpu_to_le32_compile_time (GRUB_LINUX_MAGIC_SIGNATURE)
-	    || grub_le_to_cpu16 (lh.version) < 0x0203)
-	  break;
-
-	if (!(lh.loadflags & GRUB_LINUX_FLAG_BIG_KERNEL))
-	  break;
-	ret = 1;
-	break;
-      }
-    case IS_HIBERNATED:
-      {
-	grub_uint8_t hibr_file_magic[4];
-	if (grub_file_read (file, &hibr_file_magic, sizeof (hibr_file_magic))
-	    != sizeof (hibr_file_magic))
-	  break;
-	if (grub_memcmp ("hibr", hibr_file_magic, sizeof (hibr_file_magic)) ==
-	    0
-	    || grub_memcmp ("HIBR", hibr_file_magic,
-			    sizeof (hibr_file_magic)) == 0)
-	  ret = 1;
-	break;
-      }
-    case IS_XNU64:
-    case IS_XNU32:
-      {
-	macho = grub_macho_open (args[0], (type == IS_XNU64));
-	if (!macho)
-	  break;
-	/* FIXME: more checks?  */
-	ret = 1;
-	break;
-      }
-    case IS_XNU_HIBR:
-      {
-	struct grub_xnu_hibernate_header hibhead;
-	if (grub_file_read (file, &hibhead, sizeof (hibhead))
-	    != sizeof (hibhead))
-	  break;
-	if (hibhead.magic !=
-	    grub_cpu_to_le32_compile_time (GRUB_XNU_HIBERNATE_MAGIC))
-	  break;
-	ret = 1;
-	break;
-      }
-    case IS_32_EFI:
-    case IS_64_EFI:
-    case IS_IA_EFI:
-    case IS_ARM64_EFI:
-    case IS_ARM_EFI:
-      {
-	char signature[4];
-	grub_uint32_t pe_offset;
-	struct grub_pe32_coff_header coff_head;
-
-	if (grub_file_read (file, signature, 2) != 2)
-	  break;
-	if (signature[0] != 'M' || signature[1] != 'Z')
-	  break;
-	if ((grub_ssize_t) grub_file_seek (file, 0x3c) == -1)
-	  break;
-	if (grub_file_read (file, &pe_offset, 4) != 4)
-	  break;
-	if ((grub_ssize_t) grub_file_seek (file, grub_le_to_cpu32 (pe_offset))
-	    == -1)
-	  break;
-	if (grub_file_read (file, signature, 4) != 4)
-	  break;
-	if (signature[0] != 'P' || signature[1] != 'E'
-	    || signature[2] != '\0' || signature[3] != '\0')
-	  break;
-
-	if (grub_file_read (file, &coff_head, sizeof (coff_head))
-	    != sizeof (coff_head))
-	  break;
-	if (type == IS_32_EFI
-	    && coff_head.machine !=
-	    grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_I386))
-	  break;
-	if (type == IS_64_EFI
-	    && coff_head.machine !=
-	    grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_X86_64))
-	  break;
-	if (type == IS_IA_EFI
-	    && coff_head.machine !=
-	    grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_IA64))
-	  break;
-	if (type == IS_ARM64_EFI
-	    && coff_head.machine !=
-	    grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_ARM64))
-	  break;
-	if (type == IS_ARM_EFI
-	    && coff_head.machine !=
-	    grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_ARMTHUMB_MIXED))
-	  break;
-	if (type == IS_IA_EFI || type == IS_64_EFI || type == IS_ARM64_EFI)
-	  {
-	    struct grub_pe64_optional_header o64;
-	    if (grub_file_read (file, &o64, sizeof (o64)) != sizeof (o64))
-	      break;
-	    if (o64.magic !=
-		grub_cpu_to_le16_compile_time (GRUB_PE32_PE64_MAGIC))
-	      break;
-	    if (o64.subsystem !=
-		grub_cpu_to_le16_compile_time
-		(GRUB_PE32_SUBSYSTEM_EFI_APPLICATION))
-	      break;
-	    ret = 1;
-	    break;
-	  }
-	if (type == IS_32_EFI || type == IS_ARM_EFI)
-	  {
-	    struct grub_pe32_optional_header o32;
-	    if (grub_file_read (file, &o32, sizeof (o32)) != sizeof (o32))
-	      break;
-	    if (o32.magic !=
-		grub_cpu_to_le16_compile_time (GRUB_PE32_PE32_MAGIC))
-	      break;
-	    if (o32.subsystem !=
-		grub_cpu_to_le16_compile_time
-		(GRUB_PE32_SUBSYSTEM_EFI_APPLICATION))
-	      break;
-	    ret = 1;
-	    break;
-	  }
-	break;
-      }
-    }
-
-  if (elf)
-    grub_elf_close (elf);
-  else if (macho)
-    grub_macho_close (macho);
-  else if (file)
-    grub_file_close (file);
-
-  if (!ret && (grub_errno == GRUB_ERR_BAD_OS || grub_errno == GRUB_ERR_NONE))
-    /* TRANSLATORS: it's a standalone boolean value,
-       opposite of "true".  */
-    grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
-  return grub_errno;
-}
-
-static grub_extcmd_t cmd;
-
-GRUB_MOD_INIT(file)
-{
-  cmd = grub_register_extcmd ("file", grub_cmd_file, 0,
-			      N_("OPTIONS FILE"),
-			      N_("Check if FILE is of specified type."),
-			      options);
-}
-
-GRUB_MOD_FINI(file)
-{
-  grub_unregister_extcmd (cmd);
-}

grub-core/commands/file32.c

@@ -1,5 +0,0 @@
-#define GRUB_TARGET_WORDSIZE 32
-#define XX		32
-#define ehdrXX ehdr32
-#define grub_file_check_netbsdXX grub_file_check_netbsd32
-#include "fileXX.c"

grub-core/commands/file64.c

@@ -1,5 +0,0 @@
-#define GRUB_TARGET_WORDSIZE 64
-#define XX		64
-#define ehdrXX ehdr64
-#define grub_file_check_netbsdXX grub_file_check_netbsd64
-#include "fileXX.c"

grub-core/commands/fileXX.c

@@ -1,70 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2013  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/fileid.h>
-#include <grub/elfload.h>
-
-#pragma GCC diagnostic ignored "-Wcast-align"
-
-int
-grub_file_check_netbsdXX (grub_elf_t elf)
-{
-  Elf_Shdr *s, *s0;
-
-  grub_size_t shnum = elf->ehdr.ehdrXX.e_shnum;
-  grub_size_t shentsize = elf->ehdr.ehdrXX.e_shentsize;
-  grub_size_t shsize = shnum * shentsize;
-  grub_off_t stroff;
-
-  if (!shnum || !shentsize)
-    return 0;
-
-  s0 = grub_malloc (shsize);
-  if (!s0)
-    return 0;
-
-  if (grub_file_seek (elf->file, elf->ehdr.ehdrXX.e_shoff) == (grub_off_t) -1)
-    return 0;
-
-  if (grub_file_read (elf->file, s0, shsize) != (grub_ssize_t) shsize)
-    return 0;
-
-  s = (Elf_Shdr *) ((char *) s0 + elf->ehdr.ehdrXX.e_shstrndx * shentsize);
-  stroff = s->sh_offset;
-
-  for (s = s0; s < (Elf_Shdr *) ((char *) s0 + shnum * shentsize);
-       s = (Elf_Shdr *) ((char *) s + shentsize))
-    {
-      char name[sizeof(".note.netbsd.ident")];
-      grub_memset (name, 0, sizeof (name));
-      if (grub_file_seek (elf->file, stroff + s->sh_name) == (grub_off_t) -1)
-	return grub_errno;
-
-      if (grub_file_read (elf->file, name, sizeof (name)) != (grub_ssize_t) sizeof (name))
-	{
-	  if (grub_errno)
-	    return grub_errno;
-	  continue;
-	}
-      if (grub_memcmp (name, ".note.netbsd.ident",
-		       sizeof(".note.netbsd.ident")) != 0)
-	continue;
-      return 1;
-    }
-  return 0;
-}

grub-core/commands/i386/cmosdump.c

@@ -55,7 +55,7 @@ GRUB_MOD_INIT(cmosdump)
 {
   cmd = grub_register_command ("cmosdump", grub_cmd_cmosdump,
 			       0,
-			       N_("Show raw dump of the CMOS contents."));
+			       N_("Dump CMOS contents."));
 }
 
 GRUB_MOD_FINI(cmosdump)

grub-core/commands/i386/cmostest.c

@@ -109,10 +109,9 @@ GRUB_MOD_INIT(cmostest)
 			       N_("Test bit at BYTE:BIT in CMOS."));
   cmd_clean = grub_register_command ("cmosclean", grub_cmd_cmosclean,
 				     N_("BYTE:BIT"),
-				     N_("Clear bit at BYTE:BIT in CMOS."));
+				     N_("Clean bit at BYTE:BIT in CMOS."));
   cmd_set = grub_register_command ("cmosset", grub_cmd_cmosset,
 				   N_("BYTE:BIT"),
-				   /* TRANSLATORS: A bit may be either set (1) or clear (0).  */
 				   N_("Set bit at BYTE:BIT in CMOS."));
 }
 

grub-core/commands/i386/coreboot/cb_timestamps.c

@@ -109,7 +109,7 @@ GRUB_MOD_INIT(cbtime)
 {
   cmd_boottime =
     grub_register_command ("coreboot_boottime", grub_cmd_coreboot_boottime,
-			   0, N_("Show coreboot boot time statistics."));
+			   0, N_("Get coreboot boot time statistics."));
 }
 
 GRUB_MOD_FINI(cbtime)

grub-core/commands/i386/cpuid.c

@@ -34,38 +34,19 @@ static const struct grub_arg_option options[] =
     /* TRANSLATORS: "(default)" at the end means that this option is used if
        no argument is specified.  */
     {"long-mode", 'l', 0, N_("Check if CPU supports 64-bit (long) mode (default)."), 0, 0},
-    {"pae", 'p', 0, N_("Check if CPU supports Physical Address Extension."), 0, 0},
     {0, 0, 0, 0, 0, 0}
   };
 
-enum
+#define bit_LM (1 << 29)
-  {
-    MODE_LM = 0,
-    MODE_PAE = 1
-  };
 
-enum
+unsigned char grub_cpuid_has_longmode = 0;
-  {
-    bit_PAE = (1 << 6),
-  };
-enum
-  {
-    bit_LM = (1 << 29)
-  };
-
-unsigned char grub_cpuid_has_longmode = 0, grub_cpuid_has_pae = 0;
 
 static grub_err_t
-grub_cmd_cpuid (grub_extcmd_context_t ctxt,
+grub_cmd_cpuid (grub_extcmd_context_t ctxt __attribute__ ((unused)),
 		int argc __attribute__ ((unused)),
 		char **args __attribute__ ((unused)))
 {
-  int val = 0;
+  return grub_cpuid_has_longmode ? GRUB_ERR_NONE
-  if (ctxt->state[MODE_PAE].set)
-    val = grub_cpuid_has_pae;
-  else
-    val = grub_cpuid_has_longmode;
-  return val ? GRUB_ERR_NONE
     /* TRANSLATORS: it's a standalone boolean value,
        opposite of "true".  */
     : grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
@@ -78,7 +59,6 @@ GRUB_MOD_INIT(cpuid)
 #ifdef __x86_64__
   /* grub-emu */
   grub_cpuid_has_longmode = 1;
-  grub_cpuid_has_pae = 1;
 #else
   unsigned int eax, ebx, ecx, edx;
   unsigned int max_level;
@@ -99,12 +79,6 @@ GRUB_MOD_INIT(cpuid)
   if (max_level == 0)
     goto done;
 
-  if (max_level >= 1)
-    {
-      grub_cpuid (1, eax, ebx, ecx, edx);
-      grub_cpuid_has_pae = !!(edx & bit_PAE);
-    }
-
   grub_cpuid (0x80000000, eax, ebx, ecx, edx);
   ext_level = eax;
   if (ext_level < 0x80000000)

grub-core/commands/i386/nthibr.c

@@ -0,0 +1,79 @@
+/* nthibr.c - tests whether an MS Windows system partition is hibernated */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2013  Peter Lustig
+ *  Copyright (C) 2013  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/types.h>
+#include <grub/mm.h>
+#include <grub/file.h>
+#include <grub/misc.h>
+#include <grub/dl.h>
+#include <grub/command.h>
+#include <grub/err.h>
+#include <grub/i18n.h>
+
+GRUB_MOD_LICENSE ("GPLv3+");
+
+static grub_err_t
+grub_cmd_nthibr (grub_command_t cmd __attribute__ ((unused)),
+                 int argc, char **args)
+{
+  grub_uint8_t hibr_file_magic[4];
+  grub_file_t hibr_file = 0;
+
+  if (argc != 1)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
+
+  hibr_file = grub_file_open (args[0]);
+  if (!hibr_file)
+    return grub_errno;
+
+  /* Try to read magic number of 'hiberfil.sys' */
+  if (grub_file_read (hibr_file, hibr_file_magic,
+		      sizeof (hibr_file_magic))
+      != (grub_ssize_t) sizeof (hibr_file_magic))
+    {
+      if (!grub_errno)
+	grub_error (GRUB_ERR_TEST_FAILURE, "false");
+      goto exit;
+    }
+
+  if (!(grub_memcmp ("hibr", hibr_file_magic, sizeof (hibr_file_magic)) == 0
+	|| grub_memcmp ("HIBR", hibr_file_magic, sizeof (hibr_file_magic)) == 0))
+    grub_error (GRUB_ERR_TEST_FAILURE, "false");
+
+ exit:
+  grub_file_close (hibr_file);
+
+  return grub_errno;
+}
+
+static grub_command_t cmd;
+
+GRUB_MOD_INIT (check_nt_hiberfil)
+{
+  cmd = grub_register_command ("check_nt_hiberfil", grub_cmd_nthibr,
+                               N_("FILE"),
+                               N_("Test whether a hiberfil.sys is "
+                                  "in hibernated state."));
+}
+
+GRUB_MOD_FINI (check_nt_hiberfil)
+{
+  grub_unregister_command (cmd);
+}

grub-core/commands/i386/pc/drivemap.c

@@ -74,7 +74,7 @@ typedef struct drivemap_node
   grub_uint8_t redirto;
 } drivemap_node_t;
 
-typedef struct GRUB_PACKED int13map_node
+typedef struct __attribute__ ((packed)) int13map_node
 {
   grub_uint8_t disknum;
   grub_uint8_t mapto;

grub-core/commands/legacycfg.c

@@ -314,11 +314,7 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)),
       /* First try Linux.  */
       if (kernel_type == GUESS_IT || kernel_type == LINUX)
 	{
-#ifdef GRUB_MACHINE_PCBIOS
 	  cmd = grub_command_find ("linux16");
-#else
-	  cmd = grub_command_find ("linux");
-#endif
 	  if (cmd)
 	    {
 	      if (!(cmd->func) (cmd, cutargc, cutargs))
@@ -473,19 +469,10 @@ grub_cmd_legacy_initrd (struct grub_command *mycmd __attribute__ ((unused)),
 
   if (kernel_type == LINUX)
     {
-#ifdef GRUB_MACHINE_PCBIOS
       cmd = grub_command_find ("initrd16");
-#else
-      cmd = grub_command_find ("initrd");
-#endif
       if (!cmd)
 	return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("can't find command `%s'"),
-#ifdef GRUB_MACHINE_PCBIOS
+			   "initrd16");
-			   "initrd16"
-#else
-			   "initrd"
-#endif
-			   );
 
       return cmd->func (cmd, argc, args);
     }

grub-core/commands/loadenv.c

@@ -455,7 +455,7 @@ GRUB_MOD_INIT(loadenv)
 {
   cmd_load =
     grub_register_extcmd ("load_env", grub_cmd_load_env, 0,
-			  N_("[-f FILE] [-s|--skip-sig] [variable_name_to_whitelist] [...]"),
+			  N_("[-f FILE] [-s|--skip-sig] [whitelisted_variable_name] [...]"),
 			  N_("Load variables from environment block file."),
 			  options);
   cmd_list =

grub-core/commands/macbless.c

@@ -1,236 +0,0 @@
-/* hfspbless.c - set the hfs+ boot directory.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003,2005,2007,2008,2009,2012,2013  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/command.h>
-#include <grub/fs.h>
-#include <grub/misc.h>
-#include <grub/dl.h>
-#include <grub/device.h>
-#include <grub/disk.h>
-#include <grub/hfsplus.h>
-#include <grub/hfs.h>
-#include <grub/partition.h>
-#include <grub/file.h>
-#include <grub/mm.h>
-#include <grub/err.h>
-
-GRUB_MOD_LICENSE ("GPLv3+");
-
-struct find_node_context
-{
-  grub_uint64_t inode_found;
-  char *dirname;
-  enum
-  { NONE, FILE, DIR } found;
-};
-
-static int
-find_inode (const char *filename,
-	    const struct grub_dirhook_info *info, void *data)
-{
-  struct find_node_context *ctx = data;
-  if (!info->inodeset)
-    return 0;
-
-  if ((grub_strcmp (ctx->dirname, filename) == 0
-       || (info->case_insensitive
-	   && grub_strcasecmp (ctx->dirname, filename) == 0)))
-    {
-      ctx->inode_found = info->inode;
-      ctx->found = info->dir ? DIR : FILE;
-    }
-  return 0;
-}
-
-grub_err_t
-grub_mac_bless_inode (grub_device_t dev, grub_uint32_t inode, int is_dir,
-		      int intel)
-{
-  grub_err_t err;
-  union
-  {
-    struct grub_hfs_sblock hfs;
-    struct grub_hfsplus_volheader hfsplus;
-  } volheader;
-  grub_disk_addr_t embedded_offset;
-
-  if (intel && is_dir)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT,
-		       "can't bless a directory for mactel");
-  if (!intel && !is_dir)
-    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-		       "can't bless a file for mac PPC");
-
-  /* Read the bootblock.  */
-  err = grub_disk_read (dev->disk, GRUB_HFSPLUS_SBLOCK, 0, sizeof (volheader),
-			(char *) &volheader);
-  if (err)
-    return err;
-
-  embedded_offset = 0;
-  if (grub_be_to_cpu16 (volheader.hfs.magic) == GRUB_HFS_MAGIC)
-    {
-      int extent_start;
-      int ablk_size;
-      int ablk_start;
-
-      /* See if there's an embedded HFS+ filesystem.  */
-      if (grub_be_to_cpu16 (volheader.hfs.embed_sig) != GRUB_HFSPLUS_MAGIC)
-	{
-	  if (intel)
-	    volheader.hfs.intel_bootfile = grub_be_to_cpu32 (inode);
-	  else
-	    volheader.hfs.ppc_bootdir = grub_be_to_cpu32 (inode);
-	  return GRUB_ERR_NONE;
-	}
-
-      /* Calculate the offset needed to translate HFS+ sector numbers.  */
-      extent_start =
-	grub_be_to_cpu16 (volheader.hfs.embed_extent.first_block);
-      ablk_size = grub_be_to_cpu32 (volheader.hfs.blksz);
-      ablk_start = grub_be_to_cpu16 (volheader.hfs.first_block);
-      embedded_offset = (ablk_start
-			 + extent_start
-			 * (ablk_size >> GRUB_DISK_SECTOR_BITS));
-
-      err =
-	grub_disk_read (dev->disk, embedded_offset + GRUB_HFSPLUS_SBLOCK, 0,
-			sizeof (volheader), (char *) &volheader);
-      if (err)
-	return err;
-    }
-
-  if ((grub_be_to_cpu16 (volheader.hfsplus.magic) != GRUB_HFSPLUS_MAGIC)
-      && (grub_be_to_cpu16 (volheader.hfsplus.magic) != GRUB_HFSPLUSX_MAGIC))
-    return grub_error (GRUB_ERR_BAD_FS, "not a HFS+ filesystem");
-  if (intel)
-    volheader.hfsplus.intel_bootfile = grub_be_to_cpu32 (inode);
-  else
-    volheader.hfsplus.ppc_bootdir = grub_be_to_cpu32 (inode);
-
-  return grub_disk_write (dev->disk, embedded_offset + GRUB_HFSPLUS_SBLOCK, 0,
-			  sizeof (volheader), (char *) &volheader);
-}
-
-grub_err_t
-grub_mac_bless_file (grub_device_t dev, const char *path_in, int intel)
-{
-  grub_fs_t fs;
-
-  char *path, *tail;
-  struct find_node_context ctx;
-
-  fs = grub_fs_probe (dev);
-  if (!fs || (grub_strcmp (fs->name, "hfsplus") != 0
-	      && grub_strcmp (fs->name, "hfs") != 0))
-    return grub_error (GRUB_ERR_BAD_FS, "no suitable FS found");
-
-  path = grub_strdup (path_in);
-  if (!path)
-    return grub_errno;
-
-  tail = path + grub_strlen (path) - 1;
-
-  /* Remove trailing '/'. */
-  while (tail != path && *tail == '/')
-    *(tail--) = 0;
-
-  tail = grub_strrchr (path, '/');
-  ctx.found = 0;
-
-  if (tail)
-    {
-      *tail = 0;
-      ctx.dirname = tail + 1;
-
-      (fs->dir) (dev, *path == 0 ? "/" : path, find_inode, &ctx);
-    }
-  else
-    {
-      ctx.dirname = path + 1;
-      (fs->dir) (dev, "/", find_inode, &ctx);
-    }
-  if (!ctx.found)
-    {
-      grub_free (path);
-      return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"),
-			 path_in);
-    }
-  grub_free (path);
-
-  return grub_mac_bless_inode (dev, (grub_uint32_t) ctx.inode_found,
-			       (ctx.found == DIR), intel);
-}
-
-static grub_err_t
-grub_cmd_macbless (grub_command_t cmd, int argc, char **args)
-{
-  char *device_name;
-  char *path = 0;
-  grub_device_t dev;
-  grub_err_t err;
-
-  if (argc != 1)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
-  device_name = grub_file_get_device_name (args[0]);
-  dev = grub_device_open (device_name);
-
-  path = grub_strchr (args[0], ')');
-  if (!path)
-    path = args[0];
-  else
-    path = path + 1;
-
-  if (!path || *path == 0 || !device_name)
-    {
-      if (dev)
-	grub_device_close (dev);
-
-      grub_free (device_name);
-      grub_free (path);
-
-      return grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid argument");
-    }
-
-  err = grub_mac_bless_file (dev, path, cmd->name[3] == 't');
-
-  grub_device_close (dev);
-  grub_free (device_name);
-  return err;
-}
-
-static grub_command_t cmd, cmd_ppc;
-
-GRUB_MOD_INIT(macbless)
-{
-  cmd = grub_register_command ("mactelbless", grub_cmd_macbless,
-			       N_("FILE"),
-			       N_
-			       ("Bless FILE of HFS or HFS+ partition for intel macs."));
-  cmd_ppc =
-    grub_register_command ("macppcbless", grub_cmd_macbless, N_("DIR"),
-			   N_
-			   ("Bless DIR of HFS or HFS+ partition for PPC macs."));
-}
-
-GRUB_MOD_FINI(macbless)
-{
-  grub_unregister_command (cmd);
-  grub_unregister_command (cmd_ppc);
-}

grub-core/commands/minicmd.c

@@ -101,18 +101,12 @@ grub_mini_cmd_dump (struct grub_command *cmd __attribute__ ((unused)),
   if (argc == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "no address specified");
 
-#if GRUB_CPU_SIZEOF_VOID_P == GRUB_CPU_SIZEOF_LONG
+  addr = (grub_uint8_t *) grub_strtoul (argv[0], 0, 0);
-#define grub_strtoaddr grub_strtoul
-#else
-#define grub_strtoaddr grub_strtoull
-#endif
-
-  addr = (grub_uint8_t *) grub_strtoaddr (argv[0], 0, 0);
   if (grub_errno)
     return grub_errno;
 
   if (argc > 1)
-    size = (grub_size_t) grub_strtoaddr (argv[1], 0, 0);
+    size = (grub_size_t) grub_strtoul (argv[1], 0, 0);
 
   while (size--)
     {

grub-core/commands/parttool.c

@@ -133,7 +133,7 @@ show_help (grub_device_t dev)
 	  }
       }
   if (! found)
-    grub_printf_ (N_("Sorry, no parttool is available for %s\n"),
+    grub_printf_ (N_("Sorry no parttool is available for %s\n"),
 		  dev->disk->partition->partmap->name);
   return GRUB_ERR_NONE;
 }

grub-core/commands/pcidump.c

@@ -166,7 +166,7 @@ GRUB_MOD_INIT(pcidump)
 {
   cmd = grub_register_extcmd ("pcidump", grub_cmd_pcidump, 0,
 			      N_("[-s POSITION] [-d DEVICE]"),
-			      N_("Show raw dump of the PCI configuration space."), options);
+			      N_("Dump PCI configuration space."), options);
 }
 
 GRUB_MOD_FINI(pcidump)

grub-core/commands/syslinuxcfg.c

@@ -1,214 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2013  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/types.h>
-#include <grub/misc.h>
-#include <grub/extcmd.h>
-#include <grub/mm.h>
-#include <grub/err.h>
-#include <grub/dl.h>
-#include <grub/file.h>
-#include <grub/normal.h>
-#include <grub/script_sh.h>
-#include <grub/i18n.h>
-#include <grub/term.h>
-#include <grub/syslinux_parse.h>
-#include <grub/crypto.h>
-#include <grub/auth.h>
-#include <grub/disk.h>
-#include <grub/partition.h>
-
-GRUB_MOD_LICENSE ("GPLv3+");
-
-/* Helper for syslinux_file.  */
-static grub_err_t
-syslinux_file_getline (char **line, int cont __attribute__ ((unused)),
-		     void *data __attribute__ ((unused)))
-{
-  *line = 0;
-  return GRUB_ERR_NONE;
-}
-
-static const struct grub_arg_option options[] =
-  {
-    {"root",  'r', 0,
-     N_("root directory of the syslinux disk [default=/]."),
-     N_("DIR"), ARG_TYPE_STRING},
-    {"cwd",  'c', 0,
-     N_("current directory of the syslinux [default is parent directory of input file]."),
-     N_("DIR"), ARG_TYPE_STRING},
-    {"isolinux",     'i',  0, N_("assume input is an isolinux configuration file."), 0, 0},
-    {"pxelinux",     'p',  0, N_("assume input is a pxelinux configuration file."), 0, 0},
-    {"syslinux",     's',  0, N_("assume input is a syslinux configuration file."), 0, 0},
-    {0, 0, 0, 0, 0, 0}
-  };
-
-enum
-  {
-    OPTION_ROOT,
-    OPTION_CWD,
-    OPTION_ISOLINUX,
-    OPTION_PXELINUX,
-    OPTION_SYSLINUX
-  };
-
-static grub_err_t
-syslinux_file (grub_extcmd_context_t ctxt, const char *filename)
-{
-  char *result;
-  const char *root = ctxt->state[OPTION_ROOT].set ? ctxt->state[OPTION_ROOT].arg : "/";
-  const char *cwd = ctxt->state[OPTION_CWD].set ? ctxt->state[OPTION_CWD].arg : NULL;
-  grub_syslinux_flavour_t flav = GRUB_SYSLINUX_UNKNOWN;
-  char *cwdf = NULL;
-  grub_menu_t menu;
-
-  if (ctxt->state[OPTION_ISOLINUX].set)
-    flav = GRUB_SYSLINUX_ISOLINUX;
-  if (ctxt->state[OPTION_PXELINUX].set)
-    flav = GRUB_SYSLINUX_PXELINUX;
-  if (ctxt->state[OPTION_SYSLINUX].set)
-    flav = GRUB_SYSLINUX_SYSLINUX;
-
-  if (!cwd)
-    {
-      char *p;
-      cwdf = grub_strdup (filename);
-      if (!cwdf)
-	return grub_errno;
-      p = grub_strrchr (cwdf, '/');
-      if (!p)
-	{
-	  grub_free (cwdf);
-	  cwd = "/";
-	  cwdf = NULL;
-	}
-      else
-	{
-	  *p = '\0';
-	  cwd = cwdf;
-	}
-    }
-
-  grub_dprintf ("syslinux",
-		"transforming syslinux config %s, root = %s, cwd = %s\n",
-		filename, root, cwd);
-
-  result = grub_syslinux_config_file (root, root, cwd, cwd, filename, flav);
-  if (!result)
-    return grub_errno;
-
-  grub_dprintf ("syslinux", "syslinux config transformed\n");
-
-  menu = grub_env_get_menu ();
-  if (! menu)
-    {
-      menu = grub_zalloc (sizeof (*menu));
-      if (! menu)
-	return grub_errno;
-
-      grub_env_set_menu (menu);
-    }
-
-  grub_normal_parse_line (result, syslinux_file_getline, NULL);
-  grub_print_error ();
-  grub_free (result);
-  grub_free (cwdf);
-
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_cmd_syslinux_source (grub_extcmd_context_t ctxt,
-			  int argc, char **args)
-{
-  int new_env, extractor;
-  grub_err_t ret;
-
-  if (argc != 1)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-
-  extractor = (ctxt->extcmd->cmd->name[0] == 'e');
-  new_env = (ctxt->extcmd->cmd->name[extractor ? (sizeof ("extract_syslinux_entries_") - 1)
-			     : (sizeof ("syslinux_") - 1)] == 'c');
-
-  if (new_env)
-    grub_cls ();
-
-  if (new_env && !extractor)
-    grub_env_context_open ();
-  if (extractor)
-    grub_env_extractor_open (!new_env);
-
-  ret = syslinux_file (ctxt, args[0]);
-
-  if (new_env)
-    {
-      grub_menu_t menu;
-      menu = grub_env_get_menu ();
-      if (menu && menu->size)
-	grub_show_menu (menu, 1, 0);
-      if (!extractor)
-	grub_env_context_close ();
-    }
-  if (extractor)
-    grub_env_extractor_close (!new_env);
-
-  return ret;
-}
-
-
-static grub_extcmd_t cmd_source, cmd_configfile;
-static grub_extcmd_t cmd_source_extract, cmd_configfile_extract;
-
-GRUB_MOD_INIT(syslinuxcfg)
-{
-  cmd_source
-    = grub_register_extcmd ("syslinux_source",
-			    grub_cmd_syslinux_source, 0,
-			    N_("FILE"),
-			    /* TRANSLATORS: "syslinux config" means
-			       "config as used by syslinux".  */
-			    N_("Execute syslinux config in same context"),
-			    options);
-  cmd_configfile
-    = grub_register_extcmd ("syslinux_configfile",
-			    grub_cmd_syslinux_source, 0,
-			    N_("FILE"),
-			    N_("Execute syslinux config in new context"),
-			    options);
-  cmd_source_extract
-    = grub_register_extcmd ("extract_syslinux_entries_source",
-			    grub_cmd_syslinux_source, 0,
-			    N_("FILE"),
-			    N_("Execute syslinux config in same context taking only menu entries"),
-			    options);
-  cmd_configfile_extract
-    = grub_register_extcmd ("extract_syslinux_entries_configfile",
-			    grub_cmd_syslinux_source, 0,
-			    N_("FILE"),
-			    N_("Execute syslinux config in new context taking only menu entries"),
-			    options);
-}
-
-GRUB_MOD_FINI(syslinuxcfg)
-{
-  grub_unregister_extcmd (cmd_source);
-  grub_unregister_extcmd (cmd_configfile);
-  grub_unregister_extcmd (cmd_source_extract);
-  grub_unregister_extcmd (cmd_configfile_extract);
-}

grub-core/commands/tr.c

@@ -29,7 +29,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
 
 static const struct grub_arg_option options[] =
   {
-    { "set", 's', 0, N_("Set a variable to return value."), N_("VARNAME"), ARG_TYPE_STRING },
+    { "set", 's', 0, N_("Variable name to update."), N_("VARNAME"), ARG_TYPE_STRING },
     { "upcase", 'U', 0, N_("Translate to upper case."), 0, 0 },
     { "downcase", 'D', 0, N_("Translate to lower case."), 0, 0 },
     { 0, 0, 0, 0, 0, 0 }

grub-core/commands/verify.c

@@ -41,7 +41,7 @@ enum
 static const struct grub_arg_option options[] =
   {
     {"skip-sig", 's', 0,
-     N_("Skip signature-checking of the public key file."), 0, ARG_TYPE_NONE},
+     N_("Skip signature-checking of the signature file."), 0, ARG_TYPE_NONE},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -133,7 +133,7 @@ struct signature_v4_header
   grub_uint8_t pkeyalgo;
   grub_uint8_t hash;
   grub_uint16_t hashed_sub;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 const char *hashes[] = {
   [0x01] = "md5",
@@ -885,7 +885,6 @@ grub_pubkey_open (grub_file_t io, const char *filename)
   if (err)
     return NULL;
   io->device = 0;
-  io->name = 0;
   grub_file_close (io);
   return ret;
 }
@@ -966,14 +965,14 @@ GRUB_MOD_INIT(verify)
 			      options);
   cmd_trust = grub_register_extcmd ("trust", grub_cmd_trust, 0,
 				     N_("[-s|--skip-sig] PUBKEY_FILE"),
-				     N_("Add PUBKEY_FILE to trusted keys."),
+				     N_("Add PKFILE to trusted keys."),
 				     options);
   cmd_list = grub_register_command ("list_trusted", grub_cmd_list,
 				    0,
-				    N_("Show the list of trusted keys."));
+				    N_("List trusted keys."));
   cmd_distrust = grub_register_command ("distrust", grub_cmd_distrust,
 					N_("PUBKEY_ID"),
-					N_("Remove PUBKEY_ID from trusted keys."));
+					N_("Remove KEYID from trusted keys."));
 }
 
 GRUB_MOD_FINI(verify)

grub-core/commands/xen/lsxen.c

@@ -77,10 +77,10 @@ static grub_command_t cmd_ls, cmd_cat;
 
 GRUB_MOD_INIT (lsxen)
 {
-  cmd_ls = grub_register_command ("xen_ls", grub_cmd_lsxen, N_("[DIR]"),
+  cmd_ls = grub_register_command ("xen_ls", grub_cmd_lsxen, "[DIR]",
-				  N_("List Xen storage."));
+				  N_("List XEN storage."));
-  cmd_cat = grub_register_command ("xen_cat", grub_cmd_catxen, N_("[DIR]"),
+  cmd_cat = grub_register_command ("xen_cat", grub_cmd_catxen, "[DIR]",
-				   N_("List Xen storage."));
+				   N_("List XEN storage."));
 }
 
 GRUB_MOD_FINI (lsxen)

grub-core/disk/cryptodisk.c

@@ -51,7 +51,7 @@ static inline int GF_PER_SECTOR (const struct grub_cryptodisk *dev)
 }
 
 static grub_cryptodisk_t cryptodisk_list = NULL;
-static grub_uint8_t last_cryptodisk_id = 0;
+static grub_uint8_t n = 0;
 
 static void
 gf_mul_x (grub_uint8_t *g)
@@ -707,7 +707,7 @@ grub_cryptodisk_insert (grub_cryptodisk_t newdev, const char *name,
       return grub_errno;
     }
 
-  newdev->id = last_cryptodisk_id++;
+  newdev->id = n++;
   newdev->source_id = source->id;
   newdev->source_dev_id = source->dev->id;
   newdev->next = cryptodisk_list;
@@ -753,7 +753,7 @@ grub_cryptodisk_cheat_insert (grub_cryptodisk_t newdev, const char *name,
   newdev->cheat_fd = GRUB_UTIL_FD_INVALID;
   newdev->source_id = source->id;
   newdev->source_dev_id = source->dev->id;
-  newdev->id = last_cryptodisk_id++;
+  newdev->id = n++;
   newdev->next = cryptodisk_list;
   cryptodisk_list = newdev;
 

grub-core/disk/diskfilter.c

@@ -1057,8 +1057,7 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
 		(unsigned long long) grub_disk_get_size (disk),
 		array->name, diskfilter->name);
 #ifdef GRUB_UTIL
-  grub_util_info ("Inserting %s (+%" GRUB_HOST_PRIuLONG_LONG ",%"
+  grub_util_info ("Inserting %s (+%lld,%lld) into %s (%s)\n", disk->name,
-		  GRUB_HOST_PRIuLONG_LONG ") into %s (%s)\n", disk->name,
 		  (unsigned long long) grub_partition_get_start (disk->partition),
 		  (unsigned long long) grub_disk_get_size (disk),
 		  array->name, diskfilter->name);

grub-core/disk/dmraid_nvidia.c

@@ -88,7 +88,7 @@ struct grub_nv_super
   char prodrev[NV_PRODREV_LEN];	/* 0x2C - 0x2F Array product revision */
   grub_uint32_t unit_flags;	/* 0x30 - 0x33 Flags for this disk */
   struct grub_nv_array array;	/* Array information */
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 static struct grub_diskfilter_vg *
 grub_dmraid_nv_detect (grub_disk_t disk,

grub-core/disk/efi/efidisk.c

@@ -157,7 +157,8 @@ find_parent_device (struct grub_efidisk_data *devices,
   ldp = find_last_device_path (dp);
   ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
   ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
-  ldp->length = sizeof (*ldp);
+  ldp->length[0] = sizeof (*ldp);
+  ldp->length[1] = 0;
 
   for (parent = devices; parent; parent = parent->next)
     {
@@ -187,7 +188,8 @@ is_child (struct grub_efidisk_data *child,
   ldp = find_last_device_path (dp);
   ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
   ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
-  ldp->length = sizeof (*ldp);
+  ldp->length[0] = sizeof (*ldp);
+  ldp->length[1] = 0;
 
   ret = (grub_efi_compare_device_paths (dp, parent->device_path) == 0);
   grub_free (dp);
@@ -333,21 +335,6 @@ name_devices (struct grub_efidisk_data *devices)
       if (! dp)
 	continue;
 
-      /* Ghosts proudly presented by Apple.  */
-      if (GRUB_EFI_DEVICE_PATH_TYPE (dp) == GRUB_EFI_MEDIA_DEVICE_PATH_TYPE
-	  && GRUB_EFI_DEVICE_PATH_SUBTYPE (dp)
-	  == GRUB_EFI_VENDOR_MEDIA_DEVICE_PATH_SUBTYPE)
-	{
-	  grub_efi_vendor_device_path_t *vendor = (grub_efi_vendor_device_path_t *) dp;
-	  const struct grub_efi_guid apple = GRUB_EFI_VENDOR_APPLE_GUID;
-
-	  if (vendor->header.length == sizeof (*vendor)
-	      && grub_memcmp (&vendor->vendor_guid, &apple,
-			      sizeof (vendor->vendor_guid)) == 0
-	      && find_parent_device (devices, d))
-	    continue;
-	}
-
       m = d->block_io->media;
       if (GRUB_EFI_DEVICE_PATH_TYPE (dp) == GRUB_EFI_ACPI_DEVICE_PATH_TYPE
 	  && GRUB_EFI_DEVICE_PATH_SUBTYPE (dp)
@@ -681,20 +668,20 @@ grub_efidisk_get_device_handle (grub_disk_t disk)
 	devices = make_devices ();
 	FOR_CHILDREN (c, devices)
 	  {
-	    grub_efi_hard_drive_device_path_t *hd;
+	    grub_efi_hard_drive_device_path_t hd;
 
-	    hd = (grub_efi_hard_drive_device_path_t *) c->last_device_path;
+	    grub_memcpy (&hd, c->last_device_path, sizeof (hd));
 
 	    if ((GRUB_EFI_DEVICE_PATH_TYPE (c->last_device_path)
 		 == GRUB_EFI_MEDIA_DEVICE_PATH_TYPE)
 		&& (GRUB_EFI_DEVICE_PATH_SUBTYPE (c->last_device_path)
 		    == GRUB_EFI_HARD_DRIVE_DEVICE_PATH_SUBTYPE)
 		&& (grub_partition_get_start (disk->partition) 
-		    == (hd->partition_start << (disk->log_sector_size
+		    == (hd.partition_start << (disk->log_sector_size
-						- GRUB_DISK_SECTOR_BITS)))
+					       - GRUB_DISK_SECTOR_BITS)))
 		&& (grub_partition_get_len (disk->partition)
-		    == (hd->partition_size << (disk->log_sector_size
+		    == (hd.partition_size << (disk->log_sector_size
-					       - GRUB_DISK_SECTOR_BITS))))
+					      - GRUB_DISK_SECTOR_BITS))))
 	      {
 		handle = c->handle;
 		break;
@@ -760,7 +747,7 @@ get_diskname_from_path (const grub_efi_device_path_t *path,
 struct grub_efidisk_get_device_name_ctx
 {
   char *partition_name;
-  grub_efi_hard_drive_device_path_t *hd;
+  grub_efi_hard_drive_device_path_t hd;
 };
 
 /* Helper for grub_efidisk_get_device_name.
@@ -772,11 +759,11 @@ grub_efidisk_get_device_name_iter (grub_disk_t disk,
   struct grub_efidisk_get_device_name_ctx *ctx = data;
 
   if (grub_partition_get_start (part)
-      == (ctx->hd->partition_start << (disk->log_sector_size
+      == (ctx->hd.partition_start << (disk->log_sector_size
-				       - GRUB_DISK_SECTOR_BITS))
+				      - GRUB_DISK_SECTOR_BITS))
       && grub_partition_get_len (part)
-      == (ctx->hd->partition_size << (disk->log_sector_size
+      == (ctx->hd.partition_size << (disk->log_sector_size
-				      - GRUB_DISK_SECTOR_BITS)))
+				     - GRUB_DISK_SECTOR_BITS)))
     {
       ctx->partition_name = grub_partition_get_name (part);
       return 1;
@@ -829,7 +816,8 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
 
 	  dup_ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
 	  dup_ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
-	  dup_ldp->length = sizeof (*dup_ldp);
+	  dup_ldp->length[0] = sizeof (*dup_ldp);
+	  dup_ldp->length[1] = 0;
 	}
 
       if (!get_diskname_from_path (dup_dp, device_name))
@@ -846,10 +834,10 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
 
       /* Find a partition which matches the hard drive device path.  */
       ctx.partition_name = NULL;
-      ctx.hd = (grub_efi_hard_drive_device_path_t *) ldp;
+      grub_memcpy (&ctx.hd, ldp, sizeof (ctx.hd));
-      if (ctx.hd->partition_start == 0
+      if (ctx.hd.partition_start == 0
-	  && (ctx.hd->partition_size << (parent->log_sector_size
+	  && (ctx.hd.partition_size << (parent->log_sector_size
-					 - GRUB_DISK_SECTOR_BITS))
+					- GRUB_DISK_SECTOR_BITS))
 	  == grub_disk_get_size (parent))
 	{
 	  dev_name = grub_strdup (parent->name);

grub-core/disk/geli.c

@@ -95,7 +95,7 @@ struct grub_geli_key
   grub_uint8_t iv_key[64];
   grub_uint8_t cipher_key[64];
   grub_uint8_t hmac[64];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_geli_phdr
 {
@@ -111,7 +111,7 @@ struct grub_geli_phdr
   grub_uint32_t niter;
   grub_uint8_t salt[64];
   struct grub_geli_key keys[2];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 enum
   {
@@ -144,7 +144,7 @@ geli_rekey (struct grub_cryptodisk *dev, grub_uint64_t zoneno)
   const struct {
     char magic[4];
     grub_uint64_t zone;
-  } GRUB_PACKED tohash
+  } __attribute__ ((packed)) tohash
       = { {'e', 'k', 'e', 'y'}, grub_cpu_to_le64 (zoneno) };
   GRUB_PROPERLY_ALIGNED_ARRAY (key, GRUB_CRYPTO_MAX_MDLEN);
 

grub-core/disk/host.c

@@ -49,7 +49,7 @@ grub_host_open (const char *name, grub_disk_t disk)
       return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a host disk");
 
   disk->total_sectors = 0;
-  disk->id = 0;
+  disk->id = (unsigned long) "host";
 
   disk->data = 0;
 

grub-core/disk/i386/pc/biosdisk.c

@@ -426,10 +426,6 @@ grub_biosdisk_open (const char *name, grub_disk_t disk)
   disk->total_sectors = total_sectors;
   /* Limit the max to 0x7f because of Phoenix EDD.  */
   disk->max_agglomerate = 0x7f >> GRUB_DISK_CACHE_BITS;
-  COMPILE_TIME_ASSERT ((0x7f >> GRUB_DISK_CACHE_BITS
-			<< (GRUB_DISK_SECTOR_BITS + GRUB_DISK_CACHE_BITS))
-		       + sizeof (struct grub_biosdisk_dap)
-		       < GRUB_MEMORY_MACHINE_SCRATCH_SIZE);
 
   disk->data = data;
 

grub-core/disk/ieee1275/ofdisk.c

@@ -31,14 +31,11 @@ static grub_ieee1275_ihandle_t last_ihandle;
 struct ofdisk_hash_ent
 {
   char *devpath;
-  char *open_path;
-  char *grub_devpath;
   int is_boot;
   int is_cdrom;
   /* Pointer to shortest available name on nodes representing canonical names,
      otherwise NULL.  */
   const char *shortest;
-  const char *grub_shortest;
   struct ofdisk_hash_ent *next;
 };
 
@@ -73,50 +70,12 @@ ofdisk_hash_add_real (char *devpath)
 {
   struct ofdisk_hash_ent *p;
   struct ofdisk_hash_ent **head = &ofdisk_hash[ofdisk_hash_fn(devpath)];
-  const char *iptr;
-  char *optr;
 
   p = grub_zalloc (sizeof (*p));
   if (!p)
     return NULL;
 
   p->devpath = devpath;
-
-  p->grub_devpath = grub_malloc (sizeof ("ieee1275/")
-				 + 2 * grub_strlen (p->devpath));
-
-  if (!p->grub_devpath)
-    {
-      grub_free (p);
-      return NULL;
-    }
-
-  if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PARTITION_0))
-    {
-      p->open_path = grub_malloc (grub_strlen (p->devpath) + 3);
-      if (!p->open_path)
-	{
-	  grub_free (p->grub_devpath);
-	  grub_free (p);
-	  return NULL;
-	}
-      optr = grub_stpcpy (p->open_path, p->devpath);
-      *optr++ = ':';
-      *optr++ = '0';
-      *optr = '\0';
-    }
-  else
-    p->open_path = p->devpath;
-
-  optr = grub_stpcpy (p->grub_devpath, "ieee1275/");
-  for (iptr = p->devpath; *iptr; )
-    {
-      if (*iptr == ',')
-	*optr++ = '\\';
-      *optr++ = *iptr++;
-    }
-  *optr = 0;
-
   p->next = *head;
   *head = p;
   return p;
@@ -145,8 +104,7 @@ ofdisk_hash_add (char *devpath, char *curcan)
 
   if (!curcan)
     {
-      p->shortest = p->devpath;
+      p->shortest = devpath;
-      p->grub_shortest = p->grub_devpath;
       if (check_string_cdrom (devpath))
 	p->is_cdrom = 1;  
       return p;
@@ -167,10 +125,7 @@ ofdisk_hash_add (char *devpath, char *curcan)
     {
       if (!pcan->shortest
 	  || grub_strlen (pcan->shortest) > grub_strlen (devpath))
-	{
+	pcan->shortest = devpath;
-	  pcan->shortest = p->devpath;
-	  pcan->grub_shortest = p->grub_devpath;
-	}
     }
 
   return p;
@@ -333,8 +288,21 @@ grub_ofdisk_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data,
 	  if (!ent->is_boot && ent->is_cdrom)
 	    continue;
 
-	  if (hook (ent->grub_shortest, hook_data))
+	  {
-	    return 1;
+	    char buffer[sizeof ("ieee1275/") + 2 * grub_strlen (ent->shortest)];
+	    const char *iptr;
+	    char *optr;
+	    optr = grub_stpcpy (buffer, "ieee1275/");
+	    for (iptr = ent->shortest; *iptr; )
+	      {
+		if (*iptr == ',')
+		  *optr++ = '\\';
+		*optr++ = *iptr++;
+	      }
+	    *optr = 0;
+	    if (hook (buffer, hook_data))
+	      return 1;
+	  }
 	}
     }	  
   return 0;
@@ -428,7 +396,7 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
     if (!op)
       return grub_errno;
     disk->id = (unsigned long) op;
-    disk->data = op->open_path;
+    disk->data = op->devpath;
   }
 
   return 0;
@@ -460,7 +428,20 @@ grub_ofdisk_prepare (grub_disk_t disk, grub_disk_addr_t sector)
       last_ihandle = 0;
       last_devpath = NULL;
 
-      grub_ieee1275_open (disk->data, &last_ihandle);
+      if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PARTITION_0))
+	{
+	  char name2[grub_strlen (disk->data) + 3];
+	  char *p;
+	  
+	  grub_strcpy (name2, disk->data);
+	  p = name2 + grub_strlen (name2);
+	  *p++ = ':';
+	  *p++ = '0';
+	  *p = 0;
+	  grub_ieee1275_open (name2, &last_ihandle);
+	}
+      else
+	grub_ieee1275_open (disk->data, &last_ihandle);
       if (! last_ihandle)
 	return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
       last_devpath = disk->data;      

grub-core/disk/ldm.c

@@ -49,7 +49,7 @@ struct grub_ldm_vblk {
   grub_uint8_t type;
   grub_uint32_t unused2;
   grub_uint8_t dynamic[104];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 #define LDM_VBLK_MAGIC "VBLK"
 
 enum
@@ -83,7 +83,7 @@ struct grub_ldm_label
   grub_uint64_t pv_size;
   grub_uint64_t config_start;
   grub_uint64_t config_size;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 
 #define LDM_MAGIC "PRIVHEAD"
@@ -1012,7 +1012,7 @@ grub_util_ldm_embed (struct grub_disk *disk, unsigned int *nsectors,
 			      usable for bootloaders (called generically
 			      "embedding zone") and this operation is
 			      called "embedding".  */
-			   N_("your LDM Embedding Partition is too small;"
+			   N_("your LDM embedding Partition is too small;"
 			      " embedding won't be possible"));
       *nsectors = lv->size;
       if (*nsectors > max_nsectors)

grub-core/disk/loopback.c

@@ -32,11 +32,9 @@ struct grub_loopback
   char *devname;
   grub_file_t file;
   struct grub_loopback *next;
-  unsigned long id;
 };
 
 static struct grub_loopback *loopback_list;
-static unsigned long last_id = 0;
 
 static const struct grub_arg_option options[] =
   {
@@ -122,7 +120,6 @@ grub_cmd_loopback (grub_extcmd_context_t ctxt, int argc, char **args)
     }
 
   newdev->file = file;
-  newdev->id = last_id++;
 
   /* Add the new entry to the list.  */
   newdev->next = loopback_list;
@@ -174,7 +171,7 @@ grub_loopback_open (const char *name, grub_disk_t disk)
   disk->max_agglomerate = 1 << (29 - GRUB_DISK_SECTOR_BITS
 				- GRUB_DISK_CACHE_BITS);
 
-  disk->id = dev->id;
+  disk->id = (unsigned long) dev;
 
   disk->data = dev;
 

grub-core/disk/luks.c

@@ -56,7 +56,7 @@ struct grub_luks_phdr
     grub_uint32_t keyMaterialOffset;
     grub_uint32_t stripes;
   } keyblock[8];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 typedef struct grub_luks_phdr *grub_luks_phdr_t;
 

grub-core/disk/lvm.c

@@ -65,7 +65,7 @@ grub_lvm_checkvalue (char **p, char *str, char *tmpl)
 static int
 grub_lvm_check_flag (char *p, const char *str, const char *flag)
 {
-  grub_size_t len_str = grub_strlen (str), len_flag = grub_strlen (flag);
+  int len_str = grub_strlen (str), len_flag = grub_strlen (flag);
   while (1)
     {
       char *q;
@@ -111,8 +111,7 @@ grub_lvm_detect (grub_disk_t disk,
   struct grub_lvm_disk_locn *dlocn;
   struct grub_lvm_mda_header *mdah;
   struct grub_lvm_raw_locn *rlocn;
-  unsigned int i, j;
+  unsigned int i, j, vgname_len;
-  grub_size_t vgname_len;
   struct grub_diskfilter_vg *vg;
   struct grub_diskfilter_pv *pv;
 
@@ -274,7 +273,7 @@ grub_lvm_detect (grub_disk_t disk,
 	  /* Add all the pvs to the volume group. */
 	  while (1)
 	    {
-	      grub_ssize_t s;
+	      int s;
 	      while (grub_isspace (*p))
 		p++;
 
@@ -341,7 +340,7 @@ grub_lvm_detect (grub_disk_t disk,
 	  /* And add all the lvs to the volume group. */
 	  while (1)
 	    {
-	      grub_ssize_t s;
+	      int s;
 	      int skip_lv = 0;
 	      struct grub_diskfilter_lv *lv;
 	      struct grub_diskfilter_segment *seg;

grub-core/disk/mdraid1x_linux.c

@@ -97,7 +97,7 @@ struct grub_raid_super_1x
    */
   grub_uint16_t dev_roles[0];	/* Role in array, or 0xffff for a spare, or 0xfffe for faulty.  */
 };
-/* Could be GRUB_PACKED, but since all members in this struct
+/* Could be __attribute__ ((packed)), but since all members in this struct
    are already appropriately aligned, we can omit this and avoid suboptimal
    assembly in some cases.  */
 

grub-core/disk/mdraid_linux.c

@@ -175,7 +175,7 @@ struct grub_raid_super_09
    * Active descriptor
    */
   struct grub_raid_disk_09 this_disk;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 static struct grub_diskfilter_vg *
 grub_mdraid_detect (grub_disk_t disk,

grub-core/disk/memdisk.c

@@ -47,7 +47,7 @@ grub_memdisk_open (const char *name, grub_disk_t disk)
 
   disk->total_sectors = memdisk_size / GRUB_DISK_SECTOR_SIZE;
   disk->max_agglomerate = GRUB_DISK_MAX_MAX_AGGLOMERATE;
-  disk->id = 0;
+  disk->id = (unsigned long) "mdsk";
 
   return GRUB_ERR_NONE;
 }

grub-core/disk/pata.c

@@ -402,15 +402,9 @@ grub_pata_pciinit (grub_pci_device_t dev,
 	  bar2 = grub_pci_read (addr);
 
 	  /* Check if the BARs describe an IO region.  */
-	  if ((bar1 & 1) && (bar2 & 1) && (bar1 & ~3))
+	  if ((bar1 & 1) && (bar2 & 1))
 	    {
 	      rega = bar1 & ~3;
-	      addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
-	      grub_pci_write_word (addr, grub_pci_read_word (addr)
-				   | GRUB_PCI_COMMAND_IO_ENABLED
-				   | GRUB_PCI_COMMAND_MEM_ENABLED
-				   | GRUB_PCI_COMMAND_BUS_MASTER);
-
 	    }
 	}
 

grub-core/disk/raid6_recover.c

@@ -34,9 +34,9 @@ static unsigned powx_inv[256];
 static const grub_uint8_t poly = 0x1d;
 
 static void
-grub_raid_block_mulx (unsigned mul, char *buf, grub_size_t size)
+grub_raid_block_mulx (unsigned mul, char *buf, int size)
 {
-  grub_size_t i;
+  int i;
   grub_uint8_t *p;
 
   p = (grub_uint8_t *) buf;

grub-core/disk/usbms.c

@@ -44,7 +44,7 @@ struct grub_usbms_cbw
   grub_uint8_t lun;
   grub_uint8_t length;
   grub_uint8_t cbwcb[16];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_usbms_csw
 {
@@ -52,7 +52,7 @@ struct grub_usbms_csw
   grub_uint32_t tag;
   grub_uint32_t residue;
   grub_uint8_t status;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_usbms_dev
 {
@@ -298,8 +298,6 @@ grub_usbms_transfer_bo (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
   grub_usb_err_t errCSW = GRUB_USB_ERR_NONE;
   int retrycnt = 3 + 1;
   
-  tag++;
-
  retry:
   retrycnt--;
   if (retrycnt == 0)
@@ -308,7 +306,7 @@ grub_usbms_transfer_bo (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
   /* Setup the request.  */
   grub_memset (&cbw, 0, sizeof (cbw));
   cbw.signature = grub_cpu_to_le32 (0x43425355);
-  cbw.tag = tag;
+  cbw.tag = tag++;
   cbw.transfer_length = grub_cpu_to_le32 (size);
   cbw.flags = (!read_write) << GRUB_USBMS_DIRECTION_BIT;
   cbw.lun = scsi->lun; /* In USB MS CBW are LUN bits on another place than in SCSI CDB, both should be set correctly. */
@@ -337,7 +335,7 @@ grub_usbms_transfer_bo (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
 	  grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
 	  goto CheckCSW;
 	}
-      goto retry;
+      return grub_error (GRUB_ERR_IO, "USB Mass Storage request failed");
     }
 
   /* Read/write the data, (maybe) according to specification.  */

grub-core/font/font.c

@@ -33,7 +33,7 @@
 
 GRUB_MOD_LICENSE ("GPLv3+");
 
-#if HAVE_FONT_SOURCE
+#ifdef USE_ASCII_FALLBACK
 #include "ascii.h"
 #endif
 
@@ -110,14 +110,14 @@ static struct grub_font null_font;
 /* Flag to ensure module is initialized only once.  */
 static grub_uint8_t font_loader_initialized;
 
-#if HAVE_FONT_SOURCE
+#ifdef USE_ASCII_FALLBACK
 static struct grub_font_glyph *ascii_font_glyph[0x80];
 #endif
 
 static struct grub_font_glyph *
 ascii_glyph_lookup (grub_uint32_t code)
 {
-#if HAVE_FONT_SOURCE
+#ifdef USE_ASCII_FALLBACK
   static int ascii_failback_initialized = 0;
 
   if (code >= 0x80)

grub-core/fs/affs.c

@@ -36,7 +36,7 @@ struct grub_affs_bblock
   grub_uint8_t flags;
   grub_uint32_t checksum;
   grub_uint32_t rootblock;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* Set if the filesystem is a AFFS filesystem.  Otherwise this is an
    OFS filesystem.  */
@@ -51,14 +51,14 @@ struct grub_affs_rblock
   grub_uint32_t unused2;
   grub_uint32_t checksum;
   grub_uint32_t hashtable[1];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_affs_time
 {
   grub_int32_t day;
   grub_uint32_t min;
   grub_uint32_t hz;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* The second part of a file header block.  */
 struct grub_affs_file
@@ -76,7 +76,7 @@ struct grub_affs_file
   grub_uint32_t parent;
   grub_uint32_t extension;
   grub_uint32_t type;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* The location of `struct grub_affs_file' relative to the end of a
    file header block.  */

grub-core/fs/bfs.c

@@ -73,7 +73,7 @@ struct grub_bfs_extent
   grub_uint32_t ag;
   grub_uint16_t start;
   grub_uint16_t len;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_bfs_superblock
 {
@@ -89,7 +89,7 @@ struct grub_bfs_superblock
   grub_uint8_t unused3[32];
   grub_uint32_t magic3;
   struct grub_bfs_extent root_dir;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_bfs_inode
 {
@@ -118,11 +118,11 @@ struct grub_bfs_inode
       grub_uint64_t max_double_indirect_range;
       grub_uint64_t size;
       grub_uint32_t pad[4];
-    } GRUB_PACKED;
+    } __attribute__ ((packed));
     char inplace_link[144];
-  } GRUB_PACKED;
+  } __attribute__ ((packed));
   grub_uint8_t small_data[0];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 enum
 {
@@ -134,7 +134,7 @@ struct grub_bfs_small_data_element_header
   grub_uint32_t type;
   grub_uint16_t name_len;
   grub_uint16_t value_len;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_bfs_btree_header
 {
@@ -151,7 +151,7 @@ struct grub_bfs_btree_header
   grub_uint64_t root;
 #endif
   grub_uint32_t unused2[2];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_bfs_btree_node
 {
@@ -165,7 +165,7 @@ struct grub_bfs_btree_node
   grub_uint16_t count_keys;
   grub_uint16_t total_key_len;
 #endif
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_bfs_data
 {

grub-core/fs/btrfs.c

@@ -53,7 +53,7 @@ struct grub_btrfs_device
   grub_uint64_t device_id;
   grub_uint64_t size;
   grub_uint8_t dummy[0x62 - 0x10];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_btrfs_superblock
 {
@@ -71,7 +71,7 @@ struct grub_btrfs_superblock
   char label[0x100];
   grub_uint8_t dummy4[0x100];
   grub_uint8_t bootstrap_mapping[0x800];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct btrfs_header
 {
@@ -80,7 +80,7 @@ struct btrfs_header
   grub_uint8_t dummy[0x30];
   grub_uint32_t nitems;
   grub_uint8_t level;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_btrfs_device_desc
 {
@@ -122,28 +122,28 @@ struct grub_btrfs_chunk_item
   grub_uint8_t dummy2[0xc];
   grub_uint16_t nstripes;
   grub_uint16_t nsubstripes;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_btrfs_chunk_stripe
 {
   grub_uint64_t device_id;
   grub_uint64_t offset;
   grub_btrfs_uuid_t device_uuid;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_btrfs_leaf_node
 {
   struct grub_btrfs_key key;
   grub_uint32_t offset;
   grub_uint32_t size;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_btrfs_internal_node
 {
   struct grub_btrfs_key key;
   grub_uint64_t addr;
   grub_uint64_t dummy;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_btrfs_dir_item
 {
@@ -156,7 +156,7 @@ struct grub_btrfs_dir_item
 #define GRUB_BTRFS_DIR_ITEM_TYPE_SYMLINK 7
   grub_uint8_t type;
   char name[0];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_btrfs_leaf_descriptor
 {
@@ -183,7 +183,7 @@ struct grub_btrfs_inode
   grub_uint64_t size;
   grub_uint8_t dummy2[0x70];
   struct grub_btrfs_time mtime;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_btrfs_extent_data
 {
@@ -204,7 +204,7 @@ struct grub_btrfs_extent_data
       grub_uint64_t filled;
     };
   };
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 #define GRUB_BTRFS_EXTENT_INLINE 0
 #define GRUB_BTRFS_EXTENT_REGULAR 1
@@ -1104,12 +1104,7 @@ grub_btrfs_extent_read (struct grub_btrfs_data *data,
 					 - (grub_uint8_t *) data->extent),
 					extoff, buf, csize)
 		  != (grub_ssize_t) csize)
-		{
+		return -1;
-		  if (!grub_errno)
-		    grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
-				"premature end of compressed");
-		  return -1;
-		}
 	    }
 	  else if (data->extent->compression == GRUB_BTRFS_COMPRESSION_LZO)
 	    {
@@ -1163,12 +1158,7 @@ grub_btrfs_extent_read (struct grub_btrfs_data *data,
 	      grub_free (tmp);
 
 	      if (ret != (grub_ssize_t) csize)
-		{
+		return -1;
-		  if (!grub_errno)
-		    grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
-				"premature end of compressed");
-		  return -1;
-		}
 
 	      break;
 	    }

grub-core/fs/cbfs.c

@@ -291,7 +291,7 @@ grub_cbfsdisk_open (const char *name, grub_disk_t disk)
 
   disk->total_sectors = cbfsdisk_size / GRUB_DISK_SECTOR_SIZE;
   disk->max_agglomerate = GRUB_DISK_MAX_MAX_AGGLOMERATE;
-  disk->id = 0;
+  disk->id = (unsigned long) "cbfs";
 
   return GRUB_ERR_NONE;
 }

grub-core/fs/cpio.c

@@ -35,7 +35,7 @@ struct head
   grub_uint16_t mtime[2];
   grub_uint16_t namesize[1];
   grub_uint16_t filesize[2];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 static inline unsigned long long
 read_number (const grub_uint16_t *arr, grub_size_t size)

grub-core/fs/cpio_be.c

@@ -35,7 +35,7 @@ struct head
   grub_uint16_t mtime[2];
   grub_uint16_t namesize[1];
   grub_uint16_t filesize[2];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 static inline unsigned long long
 read_number (const grub_uint16_t *arr, grub_size_t size)

grub-core/fs/fat.c

@@ -92,7 +92,7 @@ struct grub_fat_dir_entry
       grub_uint8_t m_time_tenth;
       grub_uint8_t a_time_tenth;
       grub_uint8_t reserved2[9];
-    }  GRUB_PACKED file;
+    }  __attribute__ ((packed)) file;
     struct {
       grub_uint8_t flags;
       grub_uint8_t reserved1;
@@ -103,17 +103,17 @@ struct grub_fat_dir_entry
       grub_uint32_t reserved3;
       grub_uint32_t first_cluster;
       grub_uint64_t file_size;
-    }   GRUB_PACKED stream_extension;
+    }   __attribute__ ((packed)) stream_extension;
     struct {
       grub_uint8_t flags;
       grub_uint16_t str[15];
-    }  GRUB_PACKED  file_name;
+    }  __attribute__ ((packed))  file_name;
     struct {
       grub_uint8_t character_count;
       grub_uint16_t str[15];
-    }  GRUB_PACKED  volume_label;
+    }  __attribute__ ((packed))  volume_label;
-  }  GRUB_PACKED type_specific;
+  }  __attribute__ ((packed)) type_specific;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_fat_dir_node
 {
@@ -142,7 +142,7 @@ struct grub_fat_dir_entry
   grub_uint16_t w_date;
   grub_uint16_t first_cluster_low;
   grub_uint32_t file_size;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_fat_long_name_entry
 {
@@ -154,7 +154,7 @@ struct grub_fat_long_name_entry
   grub_uint16_t name2[6];
   grub_uint16_t first_cluster;
   grub_uint16_t name3[2];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 typedef struct grub_fat_dir_entry grub_fat_dir_node_t;
 

grub-core/fs/hfs.c

@@ -65,7 +65,7 @@ struct grub_hfs_node
   grub_uint8_t level;
   grub_uint16_t reccnt;
   grub_uint16_t unused;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* The head of the B*-Tree.  */
 struct grub_hfs_treeheader
@@ -81,7 +81,7 @@ struct grub_hfs_treeheader
   grub_uint32_t nodes;
   grub_uint32_t free_nodes;
   grub_uint8_t unused[76];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* The state of a mounted HFS filesystem.  */
 struct grub_hfs_data
@@ -112,7 +112,7 @@ struct grub_hfs_catalog_key
 
   /* Filename.  */
   grub_uint8_t str[31];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* The key as used on disk in a extent overflow tree.  Using this key
    the extents can be looked up using a fileid and logical start block
@@ -125,7 +125,7 @@ struct grub_hfs_extent_key
   grub_uint8_t forktype;
   grub_uint32_t fileid;
   grub_uint16_t first_block;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* A directory record.  This is used to find out the directory ID.  */
 struct grub_hfs_dirrec
@@ -136,7 +136,7 @@ struct grub_hfs_dirrec
   grub_uint32_t dirid;
   grub_uint32_t ctime;
   grub_uint32_t mtime;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* Information about a file.  */
 struct grub_hfs_filerec
@@ -154,7 +154,7 @@ struct grub_hfs_filerec
   /* The first 3 extents of the file.  The other extents can be found
      in the extent overflow file.  */
   grub_hfs_datarecord_t extents;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* A record descriptor, both key and data, used to pass to call back
    functions.  */
@@ -712,7 +712,7 @@ grub_hfs_iterate_records (struct grub_hfs_data *data, int type, int idx,
 	  {
 	    grub_uint8_t keylen;
 	    grub_uint8_t key;
-	  } GRUB_PACKED *pnt;
+	  } __attribute__ ((packed)) *pnt;
 	  pnt = (struct pointer *) (grub_be_to_cpu16 (node->offsets[pos])
 				    + node->rawnode);
 
@@ -1229,18 +1229,14 @@ grub_hfs_dir_hook (struct grub_hfs_record *rec, void *hook_arg)
     {
       info.dir = 1;
       info.mtimeset = 1;
-      info.inodeset = 1;
       info.mtime = grub_be_to_cpu32 (drec->mtime) - 2082844800;
-      info.inode = grub_be_to_cpu32 (drec->dirid);
       return ctx->hook (fname, &info, ctx->hook_data);
     }
   if (frec->type == GRUB_HFS_FILETYPE_FILE)
     {
       info.dir = 0;
       info.mtimeset = 1;
-      info.inodeset = 1;
       info.mtime = grub_be_to_cpu32 (frec->mtime) - 2082844800;
-      info.inode = grub_be_to_cpu32 (frec->fileid);
       return ctx->hook (fname, &info, ctx->hook_data);
     }
 

grub-core/fs/hfsplus.c

@@ -34,6 +34,11 @@
 
 GRUB_MOD_LICENSE ("GPLv3+");
 
+#define GRUB_HFSPLUS_MAGIC 0x482B
+#define GRUB_HFSPLUSX_MAGIC 0x4858
+#define GRUB_HFSPLUS_SBLOCK 2
+
+
 /* The type of node.  */
 enum grub_hfsplus_btnode_type
   {
@@ -60,7 +65,7 @@ struct grub_hfsplus_btheader
   grub_uint8_t btree_type;
   grub_uint8_t key_compare;
   grub_uint32_t attributes;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_hfsplus_catfile
 {
@@ -75,7 +80,7 @@ struct grub_hfsplus_catfile
   grub_uint8_t unused3[44];
   struct grub_hfsplus_forkdata data;
   struct grub_hfsplus_forkdata resource;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* Filetype information as used in inodes.  */
 #define GRUB_HFSPLUS_FILEMODE_MASK	0170000
@@ -914,8 +919,6 @@ grub_hfsplus_dir_iter (const char *filename,
   info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR);
   info.mtimeset = 1;
   info.mtime = node->mtime;
-  info.inodeset = 1;
-  info.inode = node->fileid;
   info.case_insensitive = !! (filetype & GRUB_FSHELP_CASE_INSENSITIVE);
   grub_free (node);
   return ctx->hook (filename, &info, ctx->hook_data);

grub-core/fs/hfspluscomp.c

@@ -35,19 +35,19 @@ struct grub_hfsplus_compress_header1
   grub_uint32_t total_compressed_size_including_seek_blocks_and_header2;
   grub_uint32_t value_0x32;
   grub_uint8_t unused[0xf0];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* big-endian.  */
 struct grub_hfsplus_compress_header2
 {
   grub_uint32_t total_compressed_size_including_seek_blocks;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* little-endian.  */
 struct grub_hfsplus_compress_header3
 {
   grub_uint32_t num_chunks;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* little-endian.  */
 struct grub_hfsplus_compress_block_descriptor
@@ -59,7 +59,7 @@ struct grub_hfsplus_compress_block_descriptor
 struct grub_hfsplus_compress_end_descriptor
 {
   grub_uint8_t always_the_same[50];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_hfsplus_attr_header
 {
@@ -67,7 +67,7 @@ struct grub_hfsplus_attr_header
   grub_uint8_t type;
   grub_uint32_t unknown[1];
   grub_uint64_t size;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_hfsplus_compress_attr
 {
@@ -75,7 +75,7 @@ struct grub_hfsplus_compress_attr
   grub_uint32_t type;
   grub_uint32_t uncompressed_inline_size;
   grub_uint32_t always_0;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 enum
   {
@@ -156,12 +156,8 @@ hfsplus_read_compressed_real (struct grub_hfsplus_file *node,
 	  if (ts > node->size - (pos & ~(HFSPLUS_COMPRESS_BLOCK_SIZE)))
 	    ts = node->size - (pos & ~(HFSPLUS_COMPRESS_BLOCK_SIZE));
 	  if (grub_zlib_decompress (tmp_buf, sz, 0,
-				    node->cbuf, ts) != (grub_ssize_t) ts)
+				    node->cbuf, ts) < 0)
 	    {
-	      if (!grub_errno)
-		grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
-			    "premature end of compressed");
-
 	      grub_free (tmp_buf);
 	      return -1;
 	    }
@@ -292,14 +288,8 @@ hfsplus_open_compressed_real (struct grub_hfsplus_file *node)
   if (grub_zlib_decompress ((char *) (cmp_head + 1),
 			    grub_cpu_to_be64 (attr_head->size)
 			    - sizeof (*cmp_head), 0,
-			    node->cbuf, node->size)
+			    node->cbuf, node->size) < 0)
-      != (grub_ssize_t) node->size)
+    return grub_errno;
-    {
-      if (!grub_errno)
-	grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
-		    "premature end of compressed");
-      return grub_errno;
-    }
   node->compressed = 1;
   return 0;
 }

grub-core/fs/iso9660.c

@@ -54,7 +54,7 @@ struct grub_iso9660_voldesc
   grub_uint8_t type;
   grub_uint8_t magic[5];
   grub_uint8_t version;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_iso9660_date2
 {
@@ -65,7 +65,7 @@ struct grub_iso9660_date2
   grub_uint8_t minute;
   grub_uint8_t second;
   grub_uint8_t offset;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* A directory entry.  */
 struct grub_iso9660_dir
@@ -81,7 +81,7 @@ struct grub_iso9660_dir
   grub_uint8_t unused2[6];
 #define MAX_NAMELEN 255
   grub_uint8_t namelen;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_iso9660_date
 {
@@ -93,7 +93,7 @@ struct grub_iso9660_date
   grub_uint8_t second[2];
   grub_uint8_t hundredth[2];
   grub_uint8_t offset;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* The primary volume descriptor.  Only little endian is used.  */
 struct grub_iso9660_primary_voldesc
@@ -112,7 +112,7 @@ struct grub_iso9660_primary_voldesc
   grub_uint8_t unused6[624];
   struct grub_iso9660_date created;
   struct grub_iso9660_date modified;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* A single entry in the path table.  */
 struct grub_iso9660_path
@@ -122,7 +122,7 @@ struct grub_iso9660_path
   grub_uint32_t first_sector;
   grub_uint16_t parentdir;
   grub_uint8_t name[0];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* An entry in the System Usage area of the directory entry.  */
 struct grub_iso9660_susp_entry
@@ -131,7 +131,7 @@ struct grub_iso9660_susp_entry
   grub_uint8_t len;
   grub_uint8_t version;
   grub_uint8_t data[0];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* The CE entry.  This is used to describe the next block where data
    can be found.  */
@@ -144,7 +144,7 @@ struct grub_iso9660_susp_ce
   grub_uint32_t off_be;
   grub_uint32_t len;
   grub_uint32_t len_be;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_iso9660_data
 {

grub-core/fs/jfs.c

@@ -70,7 +70,7 @@ struct grub_jfs_extent
   /* The physical offset of the first block on the disk.  */
   grub_uint8_t blk1;
   grub_uint32_t blk2;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 #define GRUB_JFS_IAG_INODES_OFFSET 3072
 #define GRUB_JFS_IAG_INODES_COUNT 128
@@ -79,7 +79,7 @@ struct grub_jfs_iag
 {
   grub_uint8_t unused[GRUB_JFS_IAG_INODES_OFFSET];
   struct grub_jfs_extent inodes[GRUB_JFS_IAG_INODES_COUNT];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 
 /* The head of the tree used to find extents.  */
@@ -94,7 +94,7 @@ struct grub_jfs_treehead
   grub_uint16_t count;
   grub_uint16_t max;
   grub_uint8_t unused2[10];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* A node in the extent tree.  */
 struct grub_jfs_tree_extent
@@ -107,7 +107,7 @@ struct grub_jfs_tree_extent
   grub_uint32_t offset2;
 
   struct grub_jfs_extent extent;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* The tree of directory entries.  */
 struct grub_jfs_tree_dir
@@ -128,7 +128,7 @@ struct grub_jfs_tree_dir
   /* The location of the sorted array of pointers to dirents.  */
   grub_uint8_t sindex;
   grub_uint8_t unused[10];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* An internal node in the dirents tree.  */
 struct grub_jfs_internal_dirent
@@ -137,7 +137,7 @@ struct grub_jfs_internal_dirent
   grub_uint8_t next;
   grub_uint8_t len;
   grub_uint16_t namepart[11];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* A leaf node in the dirents tree.  */
 struct grub_jfs_leaf_dirent
@@ -150,7 +150,7 @@ struct grub_jfs_leaf_dirent
   grub_uint8_t len;
   grub_uint16_t namepart[11];
   grub_uint32_t index;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 /* A leaf in the dirents tree.  This one is used if the previously
    dirent was not big enough to store the name.  */
@@ -159,13 +159,13 @@ struct grub_jfs_leaf_next_dirent
   grub_uint8_t next;
   grub_uint8_t len;
   grub_uint16_t namepart[15];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_jfs_time
 {
   grub_int32_t sec;
   grub_int32_t nanosec;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_jfs_inode
 {
@@ -185,7 +185,7 @@ struct grub_jfs_inode
   union
   {
     /* The tree describing the extents of the file.  */
-    struct GRUB_PACKED
+    struct __attribute__ ((packed))
     {
       struct grub_jfs_treehead tree;
       struct grub_jfs_tree_extent extents[16];
@@ -206,15 +206,15 @@ struct grub_jfs_inode
 	grub_uint8_t sorted[8];
       } header;
       struct grub_jfs_leaf_dirent dirents[8];
-    } GRUB_PACKED dir;
+    } dir __attribute__ ((packed));
     /* Fast symlink.  */
     struct
     {
       grub_uint8_t unused[32];
       grub_uint8_t path[256];
     } symlink;
-  } GRUB_PACKED;
+  } __attribute__ ((packed));
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_jfs_data
 {
@@ -226,7 +226,7 @@ struct grub_jfs_data
   int pos;
   int linknest;
   int namecomponentlen;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_jfs_diropen
 {
@@ -237,7 +237,7 @@ struct grub_jfs_diropen
     struct grub_jfs_leaf_dirent dirent[0];
     struct grub_jfs_leaf_next_dirent next_dirent[0];
     grub_uint8_t sorted[0];
-  } GRUB_PACKED *dirpage;
+  } *dirpage __attribute__ ((packed));
   struct grub_jfs_data *data;
   struct grub_jfs_inode *inode;
   int count;
@@ -251,7 +251,7 @@ struct grub_jfs_diropen
    */
   char name[256 * GRUB_MAX_UTF8_PER_UTF16 + 1];
   grub_uint32_t ino;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 
 static grub_dl_t my_mod;

grub-core/fs/newc.c

@@ -38,7 +38,7 @@ struct head
   char rdevminor[8];
   char namesize[8];
   char check[8];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 static inline unsigned long long
 read_number (const char *str, grub_size_t size)

grub-core/fs/nilfs2.c

@@ -143,7 +143,7 @@ struct grub_nilfs2_dir_entry
   char name[NILFS_NAME_LEN];
   char pad;
 #endif
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 enum
 {

grub-core/fs/ntfs.c

@@ -643,7 +643,7 @@ struct symlink_descriptor
   grub_uint16_t len1;
   grub_uint16_t off2;
   grub_uint16_t len2;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 static char *
 grub_ntfs_read_symlink (grub_fshelp_node_t node)

grub-core/fs/odc.c

@@ -35,7 +35,7 @@ struct head
   char mtime[11];
   char namesize[6];
   char filesize[11];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 static inline unsigned long long
 read_number (const char *str, grub_size_t size)

grub-core/fs/proc.c

@@ -44,7 +44,7 @@ grub_procdev_open (const char *name, grub_disk_t disk)
       return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a procfs disk");
 
   disk->total_sectors = 0;
-  disk->id = 0;
+  disk->id = (unsigned long) "proc";
 
   disk->data = 0;
 

grub-core/fs/reiserfs.c

@@ -109,14 +109,14 @@ struct grub_reiserfs_superblock
   grub_uint8_t unused[4];
   grub_uint16_t uuid[8];
   char label[16];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_reiserfs_journal_header
 {
   grub_uint32_t last_flush_uid;
   grub_uint32_t unflushed_offset;
   grub_uint32_t mount_id;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_reiserfs_description_block
 {
@@ -124,14 +124,14 @@ struct grub_reiserfs_description_block
   grub_uint32_t len;
   grub_uint32_t mount_id;
   grub_uint32_t real_blocks[0];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_reiserfs_commit_block
 {
   grub_uint32_t id;
   grub_uint32_t len;
   grub_uint32_t real_blocks[0];
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_reiserfs_stat_item_v1
 {
@@ -145,7 +145,7 @@ struct grub_reiserfs_stat_item_v1
   grub_uint32_t ctime;
   grub_uint32_t rdev;
   grub_uint32_t first_direct_byte;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_reiserfs_stat_item_v2
 {
@@ -160,7 +160,7 @@ struct grub_reiserfs_stat_item_v2
   grub_uint32_t ctime;
   grub_uint32_t blocks;
   grub_uint32_t first_direct_byte;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_reiserfs_key
 {
@@ -172,13 +172,13 @@ struct grub_reiserfs_key
     {
       grub_uint32_t offset;
       grub_uint32_t type;
-    } GRUB_PACKED v1;
+    } v1 __attribute__ ((packed));
     struct
     {
       grub_uint64_t offset_type;
-    } GRUB_PACKED v2;
+    } v2 __attribute__ ((packed));
   } u;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_reiserfs_item_header
 {
@@ -187,11 +187,11 @@ struct grub_reiserfs_item_header
   {
     grub_uint16_t free_space;
     grub_uint16_t entry_count;
-  } GRUB_PACKED u;
+  } u __attribute__ ((packed));
   grub_uint16_t item_size;
   grub_uint16_t item_location;
   grub_uint16_t version;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_reiserfs_block_header
 {
@@ -200,14 +200,14 @@ struct grub_reiserfs_block_header
   grub_uint16_t free_space;
   grub_uint16_t reserved;
   struct grub_reiserfs_key block_right_delimiting_key;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_reiserfs_disk_child
 {
   grub_uint32_t block_number;
   grub_uint16_t size;
   grub_uint16_t reserved;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_reiserfs_directory_header
 {
@@ -216,7 +216,7 @@ struct grub_reiserfs_directory_header
   grub_uint32_t object_id;
   grub_uint16_t location;
   grub_uint16_t state;
-} GRUB_PACKED;
+} __attribute__ ((packed));
 
 struct grub_fshelp_node
 {