diff --git a/src/libgcc/__divdi3.c b/src/libgcc/__divdi3.c
index 7097b11e..224bb69c 100644
--- a/src/libgcc/__divdi3.c
+++ b/src/libgcc/__divdi3.c
@@ -6,21 +6,5 @@
 
 __libgcc int64_t __divdi3(int64_t num, int64_t den)
 {
-  int minus = 0;
-  int64_t v;
-
-  if ( num < 0 ) {
-    num = -num;
-    minus = 1;
-  }
-  if ( den < 0 ) {
-    den = -den;
-    minus ^= 1;
-  }
-
-  v = __udivmoddi4(num, den, NULL);
-  if ( minus )
-    v = -v;
-
-  return v;
+  return __divmoddi4(num, den, NULL);
 }
diff --git a/src/libgcc/__divmoddi4.c b/src/libgcc/__divmoddi4.c
new file mode 100644
index 00000000..95e328d0
--- /dev/null
+++ b/src/libgcc/__divmoddi4.c
@@ -0,0 +1,25 @@
+#include "libgcc.h"
+
+__libgcc int64_t __divmoddi4(int64_t num, int64_t den, int64 *rem_p)
+{
+  int minus = 0;
+  int64_t v;
+
+  if ( num < 0 ) {
+    num = -num;
+    minus = 1;
+  }
+  if ( den < 0 ) {
+    den = -den;
+    minus ^= 1;
+  }
+
+  v = __udivmoddi4(num, den, (uint64_t *)rem_p);
+  if ( minus ) {
+    v = -v;
+    if ( rem_p )
+      *rem_p = -(*rem_p);
+  }
+
+  return v;
+}
diff --git a/src/libgcc/__moddi3.c b/src/libgcc/__moddi3.c
index d671bbc4..ea6fd6f7 100644
--- a/src/libgcc/__moddi3.c
+++ b/src/libgcc/__moddi3.c
@@ -6,21 +6,8 @@
 
 __libgcc int64_t __moddi3(int64_t num, int64_t den)
 {
-  int minus = 0;
   int64_t v;
 
-  if ( num < 0 ) {
-    num = -num;
-    minus = 1;
-  }
-  if ( den < 0 ) {
-    den = -den;
-    minus ^= 1;
-  }
-
-  (void) __udivmoddi4(num, den, (uint64_t *)&v);
-  if ( minus )
-    v = -v;
-
+  (void) __divmoddi4(num, den, &v);
   return v;
 }
diff --git a/src/libgcc/libgcc.h b/src/libgcc/libgcc.h
index d3e9bdd7..eb7c68ec 100644
--- a/src/libgcc/libgcc.h
+++ b/src/libgcc/libgcc.h
@@ -8,6 +8,7 @@ extern __libgcc uint64_t __udivmoddi4 ( uint64_t num, uint64_t den,
 					uint64_t *rem );
 extern __libgcc uint64_t __udivdi3  (uint64_t num, uint64_t den );
 extern __libgcc uint64_t __umoddi3 ( uint64_t num, uint64_t den );
+extern __libgcc int64_t __divmoddi4 ( int64_t num, int64_t den, int64_t *rem );
 extern __libgcc int64_t __divdi3 ( int64_t num, int64_t den );
 extern __libgcc int64_t __moddi3 ( int64_t num, int64_t den );