* grub-core/kern/main.c (grub_set_prefix_and_root): Set variable
cmdpath to firmware directory.

* grub-core/kern/efi/efi.c (grub_efi_get_filename): Reset the pointer
at the start of second iteration.

* grub-core/Makefile.am (efiemu64.o): Explicitly set link format.

* Makefile.am (default_payload.elf): New target for easier coreboot
build.

Merge branch 'master' of git.sv.gnu.org:/srv/git/grub

Conflicts:
ChangeLog

* grub-core/kern/arm/cache_armv6.S: Remove special handling for
clang (not necessarry with -no-integrated-as).
* include/grub/symbol.h [__arm__]: Likewise.

* grub-core/fs/ext2.c (grub_ext2_read_block): Factor out common code for indirect block handling.

Saves 185 bytes on compressed image.

* configure.ac: Use -no-integrated-as on arm with clang.
* INSTALL: Mention ARM compilation with clang.

* conf/Makefile.common (CCASFLAGS_PLATFORM) [COND_arm]: Add
-mthumb-interwork.

Merge branch 'master' of git.sv.gnu.org:/srv/git/grub

fix make clean

* Makefile.am: Remove build-grub-* in make clean.

new files to .gitignore

* .gitignore: Add build-grub-gen-asciih, build-grub-gen-widthspec,
build-grub-mkfont, and grub-emu-lite. Remove .bzrignore.

* grub-core/kern/arm/misc.S: Make thumb2-compatible.

* .gitignore: fix rules for .dep* and add *.a post git migration

* configure.ac (AM_INIT_AUTOMAKE): Require at least version 1.10.1,
to match INSTALL.

* grub-core/kern/misc.c: Don't redirect divisions in the
GRUB_UTIL case.
* include/grub/misc.h: Likewise.

* grub-core/osdep/unix/emuconsole.c (put): Pacify the compiler on
systems that require checking the return value of write.

* util/grub-install.in (efi_quiet): Fix inverted logic: make
efibootmgr quiet when --debug is not used, rather than when it is.

* gentpl.py (define_macro_for_platform_dependencies): Remove
first (and thus unused) of two definitions for this function.
(platform_dependencies): Likewise.

* acinclude.m4 (grub_apple_cc): Remove; since the removal of nested
functions, we only need to check this for the target, not the host.
* configure.ac (grub_apple_cc): Likewise.

* grub-core/kern/arm/cache.c (probe_caches): Move asm part to ...
* grub-core/kern/arm/cache_armv6.S: ... here. This allows this
asm to stay in arm even if surrounding is thumb.

* grub-core/kern/arm/misc.S: Add __muldi3 and __aeabi_lmul. Those
helper functions are needed for thumb.

* grub-core/disk/diskfilter.c (grub_diskfilter_make_raid): Make
level / 3 division explicitly unsigned. Saves few bytes.

* grub-core/fs/zfs/zfs.c (ZAP_LEAF_NUMCHUNKS): Use unsigned arithmetics.

* grub-core/normal/datetime.c (grub_get_weekday): Use if rather than
division.

* grub-core/kern/uboot/init.c: Move grub_uboot_machine_type and
grub_uboot_boot_data to asm part.

* grub-core/kern/arm/uboot/startup.S: Remove = by replacing with
literal load.
(grub_uboot_syscall): Save/restore r9 and align stack.

* grub-core/kern/arm/cache.S: Replace = with explicit litteral load.

* include/grub/symbol.h (END) [__arm__]: New macros. Replace all .end
occurencies with END.

* util/grub-editenv.c (help_filter, argp): Document how to delete
the whole environment block.
Reported by Dan Jacobson.  Fixes Debian bug #726265.

* docs/grub.texi (Internationalisation, Supported kernels): Fix
sectioning.

* grub-core/normal/term.c (grub_set_more): Use bool logic rather than
increment/decrement.

Revert " * include/grub/symbol.h (ADDR): New macro. Replace all occurences of"

This reverts commit 286551b4ebac0b6807c42d2034181d508479c542.

* grub-core/kern/arm/cache_armv6.S [__clang__]: Don't add .armv6 when
compiling with clang.

* grub-core/kern/arm/uboot/startup.S: Use .org rather than assigning
".".

* include/grub/symbol.h (ADDR): New macro. Replace all occurences of
=x with ADDR(x) in arm assembly.
(END): New macro. Replace all .end with END.

Redirect all divisions to grub_divmod64.

* grub-core/term/tparm.c (tparam_internal): Use unsigned divisions.

Add missing includes of loader.h.

* configure.ac: Allow disabling themes.

* util/grub.d/20_linux_xen.in: Don't decompress initrd.

* grub-core/term/at_keyboard.c: Don't poll non-functional AT controller
until it becomes operational.

* grub-core/Makefile.core.def (legacy_password_test): Disable
on platforms where no legacycfg is compiled.
* grub-core/tests/lib/functional_test.c: Tolerate failure to
load legacy_password_test.

* grub-core/loader/i386/bsd.c: Remove variable length arrays.

* grub-core/efiemu/prepare.c: Remove variable length arrays.

* grub-core/osdep/windows/hostdisk.c (grub_util_fd_strerror): Silence
strict-aliasing warning.
(fsync): Silence cast warning.

* grub-core/commands/verify.c: Remove variable length arrays.
Load gcry_dsa/gcry_rsa automatically.

* grub-core/tests/signature_test.c: New test.

* grub-core/disk/cryptodisk.c (luks_script_get): Adapt to new procfs
API.

* grub-core/tests/legacy_password_test.c (vectors): Make static.
* grub-core/tests/pbkdf2_test.c (vectors): Likewise.

