am ca1904d4: am 1957e34d: Merge "Add missed compiler support function for "/" and "%""
* commit 'ca1904d414062a381350f9081089f32ff12b7006':
Add missed compiler support function for "/" and "%"
diff --git a/lib/ExecutionEngine/Runtime.def b/lib/ExecutionEngine/Runtime.def
index e4a6875..69c2b16 100644
--- a/lib/ExecutionEngine/Runtime.def
+++ b/lib/ExecutionEngine/Runtime.def
@@ -117,9 +117,7 @@
DEF_GENERIC_OR_VFP_RUNTIME(__divdf3)
-#if !defined(__i386__)
- DEF_LLVM_RUNTIME(__divdi3)
-#endif
+DEF_LLVM_RUNTIME(__divdi3)
DEF_LLVM_RUNTIME(__divsi3)
#if !defined(ANDROID) /* no complex extension */
@@ -183,9 +181,7 @@
DEF_VFP_RUNTIME(__ltdf2)
DEF_VFP_RUNTIME(__ltsf2)
-#if !defined(__i386__)
- DEF_LLVM_RUNTIME(__moddi3)
-#endif
+DEF_LLVM_RUNTIME(__moddi3)
DEF_LLVM_RUNTIME(__modsi3)
#ifndef ANDROID // no complex extension
@@ -235,14 +231,10 @@
DEF_GENERIC_OR_VFP_RUNTIME(__truncdfsf2)
DEF_LLVM_RUNTIME(__ucmpdi2)
-#if !defined(__i386__)
- DEF_LLVM_RUNTIME(__udivdi3)
-#endif
+DEF_LLVM_RUNTIME(__udivdi3)
DEF_LLVM_RUNTIME(__udivmoddi4)
DEF_LLVM_RUNTIME(__udivsi3)
-#if !defined(__i386__)
- DEF_LLVM_RUNTIME(__umoddi3)
-#endif
+DEF_LLVM_RUNTIME(__umoddi3)
DEF_LLVM_RUNTIME(__umodsi3)
DEF_GENERIC_OR_VFP_RUNTIME(__unorddf2)
diff --git a/lib/ExecutionEngine/RuntimeStub.h b/lib/ExecutionEngine/RuntimeStub.h
index 1ca678b..bea4a6c 100644
--- a/lib/ExecutionEngine/RuntimeStub.h
+++ b/lib/ExecutionEngine/RuntimeStub.h
@@ -25,9 +25,7 @@
#ifndef ANDROID /* no complex.h */
extern double _Complex __divdc3(double, double, double, double);
#endif
-#if !defined(__i386__)
extern di_int __divdi3(di_int, di_int);
-#endif
extern si_int __divsi3(si_int, si_int);
#ifndef ANDROID /* no complex.h */
extern float _Complex __divsc3(float, float, float, float);
@@ -44,8 +42,8 @@
extern float __floatdisf(di_int);
extern double __floatundidf(du_int);
extern float __floatundisf(du_int);
-extern di_int __moddi3(di_int, di_int);
#endif
+extern di_int __moddi3(di_int, di_int);
extern si_int __modsi3(si_int, si_int);
#if !defined(__i386__) && !defined(__SSE2__)
extern di_int __lshrdi3(di_int, si_int);
@@ -73,14 +71,10 @@
extern di_int __subvdi3(di_int, di_int);
extern si_int __subvsi3(si_int, si_int);
extern si_int __ucmpdi2(du_int, du_int);
-#if !defined(__i386__)
extern du_int __udivdi3(du_int, du_int);
-#endif
extern su_int __udivsi3(su_int, su_int);
extern du_int __udivmoddi4(du_int, du_int, du_int *);
-#if !defined(__i386__)
extern du_int __umoddi3(du_int, du_int);
-#endif
extern su_int __umodsi3(su_int, su_int);
extern void __eprintf(char const *, char const *, char const *, char const *)
__attribute__((visibility("hidden")));