Merge branch 'master' into andrey/ext4_inline_data

Conflicts: grub-core/fs/ext2.c
ext4 inline data support
2026-10-21 06:49:35 +00:00 · 2016-07-11 07:23:13 +03:00 · 2013-12-18 19:53:19 +01:00
939 changed files with 72007 additions and 45359 deletions
@@ -1 +0,0 @@
 po/exclude.pot binary
@@ -1,277 +1,248 @@
-#
+00_header
-# Ignore patterns in this directory and all subdirectories.
+10_*
-#
+20_linux_xen
 30_os-prober
 40_custom
 41_custom
 *.1
 *.8
-*.a
+aclocal.m4
 ahci_test
 ascii.bitmaps
 ascii.h
 autom4te.cache
 build-grub-gen-asciih
 build-grub-gen-widthspec
 build-grub-mkfont
 cdboot_test
 cmp_test
 config.cache
 config.guess
 config.h
 config-util.h
 config-util.h.in
 config.log
 config.status
 config.sub
 configure
 core_compress_test
 DISTLIST
 docs/*.info
 docs/stamp-vti
 docs/version.texi
 ehci_test
 example_grub_script_test
 example_scripted_test
 example_unit_test
 *.exec
 *.exec.exe
-*.image
+fddboot_test
 *.image.exe
 *.img
 *.log
 *.lst
 *.marker
 *.mod
 *.o
 *.pf2
 *.pp
 *.trs
 *~
 .deps-core/
 .deps-util/
 .deps/
 .dirstamp
 DISTLIST
 GPATH
 GRTAGS
 GSYMS
 GTAGS
 Makefile
 Makefile.in
 ascii.bitmaps
 genkernsyms.sh
 gensymlist.sh
 gentrigtables
 gentrigtables.exe
 gettext_strings_test
 grub-bin2h
 /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.exe
 grub-emu
 grub-emu-lite
 grub-emu-lite.exe
 grub-emu.exe
-grub-macho2img
+grub-emu-lite.exe
 grub_emu_init.c
 grub_emu_init.h
 /grub-file
 /grub-file.exe
 grub-fstest
 grub-fstest.exe
 grub_fstest_init.c
 grub_fstest_init.h
 grub_func_test
 grub-install
 grub-install.exe
 grub-kbdcomp
 /grub-macbless
 /grub-macbless.exe
 grub-macho2img
 /grub-menulst2cfg
 /grub-menulst2cfg.exe
 /grub-mk*
 grub-mount
 /grub-ofpathname
 /grub-ofpathname.exe
 grub-core/build-grub-pe2elf.exe
 /grub-probe
 /grub-probe.exe
 grub_probe_init.c
 grub_probe_init.h
 /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
 grub_script_continue
 grub_script_dollar
 grub_script_echo1
 grub_script_echo_keywords
 grub_script_escape_comma
 grub_script_eval
 grub_script_expansion
 grub_script_final_semicolon
 grub_script_for1
 grub_script_functions
 grub_script_gettext
 grub_script_if
 grub_script_leading_whitespace
 grub_script_no_commands
 grub_script_not
 grub_script_return
 grub_script_setparams
 grub_script_shift
 grub_script_strcmp
 grub_script_test
 grub_script_vars1
 grub_script_while1
 grub_script.tab.c
 grub_script.tab.h
 grub_script.yy.c
 grub_script.yy.h
-grub_script_check_init.c
+grub-set-default
 grub_script_check_init.h
 grub_setup_init.c
 grub_setup_init.h
-mdate-sh
+grub-shell
-mod-*.c
+grub-shell-tester
-update-grub_lib
+grub-sparc64-setup
-widthspec.bin
+grub-sparc64-setup.exe
 #
 # Ignore patterns relative to this .gitignore file's directory.
 #
 /00_header
 /10_*
 /20_linux_xen
 /30_os-prober
 /30_uefi-firmware
 /40_custom
 /41_custom
 /ABOUT-NLS
 /ChangeLog
 /INSTALL.grub
 /Makefile.util.am
 /Makefile.utilgcry.def
 /aclocal.m4
 /ahci_test
 /ascii.h
 /autom4te.cache/
 /btrfs_test
 /build-aux/
 /build-grub-gen-asciih
 /build-grub-gen-widthspec
 /build-grub-mkfont
 /cdboot_test
 /cmp_test
 /compile
 /config-util.h
 /config-util.h.in
 /config.cache
 /config.guess
 /config.h
 /config.log
 /config.status
 /config.sub
 /configure
 /contrib
 /core_compress_test
 /cpio_test
 /date_test
 /depcomp
 /docs/*.info
 /docs/*.info-[0-9]*
 /docs/stamp-1
 /docs/stamp-vti
 /docs/version-dev.texi
 /docs/version.texi
 /ehci_test
 /example_grub_script_test
 /example_scripted_test
 /example_unit_test
 /exfat_test
 /ext234_test
 /f2fs_test
 /fat_test
 /fddboot_test
 /file_filter_test
 /garbage-gen
 /garbage-gen.exe
 /gettext_strings_test
 /gnulib/
 /grub-2.[0-9]*/
 /grub-2.[0-9]*.tar.gz
 /grub-bios-setup
 /grub-bios-setup.exe
 /grub-core/*.module
 /grub-core/*.module.exe
 /grub-core/*.pp
 /grub-core/Makefile.core.am
 /grub-core/Makefile.gcry.def
 /grub-core/bootinfo.txt
 /grub-core/build-grub-module-verifier
 /grub-core/build-grub-pe2elf.exe
 /grub-core/contrib
 /grub-core/gdb_grub
 /grub-core/genmod.sh
 /grub-core/gensyminfo.sh
 /grub-core/gentrigtables
 /grub-core/gentrigtables.exe
 /grub-core/gmodule.pl
 /grub-core/grub.chrp
 /grub-core/kernel.img.bin
 /grub-core/lib/gnulib
 /grub-core/lib/libgcrypt-grub
 /grub-core/modinfo.sh
 /grub-core/rs_decoder.h
 /grub-core/symlist.c
 /grub-core/symlist.h
 /grub-core/trigtables.c
 /grub-core/unidata.c
 /grub-editenv
 /grub-editenv.exe
 /grub-file
 /grub-file.exe
 /grub-fs-tester
 /grub-fstest
 /grub-fstest.exe
 /grub-glue-efi
 /grub-glue-efi.exe
 /grub-install
 /grub-install.exe
 /grub-kbdcomp
 /grub-macbless
 /grub-macbless.exe
 /grub-menulst2cfg
 /grub-menulst2cfg.exe
 /grub-mk*
 /grub-mount
 /grub-ofpathname
 /grub-ofpathname.exe
 /grub-probe
 /grub-probe.exe
 /grub-reboot
 /grub-render-label
 /grub-render-label.exe
 /grub-script-check
 /grub-script-check.exe
 /grub-set-default
 /grub-shell
 /grub-shell-tester
 /grub-sparc64-setup
 /grub-sparc64-setup.exe
 /grub-syslinux2cfg
 /grub-syslinux2cfg.exe
-/grub_cmd_date
+gzcompress_test
-/grub_cmd_echo
+hddboot_test
-/grub_cmd_regexp
+help_test
-/grub_cmd_set_date
+*.img
-/grub_cmd_sleep
+*.image
-/grub_cmd_test
+*.image.exe
-/grub_cmd_tr
+include/grub/cpu
-/grub_fstest_init.c
+include/grub/machine
-/grub_fstest_init.h
+install-sh
-/grub_func_test
+lib/libgcrypt-grub
-/grub_script_blanklines
+libgrub_a_init.c
-/grub_script_blockarg
+*.log
-/grub_script_break
+*.lst
-/grub_script_comments
+lzocompress_test
-/grub_script_continue
+*.marker
-/grub_script_dollar
+Makefile
-/grub_script_echo1
+*.mod
-/grub_script_echo_keywords
+mod-*.c
-/grub_script_escape_comma
+missing
-/grub_script_eval
+netboot_test
-/grub_script_expansion
+*.o
-/grub_script_final_semicolon
+*.a
-/grub_script_for1
+ohci_test
-/grub_script_functions
+partmap_test
-/grub_script_gettext
+pata_test
-/grub_script_if
+*.pf2
-/grub_script_leading_whitespace
+*.pp
-/grub_script_no_commands
+po/*.mo
-/grub_script_not
+po/grub.pot
-/grub_script_return
+po/POTFILES
-/grub_script_setparams
+po/stamp-po
-/grub_script_shift
+printf_test
-/grub_script_strcmp
+priority_queue_unit_test
-/grub_script_test
+pseries_test
-/grub_script_vars1
+stamp-h
-/grub_script_while1
+stamp-h1
-/gzcompress_test
+stamp-h.in
-/hddboot_test
+symlist.c
-/help_test
+symlist.h
-/hfs_test
+trigtables.c
-/hfsplus_test
+*.trs
-/include/grub/cpu
+uhci_test
-/include/grub/gcrypt/g10lib.h
+update-grub_lib
-/include/grub/gcrypt/gcrypt.h
+unidata.c
-/include/grub/machine
+xzcompress_test
-/install-sh
+Makefile.in
-/iso9660_test
+GPATH
-/jfs_test
+GRTAGS
-/lib/libgcrypt-grub
+GSYMS
-/libgrub_a_init.c
+GTAGS
-/lzocompress_test
+compile
-/m4/
+depcomp
-/minixfs_test
+mdate-sh
-/missing
+texinfo.tex
-/netboot_test
+grub-core/lib/libgcrypt-grub
-/nilfs2_test
+.deps
-/ntfs_test
+.deps-util
-/ohci_test
+.deps-core
-/partmap_test
+.dirstamp
-/pata_test
+Makefile.util.am
-/po/*.gmo
+contrib
-/po/*.mo
+grub-core/bootinfo.txt
-/po/*.po
+grub-core/Makefile.core.am
-/po/LINGUAS
+grub-core/Makefile.gcry.def
-/po/Makefile.in.in
+grub-core/contrib
-/po/Makevars
+grub-core/gdb_grub
-/po/Makevars.template
+grub-core/genmod.sh
-/po/POTFILES
+grub-core/gensyminfo.sh
-/po/POTFILES-shell.in
+grub-core/gmodule.pl
-/po/POTFILES.in
+grub-core/grub.chrp
-/po/Rules-quot
+grub-core/modinfo.sh
-/po/grub.pot
+grub-core/*.module
-/po/remove-potcdate.sed
+grub-core/*.module.exe
-/po/stamp-po
+grub-core/*.pp
-/printf_test
+grub-core/kernel.img.bin
-/priority_queue_unit_test
+util/bash-completion.d/grub
-/pseries_test
+grub-core/gnulib/alloca.h
-/reiserfs_test
+grub-core/gnulib/arg-nonnull.h
-/romfs_test
+grub-core/gnulib/c++defs.h
-/squashfs_test
+grub-core/gnulib/charset.alias
-/stamp-h
+grub-core/gnulib/configmake.h
-/stamp-h.in
+grub-core/gnulib/float.h
-/stamp-h1
+grub-core/gnulib/getopt.h
-/syslinux_test
+grub-core/gnulib/langinfo.h
-/tar_test
+grub-core/gnulib/ref-add.sed
-/test_sha512sum
+grub-core/gnulib/ref-del.sed
-/test_unset
+grub-core/gnulib/stdio.h
-/tests/syslinux/ubuntu10.04_grub.cfg
+grub-core/gnulib/stdlib.h
-/texinfo.tex
+grub-core/gnulib/string.h
-/udf_test
+grub-core/gnulib/strings.h
-/uhci_test
+grub-core/gnulib/sys
-/util/bash-completion.d/grub
+grub-core/gnulib/unistd.h
-/widthspec.h
+grub-core/gnulib/warn-on-use.h
-/xfs_test
+grub-core/gnulib/wchar.h
-/xzcompress_test
+grub-core/gnulib/wctype.h
-/zfs_test
+grub-core/rs_decoder.h
 widthspec.bin
 widthspec.h
 docs/stamp-1
 docs/version-dev.texi
 Makefile.utilgcry.def
 po/*.po
 po/*.gmo
 po/LINGUAS
 po/remove-potcdate.sed
 include/grub/gcrypt/gcrypt.h
 include/grub/gcrypt/g10lib.h
 po/POTFILES.in
 po/POTFILES-shell.in
 /grub-glue-efi
 /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
@@ -1,109 +0,0 @@
 # SPDX-License-Identifier: GPL-3.0+
 # Originally Copyright Roger Meier <r.meier@siemens.com>
 # Adapted for GRUB by Alexander Graf <agraf@suse.de>
 #
 # Build GRUB on Travis CI - https://www.travis-ci.org/
 #
 dist: xenial
 language: c
 addons:
  apt:
    packages:
    - autopoint
    - libsdl1.2-dev
    - lzop
    - ovmf
    - python
    - qemu-system
    - unifont
 env:
  global:
    # Include all cross toolchain paths, so we can just call them later down.
    - PATH=/tmp/qemu-install/bin:/tmp/grub/bin:/usr/bin:/bin:/tmp/cross/gcc-8.1.0-nolibc/aarch64-linux/bin:/tmp/cross/gcc-8.1.0-nolibc/arm-linux-gnueabi/bin:/tmp/cross/gcc-8.1.0-nolibc/ia64-linux/bin:/tmp/cross/gcc-8.1.0-nolibc/mips64-linux/bin:/tmp/cross/gcc-8.1.0-nolibc/powerpc64-linux/bin:/tmp/cross/gcc-8.1.0-nolibc/riscv32-linux/bin:/tmp/cross/gcc-8.1.0-nolibc/riscv64-linux/bin:/tmp/cross/gcc-8.1.0-nolibc/sparc64-linux/bin
 before_script:
  # Install necessary toolchains based on $CROSS_TARGETS variable.
  - mkdir /tmp/cross
  # These give us binaries like /tmp/cross/gcc-8.1.0-nolibc/ia64-linux/bin/ia64-linux-gcc
  - for i in $CROSS_TARGETS; do
        ( cd /tmp/cross; wget -t 3 -O - https://mirrors.kernel.org/pub/tools/crosstool/files/bin/x86_64/8.1.0/x86_64-gcc-8.1.0-nolibc-$i.tar.xz | tar xJ );
    done
 script:
  # Comments must be outside the command strings below, or the Travis parser
  # will get confused.
  - ./bootstrap
  # Build all selected GRUB targets.
  - for target in $GRUB_TARGETS; do
      plat=${target#*-};
      arch=${target%-*};
      [ "$arch" = "arm64" ] && arch=aarch64-linux;
      [ "$arch" = "arm" ] && arch=arm-linux-gnueabi;
      [ "$arch" = "ia64" ] && arch=ia64-linux;
      [ "$arch" = "mipsel" ] && arch=mips64-linux;
      [ "$arch" = "powerpc" ] && arch=powerpc64-linux;
      [ "$arch" = "riscv32" ] && arch=riscv32-linux;
      [ "$arch" = "riscv64" ] && arch=riscv64-linux;
      [ "$arch" = "sparc64" ] && arch=sparc64-linux;
      echo "Building $target";
      mkdir obj-$target;
      JOBS=`getconf _NPROCESSORS_ONLN 2> /dev/null || echo 1`;
      [ "$JOBS" == 1 ] || JOBS=$(($JOBS + 1));
      ( cd obj-$target && ../configure --target=$arch --with-platform=$plat --prefix=/tmp/grub && make -j$JOBS && make -j$JOBS install ) &> log || ( cat log; false );
    done
  # Our test canary.
  - echo -e "insmod echo\\ninsmod reboot\\necho hello world\\nreboot" > grub.cfg
  # Assemble images and possibly run them.
  - for target in $GRUB_TARGETS; do grub-mkimage -c grub.cfg -p / -O $target -o grub-$target echo reboot normal; done
  # Run images we know how to run.
  - if [[ "$GRUB_TARGETS" == *"x86_64-efi"* ]]; then qemu-system-x86_64 -bios /usr/share/ovmf/OVMF.fd -m 512 -no-reboot -nographic -net nic -net user,tftp=.,bootfile=grub-x86_64-efi | tee grub.log && grep "hello world" grub.log; fi
 matrix:
  include:
  # Each env setting here is a dedicated build.
    - name: "x86_64"
      env:
        - GRUB_TARGETS="x86_64-efi x86_64-xen"
    - name: "i386"
      env:
        - GRUB_TARGETS="i386-coreboot i386-efi i386-ieee1275 i386-multiboot i386-pc i386-qemu i386-xen i386-xen_pvh"
    - name: "powerpc"
      env:
        - GRUB_TARGETS="powerpc-ieee1275"
        - CROSS_TARGETS="powerpc64-linux"
    - name: "sparc64"
      env:
        - GRUB_TARGETS="sparc64-ieee1275"
        - CROSS_TARGETS="sparc64-linux"
    - name: "ia64"
      env:
        - GRUB_TARGETS="ia64-efi"
        - CROSS_TARGETS="ia64-linux"
    - name: "mips"
      env:
        - GRUB_TARGETS="mips-arc mipsel-arc mipsel-qemu_mips mips-qemu_mips"
        - CROSS_TARGETS="mips64-linux"
    - name: "arm"
      env:
        - GRUB_TARGETS="arm-coreboot arm-efi arm-uboot"
        - CROSS_TARGETS="arm-linux-gnueabi"
    - name: "arm64"
      env:
        - GRUB_TARGETS="arm64-efi"
        - CROSS_TARGETS="aarch64-linux"
    - name: "riscv32"
      env:
        - GRUB_TARGETS="riscv32-efi"
        - CROSS_TARGETS="riscv32-linux"
    - name: "riscv64"
      env:
        - GRUB_TARGETS="riscv64-efi"
        - CROSS_TARGETS="riscv64-linux"
@@ -0,0 +1,223 @@
 1 Notes on the Free Translation Project
 ***************************************
 Free software is going international!  The Free Translation Project is
 a way to get maintainers of free software, translators, and users all
 together, so that free software will gradually become able to speak many
 languages.  A few packages already provide translations for their
 messages.
   If you found this `ABOUT-NLS' file inside a distribution, you may
 assume that the distributed package does use GNU `gettext' internally,
 itself available at your nearest GNU archive site.  But you do _not_
 need to install GNU `gettext' prior to configuring, installing or using
 this package with messages translated.
   Installers will find here some useful hints.  These notes also
 explain how users should proceed for getting the programs to use the
 available translations.  They tell how people wanting to contribute and
 work on translations can contact the appropriate team.
   When reporting bugs in the `intl/' directory or bugs which may be
 related to internationalization, you should tell about the version of
 `gettext' which is used.  The information can be found in the
 `intl/VERSION' file, in internationalized packages.
 1.1 Quick configuration advice
 ==============================
 If you want to exploit the full power of internationalization, you
 should configure it using
     ./configure --with-included-gettext
 to force usage of internationalizing routines provided within this
 package, despite the existence of internationalizing capabilities in the
 operating system where this package is being installed.  So far, only
 the `gettext' implementation in the GNU C library version 2 provides as
 many features (such as locale alias, message inheritance, automatic
 charset conversion or plural form handling) as the implementation here.
 It is also not possible to offer this additional functionality on top
 of a `catgets' implementation.  Future versions of GNU `gettext' will
 very likely convey even more functionality.  So it might be a good idea
 to change to GNU `gettext' as soon as possible.
   So you need _not_ provide this option if you are using GNU libc 2 or
 you have installed a recent copy of the GNU gettext package with the
 included `libintl'.
 1.2 INSTALL Matters
 ===================
 Some packages are "localizable" when properly installed; the programs
 they contain can be made to speak your own native language.  Most such
 packages use GNU `gettext'.  Other packages have their own ways to
 internationalization, predating GNU `gettext'.
   By default, this package will be installed to allow translation of
 messages.  It will automatically detect whether the system already
 provides the GNU `gettext' functions.  If not, the included GNU
 `gettext' library will be used.  This library is wholly contained
 within this package, usually in the `intl/' subdirectory, so prior
 installation of the GNU `gettext' package is _not_ required.
 Installers may use special options at configuration time for changing
 the default behaviour.  The commands:
     ./configure --with-included-gettext
     ./configure --disable-nls
 will, respectively, bypass any pre-existing `gettext' to use the
 internationalizing routines provided within this package, or else,
 _totally_ disable translation of messages.
   When you already have GNU `gettext' installed on your system and run
 configure without an option for your new package, `configure' will
 probably detect the previously built and installed `libintl.a' file and
 will decide to use this.  This might not be desirable.  You should use
 the more recent version of the GNU `gettext' library.  I.e. if the file
 `intl/VERSION' shows that the library which comes with this package is
 more recent, you should use
     ./configure --with-included-gettext
 to prevent auto-detection.
   The configuration process will not test for the `catgets' function
 and therefore it will not be used.  The reason is that even an
 emulation of `gettext' on top of `catgets' could not provide all the
 extensions of the GNU `gettext' library.
   Internationalized packages usually have many `po/LL.po' files, where
 LL gives an ISO 639 two-letter code identifying the language.  Unless
 translations have been forbidden at `configure' time by using the
 `--disable-nls' switch, all available translations are installed
 together with the package.  However, the environment variable `LINGUAS'
 may be set, prior to configuration, to limit the installed set.
 `LINGUAS' should then contain a space separated list of two-letter
 codes, stating which languages are allowed.
 1.3 Using This Package
 ======================
 As a user, if your language has been installed for this package, you
 only have to set the `LANG' environment variable to the appropriate
 `LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
 and `CC' is an ISO 3166 two-letter country code.  For example, let's
 suppose that you speak German and live in Germany.  At the shell
 prompt, merely execute `setenv LANG de_DE' (in `csh'),
 `export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
 This can be done from your `.login' or `.profile' file, once and for
 all.
   You might think that the country code specification is redundant.
 But in fact, some languages have dialects in different countries.  For
 example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
 country code serves to distinguish the dialects.
   The locale naming convention of `LL_CC', with `LL' denoting the
 language and `CC' denoting the country, is the one use on systems based
 on GNU libc.  On other systems, some variations of this scheme are
 used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
 locales supported by your system for your language by running the
 command `locale -a | grep '^LL''.
   Not all programs have translations for all languages.  By default, an
 English message is shown in place of a nonexistent translation.  If you
 understand other languages, you can set up a priority list of languages.
 This is done through a different environment variable, called
 `LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
 for the purpose of message handling, but you still need to have `LANG'
 set to the primary language; this is required by other parts of the
 system libraries.  For example, some Swedish users who would rather
 read translations in German than English for when Swedish is not
 available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
   Special advice for Norwegian users: The language code for Norwegian
 bokma*l changed from `no' to `nb' recently (in 2003).  During the
 transition period, while some message catalogs for this language are
 installed under `nb' and some older ones under `no', it's recommended
 for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
 older translations are used.
   In the `LANGUAGE' environment variable, but not in the `LANG'
 environment variable, `LL_CC' combinations can be abbreviated as `LL'
 to denote the language's main dialect.  For example, `de' is equivalent
 to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
 (Portuguese as spoken in Portugal) in this context.
 1.4 Translating Teams
 =====================
 For the Free Translation Project to be a success, we need interested
 people who like their own language and write it well, and who are also
 able to synergize with other translators speaking the same language.
 Each translation team has its own mailing list.  The up-to-date list of
 teams can be found at the Free Translation Project's homepage,
 `http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
 area.
   If you'd like to volunteer to _work_ at translating messages, you
 should become a member of the translating team for your own language.
 The subscribing address is _not_ the same as the list itself, it has
 `-request' appended.  For example, speakers of Swedish can send a
 message to `sv-request@li.org', having this message body:
     subscribe
   Keep in mind that team members are expected to participate
 _actively_ in translations, or at solving translational difficulties,
 rather than merely lurking around.  If your team does not exist yet and
 you want to start one, or if you are unsure about what to do or how to
 get started, please write to `translation@iro.umontreal.ca' to reach the
 coordinator for all translator teams.
   The English team is special.  It works at improving and uniformizing
 the terminology in use.  Proven linguistic skills are praised more than
 programming skills, here.
 1.5 Available Packages
 ======================
 Languages are not equally supported in all packages.  The following
 matrix shows the current state of internationalization, as of October
 2006.  The matrix shows, in regard of each package, for which languages
 PO files have been submitted to translation coordination, with a
 translation percentage of at least 50%.
 # Matrix here is removed!
   Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
 used for implementing regional variants of languages, or language
 dialects.
   For a PO file in the matrix above to be effective, the package to
 which it applies should also have been internationalized and
 distributed as such by its maintainer.  There might be an observable
 lag between the mere existence a PO file and its wide availability in a
 distribution.
   If October 2006 seems to be old, you may fetch a more recent copy of
 this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
 matrix with full percentage details can be found at
 `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
 1.6 Using `gettext' in new packages
 ===================================
 If you are writing a freely available program and want to
 internationalize it you are welcome to use GNU `gettext' in your
 package.  Of course you have to respect the GNU Library General Public
 License which covers the use of the GNU `gettext' library.  This means
 in particular that even non-free programs can use `libintl' as a shared
 library, whereas only free software can use `libintl' as a static
 library or use modified versions of `libintl'.
   Once the sources are changed appropriately and the setup can handle
 the use of `gettext' the only thing missing are the translations.  The
 Free Translation Project is also available for packages which are not
 developed inside the GNU project.  Therefore the information given above
 applies also for every other Free Software Project.  Contact
 `translation@iro.umontreal.ca' to make the `.pot' files available to
 the translation teams.
@@ -11,15 +11,33 @@ GRUB depends on some software packages installed into your system. If
 you don't have any of them, please obtain and install them before
 configuring the GRUB.
-* GCC 5.1.0 or later
+* GCC 4.1.3 or later
-  Experimental support for clang 3.8.0 or later (results in much bigger binaries)
+  Note: older versions may work but support is limited
-  for i386, x86_64, arm (including thumb), arm64, mips(el), powerpc, sparc64
+
  Experimental support for clang 3.3 or later (results in much bigger binaries)
  for i386, x86_64, arm (except thumb), arm64, mips(el), powerpc, sparc64
  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
 	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 3.5 or later works for sparc64
        earlier versions return "error: unable to interface with target machine"
  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
 * GNU binutils 2.9.1.0.23 or later
 * Flex 2.5.35 or later
 * pkg-config
 * Other standard GNU/Unix tools
 * a libc with large file support (e.g. glibc 2.1 or later)
@@ -35,15 +53,15 @@ For optional grub-emu features, you need:
 To build GRUB's graphical terminal (gfxterm), you need:
-* FreeType 2.1.5 or later
+* FreeType 2 or later
 * GNU Unifont
 If you use a development snapshot or want to hack on GRUB you may
 need the following.
 * Python 2.6 or later
-* Autoconf 2.63 or later
+* Autoconf 2.60 or later
-* Automake 1.11 or later
+* Automake 1.10.1 or later
 Prerequisites for make-check:
@@ -84,11 +102,10 @@ The simplest way to compile this package is:
  2. Skip this and following step if you use release tarball and proceed to
     step 4. If you want translations type `./linguas.sh'.
-  3. Type `./bootstrap'.
+  3. Type `./autogen.sh'.
-     * autogen.sh (called by bootstrap) uses python. By default the
+     * autogen.sh uses python. By default invocation is "python" but can be
-       invocation is "python", but it can be overridden by setting the
+       overriden by setting variable $PYTHON.
       variable $PYTHON.
  4. Type `./configure' to configure the package for your system.
     If you're using `csh' on an old version of System V, you might
@@ -142,20 +159,12 @@ For this example the configure line might look like (more details below)
 (some options are optional and included here for completeness but some rarely
 used options are omitted):
-  ./configure --host=x86_64-linux-gnu --target=arm-linux-gnueabihf \
+./configure BUILD_CC=gcc BUILD_FREETYPE=freetype-config --host=amd64-linux-gnu
-    --with-platform=efi BUILD_CC=gcc BUILD_PKG_CONFIG=pkg-config \
+CC=amd64-linux-gnu-gcc CFLAGS="-g -O2" FREETYPE=amd64-linux-gnu-freetype-config
-    HOST_CC=x86_64-linux-gnu-gcc HOST_CFLAGS='-g -O2' \
+--target=arm --with-platform=uboot TARGET_CC=arm-elf-gcc
-    PKG_CONFIG=x86_64-linux-gnu-pkg-config TARGET_CC=arm-linux-gnueabihf-gcc \
+TARGET_CFLAGS="-Os -march=armv6" TARGET_CCASFLAGS="-march=armv6"
-    TARGET_CFLAGS='-Os -march=armv8.3-a' TARGET_CCASFLAGS='-march=armv8.3-a' \
+TARGET_OBJCOPY="arm-elf-objcopy" TARGET_STRIP="arm-elf-strip"
-    TARGET_OBJCOPY=arm-linux-gnueabihf-objcopy \
+TARGET_NM=arm-elf-nm TARGET_RANLIB=arm-elf-ranlib LEX=gflex
    TARGET_STRIP=arm-linux-gnueabihf-strip TARGET_NM=arm-linux-gnueabihf-nm \
    TARGET_RANLIB=arm-linux-gnueabihf-ranlib LEX=flex
 Normally, for building a GRUB on amd64 with tools to run on amd64 to
 generate images to run on ARM, using your Linux distribution's
 packaged cross compiler, the following would suffice:
  ./configure --target=arm-linux-gnueabihf --with-platform=efi
 You need to use following options to specify tools and platforms. For minimum
 version look at prerequisites. All tools not mentioned in this section under
@@ -168,27 +177,24 @@ corresponding platform are not needed for the platform in question.
    2. BUILD_CFLAGS= for C options for build.
    3. BUILD_CPPFLAGS= for C preprocessor options for build.
    4. BUILD_LDFLAGS= for linker options for build.
-    5. BUILD_PKG_CONFIG= for pkg-config for build (optional).
+    5. BUILD_FREETYPE= for freetype-config for build (optional).
  - For host
    1. --host= to autoconf name of host.
-    2. CC= for gcc able to compile for host.
+    2. CC= for gcc able to compile for host
-    3. CFLAGS= for C options for host.
+    3. HOST_CFLAGS= for C options for host.
-    4. HOST_CC= for gcc able to compile for host.
+    4. HOST_CPPFLAGS= for C preprocessor options for host.
-    5. HOST_CFLAGS= for C options for host.
+    5. HOST_LDFLAGS= for linker options for host.
-    6. HOST_CPPFLAGS= for C preprocessor options for host.
+    6. FREETYPE= for freetype-config for host (optional).
-    7. HOST_LDFLAGS= for linker options for host.
+    7. Libdevmapper if any must be in standard linker folders (-ldevmapper) (optional).
-    8. PKG_CONFIG= for pkg-config for host (optional).
+    8. Libfuse if any must be in standard linker folders (-lfuse) (optional).
-    9. Libdevmapper if any must be in standard linker folders (-ldevmapper) (optional).
+    9. Libzfs if any must be in standard linker folders (-lzfs) (optional).
-    10. Libfuse if any must be in standard linker folders (-lfuse) (optional).
+    10. Liblzma if any must be in standard linker folders (-llzma) (optional).
    11. Libzfs if any must be in standard linker folders (-lzfs) (optional).
    12. Liblzma if any must be in standard linker folders (-llzma) (optional).
    Note: The HOST_* variables override not prefixed variables.
  - For target
    1. --target= to autoconf cpu name of target.
    2. --with-platform to choose firmware.
-    3. TARGET_CC= for gcc able to compile for target.
+    3. TARGET_CC= for gcc able to compile for target
    4. TARGET_CFLAGS= for C options for target.
    5. TARGET_CPPFLAGS= for C preprocessor options for target.
    6. TARGET_CCASFLAGS= for assembler options for target.
@@ -197,10 +203,6 @@ corresponding platform are not needed for the platform in question.
    9. TARGET_STRIP= for strip for target.
    10. TARGET_NM= for nm for target.
    11. TARGET_RANLIB= for ranlib for target.
    Note: If the TARGET_* variables are not specified then they will default
          to be the same as the host variables. If host variables are not
          specified then the TARGET_* variables will default to be the same
          as not prefixed variables.
  - Additionally for emu, for host and target.
    1. SDL is looked for in standard linker directories (-lSDL) (optional)
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = subdir-objects -Wno-portability
 DEPDIR = .deps-util
-SUBDIRS = grub-core/lib/gnulib .
+SUBDIRS = grub-core/gnulib .
 if COND_real_platform
 SUBDIRS += grub-core
 endif
@@ -37,7 +37,7 @@ grub_script.yy.c: grub_script.yy.h
 CLEANFILES += grub_script.yy.c grub_script.yy.h
 # For libgrub.a
-libgrub.pp: config-util.h grub_script.tab.h grub_script.yy.h $(libgrubmods_a_SOURCES) $(libgrubkern_a_SOURCES)
+libgrub.pp: grub_script.tab.h grub_script.yy.h $(libgrubmods_a_SOURCES) $(libgrubkern_a_SOURCES)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgrubmods_a_CPPFLAGS) $(libgrubkern_a_CPPFLAGS) $(CPPFLAGS) \
 	  -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1)
 CLEANFILES += libgrub.pp
@@ -71,7 +71,7 @@ endif
 starfield_theme_files = $(srcdir)/themes/starfield/blob_w.png $(srcdir)/themes/starfield/boot_menu_c.png $(srcdir)/themes/starfield/boot_menu_e.png $(srcdir)/themes/starfield/boot_menu_ne.png $(srcdir)/themes/starfield/boot_menu_n.png $(srcdir)/themes/starfield/boot_menu_nw.png $(srcdir)/themes/starfield/boot_menu_se.png $(srcdir)/themes/starfield/boot_menu_s.png $(srcdir)/themes/starfield/boot_menu_sw.png $(srcdir)/themes/starfield/boot_menu_w.png $(srcdir)/themes/starfield/slider_c.png $(srcdir)/themes/starfield/slider_n.png $(srcdir)/themes/starfield/slider_s.png $(srcdir)/themes/starfield/starfield.png $(srcdir)/themes/starfield/terminal_box_c.png $(srcdir)/themes/starfield/terminal_box_e.png $(srcdir)/themes/starfield/terminal_box_ne.png $(srcdir)/themes/starfield/terminal_box_n.png $(srcdir)/themes/starfield/terminal_box_nw.png $(srcdir)/themes/starfield/terminal_box_se.png $(srcdir)/themes/starfield/terminal_box_s.png $(srcdir)/themes/starfield/terminal_box_sw.png $(srcdir)/themes/starfield/terminal_box_w.png $(srcdir)/themes/starfield/theme.txt $(srcdir)/themes/starfield/README $(srcdir)/themes/starfield/COPYING.CC-BY-SA-3.0
 build-grub-mkfont$(BUILD_EXEEXT): util/grub-mkfont.c grub-core/unidata.c grub-core/kern/emu/misc.c util/misc.c
-	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-mkfont\" $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS)
+	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-mkfont\" $^ $(build_freetype_cflags) $(build_freetype_libs)
 CLEANFILES += build-grub-mkfont$(BUILD_EXEEXT)
 garbage-gen$(BUILD_EXEEXT): util/garbage-gen.c
@@ -80,11 +80,11 @@ CLEANFILES += garbage-gen$(BUILD_EXEEXT)
 EXTRA_DIST += util/garbage-gen.c
 build-grub-gen-asciih$(BUILD_EXEEXT): util/grub-gen-asciih.c
-	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) -Wall -Werror
+	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
 CLEANFILES += build-grub-gen-asciih$(BUILD_EXEEXT)
 build-grub-gen-widthspec$(BUILD_EXEEXT): util/grub-gen-widthspec.c
-	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) -Wall -Werror
+	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
 CLEANFILES += build-grub-gen-widthspec$(BUILD_EXEEXT)
 if COND_STARFIELD
@@ -145,116 +145,109 @@ if COND_real_platform
 if COND_i386_coreboot
 QEMU32=qemu-system-i386
 MINIMUM_CPU_LINUX=pentium2
 endif
 if COND_i386_multiboot
 QEMU32=qemu-system-i386
 MINIMUM_CPU_LINUX=pentium2
 endif
 if COND_i386_ieee1275
 QEMU32=qemu-system-i386
 MINIMUM_CPU_LINUX=pentium2
 endif
 if COND_i386_qemu
 QEMU32=qemu-system-i386
 MINIMUM_CPU_LINUX=pentium2
 endif
 if COND_i386_pc
 QEMU32=qemu-system-i386
 MINIMUM_CPU_LINUX=pentium2
 endif
 if COND_i386_efi
 QEMU32=qemu-system-i386
 MINIMUM_CPU_LINUX=pentium2
 endif
 if COND_x86_64_efi
 QEMU32=qemu-system-x86_64
 MINIMUM_CPU_LINUX=core2duo
 endif
 linux.init.x86_64: $(srcdir)/grub-core/tests/boot/linux.init-x86_64.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -static -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 linux.init.i386: $(srcdir)/grub-core/tests/boot/linux.init-i386.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -static -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 linux.init.mips: $(srcdir)/grub-core/tests/boot/linux.init-mips.S
-	$(TARGET_CC) -o $@ $< -static -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 linux.init.ppc: $(srcdir)/grub-core/tests/boot/linux.init-ppc.S
-	$(TARGET_CC) -o $@ $< -static -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 linux.init.mipsel: $(srcdir)/grub-core/tests/boot/linux.init-mips.S
-	$(TARGET_CC) -o $@ $< -static -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 linux.init.loongson: $(srcdir)/grub-core/tests/boot/linux.init-mips.S
-	$(TARGET_CC) -o $@ $< -static -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -DREBOOT=1
+	$(TARGET_CC) -o $@ $< -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -DREBOOT=1
 multiboot.elf: $(srcdir)/grub-core/tests/boot/kernel-i386.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -static -ffreestanding -nostdlib -nostdinc -DTARGET_MULTIBOOT=1 -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include
+	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -DTARGET_MULTIBOOT=1 -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include
 kfreebsd.elf: $(srcdir)/grub-core/tests/boot/kernel-i386.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -static -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include
+	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include
 kfreebsd.aout: kfreebsd.elf
-	$(TARGET_OBJCOPY) -O a.out-i386-linux $< $@ -j .text
+	$(TARGET_OBJCOPY) -O a.out-i386-linux $< $@ -R .note.gnu.build-id -R .note.gnu.gold-version
 pc-chainloader.elf: $(srcdir)/grub-core/tests/boot/kernel-8086.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -static -DTARGET_CHAINLOADER=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0x7c00 -m32
+	$(TARGET_CC) -o $@ $< -DTARGET_CHAINLOADER=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0x7c00 -m32
 pc-chainloader.bin: pc-chainloader.elf
 	$(TARGET_OBJCOPY) -O binary --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn -R .note.gnu.gold-version $< $@;
 ntldr.elf: $(srcdir)/grub-core/tests/boot/kernel-8086.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -DTARGET_NTLDR=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -static -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0 -m32
+	$(TARGET_CC) -o $@ $< -DTARGET_NTLDR=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0 -m32
 ntldr.bin: ntldr.elf
-	$(TARGET_OBJCOPY) -O binary --strip-unneeded -j .text $< $@;
+	$(TARGET_OBJCOPY) -O binary --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn -R .note.gnu.gold-version $< $@;
 multiboot2.elf: $(srcdir)/grub-core/tests/boot/kernel-i386.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -static -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include -DTARGET_MULTIBOOT2=1
+	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include -DTARGET_MULTIBOOT2=1
 kfreebsd.init.x86_64: $(srcdir)/grub-core/tests/boot/kfreebsd.init-x86_64.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -m64 -static -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
+	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
 kfreebsd.init.i386: $(srcdir)/grub-core/tests/boot/kfreebsd.init-i386.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -m32 -static -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
+	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
 knetbsd.init.i386: $(srcdir)/grub-core/tests/boot/kbsd.init-i386.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -m32 -static -nostdlib -nostdinc -DTARGET_NETBSD=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DTARGET_NETBSD=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 kopenbsd.init.i386: $(srcdir)/grub-core/tests/boot/kbsd.init-i386.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -m32 -static -nostdlib -nostdinc -DTARGET_OPENBSD=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DTARGET_OPENBSD=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 knetbsd.init.x86_64: $(srcdir)/grub-core/tests/boot/kbsd.init-x86_64.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -m64 -DTARGET_NETBSD=1 -static -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -m64 -DTARGET_NETBSD=1 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 kopenbsd.init.x86_64: $(srcdir)/grub-core/tests/boot/kbsd.init-x86_64.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
-	$(TARGET_CC) -o $@ $< -m64 -DTARGET_OPENBSD=1 -static -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+	$(TARGET_CC) -o $@ $< -m64 -DTARGET_OPENBSD=1 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 linux-initramfs.mips: linux.init.mips Makefile
-	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio -R 0:0 --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
+	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
 linux-initramfs.ppc: linux.init.ppc Makefile
-	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio -R 0:0 --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
+	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
 linux-initramfs.mipsel: linux.init.mipsel Makefile
-	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio -R 0:0 --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
+	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
 linux-initramfs.loongson: linux.init.loongson Makefile
-	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio -R 0:0 --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
+	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
 linux-initramfs.i386: linux.init.i386 Makefile
-	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio -R 0:0 --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
+	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
 linux-initramfs.x86_64: linux.init.x86_64 Makefile
-	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio -R 0:0 --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
+	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && cp $< $$TDIR/init && (cd $$TDIR && echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@ && rm -rf $$TDIR
 kfreebsd-mfsroot.i386.img: kfreebsd.init.i386 Makefile
 	TDIR=`mktemp -d "$${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
@@ -313,7 +306,7 @@ bootcheck-knetbsd-x86_64: knetbsd.miniroot-image.x86_64.gz $(GRUB_PAYLOADS_DIR)/
 	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=qemu-system-x86_64 --files=/miniroot.gz=knetbsd.miniroot-image.x86_64.gz --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/grub-core/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 bootcheck-linux-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
-	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=$(QEMU32) --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/grub-core/tests/boot/linux.cfg --qemu-opts="-cpu $(MINIMUM_CPU_LINUX)" | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=$(QEMU32) --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/grub-core/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 bootcheck-linux-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
 	./grub-shell --timeout=$(BOOTCHECK_TIMEOUT) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/grub-core/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
@@ -376,12 +369,6 @@ if COND_i386_coreboot
 BOOTCHECKS = bootcheck-kfreebsd-aout bootcheck-kopenbsd-i386 bootcheck-kopenbsd-x86_64 bootcheck-multiboot bootcheck-multiboot2 bootcheck-linux-i386 bootcheck-linux-x86_64 bootcheck-knetbsd-x86_64 bootcheck-kfreebsd-x86_64 bootcheck-kfreebsd-i386
 endif
 if COND_i386_ieee1275
 # *BSD requires ACPI
 #legacy protocol (linux16) makes early BIOS calls.
 BOOTCHECKS = bootcheck-kfreebsd-aout bootcheck-multiboot bootcheck-multiboot2 bootcheck-linux-i386 bootcheck-linux-x86_64
 endif
 if COND_i386_pc
 #pc chainloader by definition is only for i386-pc
 #ntldr and bootmgr require BIOS.
@@ -422,10 +409,9 @@ BOOTCHECK_TIMEOUT=180
 bootcheck: $(BOOTCHECKS)
 if COND_i386_coreboot
 FS_PAYLOAD_MODULES ?= $(shell cat grub-core/fs.lst)
 default_payload.elf: grub-mkstandalone grub-mkimage FORCE
 	test -f $@ && rm $@ || true
-	pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos 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 multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(FS_PAYLOAD_MODULES) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --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 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 multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(shell cat grub-core/fs.lst) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
 endif
 endif
@@ -477,11 +463,6 @@ EXTRA_DIST += ChangeLog ChangeLog-2015
 syslinux_test: $(top_builddir)/config.status tests/syslinux/ubuntu10.04_grub.cfg
 # Mimic simplify_filename from grub-core/lib/syslinux_parse.c, so that we
 # can predict its behaviour in tests.  We have to pre-substitute this before
 # calling config.status, as config.status offers no reliable way to hook in
 # a command between setting ac_abs_top_srcdir and emitting output files.
 tests/syslinux/ubuntu10.04_grub.cfg: $(top_builddir)/config.status tests/syslinux/ubuntu10.04_grub.cfg.in
-	simplified_abs_top_srcdir=`echo "$(abs_top_srcdir)" | sed 's,//,/,g; s,/\./,/,g; :loop; s,/[^/][^/]*/\.\.\(/\|$$\),\1,; t loop'`; \
+	(for x in tests/syslinux/ubuntu10.04_grub.cfg.in ; do cat $(srcdir)/"$$x"; done) | $(top_builddir)/config.status --file=$@:-
 	sed "s,@simplified_abs_top_srcdir@,$$simplified_abs_top_srcdir,g" $(srcdir)/tests/syslinux/ubuntu10.04_grub.cfg.in | $(top_builddir)/config.status --file=$@:-
 CLEANFILES += tests/syslinux/ubuntu10.04_grub.cfg
@@ -3,7 +3,7 @@ AutoGen definitions Makefile.tpl;
 library = {
  name = libgrubkern.a;
  cflags = '$(CFLAGS_GNULIB)';
-  cppflags = '$(CPPFLAGS_GNULIB) -I$(srcdir)/grub-core/lib/json';
+  cppflags = '$(CPPFLAGS_GNULIB)';
  common = util/misc.c;
  common = grub-core/kern/command.c;
@@ -36,9 +36,7 @@ library = {
  common = grub-core/kern/misc.c;
  common = grub-core/kern/partition.c;
  common = grub-core/lib/crypto.c;
  common = grub-core/lib/json/json.c;
  common = grub-core/disk/luks.c;
  common = grub-core/disk/luks2.c;
  common = grub-core/disk/geli.c;
  common = grub-core/disk/cryptodisk.c;
  common = grub-core/disk/AFSplitter.c;
@@ -56,7 +54,7 @@ library = {
 library = {
  name = libgrubmods.a;
  cflags = '-fno-builtin -Wno-undef';
-  cppflags = '-I$(srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -I$(srcdir)/grub-core/lib/zstd -DMINILZO_HAVE_CONFIG_H';
+  cppflags = '-I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H';
  common_nodist = grub_script.tab.c;
  common_nodist = grub_script.yy.c;
@@ -101,7 +99,6 @@ library = {
  common = grub-core/fs/ext2.c;
  common = grub-core/fs/fat.c;
  common = grub-core/fs/exfat.c;
  common = grub-core/fs/f2fs.c;
  common = grub-core/fs/fshelp.c;
  common = grub-core/fs/hfs.c;
  common = grub-core/fs/hfsplus.c;
@@ -141,7 +138,7 @@ library = {
  common = grub-core/lib/crc.c;
  common = grub-core/lib/adler32.c;
  common = grub-core/lib/crc64.c;
-  common = grub-core/lib/datetime.c;
+  common = grub-core/normal/datetime.c;
  common = grub-core/normal/misc.c;
  common = grub-core/partmap/acorn.c;
  common = grub-core/partmap/amiga.c;
@@ -167,15 +164,6 @@ library = {
  common = grub-core/lib/xzembed/xz_dec_bcj.c;
  common = grub-core/lib/xzembed/xz_dec_lzma2.c;
  common = grub-core/lib/xzembed/xz_dec_stream.c;
  common = grub-core/lib/zstd/debug.c;
  common = grub-core/lib/zstd/entropy_common.c;
  common = grub-core/lib/zstd/error_private.c;
  common = grub-core/lib/zstd/fse_decompress.c;
  common = grub-core/lib/zstd/huf_decompress.c;
  common = grub-core/lib/zstd/module.c;
  common = grub-core/lib/zstd/xxhash.c;
  common = grub-core/lib/zstd/zstd_common.c;
  common = grub-core/lib/zstd/zstd_decompress.c;
 };
 program = {
@@ -200,9 +188,10 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBLZMA)';
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  cppflags = '-DGRUB_PKGLIBDIR=\"$(pkglibdir)\"';
 };
 program = {
@@ -216,7 +205,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -231,7 +220,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -241,23 +230,12 @@ program = {
  common = util/grub-editenv.c;
  common = util/editenv.c;
  common = util/grub-install-common.c;
  common = grub-core/osdep/init.c;
  common = grub-core/osdep/compress.c;
  extra_dist = grub-core/osdep/unix/compress.c;
  extra_dist = grub-core/osdep/basic/compress.c;
  common = util/mkimage.c;
  common = util/grub-mkimage32.c;
  common = util/grub-mkimage64.c;
  common = grub-core/osdep/config.c;
  common = util/config.c;
  common = util/resolve.c;
  ldadd = '$(LIBLZMA)';
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -273,7 +251,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -296,7 +274,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -312,7 +290,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse';
  condition = COND_GRUB_MOUNT;
 };
@@ -324,14 +302,14 @@ program = {
  common = grub-core/kern/emu/argp_common.c;
  common = grub-core/osdep/init.c;
-  cflags = '$(FREETYPE_CFLAGS)';
+  cflags = '$(freetype_cflags)';
  cppflags = '-DGRUB_MKFONT=1';
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(FREETYPE_LIBS)';
+  ldadd = '$(freetype_libs)';
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  condition = COND_GRUB_MKFONT;
 };
@@ -349,7 +327,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -371,7 +349,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubkern.a;
  ldadd = libgrubgcry.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  cppflags = '-DGRUB_SETUP_FUNC=grub_util_bios_setup';
 };
@@ -391,7 +369,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubkern.a;
  ldadd = libgrubgcry.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  cppflags = '-DGRUB_SETUP_FUNC=grub_util_sparc_setup';
 };
@@ -407,7 +385,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -422,7 +400,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -437,7 +415,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -514,12 +492,6 @@ script = {
  installdir = grubconf;
 };
 script = {
  name = '30_uefi-firmware';
  common = util/grub.d/30_uefi-firmware.in;
  installdir = grubconf;
 };
 script = {
  name = '40_custom';
  common = util/grub.d/40_custom.in;
@@ -570,7 +542,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  condition = COND_HAVE_EXEC;
@@ -617,7 +589,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -656,7 +628,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -692,7 +664,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -802,12 +774,6 @@ script = {
  common = tests/xfs_test.in;
 };
 script = {
  testcase;
  name = f2fs_test;
  common = tests/f2fs_test.in;
 };
 script = {
  testcase;
  name = nilfs2_test;
@@ -1222,7 +1188,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -1237,7 +1203,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -1252,7 +1218,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -1268,7 +1234,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  condition = COND_HAVE_CXX;
 };
@@ -1284,7 +1250,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -1299,7 +1265,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -1317,7 +1283,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -1333,7 +1299,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -1351,7 +1317,7 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -1380,6 +1346,6 @@ program = {
  ldadd = libgrubmods.a;
  ldadd = libgrubgcry.a;
  ldadd = libgrubkern.a;
-  ldadd = grub-core/lib/gnulib/libgnu.a;
+  ldadd = grub-core/gnulib/libgnu.a;
  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
 };
@@ -1,21 +1,3 @@
 New in 2.04:
 * GCC 8 and 9 support.
 * Gnulib integration overhaul.
 * RISC-V support.
 * Xen PVH support.
 * Native UEFI secure boot support.
 * UEFI TPM driver.
 * New IEEE 1275 obdisk driver.
 * Btrfs RAID 5 and RIAD 6 support.
 * PARTUUID support.
 * VLAN support.
 * Native DHCP support.
 * Many ARM and ARM64 fixes.
 * Many SPARC fixes.
 * Many IEEE 1275 fixes.
 * ...and tons of other fixes and cleanups...
 New in 2.02:
 * New/improved filesystem and disk support:
@@ -69,8 +51,6 @@ New in 2.02:
  * Parse `nd' disk names in GRUB Legacy configuration files.
  * Issue separate DNS queries for IPv4 and IPv6.
  * Support IPv6 Router Advertisement to configure default router.
  * New variable net_<interface>_next_server containing next server
    from BOOTP reply.
 * Coreboot improvements:
  * CBFS support both in on-disk images (loopback) and flash.
@@ -191,7 +171,6 @@ New in 2.02:
  * Use fixed timestamp when generating GRUB image for reproducible builds.
  * Verify at build time that modules contain only supported relocations and their
    structure matches what boot-time module loader expects.
  * Do not require fonts on powerpc-ieee1275.
 * Revision control moved to git.
@@ -305,9 +305,9 @@ fi
 ])
-dnl Check if the C compiler supports the stack protector
+dnl Check if the C compiler supports `-fstack-protector'.
 AC_DEFUN([grub_CHECK_STACK_PROTECTOR],[
-[# Stack smashing protector.
+[# Smashing stack protector.
 ssp_possible=yes]
 AC_MSG_CHECKING([whether `$CC' accepts `-fstack-protector'])
 # Is this a reliable test case?
@@ -324,40 +324,6 @@ else
  ssp_possible=no]
  AC_MSG_RESULT([no])
 [fi]
 [# Strong stack smashing protector.
 ssp_strong_possible=yes]
 AC_MSG_CHECKING([whether `$CC' accepts `-fstack-protector-strong'])
 # Is this a reliable test case?
 AC_LANG_CONFTEST([AC_LANG_SOURCE([[
 void foo (void) { volatile char a[8]; a[3]; }
 ]])])
 [# `$CC -c -o ...' might not be portable.  But, oh, well...  Is calling
 # `ac_compile' like this correct, after all?
 if eval "$ac_compile -S -fstack-protector-strong -o conftest.s" 2> /dev/null; then]
  AC_MSG_RESULT([yes])
  [# Should we clear up other files as well, having called `AC_LANG_CONFTEST'?
  rm -f conftest.s
 else
  ssp_strong_possible=no]
  AC_MSG_RESULT([no])
 [fi]
 [# Global stack smashing protector.
 ssp_global_possible=yes]
 AC_MSG_CHECKING([whether `$CC' accepts `-mstack-protector-guard=global'])
 # Is this a reliable test case?
 AC_LANG_CONFTEST([AC_LANG_SOURCE([[
 void foo (void) { volatile char a[8]; a[3]; }
 ]])])
 [# `$CC -c -o ...' might not be portable.  But, oh, well...  Is calling
 # `ac_compile' like this correct, after all?
 if eval "$ac_compile -S -fstack-protector -mstack-protector-guard=global -o conftest.s" 2> /dev/null; then]
  AC_MSG_RESULT([yes])
  [# Should we clear up other files as well, having called `AC_LANG_CONFTEST'?
  rm -f conftest.s
 else
  ssp_global_possible=no]
  AC_MSG_RESULT([no])
 [fi]
 ])
 dnl Check if the C compiler supports `-mstack-arg-probe' (Cygwin).
@@ -424,58 +390,6 @@ else
 [fi]
 ])
 AC_DEFUN([grub_CHECK_LINK_PIE],[
 [# Position independent executable.
 link_nopie_needed=no]
 AC_MSG_CHECKING([whether linker needs disabling of PIE to work])
 AC_LANG_CONFTEST([AC_LANG_SOURCE([[]])])
 [if eval "$ac_compile -Wl,-r,-d -nostdlib -Werror -o conftest.o" 2> /dev/null; then]
  AC_MSG_RESULT([no])
  [# Should we clear up other files as well, having called `AC_LANG_CONFTEST'?
  rm -f conftest.o
 else
  link_nopie_needed=yes]
  AC_MSG_RESULT([yes])
 [fi]
 ])
 dnl Check if the Linker supports `-no-pie'.
 AC_DEFUN([grub_CHECK_NO_PIE],
 [AC_MSG_CHECKING([whether linker accepts -no-pie])
 AC_CACHE_VAL(grub_cv_cc_ld_no_pie,
 [save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS -no-pie -nostdlib -Werror"
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
 	       [grub_cv_cc_ld_no_pie=yes],
 	       [grub_cv_cc_ld_no_pie=no])
 LDFLAGS="$save_LDFLAGS"
 ])
 AC_MSG_RESULT([$grub_cv_cc_ld_no_pie])
 nopie_possible=no
 if test "x$grub_cv_cc_ld_no_pie" = xyes ; then
  nopie_possible=yes
 fi
 ])
 AC_DEFUN([grub_CHECK_NO_PIE_ONEWORD],
 [AC_MSG_CHECKING([whether linker accepts -nopie])
 AC_CACHE_VAL(grub_cv_cc_ld_no_pie_oneword,
 [save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS -nopie -nostdlib -Werror"
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
 	       [grub_cv_cc_ld_no_pie_oneword=yes],
 	       [grub_cv_cc_ld_no_pie_oneword=no])
 LDFLAGS="$save_LDFLAGS"
 ])
 AC_MSG_RESULT([$grub_cv_cc_ld_no_pie_oneword])
 nopie_oneword_possible=no
 if test "x$grub_cv_cc_ld_no_pie_oneword" = xyes ; then
  nopie_oneword_possible=yes
 fi
 ])
 dnl Check if the C compiler supports `-fPIC'.
 AC_DEFUN([grub_CHECK_PIC],[
 [# Position independent executable.
@@ -1,16 +1,12 @@
 /* on x86 old clang doesn't support .code16
   newer clang supports it but creates 6-byte jumps instead of 3-byte ones
-   which makes us go over boot sector size.
+   which makes us go over boot sector size.  */
   Starting with 3.9 clang emits 3-byte jumps but still creates 8-bytes movl
   instead of 5-bytes, so code overflows into data.  */
 	.code16
 	jmp far
 	.org 4
 	jmp nearer
 	.org 6
 	movl nearer, %ebx
 	.org 11
 	.space 100
 nearer:
 	.space 200
@@ -2,18 +2,13 @@
 set -e
 if [ ! -e grub-core/lib/gnulib/stdlib.in.h ]; then
  echo "Gnulib not yet bootstrapped; run ./bootstrap instead." >&2
  exit 1
 fi
 # Set ${PYTHON} to plain 'python' if not set already
 : ${PYTHON:=python}
 export LC_COLLATE=C
 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' ! -ipath './gnulib/*' ! -ipath './grub-core/lib/gnulib/*' |sort > po/POTFILES.in
+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
 echo "Importing unicode..."
@@ -87,17 +82,6 @@ done
 echo "Saving timestamps..."
 echo timestamp > stamp-h.in
-if [ -z "$FROM_BOOTSTRAP" ]; then
+echo "Running autoreconf..."
-  # Unaided autoreconf is likely to install older versions of many files
+autoreconf -vi
  # than the ones provided by Gnulib, but in most cases this won't matter
  # very much.  This mode is provided so that you can run ./autogen.sh to
  # regenerate the GRUB build system in an unpacked release tarball (perhaps
  # after patching it), even on systems that don't have access to
  # gnulib.git.
  echo "Running autoreconf..."
  cp -a INSTALL INSTALL.grub
  autoreconf -vif
  mv INSTALL.grub INSTALL
 fi
 exit 0
@@ -1,101 +0,0 @@
 # Bootstrap configuration.
 # Copyright (C) 2006-2019 Free Software Foundation, Inc.
 # This program 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.
 # This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
 GNULIB_REVISION=d271f868a8df9bbec29049d01e056481b7a1a263
 # gnulib modules used by this package.
 # mbswidth is used by gnulib-fix-width.diff's changes to argp rather than
 # directly.
 gnulib_modules="
  argp
  base64
  error
  fnmatch
  getdelim
  getline
  gettext-h
  gitlog-to-changelog
  mbswidth
  progname
  realloc-gnu
  regex
  save-cwd
 "
 gnulib_tool_option_extras="\
  --no-conditional-dependencies \
  --no-vc-files \
 "
 gnulib_name=libgnu
 source_base=grub-core/lib/gnulib
 gnulib_extra_files="
  build-aux/install-sh
  build-aux/mdate-sh
  build-aux/texinfo.tex
  build-aux/depcomp
  build-aux/config.guess
  build-aux/config.sub
 "
 # Additional xgettext options to use.  Use "\\\newline" to break lines.
 XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
 --from-code=UTF-8\\\
 '
 checkout_only_file=
 copy=true
 vc_ignore=
 SKIP_PO=t
 # Build prerequisites
 buildreq="\
 autoconf   2.63
 automake   1.11
 gettext    0.18.3
 git        1.5.5
 tar        -
 "
 # bootstrap doesn't give us a reasonable way to stop Automake from
 # overwriting this, so we just copy our version aside and put it back later.
 cp -a INSTALL INSTALL.grub
 bootstrap_post_import_hook () {
  set -e
  for patchname in fix-base64 fix-null-deref fix-null-state-deref fix-regcomp-uninit-token \
      fix-regexec-null-deref fix-uninit-structure fix-unused-value fix-width no-abort; do
    patch -d grub-core/lib/gnulib -p2 \
      < "grub-core/lib/gnulib-patches/$patchname.patch"
  done
  for patchname in \
      0001-Support-POTFILES-shell \
      0002-Handle-gettext_printf-shell-function \
      0003-Make-msgfmt-output-in-little-endian \
      0004-Use-SHELL-rather-than-bin-sh; do
    patch -d po -p3 \
      < "po/gettext-patches/$patchname.patch"
  done
  FROM_BOOTSTRAP=1 ./autogen.sh
  set +e  # bootstrap expects this
 }
 bootstrap_epilogue () {
  mv INSTALL.grub INSTALL
 }
@@ -0,0 +1,690 @@
 #! /bin/sh
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
 #   Copyright 1996-2013 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 #   This file is free software; the Free Software Foundation gives
 #   unlimited permission to copy and/or distribute it, with or without
 #   modifications, as long as this notice is preserved.
 #
 # The first argument passed to this file is the canonical host specification,
 #    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
 # or
 #    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
 # should be set by the caller.
 #
 # The set of defined variables is at the end of this script.
 # Known limitations:
 # - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
 #   than 256 bytes, otherwise the compiler driver will dump core. The only
 #   known workaround is to choose shorter directory names for the build
 #   directory and/or the installation directory.
 # All known linkers require a '.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 shrext=.so
 host="$1"
 host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 # Code taken from libtool.m4's _LT_CC_BASENAME.
 for cc_temp in $CC""; do
  case $cc_temp in
    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
    \-*) ;;
    *) break;;
  esac
 done
 cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
 # Code taken from libtool.m4's _LT_COMPILER_PIC.
 wl=
 if test "$GCC" = yes; then
  wl='-Wl,'
 else
  case "$host_os" in
    aix*)
      wl='-Wl,'
      ;;
    mingw* | cygwin* | pw32* | os2* | cegcc*)
      ;;
    hpux9* | hpux10* | hpux11*)
      wl='-Wl,'
      ;;
    irix5* | irix6* | nonstopux*)
      wl='-Wl,'
      ;;
    linux* | k*bsd*-gnu | kopensolaris*-gnu)
      case $cc_basename in
        ecc*)
          wl='-Wl,'
          ;;
        icc* | ifort*)
          wl='-Wl,'
          ;;
        lf95*)
          wl='-Wl,'
          ;;
        nagfor*)
          wl='-Wl,-Wl,,'
          ;;
        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
          wl='-Wl,'
          ;;
        ccc*)
          wl='-Wl,'
          ;;
        xl* | bgxl* | bgf* | mpixl*)
          wl='-Wl,'
          ;;
        como)
          wl='-lopt='
          ;;
        *)
          case `$CC -V 2>&1 | sed 5q` in
            *Sun\ F* | *Sun*Fortran*)
              wl=
              ;;
            *Sun\ C*)
              wl='-Wl,'
              ;;
          esac
          ;;
      esac
      ;;
    newsos6)
      ;;
    *nto* | *qnx*)
      ;;
    osf3* | osf4* | osf5*)
      wl='-Wl,'
      ;;
    rdos*)
      ;;
    solaris*)
      case $cc_basename in
        f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
          wl='-Qoption ld '
          ;;
        *)
          wl='-Wl,'
          ;;
      esac
      ;;
    sunos4*)
      wl='-Qoption ld '
      ;;
    sysv4 | sysv4.2uw2* | sysv4.3*)
      wl='-Wl,'
      ;;
    sysv4*MP*)
      ;;
    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
      wl='-Wl,'
      ;;
    unicos*)
      wl='-Wl,'
      ;;
    uts4*)
      ;;
  esac
 fi
 # Code taken from libtool.m4's _LT_LINKER_SHLIBS.
 hardcode_libdir_flag_spec=
 hardcode_libdir_separator=
 hardcode_direct=no
 hardcode_minus_L=no
 case "$host_os" in
  cygwin* | mingw* | pw32* | cegcc*)
    # FIXME: the MSVC++ port hasn't been tested in a loooong time
    # When not using gcc, we currently assume that we are using
    # Microsoft Visual C++.
    if test "$GCC" != yes; then
      with_gnu_ld=no
    fi
    ;;
  interix*)
    # we just hope/assume this is gcc and not c89 (= MSVC++)
    with_gnu_ld=yes
    ;;
  openbsd*)
    with_gnu_ld=no
    ;;
 esac
 ld_shlibs=yes
 if test "$with_gnu_ld" = yes; then
  # Set some defaults for GNU ld with shared library support. These
  # are reset later if shared libraries are not supported. Putting them
  # here allows them to be overridden if necessary.
  # Unlike libtool, we use -rpath here, not --rpath, since the documented
  # option of GNU ld is called -rpath, not --rpath.
  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  case "$host_os" in
    aix[3-9]*)
      # On AIX/PPC, the GNU linker is very broken
      if test "$host_cpu" != ia64; then
        ld_shlibs=no
      fi
      ;;
    amigaos*)
      case "$host_cpu" in
        powerpc)
          ;;
        m68k)
          hardcode_libdir_flag_spec='-L$libdir'
          hardcode_minus_L=yes
          ;;
      esac
      ;;
    beos*)
      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
        :
      else
        ld_shlibs=no
      fi
      ;;
    cygwin* | mingw* | pw32* | cegcc*)
      # hardcode_libdir_flag_spec is actually meaningless, as there is
      # no search path for DLLs.
      hardcode_libdir_flag_spec='-L$libdir'
      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
        :
      else
        ld_shlibs=no
      fi
      ;;
    haiku*)
      ;;
    interix[3-9]*)
      hardcode_direct=no
      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
      ;;
    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
        :
      else
        ld_shlibs=no
      fi
      ;;
    netbsd*)
      ;;
    solaris*)
      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
        ld_shlibs=no
      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
        :
      else
        ld_shlibs=no
      fi
      ;;
    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
      case `$LD -v 2>&1` in
        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
          ld_shlibs=no
          ;;
        *)
          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
          else
            ld_shlibs=no
          fi
          ;;
      esac
      ;;
    sunos4*)
      hardcode_direct=yes
      ;;
    *)
      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
        :
      else
        ld_shlibs=no
      fi
      ;;
  esac
  if test "$ld_shlibs" = no; then
    hardcode_libdir_flag_spec=
  fi
 else
  case "$host_os" in
    aix3*)
      # Note: this linker hardcodes the directories in LIBPATH if there
      # are no directories specified by -L.
      hardcode_minus_L=yes
      if test "$GCC" = yes; then
        # Neither direct hardcoding nor static linking is supported with a
        # broken collect2.
        hardcode_direct=unsupported
      fi
      ;;
    aix[4-9]*)
      if test "$host_cpu" = ia64; then
        # On IA64, the linker does run time linking by default, so we don't
        # have to do anything special.
        aix_use_runtimelinking=no
      else
        aix_use_runtimelinking=no
        # Test if we are trying to use run time linking or normal
        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
        # need to do runtime linking.
        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
          for ld_flag in $LDFLAGS; do
            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
              aix_use_runtimelinking=yes
              break
            fi
          done
          ;;
        esac
      fi
      hardcode_direct=yes
      hardcode_libdir_separator=':'
      if test "$GCC" = yes; then
        case $host_os in aix4.[012]|aix4.[012].*)
          collect2name=`${CC} -print-prog-name=collect2`
          if test -f "$collect2name" && \
            strings "$collect2name" | grep resolve_lib_name >/dev/null
          then
            # We have reworked collect2
            :
          else
            # We have old collect2
            hardcode_direct=unsupported
            hardcode_minus_L=yes
            hardcode_libdir_flag_spec='-L$libdir'
            hardcode_libdir_separator=
          fi
          ;;
        esac
      fi
      # Begin _LT_AC_SYS_LIBPATH_AIX.
      echo 'int main () { return 0; }' > conftest.c
      ${CC} ${LDFLAGS} conftest.c -o conftest
      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
      if test -z "$aix_libpath"; then
        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
      fi
      if test -z "$aix_libpath"; then
        aix_libpath="/usr/lib:/lib"
      fi
      rm -f conftest.c conftest
      # End _LT_AC_SYS_LIBPATH_AIX.
      if test "$aix_use_runtimelinking" = yes; then
        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
      else
        if test "$host_cpu" = ia64; then
          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
        else
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
        fi
      fi
      ;;
    amigaos*)
      case "$host_cpu" in
        powerpc)
          ;;
        m68k)
          hardcode_libdir_flag_spec='-L$libdir'
          hardcode_minus_L=yes
          ;;
      esac
      ;;
    bsdi[45]*)
      ;;
    cygwin* | mingw* | pw32* | cegcc*)
      # When not using gcc, we currently assume that we are using
      # Microsoft Visual C++.
      # hardcode_libdir_flag_spec is actually meaningless, as there is
      # no search path for DLLs.
      hardcode_libdir_flag_spec=' '
      libext=lib
      ;;
    darwin* | rhapsody*)
      hardcode_direct=no
      if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
        :
      else
        ld_shlibs=no
      fi
      ;;
    dgux*)
      hardcode_libdir_flag_spec='-L$libdir'
      ;;
    freebsd2.2*)
      hardcode_libdir_flag_spec='-R$libdir'
      hardcode_direct=yes
      ;;
    freebsd2*)
      hardcode_direct=yes
      hardcode_minus_L=yes
      ;;
    freebsd* | dragonfly*)
      hardcode_libdir_flag_spec='-R$libdir'
      hardcode_direct=yes
      ;;
    hpux9*)
      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
      hardcode_libdir_separator=:
      hardcode_direct=yes
      # hardcode_minus_L: Not really in the search PATH,
      # but as the default location of the library.
      hardcode_minus_L=yes
      ;;
    hpux10*)
      if test "$with_gnu_ld" = no; then
        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
        hardcode_libdir_separator=:
        hardcode_direct=yes
        # hardcode_minus_L: Not really in the search PATH,
        # but as the default location of the library.
        hardcode_minus_L=yes
      fi
      ;;
    hpux11*)
      if test "$with_gnu_ld" = no; then
        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
        hardcode_libdir_separator=:
        case $host_cpu in
          hppa*64*|ia64*)
            hardcode_direct=no
            ;;
          *)
            hardcode_direct=yes
            # hardcode_minus_L: Not really in the search PATH,
            # but as the default location of the library.
            hardcode_minus_L=yes
            ;;
        esac
      fi
      ;;
    irix5* | irix6* | nonstopux*)
      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator=:
      ;;
    netbsd*)
      hardcode_libdir_flag_spec='-R$libdir'
      hardcode_direct=yes
      ;;
    newsos6)
      hardcode_direct=yes
      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator=:
      ;;
    *nto* | *qnx*)
      ;;
    openbsd*)
      if test -f /usr/libexec/ld.so; then
        hardcode_direct=yes
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
        else
          case "$host_os" in
            openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
              hardcode_libdir_flag_spec='-R$libdir'
              ;;
            *)
              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
              ;;
          esac
        fi
      else
        ld_shlibs=no
      fi
      ;;
    os2*)
      hardcode_libdir_flag_spec='-L$libdir'
      hardcode_minus_L=yes
      ;;
    osf3*)
      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator=:
      ;;
    osf4* | osf5*)
      if test "$GCC" = yes; then
        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
      else
        # Both cc and cxx compiler support -rpath directly
        hardcode_libdir_flag_spec='-rpath $libdir'
      fi
      hardcode_libdir_separator=:
      ;;
    solaris*)
      hardcode_libdir_flag_spec='-R$libdir'
      ;;
    sunos4*)
      hardcode_libdir_flag_spec='-L$libdir'
      hardcode_direct=yes
      hardcode_minus_L=yes
      ;;
    sysv4)
      case $host_vendor in
        sni)
          hardcode_direct=yes # is this really true???
          ;;
        siemens)
          hardcode_direct=no
          ;;
        motorola)
          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
          ;;
      esac
      ;;
    sysv4.3*)
      ;;
    sysv4*MP*)
      if test -d /usr/nec; then
        ld_shlibs=yes
      fi
      ;;
    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
      ;;
    sysv5* | sco3.2v5* | sco5v6*)
      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
      hardcode_libdir_separator=':'
      ;;
    uts4*)
      hardcode_libdir_flag_spec='-L$libdir'
      ;;
    *)
      ld_shlibs=no
      ;;
  esac
 fi
 # Check dynamic linker characteristics
 # Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
 # Unlike libtool.m4, here we don't care about _all_ names of the library, but
 # only about the one the linker finds when passed -lNAME. This is the last
 # element of library_names_spec in libtool.m4, or possibly two of them if the
 # linker has special search rules.
 library_names_spec=      # the last element of library_names_spec in libtool.m4
 libname_spec='lib$name'
 case "$host_os" in
  aix3*)
    library_names_spec='$libname.a'
    ;;
  aix[4-9]*)
    library_names_spec='$libname$shrext'
    ;;
  amigaos*)
    case "$host_cpu" in
      powerpc*)
        library_names_spec='$libname$shrext' ;;
      m68k)
        library_names_spec='$libname.a' ;;
    esac
    ;;
  beos*)
    library_names_spec='$libname$shrext'
    ;;
  bsdi[45]*)
    library_names_spec='$libname$shrext'
    ;;
  cygwin* | mingw* | pw32* | cegcc*)
    shrext=.dll
    library_names_spec='$libname.dll.a $libname.lib'
    ;;
  darwin* | rhapsody*)
    shrext=.dylib
    library_names_spec='$libname$shrext'
    ;;
  dgux*)
    library_names_spec='$libname$shrext'
    ;;
  freebsd* | dragonfly*)
    case "$host_os" in
      freebsd[123]*)
        library_names_spec='$libname$shrext$versuffix' ;;
      *)
        library_names_spec='$libname$shrext' ;;
    esac
    ;;
  gnu*)
    library_names_spec='$libname$shrext'
    ;;
  haiku*)
    library_names_spec='$libname$shrext'
    ;;
  hpux9* | hpux10* | hpux11*)
    case $host_cpu in
      ia64*)
        shrext=.so
        ;;
      hppa*64*)
        shrext=.sl
        ;;
      *)
        shrext=.sl
        ;;
    esac
    library_names_spec='$libname$shrext'
    ;;
  interix[3-9]*)
    library_names_spec='$libname$shrext'
    ;;
  irix5* | irix6* | nonstopux*)
    library_names_spec='$libname$shrext'
    case "$host_os" in
      irix5* | nonstopux*)
        libsuff= shlibsuff=
        ;;
      *)
        case $LD in
          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
          *) libsuff= shlibsuff= ;;
        esac
        ;;
    esac
    ;;
  linux*oldld* | linux*aout* | linux*coff*)
    ;;
  linux* | k*bsd*-gnu | kopensolaris*-gnu)
    library_names_spec='$libname$shrext'
    ;;
  knetbsd*-gnu)
    library_names_spec='$libname$shrext'
    ;;
  netbsd*)
    library_names_spec='$libname$shrext'
    ;;
  newsos6)
    library_names_spec='$libname$shrext'
    ;;
  *nto* | *qnx*)
    library_names_spec='$libname$shrext'
    ;;
  openbsd*)
    library_names_spec='$libname$shrext$versuffix'
    ;;
  os2*)
    libname_spec='$name'
    shrext=.dll
    library_names_spec='$libname.a'
    ;;
  osf3* | osf4* | osf5*)
    library_names_spec='$libname$shrext'
    ;;
  rdos*)
    ;;
  solaris*)
    library_names_spec='$libname$shrext'
    ;;
  sunos4*)
    library_names_spec='$libname$shrext$versuffix'
    ;;
  sysv4 | sysv4.3*)
    library_names_spec='$libname$shrext'
    ;;
  sysv4*MP*)
    library_names_spec='$libname$shrext'
    ;;
  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
    library_names_spec='$libname$shrext'
    ;;
  tpf*)
    library_names_spec='$libname$shrext'
    ;;
  uts4*)
    library_names_spec='$libname$shrext'
    ;;
 esac
 sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
 escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
 shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
 escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
 # How to pass a linker flag through the compiler.
 wl="$escaped_wl"
 # Static library suffix (normally "a").
 libext="$libext"
 # Shared library suffix (normally "so").
 shlibext="$shlibext"
 # Format of library name prefix.
 libname_spec="$escaped_libname_spec"
 # Library names that the linker finds when passed -lNAME.
 library_names_spec="$escaped_library_names_spec"
 # Flag to hardcode \$libdir into a binary during linking.
 # This must work even if \$libdir does not exist.
 hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
 # Whether we need a single -rpath flag with a separated argument.
 hardcode_libdir_separator="$hardcode_libdir_separator"
 # Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
 # resulting binary.
 hardcode_direct="$hardcode_direct"
 # Set to yes if using the -LDIR flag during linking hardcodes DIR into the
 # resulting binary.
 hardcode_minus_L="$hardcode_minus_L"
 EOF
@@ -0,0 +1,432 @@
 eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
  & eval 'exec perl -wS "$0" $argv:q'
    if 0;
 # Convert git log output to ChangeLog format.
 my $VERSION = '2012-07-29 06:11'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
 # do its job.  Otherwise, update this string manually.
 # Copyright (C) 2008-2014 Free Software Foundation, Inc.
 # This program 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.
 # This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
 # Written by Jim Meyering
 use strict;
 use warnings;
 use Getopt::Long;
 use POSIX qw(strftime);
 (my $ME = $0) =~ s|.*/||;
 # use File::Coda; # http://meyering.net/code/Coda/
 END {
  defined fileno STDOUT or return;
  close STDOUT and return;
  warn "$ME: failed to close standard output: $!\n";
  $? ||= 1;
 }
 sub usage ($)
 {
  my ($exit_code) = @_;
  my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
  if ($exit_code != 0)
    {
      print $STREAM "Try '$ME --help' for more information.\n";
    }
  else
    {
      print $STREAM <<EOF;
 Usage: $ME [OPTIONS] [ARGS]
 Convert git log output to ChangeLog format.  If present, any ARGS
 are passed to "git log".  To avoid ARGS being parsed as options to
 $ME, they may be preceded by '--'.
 OPTIONS:
   --amend=FILE FILE maps from an SHA1 to perl code (i.e., s/old/new/) that
                  makes a change to SHA1's commit log text or metadata.
   --append-dot append a dot to the first line of each commit message if
                  there is no other punctuation or blank at the end.
   --no-cluster never cluster commit messages under the same date/author
                  header; the default is to cluster adjacent commit messages
                  if their headers are the same and neither commit message
                  contains multiple paragraphs.
   --srcdir=DIR the root of the source tree, from which the .git/
                  directory can be derived.
   --since=DATE convert only the logs since DATE;
                  the default is to convert all log entries.
   --format=FMT set format string for commit subject and body;
                  see 'man git-log' for the list of format metacharacters;
                  the default is '%s%n%b%n'
   --strip-tab  remove one additional leading TAB from commit message lines.
   --strip-cherry-pick  remove data inserted by "git cherry-pick";
                  this includes the "cherry picked from commit ..." line,
                  and the possible final "Conflicts:" paragraph.
   --help       display this help and exit
   --version    output version information and exit
 EXAMPLE:
  $ME --since=2008-01-01 > ChangeLog
  $ME -- -n 5 foo > last-5-commits-to-branch-foo
 SPECIAL SYNTAX:
 The following types of strings are interpreted specially when they appear
 at the beginning of a log message line.  They are not copied to the output.
  Copyright-paperwork-exempt: Yes
    Append the "(tiny change)" notation to the usual "date name email"
    ChangeLog header to mark a change that does not require a copyright
    assignment.
  Co-authored-by: Joe User <user\@example.com>
    List the specified name and email address on a second
    ChangeLog header, denoting a co-author.
  Signed-off-by: Joe User <user\@example.com>
    These lines are simply elided.
 In a FILE specified via --amend, comment lines (starting with "#") are ignored.
 FILE must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1 (alone on
 a line) referring to a commit in the current project, and CODE refers to one
 or more consecutive lines of Perl code.  Pairs must be separated by one or
 more blank line.
 Here is sample input for use with --amend=FILE, from coreutils:
 3a169f4c5d9159283548178668d2fae6fced3030
 # fix typo in title:
 s/all tile types/all file types/
 1379ed974f1fa39b12e2ffab18b3f7a607082202
 # Due to a bug in vc-dwim, I mis-attributed a patch by Paul to myself.
 # Change the author to be Paul.  Note the escaped "@":
 s,Jim .*>,Paul Eggert <eggert\\\@cs.ucla.edu>,
 EOF
    }
  exit $exit_code;
 }
 # If the string $S is a well-behaved file name, simply return it.
 # If it contains white space, quotes, etc., quote it, and return the new string.
 sub shell_quote($)
 {
  my ($s) = @_;
  if ($s =~ m![^\w+/.,-]!)
    {
      # Convert each single quote to '\''
      $s =~ s/\'/\'\\\'\'/g;
      # Then single quote the string.
      $s = "'$s'";
    }
  return $s;
 }
 sub quoted_cmd(@)
 {
  return join (' ', map {shell_quote $_} @_);
 }
 # Parse file F.
 # Comment lines (starting with "#") are ignored.
 # F must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1
 # (alone on a line) referring to a commit in the current project, and
 # CODE refers to one or more consecutive lines of Perl code.
 # Pairs must be separated by one or more blank line.
 sub parse_amend_file($)
 {
  my ($f) = @_;
  open F, '<', $f
    or die "$ME: $f: failed to open for reading: $!\n";
  my $fail;
  my $h = {};
  my $in_code = 0;
  my $sha;
  while (defined (my $line = <F>))
    {
      $line =~ /^\#/
        and next;
      chomp $line;
      $line eq ''
        and $in_code = 0, next;
      if (!$in_code)
        {
          $line =~ /^([0-9a-fA-F]{40})$/
            or (warn "$ME: $f:$.: invalid line; expected an SHA1\n"),
              $fail = 1, next;
          $sha = lc $1;
          $in_code = 1;
          exists $h->{$sha}
            and (warn "$ME: $f:$.: duplicate SHA1\n"),
              $fail = 1, next;
        }
      else
        {
          $h->{$sha} ||= '';
          $h->{$sha} .= "$line\n";
        }
    }
  close F;
  $fail
    and exit 1;
  return $h;
 }
 # git_dir_option $SRCDIR
 #
 # From $SRCDIR, the --git-dir option to pass to git (none if $SRCDIR
 # is undef).  Return as a list (0 or 1 element).
 sub git_dir_option($)
 {
  my ($srcdir) = @_;
  my @res = ();
  if (defined $srcdir)
    {
      my $qdir = shell_quote $srcdir;
      my $cmd = "cd $qdir && git rev-parse --show-toplevel";
      my $qcmd = shell_quote $cmd;
      my $git_dir = qx($cmd);
      defined $git_dir
        or die "$ME: cannot run $qcmd: $!\n";
      $? == 0
        or die "$ME: $qcmd had unexpected exit code or signal ($?)\n";
      chomp $git_dir;
      push @res, "--git-dir=$git_dir/.git";
    }
  @res;
 }
 {
  my $since_date;
  my $format_string = '%s%n%b%n';
  my $amend_file;
  my $append_dot = 0;
  my $cluster = 1;
  my $strip_tab = 0;
  my $strip_cherry_pick = 0;
  my $srcdir;
  GetOptions
    (
     help => sub { usage 0 },
     version => sub { print "$ME version $VERSION\n"; exit },
     'since=s' => \$since_date,
     'format=s' => \$format_string,
     'amend=s' => \$amend_file,
     'append-dot' => \$append_dot,
     'cluster!' => \$cluster,
     'strip-tab' => \$strip_tab,
     'strip-cherry-pick' => \$strip_cherry_pick,
     'srcdir=s' => \$srcdir,
    ) or usage 1;
  defined $since_date
    and unshift @ARGV, "--since=$since_date";
  # This is a hash that maps an SHA1 to perl code (i.e., s/old/new/)
  # that makes a correction in the log or attribution of that commit.
  my $amend_code = defined $amend_file ? parse_amend_file $amend_file : {};
  my @cmd = ('git',
             git_dir_option $srcdir,
             qw(log --log-size),
             '--pretty=format:%H:%ct  %an  <%ae>%n%n'.$format_string, @ARGV);
  open PIPE, '-|', @cmd
    or die ("$ME: failed to run '". quoted_cmd (@cmd) ."': $!\n"
            . "(Is your Git too old?  Version 1.5.1 or later is required.)\n");
  my $prev_multi_paragraph;
  my $prev_date_line = '';
  my @prev_coauthors = ();
  while (1)
    {
      defined (my $in = <PIPE>)
        or last;
      $in =~ /^log size (\d+)$/
        or die "$ME:$.: Invalid line (expected log size):\n$in";
      my $log_nbytes = $1;
      my $log;
      my $n_read = read PIPE, $log, $log_nbytes;
      $n_read == $log_nbytes
        or die "$ME:$.: unexpected EOF\n";
      # Extract leading hash.
      my ($sha, $rest) = split ':', $log, 2;
      defined $sha
        or die "$ME:$.: malformed log entry\n";
      $sha =~ /^[0-9a-fA-F]{40}$/
        or die "$ME:$.: invalid SHA1: $sha\n";
      # If this commit's log requires any transformation, do it now.
      my $code = $amend_code->{$sha};
      if (defined $code)
        {
          eval 'use Safe';
          my $s = new Safe;
          # Put the unpreprocessed entry into "$_".
          $_ = $rest;
          # Let $code operate on it, safely.
          my $r = $s->reval("$code")
            or die "$ME:$.:$sha: failed to eval \"$code\":\n$@\n";
          # Note that we've used this entry.
          delete $amend_code->{$sha};
          # Update $rest upon success.
          $rest = $_;
        }
      # Remove lines inserted by "git cherry-pick".
      if ($strip_cherry_pick)
        {
          $rest =~ s/^\s*Conflicts:\n.*//sm;
          $rest =~ s/^\s*\(cherry picked from commit [\da-f]+\)\n//m;
        }
      my @line = split "\n", $rest;
      my $author_line = shift @line;
      defined $author_line
        or die "$ME:$.: unexpected EOF\n";
      $author_line =~ /^(\d+)  (.*>)$/
        or die "$ME:$.: Invalid line "
          . "(expected date/author/email):\n$author_line\n";
      # Format 'Copyright-paperwork-exempt: Yes' as a standard ChangeLog
      # `(tiny change)' annotation.
      my $tiny = (grep (/^Copyright-paperwork-exempt:\s+[Yy]es$/, @line)
                  ? '  (tiny change)' : '');
      my $date_line = sprintf "%s  %s$tiny\n",
        strftime ("%F", localtime ($1)), $2;
      my @coauthors = grep /^Co-authored-by:.*$/, @line;
      # Omit meta-data lines we've already interpreted.
      @line = grep !/^(?:Signed-off-by:[ ].*>$
                       |Co-authored-by:[ ]
                       |Copyright-paperwork-exempt:[ ]
                       )/x, @line;
      # Remove leading and trailing blank lines.
      if (@line)
        {
          while ($line[0] =~ /^\s*$/) { shift @line; }
          while ($line[$#line] =~ /^\s*$/) { pop @line; }
        }
      # Record whether there are two or more paragraphs.
      my $multi_paragraph = grep /^\s*$/, @line;
      # Format 'Co-authored-by: A U Thor <email@example.com>' lines in
      # standard multi-author ChangeLog format.
      for (@coauthors)
        {
          s/^Co-authored-by:\s*/\t    /;
          s/\s*</  </;
          /<.*?@.*\..*>/
            or warn "$ME: warning: missing email address for "
              . substr ($_, 5) . "\n";
        }
      # If clustering of commit messages has been disabled, if this header
      # would be different from the previous date/name/email/coauthors header,
      # or if this or the previous entry consists of two or more paragraphs,
      # then print the header.
      if ( ! $cluster
          || $date_line ne $prev_date_line
          || "@coauthors" ne "@prev_coauthors"
          || $multi_paragraph
          || $prev_multi_paragraph)
        {
          $prev_date_line eq ''
            or print "\n";
          print $date_line;
          @coauthors
            and print join ("\n", @coauthors), "\n";
        }
      $prev_date_line = $date_line;
      @prev_coauthors = @coauthors;
      $prev_multi_paragraph = $multi_paragraph;
      # If there were any lines
      if (@line == 0)
        {
          warn "$ME: warning: empty commit message:\n  $date_line\n";
        }
      else
        {
          if ($append_dot)
            {
              # If the first line of the message has enough room, then
              if (length $line[0] < 72)
                {
                  # append a dot if there is no other punctuation or blank
                  # at the end.
                  $line[0] =~ /[[:punct:]\s]$/
                    or $line[0] .= '.';
                }
            }
          # Remove one additional leading TAB from each line.
          $strip_tab
            and map { s/^\t// } @line;
          # Prefix each non-empty line with a TAB.
          @line = map { length $_ ? "\t$_" : '' } @line;
          print "\n", join ("\n", @line), "\n";
        }
      defined ($in = <PIPE>)
        or last;
      $in ne "\n"
        and die "$ME:$.: unexpected line:\n$in";
    }
  close PIPE
    or die "$ME: error closing pipe from " . quoted_cmd (@cmd) . "\n";
  # FIXME-someday: include $PROCESS_STATUS in the diagnostic
  # Complain about any unused entry in the --amend=F specified file.
  my $fail = 0;
  foreach my $sha (keys %$amend_code)
    {
      warn "$ME:$amend_file: unused entry: $sha\n";
      $fail = 1;
    }
  exit $fail;
 }
 # Local Variables:
 # mode: perl
 # indent-tabs-mode: nil
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "my $VERSION = '"
 # time-stamp-format: "%:y-%02m-%02d %02H:%02M"
 # time-stamp-time-zone: "UTC"
 # time-stamp-end: "'; # UTC"
 # End:
@@ -0,0 +1,10 @@
 #if !defined _Noreturn && __STDC_VERSION__ < 201112
 # if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
      || 0x5110 <= __SUNPRO_C)
 #  define _Noreturn __attribute__ ((__noreturn__))
 # elif 1200 <= _MSC_VER
 #  define _Noreturn __declspec (noreturn)
 # else
 #  define _Noreturn
 # endif
 #endif
@@ -0,0 +1,26 @@
 /* A C macro for declaring that specific arguments must not be NULL.
   Copyright (C) 2009-2013 Free Software Foundation, Inc.
   This program 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.
   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 /* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
   that the values passed as arguments n, ..., m must be non-NULL pointers.
   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
 #ifndef _GL_ARG_NONNULL
 # if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
 #  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
 # else
 #  define _GL_ARG_NONNULL(params)
 # endif
 #endif
@@ -0,0 +1,271 @@
 /* C++ compatible function declaration macros.
   Copyright (C) 2010-2013 Free Software Foundation, Inc.
   This program 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.
   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef _GL_CXXDEFS_H
 #define _GL_CXXDEFS_H
 /* The three most frequent use cases of these macros are:
   * For providing a substitute for a function that is missing on some
     platforms, but is declared and works fine on the platforms on which
     it exists:
       #if @GNULIB_FOO@
       # if !@HAVE_FOO@
       _GL_FUNCDECL_SYS (foo, ...);
       # endif
       _GL_CXXALIAS_SYS (foo, ...);
       _GL_CXXALIASWARN (foo);
       #elif defined GNULIB_POSIXCHECK
       ...
       #endif
   * For providing a replacement for a function that exists on all platforms,
     but is broken/insufficient and needs to be replaced on some platforms:
       #if @GNULIB_FOO@
       # if @REPLACE_FOO@
       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
       #   undef foo
       #   define foo rpl_foo
       #  endif
       _GL_FUNCDECL_RPL (foo, ...);
       _GL_CXXALIAS_RPL (foo, ...);
       # else
       _GL_CXXALIAS_SYS (foo, ...);
       # endif
       _GL_CXXALIASWARN (foo);
       #elif defined GNULIB_POSIXCHECK
       ...
       #endif
   * For providing a replacement for a function that exists on some platforms
     but is broken/insufficient and needs to be replaced on some of them and
     is additionally either missing or undeclared on some other platforms:
       #if @GNULIB_FOO@
       # if @REPLACE_FOO@
       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
       #   undef foo
       #   define foo rpl_foo
       #  endif
       _GL_FUNCDECL_RPL (foo, ...);
       _GL_CXXALIAS_RPL (foo, ...);
       # else
       #  if !@HAVE_FOO@   or   if !@HAVE_DECL_FOO@
       _GL_FUNCDECL_SYS (foo, ...);
       #  endif
       _GL_CXXALIAS_SYS (foo, ...);
       # endif
       _GL_CXXALIASWARN (foo);
       #elif defined GNULIB_POSIXCHECK
       ...
       #endif
 */
 /* _GL_EXTERN_C declaration;
   performs the declaration with C linkage.  */
 #if defined __cplusplus
 # define _GL_EXTERN_C extern "C"
 #else
 # define _GL_EXTERN_C extern
 #endif
 /* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
   declares a replacement function, named rpl_func, with the given prototype,
   consisting of return type, parameters, and attributes.
   Example:
     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
                                  _GL_ARG_NONNULL ((1)));
 */
 #define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
 #define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
  _GL_EXTERN_C rettype rpl_func parameters_and_attributes
 /* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
   declares the system function, named func, with the given prototype,
   consisting of return type, parameters, and attributes.
   Example:
     _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
                                  _GL_ARG_NONNULL ((1)));
 */
 #define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
  _GL_EXTERN_C rettype func parameters_and_attributes
 /* _GL_CXXALIAS_RPL (func, rettype, parameters);
   declares a C++ alias called GNULIB_NAMESPACE::func
   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
   Example:
     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
 */
 #define _GL_CXXALIAS_RPL(func,rettype,parameters) \
  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
 #if defined __cplusplus && defined GNULIB_NAMESPACE
 # define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
    namespace GNULIB_NAMESPACE                                \
    {                                                         \
      rettype (*const func) parameters = ::rpl_func;          \
    }                                                         \
    _GL_EXTERN_C int _gl_cxxalias_dummy
 #else
 # define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
    _GL_EXTERN_C int _gl_cxxalias_dummy
 #endif
 /* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
   except that the C function rpl_func may have a slightly different
   declaration.  A cast is used to silence the "invalid conversion" error
   that would otherwise occur.  */
 #if defined __cplusplus && defined GNULIB_NAMESPACE
 # define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
    namespace GNULIB_NAMESPACE                                     \
    {                                                              \
      rettype (*const func) parameters =                           \
        reinterpret_cast<rettype(*)parameters>(::rpl_func);        \
    }                                                              \
    _GL_EXTERN_C int _gl_cxxalias_dummy
 #else
 # define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
    _GL_EXTERN_C int _gl_cxxalias_dummy
 #endif
 /* _GL_CXXALIAS_SYS (func, rettype, parameters);
   declares a C++ alias called GNULIB_NAMESPACE::func
   that redirects to the system provided function func, if GNULIB_NAMESPACE
   is defined.
   Example:
     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
 */
 #if defined __cplusplus && defined GNULIB_NAMESPACE
  /* If we were to write
       rettype (*const func) parameters = ::func;
     like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls
     better (remove an indirection through a 'static' pointer variable),
     but then the _GL_CXXALIASWARN macro below would cause a warning not only
     for uses of ::func but also for uses of GNULIB_NAMESPACE::func.  */
 # define _GL_CXXALIAS_SYS(func,rettype,parameters) \
    namespace GNULIB_NAMESPACE                     \
    {                                              \
      static rettype (*func) parameters = ::func;  \
    }                                              \
    _GL_EXTERN_C int _gl_cxxalias_dummy
 #else
 # define _GL_CXXALIAS_SYS(func,rettype,parameters) \
    _GL_EXTERN_C int _gl_cxxalias_dummy
 #endif
 /* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
   except that the C function func may have a slightly different declaration.
   A cast is used to silence the "invalid conversion" error that would
   otherwise occur.  */
 #if defined __cplusplus && defined GNULIB_NAMESPACE
 # define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
    namespace GNULIB_NAMESPACE                          \
    {                                                   \
      static rettype (*func) parameters =               \
        reinterpret_cast<rettype(*)parameters>(::func); \
    }                                                   \
    _GL_EXTERN_C int _gl_cxxalias_dummy
 #else
 # define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
    _GL_EXTERN_C int _gl_cxxalias_dummy
 #endif
 /* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
   except that the C function is picked among a set of overloaded functions,
   namely the one with rettype2 and parameters2.  Two consecutive casts
   are used to silence the "cannot find a match" and "invalid conversion"
   errors that would otherwise occur.  */
 #if defined __cplusplus && defined GNULIB_NAMESPACE
  /* The outer cast must be a reinterpret_cast.
     The inner cast: When the function is defined as a set of overloaded
     functions, it works as a static_cast<>, choosing the designated variant.
     When the function is defined as a single variant, it works as a
     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
 # define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
    namespace GNULIB_NAMESPACE                                                \
    {                                                                         \
      static rettype (*func) parameters =                                     \
        reinterpret_cast<rettype(*)parameters>(                               \
          (rettype2(*)parameters2)(::func));                                  \
    }                                                                         \
    _GL_EXTERN_C int _gl_cxxalias_dummy
 #else
 # define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
    _GL_EXTERN_C int _gl_cxxalias_dummy
 #endif
 /* _GL_CXXALIASWARN (func);
   causes a warning to be emitted when ::func is used but not when
   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
   variants.  */
 #if defined __cplusplus && defined GNULIB_NAMESPACE
 # define _GL_CXXALIASWARN(func) \
   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
 # define _GL_CXXALIASWARN_1(func,namespace) \
   _GL_CXXALIASWARN_2 (func, namespace)
 /* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
   we enable the warning only when not optimizing.  */
 # if !__OPTIMIZE__
 #  define _GL_CXXALIASWARN_2(func,namespace) \
    _GL_WARN_ON_USE (func, \
                     "The symbol ::" #func " refers to the system function. " \
                     "Use " #namespace "::" #func " instead.")
 # elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
 #  define _GL_CXXALIASWARN_2(func,namespace) \
     extern __typeof__ (func) func
 # else
 #  define _GL_CXXALIASWARN_2(func,namespace) \
     _GL_EXTERN_C int _gl_cxxalias_dummy
 # endif
 #else
 # define _GL_CXXALIASWARN(func) \
    _GL_EXTERN_C int _gl_cxxalias_dummy
 #endif
 /* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
   causes a warning to be emitted when the given overloaded variant of ::func
   is used but not when GNULIB_NAMESPACE::func is used.  */
 #if defined __cplusplus && defined GNULIB_NAMESPACE
 # define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
                        GNULIB_NAMESPACE)
 # define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
 /* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
   we enable the warning only when not optimizing.  */
 # if !__OPTIMIZE__
 #  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
    _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
                         "The symbol ::" #func " refers to the system function. " \
                         "Use " #namespace "::" #func " instead.")
 # elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
 #  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
     extern __typeof__ (func) func
 # else
 #  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
     _GL_EXTERN_C int _gl_cxxalias_dummy
 # endif
 #else
 # define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
    _GL_EXTERN_C int _gl_cxxalias_dummy
 #endif
 #endif /* _GL_CXXDEFS_H */
@@ -0,0 +1,109 @@
 /* A C macro for emitting warnings if a function is used.
   Copyright (C) 2010-2013 Free Software Foundation, Inc.
   This program 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.
   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 /* _GL_WARN_ON_USE (function, "literal string") issues a declaration
   for FUNCTION which will then trigger a compiler warning containing
   the text of "literal string" anywhere that function is called, if
   supported by the compiler.  If the compiler does not support this
   feature, the macro expands to an unused extern declaration.
   This macro is useful for marking a function as a potential
   portability trap, with the intent that "literal string" include
   instructions on the replacement function that should be used
   instead.  However, one of the reasons that a function is a
   portability trap is if it has the wrong signature.  Declaring
   FUNCTION with a different signature in C is a compilation error, so
   this macro must use the same type as any existing declaration so
   that programs that avoid the problematic FUNCTION do not fail to
   compile merely because they included a header that poisoned the
   function.  But this implies that _GL_WARN_ON_USE is only safe to
   use if FUNCTION is known to already have a declaration.  Use of
   this macro implies that there must not be any other macro hiding
   the declaration of FUNCTION; but undefining FUNCTION first is part
   of the poisoning process anyway (although for symbols that are
   provided only via a macro, the result is a compilation error rather
   than a warning containing "literal string").  Also note that in
   C++, it is only safe to use if FUNCTION has no overloads.
   For an example, it is possible to poison 'getline' by:
   - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]],
     [getline]) in configure.ac, which potentially defines
     HAVE_RAW_DECL_GETLINE
   - adding this code to a header that wraps the system <stdio.h>:
     #undef getline
     #if HAVE_RAW_DECL_GETLINE
     _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but"
       "not universally present; use the gnulib module getline");
     #endif
   It is not possible to directly poison global variables.  But it is
   possible to write a wrapper accessor function, and poison that
   (less common usage, like &environ, will cause a compilation error
   rather than issue the nice warning, but the end result of informing
   the developer about their portability problem is still achieved):
   #if HAVE_RAW_DECL_ENVIRON
   static char ***rpl_environ (void) { return &environ; }
   _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
   # undef environ
   # define environ (*rpl_environ ())
   #endif
   */
 #ifndef _GL_WARN_ON_USE
 # if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
 /* A compiler attribute is available in gcc versions 4.3.0 and later.  */
 #  define _GL_WARN_ON_USE(function, message) \
 extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
 # elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
 /* Verify the existence of the function.  */
 #  define _GL_WARN_ON_USE(function, message) \
 extern __typeof__ (function) function
 # else /* Unsupported.  */
 #  define _GL_WARN_ON_USE(function, message) \
 _GL_WARN_EXTERN_C int _gl_warn_on_use
 # endif
 #endif
 /* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
   is like _GL_WARN_ON_USE (function, "string"), except that the function is
   declared with the given prototype, consisting of return type, parameters,
   and attributes.
   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
   not work in this case.  */
 #ifndef _GL_WARN_ON_USE_CXX
 # if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
 #  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
 extern rettype function parameters_and_attributes \
     __attribute__ ((__warning__ (msg)))
 # elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
 /* Verify the existence of the function.  */
 #  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
 extern rettype function parameters_and_attributes
 # else /* Unsupported.  */
 #  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
 _GL_WARN_EXTERN_C int _gl_warn_on_use
 # endif
 #endif
 /* _GL_WARN_EXTERN_C declaration;
   performs the declaration with C linkage.  */
 #ifndef _GL_WARN_EXTERN_C
 # if defined __cplusplus
 #  define _GL_WARN_EXTERN_C extern "C"
 # else
 #  define _GL_WARN_EXTERN_C extern
 # endif
 #endif
@@ -66,7 +66,7 @@ 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
-CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/lib/gnulib -I$(top_srcdir)/grub-core/lib/gnulib
+CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/gnulib -I$(top_srcdir)/grub-core/gnulib
 CFLAGS_POSIX = -fno-builtin
 CPPFLAGS_POSIX = -I$(top_srcdir)/grub-core/lib/posix_wrap
@@ -84,15 +84,11 @@ CPPFLAGS_PARTTOOL_LIST = -Dgrub_parttool_register=PARTTOOL_LIST_MARKER
 CPPFLAGS_TERMINAL_LIST = '-Dgrub_term_register_input(...)=INPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)'
 CPPFLAGS_TERMINAL_LIST += '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)'
 CPPFLAGS_COMMAND_LIST = '-Dgrub_register_command(...)=COMMAND_LIST_MARKER(__VA_ARGS__)'
 CPPFLAGS_COMMAND_LIST += '-Dgrub_register_command_lockdown(...)=COMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)'
 CPPFLAGS_COMMAND_LIST += '-Dgrub_register_extcmd(...)=EXTCOMMAND_LIST_MARKER(__VA_ARGS__)'
 CPPFLAGS_COMMAND_LIST += '-Dgrub_register_extcmd_lockdown(...)=EXTCOMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)'
 CPPFLAGS_COMMAND_LIST += '-Dgrub_register_command_p1(...)=P1COMMAND_LIST_MARKER(__VA_ARGS__)'
 CPPFLAGS_FDT_LIST := '-Dgrub_fdtbus_register(...)=FDT_DRIVER_LIST_MARKER(__VA_ARGS__)'
 CPPFLAGS_MARKER = $(CPPFLAGS_FS_LIST) $(CPPFLAGS_VIDEO_LIST) \
 	$(CPPFLAGS_PARTTOOL_LIST) $(CPPFLAGS_PARTMAP_LIST) \
-	$(CPPFLAGS_TERMINAL_LIST) $(CPPFLAGS_COMMAND_LIST) \
+	$(CPPFLAGS_TERMINAL_LIST) $(CPPFLAGS_COMMAND_LIST)
 	$(CPPFLAGS_FDT_LIST)
 # Define these variables to calm down automake
@@ -130,11 +126,11 @@ BUILT_SOURCES =
 .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
-	$(PYTHON) $^ > $@.new || (rm -f $@.new; exit 1)
+	python $^ > $@.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
-	if [ "x$$GRUB_CONTRIB" != x ]; then echo "You need to run ./bootstrap manually." >&2; exit 1; fi
+	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)
+	python $^ > $@.new || (rm -f $@.new; exit 1)
 	mv $@.new $@
@@ -28,15 +28,10 @@ EXTRA_DIST += grub-core/gensymlist.sh
 EXTRA_DIST += grub-core/genemuinit.sh
 EXTRA_DIST += grub-core/genemuinitheader.sh
-EXTRA_DIST += grub-core/lib/gnulib-patches/fix-base64.patch
+EXTRA_DIST += grub-core/gnulib-fix-null-deref.diff
-EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch
+EXTRA_DIST += grub-core/gnulib-fix-width.diff
-EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-state-deref.patch
+EXTRA_DIST += grub-core/gnulib-no-abort.diff
-EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch
+EXTRA_DIST += grub-core/gnulib-no-gets.diff
 EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch
 EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch
 EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch
 EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch
 EXTRA_DIST += grub-core/lib/gnulib-patches/no-abort.patch
 EXTRA_DIST += grub-core/lib/libgcrypt
 EXTRA_DIST += grub-core/lib/libgcrypt-grub/mpi/generic
@@ -116,21 +111,6 @@ EXTRA_DIST += grub-core/osdep/windows/password.c
 EXTRA_DIST += grub-core/osdep/windows/random.c
 EXTRA_DIST += grub-core/osdep/windows/sleep.c
 EXTRA_DIST += po/gettext-patches/0001-Support-POTFILES-shell.patch
 EXTRA_DIST += po/gettext-patches/0002-Handle-gettext_printf-shell-function.patch
 EXTRA_DIST += po/gettext-patches/0003-Make-msgfmt-output-in-little-endian.patch
 EXTRA_DIST += po/gettext-patches/0004-Use-SHELL-rather-than-bin-sh.patch
 EXTRA_DIST += po/POTFILES-shell.in
 EXTRA_DIST += po/README
 EXTRA_DIST += po/Rules-translit
 EXTRA_DIST += po/Rules-windowsdir
 EXTRA_DIST += po/arabic.sed
 EXTRA_DIST += po/cyrillic.sed
 EXTRA_DIST += po/greek.sed
 EXTRA_DIST += po/grub.d.sed
 EXTRA_DIST += po/hebrew.sed
 EXTRA_DIST += tests/dfly-mbr-mbexample.mbr.img.gz
 EXTRA_DIST += tests/dfly-mbr-mbexample.dfly.img.gz
@@ -26,15 +26,12 @@ dnl This is necessary because the target type in autoconf does not
 dnl describe such a system very well.
 dnl
 dnl The current strategy is to use variables with no prefix (such as
-dnl CC, CFLAGS, etc.) for the host and target type, variables with
+dnl CC, CFLAGS, etc.) for the host type, variables with prefix "BUILD_"
-dnl prefix "BUILD_" (such as BUILD_CC, BUILD_CFLAGS, etc.) for the
+dnl (such as BUILD_CC, BUILD_CFLAGS, etc.) for the build type and variables
-dnl build type, variables with prefix "HOST_" (such as HOST_CC,
+dnl with the prefix "TARGET_" (such as TARGET_CC, TARGET_CFLAGS, etc.) are
-dnl HOST_CFLAGS, etc.) for the host type and variables with the prefix
+dnl used for the target type. See INSTALL for full list of variables.
 dnl "TARGET_" (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for
 dnl the target type. See INSTALL for full list of variables and
 dnl description of the relationships between them.
-AC_INIT([GRUB],[2.06~rc1],[bug-grub@gnu.org])
+AC_INIT([GRUB],[2.02~beta3],[bug-grub@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -48,15 +45,11 @@ save_program_prefix="${program_prefix}"
 AC_CANONICAL_TARGET
 program_prefix="${save_program_prefix}"
-AM_INIT_AUTOMAKE([1.11])
+AM_INIT_AUTOMAKE([1.10.1])
-AC_PREREQ(2.63)
+AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR([include/grub/dl.h])
 AC_CONFIG_HEADER([config-util.h])
 # Explicitly check for pkg-config early on, since otherwise conditional
 # calls are problematic.
 PKG_PROG_PKG_CONFIG
 # Program name transformations
 AC_ARG_PROGRAM
 grub_TRANSFORM([grub-bios-setup])
@@ -80,15 +73,9 @@ grub_TRANSFORM([grub-file])
 # Optimization flag.  Allow user to override.
 if test "x$TARGET_CFLAGS" = x; then
-  TARGET_CFLAGS=-Os
+  TARGET_CFLAGS="$TARGET_CFLAGS -Os"
 fi
 # Enable support for "restrict" keyword and other
 # features from gnu99 C language standard.
 BUILD_CFLAGS="-std=gnu99 $BUILD_CFLAGS"
 HOST_CFLAGS="-std=gnu99 $HOST_CFLAGS"
 TARGET_CFLAGS="-std=gnu99 $TARGET_CFLAGS"
 # Default HOST_CPPFLAGS
 HOST_CPPFLAGS="$HOST_CPPFLAGS -Wall -W"
 HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_UTIL=1"
@@ -113,12 +100,6 @@ case "$target_cpu" in
  aarch64*)
 		target_cpu=arm64
 		;;
  riscv32*)
 		target_cpu=riscv32
 		;;
  riscv64*)
 		target_cpu=riscv64
 		;;
 esac
 # Specify the platform (such as firmware).
@@ -142,8 +123,6 @@ if test "x$with_platform" = x; then
    ia64-*) platform=efi ;;
    arm-*) platform=uboot ;;
    arm64-*) platform=efi ;;
    riscv32-*) platform=efi ;;
    riscv64-*) platform=efi ;;
    *)
      AC_MSG_WARN([unsupported CPU: "$target_cpu" - only building utilities])
      platform=none
@@ -168,7 +147,6 @@ case "$target_cpu"-"$platform" in
  i386-efi) ;;
  x86_64-efi) ;;
  i386-xen) ;;
  i386-xen_pvh) ;;
  x86_64-xen) ;;
  i386-pc) ;;
  i386-multiboot) ;;
@@ -189,11 +167,8 @@ case "$target_cpu"-"$platform" in
  mipsel-fuloong) platform=loongson ;;
  mipsel-loongson) ;;
  arm-uboot) ;;
  arm-coreboot) ;;
  arm-efi) ;;
  arm64-efi) ;;
  riscv32-efi) ;;
  riscv64-efi) ;;
  *-emu) ;;
  *-none) ;;
  *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
@@ -228,8 +203,7 @@ case "$host_os" in
 esac
 case "$host_os" in
-  cygwin) have_exec=y ;;
+  cygwin | windows* | mingw32*)	have_exec=n ;;
  windows* | mingw32*) have_exec=n ;;
  aros*) have_exec=n ;;
  *) have_exec=y;;
 esac
@@ -239,7 +213,6 @@ case "$platform" in
  multiboot)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MULTIBOOT=1" ;;
  efi)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_EFI=1" ;;
  xen)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_XEN=1" ;;
  xen_pvh)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_XEN_PVH=1" ;;
  ieee1275)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_IEEE1275=1" ;;
  uboot)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_UBOOT=1" ;;
  qemu)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_QEMU=1" ;;
@@ -302,7 +275,7 @@ fi
 AC_SUBST(bootdirname)
 AC_DEFINE_UNQUOTED(GRUB_BOOT_DIR_NAME, "$bootdirname",
-    [Default boot directory name])
+    [Default boot directory name]")
 AC_ARG_WITH([grubdir],
            AS_HELP_STRING([--with-grubdir=DIR],
@@ -362,7 +335,6 @@ gl_EARLY
 AC_PROG_CXX
 AM_PROG_CC_C_O
 AM_PROG_AS
 AM_PATH_PYTHON([2.6])
 # Must be GCC.
 test "x$GCC" = xyes || AC_MSG_ERROR([GCC is required])
@@ -371,7 +343,6 @@ AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
 AC_GNU_SOURCE
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.18.3])
 AC_SYS_LARGEFILE
 # Identify characteristics of the host architecture.
@@ -402,10 +373,7 @@ case "$host_os" in
     ;;
  *)
     AC_CHECK_SIZEOF(off_t)
-     if test x"$ac_cv_sizeof_off_t" != x8 ; then
+     test x"$ac_cv_sizeof_off_t" = x8 || AC_MSG_ERROR([Large file support is required]);;
       AC_CHECK_SIZEOF(off64_t)
       test x"$ac_cv_sizeof_off64_t" = x8 || AC_MSG_ERROR([Large file support is required])
     fi;;
 esac
 if test x$USE_NLS = xno; then
@@ -421,14 +389,7 @@ fi
 # Check for functions and headers.
 AC_CHECK_FUNCS(posix_memalign memalign getextmntent)
 AC_CHECK_HEADERS(sys/param.h sys/mount.h sys/mnttab.h limits.h)
 # glibc 2.25 still includes sys/sysmacros.h in sys/types.h but emits deprecation
 # warning which causes compilation failure later with -Werror. So use -Werror here
 # as well to force proper sys/sysmacros.h detection.
 SAVED_CFLAGS="$CFLAGS"
 CFLAGS="$HOST_CFLAGS -Werror"
 AC_HEADER_MAJOR
 CFLAGS="$SAVED_CFLAGS"
 AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[$ac_includes_default
 #include <sys/param.h>
@@ -488,16 +449,6 @@ case "$build_os" in
 esac
 AC_SUBST(BUILD_EXEEXT)
 # In some build environments like termux /bin/sh is not a valid
 # shebang. Use $SHELL instead if it's executable and /bin/sh isn't
 BUILD_SHEBANG=/bin/sh
 for she in /bin/sh "$SHELL"; do
  if test -x "$she" ; then
    BUILD_SHEBANG="$she"
  fi
 done
 AC_SUBST(BUILD_SHEBANG)
 # For gnulib.
 gl_INIT
@@ -571,24 +522,6 @@ CPPFLAGS="$TARGET_CPPFLAGS"
 LDFLAGS="$TARGET_LDFLAGS"
 LIBS=""
 if test "x$target_m32" = x1; then
  # Force 32-bit mode.
  TARGET_CFLAGS="$TARGET_CFLAGS -m32"
  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m32"
  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m32"
  TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
  TARGET_MODULE_FORMAT="elf32"
 fi
 if test "x$target_m64" = x1; then
  # Force 64-bit mode.
  TARGET_CFLAGS="$TARGET_CFLAGS -m64"
  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m64"
  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m64"
  TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
  TARGET_MODULE_FORMAT="elf64"
 fi
 # debug flags.
 TARGET_CFLAGS="$TARGET_CFLAGS $WARN_FLAGS -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations"
 TARGET_CCASFLAGS="$TARGET_CCASFLAGS -g"
@@ -777,6 +710,24 @@ if test "x$target_cpu" = xi386 && test "x$platform" != xemu; then
  TARGET_CFLAGS="$TARGET_CFLAGS -march=i386"
 fi
 if test "x$target_m32" = x1; then
  # Force 32-bit mode.
  TARGET_CFLAGS="$TARGET_CFLAGS -m32"
  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m32"
  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m32"
  TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
  TARGET_MODULE_FORMAT="elf32"
 fi
 if test "x$target_m64" = x1; then
  # Force 64-bit mode.
  TARGET_CFLAGS="$TARGET_CFLAGS -m64"
  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m64"
  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m64"
  TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
  TARGET_MODULE_FORMAT="elf64"
 fi
 if test "x$grub_cv_cc_target_clang" = xno && test "x$target_cpu" = xi386 && test "x$platform" != xemu && test "x$platform" != xefi; then
   TARGET_CFLAGS="$TARGET_CFLAGS -mrtd -mregparm=3"
 fi
@@ -848,26 +799,11 @@ if test x"$platform" != xemu ; then
       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
 		         [grub_cv_target_cc_soft_float="-mgeneral-regs-only"], [])
    fi
    if test "x$target_cpu" = xriscv32; then
       CFLAGS="$TARGET_CFLAGS -march=rv32imac -mabi=ilp32 -Werror"
       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
 		         [grub_cv_target_cc_soft_float="-march=rv32imac -mabi=ilp32"], [])
    fi
    if test "x$target_cpu" = xriscv64; then
       CFLAGS="$TARGET_CFLAGS -march=rv64imac -mabi=lp64 -Werror"
       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
 		         [grub_cv_target_cc_soft_float="-march=rv64imac -mabi=lp64"], [])
    fi
    if test "x$target_cpu" = xia64; then
       CFLAGS="$TARGET_CFLAGS -mno-inline-float-divide -mno-inline-sqrt -Werror"
       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
 		         [grub_cv_target_cc_soft_float="-mno-inline-float-divide -mno-inline-sqrt"], [])
    fi
    if test "x$target_cpu" = xsh4; then
       CFLAGS="$TARGET_CFLAGS -m4-nofpu -Werror"
       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
 		         [grub_cv_target_cc_soft_float="-m4-nofpu"], [])
    fi
    for cand in "-msoft-float -Xclang -msoft-float -Xclang -no-implicit-float" \
 		"-Xclang -msoft-float -Xclang -no-implicit-float" \
 		"-Xclang -msoft-float" "-msoft-float"; do
@@ -1013,17 +949,6 @@ if test "x$grub_cv_cc_fno_unwind_tables" = xyes; then
  TARGET_CFLAGS="$TARGET_CFLAGS -fno-unwind-tables"
 fi
 # Do not generate .ident sections.
 AC_CACHE_CHECK([whether -fno-ident works], [grub_cv_cc_fno_ident], [
  CFLAGS="$TARGET_CFLAGS -fno-ident"
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
      [grub_cv_cc_fno_ident=yes],
      [grub_cv_cc_fno_ident=no])
 ])
 if test "x$grub_cv_cc_fno_ident" = xyes; then
  TARGET_CFLAGS="$TARGET_CFLAGS -fno-ident"
 fi
 CFLAGS="$TARGET_CFLAGS"
@@ -1189,7 +1114,7 @@ AC_SUBST(TARGET_LDFLAGS_OLDMAGIC)
 LDFLAGS="$TARGET_LDFLAGS"
-if test "$target_cpu" = x86_64 || test "$target_cpu" = sparc64 || test "$target_cpu" = riscv64 ; then
+if test "$target_cpu" = x86_64 || test "$target_cpu" = sparc64 ; then
  # Use large model to support 4G memory
  AC_CACHE_CHECK([whether option -mcmodel=large works], grub_cv_cc_mcmodel, [
    CFLAGS="$TARGET_CFLAGS -mcmodel=large"
@@ -1199,7 +1124,7 @@ if test "$target_cpu" = x86_64 || test "$target_cpu" = sparc64 || test "$target_
  ])
  if test "x$grub_cv_cc_mcmodel" = xyes; then
    TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large"
-  elif test "$target_cpu" = sparc64 || test "$target_cpu" = riscv64; then
+  elif test "$target_cpu" = sparc64; then
    TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=medany"
  fi
 fi
@@ -1220,24 +1145,14 @@ if test "$target_cpu"-"$platform" = x86_64-efi; then
 fi
 if test "x$target_cpu" = xarm; then
-  AC_CACHE_CHECK([for options to disable movt and movw], grub_cv_target_cc_mno_movt, [
+  AC_CACHE_CHECK([whether option -mlong-calls works], grub_cv_cc_mlong_calls, [
-    grub_cv_target_cc_mno_movt=no
+    CFLAGS="$TARGET_CFLAGS -mlong-calls -Werror"
    for cand in "-mno-movt" \
 		"-mllvm -arm-use-movt=0" \
 		"-mword-relocations"; do
      if test x"$grub_cv_target_cc_mno_movt" != xno ; then
        break
      fi
      CFLAGS="$TARGET_CFLAGS $cand -Werror"
      CPPFLAGS="$TARGET_CPPFLAGS"
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-		        [grub_cv_target_cc_mno_movt="$cand"], [])
+		      [grub_cv_cc_mlong_calls=yes],
-    done
+		      [grub_cv_cc_mlong_calls=no])
  ])
-
+  if test "x$grub_cv_cc_mlong_calls" = xyes; then
-  if test x"$grub_cv_target_cc_mno_movt" != xno ; then
+    TARGET_CFLAGS="$TARGET_CFLAGS -mlong-calls"
    # A trick so that clang doesn't see it on link stage
    TARGET_CPPFLAGS="$TARGET_CPPFLAGS $grub_cv_target_cc_mno_movt"
  fi
  AC_CACHE_CHECK([whether option -mthumb-interwork works], grub_cv_cc_mthumb_interwork, [
    CFLAGS="$TARGET_CFLAGS -mthumb-interwork -Werror"
@@ -1254,12 +1169,12 @@ if test "x$target_cpu" = xarm; then
 fi
 AC_CACHE_CHECK([whether option -Qn works], grub_cv_target_cc_qn, [
-  CFLAGS="$TARGET_CFLAGS -Qn -Qunused-arguments -Werror"
+  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 -Qunused-arguments"
+  TARGET_CFLAGS="$TARGET_CFLAGS -Qn"
 fi
 #
@@ -1270,27 +1185,13 @@ CFLAGS="$TARGET_CFLAGS"
 # Position independent executable.
 grub_CHECK_PIE
 grub_CHECK_NO_PIE
 grub_CHECK_NO_PIE_ONEWORD
 grub_CHECK_LINK_PIE
 [# Need that, because some distributions ship compilers that include
-# `-fPIE' or '-fpie' and '-pie' in the default specs.
+# `-fPIE' or '-fpie' in the default specs.
 if [ x"$pie_possible" = xyes ]; then
  TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE -fno-pie"
  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -fno-PIE -fno-pie"
 fi
 if [ x"$link_nopie_needed" = xyes ] || [ x"$pie_possible" = xyes ]; then
  if [ x"$nopie_possible" = xyes ]; then
    TARGET_LDFLAGS="$TARGET_LDFLAGS -no-pie"
  fi
  if [ x"$nopie_oneword_possible" = xyes ]; then
    TARGET_LDFLAGS="$TARGET_LDFLAGS -nopie"
  fi
 fi]
 CFLAGS="$TARGET_CFLAGS"
 LDFLAGS="$TARGET_LDFLAGS"
 # Position independent executable.
 grub_CHECK_PIC
@@ -1299,12 +1200,9 @@ grub_CHECK_PIC
 # and reload $gp in every function.
 # GCC implements it using symbol __gnu_local_gp in non-PIC as well.
 # However with clang we need PIC for this reloading to happen.
 # With arm64 we need relocations that are in some way representable in
 # PE as we need to support arm64-efi. Without -fPIC clang generates
 # movk's which aren't representable.
 # 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$target_cpu = xarm64 ) && test "x$grub_cv_cc_target_clang" = xyes ; then
+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"
@@ -1312,41 +1210,12 @@ fi]
 CFLAGS="$TARGET_CFLAGS"
-# Stack smashing protector.
+# Smashing stack protector.
 grub_CHECK_STACK_PROTECTOR
-AC_ARG_ENABLE([stack-protector],
+# Need that, because some distributions ship compilers that include
-	      AS_HELP_STRING([--enable-stack-protector],
+# `-fstack-protector' in the default specs.
-			     [enable the stack protector]),
+if test "x$ssp_possible" = xyes; then
 	      [],
 	      [enable_stack_protector=no])
 if test "x$enable_stack_protector" = xno; then
  if test "x$ssp_possible" = xyes; then
    # Need that, because some distributions ship compilers that include
    # `-fstack-protector' in the default specs.
  TARGET_CFLAGS="$TARGET_CFLAGS -fno-stack-protector"
  fi
 elif test "x$platform" != xefi; then
  AC_MSG_ERROR([--enable-stack-protector is only supported on EFI platforms])
 elif test "x$ssp_global_possible" != xyes; then
  AC_MSG_ERROR([--enable-stack-protector is not supported (compiler doesn't support -mstack-protector-guard=global)])
 else
  TARGET_CFLAGS="$TARGET_CFLAGS -mstack-protector-guard=global"
  if test "x$enable_stack_protector" = xyes; then
    if test "x$ssp_possible" != xyes; then
      AC_MSG_ERROR([--enable-stack-protector is not supported (compiler doesn't support -fstack-protector)])
    fi
    TARGET_CFLAGS="$TARGET_CFLAGS -fstack-protector"
  elif test "x$enable_stack_protector" = xstrong; then
    if test "x$ssp_strong_possible" != xyes; then
      AC_MSG_ERROR([--enable-stack-protector=strong is not supported (compiler doesn't support -fstack-protector-strong)])
    fi
    TARGET_CFLAGS="$TARGET_CFLAGS -fstack-protector-strong"
  else
    # Note, -fstack-protector-all requires that the protector is disabled for
    # functions that appear in the call stack when the canary is initialized.
    AC_MSG_ERROR([invalid value $enable_stack_protector for --enable-stack-protector])
  fi
  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DGRUB_STACK_PROTECTOR=1"
 fi
 CFLAGS="$TARGET_CFLAGS"
@@ -1414,7 +1283,7 @@ fi
 # Check for libgcc symbols
 if test x"$platform" = xemu; then
-AC_CHECK_FUNCS(__udivsi3 __umodsi3 __divsi3 __modsi3 __divdi3 __moddi3 __udivdi3 __umoddi3 __ctzdi2 __ctzsi2 __clzdi2 __aeabi_uidiv __aeabi_uidivmod __aeabi_idiv __aeabi_idivmod __aeabi_ulcmp __muldi3 __aeabi_lmul __aeabi_memcpy __aeabi_memcpy4 __aeabi_memcpy8 __aeabi_memclr __aeabi_memclr4 __aeabi_memclr8 __aeabi_memset __aeabi_lasr __aeabi_llsl __aeabi_llsr _restgpr_14_x __ucmpdi2 __ashldi3 __ashrdi3 __lshrdi3 __bswapsi2 __bswapdi2 __bzero __register_frame_info __deregister_frame_info ___chkstk_ms __chkstk_ms)
+AC_CHECK_FUNCS(__udivsi3 __umodsi3 __divsi3 __modsi3 __divdi3 __moddi3 __udivdi3 __umoddi3 __ctzdi2 __ctzsi2 __aeabi_uidiv __aeabi_uidivmod __aeabi_idiv __aeabi_idivmod __aeabi_ulcmp __muldi3 __aeabi_lmul __aeabi_memcpy __aeabi_memcpy4 __aeabi_memcpy8 __aeabi_memclr __aeabi_memclr4 __aeabi_memclr8 __aeabi_memset __aeabi_lasr __aeabi_llsl __aeabi_llsr _restgpr_14_x __ucmpdi2 __ashldi3 __ashrdi3 __lshrdi3 __bswapsi2 __bswapdi2 __bzero __register_frame_info __deregister_frame_info ___chkstk_ms __chkstk_ms)
 fi
 if test "x$TARGET_APPLE_LINKER" = x1 ; then
@@ -1451,7 +1320,7 @@ AC_SUBST(TARGET_NMFLAGS_DEFINED_ONLY)
 if test "$platform" != emu; then
 AC_CACHE_CHECK([whether -nostdinc -isystem works], [grub_cv_cc_isystem], [
  SAVED_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$TARGET_CPPFLAGS -nostdlib -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
+  CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
 #include <stddef.h>
 int va_arg_func (int fixed, va_list args);]], [[]])],
@@ -1491,11 +1360,9 @@ LIBS="$tmp_LIBS"
 # Memory manager debugging.
 AC_ARG_ENABLE([mm-debug],
 	      AS_HELP_STRING([--enable-mm-debug],
-                             [include memory manager debugging]))
+                             [include memory manager debugging]),
-if test x$enable_mm_debug = xyes; then
+              [AC_DEFINE([MM_DEBUG], [1],
-    AC_DEFINE([MM_DEBUG], [1],
+                         [Define to 1 if you enable memory manager debugging.])])
            [Define to 1 if you enable memory manager debugging.])
 fi
 AC_ARG_ENABLE([cache-stats],
 	      AS_HELP_STRING([--enable-cache-stats],
@@ -1594,22 +1461,29 @@ if test x"$enable_grub_mkfont" = xno ; then
  grub_mkfont_excuse="explicitly disabled"
 fi
 if test x"$grub_mkfont_excuse" = x ; then
  # Check for freetype libraries.
  AC_CHECK_TOOLS([FREETYPE], [freetype-config])
  if test "x$FREETYPE" = x ; then
    grub_mkfont_excuse=["need freetype2 library"]
  fi
 fi
 unset ac_cv_header_ft2build_h
 if test x"$grub_mkfont_excuse" = x ; then
  # Check for freetype libraries.
-  PKG_CHECK_MODULES([FREETYPE], [freetype2], [
+  freetype_cflags=`$FREETYPE --cflags`
  freetype_libs=`$FREETYPE --libs`
  SAVED_CPPFLAGS="$CPPFLAGS"
  SAVED_LIBS="$LIBS"
-    CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
+  CPPFLAGS="$CPPFLAGS $freetype_cflags"
-    LIBS="$LIBS $FREETYPE_LIBS"
+  LIBS="$LIBS $freetype_libs"
  AC_CHECK_HEADERS([ft2build.h], [],
  	[grub_mkfont_excuse=["need freetype2 headers"]])
-    AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [],
+  AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], [grub_mkfont_excuse=["freetype2 library unusable"]])
      [grub_mkfont_excuse=["freetype2 library unusable"]])
  CPPFLAGS="$SAVED_CPPFLAGS"
  LIBS="$SAVED_LIBS"
  ], [grub_mkfont_excuse=["need freetype2 library"]])
 fi
 if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; then
@@ -1621,6 +1495,8 @@ else
 enable_grub_mkfont=no
 fi
 AC_SUBST([enable_grub_mkfont])
 AC_SUBST([freetype_cflags])
 AC_SUBST([freetype_libs])
 SAVED_CC="$CC"
 SAVED_CPP="$CPP"
@@ -1650,21 +1526,25 @@ AC_SUBST([BUILD_WORDS_BIGENDIAN])
 if test x"$grub_build_mkfont_excuse" = x ; then
  # Check for freetype libraries.
-  SAVED_PKG_CONFIG="$PKG_CONFIG"
+  AC_CHECK_PROGS([BUILD_FREETYPE], [freetype-config])
-  test -z "$BUILD_PKG_CONFIG" || PKG_CONFIG="$BUILD_PKG_CONFIG"
+  if test "x$BUILD_FREETYPE" = x ; then
-  PKG_CHECK_MODULES([BUILD_FREETYPE], [freetype2], [
+    grub_build_mkfont_excuse=["need freetype2 library"]
  fi
 fi
 if test x"$grub_build_mkfont_excuse" = x ; then
  # Check for freetype libraries.
  build_freetype_cflags=`$BUILD_FREETYPE --cflags`
  build_freetype_libs=`$BUILD_FREETYPE --libs`
  SAVED_CPPFLAGS_2="$CPPFLAGS"
  SAVED_LIBS="$LIBS"
-    CPPFLAGS="$CPPFLAGS $BUILD_FREETYPE_CFLAGS"
+  CPPFLAGS="$CPPFLAGS $build_freetype_cflags"
-    LIBS="$LIBS $BUILD_FREETYPE_LIBS"
+  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])], [],
+  AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], [grub_build_mkfont_excuse=["freetype2 library unusable"]])
      [grub_build_mkfont_excuse=["freetype2 library unusable"]])
  LIBS="$SAVED_LIBS"
  CPPFLAGS="$SAVED_CPPFLAGS_2"
  ], [grub_build_mkfont_excuse=["need freetype2 library"]])
  PKG_CONFIG="$SAVED_PKG_CONFIG"
 fi
 if test x"$enable_build_grub_mkfont" = xyes && test x"$grub_build_mkfont_excuse" != x ; then
@@ -1675,14 +1555,17 @@ if test x"$grub_build_mkfont_excuse" = x ; then
 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$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 || test "x$platform" = xcoreboot ); then
  if test x"$grub_build_mkfont_excuse" = x ; then
-    AC_MSG_ERROR([qemu, coreboot and loongson ports need build-time grub-mkfont])
+    AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot and loongson ports needs build-time grub-mkfont])
  else
-    AC_MSG_ERROR([qemu, coreboot and loongson ports need build-time grub-mkfont ($grub_build_mkfont_excuse)])
+    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])
 AC_SUBST([build_freetype_libs])
 CC="$SAVED_CC"
 CPP="$SAVED_CPP"
 CFLAGS="$SAVED_CFLAGS"
@@ -1746,11 +1629,11 @@ 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$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 || test "x$platform" = xcoreboot ); then
  if test x"$grub_build_mkfont_excuse" = x ; then
-    AC_MSG_ERROR([qemu, coreboot and loongson ports need unifont])
+    AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot and loongson ports need unifont])
  else
-    AC_MSG_ERROR([qemu, coreboot and loongson ports need unifont ($grub_build_mkfont_excuse)])
+    AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot and loongson ports need unifont ($grub_build_mkfont_excuse)])
  fi
 fi
@@ -1978,7 +1861,6 @@ AM_CONDITIONAL([COND_i386_coreboot], [test x$target_cpu = xi386 -a x$platform =
 AM_CONDITIONAL([COND_i386_multiboot], [test x$target_cpu = xi386 -a x$platform = xmultiboot])
 AM_CONDITIONAL([COND_x86_64_efi], [test x$target_cpu = xx86_64 -a x$platform = xefi])
 AM_CONDITIONAL([COND_i386_xen], [test x$target_cpu = xi386 -a x$platform = xxen])
 AM_CONDITIONAL([COND_i386_xen_pvh], [test x$target_cpu = xi386 -a x$platform = xxen_pvh])
 AM_CONDITIONAL([COND_x86_64_xen], [test x$target_cpu = xx86_64 -a x$platform = xxen])
 AM_CONDITIONAL([COND_mips_loongson], [test x$target_cpu = xmipsel -a x$platform = xloongson])
 AM_CONDITIONAL([COND_mips_qemu_mips], [test "(" x$target_cpu = xmips -o x$target_cpu = xmipsel ")"  -a x$platform = xqemu_mips])
@@ -1991,14 +1873,9 @@ AM_CONDITIONAL([COND_mipsel], [test x$target_cpu = xmipsel])
 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_coreboot], [test x$target_cpu = xarm -a x$platform = xcoreboot])
 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_riscv32], [test x$target_cpu = xriscv32 ])
 AM_CONDITIONAL([COND_riscv64], [test x$target_cpu = xriscv64 ])
 AM_CONDITIONAL([COND_riscv32_efi], [test x$target_cpu = xriscv32 -a x$platform = xefi])
 AM_CONDITIONAL([COND_riscv64_efi], [test x$target_cpu = xriscv64 -a x$platform = xefi])
 AM_CONDITIONAL([COND_HOST_HURD], [test x$host_kernel = xhurd])
 AM_CONDITIONAL([COND_HOST_LINUX], [test x$host_kernel = xlinux])
@@ -2073,7 +1950,7 @@ fi
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([grub-core/Makefile])
-AC_CONFIG_FILES([grub-core/lib/gnulib/Makefile])
+AC_CONFIG_FILES([grub-core/gnulib/Makefile])
 AC_CONFIG_FILES([po/Makefile.in])
 AC_CONFIG_FILES([docs/Makefile])
 AC_CONFIG_FILES([util/bash-completion.d/Makefile])
@@ -2161,10 +2038,5 @@ echo "Without liblzma (no support for XZ-compressed mips images) ($liblzma_excus
 else
 echo "With liblzma from $LIBLZMA (support for XZ-compressed mips images)"
 fi
 if test "x$enable_stack_protector" != xno; then
 echo "With stack smashing protector: Yes"
 else
 echo "With stack smashing protector: No"
 fi
 echo "*******************************************************"
 ]
@@ -77,7 +77,6 @@ This edition documents version @value{VERSION}.
 * Coding style::
 * Finding your way around::
 * Contributing Changes::
 * Updating External Code::
 * Porting::
 * Error Handling::
 * Stack and heap size::
@@ -85,8 +84,6 @@ This edition documents version @value{VERSION}.
 * Video Subsystem::
 * PFF2 Font File Format::
 * Graphical Menu Software Design::
 * Verifiers framework::
 * Lockdown framework::
 * Copying This Manual::         Copying This Manual
 * Index::
@end menu
@@ -184,44 +181,38 @@ If a macro is global, its name must be prefixed with GRUB_ and must consist of o
@section Comments
 All comments shall be C-style comments, of the form @samp{/* @dots{} */}.
-A comment can be placed immediately preceding the entity it describes or it
+
-can be placed together with code, variable declarations, or other non-comment
+Comments shall be placed only on a line by themselves.  They shall not be placed together with code, variable declarations, or other non-comment entities.  A comment should be placed immediately preceding the entity it describes.
 entities. However, it is recommended to not mix various forms especially in
 types/structs descriptions.
 Acceptable:
@example
 /* The page # that is the front buffer.  */
 int displayed_page;
 /* The page # that is the back buffer.  */
 int render_page;
@end example
 Unacceptable:
@example
 int displayed_page;           /* The page # that is the front buffer. */
 int render_page;              /* The page # that is the back buffer. */
@end example
@node Multi-Line Comments
@section Multi-Line Comments
-Comments spanning multiple lines shall be formatted with all lines after the
+Comments spanning multiple lines shall be formatted with all lines after the first aligned with the first line.  
-first aligned with the first line. Asterisk characters should be repeated at
+
-the start of each subsequent line.
+Asterisk characters should not be repeated a the start of each subsequent line.
 Acceptable:
@example
 /*
 * This is a comment
 * which spans multiple lines.
 * It is long.
 */
@end example
 Unacceptable:
@example
 /* This is a comment
   which spans multiple lines.
   It is long.  */
@end example
 Unacceptable:
@example
 /*
 * This is a comment
@@ -229,16 +220,7 @@ Unacceptable:
 * It is long. */
@end example
-@example
+The opening @samp{/*} and closing @samp{*/} should be placed together on a line with text.
 /* This is a comment
 * which spans multiple lines.
 * It is long.
 */
@end example
 In particular first unacceptable form makes comment difficult to distinguish
 from the code itself. Especially if it contains the code snippets and/or is
 long. So, its usage is disallowed.
@node Finding your way around
@chapter Finding your way around
@@ -483,106 +465,6 @@ If your intention is to just get started, please do not submit a inclusion
 request. Instead, please subscribe to the mailing list, and communicate first
 (e.g. sending a patch, asking a question, commenting on another message...).
@node Updating External Code
@chapter Updating external code
 GRUB includes some code from other projects, and it is sometimes necessary
 to update it.
@menu
 * Gnulib::
 * jsmn::
 * minilzo::
@end menu
@node Gnulib
@section Gnulib
 Gnulib is a source code library that provides basic functionality to
 programs and libraries.  Many software packages make use of Gnulib
 to avoid reinventing the portability wheel.
 GRUB imports Gnulib using its @command{bootstrap} utility, identifying a
 particular Git commit in @file{bootstrap.conf}.  To upgrade to a new Gnulib
 commit, set @code{GNULIB_REVISION} in @file{bootstrap.conf} to the new commit
 ID, then run @kbd{./bootstrap} and whatever else you need to make sure it
 works.  Check for changes to Gnulib's @file{NEWS} file between the old and new
 commits; in some cases it will be necessary to adjust GRUB to match.  You may
 also need to update the patches in @file{grub-core/lib/gnulib-patches/}.
 To add a new Gnulib module or remove one that is no longer needed, change
@code{gnulib_modules} in @file{bootstrap.conf}.  Again, run @kbd{./bootstrap}
 and whatever else you need to make sure it works.
 Bootstrapping from an older distribution containing gettext version < 0.18.3,
 will require a patch similar to this to be applied first before running the
@command{./bootstrap} utility:
@example
 diff --git a/bootstrap.conf b/bootstrap.conf
 index 988dda0..a3193a9 100644
 --- a/bootstrap.conf
 +++ b/bootstrap.conf
@@ -67,7 +67,7 @@ SKIP_PO=t
 buildreq="\
 autoconf   2.63
 automake   1.11
 -gettext    0.18.3
 +gettext    0.17
 git        1.5.5
 tar        -
 "
 diff --git a/configure.ac b/configure.ac
 index 08b518f..99f5b36 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -362,7 +362,7 @@ AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
 AC_GNU_SOURCE
 AM_GNU_GETTEXT([external])
 -AM_GNU_GETTEXT_VERSION([0.18.3])
 +AM_GNU_GETTEXT_VERSION([0.17])
 AC_SYS_LARGEFILE
 # Identify characteristics of the host architecture.
@end example
 It will also be necessary to adjust the patches in
@file{po/gettext-patches/} to apply to an older version of gettext.
@node jsmn
@section jsmn
 jsmn is a minimalistic JSON parser which is implemented in a single header file
@file{jsmn.h}. To import a different version of the jsmn parser, you may simply
 download the @file{jsmn.h} header from the desired tag or commit to the target
 directory:
@example
 curl -L https://raw.githubusercontent.com/zserge/jsmn/v1.1.0/jsmn.h \
    -o grub-core/lib/json/jsmn.h
@end example
@node minilzo
@section minilzo
 miniLZO is a very lightweight subset of the LZO library intended for easy
 inclusion in other projects. It is generated automatically from the LZO
 source code and contains the most important LZO functions.
 To upgrade to a new version of the miniLZO library, download the release
 tarball and copy the files into the target directory:
@example
 curl -L -O http://www.oberhumer.com/opensource/lzo/download/minilzo-2.08.tar.gz
 tar -zxf minilzo-2.08.tar.gz
 rm minilzo-2.08/testmini.c
 rm -r grub-core/lib/minilzo/*
 cp minilzo-2.08/*.[hc] grub-core/lib/minilzo
 rm -r minilzo-2.08*
@end example
@node Porting
@chapter Porting
@@ -789,7 +671,7 @@ is already present and you'll need to make it follow the existant code paths
 for your platform adding adjustments if necessary. When done compile:
@example
-./bootstrap
+./autogen.sh
 ./configure --target=$cpu --with-platform=$platform TARGET_CC=.. OBJCOPY=... STRIP=...
 make > /dev/null
@end example
@@ -2067,89 +1949,6 @@ the graphics mode that was in use before @code{grub_video_setup()} was called
 might fix some of the problems.
@node Verifiers framework
@chapter Verifiers framework
 To register your own verifier call @samp{grub_verifier_register} with a structure
 pointing to your functions.
 The interface is inspired by the hash interface with @samp{init}/@samp{write}/@samp{fini}.
 There are essentially 2 ways of using it, hashing and whole-file verification.
 With the hashing approach:
 During @samp{init} you decide whether you want to check the given file and init context.
 In @samp{write} you update your hashing state.
 In @samp{fini} you check that the hash matches the expected value/passes some check/...
 With whole-file verification:
 During @samp{init} you decide whether you want to check the given file and init context.
 In @samp{write} you verify the file and return an error if it fails.
 You don't have @samp{fini}.
 Additional @samp{verify_string} receives various strings like kernel parameters
 to verify. Returning no error means successful verification and an error stops
 the current action.
 Detailed description of the API:
 Every time a file is opened your @samp{init} function is called with file descriptor
 and file type. Your function can have the following outcomes:
@itemize
@item returning no error and setting @samp{*flags} to @samp{GRUB_VERIFY_FLAGS_DEFER_AUTH}.
 In this case verification is deferred to other active verifiers. Verification
 fails if nobody cares or selected verifier fails.
@item returning no error and setting @samp{*flags} to @samp{GRUB_VERIFY_FLAGS_SKIP_VERIFICATION}.
 In this case your verifier will not be called anymore and it is assumed to have
 skipped verification.
@item returning no error and not setting @samp{*flags} to @samp{GRUB_VERIFY_FLAGS_SKIP_VERIFICATION}
 In this case verification is done as described in the following section.
@item returning an error. Then opening of the file will fail due to failed verification.
@end itemize
 In the third case your @samp{write} will be called with chunks of the file. If
 you need the whole file in a single chunk then during @samp{init} set the bit
@samp{GRUB_VERIFY_FLAGS_SINGLE_CHUNK} in @samp{*flags}. During @samp{init} you
 may set @samp{*context} if you need additional context. At every iteration you
 may return an error and the file will be considered as having failed the
 verification. If you return no error then verification continues.
 Optionally at the end of the file @samp{fini}, if it exists, is called with just
 the context. If you return no error during any of @samp{init}, @samp{write} and
@samp{fini} then the file is considered as having succeded verification.
@node Lockdown framework
@chapter Lockdown framework
 The GRUB can be locked down, which is a restricted mode where some operations
 are not allowed. For instance, some commands cannot be used when the GRUB is
 locked down.
 The function
@code{grub_lockdown()} is used to lockdown GRUB and the function
@code{grub_is_lockdown()} function can be used to check whether lockdown is
 enabled or not. When enabled, the function returns @samp{GRUB_LOCKDOWN_ENABLED}
 and @samp{GRUB_LOCKDOWN_DISABLED} when is not enabled.
 The following functions can be used to register the commands that can only be
 used when lockdown is disabled:
@itemize
@item @code{grub_cmd_lockdown()} registers command which should not run when the
 GRUB is in lockdown mode.
@item @code{grub_cmd_lockdown()} registers extended command which should not run
 when the GRUB is in lockdown mode.
@end itemize
@node Copying This Manual
@appendix Copying This Manual
@@ -28,11 +28,10 @@ import re
 GRUB_PLATFORMS = [ "emu", "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot",
                   "i386_multiboot", "i386_ieee1275", "x86_64_efi",
-                   "i386_xen", "x86_64_xen", "i386_xen_pvh",
+                   "i386_xen", "x86_64_xen",
                   "mips_loongson", "sparc64_ieee1275",
                   "powerpc_ieee1275", "mips_arc", "ia64_efi",
-                   "mips_qemu_mips", "arm_uboot", "arm_efi", "arm64_efi",
+                   "mips_qemu_mips", "arm_uboot", "arm_efi", "arm64_efi" ]
                   "arm_coreboot", "riscv32_efi", "riscv64_efi" ]
 GROUPS = {}
@@ -45,18 +44,14 @@ GROUPS["x86"]      = GROUPS["i386"] + GROUPS["x86_64"]
 GROUPS["mips"]     = [ "mips_loongson", "mips_qemu_mips", "mips_arc" ]
 GROUPS["sparc64"]  = [ "sparc64_ieee1275" ]
 GROUPS["powerpc"]  = [ "powerpc_ieee1275" ]
-GROUPS["arm"]      = [ "arm_uboot", "arm_efi", "arm_coreboot" ]
+GROUPS["arm"]      = [ "arm_uboot", "arm_efi" ]
 GROUPS["arm64"]    = [ "arm64_efi" ]
 GROUPS["riscv32"]  = [ "riscv32_efi" ]
 GROUPS["riscv64"]  = [ "riscv64_efi" ]
 # Groups based on firmware
-GROUPS["efi"]  = [ "i386_efi", "x86_64_efi", "ia64_efi", "arm_efi", "arm64_efi",
+GROUPS["efi"]  = [ "i386_efi", "x86_64_efi", "ia64_efi", "arm_efi", "arm64_efi" ]
 		   "riscv32_efi", "riscv64_efi" ]
 GROUPS["ieee1275"]   = [ "i386_ieee1275", "sparc64_ieee1275", "powerpc_ieee1275" ]
 GROUPS["uboot"] = [ "arm_uboot" ]
 GROUPS["xen"]  = [ "i386_xen", "x86_64_xen" ]
 GROUPS["coreboot"]  = [ "i386_coreboot", "arm_coreboot" ]
 # emu is a special case so many core functionality isn't needed on this platform
 GROUPS["noemu"]   = GRUB_PLATFORMS[:]; GROUPS["noemu"].remove("emu")
@@ -66,24 +61,24 @@ GROUPS["cmos"] = GROUPS["x86"][:] + ["mips_loongson", "mips_qemu_mips",
                                     "sparc64_ieee1275", "powerpc_ieee1275"]
 GROUPS["cmos"].remove("i386_efi"); GROUPS["cmos"].remove("x86_64_efi");
 GROUPS["pci"]      = GROUPS["x86"] + ["mips_loongson"]
-GROUPS["usb"]      = GROUPS["pci"] + ["arm_coreboot"]
+GROUPS["usb"]      = GROUPS["pci"]
 # If gfxterm is main output console integrate it into kernel
-GROUPS["videoinkernel"] = ["mips_loongson", "i386_coreboot", "arm_coreboot" ]
+GROUPS["videoinkernel"] = ["mips_loongson", "i386_coreboot" ]
 GROUPS["videomodules"]   = GRUB_PLATFORMS[:];
 for i in GROUPS["videoinkernel"]: GROUPS["videomodules"].remove(i)
 # Similar for terminfo
-GROUPS["terminfoinkernel"] = [ "emu", "mips_loongson", "mips_arc", "mips_qemu_mips", "i386_xen_pvh" ] + GROUPS["xen"] + GROUPS["ieee1275"] + GROUPS["uboot"];
+GROUPS["terminfoinkernel"] = [ "emu", "mips_loongson", "mips_arc", "mips_qemu_mips" ] + GROUPS["xen"] + GROUPS["ieee1275"] + GROUPS["uboot"];
 GROUPS["terminfomodule"]   = GRUB_PLATFORMS[:];
 for i in GROUPS["terminfoinkernel"]: GROUPS["terminfomodule"].remove(i)
 # Flattened Device Trees (FDT)
-GROUPS["fdt"] = [ "arm64_efi", "arm_uboot", "arm_efi", "riscv32_efi", "riscv64_efi" ]
+GROUPS["fdt"] = [ "arm64_efi", "arm_uboot", "arm_efi" ]
 # Needs software helpers for division
 # Must match GRUB_DIVISION_IN_SOFTWARE in misc.h
-GROUPS["softdiv"] = GROUPS["arm"] + ["ia64_efi"] + GROUPS["riscv32"]
+GROUPS["softdiv"] = GROUPS["arm"] + ["ia64_efi"]
 GROUPS["no_softdiv"]   = GRUB_PLATFORMS[:]
 for i in GROUPS["softdiv"]: GROUPS["no_softdiv"].remove(i)
@@ -766,7 +761,7 @@ def image(defn, platform):
 if test x$(TARGET_APPLE_LINKER) = x1; then \
  $(MACHO2IMG) $< $@; \
 else \
-  $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; \
+  $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; \
 fi
 """)
@@ -71,7 +71,6 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/disk.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dl.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/sb.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
@@ -80,7 +79,6 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fs.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/kernel.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/list.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lockdown.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/misc.h
 if COND_emu
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/compiler-rt-emu.h
@@ -90,10 +88,8 @@ endif
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/stack_protector.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/verify.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm_private.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/memory.h
@@ -105,20 +101,7 @@ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/int.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
 endif
 if COND_i386_xen_pvh
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/int.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/xen.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/xen/hypercall.h
 endif
 if COND_i386_efi
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.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/i386/tsc.h
@@ -128,9 +111,8 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pmtimer.h
 endif
 if COND_i386_coreboot
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/coreboot/lbio.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/coreboot/lbio.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
@@ -140,7 +122,6 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/acpi.h
 endif
 if COND_i386_multiboot
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/acpi.h
 endif
@@ -151,7 +132,6 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
 endif
 if COND_i386_ieee1275
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
@@ -160,7 +140,6 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
 endif
 if COND_i386_xen
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/xen.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/xen/hypercall.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
@@ -179,7 +158,6 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
 endif
 if COND_x86_64_efi
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.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/i386/tsc.h
@@ -261,21 +239,8 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h
 endif
 if COND_arm_coreboot
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/keyboard_layouts.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.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
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fdt.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dma.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/coreboot/kernel.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fdtbus.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
@@ -288,18 +253,6 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/acpi.h
 endif
 if COND_riscv32_efi
 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/acpi.h
 endif
 if COND_riscv64_efi
 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/acpi.h
 endif
 if COND_emu
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/datetime.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/misc.h
@@ -325,7 +278,7 @@ BUILT_SOURCES += symlist.h
 symlist.c: symlist.h gensymlist.sh
 	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) -DGRUB_SYMBOL_GENERATOR=1 symlist.h > symlist.p || (rm -f symlist.p; exit 1)
-	cat symlist.p | $(SHELL) $(srcdir)/gensymlist.sh $(top_builddir)/config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
+	cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh $(top_builddir)/config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
 	rm -f symlist.p
 CLEANFILES += symlist.c
 BUILT_SOURCES += symlist.c
@@ -379,10 +332,8 @@ command.lst: $(MARKER_FILES)
 	  b=`basename $$pp .marker`; \
 	  sed -n \
 	    -e "/EXTCOMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \
 	    -e "/EXTCOMMAND_LOCKDOWN_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \
 	    -e "/P1COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \
-	    -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" \
+	    -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" $$pp; \
 	    -e "/COMMAND_LOCKDOWN_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" $$pp; \
 	done) | sort -u > $@
 platform_DATA += command.lst
 CLEANFILES += command.lst
@@ -407,16 +358,6 @@ terminal.lst: $(MARKER_FILES)
 platform_DATA += terminal.lst
 CLEANFILES += terminal.lst
 fdt.lst: $(MARKER_FILES)
 	(for pp in $^; do \
 	  b=`basename $$pp .marker`; \
 	  sed -n \
 	    -e "/FDT_DRIVER_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/i\1: $$b/;p;}" \
 	    -e "/FDT_DRIVER_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/o\1: $$b/;p;}" $$pp; \
 	done) | sort -u > $@
 platform_DATA += fdt.lst
 CLEANFILES += fdt.lst
 parttool.lst: $(MARKER_FILES)
 	(for pp in $^; do \
 	  b=`basename $$pp .marker`; \
@@ -65,28 +65,20 @@ kernel = {
  arm64_efi_ldflags          = '-Wl,-r,-d';
  arm64_efi_stripflags       = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version -R .eh_frame';
  riscv32_efi_ldflags      = '-Wl,-r,-d';
  riscv32_efi_stripflags   = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version -R .eh_frame';
  riscv64_efi_ldflags      = '-Wl,-r,-d';
  riscv64_efi_stripflags   = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version -R .eh_frame';
  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),0x9000';
+  i386_qemu_ldflags        = '$(TARGET_IMG_BASE_LDOPT),0x8200';
  i386_coreboot_ldflags    = '$(TARGET_IMG_LDFLAGS)';
-  i386_coreboot_ldflags    = '$(TARGET_IMG_BASE_LDOPT),0x9000';
+  i386_coreboot_ldflags    = '$(TARGET_IMG_BASE_LDOPT),0x8200';
  i386_multiboot_ldflags   = '$(TARGET_IMG_LDFLAGS)';
-  i386_multiboot_ldflags   = '$(TARGET_IMG_BASE_LDOPT),0x9000';
+  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';
  i386_xen_pvh_ldflags     = '$(TARGET_IMG_LDFLAGS)';
  i386_xen_pvh_ldflags     = '$(TARGET_IMG_BASE_LDOPT),0x100000';
  mips_loongson_ldflags    = '-Wl,-Ttext,0x80200000';
  powerpc_ieee1275_ldflags = '-Wl,-Ttext,0x200000';
@@ -100,15 +92,12 @@ kernel = {
  emu_cppflags = '$(CPPFLAGS_GNULIB)';
  arm_uboot_ldflags       = '-Wl,-r,-d';
  arm_uboot_stripflags    = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';
  arm_coreboot_ldflags       = '-Wl,-r,-d';
  arm_coreboot_stripflags    = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';
  i386_pc_startup = kern/i386/pc/startup.S;
  i386_efi_startup = kern/i386/efi/startup.S;
  x86_64_efi_startup = kern/x86_64/efi/startup.S;
  i386_xen_startup = kern/i386/xen/startup.S;
  x86_64_xen_startup = kern/x86_64/xen/startup.S;
  i386_xen_pvh_startup = kern/i386/xen/startup_pvh.S;
  i386_qemu_startup = kern/i386/qemu/startup.S;
  i386_ieee1275_startup = kern/i386/ieee1275/startup.S;
  i386_coreboot_startup = kern/i386/coreboot/startup.S;
@@ -116,14 +105,10 @@ kernel = {
  mips_startup = kern/mips/startup.S;
  sparc64_ieee1275_startup = kern/sparc64/ieee1275/crt0.S;
  powerpc_ieee1275_startup = kern/powerpc/ieee1275/startup.S;
-  arm_uboot_startup = kern/arm/startup.S;
+  arm_uboot_startup = kern/arm/uboot/startup.S;
  arm_coreboot_startup = kern/arm/startup.S;
  arm_efi_startup = kern/arm/efi/startup.S;
  arm64_efi_startup = kern/arm64/efi/startup.S;
  riscv32_efi_startup = kern/riscv/efi/startup.S;
  riscv64_efi_startup = kern/riscv/efi/startup.S;
  common = kern/buffer.c;
  common = kern/command.c;
  common = kern/corecmd.c;
  common = kern/device.c;
@@ -141,7 +126,6 @@ kernel = {
  common = kern/rescue_parser.c;
  common = kern/rescue_reader.c;
  common = kern/term.c;
  common = kern/verifiers.c;
  noemu = kern/compiler-rt.c;
  noemu = kern/mm.c;
@@ -165,21 +149,6 @@ kernel = {
  uboot = kern/uboot/init.c;
  uboot = kern/uboot/hw.c;
  uboot = term/uboot/console.c;
  arm_uboot = kern/arm/uboot/init.c;
  arm_uboot = kern/arm/uboot/uboot.S;
  arm_coreboot = kern/arm/coreboot/init.c;
  arm_coreboot = kern/arm/coreboot/timer.c;
  arm_coreboot = kern/arm/coreboot/coreboot.S;
  arm_coreboot = lib/fdt.c;
  arm_coreboot = bus/fdt.c;
  arm_coreboot = term/ps2.c;
  arm_coreboot = term/arm/pl050.c;
  arm_coreboot = term/arm/cros.c;
  arm_coreboot = term/arm/cros_ec.c;
  arm_coreboot = bus/spi/rk3288_spi.c;
  arm_coreboot = commands/keylayouts.c;
  arm_coreboot = kern/arm/coreboot/dma.c;
  terminfoinkernel = term/terminfo.c;
  terminfoinkernel = term/tparm.c;
@@ -190,13 +159,12 @@ kernel = {
  i386 = kern/i386/dl.c;
  i386_xen = kern/i386/dl.c;
  i386_xen_pvh = kern/i386/dl.c;
  i386_coreboot = kern/i386/coreboot/init.c;
  i386_multiboot = kern/i386/coreboot/init.c;
  i386_qemu = kern/i386/qemu/init.c;
  i386_coreboot_multiboot_qemu = term/i386/pc/vga_text.c;
-  coreboot = video/coreboot/cbfb.c;
+  i386_coreboot = video/i386/coreboot/cbfb.c;
  efi = disk/efi/efidisk.c;
  efi = kern/efi/efi.c;
@@ -205,8 +173,6 @@ kernel = {
  efi = term/efi/console.c;
  efi = kern/acpi.c;
  efi = kern/efi/acpi.c;
  efi = kern/efi/sb.c;
  efi = kern/lockdown.c;
  i386_coreboot = kern/i386/pc/acpi.c;
  i386_multiboot = kern/i386/pc/acpi.c;
  i386_coreboot = kern/acpi.c;
@@ -238,14 +204,6 @@ kernel = {
  xen = disk/xen/xendisk.c;
  xen = commands/boot.c;
  i386_xen_pvh = commands/boot.c;
  i386_xen_pvh = disk/xen/xendisk.c;
  i386_xen_pvh = kern/i386/tsc.c;
  i386_xen_pvh = kern/i386/xen/tsc.c;
  i386_xen_pvh = kern/i386/xen/pvh.c;
  i386_xen_pvh = kern/xen/init.c;
  i386_xen_pvh = term/xen/console.c;
  ia64_efi = kern/ia64/efi/startup.S;
  ia64_efi = kern/ia64/efi/init.c;
  ia64_efi = kern/ia64/dl.c;
@@ -253,16 +211,9 @@ kernel = {
  ia64_efi = kern/ia64/cache.c;
  arm_efi = kern/arm/efi/init.c;
-  arm_efi = kern/efi/fdt.c;
+  arm_efi = kern/arm/efi/misc.c;
  arm64_efi = kern/arm64/efi/init.c;
  arm64_efi = kern/efi/fdt.c;
  riscv32_efi = kern/riscv/efi/init.c;
  riscv32_efi = kern/efi/fdt.c;
  riscv64_efi = kern/riscv/efi/init.c;
  riscv64_efi = kern/efi/fdt.c;
  i386_pc = kern/i386/pc/init.c;
  i386_pc = kern/i386/pc/mmap.c;
@@ -272,10 +223,8 @@ kernel = {
  i386_qemu = kern/vga_init.c;
  i386_qemu = kern/i386/qemu/mmap.c;
-  coreboot = kern/coreboot/mmap.c;
+  i386_coreboot = kern/i386/coreboot/mmap.c;
  i386_coreboot = kern/i386/coreboot/cbtable.c;
  coreboot = kern/coreboot/cbtable.c;
  arm_coreboot = kern/arm/coreboot/cbtable.c;
  i386_multiboot = kern/i386/multiboot_mmap.c;
@@ -287,7 +236,6 @@ kernel = {
  mips_qemu_mips = term/ns8250.c;
  mips_qemu_mips = term/serial.c;
  mips_qemu_mips = term/at_keyboard.c;
  mips_qemu_mips = term/ps2.c;
  mips_qemu_mips = commands/boot.c;
  mips_qemu_mips = commands/keylayouts.c;
  mips_qemu_mips = term/i386/pc/vga_text.c;
@@ -303,7 +251,6 @@ kernel = {
  mips_loongson = bus/pci.c;
  mips_loongson = kern/mips/loongson/init.c;
  mips_loongson = term/at_keyboard.c;
  mips_loongson = term/ps2.c;
  mips_loongson = commands/boot.c;
  mips_loongson = term/serial.c;
  mips_loongson = video/sm712.c;
@@ -321,7 +268,6 @@ kernel = {
  sparc64_ieee1275 = kern/sparc64/cache.S;
  sparc64_ieee1275 = kern/sparc64/dl.c;
  sparc64_ieee1275 = kern/sparc64/ieee1275/ieee1275.c;
  sparc64_ieee1275 = disk/ieee1275/obdisk.c;
  arm = kern/arm/dl.c;
  arm = kern/arm/dl_helper.c;
@@ -336,14 +282,6 @@ kernel = {
  arm64 = kern/arm64/dl.c;
  arm64 = kern/arm64/dl_helper.c;
  riscv32 = kern/riscv/cache.c;
  riscv32 = kern/riscv/cache_flush.S;
  riscv32 = kern/riscv/dl.c;
  riscv64 = kern/riscv/cache.c;
  riscv64 = kern/riscv/cache_flush.S;
  riscv64 = kern/riscv/dl.c;
  emu = disk/host.c;
  emu = kern/emu/cache_s.S;
  emu = kern/emu/hostdisk.c;
@@ -399,7 +337,7 @@ program = {
  ldadd = 'kernel.exec$(EXEEXT)';
  ldadd = '$(MODULE_FILES)';
-  ldadd = 'lib/gnulib/libgnu.a $(LIBINTL) $(LIBUTIL) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+  ldadd = 'gnulib/libgnu.a $(LIBINTL) $(LIBUTIL) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  enable = emu;
 };
@@ -411,7 +349,7 @@ program = {
  emu_nodist = symlist.c;
  ldadd = 'kernel.exec$(EXEEXT)';
-  ldadd = 'lib/gnulib/libgnu.a $(LIBINTL) $(LIBUTIL) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+  ldadd = 'gnulib/libgnu.a $(LIBINTL) $(LIBUTIL) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  enable = emu;
 };
@@ -429,14 +367,8 @@ image = {
  i386_qemu_ldflags = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_BOOT_MACHINE_LINK_ADDR)';
  i386_qemu_ccasflags = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
-  /* The entry point for a.out binaries on sparc64 starts
+  sparc64_ieee1275_objcopyflags = '-O a.out-sunos-big';
-     at 0x4000. Since we are writing the 32 bytes long a.out
+  sparc64_ieee1275_ldflags = ' -Wl,-Ttext=0x4000';
     header in the assembly code ourselves, we need to tell
     the linker to adjust the start of the text segment to
     0x4000 - 0x20 = 0x3fe0.
   */
  sparc64_ieee1275_ldflags = ' -Wl,-Ttext=0x3fe0';
  sparc64_ieee1275_objcopyflags = '-O binary';
  objcopyflags = '-O binary';
  enable = i386_pc;
@@ -465,10 +397,8 @@ image = {
  i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00';
  sparc64_ieee1275 = boot/sparc64/ieee1275/boot.S;
-
+  sparc64_ieee1275_objcopyflags = '-O a.out-sunos-big';
-  /* See comment for sparc64_ieee1275_ldflags above. */
+  sparc64_ieee1275_ldflags = ' -Wl,-Ttext=0x4000';
  sparc64_ieee1275_ldflags = ' -Wl,-Ttext=0x3fe0';
  sparc64_ieee1275_objcopyflags = '-O binary';
  sparc64_ieee1275_cppflags = '-DCDBOOT=1';
  objcopyflags = '-O binary';
@@ -642,10 +572,7 @@ module = {
 module = {
  name = ehci;
  common = bus/usb/ehci.c;
  arm_coreboot = bus/usb/ehci-fdt.c;
  pci = bus/usb/ehci-pci.c;
  enable = pci;
  enable = arm_coreboot;
 };
 module = {
@@ -712,7 +639,6 @@ module = {
 module = {
  name = cbtable;
  common = kern/i386/coreboot/cbtable.c;
  common = kern/coreboot/cbtable.c;
  enable = i386_pc;
  enable = i386_efi;
  enable = i386_qemu;
@@ -743,7 +669,7 @@ module = {
  name = regexp;
  common = commands/regexp.c;
  common = commands/wildcard.c;
-  common = lib/gnulib/regex.c;
+  common = gnulib/regex.c;
  cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
 };
@@ -826,9 +752,6 @@ module = {
  enable = arm_efi;
  enable = arm64_efi;
  enable = arm_uboot;
  enable = arm_coreboot;
  enable = riscv32_efi;
  enable = riscv64_efi;
 };
 module = {
@@ -850,7 +773,6 @@ module = {
  name = cpuid;
  common = commands/i386/cpuid.c;
  enable = x86;
  enable = i386_xen_pvh;
  enable = i386_xen;
  enable = x86_64_xen;
 };
@@ -910,27 +832,27 @@ module = {
  i386_coreboot = lib/i386/halt.c;
  i386_qemu = lib/i386/halt.c;
  xen = lib/xen/halt.c;
  i386_xen_pvh = lib/xen/halt.c;
  efi = lib/efi/halt.c;
  ieee1275 = lib/ieee1275/halt.c;
  emu = lib/emu/halt.c;
-  uboot = lib/dummy/halt.c;
+  uboot = lib/uboot/halt.c;
  arm_coreboot = lib/dummy/halt.c;
 };
 module = {
  name = reboot;
  i386 = lib/i386/reboot.c;
  i386 = lib/i386/reboot_trampoline.S;
  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;
  mips_loongson = lib/mips/loongson/reboot.c;
  mips_qemu_mips = lib/mips/qemu_mips/reboot.c;
  xen = lib/xen/reboot.c;
  i386_xen_pvh = lib/xen/reboot.c;
  uboot = lib/uboot/reboot.c;
  arm_coreboot = lib/dummy/reboot.c;
  common = commands/reboot.c;
 };
@@ -940,8 +862,8 @@ module = {
 };
 module = {
-  name = pgp;
+  name = verify;
-  common = commands/pgp.c;
+  common = commands/verify.c;
  cflags = '$(CFLAGS_POSIX)';
  cppflags = '-I$(srcdir)/lib/posix_wrap';
 };
@@ -949,6 +871,7 @@ module = {
 module = {
  name = hdparm;
  common = commands/hdparm.c;
  common = lib/hexdump.c;
  enable = pci;
  enable = mips_qemu_mips;
 };
@@ -1090,21 +1013,6 @@ module = {
  common = commands/sleep.c;
 };
 module = {
  name = smbios;
  common = commands/smbios.c;
  efi = commands/efi/smbios.c;
  i386_pc = commands/i386/pc/smbios.c;
  i386_coreboot = commands/i386/pc/smbios.c;
  i386_multiboot = commands/i386/pc/smbios.c;
  enable = efi;
  enable = i386_pc;
  enable = i386_coreboot;
  enable = i386_multiboot;
 };
 module = {
  name = suspend;
  ieee1275 = commands/ieee1275/suspend.c;
@@ -1169,27 +1077,10 @@ module = {
  common = disk/cryptodisk.c;
 };
 module = {
  name = json;
  common = lib/json/json.c;
 };
 module = {
  name = afsplitter;
  common = disk/AFSplitter.c;
 };
 module = {
  name = luks;
  common = disk/luks.c;
-};
+  common = disk/AFSplitter.c;
 module = {
  name = luks2;
  common = disk/luks2.c;
  common = lib/gnulib/base64.c;
  cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB) -I$(srcdir)/lib/json';
 };
 module = {
@@ -1344,27 +1235,12 @@ module = {
  common = fs/bfs.c;
 };
 module = {
  name = zstd;
  common = lib/zstd/debug.c;
  common = lib/zstd/entropy_common.c;
  common = lib/zstd/error_private.c;
  common = lib/zstd/fse_decompress.c;
  common = lib/zstd/huf_decompress.c;
  common = lib/zstd/module.c;
  common = lib/zstd/xxhash.c;
  common = lib/zstd/zstd_common.c;
  common = lib/zstd/zstd_decompress.c;
  cflags = '$(CFLAGS_POSIX) -Wno-undef';
  cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/zstd';
 };
 module = {
  name = btrfs;
  common = fs/btrfs.c;
  common = lib/crc.c;
  cflags = '$(CFLAGS_POSIX) -Wno-undef';
-  cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/minilzo -I$(srcdir)/lib/zstd -DMINILZO_HAVE_CONFIG_H';
+  cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/minilzo -DMINILZO_HAVE_CONFIG_H';
 };
 module = {
@@ -1412,11 +1288,6 @@ module = {
  common = fs/exfat.c;
 };
 module = {
  name = f2fs;
  common = fs/f2fs.c;
 };
 module = {
  name = fshelp;
  common = fs/fshelp.c;
@@ -1644,18 +1515,12 @@ module = {
  x86 = lib/i386/relocator16.S;
  x86 = lib/i386/relocator32.S;
  x86 = lib/i386/relocator64.S;
  i386_xen_pvh = lib/i386/relocator16.S;
  i386_xen_pvh = lib/i386/relocator32.S;
  i386_xen_pvh = lib/i386/relocator64.S;
  i386 = lib/i386/relocator_asm.S;
  i386_xen_pvh = lib/i386/relocator_asm.S;
  x86_64 = lib/x86_64/relocator_asm.S;
  i386_xen = lib/i386/relocator_asm.S;
  x86_64_xen = lib/x86_64/relocator_asm.S;
  x86 = lib/i386/relocator.c;
  x86 = lib/i386/relocator_common_c.c;
  i386_xen_pvh = lib/i386/relocator.c;
  i386_xen_pvh = lib/i386/relocator_common_c.c;
  ieee1275 = lib/ieee1275/relocator.c;
  efi = lib/efi/relocator.c;
  mips = lib/mips/relocator_asm.S;
@@ -1666,7 +1531,6 @@ module = {
  i386_xen = lib/i386/xen/relocator.S;
  x86_64_xen = lib/x86_64/xen/relocator.S;
  xen = lib/i386/relocator_common_c.c;
  x86_64_efi = lib/x86_64/efi/relocator.c;
  extra_dist = lib/i386/relocator_common.S;
  extra_dist = kern/powerpc/cache_flush.S;
@@ -1674,25 +1538,22 @@ module = {
  enable = mips;
  enable = powerpc;
  enable = x86;
  enable = i386_xen_pvh;
  enable = xen;
 };
 module = {
  name = datetime;
  common = lib/datetime.c;
  cmos = lib/cmos_datetime.c;
  efi = lib/efi/datetime.c;
-  uboot = lib/dummy/datetime.c;
+  uboot = lib/uboot/datetime.c;
  arm_coreboot = lib/dummy/datetime.c;
  sparc64_ieee1275 = lib/ieee1275/datetime.c;
  powerpc_ieee1275 = lib/ieee1275/datetime.c;
  sparc64_ieee1275 = lib/ieee1275/cmos.c;
  powerpc_ieee1275 = lib/ieee1275/cmos.c;
  xen = lib/xen/datetime.c;
  i386_xen_pvh = lib/xen/datetime.c;
  mips_arc = lib/arc/datetime.c;
  enable = noemu;
 };
 module = {
@@ -1707,7 +1568,6 @@ module = {
  extra_dist = lib/ia64/longjmp.S;
  extra_dist = lib/arm/setjmp.S;
  extra_dist = lib/arm64/setjmp.S;
  extra_dist = lib/riscv/setjmp.S;
 };
 module = {
@@ -1738,6 +1598,8 @@ module = {
 module = {
  name = linux16;
  common = loader/i386/pc/linux.c;
  common = loader/linux.c;
  common = lib/cmdline.c;
  enable = x86;
 };
@@ -1772,24 +1634,24 @@ module = {
  cppflags = "-DGRUB_USE_MULTIBOOT2";
  common = loader/multiboot.c;
  common = lib/cmdline.c;
  common = loader/multiboot_mbi2.c;
  enable = x86;
  enable = i386_xen_pvh;
  enable = mips;
 };
 module = {
  name = multiboot;
  common = loader/multiboot.c;
  common = lib/cmdline.c;
  x86 = loader/i386/multiboot_mbi.c;
  i386_xen_pvh = loader/i386/multiboot_mbi.c;
  extra_dist = loader/multiboot_elfxx.c;
  enable = x86;
  enable = i386_xen_pvh;
 };
 module = {
  name = xen_boot;
  common = lib/cmdline.c;
  arm64 = loader/arm64/xen_boot.c;
  enable = arm64;
 };
@@ -1797,20 +1659,14 @@ module = {
 module = {
  name = linux;
  x86 = loader/i386/linux.c;
  i386_xen_pvh = loader/i386/linux.c;
  xen = loader/i386/xen.c;
  i386_pc = lib/i386/pc/vesa_modes_table.c;
  i386_xen_pvh = lib/i386/pc/vesa_modes_table.c;
  mips = loader/mips/linux.c;
  powerpc_ieee1275 = loader/powerpc/ieee1275/linux.c;
  sparc64_ieee1275 = loader/sparc64/ieee1275/linux.c;
  ia64_efi = loader/ia64/efi/linux.c;
-  arm_coreboot = loader/arm/linux.c;
+  arm = loader/arm/linux.c;
  arm_efi = loader/arm64/linux.c;
  arm_uboot = loader/arm/linux.c;
  arm64 = loader/arm64/linux.c;
  riscv32 = loader/riscv/linux.c;
  riscv64 = loader/riscv/linux.c;
  common = loader/linux.c;
  common = lib/cmdline.c;
  enable = noemu;
@@ -1818,7 +1674,7 @@ module = {
 module = {
  name = fdt;
-  efi = loader/efi/fdt.c;
+  arm64 = loader/arm64/fdt.c;
  common = lib/fdt.c;
  enable = fdt;
 };
@@ -1890,8 +1746,6 @@ module = {
  common = mmap/mmap.c;
  x86 = mmap/i386/uppermem.c;
  x86 = mmap/i386/mmap.c;
  i386_xen_pvh = mmap/i386/uppermem.c;
  i386_xen_pvh = mmap/i386/mmap.c;
  i386_pc = mmap/i386/pc/mmap.c;
  i386_pc = mmap/i386/pc/mmap_helper.S;
@@ -1901,12 +1755,9 @@ module = {
  mips = mmap/mips/uppermem.c;
  enable = x86;
  enable = i386_xen_pvh;
  enable = ia64_efi;
  enable = arm_efi;
  enable = arm64_efi;
  enable = riscv32_efi;
  enable = riscv64_efi;
  enable = mips;
 };
@@ -1919,6 +1770,7 @@ module = {
  common = normal/autofs.c;
  common = normal/color.c;
  common = normal/completion.c;
  common = normal/datetime.c;
  common = normal/menu.c;
  common = normal/menu_entry.c;
  common = normal/menu_text.c;
@@ -2014,7 +1866,6 @@ module = {
 module = {
  name = at_keyboard;
  common = term/at_keyboard.c;
  common = term/ps2.c;
  enable = x86;
 };
@@ -2107,11 +1958,6 @@ module = {
  common = tests/example_functional_test.c;
 };
 module = {
  name = strtoull_test;
  common = tests/strtoull_test.c;
 };
 module = {
  name = setjmp_test;
  common = tests/setjmp_test.c;
@@ -2142,7 +1988,6 @@ module = {
  name = legacy_password_test;
  common = tests/legacy_password_test.c;
  enable = i386_pc;
  enable = i386_xen_pvh;
  enable = i386_efi;
  enable = x86_64_efi;
  enable = emu;
@@ -2341,7 +2186,6 @@ module = {
  xen = lib/i386/pc/vesa_modes_table.c;
  enable = i386_pc;
  enable = i386_xen_pvh;
  enable = i386_efi;
  enable = x86_64_efi;
  enable = emu;
@@ -2385,12 +2229,10 @@ module = {
 module = {
  name = backtrace;
  x86 = lib/i386/backtrace.c;
  i386_xen_pvh = lib/i386/backtrace.c;
  i386_xen = lib/i386/backtrace.c;
  x86_64_xen = lib/i386/backtrace.c;
  common = lib/backtrace.c;
  enable = x86;
  enable = i386_xen_pvh;
  enable = i386_xen;
  enable = x86_64_xen;
 };
@@ -2489,13 +2331,6 @@ module = {
  common = commands/testspeed.c;
 };
 module = {
  name = tpm;
  common = commands/tpm.c;
  efi = commands/efi/tpm.c;
  enable = efi;
 };
 module = {
  name = tr;
  common = commands/tr.c;
@@ -2517,13 +2352,3 @@ module = {
  common = loader/i386/xen_file64.c;
  extra_dist = loader/i386/xen_fileXX.c;
 };
 module = {
  name = rdmsr;
  common = commands/i386/rdmsr.c;
  enable = x86;
 };
 module = {
  name = wrmsr;
  common = commands/i386/wrmsr.c;
  enable = x86;
 };
@@ -37,8 +37,8 @@
 start:
 _start:
 	/*
-	 * _start is loaded at 0x8000 and is jumped to with
+	 * _start is loaded at 0x2000 and is jumped to with
-	 * CS:IP 0:0x8000 in kernel.
+	 * CS:IP 0:0x2000 in kernel.
 	 */
 	/*
@@ -118,16 +118,7 @@ LOCAL (codestart):
 #include "../../../kern/i386/realmode.S"
 /*
 *
 * This is a workaround for clang adding a section containing only .addrsig
 * Since clang itself is unable to assemble this pseudo-opcode, just replace
 * it with .text
 *
 */
 #define addrsig text
 #include <rs_decoder.h>
 #undef addrsig
 	.text
@@ -21,24 +21,6 @@
 	.text
 	.align	4
 	/*
 	 * We're writing the a.out header ourselves as newer
 	 * upstream versions of binutils no longer support
 	 * the a.out format on sparc64.
 	 *
 	 * The boot loader fits into 512 bytes with 32 bytes
 	 * used for the a.out header, hence the text segment
 	 * size is 512 - 32. There is no data segment and no
 	 * code relocation, thus those fields remain zero.
 	 */
 	.word	0x1030107                        /* Magic number. */
 	.word	512 - GRUB_BOOT_AOUT_HEADER_SIZE /* Size of text segment. */
 	.word	0                                /* Size of initialized data. */
 	.word	0                                /* Size of uninitialized data. */
 	.word	0                                /* Size of symbol table || checksum. */
 	.word	_start                           /* Entry point. */
 	.word	0                                /* Size of text relocation. */
 	.word	0                                /* Size of data relocation. */
 	.globl	_start
 _start:
 	/* OF CIF entry point arrives in %o4 */
@@ -48,7 +30,7 @@ pic_base:
 #ifndef CDBOOT
 	/* The offsets to these locations are defined by the
-	 * GRUB_BOOT_MACHINE_foo macros in include/grub/sparc64/ieee1275/boot.h,
+	 * GRUB_BOOT_MACHINE_foo macros in include/grub/sparc/ieee1275/boot.h,
 	 * and grub-setup uses this to patch these next three values as needed.
 	 *
 	 * The boot_path will be the OF device path of the partition where the
@@ -58,14 +40,10 @@ pic_base:
 	 *
 	 * After loading in that block we will execute it by jumping to the
 	 * load address plus the size of the prepended A.OUT header (32 bytes).
 	 *
 	 * Since this assembly code includes the 32 bytes long a.out header,
 	 * we need to move the actual code entry point forward by the size
 	 * of the a.out header, i.e. += GRUB_BOOT_AOUT_HEADER_SIZE.
 	 */
-	.org GRUB_BOOT_MACHINE_BOOT_DEVPATH + GRUB_BOOT_AOUT_HEADER_SIZE
+	.org GRUB_BOOT_MACHINE_BOOT_DEVPATH
 boot_path:
-	.org GRUB_BOOT_MACHINE_KERNEL_BYTE + GRUB_BOOT_AOUT_HEADER_SIZE
+	.org GRUB_BOOT_MACHINE_KERNEL_BYTE
 boot_path_end:
 kernel_byte:		.xword (2 << 9)
 kernel_address:		.word  GRUB_BOOT_MACHINE_KERNEL_ADDR
@@ -74,7 +52,7 @@ kernel_address:		.word  GRUB_BOOT_MACHINE_KERNEL_ADDR
 #define boot_path_end (_start + 1024)
 #include <grub/offsets.h>
-	.org 8 + GRUB_BOOT_AOUT_HEADER_SIZE
+	.org 8
 kernel_byte:		.xword (2 << 9)
 kernel_size:	        .word  512
 kernel_address:		.word  GRUB_BOOT_SPARC64_IEEE1275_IMAGE_ADDRESS
@@ -91,10 +69,6 @@ prom_seek_name:		.asciz "seek"
 prom_read_name:		.asciz "read"
 prom_exit_name:		.asciz "exit"
 grub_name:		.asciz "GRUB "
 #ifdef CDBOOT
 prom_close_name:	.asciz "close"
 #endif
 #define GRUB_NAME_LEN	5
 	.align	4
@@ -239,12 +213,6 @@ bootpath_known:
 	call	prom_call_3_1_o1
 #ifdef CDBOOT
 	 LDUW_ABS(kernel_size, 0x00, %o3)
 	GET_ABS(prom_close_name, %o0)
 	mov	1, %g1
 	mov	0, %o5
 	call	prom_call
 	 mov	BOOTDEV_REG, %o1
 #else
 	 mov	512, %o3
 #endif
@@ -1,256 +0,0 @@
 /*
 *  GRUB  --  GRand Unified Bootloader
 *  Copyright (C) 2016  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/fdtbus.h>
 #include <grub/fdt.h>
 #include <grub/term.h>
 static const void *dtb;
 static grub_size_t root_address_cells, root_size_cells;
 /* Pointer to this symbol signals invalid mapping.  */
 char grub_fdtbus_invalid_mapping[1];
 struct grub_fdtbus_dev *devs;
 struct grub_fdtbus_driver *drivers;
 int
 grub_fdtbus_is_compatible (const char *compat_string,
 			   const struct grub_fdtbus_dev *dev)
 {
  grub_size_t compatible_size;
  const char *compatible = grub_fdt_get_prop (dtb, dev->node, "compatible",
 					      &compatible_size);
  if (!compatible)
    return 0;
  const char *compatible_end = compatible + compatible_size;
  while (compatible < compatible_end)
    {
      if (grub_strcmp (compat_string, compatible) == 0)
 	return 1;
      compatible += grub_strlen (compatible) + 1;
    }
  return 0;
 }
 static void
 fdtbus_scan (struct grub_fdtbus_dev *parent)
 {
  int node;
  for (node = grub_fdt_first_node (dtb, parent ? parent->node : 0); node >= 0;
       node = grub_fdt_next_node (dtb, node))
    {
      struct grub_fdtbus_dev *dev;
      struct grub_fdtbus_driver *driver;
      dev = grub_zalloc (sizeof (*dev));
      if (!dev)
 	{
 	  grub_print_error ();
 	  return;
 	}
      dev->node = node;
      dev->next = devs;
      dev->parent = parent;
      devs = dev;
      FOR_LIST_ELEMENTS(driver, drivers)
 	if (!dev->driver && grub_fdtbus_is_compatible (driver->compatible, dev))
 	  {
 	    grub_dprintf ("fdtbus", "Attaching %s\n", driver->compatible);
 	    if (driver->attach (dev) == GRUB_ERR_NONE)
 	      {
 		grub_dprintf ("fdtbus", "Attached %s\n", driver->compatible);
 		dev->driver = driver;
 		break;
 	      }
 	    grub_print_error ();
 	  }
      fdtbus_scan (dev);
    }
 }
 void
 grub_fdtbus_register (struct grub_fdtbus_driver *driver)
 {
  struct grub_fdtbus_dev *dev;
  grub_dprintf ("fdtbus", "Registering %s\n", driver->compatible);
  grub_list_push (GRUB_AS_LIST_P (&drivers),
 		  GRUB_AS_LIST (driver));
  for (dev = devs; dev; dev = dev->next)
    if (!dev->driver && grub_fdtbus_is_compatible (driver->compatible, dev))
      {
 	grub_dprintf ("fdtbus", "Attaching %s (%p)\n", driver->compatible, dev);
 	if (driver->attach (dev) == GRUB_ERR_NONE)
 	  {
 	    grub_dprintf ("fdtbus", "Attached %s\n", driver->compatible);
 	    dev->driver = driver;
 	  }
 	grub_print_error ();
      }
 }
 void
 grub_fdtbus_unregister (struct grub_fdtbus_driver *driver)
 {
  grub_list_remove (GRUB_AS_LIST (driver));
  struct grub_fdtbus_dev *dev;
  for (dev = devs; dev; dev = dev->next)
    if (dev->driver == driver)
      {
 	if (driver->detach)
 	  driver->detach(dev);
 	dev->driver = 0;
      }
 }
 void
 grub_fdtbus_init (const void *dtb_in, grub_size_t size)
 {
  if (!dtb_in || grub_fdt_check_header (dtb_in, size) < 0)
    grub_fatal ("invalid FDT");
  dtb = dtb_in;
  const grub_uint32_t *prop = grub_fdt_get_prop (dtb, 0, "#address-cells", 0);
  if (prop)
    root_address_cells = grub_be_to_cpu32 (*prop);
  else
    root_address_cells = 1;
  prop = grub_fdt_get_prop (dtb, 0, "#size-cells", 0);
  if (prop)
    root_size_cells = grub_be_to_cpu32 (*prop);
  else
    root_size_cells = 1;
  fdtbus_scan (0);
 }
 static int
 get_address_cells (const struct grub_fdtbus_dev *dev)
 {
  const grub_uint32_t *prop;
  if (!dev)
    return root_address_cells;
  prop = grub_fdt_get_prop (dtb, dev->node, "#address-cells", 0);
  if (prop)
    return grub_be_to_cpu32 (*prop);
  return 1;
 }
 static int
 get_size_cells (const struct grub_fdtbus_dev *dev)
 {
  const grub_uint32_t *prop;
  if (!dev)
    return root_size_cells;
  prop = grub_fdt_get_prop (dtb, dev->node, "#size-cells", 0);
  if (prop)
    return grub_be_to_cpu32 (*prop);
  return 1;
 }
 static grub_uint64_t
 get64 (const grub_uint32_t *reg, grub_size_t cells)
 {
  grub_uint64_t val = 0;
  if (cells >= 1)
    val = grub_be_to_cpu32 (reg[cells - 1]);
  if (cells >= 2)
    val |= ((grub_uint64_t) grub_be_to_cpu32 (reg[cells - 2])) << 32;
  return val;
 }
 static volatile void *
 translate (const struct grub_fdtbus_dev *dev, const grub_uint32_t *reg)
 {
  volatile void *ret;
  const grub_uint32_t *ranges;
  grub_size_t ranges_size, cells_per_mapping;
  grub_size_t parent_address_cells, child_address_cells, child_size_cells;
  grub_size_t nmappings, i;
  if (dev == 0)
    {
      grub_uint64_t val;
      val = get64 (reg, root_address_cells);
      if (sizeof (void *) == 4 && (val >> 32))
 	return grub_fdtbus_invalid_mapping;
      return (void *) (grub_addr_t) val;
    }
  ranges = grub_fdt_get_prop (dtb, dev->node, "ranges", &ranges_size);
  if (!ranges)
    return grub_fdtbus_invalid_mapping;
  if (ranges_size == 0)
    return translate (dev->parent, reg);
  parent_address_cells = get_address_cells (dev->parent);
  child_address_cells = get_address_cells (dev);
  child_size_cells = get_size_cells (dev);
  cells_per_mapping = parent_address_cells + child_address_cells + child_size_cells;
  nmappings = ranges_size / 4 / cells_per_mapping;
  for (i = 0; i < nmappings; i++)
    {
      const grub_uint32_t *child_addr = &ranges[i * cells_per_mapping];
      const grub_uint32_t *parent_addr = child_addr + child_address_cells;
      grub_uint64_t child_size = get64 (parent_addr + parent_address_cells, child_size_cells);
      if (child_address_cells > 2 && grub_memcmp (reg, child_addr, (child_address_cells - 2) * 4) != 0)
 	continue;
      if (get64 (reg, child_address_cells) < get64 (child_addr, child_address_cells))
 	continue;
      grub_uint64_t offset = get64 (reg, child_address_cells) - get64 (child_addr, child_address_cells);
      if (offset >= child_size)
 	continue;
      ret = translate (dev->parent, parent_addr);
      if (grub_fdtbus_is_mapping_valid (ret))
 	ret = (volatile char *) ret + offset;
      return ret;
    }
  return grub_fdtbus_invalid_mapping;
 }
 volatile void *
 grub_fdtbus_map_reg (const struct grub_fdtbus_dev *dev, int regno, grub_size_t *size)
 {
  grub_size_t address_cells, size_cells;
  address_cells = get_address_cells (dev->parent);
  size_cells = get_size_cells (dev->parent);
  const grub_uint32_t *reg = grub_fdt_get_prop (dtb, dev->node, "reg", 0);
  if (size && size_cells)
    *size = reg[(address_cells + size_cells) * regno + address_cells];
  if (size && !size_cells)
    *size = 0;
  return translate (dev->parent, reg + (address_cells + size_cells) * regno);
 }
 const char *
 grub_fdtbus_get_name (const struct grub_fdtbus_dev *dev)
 {
  return grub_fdt_get_nodename (dtb, dev->node);
 }
 const void *
 grub_fdtbus_get_prop (const struct grub_fdtbus_dev *dev,
 		      const char *name,
 		      grub_uint32_t *len)
 {
  return grub_fdt_get_prop (dtb, dev->node, name, len);
 }
 const void *
 grub_fdtbus_get_fdt (void)
 {
  return dtb;
 }
@@ -1,103 +0,0 @@
 /*
 *  GRUB  --  GRand Unified Bootloader
 *
 *  Copyright (C) 2012  Google Inc.
 *  Copyright (C) 2016  Free Software Foundation, Inc.
 *
 *  This is based on depthcharge code.
 *
 *  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/mm.h>
 #include <grub/time.h>
 #include <grub/misc.h>
 #include <grub/fdtbus.h>
 #include <grub/machine/kernel.h>
 static grub_err_t
 spi_send (const struct grub_fdtbus_dev *dev, const void *data, grub_size_t sz)
 {
  const grub_uint8_t *ptr = data, *end = ptr + sz;
  volatile grub_uint32_t *spi = grub_fdtbus_map_reg (dev, 0, 0);
  spi[2] = 0;
  spi[1] = sz - 1;
  spi[0] = ((1 << 18) | spi[0]) & ~(1 << 19);
  spi[2] = 1;
  while (ptr < end)
    {
      while (spi[9] & 2);
      spi[256] = *ptr++;
    }
  while (spi[9] & 1);
  return GRUB_ERR_NONE;
 }
 static grub_err_t
 spi_receive (const struct grub_fdtbus_dev *dev, void *data, grub_size_t sz)
 {
  grub_uint8_t *ptr = data, *end = ptr + sz;
  volatile grub_uint32_t *spi = grub_fdtbus_map_reg (dev, 0, 0);
  spi[2] = 0;
  spi[1] = sz - 1;
  spi[0] = ((1 << 19) | spi[0]) & ~(1 << 18);
  spi[2] = 1;
  while (ptr < end)
    {
      while (spi[9] & 8);
      *ptr++ = spi[512];
    }
  while (spi[9] & 1);
  return GRUB_ERR_NONE;
 }
 static grub_err_t
 spi_start (const struct grub_fdtbus_dev *dev)
 {
  volatile grub_uint32_t *spi = grub_fdtbus_map_reg (dev, 0, 0);
  spi[3] = 1;
  return GRUB_ERR_NONE;
 }
 static void
 spi_stop (const struct grub_fdtbus_dev *dev)
 {
  volatile grub_uint32_t *spi = grub_fdtbus_map_reg (dev, 0, 0);
  spi[3] = 0;
 }
 static grub_err_t
 spi_attach(const struct grub_fdtbus_dev *dev)
 {
  if (!grub_fdtbus_is_mapping_valid (grub_fdtbus_map_reg (dev, 0, 0)))
    return GRUB_ERR_IO;
  return GRUB_ERR_NONE;
 }
 static struct grub_fdtbus_driver spi =
 {
  .compatible = "rockchip,rk3288-spi",
  .attach = spi_attach,
  .send = spi_send,
  .receive = spi_receive,
  .start = spi_start,
  .stop = spi_stop,
 };
 void
 grub_rk3288_spi_init (void)
 {
  grub_fdtbus_register (&spi);
 }
@@ -1,45 +0,0 @@
 /* ehci.c - EHCI Support.  */
 /*
 *  GRUB  --  GRand Unified Bootloader
 *  Copyright (C) 2011  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/misc.h>
 #include <grub/mm.h>
 #include <grub/time.h>
 #include <grub/usb.h>
 #include <grub/fdtbus.h>
 static grub_err_t
 ehci_attach(const struct grub_fdtbus_dev *dev)
 {
  grub_dprintf ("ehci", "Found generic-ehci\n");
  grub_ehci_init_device (grub_fdtbus_map_reg (dev, 0, 0));
  return 0;
 }
 struct grub_fdtbus_driver ehci =
 {
  .compatible = "generic-ehci",
  .attach = ehci_attach
 };
 void
 grub_ehci_pci_scan (void)
 {
  grub_fdtbus_register (&ehci);
 }
@@ -1,208 +0,0 @@
 /* ehci.c - EHCI Support.  */
 /*
 *  GRUB  --  GRand Unified Bootloader
 *  Copyright (C) 2011  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/pci.h>
 #include <grub/cpu/pci.h>
 #include <grub/cs5536.h>
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/time.h>
 #include <grub/usb.h>
 #define GRUB_EHCI_PCI_SBRN_REG  0x60
 #define GRUB_EHCI_ADDR_MEM_MASK	(~0xff)
 /* USBLEGSUP bits and related OS OWNED byte offset */
 enum
 {
  GRUB_EHCI_BIOS_OWNED = (1 << 16),
  GRUB_EHCI_OS_OWNED = (1 << 24)
 };
 /* PCI iteration function... */
 static int
 grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
 		    void *data __attribute__ ((unused)))
 {
  volatile grub_uint32_t *regs;
  grub_uint32_t base, base_h;
  grub_uint32_t eecp_offset;
  grub_uint32_t usblegsup = 0;
  grub_uint64_t maxtime;
  grub_uint32_t interf;
  grub_uint32_t subclass;
  grub_uint32_t class;
  grub_uint8_t release;
  grub_uint32_t class_code;
  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: begin\n");
  if (pciid == GRUB_CS5536_PCIID)
    {
      grub_uint64_t basereg;
      basereg = grub_cs5536_read_msr (dev, GRUB_CS5536_MSR_USB_EHCI_BASE);
      if (!(basereg & GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE))
 	{
 	  /* Shouldn't happen.  */
 	  grub_dprintf ("ehci", "No EHCI address is assigned\n");
 	  return 0;
 	}
      base = (basereg & GRUB_CS5536_MSR_USB_BASE_ADDR_MASK);
      basereg |= GRUB_CS5536_MSR_USB_BASE_BUS_MASTER;
      basereg &= ~GRUB_CS5536_MSR_USB_BASE_PME_ENABLED;
      basereg &= ~GRUB_CS5536_MSR_USB_BASE_PME_STATUS;
      basereg &= ~GRUB_CS5536_MSR_USB_BASE_SMI_ENABLE;
      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_EHCI_BASE, basereg);
    }
  else
    {
      grub_pci_address_t addr;
      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
      class_code = grub_pci_read (addr) >> 8;
      interf = class_code & 0xFF;
      subclass = (class_code >> 8) & 0xFF;
      class = class_code >> 16;
      /* If this is not an EHCI controller, just return.  */
      if (class != 0x0c || subclass != 0x03 || interf != 0x20)
 	return 0;
      grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: class OK\n");
      /* Check Serial Bus Release Number */
      addr = grub_pci_make_address (dev, GRUB_EHCI_PCI_SBRN_REG);
      release = grub_pci_read_byte (addr);
      if (release != 0x20)
 	{
 	  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: Wrong SBRN: %0x\n",
 			release);
 	  return 0;
 	}
      grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: bus rev. num. OK\n");
      /* Determine EHCI EHCC registers base address.  */
      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
      base = grub_pci_read (addr);
      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG1);
      base_h = grub_pci_read (addr);
      /* Stop if registers are mapped above 4G - GRUB does not currently
       * work with registers mapped above 4G */
      if (((base & GRUB_PCI_ADDR_MEM_TYPE_MASK) != GRUB_PCI_ADDR_MEM_TYPE_32)
 	  && (base_h != 0))
 	{
 	  grub_dprintf ("ehci",
 			"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_dprintf ("ehci", "EHCI grub_ehci_pci_iter: 32-bit EHCI OK\n");
    }
  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: iobase of EHCC: %08x\n",
 		(base & GRUB_EHCI_ADDR_MEM_MASK));
  regs = grub_pci_device_map_range (dev,
 				    (base & GRUB_EHCI_ADDR_MEM_MASK),
 				    0x100);
  /* Is there EECP ? */
  eecp_offset = (grub_le_to_cpu32 (regs[2]) >> 8) & 0xff;
    /* Determine and change ownership. */
  /* EECP offset valid in HCCPARAMS */
  /* Ownership can be changed via EECP only */
  if (pciid != GRUB_CS5536_PCIID && eecp_offset >= 0x40)	
    {
      grub_pci_address_t pciaddr_eecp;
      pciaddr_eecp = grub_pci_make_address (dev, eecp_offset);
      usblegsup = grub_pci_read (pciaddr_eecp);
      if (usblegsup & GRUB_EHCI_BIOS_OWNED)
 	{
 	  grub_boot_time ("Taking ownership of EHCI controller");
 	  grub_dprintf ("ehci",
 			"EHCI grub_ehci_pci_iter: EHCI owned by: BIOS\n");
 	  /* Ownership change - set OS_OWNED bit */
 	  grub_pci_write (pciaddr_eecp, usblegsup | GRUB_EHCI_OS_OWNED);
 	  /* Ensure PCI register is written */
 	  grub_pci_read (pciaddr_eecp);
 	  /* Wait for finish of ownership change, EHCI specification
 	   * doesn't say how long it can take... */
 	  maxtime = grub_get_time_ms () + 1000;
 	  while ((grub_pci_read (pciaddr_eecp) & GRUB_EHCI_BIOS_OWNED)
 		 && (grub_get_time_ms () < maxtime));
 	  if (grub_pci_read (pciaddr_eecp) & GRUB_EHCI_BIOS_OWNED)
 	    {
 	      grub_dprintf ("ehci",
 			    "EHCI grub_ehci_pci_iter: EHCI change ownership timeout");
 	      /* Change ownership in "hard way" - reset BIOS ownership */
 	      grub_pci_write (pciaddr_eecp, GRUB_EHCI_OS_OWNED);
 	      /* Ensure PCI register is written */
 	      grub_pci_read (pciaddr_eecp);
 	    }
 	}
      else if (usblegsup & GRUB_EHCI_OS_OWNED)
 	/* XXX: What to do in this case - nothing ? Can it happen ? */
 	grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: EHCI owned by: OS\n");
      else
 	{
 	  grub_dprintf ("ehci",
 			"EHCI grub_ehci_pci_iter: EHCI owned by: NONE\n");
 	  /* XXX: What to do in this case ? Can it happen ?
 	   * Is code below correct ? */
 	  /* Ownership change - set OS_OWNED bit */
 	  grub_pci_write (pciaddr_eecp, GRUB_EHCI_OS_OWNED);
 	  /* Ensure PCI register is written */
 	  grub_pci_read (pciaddr_eecp);
 	}
      /* Disable SMI, just to be sure.  */
      pciaddr_eecp = grub_pci_make_address (dev, eecp_offset + 4);
      grub_pci_write (pciaddr_eecp, 0);
      /* Ensure PCI register is written */
      grub_pci_read (pciaddr_eecp);
    }
  grub_dprintf ("ehci", "inithw: EHCI grub_ehci_pci_iter: ownership OK\n");
  grub_ehci_init_device (regs);
  return 0;
 }
 void
 grub_ehci_pci_scan (void)
 {
  grub_pci_iterate (grub_ehci_pci_iter, NULL);
 }
@@ -22,10 +22,13 @@
 #include <grub/usb.h>
 #include <grub/usbtrans.h>
 #include <grub/misc.h>
 #include <grub/pci.h>
 #include <grub/cpu/pci.h>
 #include <grub/cpu/io.h>
 #include <grub/time.h>
 #include <grub/loader.h>
 #include <grub/cs5536.h>
 #include <grub/disk.h>
 #include <grub/dma.h>
 #include <grub/cache.h>
 GRUB_MOD_LICENSE ("GPLv3+");
@@ -36,6 +39,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
 *      - is not supporting interrupt transfers
 */
 #define GRUB_EHCI_PCI_SBRN_REG  0x60
 /* Capability registers offsets */
 enum
 {
@@ -49,6 +54,7 @@ enum
 #define GRUB_EHCI_EECP_MASK     (0xff << 8)
 #define GRUB_EHCI_EECP_SHIFT    8
 #define GRUB_EHCI_ADDR_MEM_MASK	(~0xff)
 #define GRUB_EHCI_POINTER_MASK	(~0x1f)
 /* Capability register SPARAMS bits */
@@ -79,6 +85,13 @@ enum
 #define GRUB_EHCI_QH_EMPTY 1
 /* USBLEGSUP bits and related OS OWNED byte offset */
 enum
 {
  GRUB_EHCI_BIOS_OWNED = (1 << 16),
  GRUB_EHCI_OS_OWNED = (1 << 24)
 };
 /* Operational registers offsets */
 enum
 {
@@ -442,10 +455,9 @@ grub_ehci_reset (struct grub_ehci *e)
  sync_all_caches (e);
  grub_dprintf ("ehci", "reset\n");
  grub_ehci_oper_write32 (e, GRUB_EHCI_COMMAND,
-			  GRUB_EHCI_CMD_HC_RESET);
+			  GRUB_EHCI_CMD_HC_RESET
 			  | grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
  /* Ensure command is written */
  grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND);
  /* XXX: How long time could take reset of HC ? */
@@ -461,24 +473,116 @@ grub_ehci_reset (struct grub_ehci *e)
 }
 /* PCI iteration function... */
-void
+static int
-grub_ehci_init_device (volatile void *regs)
+grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
 		    void *data __attribute__ ((unused)))
 {
  grub_uint8_t release;
  grub_uint32_t class_code;
  grub_uint32_t interf;
  grub_uint32_t subclass;
  grub_uint32_t class;
  grub_uint32_t base, base_h;
  struct grub_ehci *e;
  grub_uint32_t eecp_offset;
  grub_uint32_t fp;
  int i;
  grub_uint32_t usblegsup = 0;
  grub_uint64_t maxtime;
  grub_uint32_t n_ports;
  grub_uint8_t caplen;
  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: begin\n");
  if (pciid == GRUB_CS5536_PCIID)
    {
      grub_uint64_t basereg;
      basereg = grub_cs5536_read_msr (dev, GRUB_CS5536_MSR_USB_EHCI_BASE);
      if (!(basereg & GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE))
 	{
 	  /* Shouldn't happen.  */
 	  grub_dprintf ("ehci", "No EHCI address is assigned\n");
 	  return 0;
 	}
      base = (basereg & GRUB_CS5536_MSR_USB_BASE_ADDR_MASK);
      basereg |= GRUB_CS5536_MSR_USB_BASE_BUS_MASTER;
      basereg &= ~GRUB_CS5536_MSR_USB_BASE_PME_ENABLED;
      basereg &= ~GRUB_CS5536_MSR_USB_BASE_PME_STATUS;
      basereg &= ~GRUB_CS5536_MSR_USB_BASE_SMI_ENABLE;
      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_EHCI_BASE, basereg);
    }
  else
    {
      grub_pci_address_t addr;
      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
      class_code = grub_pci_read (addr) >> 8;
      interf = class_code & 0xFF;
      subclass = (class_code >> 8) & 0xFF;
      class = class_code >> 16;
      /* If this is not an EHCI controller, just return.  */
      if (class != 0x0c || subclass != 0x03 || interf != 0x20)
 	return 0;
      grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: class OK\n");
      /* Check Serial Bus Release Number */
      addr = grub_pci_make_address (dev, GRUB_EHCI_PCI_SBRN_REG);
      release = grub_pci_read_byte (addr);
      if (release != 0x20)
 	{
 	  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: Wrong SBRN: %0x\n",
 			release);
 	  return 0;
 	}
      grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: bus rev. num. OK\n");
      /* Determine EHCI EHCC registers base address.  */
      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
      base = grub_pci_read (addr);
      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG1);
      base_h = grub_pci_read (addr);
      /* Stop if registers are mapped above 4G - GRUB does not currently
       * work with registers mapped above 4G */
      if (((base & GRUB_PCI_ADDR_MEM_TYPE_MASK) != GRUB_PCI_ADDR_MEM_TYPE_32)
 	  && (base_h != 0))
 	{
 	  grub_dprintf ("ehci",
 			"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_dprintf ("ehci", "EHCI grub_ehci_pci_iter: 32-bit EHCI OK\n");
    }
  /* Allocate memory for the controller and fill basic values. */
  e = grub_zalloc (sizeof (*e));
  if (!e)
-    return;
+    return 1;
  e->framelist_chunk = NULL;
  e->td_chunk = NULL;
  e->qh_chunk = NULL;
-  e->iobase_ehcc = regs;
+  e->iobase_ehcc = grub_pci_device_map_range (dev,
 					      (base & GRUB_EHCI_ADDR_MEM_MASK),
 					      0x100);
  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: iobase of EHCC: %08x\n",
 		(base & GRUB_EHCI_ADDR_MEM_MASK));
  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: CAPLEN: %02x\n",
 		grub_ehci_ehcc_read8 (e, GRUB_EHCI_EHCC_CAPLEN));
  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: VERSION: %04x\n",
@@ -494,7 +598,7 @@ grub_ehci_init_device (volatile void *regs)
  if (caplen & (sizeof (grub_uint32_t) - 1))
    {
      grub_dprintf ("ehci", "Unaligned caplen\n");
-      return;
+      return 0;
    }
  e->iobase = ((volatile grub_uint32_t *) e->iobase_ehcc
 	       + (caplen / sizeof (grub_uint32_t)));
@@ -504,8 +608,8 @@ grub_ehci_init_device (volatile void *regs)
 #endif
  grub_dprintf ("ehci",
-		"EHCI grub_ehci_pci_iter: iobase of oper. regs: %08llxx\n",
+		"EHCI grub_ehci_pci_iter: iobase of oper. regs: %08x\n",
-		(unsigned long long) (grub_addr_t) e->iobase_ehcc + caplen);
+		(base & GRUB_EHCI_ADDR_MEM_MASK) + caplen);
  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: COMMAND: %08x\n",
 		grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n",
@@ -521,6 +625,10 @@ grub_ehci_init_device (volatile void *regs)
  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: CONFIG_FLAG: %08x\n",
 		grub_ehci_oper_read32 (e, GRUB_EHCI_CONFIG_FLAG));
  /* Is there EECP ? */
  eecp_offset = (grub_ehci_ehcc_read32 (e, GRUB_EHCI_EHCC_CPARAMS)
 		 & GRUB_EHCI_EECP_MASK) >> GRUB_EHCI_EECP_SHIFT;
  /* Check format of data structures requested by EHCI */
  /* XXX: In fact it is not used at any place, it is prepared for future
   * This implementation uses 32-bits pointers only */
@@ -624,6 +732,65 @@ grub_ehci_init_device (volatile void *regs)
  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: QH/TD init. OK\n");
  /* Determine and change ownership. */
  /* EECP offset valid in HCCPARAMS */
  /* Ownership can be changed via EECP only */
  if (pciid != GRUB_CS5536_PCIID && eecp_offset >= 0x40)	
    {
      grub_pci_address_t pciaddr_eecp;
      pciaddr_eecp = grub_pci_make_address (dev, eecp_offset);
      usblegsup = grub_pci_read (pciaddr_eecp);
      if (usblegsup & GRUB_EHCI_BIOS_OWNED)
 	{
 	  grub_boot_time ("Taking ownership of EHCI controller");
 	  grub_dprintf ("ehci",
 			"EHCI grub_ehci_pci_iter: EHCI owned by: BIOS\n");
 	  /* Ownership change - set OS_OWNED bit */
 	  grub_pci_write (pciaddr_eecp, usblegsup | GRUB_EHCI_OS_OWNED);
 	  /* Ensure PCI register is written */
 	  grub_pci_read (pciaddr_eecp);
 	  /* Wait for finish of ownership change, EHCI specification
 	   * doesn't say how long it can take... */
 	  maxtime = grub_get_time_ms () + 1000;
 	  while ((grub_pci_read (pciaddr_eecp) & GRUB_EHCI_BIOS_OWNED)
 		 && (grub_get_time_ms () < maxtime));
 	  if (grub_pci_read (pciaddr_eecp) & GRUB_EHCI_BIOS_OWNED)
 	    {
 	      grub_dprintf ("ehci",
 			    "EHCI grub_ehci_pci_iter: EHCI change ownership timeout");
 	      /* Change ownership in "hard way" - reset BIOS ownership */
 	      grub_pci_write (pciaddr_eecp, GRUB_EHCI_OS_OWNED);
 	      /* Ensure PCI register is written */
 	      grub_pci_read (pciaddr_eecp);
 	    }
 	}
      else if (usblegsup & GRUB_EHCI_OS_OWNED)
 	/* XXX: What to do in this case - nothing ? Can it happen ? */
 	grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: EHCI owned by: OS\n");
      else
 	{
 	  grub_dprintf ("ehci",
 			"EHCI grub_ehci_pci_iter: EHCI owned by: NONE\n");
 	  /* XXX: What to do in this case ? Can it happen ?
 	   * Is code below correct ? */
 	  /* Ownership change - set OS_OWNED bit */
 	  grub_pci_write (pciaddr_eecp, GRUB_EHCI_OS_OWNED);
 	  /* Ensure PCI register is written */
 	  grub_pci_read (pciaddr_eecp);
 	}
    /* Disable SMI, just to be sure.  */
    pciaddr_eecp = grub_pci_make_address (dev, eecp_offset + 4);
    grub_pci_write (pciaddr_eecp, 0);
    /* Ensure PCI register is written */
    grub_pci_read (pciaddr_eecp);
    }
  grub_dprintf ("ehci", "inithw: EHCI grub_ehci_pci_iter: ownership OK\n");
  /* Now we can setup EHCI (maybe...) */
  /* Check if EHCI is halted and halt it if not */
@@ -696,8 +863,8 @@ grub_ehci_init_device (volatile void *regs)
  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: OK at all\n");
  grub_dprintf ("ehci",
-		"EHCI grub_ehci_pci_iter: iobase of oper. regs: %08llx\n",
+		"EHCI grub_ehci_pci_iter: iobase of oper. regs: %08x\n",
-		(unsigned long long) (grub_addr_t) regs);
+		(base & GRUB_EHCI_ADDR_MEM_MASK));
  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: COMMAND: %08x\n",
 		grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n",
@@ -713,7 +880,7 @@ grub_ehci_init_device (volatile void *regs)
  grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: CONFIG_FLAG: %08x\n",
 		grub_ehci_oper_read32 (e, GRUB_EHCI_CONFIG_FLAG));
-  return;
+  return 0;
 fail:
  if (e)
@@ -727,7 +894,7 @@ fail:
    }
  grub_free (e);
-  return;
+  return 0;
 }
 static int
@@ -1724,6 +1891,12 @@ grub_ehci_detect_dev (grub_usb_controller_t dev, int port, int *changed)
    }
 }
 static void
 grub_ehci_inithw (void)
 {
  grub_pci_iterate (grub_ehci_pci_iter, NULL);
 }
 static grub_err_t
 grub_ehci_restore_hw (void)
 {
@@ -1824,7 +1997,7 @@ GRUB_MOD_INIT (ehci)
  grub_stop_disk_firmware ();
  grub_boot_time ("Initing EHCI hardware");
-  grub_ehci_pci_scan ();
+  grub_ehci_inithw ();
  grub_boot_time ("Registering EHCI driver");
  grub_usb_controller_dev_register (&usb_controller);
  grub_boot_time ("EHCI driver registered");
@@ -75,9 +75,6 @@ grub_usb_controller_iterate (grub_usb_controller_iterate_hook_t hook,
 grub_usb_err_t
 grub_usb_clear_halt (grub_usb_device_t dev, int endpoint)
 {
  if (endpoint >= GRUB_USB_MAX_TOGGLE)
    return GRUB_USB_ERR_BADDEVICE;
  dev->toggle[endpoint] = 0;
  return grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
 				     | GRUB_USB_REQTYPE_STANDARD
@@ -137,10 +134,10 @@ grub_usb_device_initialize (grub_usb_device_t dev)
    return err;
  descdev = &dev->descdev;
-  for (i = 0; i < GRUB_USB_MAX_CONF; i++)
+  for (i = 0; i < 8; i++)
    dev->config[i].descconf = NULL;
-  if (descdev->configcnt == 0 || descdev->configcnt > GRUB_USB_MAX_CONF)
+  if (descdev->configcnt == 0)
    {
      err = GRUB_USB_ERR_BADDEVICE;
      goto fail;
@@ -175,12 +172,6 @@ grub_usb_device_initialize (grub_usb_device_t dev)
      /* Skip the configuration descriptor.  */
      pos = dev->config[i].descconf->length;
      if (dev->config[i].descconf->numif > GRUB_USB_MAX_IF)
        {
          err = GRUB_USB_ERR_BADDEVICE;
          goto fail;
        }
      /* Read all interfaces.  */
      for (currif = 0; currif < dev->config[i].descconf->numif; currif++)
 	{
@@ -226,7 +217,7 @@ grub_usb_device_initialize (grub_usb_device_t dev)
 fail:
-  for (i = 0; i < GRUB_USB_MAX_CONF; i++)
+  for (i = 0; i < 8; i++)
    grub_free (dev->config[i].descconf);
  return err;
@@ -149,8 +149,8 @@ grub_usb_add_hub (grub_usb_device_t dev)
  grub_usb_set_configuration (dev, 1);
  dev->nports = hubdesc.portcnt;
-  dev->children = grub_calloc (hubdesc.portcnt, sizeof (dev->children[0]));
+  dev->children = grub_zalloc (hubdesc.portcnt * sizeof (dev->children[0]));
-  dev->ports = grub_calloc (dev->nports, sizeof (dev->ports[0]));
+  dev->ports = grub_zalloc (dev->nports * sizeof (dev->ports[0]));
  if (!dev->children || !dev->ports)
    {
      grub_free (dev->children);
@@ -268,8 +268,8 @@ grub_usb_controller_dev_register_iter (grub_usb_controller_t controller, void *d
  /* Query the number of ports the root Hub has.  */
  hub->nports = controller->dev->hubports (controller);
-  hub->devices = grub_calloc (hub->nports, sizeof (hub->devices[0]));
+  hub->devices = grub_zalloc (sizeof (hub->devices[0]) * hub->nports);
-  hub->ports = grub_calloc (hub->nports, sizeof (hub->ports[0]));
+  hub->ports = grub_zalloc (sizeof (hub->ports[0]) * hub->nports);
  if (!hub->devices || !hub->ports)
    {
      grub_free (hub->devices);
@@ -18,7 +18,7 @@
 */
 #include <grub/dl.h>
-#include <grub/dma.h>
+#include <grub/pci.h>
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/usb.h>
@@ -27,7 +27,6 @@
 #include <grub/mm.h>
 #include <grub/memory.h>
 #include <grub/i18n.h>
 #include <grub/lockdown.h>
 #ifdef GRUB_MACHINE_EFI
 #include <grub/efi/efi.h>
@@ -636,7 +635,7 @@ grub_cmd_acpi (struct grub_extcmd_context *ctxt, int argc, char **args)
      grub_size_t size;
      char *buf;
-      file = grub_file_open (args[i], GRUB_FILE_TYPE_ACPI_TABLE);
+      file = grub_file_open (args[i]);
      if (! file)
 	{
 	  free_tables ();
@@ -762,10 +761,10 @@ grub_cmd_acpi (struct grub_extcmd_context *ctxt, int argc, char **args)
    struct grub_efi_guid acpi = GRUB_EFI_ACPI_TABLE_GUID;
    struct grub_efi_guid acpi20 = GRUB_EFI_ACPI_20_TABLE_GUID;
-    efi_call_2 (grub_efi_system_table->boot_services->install_configuration_table,
+    grub_efi_system_table->boot_services->install_configuration_table
-      &acpi20, grub_acpi_get_rsdpv2 ());
+      (&acpi20, grub_acpi_get_rsdpv2 ());
-    efi_call_2 (grub_efi_system_table->boot_services->install_configuration_table,
+    grub_efi_system_table->boot_services->install_configuration_table
-      &acpi, grub_acpi_get_rsdpv1 ());
+      (&acpi, grub_acpi_get_rsdpv1 ());
  }
 #endif
@@ -776,7 +775,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(acpi)
 {
-  cmd = grub_register_extcmd_lockdown ("acpi", grub_cmd_acpi, 0,
+  cmd = grub_register_extcmd ("acpi", grub_cmd_acpi, 0,
 			      N_("[-1|-2] [--exclude=TABLE1,TABLE2|"
 			      "--load-only=TABLE1,TABLE2] FILE1"
 			      " [FILE2] [...]"),
@@ -121,8 +121,8 @@ grub_cmd_blocklist (grub_command_t cmd __attribute__ ((unused)),
  if (argc < 1)
    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-  file = grub_file_open (args[0], GRUB_FILE_TYPE_PRINT_BLOCKLIST
+  grub_file_filter_disable_compression ();
-			 | GRUB_FILE_TYPE_NO_DECOMPRESS);
+  file = grub_file_open (args[0]);
  if (! file)
    return grub_errno;
@@ -56,7 +56,7 @@ grub_cmd_cat (grub_extcmd_context_t ctxt, int argc, char **args)
  if (argc != 1)
    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-  file = grub_file_open (args[0], GRUB_FILE_TYPE_CAT);
+  file = grub_file_open (args[0]);
  if (! file)
    return grub_errno;
@@ -45,8 +45,8 @@ grub_cmd_cmp (grub_command_t cmd __attribute__ ((unused)),
  grub_printf_ (N_("Compare file `%s' with `%s':\n"), args[0],
 		args[1]);
-  file1 = grub_file_open (args[0], GRUB_FILE_TYPE_CMP);
+  file1 = grub_file_open (args[0]);
-  file2 = grub_file_open (args[1], GRUB_FILE_TYPE_CMP);
+  file2 = grub_file_open (args[1]);
  if (! file1 || ! file2)
    goto cleanup;
@@ -59,8 +59,7 @@ grub_cmd_date (grub_command_t cmd __attribute__ ((unused)),
  for (; argc; argc--, args++)
    {
-      const char *p;
+      char *p, c;
      char c;
      int m1, ofs, n, cur_mask;
      p = args[0];
@@ -38,8 +38,8 @@ grub_cmd_fwsetup (grub_command_t cmd __attribute__ ((unused)),
  grub_size_t oi_size;
  grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID;
-  grub_efi_get_variable ("OsIndications", &global, &oi_size,
+  old_os_indications = grub_efi_get_variable ("OsIndications", &global,
-			 (void **) &old_os_indications);
+					      &oi_size);
  if (old_os_indications != NULL && oi_size == sizeof (os_indications))
    os_indications |= *old_os_indications;
@@ -63,8 +63,8 @@ efifwsetup_is_supported (void)
  grub_size_t oi_size = 0;
  grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID;
-  grub_efi_get_variable ("OsIndicationsSupported", &global, &oi_size,
+  os_indications_supported = grub_efi_get_variable ("OsIndicationsSupported",
-			 (void **) &os_indications_supported);
+						    &global, &oi_size);
  if (!os_indications_supported)
    return 0;
@@ -169,7 +169,7 @@ grub_cmd_loadbios (grub_command_t cmd __attribute__ ((unused)),
  if (argc > 1)
    {
-      file = grub_file_open (argv[1], GRUB_FILE_TYPE_VBE_DUMP);
+      file = grub_file_open (argv[1]);
      if (! file)
 	return grub_errno;
@@ -183,7 +183,7 @@ grub_cmd_loadbios (grub_command_t cmd __attribute__ ((unused)),
 	return grub_errno;
    }
-  file = grub_file_open (argv[0], GRUB_FILE_TYPE_VBE_DUMP);
+  file = grub_file_open (argv[0]);
  if (! file)
    return grub_errno;
@@ -205,12 +205,12 @@ static grub_command_t cmd_fakebios, cmd_loadbios;
 GRUB_MOD_INIT(loadbios)
 {
-  cmd_fakebios = grub_register_command_lockdown ("fakebios", grub_cmd_fakebios,
+  cmd_fakebios = grub_register_command ("fakebios", grub_cmd_fakebios,
 					0, N_("Create BIOS-like structures for"
 					      " backward compatibility with"
 					      " existing OS."));
-  cmd_loadbios = grub_register_command_lockdown ("loadbios", grub_cmd_loadbios,
+  cmd_loadbios = grub_register_command ("loadbios", grub_cmd_loadbios,
 					N_("BIOS_DUMP [INT10_DUMP]"),
 					N_("Load BIOS dump."));
 }
@@ -109,10 +109,8 @@ grub_cmd_lsefi (grub_command_t cmd __attribute__ ((unused)),
      status = efi_call_3 (grub_efi_system_table->boot_services->protocols_per_handle,
 			   handle, &protocols, &num_protocols);
-      if (status != GRUB_EFI_SUCCESS) {
+      if (status != GRUB_EFI_SUCCESS)
 	grub_printf ("Unable to retrieve protocols\n");
 	continue;
      }
      for (j = 0; j < num_protocols; j++)
 	{
 	  for (k = 0; k < ARRAY_SIZE (known_protocols); k++)
@@ -40,17 +40,14 @@ static const struct guid_mapping guid_mappings[] =
    { GRUB_EFI_CRC32_GUIDED_SECTION_EXTRACTION_GUID,
      "CRC32 GUIDED SECTION EXTRACTION"},
    { GRUB_EFI_DEBUG_IMAGE_INFO_TABLE_GUID, "DEBUG IMAGE INFO"},
    { GRUB_EFI_DEVICE_TREE_GUID, "DEVICE TREE"},
    { GRUB_EFI_DXE_SERVICES_TABLE_GUID, "DXE SERVICES"},
    { GRUB_EFI_HCDP_TABLE_GUID, "HCDP"},
    { GRUB_EFI_HOB_LIST_GUID, "HOB LIST"},
    { GRUB_EFI_LZMA_CUSTOM_DECOMPRESS_GUID, "LZMA CUSTOM DECOMPRESS"},
    { GRUB_EFI_MEMORY_TYPE_INFORMATION_GUID, "MEMORY TYPE INFO"},
    { GRUB_EFI_MPS_TABLE_GUID, "MPS"},
    { GRUB_EFI_RT_PROPERTIES_TABLE_GUID, "RT PROPERTIES"},
    { GRUB_EFI_SAL_TABLE_GUID, "SAL"},
    { GRUB_EFI_SMBIOS_TABLE_GUID, "SMBIOS"},
    { GRUB_EFI_SMBIOS3_TABLE_GUID, "SMBIOS3"},
    { GRUB_EFI_SYSTEM_RESOURCE_TABLE_GUID, "SYSTEM RESOURCE TABLE"},
    { GRUB_EFI_TIANO_CUSTOM_DECOMPRESS_GUID, "TIANO CUSTOM DECOMPRESS"},
    { GRUB_EFI_TSC_FREQUENCY_GUID, "TSC FREQUENCY"},
@@ -74,8 +71,7 @@ grub_cmd_lsefisystab (struct grub_command *cmd __attribute__ ((unused)),
    grub_printf ("Vendor: ");
    for (vendor_utf16 = st->firmware_vendor; *vendor_utf16; vendor_utf16++);
-    /* Allocate extra 3 bytes to simplify math. */
+    vendor = grub_malloc (4 * (vendor_utf16 - st->firmware_vendor) + 1);
    vendor = grub_calloc (4, vendor_utf16 - st->firmware_vendor + 1);
    if (!vendor)
      return grub_errno;
    *grub_utf16_to_utf8 ((grub_uint8_t *) vendor, st->firmware_vendor,
@@ -1,61 +0,0 @@
 /* smbios.c - get smbios tables. */
 /*
 *  GRUB  --  GRand Unified Bootloader
 *  Copyright (C) 2019  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/smbios.h>
 #include <grub/misc.h>
 #include <grub/efi/efi.h>
 #include <grub/efi/api.h>
 struct grub_smbios_eps *
 grub_machine_smbios_get_eps (void)
 {
  unsigned i;
  static grub_efi_packed_guid_t smbios_guid = GRUB_EFI_SMBIOS_TABLE_GUID;
  for (i = 0; i < grub_efi_system_table->num_table_entries; i++)
    {
      grub_efi_packed_guid_t *guid =
 	&grub_efi_system_table->configuration_table[i].vendor_guid;
      if (! grub_memcmp (guid, &smbios_guid, sizeof (grub_efi_packed_guid_t)))
 	return (struct grub_smbios_eps *)
 	  grub_efi_system_table->configuration_table[i].vendor_table;
    }
  return 0;
 }
 struct grub_smbios_eps3 *
 grub_machine_smbios_get_eps3 (void)
 {
  unsigned i;
  static grub_efi_packed_guid_t smbios3_guid = GRUB_EFI_SMBIOS3_TABLE_GUID;
  for (i = 0; i < grub_efi_system_table->num_table_entries; i++)
    {
      grub_efi_packed_guid_t *guid =
 	&grub_efi_system_table->configuration_table[i].vendor_guid;
      if (! grub_memcmp (guid, &smbios3_guid, sizeof (grub_efi_packed_guid_t)))
 	return (struct grub_smbios_eps3 *)
 	  grub_efi_system_table->configuration_table[i].vendor_table;
    }
  return 0;
 }
@@ -1,241 +0,0 @@
 /*
 *  GRUB  --  GRand Unified Bootloader
 *  Copyright (C) 2018  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/>.
 *
 *  EFI TPM support code.
 */
 #include <grub/err.h>
 #include <grub/i18n.h>
 #include <grub/efi/api.h>
 #include <grub/efi/efi.h>
 #include <grub/efi/tpm.h>
 #include <grub/mm.h>
 #include <grub/tpm.h>
 #include <grub/term.h>
 typedef TCG_PCR_EVENT grub_tpm_event_t;
 static grub_efi_guid_t tpm_guid = EFI_TPM_GUID;
 static grub_efi_guid_t tpm2_guid = EFI_TPM2_GUID;
 static grub_efi_handle_t *grub_tpm_handle;
 static grub_uint8_t grub_tpm_version;
 static grub_int8_t tpm1_present = -1;
 static grub_int8_t tpm2_present = -1;
 static grub_efi_boolean_t
 grub_tpm1_present (grub_efi_tpm_protocol_t *tpm)
 {
  grub_efi_status_t status;
  TCG_EFI_BOOT_SERVICE_CAPABILITY caps;
  grub_uint32_t flags;
  grub_efi_physical_address_t eventlog, lastevent;
  if (tpm1_present != -1)
    return (grub_efi_boolean_t) tpm1_present;
  caps.Size = (grub_uint8_t) sizeof (caps);
  status = efi_call_5 (tpm->status_check, tpm, &caps, &flags, &eventlog,
 		       &lastevent);
  if (status != GRUB_EFI_SUCCESS || caps.TPMDeactivatedFlag
      || !caps.TPMPresentFlag)
    tpm1_present = 0;
  else
    tpm1_present = 1;
  grub_dprintf ("tpm", "tpm1%s present\n", tpm1_present ? "" : " NOT");
  return (grub_efi_boolean_t) tpm1_present;
 }
 static grub_efi_boolean_t
 grub_tpm2_present (grub_efi_tpm2_protocol_t *tpm)
 {
  grub_efi_status_t status;
  EFI_TCG2_BOOT_SERVICE_CAPABILITY caps;
  caps.Size = (grub_uint8_t) sizeof (caps);
  if (tpm2_present != -1)
    return (grub_efi_boolean_t) tpm2_present;
  status = efi_call_2 (tpm->get_capability, tpm, &caps);
  if (status != GRUB_EFI_SUCCESS || !caps.TPMPresentFlag)
    tpm2_present = 0;
  else
    tpm2_present = 1;
  grub_dprintf ("tpm", "tpm2%s present\n", tpm2_present ? "" : " NOT");
  return (grub_efi_boolean_t) tpm2_present;
 }
 static grub_efi_boolean_t
 grub_tpm_handle_find (grub_efi_handle_t *tpm_handle,
 		      grub_efi_uint8_t *protocol_version)
 {
  grub_efi_handle_t *handles;
  grub_efi_uintn_t num_handles;
  if (grub_tpm_handle != NULL)
    {
      *tpm_handle = grub_tpm_handle;
      *protocol_version = grub_tpm_version;
      return 1;
    }
  handles = grub_efi_locate_handle (GRUB_EFI_BY_PROTOCOL, &tpm_guid, NULL,
 				    &num_handles);
  if (handles && num_handles > 0)
    {
      grub_tpm_handle = handles[0];
      *tpm_handle = handles[0];
      grub_tpm_version = 1;
      *protocol_version = 1;
      grub_dprintf ("tpm", "TPM handle Found, version: 1\n");
      return 1;
    }
  handles = grub_efi_locate_handle (GRUB_EFI_BY_PROTOCOL, &tpm2_guid, NULL,
 				    &num_handles);
  if (handles && num_handles > 0)
    {
      grub_tpm_handle = handles[0];
      *tpm_handle = handles[0];
      grub_tpm_version = 2;
      *protocol_version = 2;
      grub_dprintf ("tpm", "TPM handle Found, version: 2\n");
      return 1;
    }
  return 0;
 }
 static grub_err_t
 grub_efi_log_event_status (grub_efi_status_t status)
 {
  switch (status)
    {
    case GRUB_EFI_SUCCESS:
      return 0;
    case GRUB_EFI_DEVICE_ERROR:
      return grub_error (GRUB_ERR_IO, N_("Command failed"));
    case GRUB_EFI_INVALID_PARAMETER:
      return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("Invalid parameter"));
    case GRUB_EFI_BUFFER_TOO_SMALL:
      return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("Output buffer too small"));
    case GRUB_EFI_NOT_FOUND:
      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("TPM unavailable"));
    default:
      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("Unknown TPM error"));
    }
 }
 static grub_err_t
 grub_tpm1_log_event (grub_efi_handle_t tpm_handle, unsigned char *buf,
 		     grub_size_t size, grub_uint8_t pcr,
 		     const char *description)
 {
  grub_tpm_event_t *event;
  grub_efi_status_t status;
  grub_efi_tpm_protocol_t *tpm;
  grub_efi_physical_address_t lastevent;
  grub_uint32_t algorithm;
  grub_uint32_t eventnum = 0;
  tpm = grub_efi_open_protocol (tpm_handle, &tpm_guid,
 				GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
  if (!grub_tpm1_present (tpm))
    return 0;
  event = grub_zalloc (sizeof (*event) + grub_strlen (description) + 1);
  if (!event)
    return grub_error (GRUB_ERR_OUT_OF_MEMORY,
 		       N_("cannot allocate TPM event buffer"));
  event->PCRIndex = pcr;
  event->EventType = EV_IPL;
  event->EventSize = grub_strlen (description) + 1;
  grub_memcpy (event->Event, description, event->EventSize);
  algorithm = TCG_ALG_SHA;
  status = efi_call_7 (tpm->log_extend_event, tpm, (grub_addr_t) buf, (grub_uint64_t) size,
 		       algorithm, event, &eventnum, &lastevent);
  grub_free (event);
  return grub_efi_log_event_status (status);
 }
 static grub_err_t
 grub_tpm2_log_event (grub_efi_handle_t tpm_handle, unsigned char *buf,
 		     grub_size_t size, grub_uint8_t pcr,
 		     const char *description)
 {
  EFI_TCG2_EVENT *event;
  grub_efi_status_t status;
  grub_efi_tpm2_protocol_t *tpm;
  tpm = grub_efi_open_protocol (tpm_handle, &tpm2_guid,
 				GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
  if (!grub_tpm2_present (tpm))
    return 0;
  event =
    grub_zalloc (sizeof (EFI_TCG2_EVENT) + grub_strlen (description) + 1);
  if (!event)
    return grub_error (GRUB_ERR_OUT_OF_MEMORY,
 		       N_("cannot allocate TPM event buffer"));
  event->Header.HeaderSize = sizeof (EFI_TCG2_EVENT_HEADER);
  event->Header.HeaderVersion = 1;
  event->Header.PCRIndex = pcr;
  event->Header.EventType = EV_IPL;
  event->Size =
    sizeof (*event) - sizeof (event->Event) + grub_strlen (description) + 1;
  grub_memcpy (event->Event, description, grub_strlen (description) + 1);
  status = efi_call_5 (tpm->hash_log_extend_event, tpm, 0, (grub_addr_t) buf,
 		       (grub_uint64_t) size, event);
  grub_free (event);
  return grub_efi_log_event_status (status);
 }
 grub_err_t
 grub_tpm_measure (unsigned char *buf, grub_size_t size, grub_uint8_t pcr,
 		    const char *description)
 {
  grub_efi_handle_t tpm_handle;
  grub_efi_uint8_t protocol_version;
  if (!grub_tpm_handle_find (&tpm_handle, &protocol_version))
    return 0;
  grub_dprintf ("tpm", "log_event, pcr = %d, size = 0x%" PRIxGRUB_SIZE ", %s\n",
                pcr, size, description);
  if (protocol_version == 1)
    return grub_tpm1_log_event (tpm_handle, buf, size, pcr, description);
  else
    return grub_tpm2_log_event (tpm_handle, buf, size, pcr, description);
 }
@@ -19,7 +19,6 @@
 #include <grub/mm.h>
 #include <grub/list.h>
 #include <grub/lockdown.h>
 #include <grub/misc.h>
 #include <grub/extcmd.h>
 #include <grub/script_sh.h>
@@ -111,28 +110,6 @@ grub_register_extcmd (const char *name, grub_extcmd_func_t func,
 				    summary, description, parser, 1);
 }
 static grub_err_t
 grub_extcmd_lockdown (grub_extcmd_context_t ctxt __attribute__ ((unused)),
                      int argc __attribute__ ((unused)),
                      char **argv __attribute__ ((unused)))
 {
  return grub_error (GRUB_ERR_ACCESS_DENIED,
                     N_("%s: the command is not allowed when lockdown is enforced"),
                     ctxt->extcmd->cmd->name);
 }
 grub_extcmd_t
 grub_register_extcmd_lockdown (const char *name, grub_extcmd_func_t func,
                               grub_command_flags_t flags, const char *summary,
                               const char *description,
                               const struct grub_arg_option *parser)
 {
  if (grub_is_lockdown () == GRUB_LOCKDOWN_ENABLED)
    func = grub_extcmd_lockdown;
  return grub_register_extcmd (name, func, flags, summary, description, parser);
 }
 void
 grub_unregister_extcmd (grub_extcmd_t ext)
 {
@@ -27,8 +27,6 @@
 #include <grub/elf.h>
 #include <grub/xen_file.h>
 #include <grub/efi/pe32.h>
 #include <grub/arm/linux.h>
 #include <grub/arm64/linux.h>
 #include <grub/i386/linux.h>
 #include <grub/xnu.h>
 #include <grub/machoload.h>
@@ -90,10 +88,6 @@ static const struct grub_arg_option options[] = {
   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-riscv32-efi", 0, 0,
   N_("Check if FILE is RISC-V 32bit EFI file"), 0, 0},
  {"is-riscv64-efi", 0, 0,
   N_("Check if FILE is RISC-V 64bit 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,
@@ -134,8 +128,6 @@ enum
  IS_IA_EFI,
  IS_ARM64_EFI,
  IS_ARM_EFI,
  IS_RISCV32_EFI,
  IS_RISCV64_EFI,
  IS_HIBERNATED,
  IS_XNU64,
  IS_XNU32,
@@ -171,7 +163,7 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
  if (type == -1)
    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no type specified");
-  file = grub_file_open (args[0], GRUB_FILE_TYPE_XNU_KERNEL);
+  file = grub_file_open (args[0]);
  if (!file)
    return grub_errno;
  switch (type)
@@ -391,19 +383,21 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
      }
    case IS_ARM_LINUX:
      {
-	struct linux_arm_kernel_header lh;
+	grub_uint32_t sig, sig_pi;
-
+	if (grub_file_read (file, &sig_pi, 4) != 4)
 	if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
 	  break;
-	/* Short forward branch in A32 state (for Raspberry pi kernels). */
+	/* Raspberry pi.  */
-	if (lh.code0 == grub_cpu_to_le32_compile_time (0xea000006))
+	if (sig_pi == grub_cpu_to_le32_compile_time (0xea000006))
 	  {
 	    ret = 1;
 	    break;
 	  }
-	if (lh.magic ==
+	if (grub_file_seek (file, 0x24) == (grub_size_t) -1)
-	    grub_cpu_to_le32_compile_time (GRUB_LINUX_ARM_MAGIC_SIGNATURE))
+	  break;
 	if (grub_file_read (file, &sig, 4) != 4)
 	  break;
 	if (sig == grub_cpu_to_le32_compile_time (0x016f2818))
 	  {
 	    ret = 1;
 	    break;
@@ -412,13 +406,13 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
      }
    case IS_ARM64_LINUX:
      {
-	struct linux_arm64_kernel_header lh;
+	grub_uint32_t sig;
-	if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
+	if (grub_file_seek (file, 0x38) == (grub_size_t) -1)
 	  break;
-
+	if (grub_file_read (file, &sig, 4) != 4)
-	if (lh.magic ==
+	  break;
-	    grub_cpu_to_le32_compile_time (GRUB_LINUX_ARM64_MAGIC_SIGNATURE))
+	if (sig == grub_cpu_to_le32_compile_time (0x644d5241))
 	  {
 	    ret = 1;
 	    break;
@@ -503,7 +497,7 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
    case IS_X86_LINUX32:
    case IS_X86_LINUX:
      {
-	struct linux_i386_kernel_header lh;
+	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))
@@ -514,7 +508,7 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
 	/* FIXME: some really old kernels (< 1.3.73) will fail this.  */
 	if (lh.header !=
-	    grub_cpu_to_le32_compile_time (GRUB_LINUX_I386_MAGIC_SIGNATURE)
+	    grub_cpu_to_le32_compile_time (GRUB_LINUX_MAGIC_SIGNATURE)
 	    || grub_le_to_cpu16 (lh.version) < 0x0200)
 	  break;
@@ -527,7 +521,7 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
 	/* 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_I386_MAGIC_SIGNATURE)
+	    grub_cpu_to_le32_compile_time (GRUB_LINUX_MAGIC_SIGNATURE)
 	    || grub_le_to_cpu16 (lh.version) < 0x0203)
 	  break;
@@ -552,8 +546,7 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
    case IS_XNU64:
    case IS_XNU32:
      {
-	macho = grub_macho_open (args[0], GRUB_FILE_TYPE_XNU_KERNEL,
+	macho = grub_macho_open (args[0], (type == IS_XNU64));
 				 (type == IS_XNU64));
 	if (!macho)
 	  break;
 	/* FIXME: more checks?  */
@@ -577,8 +570,6 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
    case IS_IA_EFI:
    case IS_ARM64_EFI:
    case IS_ARM_EFI:
    case IS_RISCV32_EFI:
    case IS_RISCV64_EFI:
      {
 	char signature[4];
 	grub_uint32_t pe_offset;
@@ -624,13 +615,7 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
 	    && coff_head.machine !=
 	    grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_ARMTHUMB_MIXED))
 	  break;
-	if ((type == IS_RISCV32_EFI || type == IS_RISCV64_EFI)
+	if (type == IS_IA_EFI || type == IS_64_EFI || type == IS_ARM64_EFI)
 	    && coff_head.machine !=
 	    grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_RISCV64))
          /* TODO: Determine bitness dynamically */
 	  break;
 	if (type == IS_IA_EFI || type == IS_64_EFI || type == IS_ARM64_EFI ||
 	    type == IS_RISCV32_EFI || type == IS_RISCV64_EFI)
 	  {
 	    struct grub_pe64_optional_header o64;
 	    if (grub_file_read (file, &o64, sizeof (o64)) != sizeof (o64))
@@ -113,7 +113,7 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename,
  if (hash->mdlen > GRUB_CRYPTO_MAX_MDLEN)
    return grub_error (GRUB_ERR_BUG, "mdlen is too long");
-  hashlist = grub_file_open (hashfilename, GRUB_FILE_TYPE_HASHLIST);
+  hashlist = grub_file_open (hashfilename);
  if (!hashlist)
    return grub_errno;
@@ -128,17 +128,11 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename,
 	  high = hextoval (*p++);
 	  low = hextoval (*p++);
 	  if (high < 0 || low < 0)
 	    {
 	      grub_free (buf);
 	    return grub_error (GRUB_ERR_BAD_FILE_TYPE, "invalid hash list");
 	    }
 	  expected[i] = (high << 4) | low;
 	}
      if ((p[0] != ' ' && p[0] != '\t') || (p[1] != ' ' && p[1] != '\t'))
 	{
 	  grub_free (buf);
 	return grub_error (GRUB_ERR_BAD_FILE_TYPE, "invalid hash list");
 	}
      p += 2;
      if (prefix)
 	{
@@ -146,19 +140,18 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename,
 	  filename = grub_xasprintf ("%s/%s", prefix, p);
 	  if (!filename)
 	    {
 	      grub_free (buf);
 	    return grub_errno;
-	    }
+	  if (!uncompress)
-	  file = grub_file_open (filename, GRUB_FILE_TYPE_TO_HASH
+	    grub_file_filter_disable_compression ();
-				 | (!uncompress ? GRUB_FILE_TYPE_NO_DECOMPRESS
+	  file = grub_file_open (filename);
 				    : GRUB_FILE_TYPE_NONE));
 	  grub_free (filename);
 	}
      else
-	file = grub_file_open (p, GRUB_FILE_TYPE_TO_HASH
+	{
-			       | (!uncompress ? GRUB_FILE_TYPE_NO_DECOMPRESS
+	  if (!uncompress)
-				  : GRUB_FILE_TYPE_NONE));
+	    grub_file_filter_disable_compression ();
 	  file = grub_file_open (p);
 	}
      if (!file)
 	{
 	  grub_file_close (hashlist);
@@ -249,9 +242,9 @@ grub_cmd_hashsum (struct grub_extcmd_context *ctxt,
      grub_file_t file;
      grub_err_t err;
      unsigned j;
-      file = grub_file_open (args[i], GRUB_FILE_TYPE_TO_HASH
+      if (!uncompress)
-			     | (!uncompress ? GRUB_FILE_TYPE_NO_DECOMPRESS
+	grub_file_filter_disable_compression ();
-				: GRUB_FILE_TYPE_NONE));
+      file = grub_file_open (args[i]);
      if (!file)
 	{
 	  if (!keep)
@@ -328,7 +328,6 @@ grub_cmd_hdparm (grub_extcmd_context_t ctxt, int argc, char **args)
 	  ata = ((struct grub_scsi *) disk->data)->data;
 	  break;
 	}
      /* FALLTHROUGH */
    default:
      grub_disk_close (disk);
      return grub_error (GRUB_ERR_IO, "not an ATA device");
@@ -436,7 +435,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(hdparm)
 {
-  cmd = grub_register_extcmd_lockdown ("hdparm", grub_cmd_hdparm, 0,
+  cmd = grub_register_extcmd ("hdparm", grub_cmd_hdparm, 0,
 			      N_("[OPTIONS] DISK"),
 			      N_("Get/set ATA disk parameters."), options);
 }
@@ -90,7 +90,7 @@ grub_cmd_hexdump (grub_extcmd_context_t ctxt, int argc, char **args)
    {
      grub_file_t file;
-      file = grub_file_open (args[0], GRUB_FILE_TYPE_HEXCAT);
+      file = grub_file_open (args[0]);
      if (! file)
 	return 0;
@@ -27,7 +27,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
 static grub_err_t
 parse_args (int argc, char *argv[], int *byte, int *bit)
 {
-  const char *rest;
+  char *rest;
  if (argc != 1)
    return grub_error (GRUB_ERR_BAD_ARGUMENT, "address required");
@@ -20,7 +20,7 @@
 #include <grub/misc.h>
 #include <grub/command.h>
 #include <grub/i18n.h>
-#include <grub/coreboot/lbio.h>
+#include <grub/i386/coreboot/lbio.h>
 #include <grub/i386/tsc.h>
 GRUB_MOD_LICENSE ("GPLv3+");
@@ -20,7 +20,7 @@
 #include <grub/misc.h>
 #include <grub/command.h>
 #include <grub/i18n.h>
-#include <grub/coreboot/lbio.h>
+#include <grub/i386/coreboot/lbio.h>
 #include <grub/i386/tsc.h>
 GRUB_MOD_LICENSE ("GPLv3+");
@@ -93,7 +93,7 @@ grub_cmd_play (grub_command_t cmd __attribute__ ((unused)),
      grub_uint32_t tempo;
      grub_file_t file;
-      file = grub_file_open (args[0], GRUB_FILE_TYPE_AUDIO);
+      file = grub_file_open (args[0]);
      if (! file)
        return grub_errno;
@@ -132,7 +132,7 @@ grub_cmd_play (grub_command_t cmd __attribute__ ((unused)),
    }
  else
    {
-      const char *end;
+      char *end;
      unsigned tempo;
      struct note note;
      int i;
@@ -1,52 +0,0 @@
 /* smbios.c - get smbios tables. */
 /*
 *  GRUB  --  GRand Unified Bootloader
 *  Copyright (C) 2019  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/acpi.h>
 #include <grub/smbios.h>
 #include <grub/misc.h>
 struct grub_smbios_eps *
 grub_machine_smbios_get_eps (void)
 {
  grub_uint8_t *ptr;
  grub_dprintf ("smbios", "Looking for SMBIOS EPS. Scanning BIOS\n");
  for (ptr = (grub_uint8_t *) 0xf0000; ptr < (grub_uint8_t *) 0x100000; ptr += 16)
    if (grub_memcmp (ptr, "_SM_", 4) == 0
 	&& grub_byte_checksum (ptr, sizeof (struct grub_smbios_eps)) == 0)
      return (struct grub_smbios_eps *) ptr;
  return 0;
 }
 struct grub_smbios_eps3 *
 grub_machine_smbios_get_eps3 (void)
 {
  grub_uint8_t *ptr;
  grub_dprintf ("smbios", "Looking for SMBIOS3 EPS. Scanning BIOS\n");
  for (ptr = (grub_uint8_t *) 0xf0000; ptr < (grub_uint8_t *) 0x100000; ptr += 16)
    if (grub_memcmp (ptr, "_SM3_", 5) == 0
 	&& grub_byte_checksum (ptr, sizeof (struct grub_smbios_eps3)) == 0)
      return (struct grub_smbios_eps3 *) ptr;
  return 0;
 }
@@ -1,102 +0,0 @@
 /* rdmsr.c - Read CPU model-specific registers. */
 /*
 *  GRUB  --  GRand Unified Bootloader
 *  Copyright (C) 2019  Free Software Foundation, Inc.
 *  Based on gcc/gcc/config/i386/driver-i386.c
 *
 *  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/i386/cpuid.h>
 #include <grub/i386/rdmsr.h>
 GRUB_MOD_LICENSE("GPLv3+");
 static grub_extcmd_t cmd_read;
 static const struct grub_arg_option options[] =
 {
  {0, 'v', 0, N_("Save read value into variable VARNAME."),
  N_("VARNAME"), ARG_TYPE_STRING},
  {0, 0, 0, 0, 0, 0}
 };
 static grub_err_t
 grub_cmd_msr_read (grub_extcmd_context_t ctxt, int argc, char **argv)
 {
  grub_uint32_t manufacturer[3], max_cpuid, a, b, c, features, addr;
  grub_uint64_t value;
  const char *ptr;
  char buf[sizeof("1122334455667788")];
  /*
   * The CPUID instruction should be used to determine whether MSRs
   * are supported. (CPUID.01H:EDX[5] = 1)
   */
  if (! grub_cpu_is_cpuid_supported ())
    return grub_error (GRUB_ERR_BUG, N_("unsupported instruction"));
  grub_cpuid (0, max_cpuid, manufacturer[0], manufacturer[2], manufacturer[1]);
  if (max_cpuid < 1)
    return grub_error (GRUB_ERR_BUG, N_("unsupported instruction"));
  grub_cpuid (1, a, b, c, features);
  if (!(features & (1 << 5)))
    return grub_error (GRUB_ERR_BUG, N_("unsupported instruction"));
  if (argc != 1)
    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
  grub_errno = GRUB_ERR_NONE;
  ptr = argv[0];
  addr = grub_strtoul (ptr, &ptr, 0);
  if (grub_errno != GRUB_ERR_NONE)
    return grub_errno;
  if (*ptr != '\0')
    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("invalid argument"));
  value = grub_msr_read (addr);
  if (ctxt->state[0].set)
    {
      grub_snprintf (buf, sizeof(buf), "%llx", (unsigned long long) value);
      grub_env_set (ctxt->state[0].arg, buf);
    }
  else
    grub_printf ("0x%llx\n", (unsigned long long) value);
  return GRUB_ERR_NONE;
 }
 GRUB_MOD_INIT(rdmsr)
 {
  cmd_read = grub_register_extcmd ("rdmsr", grub_cmd_msr_read, 0, N_("ADDR"),
 				   N_("Read a CPU model specific register."),
 				   options);
 }
 GRUB_MOD_FINI(rdmsr)
 {
  grub_unregister_extcmd (cmd_read);
 }
@@ -1,94 +0,0 @@
 /* wrmsr.c - Write CPU model-specific registers. */
 /*
 *  GRUB  --  GRand Unified Bootloader
 *  Copyright (C) 2019  Free Software Foundation, Inc.
 *  Based on gcc/gcc/config/i386/driver-i386.c
 *
 *  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/lockdown.h>
 #include <grub/i18n.h>
 #include <grub/i386/cpuid.h>
 #include <grub/i386/wrmsr.h>
 GRUB_MOD_LICENSE("GPLv3+");
 static grub_command_t cmd_write;
 static grub_err_t
 grub_cmd_msr_write (grub_command_t cmd __attribute__ ((unused)), int argc, char **argv)
 {
  grub_uint32_t manufacturer[3], max_cpuid, a, b, c, features, addr;
  grub_uint64_t value;
  const char *ptr;
  /*
   * The CPUID instruction should be used to determine whether MSRs
   * are supported. (CPUID.01H:EDX[5] = 1)
   */
  if (!grub_cpu_is_cpuid_supported ())
    return grub_error (GRUB_ERR_BUG, N_("unsupported instruction"));
  grub_cpuid (0, max_cpuid, manufacturer[0], manufacturer[2], manufacturer[1]);
  if (max_cpuid < 1)
    return grub_error (GRUB_ERR_BUG, N_("unsupported instruction"));
  grub_cpuid (1, a, b, c, features);
  if (!(features & (1 << 5)))
    return grub_error (GRUB_ERR_BUG, N_("unsupported instruction"));
  if (argc != 2)
    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("two arguments expected"));
  grub_errno = GRUB_ERR_NONE;
  ptr = argv[0];
  addr = grub_strtoul (ptr, &ptr, 0);
  if (grub_errno != GRUB_ERR_NONE)
    return grub_errno;
  if (*ptr != '\0')
    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("invalid argument"));
  ptr = argv[1];
  value = grub_strtoull (ptr, &ptr, 0);
  if (grub_errno != GRUB_ERR_NONE)
    return grub_errno;
  if (*ptr != '\0')
    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("invalid argument"));
  grub_msr_write (addr, value);
  return GRUB_ERR_NONE;
 }
 GRUB_MOD_INIT(wrmsr)
 {
  cmd_write = grub_register_command_lockdown ("wrmsr", grub_cmd_msr_write, N_("ADDR VALUE"),
                                              N_("Write a value to a CPU model specific register."));
 }
 GRUB_MOD_FINI(wrmsr)
 {
  grub_unregister_command (cmd_write);
 }
@@ -23,7 +23,6 @@
 #include <grub/env.h>
 #include <grub/cpu/io.h>
 #include <grub/i18n.h>
 #include <grub/lockdown.h>
 GRUB_MOD_LICENSE ("GPLv3+");
@@ -132,15 +131,15 @@ GRUB_MOD_INIT(memrw)
 			  N_("PORT"), N_("Read 32-bit value from PORT."),
 			  options);
  cmd_write_byte =
-    grub_register_command_lockdown ("outb", grub_cmd_write,
+    grub_register_command ("outb", grub_cmd_write,
 			   N_("PORT VALUE [MASK]"),
 			   N_("Write 8-bit VALUE to PORT."));
  cmd_write_word =
-    grub_register_command_lockdown ("outw", grub_cmd_write,
+    grub_register_command ("outw", grub_cmd_write,
 			   N_("PORT VALUE [MASK]"),
 			   N_("Write 16-bit VALUE to PORT."));
  cmd_write_dword =
-    grub_register_command_lockdown ("outl", grub_cmd_write,
+    grub_register_command ("outl", grub_cmd_write,
 			   N_("ADDR VALUE [MASK]"),
 			   N_("Write 32-bit VALUE to PORT."));
 }
@@ -40,7 +40,7 @@ static struct grub_keyboard_layout layout_us = {
    /* 0x10 */ 'm',  'n',  'o',  'p',  'q', 'r', 's', 't',
    /* 0x18 */ 'u',  'v',  'w',  'x',  'y', 'z', '1', '2',
    /* 0x20 */ '3',  '4',  '5',  '6',  '7', '8', '9', '0',
-    /* 0x28 */ '\n', GRUB_TERM_ESC, GRUB_TERM_BACKSPACE, GRUB_TERM_TAB, ' ', '-', '=', '[',
+    /* 0x28 */ '\n', '\e', '\b', '\t', ' ', '-', '=', '[',
    /* According to usage table 0x31 should be mapped to '/'
       but testing with real keyboard shows that 0x32 is remapped to '/'.
       Map 0x31 to 0. 
@@ -82,8 +82,8 @@ static struct grub_keyboard_layout layout_us = {
    /* 0x10 */ 'M',  'N',  'O',  'P',  'Q', 'R', 'S', 'T',
    /* 0x18 */ 'U',  'V',  'W',  'X',  'Y', 'Z', '!', '@',
    /* 0x20 */ '#',  '$',  '%',  '^',  '&', '*', '(', ')',
-    /* 0x28 */ '\n' | GRUB_TERM_SHIFT, GRUB_TERM_ESC | GRUB_TERM_SHIFT,
+    /* 0x28 */ '\n' | GRUB_TERM_SHIFT, '\e' | GRUB_TERM_SHIFT, 
-    /* 0x2a */ GRUB_TERM_BACKSPACE | GRUB_TERM_SHIFT, GRUB_TERM_TAB | GRUB_TERM_SHIFT,
+    /* 0x2a */ '\b' | GRUB_TERM_SHIFT, '\t' | GRUB_TERM_SHIFT, 
    /* 0x2c */ ' '  | GRUB_TERM_SHIFT,  '_', '+', '{',
    /* According to usage table 0x31 should be mapped to '/'
       but testing with real keyboard shows that 0x32 is remapped to '/'.
@@ -220,7 +220,7 @@ grub_cmd_keymap (struct grub_command *cmd __attribute__ ((unused)),
  else
    filename = argv[0];
-  file = grub_file_open (filename, GRUB_FILE_TYPE_KEYBOARD_LAYOUT);
+  file = grub_file_open (filename);
  if (! file)
    goto fail;
@@ -35,6 +35,24 @@ static const struct grub_arg_option options[] =
    {0, 0, 0, 0, 0, 0}
  };
 static int
 grub_getkeystatus (void)
 {
  int status = 0;
  grub_term_input_t term;
  if (grub_term_poll_usb)
    grub_term_poll_usb (0);
  FOR_ACTIVE_TERM_INPUTS(term)
  {
    if (term->getkeystatus)
      status |= term->getkeystatus (term);
  }
  return status;
 }
 static grub_err_t
 grub_cmd_keystatus (grub_extcmd_context_t ctxt,
 		    int argc __attribute__ ((unused)),
@@ -32,7 +32,6 @@
 #include <grub/auth.h>
 #include <grub/disk.h>
 #include <grub/partition.h>
 #include <grub/safemath.h>
 GRUB_MOD_LICENSE ("GPLv3+");
@@ -56,7 +55,7 @@ legacy_file (const char *filename)
  if (!suffix)
    return grub_errno;
-  file = grub_file_open (filename, GRUB_FILE_TYPE_CONFIG);
+  file = grub_file_open (filename);
  if (! file)
    {
      grub_free (suffix);
@@ -105,22 +104,13 @@ legacy_file (const char *filename)
 	if (newsuffix)
 	  {
 	    char *t;
 	    grub_size_t sz;
 	    if (grub_add (grub_strlen (suffix), grub_strlen (newsuffix), &sz) ||
 		grub_add (sz, 1, &sz))
 	      {
 		grub_errno = GRUB_ERR_OUT_OF_RANGE;
 		goto fail_0;
 	      }
 	    t = suffix;
-	    suffix = grub_realloc (suffix, sz);
+	    suffix = grub_realloc (suffix, grub_strlen (suffix)
 				   + grub_strlen (newsuffix) + 1);
 	    if (!suffix)
 	      {
 		grub_free (t);
 fail_0:
 		grub_free (entrysrc);
 		grub_free (parsed);
 		grub_free (newsuffix);
@@ -164,22 +154,13 @@ legacy_file (const char *filename)
 	  else
 	    {
 	      char *t;
 	      grub_size_t sz;
 	      if (grub_add (grub_strlen (entrysrc), grub_strlen (parsed), &sz) ||
 		  grub_add (sz, 1, &sz))
 		{
 		  grub_errno = GRUB_ERR_OUT_OF_RANGE;
 		  goto fail_1;
 		}
 	      t = entrysrc;
-	      entrysrc = grub_realloc (entrysrc, sz);
+	      entrysrc = grub_realloc (entrysrc, grub_strlen (entrysrc)
 				       + grub_strlen (parsed) + 1);
 	      if (!entrysrc)
 		{
 		  grub_free (t);
 fail_1:
 		  grub_free (parsed);
 		  grub_free (suffix);
 		  return grub_errno;
@@ -333,7 +314,7 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)),
  if (argc < 2)
    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-  cutargs = grub_calloc (argc - 1, sizeof (cutargs[0]));
+  cutargs = grub_malloc (sizeof (cutargs[0]) * (argc - 1));
  if (!cutargs)
    return grub_errno;
  cutargc = argc - 1;
@@ -455,7 +436,7 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)),
 	    {
 	      char rbuf[3] = "-r";
 	      bsdargc = cutargc + 2;
-	      bsdargs = grub_calloc (bsdargc, sizeof (bsdargs[0]));
+	      bsdargs = grub_malloc (sizeof (bsdargs[0]) * bsdargc);
 	      if (!bsdargs)
 		{
 		  err = grub_errno;
@@ -536,7 +517,7 @@ grub_cmd_legacy_initrd (struct grub_command *mycmd __attribute__ ((unused)),
 #endif
 			   );
-      return cmd->func (cmd, argc ? 1 : 0, args);
+      return cmd->func (cmd, argc, args);
    }
  if (kernel_type == MULTIBOOT)
    {
@@ -578,7 +559,7 @@ grub_cmd_legacy_initrdnounzip (struct grub_command *mycmd __attribute__ ((unused
 	return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("can't find command `%s'"),
 			   "module");
-      newargs = grub_calloc (argc + 1, sizeof (newargs[0]));
+      newargs = grub_malloc ((argc + 1) * sizeof (newargs[0]));
      if (!newargs)
 	return grub_errno;
      grub_memcpy (newargs + 1, args, argc * sizeof (newargs[0]));
@@ -44,8 +44,7 @@ static const struct grub_arg_option options[] =
   PUBKEY filter (that insists upon properly signed files) as well.  PUBKEY
   filter is restored before the function returns. */
 static grub_file_t
-open_envblk_file (char *filename,
+open_envblk_file (char *filename, int untrusted)
 		  enum grub_file_type type)
 {
  grub_file_t file;
  char *buf = 0;
@@ -73,7 +72,13 @@ open_envblk_file (char *filename,
      grub_strcpy (filename + len + 1, GRUB_ENVBLK_DEFCFG);
    }
-  file = grub_file_open (filename, type);
+  /* The filters that are disabled will be re-enabled by the call to
     grub_file_open() after this particular file is opened. */
  grub_file_filter_disable_compression ();
  if (untrusted)
    grub_file_filter_disable_pubkey ();
  file = grub_file_open (filename);
  grub_free (buf);
  return file;
@@ -166,10 +171,7 @@ grub_cmd_load_env (grub_extcmd_context_t ctxt, int argc, char **args)
  whitelist.list = args;
  /* state[0] is the -f flag; state[1] is the --skip-sig flag */
-  file = open_envblk_file ((state[0].set) ? state[0].arg : 0,
+  file = open_envblk_file ((state[0].set) ? state[0].arg : 0, state[1].set);
 			   GRUB_FILE_TYPE_LOADENV
 			   | (state[1].set
 			      ? GRUB_FILE_TYPE_SKIP_SIGNATURE : GRUB_FILE_TYPE_NONE));
  if (! file)
    return grub_errno;
@@ -204,10 +206,7 @@ grub_cmd_list_env (grub_extcmd_context_t ctxt,
  grub_file_t file;
  grub_envblk_t envblk;
-  file = open_envblk_file ((state[0].set) ? state[0].arg : 0,
+  file = open_envblk_file ((state[0].set) ? state[0].arg : 0, 0);
 			   GRUB_FILE_TYPE_LOADENV
 			   | (state[1].set
 			      ? GRUB_FILE_TYPE_SKIP_SIGNATURE : GRUB_FILE_TYPE_NONE));
  if (! file)
    return grub_errno;
@@ -391,8 +390,7 @@ grub_cmd_save_env (grub_extcmd_context_t ctxt, int argc, char **args)
    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no variable is specified");
  file = open_envblk_file ((state[0].set) ? state[0].arg : 0,
-			   GRUB_FILE_TYPE_SAVEENV
+                           1 /* allow untrusted */);
 			   | GRUB_FILE_TYPE_SKIP_SIGNATURE);
  if (! file)
    return grub_errno;
@@ -129,8 +129,8 @@ print_files_long (const char *filename, const struct grub_dirhook_info *info,
      /* XXX: For ext2fs symlinks are detected as files while they
 	 should be reported as directories.  */
-      file = grub_file_open (pathname, GRUB_FILE_TYPE_GET_SIZE
+      grub_file_filter_disable_compression ();
-			     | GRUB_FILE_TYPE_NO_DECOMPRESS);
+      file = grub_file_open (pathname);
      if (! file)
 	{
 	  grub_errno = 0;
@@ -196,20 +196,11 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
      goto fail;
    }
-  if (! *path && device_name)
+  if (! *path)
    {
      if (grub_errno == GRUB_ERR_UNKNOWN_FS)
 	grub_errno = GRUB_ERR_NONE;
 #ifdef GRUB_MACHINE_IEEE1275
      /*
       * Close device to prevent a double open in grub_normal_print_device_info().
       * Otherwise it may lead to hangs on some IEEE 1275 platforms.
       */
      grub_device_close (dev);
      dev = NULL;
 #endif
      grub_normal_print_device_info (device_name);
    }
  else if (fs)
@@ -221,9 +212,9 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
      };
      if (longlist)
-	(fs->fs_dir) (dev, path, print_files_long, &ctx);
+	(fs->dir) (dev, path, print_files_long, &ctx);
      else
-	(fs->fs_dir) (dev, path, print_files, &ctx);
+	(fs->dir) (dev, path, print_files, &ctx);
      if (grub_errno == GRUB_ERR_BAD_FILE_TYPE
 	  && path[grub_strlen (path) - 1] != '/')
@@ -234,8 +225,8 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
 	  struct grub_dirhook_info info;
 	  grub_errno = 0;
-	  file = grub_file_open (dirname, GRUB_FILE_TYPE_GET_SIZE
+	  grub_file_filter_disable_compression ();
-				 | GRUB_FILE_TYPE_NO_DECOMPRESS);
+	  file = grub_file_open (dirname);
 	  if (! file)
 	    goto fail;
@@ -159,12 +159,12 @@ grub_mac_bless_file (grub_device_t dev, const char *path_in, int intel)
      *tail = 0;
      ctx.dirname = tail + 1;
-      (fs->fs_dir) (dev, *path == 0 ? "/" : path, find_inode, &ctx);
+      (fs->dir) (dev, *path == 0 ? "/" : path, find_inode, &ctx);
    }
  else
    {
      ctx.dirname = path + 1;
-      (fs->fs_dir) (dev, "/", find_inode, &ctx);
+      (fs->dir) (dev, "/", find_inode, &ctx);
    }
  if (!ctx.found)
    {
@@ -22,7 +22,6 @@
 #include <grub/extcmd.h>
 #include <grub/env.h>
 #include <grub/i18n.h>
 #include <grub/lockdown.h>
 GRUB_MOD_LICENSE ("GPLv3+");
@@ -134,15 +133,15 @@ GRUB_MOD_INIT(memrw)
 			  N_("ADDR"), N_("Read 32-bit value from ADDR."),
 			  options);
  cmd_write_byte =
-    grub_register_command_lockdown ("write_byte", grub_cmd_write,
+    grub_register_command ("write_byte", grub_cmd_write,
 			   N_("ADDR VALUE [MASK]"),
 			   N_("Write 8-bit VALUE to ADDR."));
  cmd_write_word =
-    grub_register_command_lockdown ("write_word", grub_cmd_write,
+    grub_register_command ("write_word", grub_cmd_write,
 			   N_("ADDR VALUE [MASK]"),
 			   N_("Write 16-bit VALUE to ADDR."));
  cmd_write_dword =
-    grub_register_command_lockdown ("write_dword", grub_cmd_write,
+    grub_register_command ("write_dword", grub_cmd_write,
 			   N_("ADDR VALUE [MASK]"),
 			   N_("Write 32-bit VALUE to ADDR."));
 }
@@ -52,8 +52,8 @@ static struct
  int key;
 } hotkey_aliases[] =
  {
-    {"backspace", GRUB_TERM_BACKSPACE},
+    {"backspace", '\b'},
-    {"tab", GRUB_TERM_TAB},
+    {"tab", '\t'},
    {"delete", GRUB_TERM_KEY_DC},
    {"insert", GRUB_TERM_KEY_INSERT},
    {"f1", GRUB_TERM_KEY_F1},
@@ -154,7 +154,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
    goto fail;
  /* Save argc, args to pass as parameters to block arg later. */
-  menu_args = grub_calloc (argc + 1, sizeof (char *));
+  menu_args = grub_malloc (sizeof (char*) * (argc + 1));
  if (! menu_args)
    goto fail;
@@ -230,7 +230,7 @@ setparams_prefix (int argc, char **args)
      len += 3; /* 3 = 1 space + 2 quotes */
      p = args[i];
      while (*p)
-	len += (*p++ == '\'' ? 4 : 1);
+	len += (*p++ == '\'' ? 3 : 1);
    }
  result = grub_malloc (len + 2);
@@ -43,7 +43,7 @@ grub_mini_cmd_cat (struct grub_command *cmd __attribute__ ((unused)),
  if (argc < 1)
    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-  file = grub_file_open (argv[0], GRUB_FILE_TYPE_CAT);
+  file = grub_file_open (argv[0]);
  if (! file)
    return grub_errno;
@@ -137,13 +137,7 @@ grub_mini_cmd_rmmod (struct grub_command *cmd __attribute__ ((unused)),
  if (! mod)
    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no such module");
-  if (grub_dl_is_persistent (mod))
+  if (grub_dl_unref (mod) <= 0)
    return grub_error (GRUB_ERR_BAD_ARGUMENT, "cannot unload persistent module");
  if (grub_dl_ref_count (mod) > 1)
    return grub_error (GRUB_ERR_BAD_ARGUMENT, "cannot unload referenced module");
  grub_dl_unref (mod);
    grub_dl_unload (mod);
  return 0;
@@ -66,7 +66,6 @@ get_uuid (const char *name, char **uuid, int getnative)
      /* Firmware disks.  */
    case GRUB_DISK_DEVICE_BIOSDISK_ID:
    case GRUB_DISK_DEVICE_OFDISK_ID:
    case GRUB_DISK_DEVICE_OBDISK_ID:
    case GRUB_DISK_DEVICE_EFIDISK_ID:
    case GRUB_DISK_DEVICE_NAND_ID:
    case GRUB_DISK_DEVICE_ARCDISK_ID:
@@ -80,7 +79,6 @@ get_uuid (const char *name, char **uuid, int getnative)
    case GRUB_DISK_DEVICE_XEN:
      if (getnative)
 	break;
      /* FALLTHROUGH */
      /* Virtual disks.  */
      /* GRUB dynamically generated files.  */
@@ -109,7 +107,7 @@ get_uuid (const char *name, char **uuid, int getnative)
      grub_device_close (dev);
      return grub_errno;
    }
-  if (!fs->fs_uuid || fs->fs_uuid (dev, uuid) || !*uuid)
+  if (!fs->uuid || fs->uuid (dev, uuid) || !*uuid)
    {
      grub_device_close (dev);
@@ -195,7 +193,7 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)),
  else
    path_prefix = prefix;
-  mods = grub_calloc (argc, sizeof (mods[0]));
+  mods = grub_malloc (argc * sizeof (mods[0]));
  if (!mods)
    return grub_errno;
@@ -243,8 +241,7 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)),
      if (! filename)
 	goto fail;
-      file = grub_file_open (filename,
+      file = grub_file_open (filename);
 			     GRUB_FILE_TYPE_GRUB_MODULE);
      grub_free (filename);
      if (! file)
 	goto fail;
@@ -59,13 +59,7 @@ grub_parttool_register(const char *part_name,
  for (nargs = 0; args[nargs].name != 0; nargs++);
  cur->nargs = nargs;
  cur->args = (struct grub_parttool_argdesc *)
-    grub_calloc (nargs + 1, sizeof (struct grub_parttool_argdesc));
+    grub_malloc ((nargs + 1) * sizeof (struct grub_parttool_argdesc));
  if (!cur->args)
    {
      grub_free (cur);
      curhandle--;
      return -1;
    }
  grub_memcpy (cur->args, args,
 	       (nargs + 1) * sizeof (struct grub_parttool_argdesc));
@@ -199,7 +193,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
 	  {
 	    grub_file_t file;
-	    file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE_LIST);
+	    file = grub_file_open (filename);
 	    if (file)
 	      {
 		char *buf = 0;
@@ -263,7 +257,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
 	return err;
      }
-  parsed = (int *) grub_calloc (argc, sizeof (int));
+  parsed = (int *) grub_zalloc (argc * sizeof (int));
  for (i = 1; i < argc; i++)
    if (! parsed[i])
@@ -296,7 +290,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
 	  }
 	ptool = cur;
 	pargs = (struct grub_parttool_args *)
-	  grub_calloc (ptool->nargs, sizeof (struct grub_parttool_args));
+	  grub_zalloc (ptool->nargs * sizeof (struct grub_parttool_args));
 	for (j = i; j < argc; j++)
 	  if (! parsed[j])
 	    {
@@ -86,7 +86,7 @@ grub_cmd_password (grub_command_t cmd __attribute__ ((unused)),
 		   int argc, char **args)
 {
  grub_err_t err;
-  const char *ptr, *ptr2;
+  char *ptr, *ptr2;
  grub_uint8_t *ptro;
  struct pbkdf2_password *pass;
@@ -95,7 +95,7 @@ grub_cmd_pcidump (grub_extcmd_context_t ctxt,
  if (ctxt->state[0].set)
    {
      ptr = ctxt->state[0].arg;
-      ctx.pciid_check_value |= (grub_strtoul (ptr, &ptr, 16) & 0xffff);
+      ctx.pciid_check_value |= (grub_strtoul (ptr, (char **) &ptr, 16) & 0xffff);
      if (grub_errno == GRUB_ERR_BAD_NUMBER)
 	{
 	  grub_errno = GRUB_ERR_NONE;
@@ -108,7 +108,8 @@ grub_cmd_pcidump (grub_extcmd_context_t ctxt,
      if (*ptr != ':')
 	return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("missing `%c' symbol"), ':');
      ptr++;
-      ctx.pciid_check_value |= (grub_strtoul (ptr, &ptr, 16) & 0xffff) << 16;
+      ctx.pciid_check_value |= (grub_strtoul (ptr, (char **) &ptr, 16) & 0xffff)
 	<< 16;
      if (grub_errno == GRUB_ERR_BAD_NUMBER)
 	grub_errno = GRUB_ERR_NONE;
      else
@@ -123,7 +124,7 @@ grub_cmd_pcidump (grub_extcmd_context_t ctxt,
      ptr = ctxt->state[1].arg;
      optr = ptr;
-      ctx.bus = grub_strtoul (ptr, &ptr, 16);
+      ctx.bus = grub_strtoul (ptr, (char **) &ptr, 16);
      if (grub_errno == GRUB_ERR_BAD_NUMBER)
 	{
 	  grub_errno = GRUB_ERR_NONE;
@@ -137,7 +138,7 @@ grub_cmd_pcidump (grub_extcmd_context_t ctxt,
 	return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("missing `%c' symbol"), ':');
      ptr++;
      optr = ptr;
-      ctx.device = grub_strtoul (ptr, &ptr, 16);
+      ctx.device = grub_strtoul (ptr, (char **) &ptr, 16);
      if (grub_errno == GRUB_ERR_BAD_NUMBER)
 	{
 	  grub_errno = GRUB_ERR_NONE;
@@ -148,7 +149,7 @@ grub_cmd_pcidump (grub_extcmd_context_t ctxt,
      if (*ptr == '.')
 	{
 	  ptr++;
-	  ctx.function = grub_strtoul (ptr, &ptr, 16);
+	  ctx.function = grub_strtoul (ptr, (char **) &ptr, 16);
 	  if (grub_errno)
 	    return grub_errno;
 	  ctx.check_function = 1;
@@ -24,7 +24,6 @@
 #include <grub/device.h>
 #include <grub/disk.h>
 #include <grub/partition.h>
 #include <grub/gpt_partition.h>
 #include <grub/net.h>
 #include <grub/fs.h>
 #include <grub/file.h>
@@ -32,7 +31,6 @@
 #include <grub/env.h>
 #include <grub/extcmd.h>
 #include <grub/i18n.h>
 #include <grub/i386/pc/boot.h>
 GRUB_MOD_LICENSE ("GPLv3+");
@@ -47,7 +45,6 @@ static const struct grub_arg_option options[] =
    {"fs",		'f', 0, N_("Determine filesystem type."), 0, 0},
    {"fs-uuid",		'u', 0, N_("Determine filesystem UUID."), 0, 0},
    {"label",		'l', 0, N_("Determine filesystem label."), 0, 0},
    {"part-uuid",	0,   0, N_("Determine partition UUID."), 0, 0},
    {0, 0, 0, 0, 0, 0}
  };
@@ -101,56 +98,6 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args)
      grub_device_close (dev);
      return GRUB_ERR_NONE;
    }
  if (state[6].set)
    {
      /* AAAABBBB-CCCC-DDDD-EEEE-FFFFFFFFFFFF + null terminator */
      char val[37] = "none";
      if (dev->disk && dev->disk->partition)
 	{
 	  struct grub_partition *p = dev->disk->partition;
 	  grub_disk_t disk = grub_disk_open(dev->disk->name);
 	  if (!disk)
 	    {
 	      grub_device_close (dev);
 	      return grub_errno;
 	    }
 	  if (grub_strcmp(dev->disk->partition->partmap->name, "gpt") == 0)
 	    {
 	      struct grub_gpt_partentry entry;
 	      grub_gpt_part_guid_t *guid;
 	      if (grub_disk_read(disk, p->offset, p->index, sizeof(entry), &entry))
 		return grub_errno;
 	      guid = &entry.guid;
 	      grub_snprintf (val, sizeof(val),
 			     "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
 			     grub_le_to_cpu32 (guid->data1),
 			     grub_le_to_cpu16 (guid->data2),
 			     grub_le_to_cpu16 (guid->data3),
 			     guid->data4[0], guid->data4[1], guid->data4[2],
 			     guid->data4[3], guid->data4[4], guid->data4[5],
 			     guid->data4[6], guid->data4[7]);
 	    }
 	  else if (grub_strcmp(dev->disk->partition->partmap->name, "msdos") == 0)
 	    {
 	      grub_uint32_t nt_disk_sig;
 	      if (grub_disk_read(disk, 0, GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC,
 				 sizeof(nt_disk_sig), &nt_disk_sig) == 0)
 		grub_snprintf (val, sizeof(val), "%08x-%02x",
 			       grub_le_to_cpu32(nt_disk_sig), 1 + p->number);
 	    }
 	  grub_disk_close(disk);
 	}
      if (state[0].set)
 	grub_env_set (state[0].arg, val);
      else
 	grub_printf ("%s", val);
      grub_device_close (dev);
      return GRUB_ERR_NONE;
    }
  fs = grub_fs_probe (dev);
  if (! fs)
    return grub_errno;
@@ -166,10 +113,10 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args)
  if (state[4].set)
    {
      char *uuid;
-      if (! fs->fs_uuid)
+      if (! fs->uuid)
 	return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
 			   N_("%s does not support UUIDs"), fs->name);
-      err = fs->fs_uuid (dev, &uuid);
+      err = fs->uuid (dev, &uuid);
      if (err)
 	return err;
      if (! uuid)
@@ -187,11 +134,11 @@ grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args)
  if (state[5].set)
    {
      char *label;
-      if (! fs->fs_label)
+      if (! fs->label)
 	return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
 			   N_("filesystem `%s' does not support labels"),
 			   fs->name);
-      err = fs->fs_label (dev, &label);
+      err = fs->label (dev, &label);
      if (err)
 	return err;
      if (! label)
@@ -64,7 +64,7 @@ set_matches (char **varnames, char *str, grub_size_t nmatches,
 {
  int i;
  char *p;
-  const char * q;
+  char *q;
  grub_err_t err;
  unsigned long j;
@@ -116,7 +116,7 @@ grub_cmd_regexp (grub_extcmd_context_t ctxt, int argc, char **args)
  if (ret)
    goto fail;
-  matches = grub_calloc (regex.re_nsub + 1, sizeof (*matches));
+  matches = grub_zalloc (sizeof (*matches) * (regex.re_nsub + 1));
  if (! matches)
    goto fail;
@@ -81,8 +81,8 @@ iterate_device (const char *name, void *data)
      if (! buf)
 	return 1;
-      file = grub_file_open (buf, GRUB_FILE_TYPE_FS_SEARCH
+      grub_file_filter_disable_compression ();
-			     | GRUB_FILE_TYPE_NO_DECOMPRESS);
+      file = grub_file_open (buf);
      if (file)
 	{
 	  found = 1;
@@ -103,9 +103,9 @@ iterate_device (const char *name, void *data)
 	  fs = grub_fs_probe (dev);
 #ifdef DO_SEARCH_FS_UUID
-#define read_fn fs_uuid
+#define read_fn uuid
 #else
-#define read_fn fs_label
+#define read_fn label
 #endif
 	  if (fs && fs->read_fn)
@@ -122,7 +122,7 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)
    for (i = 0; state[SEARCH_HINT_BAREMETAL].args[i]; i++)
      nhints++;
-  hints = grub_calloc (nhints, sizeof (hints[0]));
+  hints = grub_malloc (sizeof (hints[0]) * nhints);
  if (!hints)
    return grub_errno;
  j = 0;
@@ -169,7 +169,7 @@ grub_cmd_setpci (grub_extcmd_context_t ctxt, int argc, char **argv)
  if (ctxt->state[0].set)
    {
      ptr = ctxt->state[0].arg;
-      pciid_check_value |= (grub_strtoul (ptr, &ptr, 16) & 0xffff);
+      pciid_check_value |= (grub_strtoul (ptr, (char **) &ptr, 16) & 0xffff);
      if (grub_errno == GRUB_ERR_BAD_NUMBER)
 	{
 	  grub_errno = GRUB_ERR_NONE;
@@ -182,7 +182,8 @@ grub_cmd_setpci (grub_extcmd_context_t ctxt, int argc, char **argv)
      if (*ptr != ':')
 	return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("missing `%c' symbol"), ':');
      ptr++;
-      pciid_check_value |= (grub_strtoul (ptr, &ptr, 16) & 0xffff) << 16;
+      pciid_check_value |= (grub_strtoul (ptr, (char **) &ptr, 16) & 0xffff)
 	<< 16;
      if (grub_errno == GRUB_ERR_BAD_NUMBER)
 	grub_errno = GRUB_ERR_NONE;
      else
@@ -199,7 +200,7 @@ grub_cmd_setpci (grub_extcmd_context_t ctxt, int argc, char **argv)
      ptr = ctxt->state[1].arg;
      optr = ptr;
-      bus = grub_strtoul (ptr, &ptr, 16);
+      bus = grub_strtoul (ptr, (char **) &ptr, 16);
      if (grub_errno == GRUB_ERR_BAD_NUMBER)
 	{
 	  grub_errno = GRUB_ERR_NONE;
@@ -213,7 +214,7 @@ grub_cmd_setpci (grub_extcmd_context_t ctxt, int argc, char **argv)
 	return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("missing `%c' symbol"), ':');
      ptr++;
      optr = ptr;
-      device = grub_strtoul (ptr, &ptr, 16);
+      device = grub_strtoul (ptr, (char **) &ptr, 16);
      if (grub_errno == GRUB_ERR_BAD_NUMBER)
 	{
 	  grub_errno = GRUB_ERR_NONE;
@@ -224,7 +225,7 @@ grub_cmd_setpci (grub_extcmd_context_t ctxt, int argc, char **argv)
      if (*ptr == '.')
 	{
 	  ptr++;
-	  function = grub_strtoul (ptr, &ptr, 16);
+	  function = grub_strtoul (ptr, (char **) &ptr, 16);
 	  if (grub_errno)
 	    return grub_errno;
 	  check_function = 1;
@@ -252,7 +253,7 @@ grub_cmd_setpci (grub_extcmd_context_t ctxt, int argc, char **argv)
  if (i == ARRAY_SIZE (pci_registers))
    {
      regsize = 0;
-      regaddr = grub_strtoul (ptr, &ptr, 16);
+      regaddr = grub_strtoul (ptr, (char **) &ptr, 16);
      if (grub_errno)
 	return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown register");
    }
@@ -269,7 +270,7 @@ grub_cmd_setpci (grub_extcmd_context_t ctxt, int argc, char **argv)
  if (*ptr == '+')
    {
      ptr++;
-      regaddr += grub_strtoul (ptr, &ptr, 16);
+      regaddr += grub_strtoul (ptr, (char **) &ptr, 16);
      if (grub_errno)
 	return grub_errno;
    }
@@ -301,14 +302,14 @@ grub_cmd_setpci (grub_extcmd_context_t ctxt, int argc, char **argv)
  if (*ptr == '=')
    {
      ptr++;
-      regwrite = grub_strtoul (ptr, &ptr, 16);
+      regwrite = grub_strtoul (ptr, (char **) &ptr, 16);
      if (grub_errno)
 	return grub_errno;
      write_mask = 0xffffffff;
      if (*ptr == ':')
 	{
 	  ptr++;
-	  write_mask = grub_strtoul (ptr, &ptr, 16);
+	  write_mask = grub_strtoul (ptr, (char **) &ptr, 16);
 	  if (grub_errno)
 	    return grub_errno;
 	  write_mask = 0xffffffff;
@@ -328,7 +329,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(setpci)
 {
-  cmd = grub_register_extcmd_lockdown ("setpci", grub_cmd_setpci, 0,
+  cmd = grub_register_extcmd ("setpci", grub_cmd_setpci, 0,
 			      N_("[-s POSITION] [-d DEVICE] [-v VAR] "
 				 "REGISTER[=VALUE[:MASK]]"),
 			      N_("Manipulate PCI devices."), options);
@@ -55,7 +55,7 @@ grub_interruptible_millisleep (grub_uint32_t ms)
  start = grub_get_time_ms ();
  while (grub_get_time_ms () - start < ms)
-    if (grub_key_is_interrupt (grub_getkey_noblock ()))
+    if (grub_getkey_noblock () == GRUB_TERM_ESC)
      return 1;
  return 0;
@@ -1,398 +0,0 @@
 /* smbios.c - retrieve smbios information. */
 /*
 *  GRUB  --  GRand Unified Bootloader
 *  Copyright (C) 2019  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/env.h>
 #include <grub/extcmd.h>
 #include <grub/i18n.h>
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/smbios.h>
 GRUB_MOD_LICENSE ("GPLv3+");
 /* Abstract useful values found in either the SMBIOS3 or SMBIOS EPS. */
 static struct {
  grub_addr_t start;
  grub_addr_t end;
  grub_uint16_t structures;
 } table_desc;
 static grub_extcmd_t cmd;
 /* Locate the SMBIOS entry point structure depending on the hardware. */
 struct grub_smbios_eps *
 grub_smbios_get_eps (void)
 {
  static struct grub_smbios_eps *eps = NULL;
  if (eps != NULL)
    return eps;
  eps = grub_machine_smbios_get_eps ();
  return eps;
 }
 /* Locate the SMBIOS3 entry point structure depending on the hardware. */
 static struct grub_smbios_eps3 *
 grub_smbios_get_eps3 (void)
 {
  static struct grub_smbios_eps3 *eps = NULL;
  if (eps != NULL)
    return eps;
  eps = grub_machine_smbios_get_eps3 ();
  return eps;
 }
 static char *
 linux_string (const char *value)
 {
  char *out = grub_malloc( grub_strlen (value) + 1);
  const char *src = value;
  char *dst = out;
  for (; *src; src++)
    if (*src > ' ' && *src < 127 && *src != ':')
      *dst++ = *src;
  *dst = 0;
  return out;
 }
 /*
 * These functions convert values from the various SMBIOS structure field types
 * into a string formatted to be returned to the user.  They expect that the
 * structure and offset were already validated.  When the requested data is
 * successfully retrieved and formatted, the pointer to the string is returned;
 * otherwise, NULL is returned on failure.  Don't free the result.
 */
 static const char *
 grub_smbios_format_byte (const grub_uint8_t *structure, grub_uint8_t offset)
 {
  static char buffer[sizeof ("255")];
  grub_snprintf (buffer, sizeof (buffer), "%u", structure[offset]);
  return (const char *)buffer;
 }
 static const char *
 grub_smbios_format_word (const grub_uint8_t *structure, grub_uint8_t offset)
 {
  static char buffer[sizeof ("65535")];
  grub_uint16_t value = grub_get_unaligned16 (structure + offset);
  grub_snprintf (buffer, sizeof (buffer), "%u", value);
  return (const char *)buffer;
 }
 static const char *
 grub_smbios_format_dword (const grub_uint8_t *structure, grub_uint8_t offset)
 {
  static char buffer[sizeof ("4294967295")];
  grub_uint32_t value = grub_get_unaligned32 (structure + offset);
  grub_snprintf (buffer, sizeof (buffer), "%" PRIuGRUB_UINT32_T, value);
  return (const char *)buffer;
 }
 static const char *
 grub_smbios_format_qword (const grub_uint8_t *structure, grub_uint8_t offset)
 {
  static char buffer[sizeof ("18446744073709551615")];
  grub_uint64_t value = grub_get_unaligned64 (structure + offset);
  grub_snprintf (buffer, sizeof (buffer), "%" PRIuGRUB_UINT64_T, value);
  return (const char *)buffer;
 }
 static const char *
 grub_smbios_get_string (const grub_uint8_t *structure, grub_uint8_t offset)
 {
  const grub_uint8_t *ptr = structure + structure[1];
  const grub_uint8_t *table_end = (const grub_uint8_t *)table_desc.end;
  const grub_uint8_t referenced_string_number = structure[offset];
  grub_uint8_t i;
  /* A string referenced with zero is interpreted as unset. */
  if (referenced_string_number == 0)
    return NULL;
  /* Search the string set. */
  for (i = 1; *ptr != 0 && ptr < table_end; i++)
    if (i == referenced_string_number)
      {
        const char *str = (const char *)ptr;
        while (*ptr++ != 0)
          if (ptr >= table_end)
            return NULL; /* The string isn't terminated. */
        return str;
      }
    else
      while (*ptr++ != 0 && ptr < table_end);
  /* The string number is greater than the number of strings in the set. */
  return NULL;
 }
 static const char *
 grub_smbios_format_uuid (const grub_uint8_t *structure, grub_uint8_t offset)
 {
  static char buffer[sizeof ("ffffffff-ffff-ffff-ffff-ffffffffffff")];
  const grub_uint8_t *f = structure + offset; /* little-endian fields */
  const grub_uint8_t *g = f + 8; /* byte-by-byte fields */
  grub_snprintf (buffer, sizeof (buffer),
                 "%02x%02x%02x%02x-%02x%02x-%02x%02x-"
                 "%02x%02x-%02x%02x%02x%02x%02x%02x",
                 f[3], f[2], f[1], f[0], f[5], f[4], f[7], f[6],
                 g[0], g[1], g[2], g[3], g[4], g[5], g[6], g[7]);
  return (const char *)buffer;
 }
 /* List the field formatting functions and the number of bytes they need. */
 static const struct {
  const char *(*format) (const grub_uint8_t *structure, grub_uint8_t offset);
  grub_uint8_t field_length;
 } field_extractors[] = {
  {grub_smbios_format_byte, 1},
  {grub_smbios_format_word, 2},
  {grub_smbios_format_dword, 4},
  {grub_smbios_format_qword, 8},
  {grub_smbios_get_string, 1},
  {grub_smbios_format_uuid, 16}
 };
 /* List command options, with structure field getters ordered as above. */
 #define FIRST_GETTER_OPT (3)
 #define SETTER_OPT (FIRST_GETTER_OPT + ARRAY_SIZE(field_extractors))
 #define LINUX_OPT (FIRST_GETTER_OPT + ARRAY_SIZE(field_extractors) + 1)
 static const struct grub_arg_option options[] = {
  {"type",       't', 0, N_("Match structures with the given type."),
                         N_("type"), ARG_TYPE_INT},
  {"handle",     'h', 0, N_("Match structures with the given handle."),
                         N_("handle"), ARG_TYPE_INT},
  {"match",      'm', 0, N_("Select a structure when several match."),
                         N_("match"), ARG_TYPE_INT},
  {"get-byte",   'b', 0, N_("Get the byte's value at the given offset."),
                         N_("offset"), ARG_TYPE_INT},
  {"get-word",   'w', 0, N_("Get two bytes' value at the given offset."),
                         N_("offset"), ARG_TYPE_INT},
  {"get-dword",  'd', 0, N_("Get four bytes' value at the given offset."),
                         N_("offset"), ARG_TYPE_INT},
  {"get-qword",  'q', 0, N_("Get eight bytes' value at the given offset."),
                         N_("offset"), ARG_TYPE_INT},
  {"get-string", 's', 0, N_("Get the string specified at the given offset."),
                         N_("offset"), ARG_TYPE_INT},
  {"get-uuid",   'u', 0, N_("Get the UUID's value at the given offset."),
                         N_("offset"), ARG_TYPE_INT},
  {"set",       '\0', 0, N_("Store the value in the given variable name."),
                         N_("variable"), ARG_TYPE_STRING},
  {"linux",     '\0', 0, N_("Filter the result like linux does."),
                         N_("variable"), ARG_TYPE_NONE},
  {0, 0, 0, 0, 0, 0}
 };
 /*
 * Return a matching SMBIOS structure.
 *
 * This method can use up to three criteria for selecting a structure:
 *   - The "type" field                  (use -1 to ignore)
 *   - The "handle" field                (use -1 to ignore)
 *   - Which to return if several match  (use  0 to ignore)
 *
 * The return value is a pointer to the first matching structure.  If no
 * structures match the given parameters, NULL is returned.
 */
 static const grub_uint8_t *
 grub_smbios_match_structure (const grub_int16_t type,
                             const grub_int32_t handle,
                             const grub_uint16_t match)
 {
  const grub_uint8_t *ptr = (const grub_uint8_t *)table_desc.start;
  const grub_uint8_t *table_end = (const grub_uint8_t *)table_desc.end;
  grub_uint16_t structures = table_desc.structures;
  grub_uint16_t structure_count = 0;
  grub_uint16_t matches = 0;
  while (ptr < table_end
         && ptr[1] >= 4 /* Valid structures include the 4-byte header. */
         && (structure_count++ < structures || structures == 0))
    {
      grub_uint16_t structure_handle = grub_get_unaligned16 (ptr + 2);
      grub_uint8_t structure_type = ptr[0];
      if ((handle < 0 || handle == structure_handle)
          && (type < 0 || type == structure_type)
          && (match == 0 || match == ++matches))
        return ptr;
      else
        {
          ptr += ptr[1];
          while ((*ptr++ != 0 || *ptr++ != 0) && ptr < table_end);
        }
      if (structure_type == GRUB_SMBIOS_TYPE_END_OF_TABLE)
        break;
    }
  return NULL;
 }
 static grub_err_t
 grub_cmd_smbios (grub_extcmd_context_t ctxt,
                 int argc __attribute__ ((unused)),
                 char **argv __attribute__ ((unused)))
 {
  struct grub_arg_list *state = ctxt->state;
  grub_int16_t type = -1;
  grub_int32_t handle = -1;
  grub_uint16_t match = 0;
  grub_uint8_t offset = 0;
  const grub_uint8_t *structure;
  const char *value;
  char *modified_value = NULL;
  grub_int32_t option;
  grub_int8_t field_type = -1;
  grub_uint8_t i;
  if (table_desc.start == 0)
    return grub_error (GRUB_ERR_IO,
                       N_("the SMBIOS entry point structure was not found"));
  /* Read the given filtering options. */
  if (state[0].set)
    {
      option = grub_strtol (state[0].arg, NULL, 0);
      if (option < 0 || option > 255)
        return grub_error (GRUB_ERR_BAD_ARGUMENT,
                           N_("the type must be between 0 and 255"));
      type = (grub_int16_t)option;
    }
  if (state[1].set)
    {
      option = grub_strtol (state[1].arg, NULL, 0);
      if (option < 0 || option > 65535)
        return grub_error (GRUB_ERR_BAD_ARGUMENT,
                           N_("the handle must be between 0 and 65535"));
      handle = (grub_int32_t)option;
    }
  if (state[2].set)
    {
      option = grub_strtol (state[2].arg, NULL, 0);
      if (option <= 0 || option > 65535)
        return grub_error (GRUB_ERR_BAD_ARGUMENT,
                           N_("the match must be a positive integer"));
      match = (grub_uint16_t)option;
    }
  /* Determine the data type of the structure field to retrieve. */
  for (i = 0; i < ARRAY_SIZE(field_extractors); i++)
    if (state[FIRST_GETTER_OPT + i].set)
      {
        if (field_type >= 0)
          return grub_error (GRUB_ERR_BAD_ARGUMENT,
                             N_("only one --get option is usable at a time"));
        field_type = i;
      }
  /* Require a choice of a structure field to return. */
  if (field_type < 0)
    return grub_error (GRUB_ERR_BAD_ARGUMENT,
                       N_("one of the --get options is required"));
  /* Locate a matching SMBIOS structure. */
  structure = grub_smbios_match_structure (type, handle, match);
  if (structure == NULL)
    return grub_error (GRUB_ERR_IO,
                       N_("no structure matched the given options"));
  /* Ensure the requested byte offset is inside the structure. */
  option = grub_strtol (state[FIRST_GETTER_OPT + field_type].arg, NULL, 0);
  if (option < 0 || option >= structure[1])
    return grub_error (GRUB_ERR_OUT_OF_RANGE,
                       N_("the given offset is outside the structure"));
  /* Ensure the requested data type at the offset is inside the structure. */
  offset = (grub_uint8_t)option;
  if (offset + field_extractors[field_type].field_length > structure[1])
    return grub_error (GRUB_ERR_OUT_OF_RANGE,
                       N_("the field ends outside the structure"));
  /* Format the requested structure field into a readable string. */
  value = field_extractors[field_type].format (structure, offset);
  if (value == NULL)
    return grub_error (GRUB_ERR_IO,
                       N_("failed to retrieve the structure field"));
  if (state[LINUX_OPT].set)
    value = modified_value = linux_string (value);
  /* Store or print the formatted value. */
  if (state[SETTER_OPT].set)
    grub_env_set (state[SETTER_OPT].arg, value);
  else
    grub_printf ("%s\n", value);
  grub_free(modified_value);
  return GRUB_ERR_NONE;
 }
 GRUB_MOD_INIT(smbios)
 {
  struct grub_smbios_eps3 *eps3;
  struct grub_smbios_eps *eps;
  if ((eps3 = grub_smbios_get_eps3 ()))
    {
      table_desc.start = (grub_addr_t)eps3->table_address;
      table_desc.end = table_desc.start + eps3->maximum_table_length;
      table_desc.structures = 0; /* SMBIOS3 drops the structure count. */
    }
  else if ((eps = grub_smbios_get_eps ()))
    {
      table_desc.start = (grub_addr_t)eps->intermediate.table_address;
      table_desc.end = table_desc.start + eps->intermediate.table_length;
      table_desc.structures = eps->intermediate.structures;
    }
  cmd = grub_register_extcmd ("smbios", grub_cmd_smbios, 0,
                              N_("[-t type] [-h handle] [-m match] "
                                 "(-b|-w|-d|-q|-s|-u) offset "
                                 "[--set variable]"),
                              N_("Retrieve SMBIOS information."), options);
 }
 GRUB_MOD_FINI(smbios)
 {
  grub_unregister_extcmd (cmd);
 }
@@ -31,7 +31,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
 /* A simple implementation for signed numbers. */
 static int
-grub_strtosl (char *arg, const char ** const end, int base)
+grub_strtosl (char *arg, char **end, int base)
 {
  if (arg[0] == '-')
    return -grub_strtoul (arg + 1, end, base);
@@ -133,15 +133,15 @@ get_fileinfo (char *path, struct test_parse_ctx *ctx)
      /* Fetch writing time. */
      ctx->file_info.mtimeset = 0;
-      if (fs->fs_mtime)
+      if (fs->mtime)
 	{
-	  if (! fs->fs_mtime (dev, &ctx->file_info.mtime))
+	  if (! fs->mtime (dev, &ctx->file_info.mtime))
 	    ctx->file_info.mtimeset = 1;
 	  grub_errno = GRUB_ERR_NONE;
 	}
    }
  else
-    (fs->fs_dir) (dev, path, find_file, ctx);
+    (fs->dir) (dev, path, find_file, ctx);
  grub_device_close (dev);
  grub_free (path);
@@ -355,8 +355,8 @@ test_parse (char **args, int *argn, int argc)
 	  if (grub_strcmp (args[*argn], "-s") == 0)
 	    {
 	      grub_file_t file;
-	      file = grub_file_open (args[*argn + 1], GRUB_FILE_TYPE_GET_SIZE
+	      grub_file_filter_disable_compression ();
-				     | GRUB_FILE_TYPE_NO_DECOMPRESS);
+	      file = grub_file_open (args[*argn + 1]);
 	      update_val (file && (grub_file_size (file) != 0), &ctx);
 	      if (file)
 		grub_file_close (file);
@@ -57,7 +57,7 @@ grub_cmd_testload (struct grub_command *cmd __attribute__ ((unused)),
  if (argc < 1)
    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-  file = grub_file_open (argv[0], GRUB_FILE_TYPE_TESTLOAD);
+  file = grub_file_open (argv[0]);
  if (! file)
    return grub_errno;
@@ -61,7 +61,7 @@ grub_cmd_testspeed (grub_extcmd_context_t ctxt, int argc, char **args)
  if (buffer == NULL)
    return grub_errno;
-  file = grub_file_open (args[0], GRUB_FILE_TYPE_TESTLOAD);
+  file = grub_file_open (args[0]);
  if (file == NULL)
    goto quit;
@@ -1,95 +0,0 @@
 /*
 *  GRUB  --  GRand Unified Bootloader
 *  Copyright (C) 2018  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/>.
 *
 *  Core TPM support code.
 */
 #include <grub/err.h>
 #include <grub/i18n.h>
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/tpm.h>
 #include <grub/term.h>
 #include <grub/verify.h>
 #include <grub/dl.h>
 GRUB_MOD_LICENSE ("GPLv3+");
 static grub_err_t
 grub_tpm_verify_init (grub_file_t io,
 		      enum grub_file_type type __attribute__ ((unused)),
 		      void **context, enum grub_verify_flags *flags)
 {
  *context = io->name;
  *flags |= GRUB_VERIFY_FLAGS_SINGLE_CHUNK;
  return GRUB_ERR_NONE;
 }
 static grub_err_t
 grub_tpm_verify_write (void *context, void *buf, grub_size_t size)
 {
  return grub_tpm_measure (buf, size, GRUB_BINARY_PCR, context);
 }
 static grub_err_t
 grub_tpm_verify_string (char *str, enum grub_verify_string_type type)
 {
  const char *prefix = NULL;
  char *description;
  grub_err_t status;
  switch (type)
    {
    case GRUB_VERIFY_KERNEL_CMDLINE:
      prefix = "kernel_cmdline: ";
      break;
    case GRUB_VERIFY_MODULE_CMDLINE:
      prefix = "module_cmdline: ";
      break;
    case GRUB_VERIFY_COMMAND:
      prefix = "grub_cmd: ";
      break;
    }
  description = grub_malloc (grub_strlen (str) + grub_strlen (prefix) + 1);
  if (!description)
    return grub_errno;
  grub_memcpy (description, prefix, grub_strlen (prefix));
  grub_memcpy (description + grub_strlen (prefix), str,
 	       grub_strlen (str) + 1);
  status =
    grub_tpm_measure ((unsigned char *) str, grub_strlen (str),
 		      GRUB_STRING_PCR, description);
  grub_free (description);
  return status;
 }
 struct grub_file_verifier grub_tpm_verifier = {
  .name = "tpm",
  .init = grub_tpm_verify_init,
  .write = grub_tpm_verify_write,
  .verify_string = grub_tpm_verify_string,
 };
 GRUB_MOD_INIT (tpm)
 {
  grub_verifier_register (&grub_tpm_verifier);
 }
 GRUB_MOD_FINI (tpm)
 {
  grub_verifier_unregister (&grub_tpm_verifier);
 }
@@ -63,11 +63,6 @@ static const char *usb_devspeed[] =
    "High"
  };
 #if __GNUC__ >= 9
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Waddress-of-packed-member"
 #endif
 static grub_usb_err_t
 grub_usb_get_string (grub_usb_device_t dev, grub_uint8_t index, int langid,
 		     char **string)
@@ -113,10 +108,6 @@ grub_usb_get_string (grub_usb_device_t dev, grub_uint8_t index, int langid,
  return GRUB_USB_ERR_NONE;
 }
 #if __GNUC__ >= 9
 #pragma GCC diagnostic pop
 #endif
 static void
 usb_print_str (const char *description, grub_usb_device_t dev, int idx)
 {
@@ -30,10 +30,16 @@
 #include <grub/env.h>
 #include <grub/kernel.h>
 #include <grub/extcmd.h>
 #include <grub/verify.h>
 GRUB_MOD_LICENSE ("GPLv3+");
 struct grub_verified
 {
  grub_file_t file;
  void *buf;
 };
 typedef struct grub_verified *grub_verified_t;
 enum
  {
    OPTION_SKIP_SIG = 0
@@ -439,27 +445,23 @@ rsa_pad (gcry_mpi_t *hmpi, grub_uint8_t *hval,
  return ret;
 }
 struct grub_pubkey_context
 {
  grub_file_t sig;
  struct signature_v4_header v4;
  grub_uint8_t v;
  const gcry_md_spec_t *hash;
  void *hash_context;
 };
 static grub_err_t
-grub_verify_signature_init (struct grub_pubkey_context *ctxt, grub_file_t sig)
+grub_verify_signature_real (char *buf, grub_size_t size,
 			    grub_file_t f, grub_file_t sig,
 			    struct grub_public_key *pkey)
 {
  grub_size_t len;
  grub_uint8_t v;
  grub_uint8_t h;
  grub_uint8_t t;
  grub_uint8_t pk;
  const gcry_md_spec_t *hash;
  struct signature_v4_header v4;
  grub_err_t err;
  grub_size_t i;
  gcry_mpi_t mpis[10];
  grub_uint8_t type = 0;
  grub_memset (ctxt, 0, sizeof (*ctxt));
  err = read_packet_header (sig, &type, &len);
  if (err)
    return err;
@@ -467,18 +469,18 @@ grub_verify_signature_init (struct grub_pubkey_context *ctxt, grub_file_t sig)
  if (type != 0x2)
    return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
-  if (grub_file_read (sig, &ctxt->v, sizeof (ctxt->v)) != sizeof (ctxt->v))
+  if (grub_file_read (sig, &v, sizeof (v)) != sizeof (v))
    return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
-  if (ctxt->v != 4)
+  if (v != 4)
    return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
-  if (grub_file_read (sig, &ctxt->v4, sizeof (ctxt->v4)) != sizeof (ctxt->v4))
+  if (grub_file_read (sig, &v4, sizeof (v4)) != sizeof (v4))
    return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
-  h = ctxt->v4.hash;
+  h = v4.hash;
-  t = ctxt->v4.type;
+  t = v4.type;
-  pk = ctxt->v4.pkeyalgo;
+  pk = v4.pkeyalgo;
  if (t != 0)
    return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
@@ -489,40 +491,16 @@ grub_verify_signature_init (struct grub_pubkey_context *ctxt, grub_file_t sig)
  if (pk >= ARRAY_SIZE (pkalgos) || pkalgos[pk].name == NULL)
    return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
-  ctxt->hash = grub_crypto_lookup_md_by_name (hashes[h]);
+  hash = grub_crypto_lookup_md_by_name (hashes[h]);
-  if (!ctxt->hash)
+  if (!hash)
    return grub_error (GRUB_ERR_BAD_SIGNATURE, "hash `%s' not loaded", hashes[h]);
  grub_dprintf ("crypt", "alive\n");
-  ctxt->hash_context = grub_zalloc (ctxt->hash->contextsize);
+  {
-  if (!ctxt->hash_context)
+    void *context = NULL;
    return grub_errno;
  ctxt->hash->init (ctxt->hash_context);
  ctxt->sig = sig;
  return GRUB_ERR_NONE;
 }
 static grub_err_t
 grub_pubkey_write (void *ctxt_, void *buf, grub_size_t size)
 {
  struct grub_pubkey_context *ctxt = ctxt_;
  ctxt->hash->write (ctxt->hash_context, buf, size);
  return GRUB_ERR_NONE;
 }
 static grub_err_t
 grub_verify_signature_real (struct grub_pubkey_context *ctxt,
 			    struct grub_public_key *pkey)
 {
  gcry_mpi_t mpis[10];
  grub_uint8_t pk = ctxt->v4.pkeyalgo;
  grub_size_t i;
  grub_uint8_t *readbuf = NULL;
    unsigned char *hval;
-  grub_ssize_t rem = grub_be_to_cpu16 (ctxt->v4.hashed_sub);
+    grub_ssize_t rem = grub_be_to_cpu16 (v4.hashed_sub);
    grub_uint32_t headlen = grub_cpu_to_be32 (rem + 6);
    grub_uint8_t s;
    grub_uint16_t unhashed_sub;
@@ -531,29 +509,45 @@ grub_verify_signature_real (struct grub_pubkey_context *ctxt,
    gcry_mpi_t hmpi;
    grub_uint64_t keyid = 0;
    struct grub_public_subkey *sk;
    grub_uint8_t *readbuf = NULL;
-  readbuf = grub_malloc (READBUF_SIZE);
+    context = grub_zalloc (hash->contextsize);
-  if (!readbuf)
+    readbuf = grub_zalloc (READBUF_SIZE);
    if (!context || !readbuf)
      goto fail;
-  ctxt->hash->write (ctxt->hash_context, &ctxt->v, sizeof (ctxt->v));
+    hash->init (context);
-  ctxt->hash->write (ctxt->hash_context, &ctxt->v4, sizeof (ctxt->v4));
+    if (buf)
      hash->write (context, buf, size);
    else 
      while (1)
 	{
 	  r = grub_file_read (f, readbuf, READBUF_SIZE);
 	  if (r < 0)
 	    goto fail;
 	  if (r == 0)
 	    break;
 	  hash->write (context, readbuf, r);
 	}
    hash->write (context, &v, sizeof (v));
    hash->write (context, &v4, sizeof (v4));
    while (rem)
      {
-      r = grub_file_read (ctxt->sig, readbuf,
+	r = grub_file_read (sig, readbuf,
 			    rem < READBUF_SIZE ? rem : READBUF_SIZE);
 	if (r < 0)
 	  goto fail;
 	if (r == 0)
 	  break;
-      ctxt->hash->write (ctxt->hash_context, readbuf, r);
+	hash->write (context, readbuf, r);
 	rem -= r;
      }
-  ctxt->hash->write (ctxt->hash_context, &ctxt->v, sizeof (ctxt->v));
+    hash->write (context, &v, sizeof (v));
    s = 0xff;
-  ctxt->hash->write (ctxt->hash_context, &s, sizeof (s));
+    hash->write (context, &s, sizeof (s));
-  ctxt->hash->write (ctxt->hash_context, &headlen, sizeof (headlen));
+    hash->write (context, &headlen, sizeof (headlen));
-  r = grub_file_read (ctxt->sig, &unhashed_sub, sizeof (unhashed_sub));
+    r = grub_file_read (sig, &unhashed_sub, sizeof (unhashed_sub));
    if (r != sizeof (unhashed_sub))
      goto fail;
    {
@@ -562,7 +556,7 @@ grub_verify_signature_real (struct grub_pubkey_context *ctxt,
      rem = grub_be_to_cpu16 (unhashed_sub);
      if (rem > READBUF_SIZE)
 	goto fail;
-    r = grub_file_read (ctxt->sig, readbuf, rem);
+      r = grub_file_read (sig, readbuf, rem);
      if (r != rem)
 	goto fail;
      for (ptr = readbuf; ptr < readbuf + rem; ptr += l)
@@ -588,25 +582,25 @@ grub_verify_signature_real (struct grub_pubkey_context *ctxt,
 	}
    }
-  ctxt->hash->final (ctxt->hash_context);
+    hash->final (context);
    grub_dprintf ("crypt", "alive\n");
-  hval = ctxt->hash->read (ctxt->hash_context);
+    hval = hash->read (context);
-  if (grub_file_read (ctxt->sig, hash_start, sizeof (hash_start)) != sizeof (hash_start))
+    if (grub_file_read (sig, hash_start, sizeof (hash_start)) != sizeof (hash_start))
      goto fail;
    if (grub_memcmp (hval, hash_start, sizeof (hash_start)) != 0)
      goto fail;
-  grub_dprintf ("crypt", "@ %x\n", (int)grub_file_tell (ctxt->sig));
+    grub_dprintf ("crypt", "@ %x\n", (int)grub_file_tell (sig));
    for (i = 0; i < pkalgos[pk].nmpisig; i++)
      {
 	grub_uint16_t l;
 	grub_size_t lb;
 	grub_dprintf ("crypt", "alive\n");
-      if (grub_file_read (ctxt->sig, &l, sizeof (l)) != sizeof (l))
+	if (grub_file_read (sig, &l, sizeof (l)) != sizeof (l))
 	  goto fail;
 	grub_dprintf ("crypt", "alive\n");
 	lb = (grub_be_to_cpu16 (l) + 7) / 8;
@@ -614,7 +608,7 @@ grub_verify_signature_real (struct grub_pubkey_context *ctxt,
 	if (lb > READBUF_SIZE - sizeof (grub_uint16_t))
 	  goto fail;
 	grub_dprintf ("crypt", "alive\n");
-      if (grub_file_read (ctxt->sig, readbuf + sizeof (grub_uint16_t), lb) != (grub_ssize_t) lb)
+	if (grub_file_read (sig, readbuf + sizeof (grub_uint16_t), lb) != (grub_ssize_t) lb)
 	  goto fail;
 	grub_dprintf ("crypt", "alive\n");
 	grub_memcpy (readbuf, &l, sizeof (l));
@@ -633,12 +627,12 @@ grub_verify_signature_real (struct grub_pubkey_context *ctxt,
    if (!sk)
      {
 	/* TRANSLATORS: %08x is 32-bit key id.  */
-      grub_error (GRUB_ERR_BAD_SIGNATURE,
+	grub_error (GRUB_ERR_BAD_SIGNATURE, N_("public key %08x not found"),
-		  N_("public key %08" PRIxGRUB_UINT64_T " not found"), keyid);
+		    keyid);
 	goto fail;
      }
-  if (pkalgos[pk].pad (&hmpi, hval, ctxt->hash, sk))
+    if (pkalgos[pk].pad (&hmpi, hval, hash, sk))
      goto fail;
    if (!*pkalgos[pk].algo)
      {
@@ -655,76 +649,25 @@ grub_verify_signature_real (struct grub_pubkey_context *ctxt,
    if ((*pkalgos[pk].algo)->verify (0, hmpi, mpis, sk->mpis, 0, 0))
      goto fail;
    grub_free (context);
    grub_free (readbuf);
    return GRUB_ERR_NONE;
  fail:
    grub_free (context);
    grub_free (readbuf);
    if (!grub_errno)
      return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature"));
    return grub_errno;
-}
+  }
 static void
 grub_pubkey_close_real (struct grub_pubkey_context *ctxt)
 {
  if (ctxt->sig)
    grub_file_close (ctxt->sig);
  if (ctxt->hash_context)
    grub_free (ctxt->hash_context);
 }
 static void
 grub_pubkey_close (void *ctxt)
 {
  grub_pubkey_close_real (ctxt);
  grub_free (ctxt);
 }
 grub_err_t
-grub_verify_signature (grub_file_t f, const char *fsig,
+grub_verify_signature (grub_file_t f, grub_file_t sig,
 		       struct grub_public_key *pkey)
 {
-  grub_file_t sig;
+  return grub_verify_signature_real (0, 0, f, sig, pkey);
  grub_err_t err;
  struct grub_pubkey_context ctxt;
  grub_uint8_t *readbuf = NULL;
  sig = grub_file_open (fsig,
 			GRUB_FILE_TYPE_SIGNATURE
 			| GRUB_FILE_TYPE_NO_DECOMPRESS);
  if (!sig)
    return grub_errno;
  err = grub_verify_signature_init (&ctxt, sig);
  if (err)
    {
      grub_file_close (sig);
      return err;
    }
  readbuf = grub_zalloc (READBUF_SIZE);
  if (!readbuf)
    goto fail;
  while (1)
    {
      grub_ssize_t r;
      r = grub_file_read (f, readbuf, READBUF_SIZE);
      if (r < 0)
 	goto fail;
      if (r == 0)
 	break;
      err = grub_pubkey_write (&ctxt, readbuf, r);
      if (err)
 	return err;
    }
  grub_verify_signature_real (&ctxt, pkey);
 fail:
  grub_pubkey_close_real (&ctxt);
  return grub_errno;
 }
 static grub_err_t
@@ -737,12 +680,10 @@ grub_cmd_trust (grub_extcmd_context_t ctxt,
  if (argc < 1)
    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
-  pkf = grub_file_open (args[0],
+  grub_file_filter_disable_compression ();
-			GRUB_FILE_TYPE_PUBLIC_KEY_TRUST
+  if (ctxt->state[OPTION_SKIP_SIG].set)
-			| GRUB_FILE_TYPE_NO_DECOMPRESS
+    grub_file_filter_disable_pubkey ();
-			| (ctxt->state[OPTION_SKIP_SIG].set
+  pkf = grub_file_open (args[0]);
 			   ? GRUB_FILE_TYPE_SKIP_SIGNATURE
 			   : GRUB_FILE_TYPE_NONE));
  if (!pkf)
    return grub_errno;
  pk = grub_load_public_key (pkf);
@@ -816,7 +757,7 @@ static grub_err_t
 grub_cmd_verify_signature (grub_extcmd_context_t ctxt,
 			   int argc, char **args)
 {
-  grub_file_t f = NULL;
+  grub_file_t f = NULL, sig = NULL;
  grub_err_t err = GRUB_ERR_NONE;
  struct grub_public_key *pk = NULL;
@@ -830,12 +771,10 @@ grub_cmd_verify_signature (grub_extcmd_context_t ctxt,
  if (argc > 2)
    {
      grub_file_t pkf;
-      pkf = grub_file_open (args[2],
+      grub_file_filter_disable_compression ();
-			    GRUB_FILE_TYPE_PUBLIC_KEY
+      if (ctxt->state[OPTION_SKIP_SIG].set)
-			    | GRUB_FILE_TYPE_NO_DECOMPRESS
+	grub_file_filter_disable_pubkey ();
-			    | (ctxt->state[OPTION_SKIP_SIG].set
+      pkf = grub_file_open (args[2]);
 			       ? GRUB_FILE_TYPE_SKIP_SIGNATURE
 			       : GRUB_FILE_TYPE_NONE));
      if (!pkf)
 	return grub_errno;
      pk = grub_load_public_key (pkf);
@@ -847,15 +786,26 @@ grub_cmd_verify_signature (grub_extcmd_context_t ctxt,
      grub_file_close (pkf);
    }
-  f = grub_file_open (args[0], GRUB_FILE_TYPE_VERIFY_SIGNATURE);
+  grub_file_filter_disable_all ();
  f = grub_file_open (args[0]);
  if (!f)
    {
      err = grub_errno;
      goto fail;
    }
-  err = grub_verify_signature (f, args[1], pk);
+  grub_file_filter_disable_all ();
  sig = grub_file_open (args[1]);
  if (!sig)
    {
      err = grub_errno;
      goto fail;
    }
  err = grub_verify_signature (f, sig, pk);
 fail:
  if (sig)
    grub_file_close (sig);
  if (f)
    grub_file_close (f);
  if (pk)
@@ -865,53 +815,135 @@ grub_cmd_verify_signature (grub_extcmd_context_t ctxt,
 static int sec = 0;
 static void
 verified_free (grub_verified_t verified)
 {
  if (verified)
    {
      grub_free (verified->buf);
      grub_free (verified);
    }
 }
 static grub_ssize_t
 verified_read (struct grub_file *file, char *buf, grub_size_t len)
 {
  grub_verified_t verified = file->data;
  grub_memcpy (buf, (char *) verified->buf + file->offset, len);
  return len;
 }
 static grub_err_t
-grub_pubkey_init (grub_file_t io, enum grub_file_type type __attribute__ ((unused)),
+verified_close (struct grub_file *file)
-		  void **context, enum grub_verify_flags *flags)
+{
  grub_verified_t verified = file->data;
  grub_file_close (verified->file);
  verified_free (verified);
  file->data = 0;
  /* device and name are freed by parent */
  file->device = 0;
  file->name = 0;
  return grub_errno;
 }
 struct grub_fs verified_fs =
 {
  .name = "verified_read",
  .read = verified_read,
  .close = verified_close
 };
 static grub_file_t
 grub_pubkey_open (grub_file_t io, const char *filename)
 {
  grub_file_t sig;
  char *fsuf, *ptr;
  grub_err_t err;
-  struct grub_pubkey_context *ctxt;
+  grub_file_filter_t curfilt[GRUB_FILE_FILTER_MAX];
  grub_file_t ret;
  grub_verified_t verified;
  if (!sec)
-    {
+    return io;
-      *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION;
+  if (io->device->disk && 
-      return GRUB_ERR_NONE;
+      (io->device->disk->dev->id == GRUB_DISK_DEVICE_MEMDISK_ID
-    }
+       || io->device->disk->dev->id == GRUB_DISK_DEVICE_PROCFS_ID))
-
+    return io;
-  fsuf = grub_malloc (grub_strlen (io->name) + sizeof (".sig"));
+  fsuf = grub_malloc (grub_strlen (filename) + sizeof (".sig"));
  if (!fsuf)
-    return grub_errno;
+    return NULL;
-  ptr = grub_stpcpy (fsuf, io->name);
+  ptr = grub_stpcpy (fsuf, filename);
  grub_memcpy (ptr, ".sig", sizeof (".sig"));
-  sig = grub_file_open (fsuf, GRUB_FILE_TYPE_SIGNATURE);
+  grub_memcpy (curfilt, grub_file_filters_enabled,
 	       sizeof (curfilt));
  grub_file_filter_disable_all ();
  sig = grub_file_open (fsuf);
  grub_memcpy (grub_file_filters_enabled, curfilt,
 	       sizeof (curfilt));
  grub_free (fsuf);
  if (!sig)
-    return grub_errno;
+    return NULL;
-  ctxt = grub_malloc (sizeof (*ctxt));
+  ret = grub_malloc (sizeof (*ret));
-  if (!ctxt)
+  if (!ret)
    {
      grub_file_close (sig);
-      return grub_errno;
+      return NULL;
    }
-  err = grub_verify_signature_init (ctxt, sig);
+  *ret = *io;
  ret->fs = &verified_fs;
  ret->not_easily_seekable = 0;
  if (ret->size >> (sizeof (grub_size_t) * GRUB_CHAR_BIT - 1))
    {
      grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
 		  "big file signature isn't implemented yet");
      grub_file_close (sig);
      grub_free (ret);
      return NULL;
    }
  verified = grub_malloc (sizeof (*verified));
  if (!verified)
    {
      grub_file_close (sig);
      grub_free (ret);
      return NULL;
    }
  verified->buf = grub_malloc (ret->size);
  if (!verified->buf)
    {
      grub_file_close (sig);
      grub_free (verified);
      grub_free (ret);
      return NULL;
    }
  if (grub_file_read (io, verified->buf, ret->size) != (grub_ssize_t) ret->size)
    {
      if (!grub_errno)
 	grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"),
 		    filename);
      grub_file_close (sig);
      verified_free (verified);
      grub_free (ret);
      return NULL;
    }
  err = grub_verify_signature_real (verified->buf, ret->size, 0, sig, NULL);
  grub_file_close (sig);
  if (err)
    {
-      grub_free (ctxt);
+      verified_free (verified);
-      grub_file_close (sig);
+      grub_free (ret);
-      return err;
+      return NULL;
    }
-  *context = ctxt;
+  verified->file = io;
-  return GRUB_ERR_NONE;
+  ret->data = verified;
-}
+  return ret;
 static grub_err_t
 grub_pubkey_fini (void *ctxt)
 {
  return grub_verify_signature_real (ctxt, NULL);
 }
 static char *
@@ -934,22 +966,14 @@ pseudo_read (struct grub_file *file, char *buf, grub_size_t len)
 struct grub_fs pseudo_fs = 
  {
    .name = "pseudo",
-    .fs_read = pseudo_read
+    .read = pseudo_read
-  };
+};
 struct grub_file_verifier grub_pubkey_verifier =
  {
    .name = "pgp",
    .init = grub_pubkey_init,
    .fini = grub_pubkey_fini,
    .write = grub_pubkey_write,
    .close = grub_pubkey_close,
  };
 static grub_extcmd_t cmd, cmd_trust;
 static grub_command_t cmd_distrust, cmd_list;
-GRUB_MOD_INIT(pgp)
+GRUB_MOD_INIT(verify)
 {
  const char *val;
  struct grub_module_header *header;
@@ -960,6 +984,8 @@ GRUB_MOD_INIT(pgp)
  else
    sec = 0;
  grub_file_filter_register (GRUB_FILE_FILTER_PUBKEY, grub_pubkey_open);
  grub_register_variable_hook ("check_signatures", 0, grub_env_write_sec);
  grub_env_export ("check_signatures");
@@ -1004,13 +1030,11 @@ GRUB_MOD_INIT(pgp)
  cmd_distrust = grub_register_command ("distrust", grub_cmd_distrust,
 					N_("PUBKEY_ID"),
 					N_("Remove PUBKEY_ID from trusted keys."));
  grub_verifier_register (&grub_pubkey_verifier);
 }
-GRUB_MOD_FINI(pgp)
+GRUB_MOD_FINI(verify)
 {
-  grub_verifier_unregister (&grub_pubkey_verifier);
+  grub_file_filter_unregister (GRUB_FILE_FILTER_PUBKEY);
  grub_unregister_extcmd (cmd);
  grub_unregister_extcmd (cmd_trust);
  grub_unregister_command (cmd_list);
@@ -136,7 +136,7 @@ grub_cmd_videoinfo (grub_command_t cmd __attribute__ ((unused)),
  ctx.height = ctx.width = ctx.depth = 0;
  if (argc)
    {
-      const char *ptr;
+      char *ptr;
      ptr = args[0];
      ctx.width = grub_strtoul (ptr, &ptr, 0);
      if (grub_errno)
@@ -23,7 +23,6 @@
 #include <grub/file.h>
 #include <grub/device.h>
 #include <grub/script_sh.h>
 #include <grub/safemath.h>
 #include <regex.h>
@@ -49,7 +48,6 @@ merge (char **dest, char **ps)
  int i;
  int j;
  char **p;
  grub_size_t sz;
  if (! dest)
    return ps;
@@ -62,12 +60,7 @@ merge (char **dest, char **ps)
  for (j = 0; ps[j]; j++)
    ;
-  if (grub_add (i, j, &sz) ||
+  p = grub_realloc (dest, sizeof (char*) * (i + j + 1));
      grub_add (sz, 1, &sz) ||
      grub_mul (sz, sizeof (char *), &sz))
    return dest;
  p = grub_realloc (dest, sz);
  if (! p)
    {
      grub_free (dest);
@@ -122,15 +115,8 @@ make_regex (const char *start, const char *end, regex_t *regexp)
  char ch;
  int i = 0;
  unsigned len = end - start;
-  char *buffer;
+  char *buffer = grub_malloc (len * 2 + 2 + 1); /* worst case size. */
  grub_size_t sz;
  /* Worst case size is (len * 2 + 2 + 1). */
  if (grub_mul (len, 2, &sz) ||
      grub_add (sz, 3, &sz))
    return 1;
  buffer = grub_malloc (sz);
  if (! buffer)
    return 1;
@@ -240,7 +226,6 @@ match_devices_iter (const char *name, void *data)
  struct match_devices_ctx *ctx = data;
  char **t;
  char *buffer;
  grub_size_t sz;
  /* skip partitions if asked to. */
  if (ctx->noparts && grub_strchr (name, ','))
@@ -254,16 +239,11 @@ match_devices_iter (const char *name, void *data)
  if (regexec (ctx->regexp, buffer, 0, 0, 0))
    {
      grub_dprintf ("expand", "not matched\n");
 fail:
      grub_free (buffer);
      return 0;
    }
-  if (grub_add (ctx->ndev, 2, &sz) ||
+  t = grub_realloc (ctx->devs, sizeof (char*) * (ctx->ndev + 2));
      grub_mul (sz, sizeof (char *), &sz))
    goto fail;
  t = grub_realloc (ctx->devs, sz);
  if (! t)
    {
      grub_free (buffer);
@@ -320,7 +300,6 @@ match_files_iter (const char *name,
  struct match_files_ctx *ctx = data;
  char **t;
  char *buffer;
  grub_size_t sz;
  /* skip . and .. names */
  if (grub_strcmp(".", name) == 0 || grub_strcmp("..", name) == 0)
@@ -336,14 +315,9 @@ match_files_iter (const char *name,
  if (! buffer)
    return 1;
-  if (grub_add (ctx->nfile, 2, &sz) ||
+  t = grub_realloc (ctx->files, sizeof (char*) * (ctx->nfile + 2));
-      grub_mul (sz, sizeof (char *), &sz))
+  if (! t)
    goto fail;
  t = grub_realloc (ctx->files, sz);
  if (!t)
    {
 fail:
      grub_free (buffer);
      return 1;
    }
@@ -396,7 +370,7 @@ match_files (const char *prefix, const char *suffix, const char *end,
  else
    path = ctx.dir;
-  if (fs->fs_dir (dev, path, match_files_iter, &ctx))
+  if (fs->dir (dev, path, match_files_iter, &ctx))
    goto fail;
  grub_free (ctx.dir);
@@ -478,7 +452,7 @@ check_file (const char *dir, const char *basename)
  else
    path = dir;
-  fs->fs_dir (dev, path[0] ? path : "/", check_file_iter, &ctx);
+  fs->dir (dev, path[0] ? path : "/", check_file_iter, &ctx);
  if (grub_errno == 0 && basename[0] == 0)
    ctx.found = 1;
@@ -21,12 +21,9 @@
 */
 #include <grub/crypto.h>
 #include <grub/dl.h>
 #include <grub/mm.h>
 #include <grub/misc.h>
 GRUB_MOD_LICENSE ("GPLv2+");
 gcry_err_code_t AF_merge (const gcry_md_spec_t * hash, grub_uint8_t * src,
 			  grub_uint8_t * dst, grub_size_t blocksize,
 			  grub_size_t blocknumbers);
@@ -82,20 +82,6 @@ enum grub_ahci_hba_port_command
    GRUB_AHCI_HBA_PORT_CMD_FR = 0x4000,
  };
 enum grub_ahci_hba_port_int_status
  {
    GRUB_AHCI_HBA_PORT_IS_IFS  = (1UL << 27),
    GRUB_AHCI_HBA_PORT_IS_HBDS = (1UL << 28),
    GRUB_AHCI_HBA_PORT_IS_HBFS = (1UL << 29),
    GRUB_AHCI_HBA_PORT_IS_TFES = (1UL << 30),
  };
 #define GRUB_AHCI_HBA_PORT_IS_FATAL_MASK ( \
 	GRUB_AHCI_HBA_PORT_IS_IFS | \
 	GRUB_AHCI_HBA_PORT_IS_HBDS | \
 	GRUB_AHCI_HBA_PORT_IS_HBFS | \
 	GRUB_AHCI_HBA_PORT_IS_TFES)
 struct grub_ahci_hba
 {
  grub_uint32_t cap;
@@ -576,7 +562,7 @@ grub_ahci_pciinit (grub_pci_device_t dev,
 	    grub_ahci_readwrite_real (dev, &parms2, 1, 1);*/
      }
-  endtime = grub_get_time_ms () + 32000;
+  endtime = grub_get_time_ms () + 10000;
  while (grub_get_time_ms () < endtime)
    {
@@ -1040,8 +1026,7 @@ grub_ahci_readwrite_real (struct grub_ahci_device *dev,
  endtime = grub_get_time_ms () + (spinup ? 20000 : 20000);
  while ((dev->hba->ports[dev->port].command_issue & 1))
-    if (grub_get_time_ms () > endtime ||
+    if (grub_get_time_ms () > endtime)
 	(dev->hba->ports[dev->port].intstatus & GRUB_AHCI_HBA_PORT_IS_FATAL_MASK))
      {
 	grub_dprintf ("ahci", "AHCI status <%x %x %x %x>\n",
 		      dev->hba->ports[dev->port].command_issue,
@@ -1049,9 +1034,6 @@ grub_ahci_readwrite_real (struct grub_ahci_device *dev,
 		      dev->hba->ports[dev->port].intstatus,
 		      dev->hba->ports[dev->port].task_file_data);
 	dev->hba->ports[dev->port].command_issue = 0;
 	if (dev->hba->ports[dev->port].intstatus & GRUB_AHCI_HBA_PORT_IS_FATAL_MASK)
 	  err = grub_error (GRUB_ERR_IO, "AHCI transfer error");
 	else
 	err = grub_error (GRUB_ERR_IO, "AHCI transfer timed out");
 	if (!reset)
 	  grub_ahci_reset_port (dev, 1);
@@ -296,11 +296,11 @@ static struct grub_disk_dev grub_arcdisk_dev =
  {
    .name = "arcdisk",
    .id = GRUB_DISK_DEVICE_ARCDISK_ID,
-    .disk_iterate = grub_arcdisk_iterate,
+    .iterate = grub_arcdisk_iterate,
-    .disk_open = grub_arcdisk_open,
+    .open = grub_arcdisk_open,
-    .disk_close = grub_arcdisk_close,
+    .close = grub_arcdisk_close,
-    .disk_read = grub_arcdisk_read,
+    .read = grub_arcdisk_read,
-    .disk_write = grub_arcdisk_write,
+    .write = grub_arcdisk_write,
    .next = 0
  };
@@ -219,9 +219,8 @@ grub_ata_setaddress (struct grub_ata *dev,
 	if (dev->sectors_per_track == 0
 	    || dev->heads == 0)
 	  return grub_error (GRUB_ERR_OUT_OF_RANGE,
-			     "sector %" PRIxGRUB_UINT64_T " cannot be "
+			     "sector %d cannot be addressed "
-			     "addressed using CHS addressing",
+			     "using CHS addressing", sector);
 			     sector);
 	/* Calculate the sector, cylinder and head to use.  */
 	sect = ((grub_uint32_t) sector % dev->sectors_per_track) + 1;
@@ -233,9 +232,8 @@ grub_ata_setaddress (struct grub_ata *dev,
 	    || cylinder > dev->cylinders
 	    || head > dev->heads)
 	  return grub_error (GRUB_ERR_OUT_OF_RANGE,
-			     "sector %" PRIxGRUB_UINT64_T " cannot be "
+			     "sector %d cannot be addressed "
-			     "addressed using CHS addressing",
+			     "using CHS addressing", sector);
 			     sector);
 	parms->taskfile.disk = 0xE0 | head;
 	parms->taskfile.sectnum = sect;
@@ -512,11 +510,11 @@ static struct grub_disk_dev grub_atadisk_dev =
  {
    .name = "ATA",
    .id = GRUB_DISK_DEVICE_ATA_ID,
-    .disk_iterate = grub_ata_iterate,
+    .iterate = grub_ata_iterate,
-    .disk_open = grub_ata_open,
+    .open = grub_ata_open,
-    .disk_close = grub_ata_close,
+    .close = grub_ata_close,
-    .disk_read = grub_ata_read,
+    .read = grub_ata_read,
-    .disk_write = grub_ata_write,
+    .write = grub_ata_write,
    .next = 0
  };
@@ -1,6 +1,6 @@
 /*
 *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003,2007,2010,2011,2019  Free Software Foundation, Inc.
+ *  Copyright (C) 2003,2007,2010,2011  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
@@ -224,8 +224,7 @@ lrw_xor (const struct lrw_sector *sec,
 static gcry_err_code_t
 grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
 			   grub_uint8_t * data, grub_size_t len,
-			   grub_disk_addr_t sector, grub_size_t log_sector_size,
+			   grub_disk_addr_t sector, int do_encrypt)
 			   int do_encrypt)
 {
  grub_size_t i;
  gcry_err_code_t err;
@@ -238,7 +237,7 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
    return (do_encrypt ? grub_crypto_ecb_encrypt (dev->cipher, data, data, len)
 	    : grub_crypto_ecb_decrypt (dev->cipher, data, data, len));
-  for (i = 0; i < len; i += (1U << log_sector_size))
+  for (i = 0; i < len; i += (1U << dev->log_sector_size))
    {
      grub_size_t sz = ((dev->cipher->cipher->blocksize
 			 + sizeof (grub_uint32_t) - 1)
@@ -271,7 +270,7 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
 	    if (!ctx)
 	      return GPG_ERR_OUT_OF_MEMORY;
-	    tmp = grub_cpu_to_le64 (sector << log_sector_size);
+	    tmp = grub_cpu_to_le64 (sector << dev->log_sector_size);
 	    dev->iv_hash->init (ctx);
 	    dev->iv_hash->write (ctx, dev->iv_prefix, dev->iv_prefix_len);
 	    dev->iv_hash->write (ctx, &tmp, sizeof (tmp));
@@ -282,38 +281,24 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
 	  }
 	  break;
 	case GRUB_CRYPTODISK_MODE_IV_PLAIN64:
 	  iv[1] = grub_cpu_to_le32 (sector >> 32);
 	case GRUB_CRYPTODISK_MODE_IV_PLAIN:
-	  /*
+	  iv[0] = grub_cpu_to_le32 (sector & 0xFFFFFFFF);
 	   * The IV is a 32 or 64 bit value of the dm-crypt native sector
 	   * number. If using 32 bit IV mode, zero out the most significant
 	   * 32 bits.
 	   */
 	  {
 	    grub_uint64_t iv64;
 	    iv64 = grub_cpu_to_le64 (sector << (log_sector_size
 						 - GRUB_CRYPTODISK_IV_LOG_SIZE));
 	    grub_set_unaligned64 (iv, iv64);
 	    if (dev->mode_iv == GRUB_CRYPTODISK_MODE_IV_PLAIN)
 	      iv[1] = 0;
 	  }
 	  break;
 	case GRUB_CRYPTODISK_MODE_IV_BYTECOUNT64:
-	  /* The IV is the 64 bit byte offset of the sector. */
+	  iv[1] = grub_cpu_to_le32 (sector >> (32 - dev->log_sector_size));
-	  iv[1] = grub_cpu_to_le32 (sector >> (GRUB_TYPE_BITS (iv[1])
+	  iv[0] = grub_cpu_to_le32 ((sector << dev->log_sector_size)
-					       - log_sector_size));
+				    & 0xFFFFFFFF);
 	  iv[0] = grub_cpu_to_le32 ((sector << log_sector_size)
 				    & GRUB_TYPE_U_MAX (iv[0]));
 	  break;
 	case GRUB_CRYPTODISK_MODE_IV_BENBI:
 	  {
 	    grub_uint64_t num = (sector << dev->benbi_log) + 1;
-	    iv[sz - 2] = grub_cpu_to_be32 (num >> GRUB_TYPE_BITS (iv[0]));
+	    iv[sz - 2] = grub_cpu_to_be32 (num >> 32);
-	    iv[sz - 1] = grub_cpu_to_be32 (num & GRUB_TYPE_U_MAX (iv[0]));
+	    iv[sz - 1] = grub_cpu_to_be32 (num & 0xFFFFFFFF);
 	  }
 	  break;
 	case GRUB_CRYPTODISK_MODE_IV_ESSIV:
-	  iv[0] = grub_cpu_to_le32 (sector & GRUB_TYPE_U_MAX (iv[0]));
+	  iv[0] = grub_cpu_to_le32 (sector & 0xFFFFFFFF);
 	  err = grub_crypto_ecb_encrypt (dev->essiv_cipher, iv, iv,
 					 dev->cipher->cipher->blocksize);
 	  if (err)
@@ -325,10 +310,10 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
 	case GRUB_CRYPTODISK_MODE_CBC:
 	  if (do_encrypt)
 	    err = grub_crypto_cbc_encrypt (dev->cipher, data + i, data + i,
-					   ((grub_size_t) 1 << log_sector_size), iv);
+					   (1U << dev->log_sector_size), iv);
 	  else
 	    err = grub_crypto_cbc_decrypt (dev->cipher, data + i, data + i,
-					   ((grub_size_t) 1 << log_sector_size), iv);
+					   (1U << dev->log_sector_size), iv);
 	  if (err)
 	    return err;
 	  break;
@@ -336,10 +321,10 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
 	case GRUB_CRYPTODISK_MODE_PCBC:
 	  if (do_encrypt)
 	    err = grub_crypto_pcbc_encrypt (dev->cipher, data + i, data + i,
-					    ((grub_size_t) 1 << log_sector_size), iv);
+					    (1U << dev->log_sector_size), iv);
 	  else
 	    err = grub_crypto_pcbc_decrypt (dev->cipher, data + i, data + i,
-					    ((grub_size_t) 1 << log_sector_size), iv);
+					    (1U << dev->log_sector_size), iv);
 	  if (err)
 	    return err;
 	  break;
@@ -351,7 +336,7 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
 	    if (err)
 	      return err;
-	    for (j = 0; j < (1U << log_sector_size);
+	    for (j = 0; j < (1U << dev->log_sector_size);
 		 j += dev->cipher->cipher->blocksize)
 	      {
 		grub_crypto_xor (data + i + j, data + i + j, iv,
@@ -382,11 +367,11 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
 	    if (do_encrypt)
 	      err = grub_crypto_ecb_encrypt (dev->cipher, data + i, 
 					     data + i,
-					     (1U << log_sector_size));
+					     (1U << dev->log_sector_size));
 	    else
 	      err = grub_crypto_ecb_decrypt (dev->cipher, data + i, 
 					     data + i,
-					     (1U << log_sector_size));
+					     (1U << dev->log_sector_size));
 	    if (err)
 	      return err;
 	    lrw_xor (&sec, dev, data + i);
@@ -395,10 +380,10 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
 	case GRUB_CRYPTODISK_MODE_ECB:
 	  if (do_encrypt)
 	    err = grub_crypto_ecb_encrypt (dev->cipher, data + i, data + i,
-					   (1U << log_sector_size));
+					   (1U << dev->log_sector_size));
 	  else
 	    err = grub_crypto_ecb_decrypt (dev->cipher, data + i, data + i,
-					   (1U << log_sector_size));
+					   (1U << dev->log_sector_size));
 	  if (err)
 	    return err;
 	  break;
@@ -413,174 +398,9 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
 gcry_err_code_t
 grub_cryptodisk_decrypt (struct grub_cryptodisk *dev,
 			 grub_uint8_t * data, grub_size_t len,
-			 grub_disk_addr_t sector, grub_size_t log_sector_size)
+			 grub_disk_addr_t sector)
 {
-  return grub_cryptodisk_endecrypt (dev, data, len, sector, log_sector_size, 0);
+  return grub_cryptodisk_endecrypt (dev, data, len, sector, 0);
 }
 grub_err_t
 grub_cryptodisk_setcipher (grub_cryptodisk_t crypt, const char *ciphername, const char *ciphermode)
 {
  const char *cipheriv = NULL;
  grub_crypto_cipher_handle_t cipher = NULL, secondary_cipher = NULL;
  grub_crypto_cipher_handle_t essiv_cipher = NULL;
  const gcry_md_spec_t *essiv_hash = NULL;
  const struct gcry_cipher_spec *ciph;
  grub_cryptodisk_mode_t mode;
  grub_cryptodisk_mode_iv_t mode_iv = GRUB_CRYPTODISK_MODE_IV_PLAIN64;
  int benbi_log = 0;
  grub_err_t ret = GRUB_ERR_NONE;
  ciph = grub_crypto_lookup_cipher_by_name (ciphername);
  if (!ciph)
    {
      ret = grub_error (GRUB_ERR_FILE_NOT_FOUND, "Cipher %s isn't available",
 		        ciphername);
      goto err;
    }
  /* Configure the cipher used for the bulk data.  */
  cipher = grub_crypto_cipher_open (ciph);
  if (!cipher)
  {
      ret = grub_error (GRUB_ERR_FILE_NOT_FOUND, "Cipher %s could not be initialized",
 		        ciphername);
      goto err;
  }
  /* Configure the cipher mode.  */
  if (grub_strcmp (ciphermode, "ecb") == 0)
    {
      mode = GRUB_CRYPTODISK_MODE_ECB;
      mode_iv = GRUB_CRYPTODISK_MODE_IV_PLAIN;
      cipheriv = NULL;
    }
  else if (grub_strcmp (ciphermode, "plain") == 0)
    {
      mode = GRUB_CRYPTODISK_MODE_CBC;
      mode_iv = GRUB_CRYPTODISK_MODE_IV_PLAIN;
      cipheriv = NULL;
    }
  else if (grub_memcmp (ciphermode, "cbc-", sizeof ("cbc-") - 1) == 0)
    {
      mode = GRUB_CRYPTODISK_MODE_CBC;
      cipheriv = ciphermode + sizeof ("cbc-") - 1;
    }
  else if (grub_memcmp (ciphermode, "pcbc-", sizeof ("pcbc-") - 1) == 0)
    {
      mode = GRUB_CRYPTODISK_MODE_PCBC;
      cipheriv = ciphermode + sizeof ("pcbc-") - 1;
    }
  else if (grub_memcmp (ciphermode, "xts-", sizeof ("xts-") - 1) == 0)
    {
      mode = GRUB_CRYPTODISK_MODE_XTS;
      cipheriv = ciphermode + sizeof ("xts-") - 1;
      secondary_cipher = grub_crypto_cipher_open (ciph);
      if (!secondary_cipher)
      {
 	  ret = grub_error (GRUB_ERR_FILE_NOT_FOUND,
 			    "Secondary cipher %s isn't available", ciphername);
 	  goto err;
      }
      if (cipher->cipher->blocksize != GRUB_CRYPTODISK_GF_BYTES)
 	{
 	  ret = grub_error (GRUB_ERR_BAD_ARGUMENT,
 			    "Unsupported XTS block size: %" PRIuGRUB_SIZE,
 			    cipher->cipher->blocksize);
 	  goto err;
 	}
      if (secondary_cipher->cipher->blocksize != GRUB_CRYPTODISK_GF_BYTES)
 	{
 	  ret = grub_error (GRUB_ERR_BAD_ARGUMENT,
 			    "Unsupported XTS block size: %" PRIuGRUB_SIZE,
 			    secondary_cipher->cipher->blocksize);
 	  goto err;
 	}
    }
  else if (grub_memcmp (ciphermode, "lrw-", sizeof ("lrw-") - 1) == 0)
    {
      mode = GRUB_CRYPTODISK_MODE_LRW;
      cipheriv = ciphermode + sizeof ("lrw-") - 1;
      if (cipher->cipher->blocksize != GRUB_CRYPTODISK_GF_BYTES)
 	{
 	  ret = grub_error (GRUB_ERR_BAD_ARGUMENT,
 			    "Unsupported LRW block size: %" PRIuGRUB_SIZE,
 			    cipher->cipher->blocksize);
 	  goto err;
 	}
    }
  else
    {
      ret = grub_error (GRUB_ERR_BAD_ARGUMENT, "Unknown cipher mode: %s",
 		        ciphermode);
      goto err;
    }
  if (cipheriv == NULL)
      ;
  else if (grub_memcmp (cipheriv, "plain64", sizeof ("plain64") - 1) == 0)
      mode_iv = GRUB_CRYPTODISK_MODE_IV_PLAIN64;
  else if (grub_memcmp (cipheriv, "plain", sizeof ("plain") - 1) == 0)
      mode_iv = GRUB_CRYPTODISK_MODE_IV_PLAIN;
  else if (grub_memcmp (cipheriv, "benbi", sizeof ("benbi") - 1) == 0)
    {
      if (cipher->cipher->blocksize & (cipher->cipher->blocksize - 1)
 	  || cipher->cipher->blocksize == 0)
 	grub_error (GRUB_ERR_BAD_ARGUMENT,
 		    "Unsupported benbi blocksize: %" PRIuGRUB_SIZE,
 		    cipher->cipher->blocksize);
 	/* FIXME should we return an error here? */
      for (benbi_log = 0;
 	   (cipher->cipher->blocksize << benbi_log) < GRUB_DISK_SECTOR_SIZE;
 	   benbi_log++);
      mode_iv = GRUB_CRYPTODISK_MODE_IV_BENBI;
    }
  else if (grub_memcmp (cipheriv, "null", sizeof ("null") - 1) == 0)
      mode_iv = GRUB_CRYPTODISK_MODE_IV_NULL;
  else if (grub_memcmp (cipheriv, "essiv:", sizeof ("essiv:") - 1) == 0)
    {
      const char *hash_str = cipheriv + 6;
      mode_iv = GRUB_CRYPTODISK_MODE_IV_ESSIV;
      /* Configure the hash and cipher used for ESSIV.  */
      essiv_hash = grub_crypto_lookup_md_by_name (hash_str);
      if (!essiv_hash)
 	{
 	  ret = grub_error (GRUB_ERR_FILE_NOT_FOUND,
 			    "Couldn't load %s hash", hash_str);
 	  goto err;
 	}
      essiv_cipher = grub_crypto_cipher_open (ciph);
      if (!essiv_cipher)
 	{
 	  ret = grub_error (GRUB_ERR_FILE_NOT_FOUND,
 			    "Couldn't load %s cipher", ciphername);
 	  goto err;
 	}
    }
  else
    {
      ret = grub_error (GRUB_ERR_BAD_ARGUMENT, "Unknown IV mode: %s",
 		        cipheriv);
      goto err;
    }
  crypt->cipher = cipher;
  crypt->benbi_log = benbi_log;
  crypt->mode = mode;
  crypt->mode_iv = mode_iv;
  crypt->secondary_cipher = secondary_cipher;
  crypt->essiv_cipher = essiv_cipher;
  crypt->essiv_hash = essiv_hash;
 err:
  if (ret)
    {
      grub_crypto_cipher_close (cipher);
      grub_crypto_cipher_close (secondary_cipher);
    }
  return ret;
 }
 gcry_err_code_t
@@ -717,7 +537,7 @@ grub_cryptodisk_open (const char *name, grub_disk_t disk)
    }
  disk->data = dev;
-  disk->total_sectors = dev->total_sectors;
+  disk->total_sectors = dev->total_length;
  disk->max_agglomerate = GRUB_DISK_MAX_MAX_AGGLOMERATE;
  disk->id = dev->id;
  dev->ref++;
@@ -772,11 +592,12 @@ grub_cryptodisk_read (grub_disk_t disk, grub_disk_addr_t sector,
  grub_dprintf ("cryptodisk",
 		"Reading %" PRIuGRUB_SIZE " sectors from sector 0x%"
 		PRIxGRUB_UINT64_T " with offset of %" PRIuGRUB_UINT64_T "\n",
-		size, sector, dev->offset_sectors);
+		size, sector, dev->offset);
  err = grub_disk_read (dev->source_disk,
-			grub_disk_from_native_sector (disk, sector + dev->offset_sectors),
+			(sector << (disk->log_sector_size
-			0, size << disk->log_sector_size, buf);
+				   - GRUB_DISK_SECTOR_BITS)) + dev->offset, 0,
 			size << disk->log_sector_size, buf);
  if (err)
    {
      grub_dprintf ("cryptodisk", "grub_disk_read failed with error %d\n", err);
@@ -784,7 +605,7 @@ grub_cryptodisk_read (grub_disk_t disk, grub_disk_addr_t sector,
    }
  gcry_err = grub_cryptodisk_endecrypt (dev, (grub_uint8_t *) buf,
 					size << disk->log_sector_size,
-					sector, dev->log_sector_size, 0);
+					sector, 0);
  return grub_crypto_gcry_error (gcry_err);
 }
@@ -821,11 +642,11 @@ grub_cryptodisk_write (grub_disk_t disk, grub_disk_addr_t sector,
  grub_dprintf ("cryptodisk",
 		"Writing %" PRIuGRUB_SIZE " sectors to sector 0x%"
 		PRIxGRUB_UINT64_T " with offset of %" PRIuGRUB_UINT64_T "\n",
-		size, sector, dev->offset_sectors);
+		size, sector, dev->offset);
  gcry_err = grub_cryptodisk_endecrypt (dev, (grub_uint8_t *) tmp,
 					size << disk->log_sector_size,
-					sector, disk->log_sector_size, 1);
+					sector, 1);
  if (gcry_err)
    {
      grub_free (tmp);
@@ -833,10 +654,12 @@ grub_cryptodisk_write (grub_disk_t disk, grub_disk_addr_t sector,
    }
  /* Since ->write was called so disk.mod is loaded but be paranoid  */
-  sector = sector + dev->offset_sectors;
+  
  if (grub_disk_write_weak)
    err = grub_disk_write_weak (dev->source_disk,
-				grub_disk_from_native_sector (disk, sector),
+				(sector << (disk->log_sector_size
 					    - GRUB_DISK_SECTOR_BITS))
 				+ dev->offset,
 				0, size << disk->log_sector_size, tmp);
  else
    err = grub_error (GRUB_ERR_BUG, "disk.mod not loaded");
@@ -1191,13 +1014,13 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args)
 static struct grub_disk_dev grub_cryptodisk_dev = {
  .name = "cryptodisk",
  .id = GRUB_DISK_DEVICE_CRYPTODISK_ID,
-  .disk_iterate = grub_cryptodisk_iterate,
+  .iterate = grub_cryptodisk_iterate,
-  .disk_open = grub_cryptodisk_open,
+  .open = grub_cryptodisk_open,
-  .disk_close = grub_cryptodisk_close,
+  .close = grub_cryptodisk_close,
-  .disk_read = grub_cryptodisk_read,
+  .read = grub_cryptodisk_read,
-  .disk_write = grub_cryptodisk_write,
+  .write = grub_cryptodisk_write,
 #ifdef GRUB_UTIL
-  .disk_memberlist = grub_cryptodisk_memberlist,
+  .memberlist = grub_cryptodisk_memberlist,
 #endif
  .next = 0
 };
@@ -1246,7 +1069,7 @@ luks_script_get (grub_size_t *sz)
 	ptr = grub_stpcpy (ptr, "luks_mount ");
 	ptr = grub_stpcpy (ptr, i->uuid);
 	*ptr++ = ' ';
-	grub_snprintf (ptr, 21, "%" PRIuGRUB_UINT64_T " ", i->offset_sectors);
+	grub_snprintf (ptr, 21, "%" PRIuGRUB_UINT64_T " ", i->offset);
 	while (*ptr)
 	  ptr++;
 	for (iptr = i->cipher->cipher->name; *iptr; iptr++)
@@ -1326,6 +1149,5 @@ GRUB_MOD_FINI (cryptodisk)
 {
  grub_disk_dev_unregister (&grub_cryptodisk_dev);
  cryptodisk_cleanup ();
  grub_unregister_extcmd (cmd);
  grub_procfs_unregister (&luks_script);
 }
@@ -148,7 +148,7 @@ scan_disk_partition_iter (grub_disk_t disk, grub_partition_t p, void *data)
 	if (m->disk && m->disk->id == disk->id
 	    && m->disk->dev->id == disk->dev->id
 	    && m->part_start == grub_partition_get_start (disk->partition)
-	    && m->part_size == grub_disk_native_sectors (disk))
+	    && m->part_size == grub_disk_get_size (disk))
 	  return 0;
    }
@@ -228,9 +228,9 @@ scan_devices (const char *arname)
  for (pull = 0; pull < GRUB_DISK_PULL_MAX; pull++)
    for (p = grub_disk_dev_list; p; p = p->next)
      if (p->id != GRUB_DISK_DEVICE_DISKFILTER_ID
-	  && p->disk_iterate)
+	  && p->iterate)
 	{
-	  if ((p->disk_iterate) (scan_disk_hook, NULL, pull))
+	  if ((p->iterate) (scan_disk_hook, NULL, pull))
 	    return;
 	  if (arname && is_lv_readable (find_lv (arname), 1))
 	    return;
@@ -311,9 +311,9 @@ grub_diskfilter_memberlist (grub_disk_t disk)
  for (pull = 0; pv && pull < GRUB_DISK_PULL_MAX; pull++)
    for (p = grub_disk_dev_list; pv && p; p = p->next)
      if (p->id != GRUB_DISK_DEVICE_DISKFILTER_ID
-	  && p->disk_iterate)
+	  && p->iterate)
 	{
-	  (p->disk_iterate) (scan_disk_hook, NULL, pull);
+	  (p->iterate) (scan_disk_hook, NULL, pull);
 	  while (pv && pv->disk)
 	    pv = pv->next;
 	}
@@ -969,8 +969,7 @@ grub_diskfilter_vg_register (struct grub_diskfilter_vg *vg)
 	    for (p = vgp->lvs; p; p = p->next)
 	      {
 		int cur_num;
-		char *num;
+		char *num, *end;
 		const char *end;
 		if (!p->fullname)
 		  continue;
 		if (grub_strncmp (p->fullname, lv->fullname, len) != 0)
@@ -1135,7 +1134,7 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb,
  array->lvs->segments->node_count = nmemb;
  array->lvs->segments->raid_member_size = disk_size;
  array->lvs->segments->nodes
-    = grub_calloc (nmemb, sizeof (array->lvs->segments->nodes[0]));
+    = grub_zalloc (nmemb * sizeof (array->lvs->segments->nodes[0]));
  array->lvs->segments->stripe_size = stripe_size;
  for (i = 0; i < nmemb; i++)
    {
@@ -1190,13 +1189,13 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
  grub_dprintf ("diskfilter", "Inserting %s (+%lld,%lld) into %s (%s)\n", disk->name,
 		(unsigned long long) grub_partition_get_start (disk->partition),
-		(unsigned long long) grub_disk_native_sectors (disk),
+		(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_HOST_PRIuLONG_LONG ") into %s (%s)\n", disk->name,
 		  (unsigned long long) grub_partition_get_start (disk->partition),
-		  (unsigned long long) grub_disk_native_sectors (disk),
+		  (unsigned long long) grub_disk_get_size (disk),
 		  array->name, diskfilter->name);
  array->driver = diskfilter;
 #endif
@@ -1210,7 +1209,7 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
 	struct grub_diskfilter_lv *lv;
 	/* FIXME: Check whether the update time of the superblocks are
 	   the same.  */
-	if (pv->disk && grub_disk_native_sectors (disk) >= pv->part_size)
+	if (pv->disk && grub_disk_get_size (disk) >= pv->part_size)
 	  return GRUB_ERR_NONE;
 	pv->disk = grub_disk_open (disk->name);
 	if (!pv->disk)
@@ -1219,7 +1218,7 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
 	   raid device, we shouldn't change it.  */
 	pv->start_sector -= pv->part_start;
 	pv->part_start = grub_partition_get_start (disk->partition);
-	pv->part_size = grub_disk_native_sectors (disk);
+	pv->part_size = grub_disk_get_size (disk);
 #ifdef GRUB_UTIL
 	{
@@ -1227,7 +1226,7 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
 	  grub_partition_t p;
 	  for (p = disk->partition; p; p = p->parent)
 	    s++;
-	  pv->partmaps = xcalloc (s, sizeof (pv->partmaps[0]));
+	  pv->partmaps = xmalloc (s * sizeof (pv->partmaps[0]));
 	  s = 0;
 	  for (p = disk->partition; p; p = p->parent)
 	    pv->partmaps[s++] = xstrdup (p->partmap->name);
@@ -1311,7 +1310,7 @@ grub_diskfilter_get_pv_from_disk (grub_disk_t disk,
 	if (pv->disk && pv->disk->id == disk->id
 	    && pv->disk->dev->id == disk->dev->id
 	    && pv->part_start == grub_partition_get_start (disk->partition)
-	    && pv->part_size == grub_disk_native_sectors (disk))
+	    && pv->part_size == grub_disk_get_size (disk))
 	  {
 	    if (vg_out)
 	      *vg_out = vg;
@@ -1326,14 +1325,14 @@ static struct grub_disk_dev grub_diskfilter_dev =
  {
    .name = "diskfilter",
    .id = GRUB_DISK_DEVICE_DISKFILTER_ID,
-    .disk_iterate = grub_diskfilter_iterate,
+    .iterate = grub_diskfilter_iterate,
-    .disk_open = grub_diskfilter_open,
+    .open = grub_diskfilter_open,
-    .disk_close = grub_diskfilter_close,
+    .close = grub_diskfilter_close,
-    .disk_read = grub_diskfilter_read,
+    .read = grub_diskfilter_read,
-    .disk_write = grub_diskfilter_write,
+    .write = grub_diskfilter_write,
 #ifdef GRUB_UTIL
-    .disk_memberlist = grub_diskfilter_memberlist,
+    .memberlist = grub_diskfilter_memberlist,
-    .disk_raidname = grub_diskfilter_getname,
+    .raidname = grub_diskfilter_getname,
 #endif
    .next = 0
  };
@@ -107,7 +107,7 @@ grub_dmraid_nv_detect (grub_disk_t disk,
    /* Skip partition.  */
    return NULL;
-  sector = grub_disk_native_sectors (disk);
+  sector = grub_disk_get_size (disk);
  if (sector == GRUB_DISK_SIZE_UNKNOWN)
    /* Not raid.  */
    return NULL;
@@ -122,7 +122,7 @@ grub_dmraid_nv_detect (grub_disk_t disk,
  if (sb.version != NV_VERSION)
    {
      grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-		  "unknown version: %d.%d", sb.version >> 8, sb.version & 0xFF);
+		  "unknown version: %d.%d", sb.version);
      return NULL;
    }
@@ -80,15 +80,6 @@ make_devices (void)
 	/* This should not happen... Why?  */
 	continue;
      /* iPXE adds stub Block IO protocol to loaded image device handle. It is
         completely non-functional and simply returns an error for every method.
        So attempt to detect and skip it. Magic number is literal "iPXE" and
        check block size as well */
      /* FIXME: shoud we close it? We do not do it elsewhere */
      if (bio->media && bio->media->media_id == 0x69505845U &&
         bio->media->block_size == 1)
         continue;
      d = grub_malloc (sizeof (*d));
      if (! d)
 	{
@@ -129,9 +120,6 @@ find_parent_device (struct grub_efidisk_data *devices,
    return 0;
  ldp = grub_efi_find_last_device_path (dp);
  if (! ldp)
    return 0;
  ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
  ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
  ldp->length = sizeof (*ldp);
@@ -162,9 +150,6 @@ is_child (struct grub_efidisk_data *child,
    return 0;
  ldp = grub_efi_find_last_device_path (dp);
  if (! ldp)
    return 0;
  ldp->type = GRUB_EFI_END_DEVICE_PATH_TYPE;
  ldp->subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
  ldp->length = sizeof (*ldp);
@@ -230,7 +215,7 @@ name_devices (struct grub_efidisk_data *devices)
 	    {
 	    case GRUB_EFI_HARD_DRIVE_DEVICE_PATH_SUBTYPE:
 	      is_hard_drive = 1;
-	      /* Intentionally fall through.  */
+	      /* Fall through by intention.  */
 	    case GRUB_EFI_CDROM_DEVICE_PATH_SUBTYPE:
 	      {
 		struct grub_efidisk_data *parent, *parent2;
@@ -633,11 +618,11 @@ static struct grub_disk_dev grub_efidisk_dev =
  {
    .name = "efidisk",
    .id = GRUB_DISK_DEVICE_EFIDISK_ID,
-    .disk_iterate = grub_efidisk_iterate,
+    .iterate = grub_efidisk_iterate,
-    .disk_open = grub_efidisk_open,
+    .open = grub_efidisk_open,
-    .disk_close = grub_efidisk_close,
+    .close = grub_efidisk_close,
-    .disk_read = grub_efidisk_read,
+    .read = grub_efidisk_read,
-    .disk_write = grub_efidisk_write,
+    .write = grub_efidisk_write,
    .next = 0
  };
@@ -836,9 +821,6 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
 	{
 	  grub_efi_device_path_t *dup_ldp;
 	  dup_ldp = grub_efi_find_last_device_path (dup_dp);
 	  if (! dup_ldp)
 	    break;
 	  if (!(GRUB_EFI_DEVICE_PATH_TYPE (dup_ldp) == GRUB_EFI_MEDIA_DEVICE_PATH_TYPE
 		&& (GRUB_EFI_DEVICE_PATH_SUBTYPE (dup_ldp) == GRUB_EFI_CDROM_DEVICE_PATH_SUBTYPE
 		    || GRUB_EFI_DEVICE_PATH_SUBTYPE (dup_ldp) == GRUB_EFI_HARD_DRIVE_DEVICE_PATH_SUBTYPE)))
@@ -867,7 +849,7 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
      if (ctx.hd->partition_start == 0
 	  && (ctx.hd->partition_size << (parent->log_sector_size
 					 - GRUB_DISK_SECTOR_BITS))
-	  == grub_disk_native_sectors (parent))
+	  == grub_disk_get_size (parent))
 	{
 	  dev_name = grub_strdup (parent->name);
 	}
@@ -258,7 +258,7 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid,
  if (2 * GRUB_MD_SHA256->mdlen + 1 > GRUB_CRYPTODISK_MAX_UUID_LENGTH)
    return NULL;
-  sector = grub_disk_native_sectors (disk);
+  sector = grub_disk_get_size (disk);
  if (sector == GRUB_DISK_SIZE_UNKNOWN || sector == 0)
    return NULL;
@@ -361,7 +361,7 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid,
    }
  newdev->cipher = cipher;
  newdev->secondary_cipher = secondary_cipher;
-  newdev->offset_sectors = 0;
+  newdev->offset = 0;
  newdev->source_disk = NULL;
  newdev->benbi_log = 0;
  if (grub_le_to_cpu16 (header.alg) == 0x16)
@@ -391,7 +391,7 @@ configure_ciphers (grub_disk_t disk, const char *check_uuid,
  newdev->modname = "geli";
-  newdev->total_sectors = grub_disk_native_sectors (disk) - 1;
+  newdev->total_length = grub_disk_get_size (disk) - 1;
  grub_memcpy (newdev->uuid, uuid, sizeof (newdev->uuid));
  COMPILE_TIME_ASSERT (sizeof (newdev->uuid) >= 32 * 2 + 1);
  return newdev;
@@ -420,7 +420,7 @@ recover_key (grub_disk_t source, grub_cryptodisk_t dev)
  if (dev->hash->mdlen > GRUB_CRYPTO_MAX_MDLEN)
    return grub_error (GRUB_ERR_BUG, "mdlen is too long");
-  sector = grub_disk_native_sectors (source);
+  sector = grub_disk_get_size (source);
  if (sector == GRUB_DISK_SIZE_UNKNOWN || sector == 0)
    return grub_error (GRUB_ERR_BUG, "not a geli");
@@ -84,11 +84,11 @@ static struct grub_disk_dev grub_host_dev =
    /* The only important line in this file :-) */
    .name = "host",
    .id = GRUB_DISK_DEVICE_HOST_ID,
-    .disk_iterate = grub_host_iterate,
+    .iterate = grub_host_iterate,
-    .disk_open = grub_host_open,
+    .open = grub_host_open,
-    .disk_close = grub_host_close,
+    .close = grub_host_close,
-    .disk_read = grub_host_read,
+    .read = grub_host_read,
-    .disk_write = grub_host_write,
+    .write = grub_host_write,
    .next = 0
  };
Author	SHA1	Message	Date
Andrei Borzenkov	e897f83635	Merge branch 'master' into andrey/ext4_inline_data Conflicts: grub-core/fs/ext2.c	2016-07-11 07:23:13 +03:00
Andrey Borzenkov	d4af83fc60	ext4 inline data support	2013-12-18 19:53:19 +01:00