Refactor to remove un-named struct gnu extension usage. Now ISO C89 and C99 compliant. Comment trailing endifs

llvm-svn: 78537

1 files changed, 12 insertions, 12 deletions

diff --git a/compiler-rt/lib/muldi3.c b/compiler-rt/lib/muldi3.c
index 6ed5929da38..38963b72630 100644
--- a/compiler-rt/lib/muldi3.c
+++ b/compiler-rt/lib/muldi3.c
@@ -23,18 +23,18 @@ __muldsi3(su_int a, su_int b)
     dwords r;
     const int bits_in_word_2 = (int)(sizeof(si_int) * CHAR_BIT) / 2;
     const su_int lower_mask = (su_int)~0 >> bits_in_word_2;
-    r.low = (a & lower_mask) * (b & lower_mask);
-    su_int t = r.low >> bits_in_word_2;
-    r.low &= lower_mask;
+    r.s.low = (a & lower_mask) * (b & lower_mask);
+    su_int t = r.s.low >> bits_in_word_2;
+    r.s.low &= lower_mask;
     t += (a >> bits_in_word_2) * (b & lower_mask);
-    r.low += (t & lower_mask) << bits_in_word_2;
-    r.high = t >> bits_in_word_2;
-    t = r.low >> bits_in_word_2;
-    r.low &= lower_mask;
+    r.s.low += (t & lower_mask) << bits_in_word_2;
+    r.s.high = t >> bits_in_word_2;
+    t = r.s.low >> bits_in_word_2;
+    r.s.low &= lower_mask;
     t += (b >> bits_in_word_2) * (a & lower_mask);
-    r.low += (t & lower_mask) << bits_in_word_2;
-    r.high += t >> bits_in_word_2;
-    r.high += (a >> bits_in_word_2) * (b >> bits_in_word_2);
+    r.s.low += (t & lower_mask) << bits_in_word_2;
+    r.s.high += t >> bits_in_word_2;
+    r.s.high += (a >> bits_in_word_2) * (b >> bits_in_word_2);
     return r.all;
 }
 
@@ -48,7 +48,7 @@ __muldi3(di_int a, di_int b)
     dwords y;
     y.all = b;
     dwords r;
-    r.all = __muldsi3(x.low, y.low);
-    r.high += x.high * y.low + x.low * y.high;
+    r.all = __muldsi3(x.s.low, y.s.low);
+    r.s.high += x.s.high * y.s.low + x.s.low * y.s.high;
     return r.all;
 }