From 3f035740506ae3ce534b2ddf820bbe8ae5beeb83 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Wed, 10 Jun 2020 13:16:08 +0200
Subject: [PATCH] ldiv: Work around missing struct return feature.

* lib/mes/div.c (__mesabi_ldiv): Remove return type.
(__mesabi_imod): Adapt call site.
(__aeabi_idiv): Adapt call site and move it to conditional compilation.
(__aeabi_idivmod): Adapt call site.
---
 lib/mes/div.c | 52 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/lib/mes/div.c b/lib/mes/div.c
index 352acc07..77a1a410 100644
--- a/lib/mes/div.c
+++ b/lib/mes/div.c
@@ -67,9 +67,9 @@ __mesabi_uldiv (unsigned long a, unsigned long b, unsigned long* remainder)
 /* Note: Rounds towards zero.
    Maintainer: Be careful to satisfy quot * b + rem == a.
                That means that rem can be negative. */
-ldiv_t __mesabi_ldiv(long a, long b)
+void
+__mesabi_ldiv(long a, long b, ldiv_t* result)
 {
-  ldiv_t result;
   int negate_result = (a < 0) ^ (b < 0);
   if (b == LONG_MIN)
     __mesabi_div0();
@@ -80,22 +80,21 @@ ldiv_t __mesabi_ldiv(long a, long b)
         a = -a;
       if (b < 0)
         b = -b;
-      result.quot = __mesabi_uldiv(a, b, &result.rem);
+      result->quot = __mesabi_uldiv(a, b, &result->rem);
       if (negate_result)
-        result.quot = -result.quot;
+        result->quot = -result->quot;
       if (negative_a)
-        result.rem = -result.rem;
-      return result;
+        result->rem = -result->rem;
     }
   else
     {
-      result.rem = 0;
+      result->rem = 0;
       if (b < 0)
         b = -b;
       if (b == 1)
         {
-          result.quot = a;
-          /* Since result.quot is already negative, don't negate it again. */
+          result->quot = a;
+          /* Since result->quot is already negative, don't negate it again. */
           negate_result = !negate_result;
         }
       else if (b == 0)
@@ -105,15 +104,32 @@ ldiv_t __mesabi_ldiv(long a, long b)
           long x;
           for (x = 0; a <= -b; a += b)
             ++x;
-          result.rem = a; /* negative */
-          result.quot = x;
+          result->rem = a; /* negative */
+          result->quot = x;
         }
       if (negate_result)
-        result.quot = -result.quot;
-      return result;
+        result->quot = -result->quot;
     }
 }
 
+long
+__mesabi_imod (long a, long b)
+{
+  ldiv_t result;
+  __mesabi_ldiv(a, b, &result);
+  return result.rem;
+}
+
+#if !SYSTEM_LIBC && __arm__
+long
+__aeabi_idiv (long a, long b)
+{
+  ldiv_t result;
+  __mesabi_ldiv(a, b, &result);
+  return result.quot;
+}
+#endif // !SYSTEM_LIBC && __arm__
+
 #if __GNUC__ && !SYSTEM_LIBC && __arm__
 // ...-binutils-2.31.1/bin/ld: hash.o: in function `hash_cstring':
 // hash.c:(.text+0x56): undefined reference to `__aeabi_idivmod'
@@ -129,19 +145,13 @@ ldiv_t __mesabi_ldiv(long a, long b)
 long
 __aeabi_idivmod (long a, long b)
 {
-  ldiv_t result = __mesabi_ldiv(a, b);
+  ldiv_t result;
+  __mesabi_ldiv(a, b, &result);
   register long rem_result asm("r1");
   rem_result = result.rem;
   return result.quot;
 }
 
-long
-__aeabi_idiv (long a, long b)
-{
-  ldiv_t result = __mesabi_ldiv(a, b);
-  return result.quot;
-}
-
 /* Result: r0: quotient; r1: remainder */
 unsigned long
 __aeabi_uidivmod (unsigned long a, unsigned long b)