Merge "Undefine a bunch of helper function already exising in gcc 4.7."
diff --git a/runtime/lib/ashldi3.c b/runtime/lib/ashldi3.c
index cb2af08..7ff774a 100644
--- a/runtime/lib/ashldi3.c
+++ b/runtime/lib/ashldi3.c
@@ -12,7 +12,7 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) // gcc >= 4.8 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // 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 3ab82f0..09aab2a 100644
--- a/runtime/lib/divsi3.c
+++ b/runtime/lib/divsi3.c
@@ -12,10 +12,7 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || \
- (__GNUC__ == 4 && __GNUC_MINOR__ < 8 && !defined(HAS_HW_DIV))
-// gcc >= 4.8 implements this in libgcc
-// gcc 4.7 also implements this in libgcc with -mcpu=cortex-a15
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // 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 16b4afd..cc0ce7c 100644
--- a/runtime/lib/fixdfdi.c
+++ b/runtime/lib/fixdfdi.c
@@ -12,7 +12,7 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) // gcc >= 4.8 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // 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 3e9b12e..5d4a781 100644
--- a/runtime/lib/fixsfdi.c
+++ b/runtime/lib/fixsfdi.c
@@ -12,7 +12,7 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) // gcc >= 4.8 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // 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 51040e8..c6a3827 100644
--- a/runtime/lib/fixunsdfdi.c
+++ b/runtime/lib/fixunsdfdi.c
@@ -12,7 +12,7 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) // gcc >= 4.8 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // 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 513dbeb..75b4b6d 100644
--- a/runtime/lib/fixunsdfsi.c
+++ b/runtime/lib/fixunsdfsi.c
@@ -12,7 +12,7 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) // gcc >= 4.8 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // 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 3dd195c..7f38792 100644
--- a/runtime/lib/fixunssfdi.c
+++ b/runtime/lib/fixunssfdi.c
@@ -12,7 +12,7 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) // gcc >= 4.8 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // 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 94606aa..c063f48 100644
--- a/runtime/lib/floatdidf.c
+++ b/runtime/lib/floatdidf.c
@@ -12,7 +12,7 @@
*===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) // gcc >= 4.8 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // 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 0f1923b..906f589 100644
--- a/runtime/lib/floatdisf.c
+++ b/runtime/lib/floatdisf.c
@@ -12,7 +12,7 @@
*===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) // gcc >= 4.8 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // 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 9dc73af..d722013 100644
--- a/runtime/lib/floatundidf.c
+++ b/runtime/lib/floatundidf.c
@@ -12,7 +12,7 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) // gcc >= 4.8 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // 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 d5d3599..aecce23 100644
--- a/runtime/lib/floatundisf.c
+++ b/runtime/lib/floatundisf.c
@@ -12,7 +12,7 @@
*===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) // gcc >= 4.8 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // 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 29836bf..78c91d6 100644
--- a/runtime/lib/lshrdi3.c
+++ b/runtime/lib/lshrdi3.c
@@ -12,7 +12,7 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) // gcc >= 4.8 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // 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 b2dd80f..26b418b 100644
--- a/runtime/lib/muldi3.c
+++ b/runtime/lib/muldi3.c
@@ -12,7 +12,7 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) // gcc >= 4.8 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // 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 fa0bb7c..49cc218 100644
--- a/runtime/lib/udivsi3.c
+++ b/runtime/lib/udivsi3.c
@@ -12,7 +12,7 @@
* ===----------------------------------------------------------------------===
*/
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) // gcc >= 4.8 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) // gcc >= 4.7 implements this in libgcc
#include "int_lib.h"
/* Returns: a / b */
