merge master to newports/alpha

diff --cc configure.ac
Simple merge

diff --cc grub-core/Makefile.am
Simple merge

diff --cc grub-core/Makefile.core.def
Simple merge

diff --cc grub-core/gfxmenu/gui_circular_progress.c
Simple merge

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

diff --cc grub-core/kern/misc.c
index 7e7fc9216aca32e7b952907c8085df759139cff9,f883fb911ea5cb4409d9779cec6e15931584b86f..53e6b1711e2368ee7df7fd35d5787d5397c7d6c2
--- 1/grub-core/kern/misc.c
--- 2/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@@ -553,8 -551,12 +551,13 @@@ grub_divmod64 (grub_uint64_t n, grub_ui
    grub_uint64_t q = 0;
    grub_uint64_t m = 0;
  
+   /* ARM and IA64 don't have a fast 32-bit division.
+      Using that code would just make us use libgcc routines, calling
+      them twice (once for modulo and once for quotient.
+   */
+ #if !defined (__arm__) && !defined (__ia64__)
    /* Skip the slow computation if 32-bit arithmetic is possible.  */
 +#ifndef __alpha__
    if (n < 0xffffffff && d < 0xffffffff)
      {
        if (r)

diff --cc grub-core/lib/libgcrypt/mpi/longlong.h
Simple merge

diff --cc grub-core/term/terminfo.c
Simple merge

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

diff --cc util/mkimage.c
Simple merge