* grub-core/tests/setjmp_test.c: Reset counter to 0 before starting.

* grub-core/fs/proc.c: Allow \0 in proc files.

* grub-core/tests/xnu_uuid_test.c: Fix assert message.

* grub-core/tests/xnu_uuid_test.c: Fix copyright year.

* grub-core/fs/ext2.c: Remove variable length arrays.

* grub-core/lib/crypto.c (grub_crypto_cbc_decrypt): Remove variable
length arrays.

* grub-core/disk/AFSplitter.c: Remove variable length arrays.
* grub-core/disk/cryptodisk.c: Likewise.
* grub-core/disk/geli.c: Likewise.
* grub-core/disk/luks.c: Likewise.

* grub-core/tests/legacy_password_test.c: New test.
* grub-core/commands/legacycfg.c: Remove variable length arrays.

* grub-core/lib/pbkdf2.c: Remove variable length arrays.

* grub-core/tests/pbkdf2_test.c: New test.

* grub-core/lib/xzembed/xz_dec_stream.c: Remove variable length arrays.

* grub-core/io/lzopio.c: Remove variable length arrays.

* include/grub/crypto.h: Add maximums on hash size and cipher block
size.

* grub-core/commands/xnu_uuid.c: Remove variable length arrays.

* grub-core/tests/xnu_uuid_test.c: New test.

* grub-core/commands/hashsum.c: Remove unneeded memset (zalloc already
covers it).

* grub-core/commands/hashsum.c: Remove variable length arrays.

* grub-core/tests/gfxterm_menu.c (gfxterm_menu): Handle out-of-memory
condition.
* tests/grub_func_test.in: Increase memory allocation.

* grub-core/osdep/unix/getroot.c [HAVE_STRUCT_STATFS_F_FSTYPENAME
&& HAVE_STRUCT_STATFS_F_MNTFROMNAME]: Include sys/param.h and
sys/mount.h.

* grub-core/osdep/apple/hostdisk.c (grub_util_get_fd_size): Rename to ..
(grub_util_get_fd_size_os): ...this.
(grub_hostdisk_flush_initial_buffer): New empty function.

* grub-core/gensyminfo.sh.in: Handle the case of portable output
without --defined-only.

* grub-core/lib/i386/relocator_common.S [__APPLE__ && __x86_64__]: Use
rip-relative addressing in prologue.

* include/grub/misc.h [__APPLE__]: Do not add regparm(0) on x86_64.
* grub-core/kern/misc.c (__bzero) [__APPLE__]: New function.

* util/getroot.c (grub_util_biosdisk_get_grub_dev) [__APPLE__]:
Add missing semicolon.

* util/grub-macho2img.c: Use plain fopen rather than grub_util_fopen.

* configure.ac: Check for lzma.h for enabling liblzma and allow
manual disabling.

Add missing includes of loader.h.

* util/grub.d/30_os-prober.in: Add minix entry.

* grub-core/loader/i386/coreboot/chainloader.c (load_segment): Use
right buffer for temporary load.

* grub-core/loader/i386/coreboot/chainloader.c: Support tianocore.

* grub-core/loader/i386/coreboot/chainloader.c: Support lzma-compressed
payload.

* include/grub/lib/LzmaDec.h: Fix to include LzmaTypes.h and
not Types.h.
* grub-core/lib/LzmaDec.c: Fix prologue to make it compileable in GRUB
environment.
(LzmaDec_InitDicAndState): Make static.

* util/grub-mkimagexx.c (generate_elf): Fix module address on coreboot.

* grub-core/term/ieee1275/escc.c (GRUB_MOD_INIT): Fix order of channels.

Reported by: Aaro Koskinen <aaro.koskinen@iki.fi>

* docs/grub-dev.texi: Replace bzr references with git ones.

grub-reboot no more sets saved_default

Remove reference to grub-default from description of saved default entry.

Also mention that GRUB_DEFAULT=saved depends on availability of environment
block.

ChangeLog entry for 5645cc7995a788a443c6f29addac26ea6d3989d4

* configure.ac: Make efiemu test cflags match the cflags efiemu is
compiled with.

document GRUB_DISABLE_SUBMENU

Signed-off-by: Andrey Borzenkov <arvidjaar@gmail.com>

Fix grub_machine_fini bitrot.

Reported by: Glenn Washburn.

* configure.ac: Remove leftover -fnested-funcions -Wl,-allow_execute.

* grub-core/Makefile.am (efiemu): Remove leftover -DAPPLE_CC and
-DELF.
* grub-core/efiemu/runtime/config.h: Use __i386__ and __x86_64__
instead of ELF*.

* configure.ac: Restore CFLAGS to TARGET_CFLAGS before external tests.
Add -march=core2 when testing compile of efiemu64.

Thanks Andrey Borzenkov for spotting this.

Add new ports: i386-xen and x86_64-xen. This allows running GRUB in
XEN PV environment and load kernels.

* grub-core/loader/i386/multiboot_mbi.c: Handle space in command line.
* grub-core/loader/multiboot_mbi2.c: Likewise.

* grub-core/lib/cmdline.c (grub_loader_cmdline_size): Fix empty cmdline
handling.

* grub-core/commands/i386/cmostest.c: Add new command "cmosset".

Tested by: Denis 'GNUtoo' Carikli.

* grub-core/normal/datetime.c (grub_get_weekday): Use unsigned types.

* grub-core/gfxmenu/gui_circular_progress.c (parse_angle):
Use to get rounded angle rather than truncated.

* grub-core/term/serial.c: Add option for enabling/disabling
RTS/CTS flow control.