From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Fri, 8 Nov 2013 17:46:53 +0000 (+0100)
Subject: merge master to newports/alpha
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fphcoder%2Fports%2Falpha;p=thirdparty%2Fgrub.git

merge master to newports/alpha
---

7c58da503f67ddff0b237307f4e16357650d0951
diff --cc grub-core/kern/misc.c
index 7e7fc9216,f883fb911..53e6b1711
--- a/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)