Blame SOURCES/0008-Currently-we-have-DivU64x32-on-ia32-but-it-tries-to-.patch
|
 |
67650e |
From d039cd620b8a270d9b231691c9b31d6824f18c08 Mon Sep 17 00:00:00 2001
|
|
|
67650e |
From: Nigel Croxon <ncroxon@redhat.com>
|
|
|
67650e |
Date: Wed, 10 Jan 2018 10:28:36 -0500
|
|
|
67650e |
Subject: [PATCH 08/25] Currently we have DivU64x32 on ia32, but it tries to
|
|
|
67650e |
call __umoddi3 and __udivdi3 from libgcc, which we don't have. This fixes it
|
|
|
67650e |
to use our implementation in that case.
|
|
|
aad209 |
|
|
|
67650e |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
67650e |
Signed-off-by: Nigel Croxon <ncroxon@redhat.com>
|
|
|
aad209 |
---
|
|
|
aad209 |
lib/ia32/math.c | 4 ++--
|
|
|
aad209 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
aad209 |
|
|
|
aad209 |
diff --git a/lib/ia32/math.c b/lib/ia32/math.c
|
|
|
67650e |
index 81f51bf45e4..fce7a8d4875 100644
|
|
|
aad209 |
--- a/lib/ia32/math.c
|
|
|
aad209 |
+++ b/lib/ia32/math.c
|
|
|
aad209 |
@@ -140,7 +140,7 @@ DivU64x32 (
|
|
|
aad209 |
// divide 64bit by 32bit and get a 64bit result
|
|
|
aad209 |
// N.B. only works for 31bit divisors!!
|
|
|
aad209 |
{
|
|
|
aad209 |
-#if defined(__GNUC__) && !defined(__MINGW32__)
|
|
|
aad209 |
+#if 0 && defined(__GNUC__) && !defined(__MINGW32__)
|
|
|
aad209 |
if (Remainder)
|
|
|
aad209 |
*Remainder = Dividend % Divisor;
|
|
|
aad209 |
return Dividend / Divisor;
|
|
|
aad209 |
@@ -157,7 +157,7 @@ DivU64x32 (
|
|
|
aad209 |
|
|
|
aad209 |
Rem = 0;
|
|
|
aad209 |
for (bit=0; bit < 64; bit++) {
|
|
|
aad209 |
-#ifdef __MINGW32__
|
|
|
aad209 |
+#if defined(__GNUC__) || defined(__MINGW32__)
|
|
|
aad209 |
asm (
|
|
|
aad209 |
"shll $1, %0\n\t"
|
|
|
aad209 |
"rcll $1, 4%0\n\t"
|
|
|
aad209 |
--
|
|
|
67650e |
2.15.0
|
|
|
aad209 |
|