vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/kern/misc.c: Don't redirect divisions in the

Browse source 
GRUB_UTIL case.
* include/grub/misc.h: Likewise.
This commit is contained in:
Colin Watson 2013-11-13 14:47:23 +00:00
parent 9b45c0733e
commit 81a2e438dc
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-11-13 Colin Watson <cjwatson@ubuntu.com>
* grub-core/kern/misc.c: Don't redirect divisions in the
GRUB_UTIL case.
* include/grub/misc.h: Likewise.
2013-11-13 Colin Watson <cjwatson@ubuntu.com> 2013-11-13 Colin Watson <cjwatson@ubuntu.com>
* grub-core/osdep/unix/emuconsole.c (put): Pacify the compiler on * grub-core/osdep/unix/emuconsole.c (put): Pacify the compiler on

4
grub-core/kern/misc.c
View file

@ -596,6 +596,8 @@ grub_divmod64 (grub_uint64_t n, grub_uint64_t d, grub_uint64_t *r)
return q; return q;
} }
#ifndef GRUB_UTIL
#if defined (__arm__) #if defined (__arm__)
grub_uint32_t grub_uint32_t
@ -639,6 +641,8 @@ __umoddi3 (grub_uint64_t a, grub_uint64_t b)
#endif #endif
#endif /* GRUB_UTIL */
/* Convert a long long value to a string. This function avoids 64-bit /* Convert a long long value to a string. This function avoids 64-bit
modular arithmetic or divisions. */ modular arithmetic or divisions. */
static char * static char *

4
include/grub/misc.h
View file

@ -453,6 +453,8 @@ grub_error_load (const struct grub_error_saved *save)
grub_errno = save->grub_errno; grub_errno = save->grub_errno;
} }
#ifndef GRUB_UTIL
#if defined (__arm__) #if defined (__arm__)
grub_uint32_t grub_uint32_t
@ -487,6 +489,8 @@ EXPORT_FUNC (__umoddi3) (grub_uint64_t a, grub_uint64_t b);
#endif #endif
#endif /* GRUB_UTIL */
#if BOOT_TIME_STATS #if BOOT_TIME_STATS
struct grub_boot_time struct grub_boot_time