Merge "Quick fix for the x86 build."
diff --git a/runtime/lib/ashldi3.c b/runtime/lib/ashldi3.c
index 7ff774a..0a65a15 100644
--- a/runtime/lib/ashldi3.c
+++ b/runtime/lib/ashldi3.c
@@ -12,7 +12,8 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // gcc >= 4.7 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || defined(ARCH_X86)
+// ARM gcc >= 4.7 implements this in libgcc
#include "int_lib.h"
/* Returns: a << b */
diff --git a/runtime/lib/divsi3.c b/runtime/lib/divsi3.c
index 09aab2a..c91de75 100644
--- a/runtime/lib/divsi3.c
+++ b/runtime/lib/divsi3.c
@@ -12,7 +12,8 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // gcc >= 4.7 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || defined(ARCH_X86)
+// ARM gcc >= 4.7 implements this in libgcc
#include "int_lib.h"
su_int __udivsi3(su_int n, su_int d);
diff --git a/runtime/lib/fixdfdi.c b/runtime/lib/fixdfdi.c
index cc0ce7c..2316b22 100644
--- a/runtime/lib/fixdfdi.c
+++ b/runtime/lib/fixdfdi.c
@@ -12,7 +12,8 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // gcc >= 4.7 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || defined(ARCH_X86)
+// ARM gcc >= 4.7 implements this in libgcc
#include "int_lib.h"
/* Returns: convert a to a signed long long, rounding toward zero. */
diff --git a/runtime/lib/fixsfdi.c b/runtime/lib/fixsfdi.c
index 5d4a781..d8e01f9 100644
--- a/runtime/lib/fixsfdi.c
+++ b/runtime/lib/fixsfdi.c
@@ -12,7 +12,8 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // gcc >= 4.7 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || defined(ARCH_X86)
+// ARM gcc >= 4.7 implements this in libgcc
#include "int_lib.h"
/* Returns: convert a to a signed long long, rounding toward zero. */
diff --git a/runtime/lib/fixunsdfdi.c b/runtime/lib/fixunsdfdi.c
index c6a3827..12ab25c 100644
--- a/runtime/lib/fixunsdfdi.c
+++ b/runtime/lib/fixunsdfdi.c
@@ -12,7 +12,8 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // gcc >= 4.7 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || defined(ARCH_X86)
+// ARM gcc >= 4.7 implements this in libgcc
#include "int_lib.h"
/* Returns: convert a to a unsigned long long, rounding toward zero.
diff --git a/runtime/lib/fixunsdfsi.c b/runtime/lib/fixunsdfsi.c
index 75b4b6d..b79f1a8 100644
--- a/runtime/lib/fixunsdfsi.c
+++ b/runtime/lib/fixunsdfsi.c
@@ -12,7 +12,8 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // gcc >= 4.7 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || defined(ARCH_X86)
+// ARM gcc >= 4.7 implements this in libgcc
#include "int_lib.h"
/* Returns: convert a to a unsigned int, rounding toward zero.
diff --git a/runtime/lib/fixunssfdi.c b/runtime/lib/fixunssfdi.c
index 7f38792..a70b888 100644
--- a/runtime/lib/fixunssfdi.c
+++ b/runtime/lib/fixunssfdi.c
@@ -12,7 +12,8 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // gcc >= 4.7 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || defined(ARCH_X86)
+// ARM gcc >= 4.7 implements this in libgcc
#include "int_lib.h"
/* Returns: convert a to a unsigned long long, rounding toward zero.
diff --git a/runtime/lib/floatdidf.c b/runtime/lib/floatdidf.c
index c063f48..dd406f4 100644
--- a/runtime/lib/floatdidf.c
+++ b/runtime/lib/floatdidf.c
@@ -12,7 +12,8 @@
*===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // gcc >= 4.7 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || defined(ARCH_X86)
+// ARM gcc >= 4.7 implements this in libgcc
#include "int_lib.h"
#include <float.h>
diff --git a/runtime/lib/floatdisf.c b/runtime/lib/floatdisf.c
index 906f589..8c365cc 100644
--- a/runtime/lib/floatdisf.c
+++ b/runtime/lib/floatdisf.c
@@ -12,7 +12,8 @@
*===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // gcc >= 4.7 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || defined(ARCH_X86)
+// ARM gcc >= 4.7 implements this in libgcc
#include "int_lib.h"
#include <float.h>
diff --git a/runtime/lib/floatundidf.c b/runtime/lib/floatundidf.c
index d722013..f142528 100644
--- a/runtime/lib/floatundidf.c
+++ b/runtime/lib/floatundidf.c
@@ -12,7 +12,8 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // gcc >= 4.7 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || defined(ARCH_X86)
+// ARM gcc >= 4.7 implements this in libgcc
#include "int_lib.h"
#include <float.h>
diff --git a/runtime/lib/floatundisf.c b/runtime/lib/floatundisf.c
index aecce23..4a42351 100644
--- a/runtime/lib/floatundisf.c
+++ b/runtime/lib/floatundisf.c
@@ -12,7 +12,8 @@
*===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // gcc >= 4.7 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || defined(ARCH_X86)
+// ARM gcc >= 4.7 implements this in libgcc
#include "int_lib.h"
#include <float.h>
diff --git a/runtime/lib/lshrdi3.c b/runtime/lib/lshrdi3.c
index 78c91d6..5e17cca 100644
--- a/runtime/lib/lshrdi3.c
+++ b/runtime/lib/lshrdi3.c
@@ -12,7 +12,8 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // gcc >= 4.7 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || defined(ARCH_X86)
+// ARM gcc >= 4.7 implements this in libgcc
#include "int_lib.h"
/* Returns: logical a >> b */
diff --git a/runtime/lib/muldi3.c b/runtime/lib/muldi3.c
index 26b418b..421b29e 100644
--- a/runtime/lib/muldi3.c
+++ b/runtime/lib/muldi3.c
@@ -12,7 +12,8 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // gcc >= 4.7 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || defined(ARCH_X86)
+// ARM gcc >= 4.7 implements this in libgcc
#include "int_lib.h"
/* Returns: a * b */
diff --git a/runtime/lib/udivsi3.c b/runtime/lib/udivsi3.c
index 49cc218..59bf4bb 100644
--- a/runtime/lib/udivsi3.c
+++ b/runtime/lib/udivsi3.c
@@ -12,7 +12,8 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // gcc >= 4.7 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || defined(ARCH_X86)
+// ARM gcc >= 4.7 implements this in libgcc
#include "int_lib.h"
/* Returns: a / b */
